Release 5.0 Code Merge to main

app/build.gradle

@@ -157,8 +157,11 @@ dependencies {
     implementation "androidx.datastore:datastore-preferences:1.0.0"
     implementation 'androidx.biometric:biometric:1.2.0-alpha05'
 
+    // EncryptedSharedPreferences for secure credential storage
+    implementation "androidx.security:security-crypto:1.1.0-alpha06"
+
     //tensorflow and mediapipe.
-    implementation 'com.google.mediapipe:tasks-vision:latest.release'
+    implementation 'com.google.mediapipe:tasks-vision:0.10.21'
     implementation ("org.tensorflow:tensorflow-lite:2.11.0")
     implementation ("org.tensorflow:tensorflow-lite-gpu:2.11.0")
     implementation ("org.tensorflow:tensorflow-lite-gpu-api:2.11.0")

app/src/main/AndroidManifest.xml

@@ -2,6 +2,13 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <!-- Required for camera intent on Android 11+ (package visibility); prevents crash when taking picture on Android 12+ -->
+    <queries>
+        <intent>
+            <action android:name="android.media.action.IMAGE_CAPTURE" />
+        </intent>
+    </queries>
+
     <uses-feature android:name="android.hardware.camera" />
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -49,43 +56,57 @@
         tools:targetApi="31">
         <activity
             android:name=".ui.outreach_activity.OutreachActivity"
-            android:exported="false" />
+            android:exported="false"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustResize" />
         <activity
             android:name=".ui.abha_id_activity.AbhaIdActivity"
             android:exported="false"
             android:label="@string/title_activity_abha_id"
             android:theme="@style/Theme.CHO"
+            android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustResize">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
-        <activity
-            android:name=".ui.web_view_activity.WebViewActivity"
-            android:exported="false"
-            android:label="@string/title_activity_web_view"
-            android:theme="@style/Theme.CHO" />
-
         <activity
             android:name=".ui.edit_patient_details_activity.EditPatientDetailsActivity"
-            android:exported="false" />
+            android:exported="false"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustResize" />
         <activity
             android:name=".ui.register_patient_activity.RegisterPatientActivity"
             android:exported="false"
+            android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustResize" />
         <activity
             android:name=".ui.register_patient_activity.scanAadhaar.ScanAadhaarActivity"
-            android:exported="false" />
+            android:exported="false"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustResize" />
         <activity
             android:name=".ui.register_patient_activity.scanAadhaar.CaptureAct"
+            android:screenOrientation="portrait"
             android:exported="false" />
         <activity
             android:name=".ui.master_location_settings.MasterLocationSettingsActivity"
-            android:exported="false" />
+            android:screenOrientation="portrait"
+            android:exported="false"
+            android:windowSoftInputMode="adjustResize" />
         <activity
             android:name=".ui.home_activity.HomeActivity"
             android:exported="false"
-            android:label="CPHC" />
+            android:label="CPHC"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustResize" />
+        <activity
+            android:name=".ui.home.rmncha.SubModuleActivity"
+            android:exported="false"
+            android:label="@string/app_name"
+            android:screenOrientation="portrait"
+            android:parentActivityName=".ui.home_activity.HomeActivity"
+            android:windowSoftInputMode="adjustResize" />
         <activity
             android:name=".ui.login_activity.LoginActivity"
             android:exported="true"
@@ -115,7 +136,7 @@
         <provider
             android:name="androidx.startup.InitializationProvider"
             android:authorities="${applicationId}.androidx-startup"
-            tools:node="remove"/>
+            tools:node="remove" />
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.provider"

app/src/main/java/org/piramalswasthya/cho/CHOApplication.kt

@@ -14,6 +14,8 @@ import androidx.work.Configuration
 import dagger.hilt.android.EntryPointAccessors
 import dagger.hilt.android.HiltAndroidApp
 import com.google.firebase.FirebaseApp
+import org.piramalswasthya.cho.network.TokenRefreshHolder
+import org.piramalswasthya.cho.network.TokenRefreshProvider
 import org.piramalswasthya.cho.ui.home_activity.DemoDataStore
 import timber.log.Timber
 import javax.inject.Inject
@@ -58,10 +60,69 @@ class CHOApplication : Application(), Configuration.Provider {
             AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
         }
 
+        // Global keyboard insets handler: ensures the layout resizes when the soft keyboard
+        // opens on ALL activities. Required because targetSdk 35 enforces edge-to-edge,
+        // which makes windowSoftInputMode="adjustResize" silently ignored.
+        registerActivityLifecycleCallbacks(object : ActivityLifecycleCallbacks {
+            override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
+                val window = activity.window
+                val insetsController = WindowCompat.getInsetsController(window, window.decorView)
+                insetsController.isAppearanceLightStatusBars = false
+                val statusBarBgView = View(activity).apply {
+                    tag = "status_bar_bg"
+                    setBackgroundColor(android.graphics.Color.parseColor("#24303C"))
+                }
+
+                val decorView = window.decorView as android.view.ViewGroup
+                decorView.addView(
+                    statusBarBgView,
+                    android.widget.FrameLayout.LayoutParams(
+                        android.widget.FrameLayout.LayoutParams.MATCH_PARENT, 0
+                    )
+                )
+
+                val rootView = activity.findViewById<View>(android.R.id.content)
+                ViewCompat.setOnApplyWindowInsetsListener(rootView) { view, insets ->
+                    val imeInsets = insets.getInsets(WindowInsetsCompat.Type.ime())
+                    val systemBarInsets = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+                    val bottomPadding = maxOf(imeInsets.bottom, systemBarInsets.bottom)
+                    view.setPadding(
+                        systemBarInsets.left,
+                        systemBarInsets.top,
+                        systemBarInsets.right,
+                        bottomPadding
+                    )
+
+                    statusBarBgView.layoutParams.height = systemBarInsets.top
+                    statusBarBgView.requestLayout()
+                    WindowInsetsCompat.CONSUMED
+                }
+            }
+
+            override fun onActivityStarted(activity: Activity) { /* No action needed */ }
+            override fun onActivityResumed(activity: Activity) { /* No action needed */ }
+            override fun onActivityPaused(activity: Activity) { /* No action needed */ }
+            override fun onActivityStopped(activity: Activity) { /* No action needed */ }
+            override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) { /* No action needed */ }
+            override fun onActivityDestroyed(activity: Activity) { /* No action needed */ }
+        })
+
+        // Set token refresh provider so AuthRefreshInterceptor can refresh JWT when expired
+        try {
+            val entryPoint = EntryPointAccessors.fromApplication(this, TokenRefreshEntryPoint::class.java)
+            TokenRefreshHolder.provider = entryPoint.tokenRefreshProvider()
+        } catch (e: Exception) {
+            Timber.w(e, "CHOApplication: Could not set TokenRefreshProvider")
+        }
     }
 
+    @dagger.hilt.EntryPoint
+    @dagger.hilt.InstallIn(dagger.hilt.components.SingletonComponent::class)
+    interface TokenRefreshEntryPoint {
+        fun tokenRefreshProvider(): TokenRefreshProvider
+    }
 
     companion object {
         fun dataStore(context: Context) = (context.applicationContext as CHOApplication).dataStore
     }
-}
+}

app/src/main/java/org/piramalswasthya/cho/adapter/ANCVisitsAdapter.kt

@@ -0,0 +1,103 @@
+package org.piramalswasthya.cho.adapter
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
+import org.piramalswasthya.cho.databinding.RvItemAncVisitBinding
+import org.piramalswasthya.cho.model.PatientWithPwrDomain
+import org.piramalswasthya.cho.utils.DateTimeUtil
+
+class ANCVisitsAdapter(
+    private val clickListener: ClickListener? = null
+) : ListAdapter<PatientWithPwrDomain, ANCVisitsAdapter.ANCVisitViewHolder>(
+    ANCVisitDiffUtilCallBack
+) {
+
+    private object ANCVisitDiffUtilCallBack : DiffUtil.ItemCallback<PatientWithPwrDomain>() {
+        override fun areItemsTheSame(
+            oldItem: PatientWithPwrDomain,
+            newItem: PatientWithPwrDomain
+        ) = oldItem.patient.patientID == newItem.patient.patientID
+
+        override fun areContentsTheSame(
+            oldItem: PatientWithPwrDomain,
+            newItem: PatientWithPwrDomain
+        ) = oldItem == newItem
+    }
+
+    class ANCVisitViewHolder private constructor(
+        private val binding: RvItemAncVisitBinding
+    ) : RecyclerView.ViewHolder(binding.root) {
+
+        companion object {
+            fun from(parent: ViewGroup): ANCVisitViewHolder {
+                val layoutInflater = LayoutInflater.from(parent.context)
+                val binding = RvItemAncVisitBinding.inflate(layoutInflater, parent, false)
+                return ANCVisitViewHolder(binding)
+            }
+        }
+
+        fun bind(
+            item: PatientWithPwrDomain,
+            clickListener: ClickListener?
+        ) {
+            binding.patientWithPwr = item
+            binding.clickListener = clickListener
+            binding.ivCall.setOnClickListener {
+                clickListener?.onClickCall(item)
+            }
+
+            // Set weeks of pregnancy
+            val weeks = item.getWeeksOfPregnancy()
+            binding.tvWeeksPregnancy.text = if (weeks > 0 && weeks <= 40) {
+                weeks.toString()
+            } else {
+                "N/A"
+            }
+
+            // Set LMP date
+            binding.tvLmp.text = item.getFormattedLMPDate()
+
+            // Set EDD
+            binding.tvEdd.text = item.getFormattedEDD()
+
+            binding.tvLastVisit.text = "N/A"
+
+            // Hide "Add Visit" button if ANC 4 is completed and patient is not HRP
+            val isAnc4Completed = item.ancRecords.any { it.visitNumber == 4 && it.weight != null }
+            val isHRP = item.pwr?.isHrp ?: false
+            binding.btnAddAnc.visibility = if (isAnc4Completed && !isHRP) View.GONE else View.VISIBLE
+
+            binding.executePendingBindings()
+        }
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) =
+        ANCVisitViewHolder.from(parent)
+
+    override fun onBindViewHolder(holder: ANCVisitViewHolder, position: Int) {
+        holder.bind(getItem(position), clickListener)
+    }
+
+    class ClickListener(
+        private val clickedAddANC: ((patientWithPwr: PatientWithPwrDomain) -> Unit)? = null,
+        private val clickedANCVisits: ((patientWithPwr: PatientWithPwrDomain) -> Unit)? = null,
+        private val clickedAddPMSMA: ((patientWithPwr: PatientWithPwrDomain) -> Unit)? = null,
+        private val clickedCall: ((patientWithPwr: PatientWithPwrDomain) -> Unit)? = null
+    ) {
+        fun onClickAddANC(item: PatientWithPwrDomain) =
+            clickedAddANC?.let { it(item) }
+
+        fun onClickANCVisits(item: PatientWithPwrDomain) =
+            clickedANCVisits?.let { it(item) }
+
+        fun onClickAddPMSMA(item: PatientWithPwrDomain) =
+            clickedAddPMSMA?.let { it(item) }
+
+        fun onClickCall(item: PatientWithPwrDomain) =
+            clickedCall?.let { it(item) }
+    }
+}

app/src/main/java/org/piramalswasthya/cho/adapter/AbortionListAdapter.kt

@@ -0,0 +1,89 @@
+package org.piramalswasthya.cho.adapter
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
+import org.piramalswasthya.cho.databinding.RvItemAbortionBinding
+import org.piramalswasthya.cho.model.AbortionDomain
+
+class AbortionListAdapter(
+    private val clickListener: ClickListener? = null
+) : ListAdapter<AbortionDomain, AbortionListAdapter.AbortionViewHolder>(
+    AbortionDiffUtilCallBack
+) {
+
+    private object AbortionDiffUtilCallBack : DiffUtil.ItemCallback<AbortionDomain>() {
+        override fun areItemsTheSame(
+            oldItem: AbortionDomain,
+            newItem: AbortionDomain
+        ) = oldItem.patient.patientID == newItem.patient.patientID &&
+                oldItem.abortionRecord?.id == newItem.abortionRecord?.id
+
+        override fun areContentsTheSame(
+            oldItem: AbortionDomain,
+            newItem: AbortionDomain
+        ) = oldItem == newItem
+    }
+
+    class AbortionViewHolder private constructor(
+        private val binding: RvItemAbortionBinding
+    ) : RecyclerView.ViewHolder(binding.root) {
+
+        companion object {
+            fun from(parent: ViewGroup): AbortionViewHolder {
+                val layoutInflater = LayoutInflater.from(parent.context)
+                val binding = RvItemAbortionBinding.inflate(layoutInflater, parent, false)
+                return AbortionViewHolder(binding)
+            }
+        }
+
+        fun bind(
+            item: AbortionDomain,
+            clickListener: ClickListener?
+        ) {
+            binding.item = item
+            binding.clickListener = clickListener
+            binding.context = binding.root.context
+
+            // Set button color based on abortion form status (text is bound via app:abortionActionText)
+            val isFormFilled = item.isAbortionFormFilled
+            binding.btnAction.setBackgroundColor(
+                binding.root.resources.getColor(
+                    if (isFormFilled) android.R.color.holo_green_dark 
+                    else android.R.color.holo_red_dark,
+                    null
+                )
+            )
+
+
+            // Set sync icon visibility
+            binding.ivSync.visibility = if (item.abortionRecord?.syncState == org.piramalswasthya.cho.database.room.SyncState.SYNCED) {
+                android.view.View.VISIBLE
+            } else {
+                android.view.View.GONE
+            }
+
+            binding.executePendingBindings()
+        }
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) =
+        AbortionViewHolder.from(parent)
+
+    override fun onBindViewHolder(holder: AbortionViewHolder, position: Int) {
+        holder.bind(getItem(position), clickListener)
+    }
+
+    class ClickListener(
+        private val clickedView: ((patientID: String) -> Unit)? = null,
+        private val clickedAdd: ((patientID: String) -> Unit)? = null
+    ) {
+        fun onClickView(item: AbortionDomain) =
+            clickedView?.let { it(item.patient.patientID) }
+
+        fun onClickAdd(item: AbortionDomain) =
+            clickedAdd?.let { it(item.patient.patientID) }
+    }
+}