From 2b1f8a07aebced8c38f5d02f9c5ddeb0c424ff75 Mon Sep 17 00:00:00 2001 From: Pritimay Sarkar Date: Mon, 23 Oct 2023 05:04:03 +0530 Subject: [PATCH] fix display of name and user id in testing screen - show name and sample id while testing - hide the same in buffer check - change bg color after classification --- .../buffercheck/HemoCubeBufferCheckFragment.kt | 1 + .../hpostesting/presentation/hemocube/HemoCubeFragment.kt | 2 ++ app/src/main/res/layout/fragment_hemo_cube_reference.xml | 8 ++++++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/example/hpostesting/presentation/buffercheck/HemoCubeBufferCheckFragment.kt b/app/src/main/java/com/example/hpostesting/presentation/buffercheck/HemoCubeBufferCheckFragment.kt index b5a10ef..d4c473e 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/buffercheck/HemoCubeBufferCheckFragment.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/buffercheck/HemoCubeBufferCheckFragment.kt @@ -64,6 +64,7 @@ class HemoCubeBufferCheckFragment : Fragment() { binding.nameEditText.setText("SMI/SC/") binding.tvTitle.visibility = View.GONE + binding.tvName.visibility = View.GONE binding.btnGo.setOnClickListener { val serialNumber = binding.nameEditText.text.toString().trim() diff --git a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt index 58492a7..7b9ae8b 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt @@ -3,6 +3,7 @@ package com.example.hpostesting.presentation.hemocube import android.content.Context import android.content.Intent import android.content.SharedPreferences +import android.graphics.Color import android.os.Bundle import android.util.Log import android.view.LayoutInflater @@ -408,6 +409,7 @@ class HemoCubeFragment : Fragment() { binding.btnSubmit.visibility = View.VISIBLE binding.btnSubmit.isEnabled = true binding.btnSubmit.isClickable = true + binding.clParent.setBackgroundColor(Color.parseColor("#edfffd")) } } } diff --git a/app/src/main/res/layout/fragment_hemo_cube_reference.xml b/app/src/main/res/layout/fragment_hemo_cube_reference.xml index d0ab1bf..7713f9a 100644 --- a/app/src/main/res/layout/fragment_hemo_cube_reference.xml +++ b/app/src/main/res/layout/fragment_hemo_cube_reference.xml @@ -44,12 +44,16 @@ @@ -60,7 +64,7 @@ android:layout_width="0dp" android:layout_height="80dp" android:layout_marginHorizontal="24dp" - android:layout_marginTop="16dp" + android:layout_marginTop="72dp" android:gravity="center" android:textColor="@color/red" android:textSize="18sp"