fix #2431 Progessbar Correct state transition logic

Author: SaiThanushreddy

app/src/main/java/org/mifos/mobile/ui/fragments/RecentTransactionsFragment.kt

@@ -8,7 +8,6 @@ import android.view.ViewGroup
 import android.widget.Toast
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -23,8 +22,12 @@ import org.mifos.mobile.models.Transaction
 import org.mifos.mobile.ui.activities.base.BaseActivity
 import org.mifos.mobile.ui.adapters.RecentTransactionListAdapter
 import org.mifos.mobile.ui.fragments.base.BaseFragment
-import org.mifos.mobile.utils.*
+import org.mifos.mobile.utils.Constants
+import org.mifos.mobile.utils.DividerItemDecoration
+import org.mifos.mobile.utils.EndlessRecyclerViewScrollListener
 import org.mifos.mobile.utils.Network.isConnected
+import org.mifos.mobile.utils.RecentTransactionUiState
+import org.mifos.mobile.utils.Toaster
 import org.mifos.mobile.viewModels.RecentTransactionViewModel
 import javax.inject.Inject
 
@@ -71,32 +74,43 @@ class RecentTransactionsFragment : BaseFragment(), OnRefreshListener {
 
         viewLifecycleOwner.lifecycleScope.launch {
             repeatOnLifecycle(Lifecycle.State.STARTED) {
-                recentTransactionViewModel.recentTransactionUiState.collect{
+                recentTransactionViewModel.recentTransactionUiState.collect {
                     when (it) {
+
                         is RecentTransactionUiState.Loading -> showProgress()
                         is RecentTransactionUiState.RecentTransactions -> {
                             hideProgress()
                             showRecentTransactions(it.transactions)
                         }
+
                         is RecentTransactionUiState.Error -> {
                             hideProgress()
                             showMessage(getString(it.message))
                         }
+
                         is RecentTransactionUiState.EmptyTransaction -> {
                             hideProgress()
                             showEmptyTransaction()
                         }
+
                         is RecentTransactionUiState.LoadMoreRecentTransactions -> {
                             hideProgress()
                             showLoadMoreRecentTransactions(it.transactions)
                         }
 
-                        RecentTransactionUiState.Initial -> {}
+
+                        else -> {
+                            hideProgress()
+
+                        }
                     }
                 }
             }
         }
 
+
+
+
         binding.layoutError.btnTryAgain.setOnClickListener {
             retryClicked()
         }

app/src/main/java/org/mifos/mobile/viewModels/RecentTransactionViewModel.kt

@@ -28,24 +28,34 @@ class RecentTransactionViewModel @Inject constructor(private val recentTransacti
         loadRecentTransactions(offset, limit)
     }
 
-    private fun loadRecentTransactions(offset: Int, limit: Int) {
+    private fun loadRecentTransactions(offset: Int, limit: Int, refresh: Boolean = false) {
         viewModelScope.launch {
-            _recentTransactionUiState.value = RecentTransactionUiState.Loading
-            recentTransactionRepositoryImp.recentTransactions(offset, limit).catch {
-                _recentTransactionUiState.value =
-                    RecentTransactionUiState.Error(R.string.recent_transactions)
-            }.collect {
-                if (it.totalFilteredRecords == 0) {
-                    _recentTransactionUiState.value = RecentTransactionUiState.EmptyTransaction
-                } else if (loadmore && it.pageItems.isNotEmpty()) {
-                    _recentTransactionUiState.value =
-                        RecentTransactionUiState.LoadMoreRecentTransactions(it.pageItems)
-                } else if (it.pageItems.isNotEmpty()) {
+            try {
+                _recentTransactionUiState.value = RecentTransactionUiState.Loading
+
+                recentTransactionRepositoryImp.recentTransactions(offset, limit).catch {
+
                     _recentTransactionUiState.value =
-                        RecentTransactionUiState.RecentTransactions(it.pageItems)
+                        RecentTransactionUiState.Error(R.string.recent_transactions)
+                }.collect {
+                    if (it.totalFilteredRecords == 0) {
+
+                        _recentTransactionUiState.value = RecentTransactionUiState.EmptyTransaction
+                    } else if (loadmore && it.pageItems.isNotEmpty()) {
+
+                        _recentTransactionUiState.value =
+                            RecentTransactionUiState.LoadMoreRecentTransactions(it.pageItems)
+                    } else if (it.pageItems.isNotEmpty()) {
+
+                        _recentTransactionUiState.value =
+                            RecentTransactionUiState.RecentTransactions(it.pageItems)
+                    }
                 }
+            } finally {
+                _recentTransactionUiState.value = RecentTransactionUiState.Initial
             }
+
         }
     }
+}
 
-}