Merge remote-tracking branch 'origin/dev-server-2.1.131-stable-smi' into dev-server-2.1.131-stable-smi

README.md

@@ -1,5 +1,5 @@
-# This version has the new network checker implemented 
+# Latest hpos app version 
-## current version : 2.1.131-network
+## current version : 2.1.132
 
 ### Release key
 

app/build.gradle

@@ -20,7 +20,7 @@ android {
         applicationId "in.sminnovations.hpostesting.server"
         minSdk 30
         targetSdk 34
-        versionCode 133
+        versionCode 134
         versionName "2.1.131"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

app/google-services.json

@@ -1,33 +1,33 @@
 {
   "project_info": {
-    "project_number": "650071678820",
+    "project_number": "1012719870714",
-    "project_id": "hpos-af3cc",
+    "project_id": "hpos-prod",
-    "storage_bucket": "hpos-af3cc.appspot.com"
+    "storage_bucket": "hpos-prod.appspot.com"
   },
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:650071678820:android:f6fd45e2f6a63aef6c6471",
+        "mobilesdk_app_id": "1:1012719870714:android:d8d7c962d96f4097de5f43",
         "android_client_info": {
           "package_name": "in.sminnovations.hpostesting.server"
         }
       },
       "oauth_client": [
         {
-          "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
+          "client_id": "1012719870714-uli6cdjea3lfnnueh6e4r15i10ei1vlj.apps.googleusercontent.com",
           "client_type": 3
         }
       ],
       "api_key": [
         {
-          "current_key": "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I"
+          "current_key": "AIzaSyA_O0oZGzy3Kiw9fiLQ3OFPME-xQJP88vs"
         }
       ],
       "services": {
         "appinvite_service": {
           "other_platform_oauth_client": [
             {
-              "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
+              "client_id": "1012719870714-uli6cdjea3lfnnueh6e4r15i10ei1vlj.apps.googleusercontent.com",
               "client_type": 3
             }
           ]

app/src/main/java/com/example/hpostesting/data/constant/Constants.kt

@@ -28,8 +28,8 @@ object Constants {
     const val DOCUMENT_ID_FOR_UPDATE ="2o71vBKLqdgEKYtFG8Lb"
     const val ABHA_APP_PACKAGE = "in.ndhm.phr"
 
-    const val MOLBIO_INTEGRATION = false
+    const val MOLBIO_INTEGRATION = true
-    const val FIREBASE_INTEGRATION = true
+    const val FIREBASE_INTEGRATION = false
     const val deviceProvisionEmail = "HPOS_provisioner@bigtec.co.in"
     const val deviceProvisionPassword = "f2ab0e7f9d69"
     const val DEVICE_ID_API = "deviceIDAPI"

app/src/main/java/com/example/hpostesting/di/AppModule.kt

@@ -243,9 +243,10 @@ object AppModule {
 
     @Provides
     @Singleton
-    fun provideNetworkMonitor(@ApplicationContext context: Context): NetworkMonitor {
+    fun provideNetworkMonitor(
-        return NetworkMonitor(context)
+        @ApplicationContext context: Context
+    ): NetworkMonitor {
+        return NetworkMonitor(context).apply { startMonitoring() }
     }
 
-
 }

app/src/main/java/com/example/hpostesting/firebase/FirebaseManage.kt

@@ -14,6 +14,7 @@ package com.example.hpostesting.firebase
 import android.content.Context
 import android.content.Intent
 import android.os.Process
+import androidx.core.content.edit
 import com.google.firebase.FirebaseApp
 import com.google.firebase.FirebaseOptions
 import com.google.firebase.firestore.FirebaseFirestore
@@ -27,8 +28,8 @@ import javax.inject.Inject
 
 class FirebaseManager @Inject constructor(private val context: Context) {
 
-    private val sharedPreferences =
+    private val sharedPreferencesServerConfig = context.getSharedPreferences("FirebaseConfigPrefs", Context.MODE_PRIVATE)
-        context.getSharedPreferences("FirebaseConfigPrefs", Context.MODE_PRIVATE)
+    private val sharedPreferencesDev = context.getSharedPreferences("DevMode",Context.MODE_PRIVATE)
 
     private var currentFirestore: FirebaseFirestore = FirebaseFirestore.getInstance()
     private var currentStorage: FirebaseStorage = FirebaseStorage.getInstance()
@@ -36,7 +37,7 @@ class FirebaseManager @Inject constructor(private val context: Context) {
 
     private val defaultServers = listOf(
         // i have it in different place look down
-        firebaseConfig1, firebaseConfig2, firebaseConfig3,
+        firebaseConfigProd,  firebaseConfigDev  , firebaseConfigQaQc,  firebaseConfigPreProd
     )
 
     init {
@@ -44,6 +45,18 @@ class FirebaseManager @Inject constructor(private val context: Context) {
         switchServer(lastSelectedServer)
     }
 
+
+    fun setDevModeOn(state : Boolean){
+        sharedPreferencesDev.edit {
+            putBoolean( "isDevModeOn",state )
+        }
+    }
+
+    fun getDevMode(): Boolean {
+        return sharedPreferencesDev.getBoolean("isDevModeOn",false)
+    }
+
+
     fun getCurrentFirestore(): FirebaseFirestore = currentFirestore
     fun getCurrentStorage(): FirebaseStorage = currentStorage
 
@@ -73,7 +86,7 @@ class FirebaseManager @Inject constructor(private val context: Context) {
     }
 
     private fun saveSelectedServer(firebaseConfig: FirebaseConfig) {
-        with(sharedPreferences.edit()) {
+        with(sharedPreferencesServerConfig.edit()) {
             putString("selectedServerName", firebaseConfig.serverName)
             putString("projectId", firebaseConfig.projectId)
             putString("appId", firebaseConfig.appId)
@@ -93,12 +106,12 @@ class FirebaseManager @Inject constructor(private val context: Context) {
 
     fun getLastSelectedServer(): FirebaseConfig {
         val selectedServerName =
-            sharedPreferences.getString("selectedServerName", defaultServers.first().serverName)
+            sharedPreferencesServerConfig.getString("selectedServerName", defaultServers.first().serverName)
-        val projectId = sharedPreferences.getString("projectId", defaultServers.first().projectId)
+        val projectId = sharedPreferencesServerConfig.getString("projectId", defaultServers.first().projectId)
-        val appId = sharedPreferences.getString("appId", defaultServers.first().appId)
+        val appId = sharedPreferencesServerConfig.getString("appId", defaultServers.first().appId)
-        val apiKey = sharedPreferences.getString("apiKey", defaultServers.first().apiKey)
+        val apiKey = sharedPreferencesServerConfig.getString("apiKey", defaultServers.first().apiKey)
         val storageBucket =
-            sharedPreferences.getString("storageBucket", defaultServers.first().storageBucket)
+            sharedPreferencesServerConfig.getString("storageBucket", defaultServers.first().storageBucket)
 
         return FirebaseConfig(
             serverName = selectedServerName ?: defaultServers.first().serverName,
@@ -128,7 +141,7 @@ fun delayedRestart(context: Context) {
     }
 }
 
-private val firebaseConfig1 = FirebaseConfig(
+private val firebaseConfigDev = FirebaseConfig(
     serverName = "dev",
     apiKey = "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I",
     appId = "1:650071678820:android:a53292637abb7c0d6c6471",
@@ -136,7 +149,7 @@ private val firebaseConfig1 = FirebaseConfig(
     storageBucket = "hpos-af3cc.appspot.com"
 )
 
-private val firebaseConfig2 = FirebaseConfig(
+private val firebaseConfigQaQc = FirebaseConfig(
     serverName = "qc-qa",
     apiKey = "AIzaSyC4d4GhWHr_NMJAeBvnztQ_yQ3Qe9MAnLs",
     appId = "1:1004619739289:android:3dbcefb10ea99654e5c808",
@@ -144,10 +157,18 @@ private val firebaseConfig2 = FirebaseConfig(
     storageBucket = "hpos-qa.appspot.com"
 )
 
-private val firebaseConfig3 = FirebaseConfig(
+private val firebaseConfigProd = FirebaseConfig(
     serverName = "prod",
+    apiKey = "AIzaSyA_O0oZGzy3Kiw9fiLQ3OFPME-xQJP88vs",
+    appId = "1:1012719870714:android:d8d7c962d96f4097de5f43",
+    projectId = "hpos-prod",
+    storageBucket = "hpos-prod.appspot.com"
+)
+
+private val firebaseConfigPreProd = FirebaseConfig(
+    serverName = "pre prod",
     apiKey = "AIzaSyDYySi27LioZGNisP1NfnNU5inJX_0FT38",
-    appId = "1:121176529204:android:a7bc0842f61e5095bbed61",
+    appId = "1:121176529204:android:e6841fdac57bdc95bbed61",
     projectId = "hpos-preprod",
     storageBucket = "hpos-preprod.appspot.com"
 )

app/src/main/java/com/example/hpostesting/presentation/KitScanActivity.kt

@@ -141,6 +141,9 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
         val time = timeDifference(sharedPreference.getString(Constants.KIT_TIME, "").toString())
         val kitNum = sharedPreference.getString(Constants.KIT_NUMBER, "").toString()
        // Toast.makeText(this@KitScanActivity,"Test MAx time"+ time+"-Test count-"+kitNum,Toast.LENGTH_SHORT).show()
+//        if (sharedPreference.getString(Constants.USER_ID, "").toString() == "ADMIN") {
+//            moveToNext()
+//        }else{
         if (sharedPreference.getString(Constants.USER_ID, "").toString() == "ADMIN") {
             moveToNext()
         }else{

app/src/main/java/com/example/hpostesting/presentation/main_base/AppVersionTapManage.kt

@@ -1,16 +1,21 @@
 package com.example.hpostesting.presentation.main_base
 
+import com.example.hpostesting.data.constant.Constants.FIREBASE_INTEGRATION
+import com.example.hpostesting.data.constant.Constants.MOLBIO_INTEGRATION
+
 class AppVersionTapManager {
 
-    private var tapCount = 0
+     private var tapCount = 0
     private val maxTapCount = 5
+     val shouldEnable = FIREBASE_INTEGRATION && !MOLBIO_INTEGRATION
+     val notEnable = MOLBIO_INTEGRATION && !FIREBASE_INTEGRATION
 
     fun registerTap(onMaxTapsReached: () -> Unit) {
         tapCount++
-        if (tapCount >= maxTapCount) {
+            if (tapCount >= maxTapCount && shouldEnable) {
-            onMaxTapsReached()
+                onMaxTapsReached()
-            reset()
+                reset()
-        }
+            }
     }
     private fun reset() {
         tapCount = 0

app/src/main/java/com/example/hpostesting/presentation/main_base/SettingsFragment.kt

@@ -13,7 +13,6 @@
 
 package com.example.hpostesting.presentation.main_base
 
-import android.app.AlertDialog
 import android.content.Context
 import android.content.SharedPreferences
 import android.content.pm.PackageManager
@@ -29,15 +28,21 @@ import androidx.fragment.app.Fragment
 import androidx.preference.ListPreference
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
+import androidx.preference.PreferenceManager
+import androidx.preference.SwitchPreferenceCompat
 import com.example.hpostesting.data.constant.Constants
+import com.example.hpostesting.data.constant.Constants.FIREBASE_INTEGRATION
+import com.example.hpostesting.data.constant.Constants.MOLBIO_INTEGRATION
 import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.LanguageManager
 import com.example.hpostesting.data.repository.DatabaseRepository
 import com.example.hpostesting.firebase.FirebaseConfig
 import com.example.hpostesting.firebase.FirebaseManager
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.FragmentSlideshowBinding
 
+
 private var isLanguageChanged = false
 
 class SlideshowFragment : Fragment() {
@@ -58,7 +63,6 @@ class SlideshowFragment : Fragment() {
         super.onViewCreated(view, savedInstanceState)
 
         binding.nameEditText.setText(sharedPreferences.getString(Constants.LABNAME, ""))
-
         selectedItem = sharedPreferences.getString(Constants.CUVETTE_SIZE, "10mm").toString()
         binding.btnGo.setOnClickListener {
             var labname = binding.nameEditText.text.toString()
@@ -97,6 +101,7 @@ class SlideshowFragment : Fragment() {
                     // Do nothing here
                 }
             }
+
         binding.spinnerCuvette.setSelection(pos)
         binding.btnAddSize.setOnClickListener {
             with(sharedPreferences.edit()) {
@@ -113,24 +118,25 @@ class SlideshowFragment : Fragment() {
     }
 }
 
-class PrefsFragment : PreferenceFragmentCompat(){
+class PrefsFragment : PreferenceFragmentCompat() {
     private lateinit var tapManager: AppVersionTapManager
-    private var isServerSelectionVisible = false
     private lateinit var serverPreference: Preference
     private lateinit var currentServerPreference: Preference
     lateinit var firebaseManager: FirebaseManager
+    private var topDevMode = false
     lateinit var databaseRepository: DatabaseRepository
 
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-         firebaseManager = FirebaseManager(requireContext())
+        firebaseManager = FirebaseManager(requireContext())
         databaseRepository = (activity as DashboardActivity).databaseRepository
-
         tapManager = AppVersionTapManager()
+        topDevMode = firebaseManager.getDevMode()
         val sharedPreference =
             requireContext().getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
         val preferenceScreen = preferenceManager.createPreferenceScreen(requireContext())
         val currentServer = firebaseManager.getLastSelectedServer().serverName
 
+
         // Language Preference
         val languagePreference = ListPreference(requireContext()).apply {
             key = "language_preference"
@@ -140,52 +146,102 @@ class PrefsFragment : PreferenceFragmentCompat(){
             entryValues = arrayOf("en", "kn", "hi")
             setDefaultValue("en")
             icon = ContextCompat.getDrawable(requireContext(), R.drawable.baseline_translate_24)
-
             onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
                 val languageCode = newValue as String
                 updateLanguage(requireContext(), languageCode)
                 true
             }
         }
+
+
+        val servers = firebaseManager.getAvailableServers()
+        val serverNames = servers.map { it.serverName }.toTypedArray()
+
+        val serverSelectorPreference = CustomDialogPreference(requireContext()).apply {
+            key = "server_preference"
+            title = "Select the Server"
+            summary = "Current server: $currentServer"
+            setEntries(serverNames)
+            setEntryValues(serverNames)
+            setValue(currentServer)
+            icon = ContextCompat.getDrawable(requireContext(), R.drawable.baseline_cloud_sync_24)
+            setOnPreferenceChangeListener { newValue ->
+                val preferenceConfig = servers.find { it.serverName == newValue }
+                switchFirebaseServer(preferenceConfig!!)
+                true
+            }
+        }
+
+        // Add preferences to screen
+        preferenceScreen.addPreference(languagePreference)
         preferenceScreen.addPreference(languagePreference)
 
-        val appVersionPreference = Preference(requireContext()).apply {
-            title = "App Version"
-            summary =
-                getAppVersion(requireContext()) + " [ " + getAppEnvironment(requireContext())  +"->"+currentServer+"]"
-            icon = ContextCompat.getDrawable(requireContext(), R.drawable.baseline_info_24)
 
-            setOnPreferenceClickListener {
+        val developerToggle = SwitchPreferenceCompat(requireContext()).apply {
-                if ((sharedPreference.getString(Constants.USER_ID, "").toString() == "ADMIN")) {
+            title = "Developer Options"
-                    tapManager.registerTap {
+            summary = "Enable or disable developer options"
-                        if (!isServerSelectionVisible) {
+            icon =
-                            showServerSelection()
+                ContextCompat.getDrawable(requireContext(), R.drawable.baseline_developer_mode_24)
-                        }
+            key = "developer_options" // Unique key for SharedPreferences
-                    }
-                } else {
 
+            // Load toggle state from SharedPreferences
+            isChecked = firebaseManager.getDevMode()
+
+            setOnPreferenceChangeListener { _, newValue ->
+                val isEnabled = newValue as Boolean
+                firebaseManager.setDevModeOn(isEnabled)
+
+                if (!isEnabled) {
+                    preferenceScreen.removePreference(this)
+                    preferenceScreen.removePreference(serverSelectorPreference)
+                }
+                if (!firebaseManager.getDevMode() && currentServer != "prod"){
+                 val prodConfig =  servers.find { it.serverName == "prod" }
+                    switchFirebaseServer(prodConfig!!)
                 }
                 true
             }
-
         }
-        preferenceScreen.addPreference(appVersionPreference)
 
-
+        val shouldEnableCurrentServerVersion = FIREBASE_INTEGRATION && !MOLBIO_INTEGRATION
-        currentServerPreference = Preference(requireContext()).apply {
+        val appVersionPreference = Preference(requireContext()).apply {
-            key = "current_server_preference"
+            title = "App Version"
-            title = "Current Server"
+            summary =
-            summary = "No server selected"
+                getAppVersion(requireContext()) + " [ " + getAppEnvironment(requireContext()) + "->" + if (shouldEnableCurrentServerVersion) currentServer  else "molbio"+ "]"
-            isVisible = false
+            icon = ContextCompat.getDrawable(requireContext(), R.drawable.baseline_info_24)
-            icon = ContextCompat.getDrawable(requireContext(), R.drawable.baseline_cloud_done_24)
 
             setOnPreferenceClickListener {
-//                (activity as? DashboardActivity)?.sendData("hello test data")
+                tapManager.registerTap {
-//                Toast.makeText(context, "data sent", Toast.LENGTH_SHORT).show()  this was used to send the basic data as test data
+                   firebaseManager.setDevModeOn(true)
-            true
+
+                    val devConfig =  servers.find { it.serverName == "dev" }
+                    if (firebaseManager.getDevMode()  && currentServer != "dev") {
+                        Toast.makeText(requireContext(), "Now you are a Developer", Toast.LENGTH_SHORT).show()
+                        Toast.makeText(requireContext(), "Setting Up developer Environmnet", Toast.LENGTH_SHORT).show()
+                        switchFirebaseServer(devConfig!!)
+                    }
+
+                    if (preferenceScreen.findPreference<SwitchPreferenceCompat>("developer_options") == null) {
+                        preferenceScreen.addPreference(developerToggle)
+                    }
+                    if (preferenceScreen.findPreference<ListPreference>("server_preference") == null) {
+                        preferenceScreen.addPreference(serverSelectorPreference)
+                    }
+
+                    developerToggle.isChecked = true
+                    updateServerPreference(currentServer)
+                }
+                true
             }
         }
-        preferenceScreen.addPreference(currentServerPreference)
+
+        preferenceScreen.addPreference(appVersionPreference)
+        if (firebaseManager.getDevMode()) {
+            developerToggle.isChecked = true // Ensure it's checked
+            preferenceScreen.addPreference(developerToggle)
+            preferenceScreen.addPreference(serverSelectorPreference)
+        }
+
         setPreferenceScreen(preferenceScreen)
 
         if (isLanguageChanged) {
@@ -194,58 +250,23 @@ class PrefsFragment : PreferenceFragmentCompat(){
     }
 
 
-    private fun showServerSelection() {
+    private fun updateServerPreference(newServer: String) {
-        val currentServer = firebaseManager.getLastSelectedServer().serverName
+        (findPreference<CustomDialogPreference>("server_preference"))?.let { pref ->
-        serverPreference = Preference(requireContext()).apply {
+            pref.setValue(newServer)
-            title = "Select Server"
+            pref.summary = "Current server: $newServer"
-            summary = "Choose your server"
-            icon = ContextCompat.getDrawable(requireContext(), R.drawable.baseline_cloud_sync_24)
-            setOnPreferenceClickListener {
-                showServerSelectionDialog()
-                true
-            }
         }
-
-
-
-        preferenceScreen.addPreference(serverPreference)
-        currentServerPreference.isVisible = true
-        currentServerPreference.summary = "Current Server: $currentServer"
-
-        Toast.makeText(requireContext(), "Server selection now available", Toast.LENGTH_SHORT).show()
     }
 
-    private fun showServerSelectionDialog() {
-        val servers = firebaseManager.getAvailableServers()
-
-        val serverNames = servers.map { it.serverName }.toTypedArray()
-        val builder = AlertDialog.Builder(requireContext())
-        builder.setTitle("Select Server")
-            .setItems(serverNames) { _, which ->
-                val selectedServer = servers[which]
-
-                switchFirebaseServer(selectedServer)
-            }
-            .setNegativeButton("Cancel", null)
-            .show()
-    }
-
-
     private fun switchFirebaseServer(firebaseConfig: FirebaseConfig) {
         firebaseManager.switchServer(firebaseConfig)
-        Toast.makeText(requireContext(), "Switched to ${firebaseConfig.serverName}, Please wait for few seconds", Toast.LENGTH_SHORT).show()
+        Toast.makeText(
-        Toast.makeText(requireContext(), "Restart needed restarting the app", Toast.LENGTH_SHORT).show()
+            requireContext(),
-        firebaseManager.restartApp()
+            "Switched to ${firebaseConfig.serverName}, Please wait for few seconds",
-        currentServerPreference.summary = "Current Server: ${firebaseConfig.serverName}"
+            Toast.LENGTH_SHORT
-
+        ).show()
-    }
+        Toast.makeText(requireContext(), "Restart needed restarting the app", Toast.LENGTH_SHORT)
-
-
-    private fun switchCurrentServer(serverCode: String) {
-        Toast.makeText(requireContext(), "Switched to server: $serverCode", Toast.LENGTH_SHORT)
             .show()
-        currentServerPreference.summary = "Current Server: $serverCode"
+        firebaseManager.restartApp()
-
     }
 
     private fun updateLanguage(context: Context, languageCode: String) {
@@ -275,3 +296,47 @@ class PrefsFragment : PreferenceFragmentCompat(){
 }
 
 
+
+// CustomDialogPreference.kt
+class CustomDialogPreference(context: Context) : Preference(context) {
+    private var entries: Array<String> = arrayOf()
+    private var entryValues: Array<String> = arrayOf()
+    private var currentValue: String = ""
+    private var onValueChangeListener: ((String) -> Boolean)? = null
+
+    fun setEntries(entries: Array<String>) {
+        this.entries = entries
+    }
+
+    fun setEntryValues(values: Array<String>) {
+        this.entryValues = values
+    }
+
+    fun setValue(value: String) {
+        currentValue = value
+        persistString(value)
+    }
+
+    fun setOnPreferenceChangeListener(listener: (String) -> Boolean) {
+        onValueChangeListener = listener
+    }
+
+    override fun onClick() {
+        val builder = MaterialAlertDialogBuilder(context)
+        builder.setTitle(title)
+
+        builder.setSingleChoiceItems(entries, entries.indexOf(currentValue)) { dialog, which ->
+            val newValue = entryValues[which]
+            if (onValueChangeListener?.invoke(newValue) == true) {
+                setValue(newValue)
+                dialog.dismiss()
+            }
+        }
+
+        builder.setNegativeButton("Cancel") { dialog, _ ->
+            dialog.dismiss()
+        }
+
+        builder.show()
+    }
+}

app/src/main/java/com/example/hpostesting/presentation/trueheme_test/TrueHemeTestFragment.kt

@@ -1390,6 +1390,7 @@ class TrueHemeTestFragment : Fragment() {
                     apply()
                 }
             }
+            trueHemeTestViewModel.updateLocalData()
         } catch (e: Exception) {
             Toast.makeText(
                 requireContext(),

app/src/main/java/com/example/hpostesting/presentation/trueheme_test/TrueHemeTestViewModel.kt

@@ -795,4 +795,11 @@ class TrueHemeTestViewModel @Inject constructor(
             "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
         ).format(Calendar.getInstance().time)
     }
+    fun updateLocalData() {
+        viewModelScope.launch {
+            parseData()
+            hemoCubeDao.updateTest(testDetails!!)
+        }
+    }
+
 }

app/src/main/java/com/example/hpostesting/util/NetworkChecker.kt

@@ -1,5 +1,6 @@
 package com.example.hpostesting.util
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.net.ConnectivityManager
 import android.net.Network
@@ -12,6 +13,8 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.cancel
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import java.net.HttpURLConnection
 import java.net.URL
@@ -23,7 +26,7 @@ import javax.inject.Singleton
 class NetworkMonitor @Inject constructor(
     @ApplicationContext private val context: Context
 ) {
-
+    private var isMonitoringStarted = false
     private val connectivityManager =
         context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
 
@@ -49,7 +52,10 @@ class NetworkMonitor @Inject constructor(
         }
     }
 
+    @SuppressLint("NewApi")
     fun startMonitoring() {
+        if (isMonitoringStarted) return  // Already started, do nothing.
+        isMonitoringStarted = true
         // Check initial connectivity status
         val network = connectivityManager.activeNetwork
         val capabilities = connectivityManager.getNetworkCapabilities(network)
@@ -66,6 +72,8 @@ class NetworkMonitor @Inject constructor(
                 .build()
 
         connectivityManager.registerNetworkCallback(networkRequest, networkCallback)
+        // Start periodic checks:
+        startPeriodicPingCheck()
     }
 
     fun stopMonitoring() {   // never needed to call
@@ -96,4 +104,14 @@ class NetworkMonitor @Inject constructor(
             }
         }
     }
+
+    private fun startPeriodicPingCheck(intervalMillis: Long = 1 * 60_000L) {
+        networkScope.launch {
+            while (isActive) {
+                performPingCheck()
+                delay(intervalMillis)
+            }
+        }
+    }
+
 }

app/src/main/res/drawable/baseline_developer_mode_24.xml

@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M7,5h10v2h2L19,3c0,-1.1 -0.9,-1.99 -2,-1.99L7,1c-1.1,0 -2,0.9 -2,2v4h2L7,5zM15.41,16.59L20,12l-4.59,-4.59L14,8.83 17.17,12 14,15.17l1.41,1.42zM10,15.17L6.83,12 10,8.83 8.59,7.41 4,12l4.59,4.59L10,15.17zM17,19L7,19v-2L5,17v4c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2v-4h-2v2z"/>
+    
+</vector>

app/src/main/res/layout/server_selector_drop_down.xml

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <!-- RadioGroup to select servers -->
-    <RadioGroup
-        android:id="@+id/radioGroupServers"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:orientation="vertical">
-
-        <!-- Radio Buttons for each server option -->
-        <RadioButton
-            android:id="@+id/radioButtonInternal"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Internal" />
-
-        <RadioButton
-            android:id="@+id/radioButtonClinical"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Clinical" />
-
-        <RadioButton
-            android:id="@+id/radioButtonCustomer"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Customer" />
-
-    </RadioGroup>
-</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/values-hi/arrays.xml

@@ -13,9 +13,68 @@
 
 <resources>
     <string-array name="district">
-        <item>Mysuru</item>
+        <item>अररिया</item>
-        <item>Kodagu</item>
+        <item>अरवल</item>
-        <item>Chamarajanagar</item>
+        <item>औरंगाबाद</item>
+        <item>बांका</item>
+        <item>बेगूसराय</item>
+        <item>भागलपुर</item>
+        <item>भोजपुर</item>
+        <item>बक्सर</item>
+        <item>दरभंगा</item>
+        <item>पूर्वी चंपारण</item>
+        <item>गया</item>
+        <item>गोपालगंज</item>
+        <item>जमुई</item>
+        <item>जहानाबाद</item>
+        <item>कैमूर</item>
+        <item>कटिहार</item>
+        <item>खगड़िया</item>
+        <item>किशनगंज</item>
+        <item>लखीसराय</item>
+        <item>मधेपुरा</item>
+        <item>मधुबनी</item>
+        <item>मुंगेर</item>
+        <item>मुजफ्फरपुर</item>
+        <item>नालंदा</item>
+        <item>नवादा</item>
+        <item>पटना</item>
+        <item>पूर्णिया</item>
+        <item>रोहतास</item>
+        <item>सहरसा</item>
+        <item>समस्तीपुर</item>
+        <item>सारण</item>
+        <item>शेखपुरा</item>
+        <item>शिवहर</item>
+        <item>सीतामढ़ी</item>
+        <item>सिवान</item>
+        <item>सुपौल</item>
+        <item>वैशाली</item>
+        <item>पश्चिमी चंपारण</item>
+        <item>बोकारो</item>
+        <item>चतरा</item>
+        <item>देवघर</item>
+        <item>धनबाद</item>
+        <item>दुमका</item>
+        <item>पूर्वी सिंहभूम</item>
+        <item>गढवा</item>
+        <item>गिरिडीह</item>
+        <item>गोड्डा</item>
+        <item>गुमला</item>
+        <item>हजारीबाग</item>
+        <item>जामताड़ा</item>
+        <item>खूंटी</item>
+        <item>कोडरमा</item>
+        <item>लातेहार</item>
+        <item>लोहरदगा</item>
+        <item>पाकुड़</item>
+        <item>पलामू</item>
+        <item>रामगढ़</item>
+        <item>रांची</item>
+        <item>साहिबगंज</item>
+        <item>सरायकेला खरसावां</item>
+        <item>सिमडेगा</item>
+        <item>पश्चिमी सिंहभूम</item>
         <item>Other</item>
     </string-array>
 </resources>

app/src/main/res/values-kn/arrays.xml

@@ -13,9 +13,68 @@
 
 <resources>
     <string-array name="district">
-        <item>Mysuru</item>
+        <item>Araria</item>
-        <item>Kodagu</item>
+        <item>Arwal</item>
-        <item>Chamarajanagar</item>
+        <item>Aurangabad</item>
+        <item>Banka</item>
+        <item>Begusarai</item>
+        <item>Bhagalpur</item>
+        <item>Bhojpur</item>
+        <item>Buxar</item>
+        <item>Darbhanga</item>
+        <item>East Champaran</item>
+        <item>Gaya</item>
+        <item>Gopalganj</item>
+        <item>Jamui</item>
+        <item>Jehanabad</item>
+        <item>Kaimur</item>
+        <item>Katihar</item>
+        <item>Khagaria</item>
+        <item>Kishanganj</item>
+        <item>Lakhisarai</item>
+        <item>Madhepura</item>
+        <item>Madhubani</item>
+        <item>Munger</item>
+        <item>Muzaffarpur</item>
+        <item>Nalanda</item>
+        <item>Nawada</item>
+        <item>Patna</item>
+        <item>Purnia</item>
+        <item>Rohtas</item>
+        <item>Saharsa</item>
+        <item>Samastipur</item>
+        <item>Saran</item>
+        <item>Sheikhpura</item>
+        <item>Sheohar</item>
+        <item>Sitamarhi</item>
+        <item>Siwan</item>
+        <item>Supaul</item>
+        <item>Vaishali</item>
+        <item>West Champaran</item>
+        <item>Bokaro</item>
+        <item>Chatra</item>
+        <item>Deoghar</item>
+        <item>Dhanbad</item>
+        <item>Dumka</item>
+        <item>East Singhbhum</item>
+        <item>Garhwa</item>
+        <item>Giridih</item>
+        <item>Godda</item>
+        <item>Gumla</item>
+        <item>Hazaribagh</item>
+        <item>Jamtara</item>
+        <item>Khunti</item>
+        <item>Koderma</item>
+        <item>Latehar</item>
+        <item>Lohardaga</item>
+        <item>Pakur</item>
+        <item>Palamu</item>
+        <item>Ramgarh</item>
+        <item>Ranchi</item>
+        <item>Sahibganj</item>
+        <item>Seraikela Kharsawan</item>
+        <item>Simdega</item>
+        <item>West Singhbhum</item>
         <item>Other</item>
     </string-array>
 </resources>

app/src/main/res/values/arrays.xml

@@ -26,9 +26,68 @@
         <!-- Use language codes (e.g., en, kn) as values -->
     </string-array>
     <string-array name="district">
-        <item>Mysuru</item>
+        <item>Araria</item>
-        <item>Kodagu</item>
+        <item>Arwal</item>
-        <item>Chamarajanagar</item>
+        <item>Aurangabad</item>
+        <item>Banka</item>
+        <item>Begusarai</item>
+        <item>Bhagalpur</item>
+        <item>Bhojpur</item>
+        <item>Buxar</item>
+        <item>Darbhanga</item>
+        <item>East Champaran</item>
+        <item>Gaya</item>
+        <item>Gopalganj</item>
+        <item>Jamui</item>
+        <item>Jehanabad</item>
+        <item>Kaimur</item>
+        <item>Katihar</item>
+        <item>Khagaria</item>
+        <item>Kishanganj</item>
+        <item>Lakhisarai</item>
+        <item>Madhepura</item>
+        <item>Madhubani</item>
+        <item>Munger</item>
+        <item>Muzaffarpur</item>
+        <item>Nalanda</item>
+        <item>Nawada</item>
+        <item>Patna</item>
+        <item>Purnia</item>
+        <item>Rohtas</item>
+        <item>Saharsa</item>
+        <item>Samastipur</item>
+        <item>Saran</item>
+        <item>Sheikhpura</item>
+        <item>Sheohar</item>
+        <item>Sitamarhi</item>
+        <item>Siwan</item>
+        <item>Supaul</item>
+        <item>Vaishali</item>
+        <item>West Champaran</item>
+        <item>Bokaro</item>
+        <item>Chatra</item>
+        <item>Deoghar</item>
+        <item>Dhanbad</item>
+        <item>Dumka</item>
+        <item>East Singhbhum</item>
+        <item>Garhwa</item>
+        <item>Giridih</item>
+        <item>Godda</item>
+        <item>Gumla</item>
+        <item>Hazaribagh</item>
+        <item>Jamtara</item>
+        <item>Khunti</item>
+        <item>Koderma</item>
+        <item>Latehar</item>
+        <item>Lohardaga</item>
+        <item>Pakur</item>
+        <item>Palamu</item>
+        <item>Ramgarh</item>
+        <item>Ranchi</item>
+        <item>Sahibganj</item>
+        <item>Seraikela Kharsawan</item>
+        <item>Simdega</item>
+        <item>West Singhbhum</item>
         <item>Other</item>
     </string-array>