diff --git a/app/build.gradle b/app/build.gradle index 7f7f01a..7025e23 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,7 +14,7 @@ android { namespace 'in.sminnovations.hpostesting' defaultConfig { - applicationId "in.sminnovations.hpostesting" + applicationId "in.sminnovations.hpostesting.prod" minSdk 21 targetSdk 33 versionCode 2 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 80f620b..9f3cf73 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -13,6 +13,8 @@ + + diff --git a/app/src/main/java/com/example/hpostesting/data/DataHolder.kt b/app/src/main/java/com/example/hpostesting/data/DataHolder.kt index 894ba2e..f63864b 100644 --- a/app/src/main/java/com/example/hpostesting/data/DataHolder.kt +++ b/app/src/main/java/com/example/hpostesting/data/DataHolder.kt @@ -1,7 +1,6 @@ package com.example.hpostesting.data import androidx.lifecycle.MutableLiveData -import com.example.hpostesting.data.model.patient.HemoCubeTestData import com.example.hpostesting.data.model.patient.UserData import com.example.hpostesting.data.model.test.TestRightDeviceConstants import com.example.hpostesting.data.model.test.TestType @@ -23,7 +22,12 @@ object DataHolder { val intensityReferenceArray = ArrayList() var selectedTest: UserData? = null var SelectTestType: HemoCubeTestData? = null + + var kitSerial: String = "" + var location: UserData.Location? = null var testExp: Boolean = true var hemocubeResult: Double? = null + + } \ No newline at end of file diff --git a/app/src/main/java/com/example/hpostesting/data/constant/Constants.kt b/app/src/main/java/com/example/hpostesting/data/constant/Constants.kt index 7d1ca63..fb47abb 100644 --- a/app/src/main/java/com/example/hpostesting/data/constant/Constants.kt +++ b/app/src/main/java/com/example/hpostesting/data/constant/Constants.kt @@ -36,26 +36,9 @@ object Constants { const val USER_ID = "usernameId" val STATICID = listOf( - "VIZ-1000-0001", - "VIZ-1000-0002", - "VIZ-1000-0003", "VIZ-1000-0004", "VIZ-1000-0005", "VIZ-1000-0006", - "VIZ-1000-0007", - "VIZ-1000-0008", - "VIZ-1000-0009", - "VIZ-1000-0010", - "VIZ-1000-0011", - "VIZ-1000-0012", - "VIZ-1000-0013", - "VIZ-1000-0014", - "VIZ-1000-0015", - "VIZ-1000-0016", - "VIZ-1000-0017", - "VIZ-1000-0018", - "VIZ-1000-0019" - ) const val password = "SMI@12345" diff --git a/app/src/main/java/com/example/hpostesting/presentation/KitScanActivity.kt b/app/src/main/java/com/example/hpostesting/presentation/KitScanActivity.kt index cbb412a..0c77c03 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/KitScanActivity.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/KitScanActivity.kt @@ -43,9 +43,12 @@ class KitScanActivity : AppCompatActivity() { setContentView(binding.root) if (DataHolder.sampleReadCounter <= Constants.MAXIMUM_TEST_ALLOWED_BEFORE_REFERENCE && DataHolder.isReferenceTaken){ + DataHolder.selectedTest!!.kitSerial = DataHolder.kitSerial moveToNext() } + binding.nameEditText.setText("SMI/SC/") + setSupportActionBar(binding.toolbar) binding.btnScanNow.setOnClickListener { @@ -56,7 +59,8 @@ class KitScanActivity : AppCompatActivity() { binding.btnGo.setOnClickListener { val serialNumber = binding.nameEditText.text.toString().trim() if (serialNumber.isNotEmpty() && checkDataNotNull() && isSerialValid(serialNumber)) { - DataHolder.selectedTest!!.kitSerial = binding.nameEditText.text.toString() + DataHolder.kitSerial = binding.nameEditText.text.toString() + DataHolder.selectedTest?.kitSerial = binding.nameEditText.text.toString() moveToNext() } else { Toast.makeText(this, "Invalid KIT Number", Toast.LENGTH_LONG).show() diff --git a/app/src/main/java/com/example/hpostesting/presentation/MainActivity.kt b/app/src/main/java/com/example/hpostesting/presentation/MainActivity.kt index d9e89fc..24908e3 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/MainActivity.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/MainActivity.kt @@ -65,7 +65,7 @@ class MainActivity : AppCompatActivity() { locationCallback = object : LocationCallback() { override fun onLocationResult(locationResult: LocationResult) { locationResult.lastLocation?.let { location -> - DataHolder.location = UserData.Location(location.latitude, location.longitude) + DataHolder.selectedTest!!.location = UserData.Location(location.latitude, location.longitude) Log.i("Location", DataHolder.location.toString()) } } @@ -97,6 +97,11 @@ class MainActivity : AppCompatActivity() { private fun checkAndUpdateUsbConnection() { val availableDrivers = UsbSerialProber.getDefaultProber() .findAllDrivers(getSystemService(Context.USB_SERVICE) as UsbManager) + if (availableDrivers.isNotEmpty() && availableDrivers[0].device.productId == Constants.DEVICE_PRODUCT_ID && availableDrivers[0].device.vendorId == Constants.DEVICE_VENDOR_ID) { + Log.d( + TAG, + "Device matched -> product = ${availableDrivers[0].device.productId}, vendor = ${availableDrivers[0].device.vendorId}" + ) // Log.d("mariya", availableDrivers[0].device.toString()) if (availableDrivers.isNotEmpty() && availableDrivers[0].device.productId == Constants.HOMO_CUBE_ID && availableDrivers[0].device.vendorId == Constants.VENDOR_ID) { Log.e("HomoCube", "product1") @@ -111,7 +116,10 @@ class MainActivity : AppCompatActivity() { Log.d(TAG, "Device matched -> product = ${availableDrivers[0].device.productId}, vendor = ${availableDrivers[0].device.vendorId}") DataHolder.usbConnected.value = true } else if (availableDrivers.isNotEmpty()) { - Log.d(TAG, "Device NOT matched -> product = ${availableDrivers[0].device.productId}, vendor = ${availableDrivers[0].device.vendorId}") + Log.d( + TAG, + "Device NOT matched -> product = ${availableDrivers[0].device.productId}, vendor = ${availableDrivers[0].device.vendorId}" + ) Toast.makeText(this, "Device Not Compatible", Toast.LENGTH_SHORT).show() DataHolder.usbConnected.value = false } else { @@ -136,9 +144,11 @@ class MainActivity : AppCompatActivity() { DataHolder.usbConnected.observe(this) { if (it) { - myMenu?.get(0)?.icon = ContextCompat.getDrawable(this, R.drawable.ic_baseline_usb_24) + myMenu?.get(0)?.icon = + ContextCompat.getDrawable(this, R.drawable.ic_baseline_usb_24) } else { - myMenu?.get(0)?.icon = ContextCompat.getDrawable(this, R.drawable.ic_baseline_usb_off_24) + myMenu?.get(0)?.icon = + ContextCompat.getDrawable(this, R.drawable.ic_baseline_usb_off_24) } } } @@ -155,14 +165,11 @@ class MainActivity : AppCompatActivity() { val coarseLocationPermissionRequestCode = 101 if (ContextCompat.checkSelfPermission( - this, - coarseLocationPermission + this, coarseLocationPermission ) != PackageManager.PERMISSION_GRANTED ) { ActivityCompat.requestPermissions( - this, - arrayOf(coarseLocationPermission), - coarseLocationPermissionRequestCode + this, arrayOf(coarseLocationPermission), coarseLocationPermissionRequestCode ) } else { getLocation() @@ -174,14 +181,11 @@ class MainActivity : AppCompatActivity() { val fineLocationPermissionRequestCode = 102 if (ContextCompat.checkSelfPermission( - this, - fineLocationPermission + this, fineLocationPermission ) != PackageManager.PERMISSION_GRANTED ) { ActivityCompat.requestPermissions( - this, - arrayOf(fineLocationPermission), - fineLocationPermissionRequestCode + this, arrayOf(fineLocationPermission), fineLocationPermissionRequestCode ) } else { getLocation() @@ -193,12 +197,9 @@ class MainActivity : AppCompatActivity() { val fineLocationPermission = Manifest.permission.ACCESS_FINE_LOCATION if (ActivityCompat.checkSelfPermission( - this, - coarseLocationPermission - ) != PackageManager.PERMISSION_GRANTED && - ActivityCompat.checkSelfPermission( - this, - fineLocationPermission + this, coarseLocationPermission + ) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission( + this, fineLocationPermission ) != PackageManager.PERMISSION_GRANTED ) { // Handle location permission request if needed @@ -208,16 +209,14 @@ class MainActivity : AppCompatActivity() { return } - fusedLocationClient.lastLocation - .addOnSuccessListener { location: Location? -> + fusedLocationClient.lastLocation.addOnSuccessListener { location: Location? -> location?.let { - DataHolder.location = UserData.Location(location.latitude, location.longitude) - Log.i("Location", DataHolder.location.toString()) + DataHolder.selectedTest!!.location = + UserData.Location(location.latitude, location.longitude) } ?: run { requestLocationUpdates() } - } - .addOnFailureListener { exception: Exception -> + }.addOnFailureListener { exception: Exception -> exception.printStackTrace() } } @@ -230,12 +229,9 @@ class MainActivity : AppCompatActivity() { } if (ActivityCompat.checkSelfPermission( - this, - Manifest.permission.ACCESS_COARSE_LOCATION - ) != PackageManager.PERMISSION_GRANTED && - ActivityCompat.checkSelfPermission( - this, - Manifest.permission.ACCESS_FINE_LOCATION + this, Manifest.permission.ACCESS_COARSE_LOCATION + ) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission( + this, Manifest.permission.ACCESS_FINE_LOCATION ) != PackageManager.PERMISSION_GRANTED ) { return @@ -254,9 +250,7 @@ class MainActivity : AppCompatActivity() { } override fun onRequestPermissionsResult( - requestCode: Int, - permissions: Array, - grantResults: IntArray + requestCode: Int, permissions: Array, grantResults: IntArray ) { super.onRequestPermissionsResult(requestCode, permissions, grantResults) when (requestCode) { @@ -266,16 +260,19 @@ class MainActivity : AppCompatActivity() { requestFineLocationPermission() } else { // Coarse location permission denied - Toast.makeText(this, "Coarse location permission denied", Toast.LENGTH_SHORT).show() + Toast.makeText(this, "Coarse location permission denied", Toast.LENGTH_SHORT) + .show() } } + 102 -> { if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) { // Fine location permission granted getLocation() } else { // Fine location permission denied - Toast.makeText(this, "Fine location permission denied", Toast.LENGTH_SHORT).show() + Toast.makeText(this, "Fine location permission denied", Toast.LENGTH_SHORT) + .show() } } } diff --git a/app/src/main/java/com/example/hpostesting/presentation/adapter/UserListAdapter.kt b/app/src/main/java/com/example/hpostesting/presentation/adapter/UserListAdapter.kt index 653b623..a291d6a 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/adapter/UserListAdapter.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/adapter/UserListAdapter.kt @@ -10,12 +10,16 @@ import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide import com.example.hpostesting.data.DataHolder import com.example.hpostesting.data.model.patient.UserData +import com.example.hpostesting.presentation.testRight.TestRightViewModel import com.firebase.ui.firestore.FirestoreRecyclerAdapter import com.firebase.ui.firestore.FirestoreRecyclerOptions import `in`.sminnovations.hpostesting.R import `in`.sminnovations.hpostesting.databinding.UserItemViewBinding -class UserListAdapter(options: FirestoreRecyclerOptions, private val view: View) : +class UserListAdapter( + options: FirestoreRecyclerOptions, + private val view: View +) : FirestoreRecyclerAdapter(options) { class OrderItemViewHolder(val binding: UserItemViewBinding) : diff --git a/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt b/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt index cf87c58..8c98654 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt @@ -5,7 +5,6 @@ import android.content.Context import android.content.DialogInterface import android.content.SharedPreferences import android.os.Bundle -import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -82,7 +81,14 @@ class HomeFragment : Fragment() { } } private fun loadUserData() { - val query = Firebase.firestore.collection("patientData") + val query = Firebase.firestore.collection("patientData").whereEqualTo("testStatus", false) + query.get().addOnSuccessListener { + if (it.documents.isEmpty()) { + binding.pendingTest.visibility = View.VISIBLE + } else { + binding.pendingTest.visibility = View.GONE + } + } val recyclerViewOptions = FirestoreRecyclerOptions.Builder().setQuery(query, UserData::class.java) .build() diff --git a/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightExpReference.kt b/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightExpReference.kt index f0406f0..2a20d43 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightExpReference.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightExpReference.kt @@ -52,6 +52,10 @@ class TestRightExpReference : Fragment() { Log.e("mariya", "onViewCreated 1") if (DataHolder.deviceType.equals(Constants.DEVICE_TYPE_HOMOCUBE) ) { Log.e("mariya", "onViewCreated if") + fetchHemoCubeResult() + Log.e("mariya", "onViewCreated 1") + if (DataHolder.deviceType.equals(Constants.DEVICE_TYPE_HOMOCUBE) ) { + Log.e("mariya", "onViewCreated if") // fetchHemoCubeResult() } // if (DataHolder.deviceConstant == null) { @@ -76,7 +80,8 @@ class TestRightExpReference : Fragment() { } override fun onClickPositiveButton() { - startTakingReference() +// startTakingReference() + fetchHemoCubeResult() } }) } @@ -118,6 +123,50 @@ class TestRightExpReference : Fragment() { // } } + // private fun sendCmdToFetchDeviceConstant(recursive: Boolean) { + private fun fetchHemoCubeResult() { + Log.d("mariya", "fetchHemoCubeResult() called") + + viewModel.progressBar.postValue(true) + val fullReadOutput = StringBuilder() + + (activity as TestRightActivity).mService.eventDrivenWrite2( + object : UsbServiceListener { + override fun onUsbRead(data: ByteArray?) { + Log.d("mariya", data.toString()) + data?.let { + val stringData = String(it) + fullReadOutput.append(stringData) + Log.d("mariya", "fullReadOutput = $fullReadOutput") + + if (stringData.contains("OK", true)) { + Log.d( + TAG, + "onUsbRead() called in sendCmdToFetchDeviceConstant() found OK" + ) + viewModel.mapDeviceConstants(fullReadOutput.toString()) + viewModel.progressBar.postValue(false) + } else if (stringData.contains("FINE", true)) { + Log.d(TAG, "results = FINE") + viewModel.progressBar.postValue(false) + + viewModel.errorTriggered.postValue(ErrorMessage("Please Try Again!!", Constants.ERROR_CRITICAL)) + + } + } + } + + override fun onUsbError(e: Exception?) { + Log.e(TAG, "onUsbIoError() called in sendCmdToFetchDeviceConstant() -> $e") + viewModel.errorTriggered.postValue(ErrorMessage("Please Try Again this step", Constants.ERROR_NORMAL)) + + viewModel.progressBar.postValue(false) + } + }) + } + + + // private fun sendCmdToFetchDeviceConstant(recursive: Boolean) { private fun sendCmdToFetchDeviceConstant() { Log.d(TAG, "sendCmdToFetchDeviceConstant() called") diff --git a/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightExpSample.kt b/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightExpSample.kt index bbfcb41..000ec30 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightExpSample.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightExpSample.kt @@ -79,18 +79,29 @@ class TestRightExpSample : Fragment() { // if (details != null) { // viewModel.patientDetails = details - UIUtils.createAlertDialog( - requireContext(), - getString(R.string.have_you_placed_sample), - getString(R.string.please_place_sample), - getString(R.string.no), - getString(R.string.yes_and_run), - object : MyDialogListener { - override fun onClickNegativeButton() {} - override fun onClickPositiveButton() { - startAcquiring() - } - }) + UIUtils.createAlertDialog( + requireContext(), + "WARNING", + "Please check if you have placed the sample of this person ${viewModel.testDetails?._id}", + getString(R.string.no), + "Yes", + object : MyDialogListener { + override fun onClickNegativeButton() {} + override fun onClickPositiveButton() { + UIUtils.createAlertDialog( + requireContext(), + getString(R.string.have_you_placed_sample), + getString(R.string.please_place_sample), + getString(R.string.no), + getString(R.string.yes_and_run), + object : MyDialogListener { + override fun onClickNegativeButton() {} + override fun onClickPositiveButton() { + startAcquiring() + } + }) + } + }) // } } diff --git a/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightResults.kt b/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightResults.kt index 24cbc32..f29378b 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightResults.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightResults.kt @@ -16,9 +16,17 @@ import com.example.hpostesting.data.model.test.TestRightResultType import com.example.hpostesting.data.model.test.TestType import com.example.hpostesting.presentation.dashboard.DashboardActivity import com.example.hpostesting.util.MyUtils.calculateAgeFromYOB +import com.google.firebase.firestore.FirebaseFirestore +import com.google.firebase.firestore.ktx.firestore +import com.google.firebase.ktx.Firebase import dagger.hilt.android.AndroidEntryPoint import `in`.sminnovations.hpostesting.R import `in`.sminnovations.hpostesting.databinding.FragmentTestRightResultsBinding +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch +import kotlinx.coroutines.tasks.await +import kotlinx.coroutines.withContext @AndroidEntryPoint class TestRightResults : Fragment() { @@ -55,8 +63,9 @@ class TestRightResults : Fragment() { private fun setupListeners() { binding.ivHome.setOnClickListener { - val i = Intent(requireContext().applicationContext, DashboardActivity::class.java) - startActivity(i) + CoroutineScope(Dispatchers.IO).launch { + checkBloodGroup() + } } binding.ivNext.setOnClickListener { val i = Intent(requireContext().applicationContext, DashboardActivity::class.java) @@ -65,6 +74,31 @@ class TestRightResults : Fragment() { } } + private suspend fun checkBloodGroup() { + binding.apply { + val bloodGroup = etBloodGroup.text.toString() + if (bloodGroup.isEmpty()) { + etBloodGroup.error = "Please enter your blood group" + } else { + val db: FirebaseFirestore = Firebase.firestore + val userdata = + db.collection("patientData").whereEqualTo("_id", viewModel.testDetails?._id) + .get().await() + if (userdata.documents.isNotEmpty()) { + db.collection("patientData").document(userdata.documents[0].id) + .update("bloodGroup", bloodGroup) + withContext(Dispatchers.Main) { + val i = Intent( + requireContext().applicationContext, + DashboardActivity::class.java + ) + startActivity(i) + } + } + } + } + } + private fun updateResults() { if (viewModel.testDetails?.name == "" && viewModel.testDetails?.birthYear == "") { binding.tvName.visibility = View.GONE @@ -81,37 +115,37 @@ class TestRightResults : Fragment() { if (DataHolder.selectedTestType == TestType.SICKLECERT) { - when (viewModel.testDetails?.result) { - TestRightResultType.NORMAL -> { - binding.resultNormal.visibility = View.VISIBLE - } - - TestRightResultType.SICKLECELLDISEASE -> { - binding.resultDisease.visibility = View.VISIBLE - } - - TestRightResultType.SICKLECELLTRAIT -> { - binding.resultTrait.visibility = View.VISIBLE - } - - TestRightResultType.POSITIVEBORDERLINE -> { - binding.resultPositiveBorderline.visibility = View.VISIBLE - binding.tvRecommended.visibility = View.VISIBLE - } - - TestRightResultType.NEGATIVEBORDERLINE -> { - binding.resultNegativeBorderline.visibility = View.VISIBLE - binding.tvRecommended.visibility = View.VISIBLE - } - - else -> { -// binding.resultUndefined.visibility = View.VISIBLE - Toast.makeText( - requireContext().applicationContext, "Please Test Again", Toast.LENGTH_LONG - ).show() - moveToSamplePage() - } - } +// when (viewModel.testDetails?.result) { +// TestRightResultType.NORMAL -> { +// binding.resultNormal.visibility = View.VISIBLE +// } +// +// TestRightResultType.SICKLECELLDISEASE -> { +// binding.resultDisease.visibility = View.VISIBLE +// } +// +// TestRightResultType.SICKLECELLTRAIT -> { +// binding.resultTrait.visibility = View.VISIBLE +// } +// +// TestRightResultType.POSITIVEBORDERLINE -> { +// binding.resultPositiveBorderline.visibility = View.VISIBLE +// binding.tvRecommended.visibility = View.VISIBLE +// } +// +// TestRightResultType.NEGATIVEBORDERLINE -> { +// binding.resultNegativeBorderline.visibility = View.VISIBLE +// binding.tvRecommended.visibility = View.VISIBLE +// } +// else -> { +//// binding.resultUndefined.visibility = View.VISIBLE +// Toast.makeText( +// requireContext().applicationContext, "Please Test Again", Toast.LENGTH_LONG +// ).show() +// moveToSamplePage() +// } +// } + binding.resultNormal.visibility = View.VISIBLE } else { when (viewModel.testDetails?.result) { TestRightResultType.SICKLECELLDISEASE -> { diff --git a/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightViewModel.kt b/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightViewModel.kt index 06b96b1..b6fcd03 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightViewModel.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightViewModel.kt @@ -137,7 +137,6 @@ class TestRightViewModel @Inject constructor( if (isReference) DataHolder.intensityReferenceArray.clear() else intensitySampleArray.clear() - Log.d("SURYAKUMAR", fullString) val listOfString = fullString.split("\n") for (line in listOfString) { @@ -437,7 +436,6 @@ class TestRightViewModel @Inject constructor( } private fun addResultTestToDb() { - testDetails?.location = DataHolder.location testDetails?.testTime = SimpleDateFormat( "yyyy-MM-dd HH:mm:ss", Locale.getDefault() ).format(Calendar.getInstance().time) @@ -521,7 +519,6 @@ class TestRightViewModel @Inject constructor( } private fun bulkAddResultTestToDb(userData: UserData) { - userData.location = DataHolder.location viewModelScope.launch { userData.reportUploadTime = SimpleDateFormat( "yyyy-MM-dd HH:mm:ss", Locale.getDefault() diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index db1f4a6..6fac1db 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -5,6 +5,19 @@ android:layout_width="match_parent" android:layout_height="match_parent"> + + + + + + + + + app:layout_constraintTop_toBottomOf="@id/til_blood_group" /> + app:layout_constraintTop_toBottomOf="@id/til_blood_group" /> - HPOS + HPOS Testing TestRight @@ -130,7 +130,7 @@ Scan Now Enter ABHA number manualy ABHA ID - Patient ID : %1$s + User ID : %1$s GO Click Here DashboardActivity @@ -183,5 +183,8 @@ Upload Cancel Upload done successfully + Test Completed + Select Blood Group + All registered user are tested successfully \ No newline at end of file