Added Kit and Buffer Button
This commit is contained in:
@@ -154,6 +154,10 @@ class HemoCubeFragment : Fragment() {
|
|||||||
).show()
|
).show()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
binding.btnBuffer.setOnClickListener {
|
||||||
|
startBuffer()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun listenToHemoCube() {
|
private fun listenToHemoCube() {
|
||||||
|
|||||||
@@ -3,106 +3,123 @@
|
|||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
tools:context="com.example.hpostesting.presentation.hemocube.HemoCubeFragment">
|
tools:context="com.example.hpostesting.presentation.hemocube.HemoCubeFragment">
|
||||||
|
|
||||||
<ScrollView
|
|
||||||
|
<androidx.constraintlayout.widget.ConstraintLayout
|
||||||
|
android:id="@+id/cl_parent"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent">
|
android:layout_height="match_parent">
|
||||||
|
|
||||||
<androidx.constraintlayout.widget.ConstraintLayout
|
<TextView
|
||||||
android:id="@+id/cl_parent"
|
android:id="@+id/tv_title"
|
||||||
android:layout_width="match_parent"
|
style="@style/title1"
|
||||||
android:layout_height="wrap_content">
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginHorizontal="24dp"
|
||||||
|
android:layout_marginTop="16dp"
|
||||||
|
android:text="@string/Instructions"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/tv_title"
|
android:id="@+id/tv_subtitle2"
|
||||||
style="@style/title1"
|
style="@style/title2"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="0dp"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginHorizontal="24dp"
|
android:layout_marginHorizontal="24dp"
|
||||||
android:layout_marginTop="16dp"
|
android:layout_marginTop="16dp"
|
||||||
android:text="@string/Instructions"
|
android:text="@string/step4"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="parent" />
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/tv_title" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/tv_subtitle2"
|
android:id="@+id/tv_subtitle3"
|
||||||
style="@style/title2"
|
style="@style/title2"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginHorizontal="24dp"
|
android:layout_marginHorizontal="24dp"
|
||||||
android:layout_marginTop="16dp"
|
android:layout_marginTop="16dp"
|
||||||
android:text="@string/step4"
|
android:text="@string/step5"
|
||||||
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" />
|
app:layout_constraintTop_toBottomOf="@id/tv_subtitle2" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/tv_subtitle3"
|
android:id="@+id/tv_subtitle4"
|
||||||
style="@style/title2"
|
style="@style/title1_1"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="80dp"
|
||||||
android:layout_marginHorizontal="24dp"
|
android:layout_marginHorizontal="24dp"
|
||||||
android:layout_marginTop="16dp"
|
android:layout_marginTop="16dp"
|
||||||
android:text="@string/step5"
|
android:gravity="center"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
android:textColor="@color/red"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
android:textSize="22sp"
|
||||||
app:layout_constraintTop_toBottomOf="@id/tv_subtitle2" />
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/tv_subtitle3" />
|
||||||
|
|
||||||
<TextView
|
<Button
|
||||||
android:id="@+id/tv_subtitle4"
|
android:id="@+id/btn_submit"
|
||||||
style="@style/title1_1"
|
android:layout_width="216dp"
|
||||||
android:gravity="center"
|
android:layout_height="wrap_content"
|
||||||
android:textColor="@color/red"
|
android:layout_marginHorizontal="16dp"
|
||||||
android:layout_width="0dp"
|
android:layout_marginTop="24dp"
|
||||||
android:layout_height="80dp"
|
android:clickable="false"
|
||||||
android:layout_marginHorizontal="24dp"
|
android:text="@string/submit"
|
||||||
android:layout_marginTop="16dp"
|
android:textColor="@color/white"
|
||||||
android:textSize="22sp"
|
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_subtitle4" />
|
||||||
app:layout_constraintTop_toBottomOf="@id/tv_subtitle3" />
|
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/btn_submit"
|
android:id="@+id/btn_kit"
|
||||||
android:layout_width="216dp"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginHorizontal="16dp"
|
android:text="@string/new_kit"
|
||||||
android:layout_marginTop="24dp"
|
android:textColor="@color/white"
|
||||||
android:clickable="false"
|
android:layout_margin="10dp"
|
||||||
android:text="@string/submit"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
android:textColor="@color/white"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintStart_toEndOf="@+id/btn_buffer" />
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toBottomOf="@id/tv_subtitle4" />
|
|
||||||
|
|
||||||
<!-- <Button-->
|
<Button
|
||||||
<!-- android:id="@+id/btn_read"-->
|
android:id="@+id/btn_buffer"
|
||||||
<!-- 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/new_buffer"
|
||||||
<!-- android:layout_margin="16dp"-->
|
android:textColor="@color/white"
|
||||||
<!-- android:clickable="false"-->
|
android:layout_margin="10dp"
|
||||||
<!-- app:layout_constraintTop_toBottomOf="@id/btn_set_reference"-->
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
<!-- app:layout_constraintStart_toStartOf="parent" />-->
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintEnd_toStartOf="@id/btn_kit"/>
|
||||||
|
|
||||||
<!-- </androidx.constraintlayout.widget.ConstraintLayout>-->
|
<!-- <Button-->
|
||||||
|
<!-- android:id="@+id/btn_read"-->
|
||||||
|
<!-- android:layout_width="wrap_content"-->
|
||||||
|
<!-- android:layout_height="wrap_content"-->
|
||||||
|
<!-- android:text="@string/read"-->
|
||||||
|
<!-- android:layout_margin="16dp"-->
|
||||||
|
<!-- android:clickable="false"-->
|
||||||
|
<!-- app:layout_constraintTop_toBottomOf="@id/btn_set_reference"-->
|
||||||
|
<!-- app:layout_constraintStart_toStartOf="parent" />-->
|
||||||
|
|
||||||
<ProgressBar
|
<!-- </androidx.constraintlayout.widget.ConstraintLayout>-->
|
||||||
android:id="@+id/progressBar"
|
|
||||||
android:layout_width="wrap_content"
|
<ProgressBar
|
||||||
android:layout_height="wrap_content"
|
android:id="@+id/progressBar"
|
||||||
android:layout_centerInParent="true"
|
android:layout_width="wrap_content"
|
||||||
android:elevation="12dp"
|
android:layout_height="wrap_content"
|
||||||
android:indeterminate="true"
|
android:layout_centerInParent="true"
|
||||||
android:indeterminateDrawable="@drawable/progressbar_drawable"
|
android:elevation="12dp"
|
||||||
android:visibility="gone"
|
android:indeterminate="true"
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
android:indeterminateDrawable="@drawable/progressbar_drawable"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
android:visibility="gone"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="parent" />
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
|
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
|
|
||||||
</ScrollView>
|
|
||||||
|
|
||||||
</layout>
|
</layout>
|
||||||
@@ -110,6 +110,8 @@
|
|||||||
<string name="sickle_cert">Sickle Cert</string>
|
<string name="sickle_cert">Sickle Cert</string>
|
||||||
<string name="sickle_find">Sickle Find</string>
|
<string name="sickle_find">Sickle Find</string>
|
||||||
<string name="submit">Submit</string>
|
<string name="submit">Submit</string>
|
||||||
|
<string name="new_kit">New Kit</string>
|
||||||
|
<string name="new_buffer">New Buffer</string>
|
||||||
<string name="name_error_2">Invalid character, Allowed characters are Letters, Numbers and ( ) _ - , . only</string>
|
<string name="name_error_2">Invalid character, Allowed characters are Letters, Numbers and ( ) _ - , . only</string>
|
||||||
<string name="recommended">\*Result to be confirmed with laboratory test</string>
|
<string name="recommended">\*Result to be confirmed with laboratory test</string>
|
||||||
<string name="recommended_age">\*Result to be confirmed with laboratory test as age of the patient is less than 5 years</string>
|
<string name="recommended_age">\*Result to be confirmed with laboratory test as age of the patient is less than 5 years</string>
|
||||||
|
|||||||
Reference in New Issue
Block a user