Fix showing map snackbar messages

Signed-off-by: Elly Kitoto <[email protected]>
opensrp · Dec 10, 2024 · 3dca72c · 3dca72c
1 parent 8e329f3
commit 3dca72c
Showing 1 changed file with 19 additions and 27 deletions.
diff --git a/...src/main/java/org/smartregister/fhircore/quest/ui/geowidget/GeoWidgetLauncherViewModel.kt b/...src/main/java/org/smartregister/fhircore/quest/ui/geowidget/GeoWidgetLauncherViewModel.kt
@@ -171,6 +171,7 @@ constructor(
           }
         }
 
+      _isSyncing.postValue(false)
       geoJsonFeatures.postValue(features)
 
       Timber.w(
@@ -202,43 +203,34 @@ constructor(
           ),
         )
       } else {
-        val message =
-          if (searchText.isNullOrBlank()) {
-            context.getString(R.string.all_locations_rendered)
-          } else {
-            context.getString(R.string.all_matching_locations_rendered, locationsCount)
-          }
-        emitSnackBarState(
-          SnackBarMessageConfig(
-            message = message,
-            actionLabel = context.getString(org.smartregister.fhircore.engine.R.string.ok),
-            duration = SnackbarDuration.Short,
-          ),
-        )
-      }
-
-      // Account for missing locations
-      if (locationsCount == 0) {
-        if (!searchText.isNullOrBlank()) {
+        if (locationsCount == 0) {
           val message =
-            context.getString(
-              R.string.no_found_locations_matching_text,
-              searchText,
-            )
-          Timber.w(message)
+            if (!searchText.isNullOrBlank()) {
+              context.getString(R.string.no_found_locations_matching_text, searchText)
+            } else context.getString(R.string.no_locations_to_render)
           emitSnackBarState(
             SnackBarMessageConfig(
               message = message,
               actionLabel = context.getString(org.smartregister.fhircore.engine.R.string.ok),
               duration = SnackbarDuration.Long,
             ),
           )
+          Timber.w(message)
         } else {
-          SnackBarMessageConfig(
-            message = context.getString(R.string.no_locations_to_render),
-            actionLabel = context.getString(org.smartregister.fhircore.engine.R.string.ok),
-            duration = SnackbarDuration.Long,
+          val message =
+            if (searchText.isNullOrBlank()) {
+              context.getString(R.string.all_locations_rendered)
+            } else {
+              context.getString(R.string.all_matching_locations_rendered, locationsCount)
+            }
+          emitSnackBarState(
+            SnackBarMessageConfig(
+              message = message,
+              actionLabel = context.getString(org.smartregister.fhircore.engine.R.string.ok),
+              duration = SnackbarDuration.Short,
+            ),
           )
+          Timber.w(message)
         }
       }
     }