Second Commit:
Version 1.5 [Partialy Optimized Version] [UI Fixes And Improvment] Todo: Optimized the Code Add String Theolgy
This commit is contained in:
Diassdp
@ -5,7 +5,7 @@
|
||||
android:id="@+id/main"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="@color/Secondary_Light"
|
||||
android:background="@drawable/bg_login"
|
||||
tools:context=".ui.journal.input.JournalInputActivity">
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
@ -24,44 +24,31 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="16dp"
|
||||
android:text="Please input your today data"
|
||||
android:textStyle="bold"
|
||||
android:textColor="@color/Primary_Dark"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<de.hdodenhof.circleimageview.CircleImageView
|
||||
android:id="@+id/iv_user"
|
||||
android:layout_width="60dp"
|
||||
android:layout_height="60dp"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:layout_marginTop="20dp"
|
||||
android:src="@drawable/profile_dummy_img"
|
||||
app:civ_border_color="@color/Primary_Dark"
|
||||
app:civ_border_width="2dp"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/tv_title_journal" />
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:id="@+id/cl_input_blood_pressure_SYS"
|
||||
android:layout_width="80dp"
|
||||
android:layout_height="80dp"
|
||||
android:padding="5dp"
|
||||
android:background="@drawable/bg_input"
|
||||
android:padding="5dp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintEnd_toStartOf="@+id/iv_user"
|
||||
app:layout_constraintHorizontal_bias="1.0"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/iv_user"
|
||||
app:layout_constraintVertical_bias="0.02">
|
||||
app:layout_constraintHorizontal_bias="0.0"
|
||||
app:layout_constraintStart_toStartOf="@+id/cl_input_note"
|
||||
app:layout_constraintTop_toBottomOf="@+id/tv_title_journal"
|
||||
app:layout_constraintVertical_bias="0.03">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_input_blood_pressure_SYS"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:fontFamily="@font/poppins_regular"
|
||||
android:text="Blood Pressure\n(SYS)"
|
||||
android:text="Blood Pressure\n(SYS) (mm/HG)"
|
||||
android:textAlignment="center"
|
||||
android:textColor="@color/Primary_Dark"
|
||||
android:textSize="8sp"
|
||||
@ -70,44 +57,39 @@
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<com.google.android.material.textfield.TextInputLayout
|
||||
android:id="@+id/tl_input_blood_pressure_SYS"
|
||||
<EditText
|
||||
android:id="@+id/edt_input_blood_pressure_SYS"
|
||||
android:layout_width="60dp"
|
||||
android:layout_height="25dp"
|
||||
android:layout_height="24dp"
|
||||
android:background="@drawable/bg_input_box"
|
||||
android:inputType="number"
|
||||
android:textColor="@color/black"
|
||||
android:textSize="12sp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/tv_input_blood_pressure_SYS">
|
||||
app:layout_constraintEnd_toEndOf="@+id/tv_input_blood_pressure_SYS"
|
||||
app:layout_constraintStart_toStartOf="@+id/tv_input_blood_pressure_SYS"
|
||||
app:layout_constraintTop_toBottomOf="@id/tv_input_blood_pressure_SYS" />
|
||||
|
||||
<EditText
|
||||
android:id="@+id/edt_input_blood_pressure_SYS"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/white"
|
||||
android:inputType="number" />
|
||||
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:id="@+id/cl_input_blood_pressure_DIA"
|
||||
android:layout_width="80dp"
|
||||
android:layout_height="80dp"
|
||||
android:padding="5dp"
|
||||
android:background="@drawable/bg_input"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintHorizontal_bias="0.6"
|
||||
android:padding="5dp"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/cl_input_blood_pressure_SYS"
|
||||
app:layout_constraintEnd_toEndOf="@+id/cl_input_note"
|
||||
app:layout_constraintHorizontal_bias="0.906"
|
||||
app:layout_constraintStart_toEndOf="@+id/cl_input_blood_pressure_SYS"
|
||||
app:layout_constraintTop_toBottomOf="@id/iv_user"
|
||||
app:layout_constraintVertical_bias="0.019">
|
||||
app:layout_constraintTop_toTopOf="@+id/cl_input_blood_pressure_SYS">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_input_blood_pressure_DIA"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:fontFamily="@font/poppins_regular"
|
||||
android:text="Blood Pressure\n(DIA)"
|
||||
android:text="Blood Pressure\n(DIA) (mm/HG)"
|
||||
android:textAlignment="center"
|
||||
android:textColor="@color/Primary_Dark"
|
||||
android:textSize="8sp"
|
||||
@ -116,46 +98,39 @@
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<com.google.android.material.textfield.TextInputLayout
|
||||
android:id="@+id/tl_input_blood_pressure_DIA"
|
||||
<EditText
|
||||
android:id="@+id/edt_input_blood_pressure_DIA"
|
||||
android:layout_width="60dp"
|
||||
android:layout_height="25dp"
|
||||
android:layout_marginHorizontal="24dp"
|
||||
android:layout_height="24dp"
|
||||
android:background="@drawable/bg_input_box"
|
||||
android:inputType="number"
|
||||
android:textColor="@color/black"
|
||||
android:textSize="12sp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/tv_input_blood_pressure_DIA">
|
||||
app:layout_constraintEnd_toEndOf="@+id/tv_input_blood_pressure_DIA"
|
||||
app:layout_constraintStart_toStartOf="@+id/tv_input_blood_pressure_DIA"
|
||||
app:layout_constraintTop_toBottomOf="@+id/tv_input_blood_pressure_DIA" />
|
||||
|
||||
<EditText
|
||||
android:id="@+id/edt_input_blood_pressure_DIA"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/white"
|
||||
android:inputType="number" />
|
||||
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:id="@+id/cl_input_blood_sugar"
|
||||
android:layout_width="80dp"
|
||||
android:layout_height="80dp"
|
||||
android:padding="5dp"
|
||||
android:background="@drawable/bg_input"
|
||||
android:padding="5dp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintEnd_toStartOf="@+id/iv_user"
|
||||
app:layout_constraintEnd_toEndOf="@+id/cl_input_blood_pressure_SYS"
|
||||
app:layout_constraintHorizontal_bias="1.0"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintStart_toStartOf="@+id/cl_input_note"
|
||||
app:layout_constraintTop_toBottomOf="@+id/cl_input_blood_pressure_SYS"
|
||||
app:layout_constraintVertical_bias="0.05">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_input_blood_sugar"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:fontFamily="@font/poppins_regular"
|
||||
android:text="Blood Sugar \nLevel"
|
||||
android:text="Blood Sugar \nLevel (mg/dL)"
|
||||
android:textAlignment="center"
|
||||
android:textColor="@color/Primary_Dark"
|
||||
android:textSize="8sp"
|
||||
@ -164,44 +139,39 @@
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<com.google.android.material.textfield.TextInputLayout
|
||||
android:id="@+id/tl_input_blood_sugar"
|
||||
<EditText
|
||||
android:id="@+id/edt_input_blood_sugar"
|
||||
android:layout_width="60dp"
|
||||
android:layout_height="25dp"
|
||||
android:layout_height="24dp"
|
||||
android:background="@drawable/bg_input_box"
|
||||
android:inputType="number"
|
||||
android:textColor="@color/black"
|
||||
android:textSize="12sp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/tv_input_blood_sugar">
|
||||
|
||||
<EditText
|
||||
android:id="@+id/edt_input_blood_sugar"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/white"
|
||||
android:inputType="number" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
app:layout_constraintEnd_toEndOf="@+id/tv_input_blood_sugar"
|
||||
app:layout_constraintStart_toStartOf="@+id/tv_input_blood_sugar"
|
||||
app:layout_constraintTop_toBottomOf="@+id/tv_input_blood_sugar" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:id="@+id/cl_input_weight"
|
||||
android:layout_width="80dp"
|
||||
android:layout_height="80dp"
|
||||
android:padding="5dp"
|
||||
android:background="@drawable/bg_input"
|
||||
android:padding="5dp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintHorizontal_bias="0.6"
|
||||
app:layout_constraintEnd_toEndOf="@+id/cl_input_note"
|
||||
app:layout_constraintHorizontal_bias="0.914"
|
||||
app:layout_constraintStart_toEndOf="@+id/cl_input_blood_pressure_SYS"
|
||||
app:layout_constraintTop_toBottomOf="@id/cl_input_blood_pressure_DIA"
|
||||
app:layout_constraintVertical_bias="0.05">
|
||||
app:layout_constraintVertical_bias="0.048">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_input_weight"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="8dp"
|
||||
android:fontFamily="@font/poppins_regular"
|
||||
android:text="Weight"
|
||||
android:text="Weight\n(kg)"
|
||||
android:textAlignment="center"
|
||||
android:textColor="@color/Primary_Dark"
|
||||
android:textSize="8sp"
|
||||
@ -210,50 +180,48 @@
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<com.google.android.material.textfield.TextInputLayout
|
||||
android:id="@+id/tl_input_weight"
|
||||
<EditText
|
||||
android:id="@+id/edt_input_weight"
|
||||
android:layout_width="60dp"
|
||||
android:layout_height="25dp"
|
||||
android:layout_marginTop="4dp"
|
||||
android:layout_height="24dp"
|
||||
android:background="@drawable/bg_input_box"
|
||||
android:inputType="number"
|
||||
android:textColor="@color/black"
|
||||
android:textSize="12sp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="@+id/tv_input_weight"
|
||||
app:layout_constraintStart_toStartOf="@+id/tv_input_weight"
|
||||
app:layout_constraintTop_toBottomOf="@+id/tv_input_weight" />
|
||||
|
||||
<EditText
|
||||
android:id="@+id/edt_gender"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="20dp"
|
||||
android:background="@color/white"
|
||||
android:visibility="gone"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/tv_input_weight">
|
||||
app:layout_constraintStart_toStartOf="parent" />
|
||||
|
||||
<EditText
|
||||
android:id="@+id/edt_input_weight"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/white"
|
||||
android:inputType="number" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<EditText
|
||||
android:id="@+id/edt_gender"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="20dp"
|
||||
android:visibility="gone"
|
||||
android:background="@color/white"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintBottom_toBottomOf="parent"/>
|
||||
<EditText
|
||||
android:id="@+id/edt_age"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="20dp"
|
||||
android:visibility="gone"
|
||||
android:background="@color/white"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintBottom_toBottomOf="parent"/>
|
||||
android:id="@+id/edt_age"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="20dp"
|
||||
android:background="@color/white"
|
||||
android:visibility="gone"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent" />
|
||||
|
||||
<EditText
|
||||
android:id="@+id/edt_height"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="20dp"
|
||||
android:visibility="gone"
|
||||
android:background="@color/white"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintBottom_toBottomOf="parent"/>
|
||||
android:id="@+id/edt_height"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="20dp"
|
||||
android:background="@color/white"
|
||||
android:visibility="gone"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
@ -282,23 +250,21 @@
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<com.google.android.material.textfield.TextInputLayout
|
||||
android:id="@+id/tl_input_note"
|
||||
<EditText
|
||||
android:id="@+id/edt_input_note"
|
||||
android:layout_width="200dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="4dp"
|
||||
android:layout_height="155dp"
|
||||
android:background="@drawable/bg_input_box"
|
||||
android:gravity="start|top"
|
||||
android:imeOptions="actionDone"
|
||||
android:inputType="textMultiLine|textCapSentences"
|
||||
android:maxLines="10"
|
||||
android:minLines="4"
|
||||
android:overScrollMode="always"
|
||||
android:scrollbars="vertical"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/tv_input_note">
|
||||
|
||||
<EditText
|
||||
android:id="@+id/edt_input_note"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="text"
|
||||
android:background="@color/white" />
|
||||
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
app:layout_constraintTop_toBottomOf="@+id/tv_input_note" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
<com.google.android.material.button.MaterialButton
|
||||
@ -315,6 +281,5 @@
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent" />
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
Reference in New Issue
Block a user