Digital Card button removed

# Conflicts:
#	app/src/main/java/com/example/hpostesting/presentation/dashboard/DashboardActivity.kt

app/build.gradle

@@ -19,8 +19,8 @@ android {
         applicationId "in.sminnovations.hpostesting"
         minSdk 21
         targetSdk 34
-        versionCode 44
+        versionCode 48
-        versionName "2.1.44"
+        versionName "2.1.48"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -133,4 +133,6 @@ dependencies {
     implementation "com.squareup.retrofit2:retrofit:2.9.0"
     implementation "com.squareup.retrofit2:converter-gson:2.9.0"
 
+    implementation "androidx.preference:preference-ktx:1.2.1"
+
 }

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

@@ -91,6 +91,18 @@ object Constants {
             listOf(0.1964, 0.011565),           // LED3, 555nm
             listOf(1.0, 0.0)                    // LED4
         ),
+        "HCV-000-3003" to listOf(
+            listOf(0.723142, -0.09135),         // LED1, 435nm
+            listOf(0.581462456, -0.58502),      // LED2, 415nm
+            listOf(0.1964, 0.011565),           // LED3, 555nm
+            listOf(1.0, 0.0)                    // LED4
+        ),
+        "HCV-000-3004" to listOf(
+            listOf(1.6837, -1.1417),         // LED1, 435nm
+            listOf(0.581462456, -0.58502),      // LED2, 415nm
+            listOf(0.2241, -0.0106),           // LED3, 555nm
+            listOf(1.0, 0.0)                    // LED4
+        ),
     )
 
     const val INCUBATION_TIME_MIN = 0
@@ -108,6 +120,18 @@ object Constants {
             listOf(24500, 26250),
             listOf(24500, 26250),
             listOf(24500, 26250),
+        ),
+        "HCV-000-3003" to listOf(
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+        ),
+        "HCV-000-3004" to listOf(
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         )
     )
 }

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

@@ -0,0 +1,30 @@
+package com.example.hpostesting.data.constant
+
+import android.content.Context
+import android.content.SharedPreferences
+import java.util.Locale
+
+object LanguageManager {
+    private const val LANGUAGE_PREF_KEY = "language_pref"
+
+    fun setLocale(context: Context, languageCode: String) {
+        val locale = Locale(languageCode)
+        Locale.setDefault(locale)
+
+        val resources = context.resources
+        val configuration = resources.configuration
+        configuration.setLocale(locale)
+
+        context.createConfigurationContext(configuration)
+    }
+
+    fun persistLanguagePreference(context: Context, languageCode: String) {
+        val prefs: SharedPreferences = context.getSharedPreferences("AppPrefs", Context.MODE_PRIVATE)
+        prefs.edit().putString(LANGUAGE_PREF_KEY, languageCode).apply()
+    }
+
+    fun getSavedLanguage(context: Context): String {
+        val prefs: SharedPreferences = context.getSharedPreferences("AppPrefs", Context.MODE_PRIVATE)
+        return prefs.getString(LANGUAGE_PREF_KEY, "en") ?: "en"
+    }
+}

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

@@ -11,6 +11,7 @@ import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import com.example.hpostesting.data.DataHolder
 import com.example.hpostesting.data.constant.Constants
+import com.example.hpostesting.data.constant.LanguageManager
 
 import com.example.hpostesting.presentation.hemocube.HemocubeActivity
 import com.example.hpostesting.presentation.testRight.TestRightActivity
@@ -44,6 +45,12 @@ class KitScanActivity : AppCompatActivity() {
         binding.nameEditText.setText(contents)
     }
 
+    override fun attachBaseContext(newBase: Context?) {
+        val languageCode = LanguageManager.getSavedLanguage(newBase!!)
+        LanguageManager.setLocale(newBase, languageCode)
+        super.attachBaseContext(newBase)
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 

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

@@ -17,6 +17,7 @@ import androidx.core.content.ContextCompat
 import androidx.core.view.get
 import com.example.hpostesting.data.DataHolder
 import com.example.hpostesting.data.constant.Constants
+import com.example.hpostesting.data.constant.LanguageManager
 import com.example.hpostesting.data.model.patient.UserData
 import com.example.hpostesting.data.model.test.TestType
 import com.google.android.gms.location.*
@@ -44,6 +45,12 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
+    override fun attachBaseContext(newBase: Context?) {
+        val languageCode = LanguageManager.getSavedLanguage(newBase!!)
+        LanguageManager.setLocale(newBase, languageCode)
+        super.attachBaseContext(newBase)
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = ActivityMainBinding.inflate(layoutInflater)

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

@@ -2,6 +2,7 @@ package com.example.hpostesting.presentation
 
 import com.example.hpostesting.presentation.dashboard.DashboardActivity
 import android.Manifest
+import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.os.Build
@@ -14,6 +15,7 @@ import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import com.example.hpostesting.data.DataHolder
+import com.example.hpostesting.data.constant.LanguageManager
 import com.example.hpostesting.util.MyUtils
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.ActivitySplashBinding
@@ -32,6 +34,12 @@ class SplashActivity : AppCompatActivity() {
 
     private var allPermissionsGranted = false
 
+    override fun attachBaseContext(newBase: Context?) {
+        val languageCode = LanguageManager.getSavedLanguage(newBase!!)
+        LanguageManager.setLocale(newBase, languageCode)
+        super.attachBaseContext(newBase)
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = ActivitySplashBinding.inflate(layoutInflater)

app/src/main/java/com/example/hpostesting/presentation/adapter/UserListAdapter.kt

@@ -94,13 +94,13 @@ class UserListAdapter(
 
                 val builder = AlertDialog.Builder(context)
                     .setView(dialogView)
-                    .setTitle("Add Blood Group")
+                    .setTitle(R.string.blood_group)
 
                 val etBloodGroup = dialogView.findViewById<AutoCompleteTextView>(R.id.et_blood_group)
 
-                builder.setPositiveButton("OK") { dialog, which ->
+                builder.setPositiveButton(R.string.ok) { dialog, which ->
                     val bloodGroup = etBloodGroup.text.toString()
-                    if (bloodGroup.equals("Select Blood Group") || bloodGroup.isNullOrBlank()) {
+                    if (bloodGroup.equals("Select Blood Group") ||bloodGroup.equals("ರಕ್ತ ಗುಂಪು ಆಯ್ಕೆಮಾಡಿ") || bloodGroup.isNullOrBlank()) {
                         if (view != null) {
                             etBloodGroup.error =view.context.getString(R.string.blood_group_error)
                         }
@@ -166,7 +166,7 @@ class UserListAdapter(
                     // Handle the selected blood group here
                 }
 
-                builder.setNegativeButton("Cancel") { dialog, which ->
+                builder.setNegativeButton(R.string.cancel) { dialog, which ->
                     dialog.dismiss()
                 }
 

app/src/main/java/com/example/hpostesting/presentation/buffercheck/HemocubeBufferCheckActivity.kt

@@ -21,6 +21,7 @@ import androidx.core.content.ContextCompat
 import androidx.core.view.get
 import com.example.hpostesting.data.DataHolder
 import com.example.hpostesting.data.constant.Constants
+import com.example.hpostesting.data.constant.LanguageManager
 import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
 import com.example.hpostesting.presentation.testRight.UsbService
 import com.hoho.android.usbserial.driver.UsbSerialDriver
@@ -73,6 +74,12 @@ open class HemocubeBufferCheckActivity : AppCompatActivity() {
         }
     }
 
+    override fun attachBaseContext(newBase: Context?) {
+        val languageCode = LanguageManager.getSavedLanguage(newBase!!)
+        LanguageManager.setLocale(newBase, languageCode)
+        super.attachBaseContext(newBase)
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = ActivityHemocubeBinding.inflate(layoutInflater)

app/src/main/java/com/example/hpostesting/presentation/dashboard/DashboardActivity.kt

@@ -1,5 +1,6 @@
 package com.example.hpostesting.presentation.dashboard
 
+import android.content.Context
 import android.os.Bundle
 import android.view.Menu
 import android.widget.Toast
@@ -10,6 +11,7 @@ import androidx.navigation.ui.AppBarConfiguration
 import androidx.navigation.ui.navigateUp
 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.firebase.appdistribution.FirebaseAppDistribution
 import com.google.firebase.appdistribution.FirebaseAppDistributionException
@@ -24,6 +26,12 @@ class DashboardActivity : AppCompatActivity() {
     private lateinit var appBarConfiguration: AppBarConfiguration
     private lateinit var binding: ActivityDashboardBinding
 
+    override fun attachBaseContext(newBase: Context?) {
+        val languageCode = LanguageManager.getSavedLanguage(newBase!!)
+        LanguageManager.setLocale(newBase, languageCode)
+        super.attachBaseContext(newBase)
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 

app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt

@@ -162,10 +162,10 @@ class HomeFragment : Fragment() {
             val dateFormat = SimpleDateFormat("yyyy-MM-dd")
             val currentDate = Date()
             val formattedDate = dateFormat.format(currentDate)
-//            val query = Firebase.firestore.collection("patientData")
+            val query = Firebase.firestore.collection("patientData")
-//                .whereGreaterThanOrEqualTo("createdAt", formattedDate)
+                .whereGreaterThanOrEqualTo("createdAt", formattedDate)
-//                .orderBy("createdAt", Query.Direction.DESCENDING)
+                .orderBy("createdAt", Query.Direction.DESCENDING)
-        val query = Firebase.firestore.collection("patientData").whereEqualTo("testStatus", false)
+//        val query = Firebase.firestore.collection("patientData").whereEqualTo("testStatus", false)
             query.get().addOnSuccessListener {
                 if (it.documents.isEmpty()) {
                     binding.pendingTest.visibility = View.VISIBLE

app/src/main/java/com/example/hpostesting/presentation/dashboard/SlideshowFragment.kt

@@ -1,47 +1,66 @@
 package com.example.hpostesting.presentation.dashboard
+
+import android.content.Context
+import android.content.pm.PackageManager
 import android.os.Bundle
-import android.view.LayoutInflater
+import android.widget.Toast
-import android.view.View
+import androidx.preference.ListPreference
-import android.view.ViewGroup
+import androidx.preference.Preference
-import androidx.fragment.app.Fragment
+import androidx.preference.PreferenceFragmentCompat
-import androidx.lifecycle.ViewModelProvider
+import com.example.hpostesting.data.constant.LanguageManager
-import com.example.hpostesting.presentation.dashboard.ui.slideshow.SlideshowViewModel
+import `in`.sminnovations.hpostesting.R
 
-import `in`.sminnovations.hpostesting.databinding.FragmentSlideshowBinding
+private var isLanguageChanged = false
 
-class SlideshowFragment : Fragment() {
+class SlideshowFragment : PreferenceFragmentCompat() {
-    private var _binding: FragmentSlideshowBinding? = null
+    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+        val preferenceScreen = preferenceManager.createPreferenceScreen(requireContext())
 
-    // This property is only valid between onCreateView and
+        val languagePreference = ListPreference(requireContext())
-    // onDestroyView.
+        languagePreference.key = "language_preference"
-    private val binding get() = _binding!!
+        languagePreference.title = getString(R.string.app_language)
+        languagePreference.summary = getString(R.string.select_language)
+        languagePreference.entries = arrayOf("English", "Kannada", "Hindi")
+        languagePreference.entryValues = arrayOf("en", "kn", "hi")
+        languagePreference.setDefaultValue("en")
 
-    override fun onCreateView(
+        languagePreference.onPreferenceChangeListener =
-        inflater: LayoutInflater,
+            Preference.OnPreferenceChangeListener { _, newValue ->
-        container: ViewGroup?,
+                val languageCode = newValue as String
-        savedInstanceState: Bundle?,
+                updateLanguage(requireContext(), languageCode)
-    ): View {
+                true
-        val slideshowViewModel =
+            }
-            ViewModelProvider(this).get(SlideshowViewModel::class.java)
 
-        _binding = FragmentSlideshowBinding.inflate(inflater, container, false)
+        preferenceScreen.addPreference(languagePreference)
-        val root: View = binding.root
+        setPreferenceScreen(preferenceScreen)
 
-        val pInfo = requireActivity().packageManager.getPackageInfo(
+        // App Version Preference
-            requireActivity().packageName, 0
+        val appVersionPreference = Preference(requireContext())
-        )
+        appVersionPreference.title = "App Version"
-        val version = pInfo.versionName
+        appVersionPreference.summary = getAppVersion(requireContext())
-        binding.textSlideshow.text = version
 
-//        val textView: TextView = binding.textSlideshow
+        preferenceScreen.addPreference(languagePreference)
-//        slideshowViewModel.text.observe(viewLifecycleOwner) {
+        preferenceScreen.addPreference(appVersionPreference)
-//            textView.text = it
+        setPreferenceScreen(preferenceScreen)
-//        }
+
-        return root
+        if (isLanguageChanged) {
+            Toast.makeText(requireContext(), R.string.language_update, Toast.LENGTH_SHORT).show()
+        }
     }
 
-    override fun onDestroyView() {
+    private fun updateLanguage(context: Context, languageCode: String) {
-        super.onDestroyView()
+        LanguageManager.persistLanguagePreference(context, languageCode)
-        _binding = null
+        LanguageManager.setLocale(context, languageCode)
+        requireActivity().recreate() // Recreate activity to apply language changes
+        isLanguageChanged = true
+    }
+
+    private fun getAppVersion(context: Context): String {
+        return try {
+            val pInfo = context.packageManager.getPackageInfo(context.packageName, 0)
+            pInfo.versionName
+        } catch (e: PackageManager.NameNotFoundException) {
+            "N/A"
+        }
     }
 }

app/src/main/java/com/example/hpostesting/presentation/diagnostics/DiagnosticsActivity.kt

@@ -21,6 +21,7 @@ import androidx.core.content.ContextCompat
 import androidx.core.view.get
 import com.example.hpostesting.data.DataHolder
 import com.example.hpostesting.data.constant.Constants
+import com.example.hpostesting.data.constant.LanguageManager
 import com.example.hpostesting.presentation.hemocube.HemoCubeFragment
 import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
 import com.example.hpostesting.presentation.testRight.UsbService
@@ -77,6 +78,12 @@ class DiagnosticsActivity : AppCompatActivity() {
         }
     }
 
+    override fun attachBaseContext(newBase: Context?) {
+        val languageCode = LanguageManager.getSavedLanguage(newBase!!)
+        LanguageManager.setLocale(newBase, languageCode)
+        super.attachBaseContext(newBase)
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = ActivityDiagnosticsBinding.inflate(layoutInflater)

app/src/main/java/com/example/hpostesting/presentation/hemocube/DigitalCardActivity.kt

@@ -14,6 +14,7 @@ import android.os.IBinder
 import android.view.Menu
 import androidx.activity.viewModels
 import com.example.hpostesting.data.DataHolder
+import com.example.hpostesting.data.constant.LanguageManager
 import com.example.hpostesting.presentation.testRight.UsbService
 import com.hoho.android.usbserial.driver.UsbSerialDriver
 import `in`.sminnovations.hpostesting.R
@@ -21,8 +22,15 @@ import `in`.sminnovations.hpostesting.databinding.ActivityDigitalCardBinding
 import `in`.sminnovations.hpostesting.databinding.ActivityHemocubeBinding
 
 class DigitalCardActivity : AppCompatActivity() {
+
     private lateinit var binding: ActivityDigitalCardBinding
 
+    override fun attachBaseContext(newBase: Context?) {
+        val languageCode = LanguageManager.getSavedLanguage(newBase!!)
+        LanguageManager.setLocale(newBase, languageCode)
+        super.attachBaseContext(newBase)
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = ActivityDigitalCardBinding.inflate(layoutInflater)

app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt

@@ -1,6 +1,5 @@
 package com.example.hpostesting.presentation.hemocube
 
-import com.example.hpostesting.presentation.dashboard.DashboardActivity
 import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
@@ -19,7 +18,7 @@ import com.example.hpostesting.data.constant.HemoCubeCommands
 import com.example.hpostesting.data.model.patient.DeviceData
 import com.example.hpostesting.data.model.patient.toHemoCubeTestData
 import com.example.hpostesting.presentation.UsbServiceListener
-
+import com.example.hpostesting.presentation.dashboard.DashboardActivity
 import com.example.hpostesting.presentation.utils.MyDialogListener
 import com.example.hpostesting.presentation.utils.UIUtils
 import com.google.firebase.crashlytics.ktx.crashlytics
@@ -131,13 +130,11 @@ class HemoCubeFragment : Fragment() {
 
                 activity?.runOnUiThread {
                     binding.btnSubmit.visibility = View.GONE
-                    binding.btnDigitalCard.visibility = View.VISIBLE
-                    binding.btnDigitalCard.setOnClickListener {
                         val i = Intent(
-                            requireContext().applicationContext, DigitalCardActivity::class.java
+                            requireContext().applicationContext, DashboardActivity::class.java
                         )
                         startActivity(i)
-                    }
+
                 }
             }
             if (result == "Local") {

app/src/main/java/com/example/hpostesting/presentation/hemocube/HemocubeActivity.kt

@@ -21,6 +21,7 @@ import androidx.core.content.ContextCompat
 import androidx.core.view.get
 import com.example.hpostesting.data.DataHolder
 import com.example.hpostesting.data.constant.Constants
+import com.example.hpostesting.data.constant.LanguageManager
 import com.example.hpostesting.presentation.testRight.UsbService
 import com.hoho.android.usbserial.driver.UsbSerialDriver
 import com.hoho.android.usbserial.driver.UsbSerialProber
@@ -72,6 +73,12 @@ open class HemocubeActivity : AppCompatActivity() {
             viewModel.isServiceConnected = false
         }
     }
+    override fun attachBaseContext(newBase: Context?) {
+        val languageCode = LanguageManager.getSavedLanguage(newBase!!)
+        LanguageManager.setLocale(newBase, languageCode)
+        super.attachBaseContext(newBase)
+    }
+
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)

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

@@ -1,36 +1,9 @@
-<!-- SlideshowFragment layout -->
+<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="com.example.hpostesting.presentation.dashboard.SlideshowFragment">
 
-    <TextView
+</androidx.constraintlayout.widget.ConstraintLayout>
-        android:visibility="gone"
-        android:id="@+id/text_slideshow"
-        style="@style/title1"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="24dp"
-        android:textAlignment="center"
-        android:textSize="20sp"
-        android:text="@string/to_be_launched_in_next_version_of_the_app"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <!-- Language Settings -->
-    <FrameLayout
-        android:id="@+id/fragment_container"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        app:layout_constraintTop_toBottomOf="@id/text_slideshow"
-        app:layout_constraintBottom_toBottomOf="parent">
-
-
-
-    </FrameLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -255,5 +255,9 @@
     <string name="place_sample">सैम्पल रखें</string>
     <string name="invalid">अमान्य</string>
     <string name="error">त्रुटि</string>
-
+    <string name="language_update">भाषा सफलतापूर्वक अपडेट की गई है</string>
+    <string name="select_language">अपनी पसंदीदा भाषा का चयन करें</string>
+    <string name="app_language">ऐप भाषा</string>
+    <string name="add_blood_group">रक्त समूह जोड़ें</string>
+    <string name="ok">ठीक है</string>
 </resources>

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

@@ -255,5 +255,11 @@
     <string name="place_sample">ನಮೂನೆ ಇಟ್ಟುಕೊಳ್ಳಿ</string>
     <string name="invalid">ಅಮಾನ್ಯ</string>
     <string name="error">ದೋಷ</string>
+    <string name="language_update">ಭಾಷೆ ಯಶಸ್ವಿಯಾಗಿ ನವೀಕರಿಸಲಾಗಿದೆ</string>
+    <string name="select_language">ನಿಮ್ಮ ಆದರಿತ ಭಾಷೆಯನ್ನು ಆಯ್ಕೆ ಮಾಡಿ</string>
+    <string name="app_language">ಅಪ್ಲಿಕೇಶನ್ ಭಾಷೆ</string>
+    <string name="add_blood_group">ರಕ್ತ ಗುಂಡನ್ನು ಸೇರಿಸಿ</string>
+    <string name="ok">ಸರಿ</string>
+        <!-- Add translations for other strings -->
 
 </resources>

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

@@ -155,6 +155,7 @@
     <string name="is_patient_married_yes_no">Is Patient Married? (Yes/No)</string>
     <string name="category">Category</string>
     <string name="blood_group">Blood Group</string>
+    <string name="add_blood_group">Add Blood Group</string>
     <string name="digital_card">Digital Counselling Card</string>
     <string name="patient_medical_records">Patient Medical Records</string>
     <string name="patient_address_details">Patient Address Details</string>
@@ -255,5 +256,8 @@
     <string name="place_sample">Place Sample</string>
     <string name="invalid">Invalid</string>
     <string name="error">Error</string>
-
+    <string name="language_update">Language updated successfully</string>
+    <string name="select_language">Select your preferred language</string>
+    <string name="app_language">App Language</string>
+    <string name="ok">OK</string>
 </resources>