From dfa9fe7672fa69af0c90ced02d5670de17e543ff Mon Sep 17 00:00:00 2001
From: "smileomi18@gmail.com" <smi@glab22>
Date: Mon, 14 Aug 2023 21:12:14 +0530
Subject: [PATCH] deviceData function called

---
 app/build.gradle                                            | 4 ++--
 .../hpostesting/presentation/hemocube/HemoCubeFragment.kt   | 3 +++
 .../hpostesting/presentation/hemocube/HemoCubeViewModel.kt  | 4 ++--
 app/src/main/res/layout/fragment_hemo_cube_reference.xml    | 6 ++----
 build.gradle                                                | 2 +-
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 3ffcd42..fb970c8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,13 +10,13 @@ plugins {
 //apply plugin: 'kotlin-android'
 
 android {
-    compileSdk 33
+    compileSdk 34
     namespace 'in.sminnovations.hpostesting'
 
     defaultConfig {
         applicationId "in.sminnovations.hpostesting"
         minSdk 21
-        targetSdk 33
+        targetSdk 34
         versionCode 2
         versionName "2.0.1"
 
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 9e48900..9328097 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
@@ -100,9 +100,12 @@ class HemoCubeFragment : Fragment() {
             binding.progressBar.visibility = View.GONE
         }
 
+        hemoCubeViewModel.getDeviceData(sharedPreferences.getString(Constants.USER_ID,""))
+
         hemoCubeViewModel.deviceData.observe(viewLifecycleOwner) {
             currentDeviceData = it
             showToast(calculateRatio(0.17).toString())
+
         }
 
         hemoCubeViewModel.networkStatusLiveData.observe(viewLifecycleOwner) { isNetworkAvailable ->
diff --git a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeViewModel.kt b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeViewModel.kt
index deaaf7f..bfeeb90 100644
--- a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeViewModel.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeViewModel.kt
@@ -62,8 +62,8 @@ class HemoCubeViewModel @Inject constructor(
             }
         }
 
-    fun getDeviceData(deviceId: String) = viewModelScope.launch {
-        deviceData.postValue(repository.getDeviceDataById(deviceId))
+    fun getDeviceData(deviceId: String?) = viewModelScope.launch {
+        deviceData.postValue(deviceId?.let { repository.getDeviceDataById(it) })
     }
 
     private fun addResultTestToDb() {
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 2cd2a28..daa23b7 100644
--- a/app/src/main/res/layout/fragment_hemo_cube_reference.xml
+++ b/app/src/main/res/layout/fragment_hemo_cube_reference.xml
@@ -69,7 +69,7 @@
             android:textColor="@color/white"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_subtitle4" />
+            app:layout_constraintTop_toBottomOf="@id/til_blood_group" />
 
 
         <com.google.android.material.textfield.TextInputLayout
@@ -79,10 +79,9 @@
             android:layout_height="wrap_content"
             android:layout_marginHorizontal="24dp"
             android:layout_marginTop="16dp"
-            android:visibility="gone"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btn_submit">
+            app:layout_constraintTop_toBottomOf="@id/tv_subtitle4">
 
             <AutoCompleteTextView
                 android:id="@+id/et_blood_group"
@@ -90,7 +89,6 @@
                 android:layout_height="wrap_content"
                 android:hint="@string/select_blood_group"
                 android:inputType="none"
-                android:visibility="gone"
                 android:labelFor="@id/til_blood_group"
                 app:simpleItems="@array/blood_group" />
 
diff --git a/build.gradle b/build.gradle
index 100b7f4..a191c6b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         kotlin_version = '1.8.21'
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.0'
+        classpath 'com.android.tools.build:gradle:8.0.2'
         classpath 'com.google.gms:google-services:4.3.15'
         classpath 'com.google.firebase:firebase-appdistribution-gradle:4.0.0'
     }