smiuser/hpos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

Merge

Browse Source
This commit is contained in:
Pritimay Sarkar
2023-08-03 23:04:59 +05:30
parent 547b5d8663 3daba2fbb1
commit 1b893c5730
3 changed files with 110 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt
View File

@@ -136,6 +136,9 @@ class HemoCubeFragment : Fragment() {
binding.btnSubmit.isEnabled = true
binding.btnSubmit.isClickable = true
binding.btnBuffer.setOnClickListener {
startBuffer()
}
}
private fun listenToHemoCube() {

33
app/src/main/res/layout/fragment_hemo_cube_reference.xml
View File

@@ -3,14 +3,11 @@
xmlns:tools="http://schemas.android.com/tools"
tools:context="com.example.hpostesting.presentation.hemocube.HemoCubeFragment">
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="match_parent">
<TextView
android:id="@+id/tv_title"
@@ -50,12 +47,12 @@
<TextView
android:id="@+id/tv_subtitle4"
style="@style/title1_1"
android:gravity="center"
android:textColor="@color/red"
android:layout_width="0dp"
android:layout_height="80dp"
android:layout_marginHorizontal="24dp"
android:layout_marginTop="16dp"
android:gravity="center"
android:textColor="@color/red"
android:textSize="22sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -74,6 +71,28 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_subtitle4" />
<Button
android:id="@+id/btn_kit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/new_kit"
android:textColor="@color/white"
android:layout_margin="10dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/btn_buffer" />
<Button
android:id="@+id/btn_buffer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/new_buffer"
android:textColor="@color/white"
android:layout_margin="10dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/btn_kit"/>
<!-- <Button-->
<!-- android:id="@+id/btn_read"-->
<!-- android:layout_width="wrap_content"-->
@@ -103,6 +122,4 @@
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
</layout>

2
app/src/main/res/values/strings.xml
View File

@@ -110,6 +110,8 @@
<string name="sickle_cert">Sickle Cert</string>
<string name="sickle_find">Sickle Find</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="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>