Updates in results page, calculation methods & more. (working)
This commit is contained in:
@@ -5,6 +5,7 @@
|
||||
tools:context=".presentation.testRight.TestRightExpReference">
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:id="@+id/cl_parent"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
|
||||
|
||||
@@ -91,14 +91,15 @@
|
||||
app:layout_constraintTop_toBottomOf="@id/line" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_result_value"
|
||||
android:id="@+id/result_normal"
|
||||
style="@style/title3"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginHorizontal="16dp"
|
||||
android:background="@drawable/result_background_green"
|
||||
android:drawablePadding="4dp"
|
||||
android:text="@string/negative"
|
||||
android:text="@string/normal"
|
||||
android:visibility="gone"
|
||||
app:drawableStartCompat="@drawable/ic_baseline_check_circle_24"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/tv_result"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
@@ -106,37 +107,89 @@
|
||||
app:layout_constraintStart_toEndOf="@+id/tv_result"
|
||||
app:layout_constraintTop_toTopOf="@+id/tv_result" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/result_disease"
|
||||
style="@style/title3"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginHorizontal="16dp"
|
||||
android:background="@drawable/result_background_red"
|
||||
android:drawablePadding="4dp"
|
||||
android:visibility="gone"
|
||||
android:text="@string/sickle_cell_disease"
|
||||
app:drawableStartCompat="@drawable/ic_baseline_cancel_24"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/tv_result"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintHorizontal_bias="1"
|
||||
app:layout_constraintStart_toEndOf="@+id/tv_result"
|
||||
app:layout_constraintTop_toTopOf="@+id/tv_result" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/result_trait"
|
||||
style="@style/title3"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginHorizontal="16dp"
|
||||
android:background="@drawable/result_background_red"
|
||||
android:drawablePadding="4dp"
|
||||
android:visibility="gone"
|
||||
android:text="@string/sickle_cell_trait"
|
||||
app:drawableStartCompat="@drawable/ic_baseline_cancel_24"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/tv_result"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintHorizontal_bias="1"
|
||||
app:layout_constraintStart_toEndOf="@+id/tv_result"
|
||||
app:layout_constraintTop_toTopOf="@+id/tv_result" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/result_undefined"
|
||||
style="@style/title3"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginHorizontal="16dp"
|
||||
android:background="@drawable/result_background_yellow"
|
||||
android:drawablePadding="4dp"
|
||||
android:visibility="gone"
|
||||
android:text="@string/undefined"
|
||||
app:drawableStartCompat="@drawable/ic_baseline_circle_24"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/tv_result"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintHorizontal_bias="1"
|
||||
app:layout_constraintStart_toEndOf="@+id/tv_result"
|
||||
app:layout_constraintTop_toTopOf="@+id/tv_result" />
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
</com.google.android.material.card.MaterialCardView>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/iv_download"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="42dp"
|
||||
android:layout_marginStart="24dp"
|
||||
android:src="@drawable/ic_baseline_file_download_24"
|
||||
app:layout_constraintStart_toStartOf="@id/cv_sample_details"
|
||||
app:layout_constraintTop_toBottomOf="@id/cv_sample_details" />
|
||||
<!-- <ImageView-->
|
||||
<!-- android:id="@+id/iv_download"-->
|
||||
<!-- android:layout_width="wrap_content"-->
|
||||
<!-- android:layout_height="wrap_content"-->
|
||||
<!-- android:layout_marginTop="42dp"-->
|
||||
<!-- android:layout_marginStart="24dp"-->
|
||||
<!-- android:src="@drawable/ic_baseline_file_download_24"-->
|
||||
<!-- app:layout_constraintStart_toStartOf="@id/cv_sample_details"-->
|
||||
<!-- app:layout_constraintTop_toBottomOf="@id/cv_sample_details" />-->
|
||||
|
||||
<TextView
|
||||
style="@style/title3"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/download_report"
|
||||
android:textAlignment="center"
|
||||
android:textColor="@color/gray"
|
||||
app:layout_constraintEnd_toEndOf="@id/iv_download"
|
||||
app:layout_constraintStart_toStartOf="@id/iv_download"
|
||||
app:layout_constraintTop_toBottomOf="@id/iv_download" />
|
||||
<!-- <TextView-->
|
||||
<!-- style="@style/title3"-->
|
||||
<!-- android:layout_width="wrap_content"-->
|
||||
<!-- android:layout_height="wrap_content"-->
|
||||
<!-- android:text="@string/download_report"-->
|
||||
<!-- android:textAlignment="center"-->
|
||||
<!-- android:textColor="@color/gray"-->
|
||||
<!-- app:layout_constraintEnd_toEndOf="@id/iv_download"-->
|
||||
<!-- app:layout_constraintStart_toStartOf="@id/iv_download"-->
|
||||
<!-- app:layout_constraintTop_toBottomOf="@id/iv_download" />-->
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/iv_home"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="42dp"
|
||||
android:layout_marginEnd="16dp"
|
||||
android:src="@drawable/ic_baseline_home_24"
|
||||
app:layout_constraintStart_toEndOf="@id/iv_download"
|
||||
app:layout_constraintStart_toStartOf="@id/cv_sample_details"
|
||||
app:layout_constraintEnd_toStartOf="@id/iv_next"
|
||||
app:layout_constraintTop_toBottomOf="@id/cv_sample_details" />
|
||||
|
||||
@@ -158,7 +211,9 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="42dp"
|
||||
android:layout_marginEnd="24dp"
|
||||
android:layout_marginStart="16dp"
|
||||
android:src="@drawable/ic_baseline_new_label_24"
|
||||
app:layout_constraintStart_toEndOf="@id/iv_home"
|
||||
app:layout_constraintEnd_toEndOf="@id/cv_sample_details"
|
||||
app:layout_constraintTop_toBottomOf="@id/cv_sample_details" />
|
||||
|
||||
|
||||
Reference in New Issue
Block a user