Updated UI
This commit is contained in:
9
.idea/misc.xml
generated
9
.idea/misc.xml
generated
@@ -3,15 +3,20 @@
|
|||||||
<component name="DesignSurface">
|
<component name="DesignSurface">
|
||||||
<option name="filePathToZoomLevelMap">
|
<option name="filePathToZoomLevelMap">
|
||||||
<map>
|
<map>
|
||||||
|
<entry key="app/src/main/res/drawable/ic_baseline_check_circle_24.xml" value="0.243" />
|
||||||
|
<entry key="app/src/main/res/drawable/ic_baseline_file_download_24.xml" value="0.243" />
|
||||||
|
<entry key="app/src/main/res/drawable/ic_baseline_home_24.xml" value="0.243" />
|
||||||
|
<entry key="app/src/main/res/drawable/ic_baseline_new_label_24.xml" value="0.243" />
|
||||||
<entry key="app/src/main/res/drawable/progressbar_drawable.xml" value="0.1885" />
|
<entry key="app/src/main/res/drawable/progressbar_drawable.xml" value="0.1885" />
|
||||||
|
<entry key="app/src/main/res/drawable/result_background_green.xml" value="0.243" />
|
||||||
<entry key="app/src/main/res/font/inter_bold.xml" value="0.33487179487179486" />
|
<entry key="app/src/main/res/font/inter_bold.xml" value="0.33487179487179486" />
|
||||||
<entry key="app/src/main/res/layout/activity_main.xml" value="0.25" />
|
<entry key="app/src/main/res/layout/activity_main.xml" value="0.25" />
|
||||||
<entry key="app/src/main/res/layout/activity_splash.xml" value="0.24375" />
|
<entry key="app/src/main/res/layout/activity_splash.xml" value="0.24375" />
|
||||||
<entry key="app/src/main/res/layout/activity_test_right.xml" value="0.24375" />
|
<entry key="app/src/main/res/layout/activity_test_right.xml" value="0.24375" />
|
||||||
<entry key="app/src/main/res/layout/fragment_test_right_exp_reference.xml" value="0.2972222222222222" />
|
<entry key="app/src/main/res/layout/fragment_test_right_exp_reference.xml" value="0.2972222222222222" />
|
||||||
<entry key="app/src/main/res/layout/fragment_test_right_exp_sample.xml" value="0.2296875" />
|
<entry key="app/src/main/res/layout/fragment_test_right_exp_sample.xml" value="0.25" />
|
||||||
<entry key="app/src/main/res/layout/fragment_test_right_process.xml" value="0.24375" />
|
<entry key="app/src/main/res/layout/fragment_test_right_process.xml" value="0.24375" />
|
||||||
<entry key="app/src/main/res/layout/fragment_test_right_results.xml" value="0.2972222222222222" />
|
<entry key="app/src/main/res/layout/fragment_test_right_results.xml" value="0.33" />
|
||||||
<entry key="app/src/main/res/layout/table_item.xml" value="0.22407407407407406" />
|
<entry key="app/src/main/res/layout/table_item.xml" value="0.22407407407407406" />
|
||||||
</map>
|
</map>
|
||||||
</option>
|
</option>
|
||||||
|
|||||||
@@ -51,19 +51,20 @@
|
|||||||
android:layout_margin="16dp"
|
android:layout_margin="16dp"
|
||||||
android:clickable="false"
|
android:clickable="false"
|
||||||
android:text="@string/set_reference"
|
android:text="@string/set_reference"
|
||||||
|
android:textColor="@color/white"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@id/tv_subtitle2" />
|
app:layout_constraintTop_toBottomOf="@id/tv_subtitle2" />
|
||||||
|
|
||||||
<Button
|
<!-- <Button-->
|
||||||
android:id="@+id/btn_read"
|
<!-- android:id="@+id/btn_read"-->
|
||||||
android:layout_width="wrap_content"
|
<!-- android:layout_width="wrap_content"-->
|
||||||
android:layout_height="wrap_content"
|
<!-- android:layout_height="wrap_content"-->
|
||||||
android:text="@string/read"
|
<!-- android:text="@string/read"-->
|
||||||
android:layout_margin="16dp"
|
<!-- android:layout_margin="16dp"-->
|
||||||
android:clickable="false"
|
<!-- android:clickable="false"-->
|
||||||
app:layout_constraintTop_toBottomOf="@id/btn_set_reference"
|
<!-- app:layout_constraintTop_toBottomOf="@id/btn_set_reference"-->
|
||||||
app:layout_constraintStart_toStartOf="parent" />
|
<!-- app:layout_constraintStart_toStartOf="parent" />-->
|
||||||
|
|
||||||
<ProgressBar
|
<ProgressBar
|
||||||
android:id="@+id/progressBar"
|
android:id="@+id/progressBar"
|
||||||
|
|||||||
@@ -69,7 +69,7 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_margin="16dp"
|
android:layout_margin="16dp"
|
||||||
android:drawablePadding="8dp"
|
android:drawablePadding="8dp"
|
||||||
android:text="@string/enter_sample_details"
|
android:text="@string/enter_patient_details"
|
||||||
app:drawableStartCompat="@drawable/ic_baseline_create_24"
|
app:drawableStartCompat="@drawable/ic_baseline_create_24"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="parent" />
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
@@ -80,7 +80,7 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_margin="16dp"
|
android:layout_margin="16dp"
|
||||||
android:hint="@string/sample_name"
|
android:hint="@string/patient_name"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@id/tv_title_sample">
|
app:layout_constraintTop_toBottomOf="@id/tv_title_sample">
|
||||||
@@ -191,7 +191,7 @@
|
|||||||
android:layout_marginHorizontal="16dp"
|
android:layout_marginHorizontal="16dp"
|
||||||
android:layout_marginTop="24dp"
|
android:layout_marginTop="24dp"
|
||||||
android:clickable="false"
|
android:clickable="false"
|
||||||
android:text="@string/acquire"
|
android:text="@string/start_now"
|
||||||
android:textColor="@color/white"
|
android:textColor="@color/white"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
@@ -215,6 +215,7 @@
|
|||||||
android:indeterminate="true"
|
android:indeterminate="true"
|
||||||
android:indeterminateDrawable="@drawable/progressbar_drawable"
|
android:indeterminateDrawable="@drawable/progressbar_drawable"
|
||||||
android:visibility="gone"
|
android:visibility="gone"
|
||||||
|
android:elevation="12dp"
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
|||||||
@@ -39,9 +39,9 @@
|
|||||||
|
|
||||||
|
|
||||||
<string name="acquire">Acquire</string>
|
<string name="acquire">Acquire</string>
|
||||||
<string name="enter_sample_details">Enter Sample Details</string>
|
<string name="enter_patient_details">Enter Patient Details</string>
|
||||||
<string name="sample_name">Sample Name</string>
|
<string name="patient_name">Patient Name</string>
|
||||||
<string name="age">Age</string>
|
<string name="age">Age in years</string>
|
||||||
<string name="gender">Gender</string>
|
<string name="gender">Gender</string>
|
||||||
<string name="name_error">Name can\'t be empty</string>
|
<string name="name_error">Name can\'t be empty</string>
|
||||||
<string name="age_error">Age can\'t be empty</string>
|
<string name="age_error">Age can\'t be empty</string>
|
||||||
@@ -57,5 +57,6 @@
|
|||||||
<string name="download_report">Download\nReport</string>
|
<string name="download_report">Download\nReport</string>
|
||||||
<string name="home">Home</string>
|
<string name="home">Home</string>
|
||||||
<string name="new_test">New Test</string>
|
<string name="new_test">New Test</string>
|
||||||
|
<string name="start_now">Start Now</string>
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
Reference in New Issue
Block a user