Merge pull request #2038 from opensrp/fix-menu-count-anr

Fix menu count anr

Author: LZRS

android/engine/src/main/java/org/smartregister/fhircore/engine/domain/model/SideMenuOption.kt

@@ -24,7 +24,7 @@ import org.smartregister.fhircore.engine.appfeature.model.HealthModule
  * @property healthModule Optional healthModule property
  * @property iconResource Android drawable resource used as icon for menu option
  * @property titleResource Android translatable string resource used as the menu option title
- * @property count The current count for the menu item. Default is 0
+ * @property count Gets the current count for the menu item. Default is 0
  * @property showCount Show clients count against the menu option queries for resources other than
  * Patient
  */
@@ -34,6 +34,6 @@ data class SideMenuOption(
   val healthModule: HealthModule = HealthModule.DEFAULT,
   val iconResource: Int,
   val titleResource: Int,
-  val count: Long = 0,
+  val count: suspend () -> Long = suspend { 0 },
   val showCount: Boolean = true,
 )

android/quest/build.gradle

@@ -181,6 +181,8 @@ dependencies {
     implementation('org.smartregister:p2p-lib:0.3.0-SNAPSHOT')
     implementation deps.accompanist.swiperefresh
 
+    implementation 'com.github.anrwatchdog:anrwatchdog:1.4.0'
+
     //Hilt - Dependency Injection
     implementation "com.google.dagger:hilt-android:$hiltVersion"
     kapt "com.google.dagger:hilt-compiler:$hiltVersion"

android/quest/src/main/java/org/smartregister/fhircore/quest/QuestApplication.kt

@@ -25,6 +25,7 @@ import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.ProcessLifecycleOwner
 import androidx.work.Configuration
+import com.github.anrwatchdog.ANRWatchDog
 import com.google.android.fhir.datacapture.DataCaptureConfig
 import dagger.hilt.android.HiltAndroidApp
 import javax.inject.Inject
@@ -67,6 +68,10 @@ class QuestApplication :
 
   override fun onCreate() {
     super<Application>.onCreate()
+
+    // Detect input timeout ANRs
+    ANRWatchDog().start()
+
     if (BuildConfig.DEBUG) {
       Timber.plant(Timber.DebugTree())
     }

android/quest/src/main/java/org/smartregister/fhircore/quest/navigation/SideMenuOptionFactory.kt

@@ -18,7 +18,6 @@ package org.smartregister.fhircore.quest.navigation
 
 import javax.inject.Inject
 import javax.inject.Singleton
-import kotlinx.coroutines.runBlocking
 import org.smartregister.fhircore.engine.appfeature.AppFeature
 import org.smartregister.fhircore.engine.appfeature.AppFeatureManager
 import org.smartregister.fhircore.engine.appfeature.model.HealthModule
@@ -41,7 +40,7 @@ constructor(
       titleResource = R.string.all_clients,
       showCount = true,
       count =
-        runBlocking {
+        suspend {
           patientRegisterRepository.countRegisterData(
             appFeatureName = AppFeature.PatientManagement.name,
             healthModule = HealthModule.DEFAULT
@@ -81,7 +80,7 @@ constructor(
             },
           showCount = true,
           count =
-            runBlocking {
+            suspend {
               patientRegisterRepository.countRegisterData(
                 appFeatureName = it.feature,
                 healthModule = it.healthModule!!

android/quest/src/main/java/org/smartregister/fhircore/quest/ui/main/components/AppDrawer.kt

@@ -38,6 +38,7 @@ import androidx.compose.material.DropdownMenuItem
 import androidx.compose.material.Icon
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -54,6 +55,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.rememberNavController
+import kotlinx.coroutines.launch
 import org.smartregister.fhircore.engine.domain.model.Language
 import org.smartregister.fhircore.engine.domain.model.SideMenuOption
 import org.smartregister.fhircore.engine.ui.theme.AppTitleColor
@@ -113,10 +115,14 @@ fun AppDrawer(
         items(sideMenuOptions, { "${it.appFeatureName}|${it.healthModule.name}" }) { sideMenuOption
           ->
           val title = stringResource(sideMenuOption.titleResource)
+
+          val (countValue, setCountValue) = remember { mutableStateOf(0L) }
+          LaunchedEffect(key1 = sideMenuOption.count) { setCountValue(sideMenuOption.count()) }
+
           SideMenuItem(
             iconResource = sideMenuOption.iconResource,
             title = title,
-            endText = sideMenuOption.count.toString(),
+            endText = countValue.toString(),
             showEndText = sideMenuOption.showCount,
             onSideMenuClick = {
               openDrawer(false)
@@ -270,14 +276,14 @@ fun AppDrawerPreview() {
           appFeatureName = "AllFamilies",
           iconResource = R.drawable.ic_user,
           titleResource = R.string.clients,
-          count = 4,
+          count = suspend { 4 },
           showCount = true,
         ),
         SideMenuOption(
           appFeatureName = "ChildClients",
           iconResource = R.drawable.ic_user,
           titleResource = R.string.clients,
-          count = 16,
+          count = suspend { 16 },
           showCount = true
         ),
         SideMenuOption(
@@ -312,14 +318,14 @@ fun AppDrawerPreviewSyncDisabled() {
           appFeatureName = "AllFamilies",
           iconResource = R.drawable.ic_user,
           titleResource = R.string.clients,
-          count = 4,
+          count = suspend { 4 },
           showCount = true,
         ),
         SideMenuOption(
           appFeatureName = "ChildClients",
           iconResource = R.drawable.ic_user,
           titleResource = R.string.clients,
-          count = 16,
+          count = suspend { 16 },
           showCount = true
         ),
         SideMenuOption(