Refactor DataCollectionViewModel to Remove Blocking Calls and Add Load State Management #3224
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
shobhitagarwal1612
requested changes
Aug 25, 2025
app/src/main/java/org/groundplatform/android/ui/datacollection/DataCollectionViewModel.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/org/groundplatform/android/ui/datacollection/DataCollectionViewModel.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/org/groundplatform/android/ui/datacollection/DataCollectionViewModel.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/org/groundplatform/android/ui/datacollection/DataCollectionViewModel.kt
Outdated
Show resolved
Hide resolved
|
@anandwana001 Gentle ping |
Codecov Report❌ Patch coverage is Additional details and impacted files@@ Coverage Diff @@
## master #3224 +/- ##
============================================
+ Coverage 67.16% 67.22% +0.05%
- Complexity 1411 1415 +4
============================================
Files 303 304 +1
Lines 7642 7682 +40
Branches 774 782 +8
============================================
+ Hits 5133 5164 +31
- Misses 2076 2080 +4
- Partials 433 438 +5
🚀 New features to boost your workflow:
|
|
Use cases to verify:
|
| viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) { | ||
| var uiStateJob: Job? = null | ||
| viewModel.loadState.collect { state -> | ||
| binding.progressBar.isVisible = state is LoadState.Loading |
There was a problem hiding this comment.
Ensure that this is well tested too.
Comment on lines
+107
to
+124
| when (state) { | ||
| is LoadState.Error -> { | ||
| uiStateJob?.cancel() | ||
| } | ||
|
|
||
| lifecycleScope.launch { viewModel.uiState.filterNotNull().collect { updateUI(it) } } | ||
| is LoadState.Ready -> { | ||
| updateUI( | ||
| UiState.TaskListAvailable( | ||
| state.tasks, | ||
| viewModel.getTaskPosition(viewModel.getCurrentTaskId()), | ||
| ) | ||
| ) | ||
| uiStateJob?.cancel() | ||
| uiStateJob = launch { viewModel.uiState.filterNotNull().collect { updateUI(it) } } | ||
| } | ||
| else -> { | ||
| uiStateJob?.cancel() | ||
| } |
There was a problem hiding this comment.
Please refactor this code into smaller (single-purpose) functions for better readability.
| throw e | ||
| } | ||
| } | ||
| val surveyId: String |
There was a problem hiding this comment.
Please check if this can be kept private
| viewModelFactory.create(getViewModelClass(task.type)) | ||
| } catch (e: Exception) { | ||
| Timber.e("ignoring task with invalid type: $task.type") | ||
| Timber.e("$e ignoring task with invalid type: $task.type") |
There was a problem hiding this comment.
Log the entire throwable instead of adding it to the message.
| import org.groundplatform.android.model.job.Job | ||
| import org.groundplatform.android.model.task.Task | ||
|
|
||
| sealed interface LoadState { |
There was a problem hiding this comment.
Suggestions:
- Please rename it to be more generic (something like UiState?)
- Consider adding more states to this interface (e.g. collecting data, data submitted) along with validations
| runner() | ||
| .validateTextIsDisplayed("Unnamed point") | ||
| .validateTextIsDisplayed(requireNotNull(JOB.name)) | ||
| runner().validateTextIsDisplayed(TASK_1_NAME).validateTextIsDisplayed(requireNotNull(JOB.name)) |
There was a problem hiding this comment.
Please verify why this change was required? Does this indicate a regression?
|
Continuing in #3261 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #3216
@shobhitagarwal1612 PTAL?