From 4b205185d37b362b6f1b387e8327b73f2d0aaeda Mon Sep 17 00:00:00 2001 From: Mariya Date: Fri, 29 Dec 2023 11:10:38 +0530 Subject: [PATCH] error resolved related to previous changing color of text if the result is normal --- app/build.gradle | 21 +++++++++++-------- .../dashboard/DashboardActivity.kt | 5 ++++- .../presentation/hemocube/HemoCubeFragment.kt | 20 ++++++++++++++---- 3 files changed, 32 insertions(+), 14 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 0a45e20..005cf3d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -60,7 +60,7 @@ dependencies { implementation 'androidx.core:core-ktx:1.12.0' implementation 'androidx.appcompat:appcompat:1.6.1' - implementation 'com.google.android.material:material:1.10.0' + implementation 'com.google.android.material:material:1.11.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.2' implementation 'androidx.fragment:fragment-ktx:1.6.2' @@ -82,6 +82,9 @@ dependencies { implementation("com.google.firebase:firebase-appdistribution-api-ktx:16.0.0-beta11") implementation 'androidx.preference:preference-ktx:1.2.1' implementation 'androidx.preference:preference-ktx:1.2.1' + implementation 'com.google.android.play:core:1.10.3' + + // Testing @@ -97,13 +100,13 @@ dependencies { implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2" - implementation 'com.opencsv:opencsv:4.6' + implementation 'com.opencsv:opencsv:5.5' implementation 'com.github.mik3y:usb-serial-for-android:3.5.1' implementation "androidx.fragment:fragment-ktx:1.6.2" // CSV read, write - implementation 'com.opencsv:opencsv:4.6' + implementation 'com.opencsv:opencsv:5.5' // Barcode scanner implementation 'com.journeyapps:zxing-android-embedded:4.3.0' @@ -112,17 +115,17 @@ dependencies { implementation 'com.google.android.gms:play-services-code-scanner:16.1.0' //Room - implementation "androidx.room:room-ktx:2.6.0" - implementation "androidx.room:room-runtime:2.6.0" - kapt ("androidx.room:room-compiler:2.6.0") + implementation "androidx.room:room-ktx:2.6.1" + implementation "androidx.room:room-runtime:2.6.1" + kapt ("androidx.room:room-compiler:2.6.1") //image implementation 'com.github.bumptech.glide:glide:4.13.2' annotationProcessor 'com.github.bumptech.glide:compiler:4.13.2' // Navigation Component - implementation "androidx.navigation:navigation-fragment-ktx:2.7.5" - implementation "androidx.navigation:navigation-ui-ktx:2.7.5" + implementation "androidx.navigation:navigation-fragment-ktx:2.7.6" + implementation "androidx.navigation:navigation-ui-ktx:2.7.6" //Dagger - Hilt implementation "com.google.dagger:hilt-android:2.46" @@ -134,5 +137,5 @@ dependencies { implementation "com.squareup.retrofit2:converter-gson:2.9.0" implementation "androidx.preference:preference-ktx:1.2.1" - + implementation 'io.nats:jnats:2.11.2' } \ No newline at end of file diff --git a/app/src/main/java/com/example/hpostesting/presentation/dashboard/DashboardActivity.kt b/app/src/main/java/com/example/hpostesting/presentation/dashboard/DashboardActivity.kt index 1117c9c..584138a 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/dashboard/DashboardActivity.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/dashboard/DashboardActivity.kt @@ -13,6 +13,8 @@ import androidx.navigation.ui.setupActionBarWithNavController import androidx.navigation.ui.setupWithNavController import com.example.hpostesting.data.constant.LanguageManager import com.google.android.material.navigation.NavigationView +import com.google.android.play.core.appupdate.AppUpdateManager +import com.google.android.play.core.appupdate.AppUpdateManagerFactory import com.google.firebase.appdistribution.FirebaseAppDistribution import com.google.firebase.appdistribution.FirebaseAppDistributionException import com.google.firebase.crashlytics.FirebaseCrashlytics @@ -25,7 +27,8 @@ class DashboardActivity : AppCompatActivity() { private lateinit var appBarConfiguration: AppBarConfiguration private lateinit var binding: ActivityDashboardBinding - + val appUpdateManager: AppUpdateManager = AppUpdateManagerFactory.create(applicationContext) + val appUpdateInfoTask = appUpdateManager.appUpdateInfo override fun attachBaseContext(newBase: Context?) { val languageCode = LanguageManager.getSavedLanguage(newBase!!) LanguageManager.setLocale(newBase, languageCode) 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 7951693..d05ff78 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 @@ -604,11 +604,17 @@ class HemoCubeFragment : Fragment() { if (calculatedRatio != null) { if (calculatedRatio < 0.05) return getString(R.string.error_repeat_test_higher_volume) - if (calculatedRatio in 0.05..0.155) + if (calculatedRatio in 0.05..0.155) { activity?.runOnUiThread { - binding.tvSubtitle4.setTextColor(ContextCompat.getColor(requireContext(), R.color.brightGreen)) + binding.tvSubtitle4.setTextColor( + ContextCompat.getColor( + requireContext(), + R.color.brightGreen + ) + ) } return getString(R.string.normal) + } if (calculatedRatio in 0.155..0.175) return getString(R.string.negative_borderline) if (calculatedRatio in 0.175..0.22) @@ -634,11 +640,17 @@ class HemoCubeFragment : Fragment() { try { hemoCubeViewModel.messages.postValue("result classification") if (predictedDenovixRatio != null) { - if (predictedDenovixRatio in 0.0..0.16) + if (predictedDenovixRatio in 0.0..0.16) { activity?.runOnUiThread { - binding.tvSubtitle4.setTextColor(ContextCompat.getColor(requireContext(), R.color.brightGreen)) + binding.tvSubtitle4.setTextColor( + ContextCompat.getColor( + requireContext(), + R.color.brightGreen + ) + ) } return getString(R.string.normal) + } if (predictedDenovixRatio in 0.16..0.165) return getString(R.string.negative_borderline) if (predictedDenovixRatio in 0.165..0.235)