Keep Showing Progress Dialog on while Survey Loads (#2768)

* added progress dialog support * flow changed to primitive * format fix --------- Co-authored-by: Gino Miceli <228050+gino-m@users.noreply.github.com>
google · Oct 3, 2024 · ee40584 · ee40584
1 parent 92c5392
commit ee40584
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/ground/src/main/java/com/google/android/ground/ui/surveyselector/SurveySelectorFragment.kt b/ground/src/main/java/com/google/android/ground/ui/surveyselector/SurveySelectorFragment.kt
@@ -55,11 +55,15 @@ class SurveySelectorFragment : AbstractFragment(), BackPressListener {
         showProgressDialog()
       }
       UiState.SurveyActivated -> {
-        dismissProgressDialog()
+        if (!viewModel.surveyActivationInProgress) {
+          dismissProgressDialog()
+        }
       }
       is UiState.SurveyListAvailable -> {
         handleSurveyListUpdated(uiState.surveys)
-        dismissProgressDialog()
+        if (!viewModel.surveyActivationInProgress) {
+          dismissProgressDialog()
+        }
       }
       is UiState.Error -> {
         dismissProgressDialog()

diff --git a/ground/src/main/java/com/google/android/ground/ui/surveyselector/SurveySelectorViewModel.kt b/ground/src/main/java/com/google/android/ground/ui/surveyselector/SurveySelectorViewModel.kt
@@ -53,7 +53,8 @@ internal constructor(
 
   private val _uiState: MutableStateFlow<UiState> = MutableStateFlow(UiState.FetchingSurveys)
   val uiState: StateFlow<UiState> = _uiState.asStateFlow()
-  private var surveyActivationInProgress = false
+
+  var surveyActivationInProgress = false
 
   init {
     viewModelScope.launch {
@@ -86,8 +87,8 @@ internal constructor(
         }
         .fold(
           onSuccess = {
-            _uiState.emit(UiState.SurveyActivated)
             surveyActivationInProgress = false
+            _uiState.emit(UiState.SurveyActivated)
             navigateToHomeScreen()
           },
           onFailure = { exception ->