Replace ViewPager2 with Compose-based TaskScreenContainer for Data Collection#3735
Open
shobhitagarwal1612 wants to merge 11 commits into
Open
Replace ViewPager2 with Compose-based TaskScreenContainer for Data Collection#3735shobhitagarwal1612 wants to merge 11 commits into
shobhitagarwal1612 wants to merge 11 commits into
Conversation
…creen and TaskScreenContainer
…onViewModel UI effects
shobhitagarwal1612
requested a deployment
to
e2e-approval
GitHub Actions
Waiting
Collaborator
andreia-ferreira
left a comment
andreia-ferreira
left a comment
There was a problem hiding this comment.
The only issue I found was when restoring a draft where the current task was conditional. Clicking on any of the previous/next buttons makes the app crash. Tested this behavior on master to confirm it's not an existing issue and couldn't reproduce
Screen_recording_20260513_175154.webm
tested on API 24 and 36 and happens on both
| * @param onAllowLocationClicked Callback when the allow location button is clicked in the dialog. | ||
| * @param onOpenSettings Callback to open app settings. | ||
| * @param onButtonClicked Callback when a button is clicked. | ||
| * @param mapContent Composable for rendering the map. |
Collaborator
There was a problem hiding this comment.
nit: this parameter is still in the arguments so it should be part of the kdoc
| * routing. | ||
| * | ||
| * @param viewModel The view model for this task. | ||
| * @param mapContent Composable for rendering the map. |
Collaborator
There was a problem hiding this comment.
nit: same comment as above. The params here in general don't match the ones in the composable
| * @param onLoiNameAction Callback when user interacts with the LOI name dialog. | ||
| * @param onInstructionsDismiss Callback when user dismisses the instructions dialog. | ||
| * @param onDismissSelfIntersectionDialog Callback when the self-intersection dialog is dismissed. | ||
| * @param mapContent Composable for rendering the map. |
Collaborator
There was a problem hiding this comment.
nit: same comment as above
Comment on lines
+329
to
+334
| DataCollectionEvent.OpenSettings -> | ||
| viewModelScope.launch { _uiEffects.send(DataCollectionUiEffect.OpenSettings) } | ||
| is DataCollectionEvent.SetAwaitingPhotoCapture -> | ||
| viewModelScope.launch { | ||
| _uiEffects.send(DataCollectionUiEffect.SetAwaitingPhotoCapture(event.awaiting)) | ||
| } |
Collaborator
There was a problem hiding this comment.
suggestion: the logic for each of these events could be extracted to a separate method like the events above
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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 #3709
This PR overhauls the data collection flow by migrating it to a Compose-based architecture. It removes the legacy
ViewPager2and fragment-based approach (DataCollectionTaskFragment,DataCollectionViewPagerAdapter) in favor of a newTaskScreenContainer. It also refactors event handling to be more deeply integrated with ViewModels.Key Changes:
ViewPager2and task fragments with Compose-basedTaskScreenContainer.TaskMapFragmentContainerwith the official ComposeAndroidFragment.DataCollectionViewModelby removingMutableSharedFlowand using UI effects.onButtonClickedparameter from task screens and handle clicks via individual ViewModels.OpenSettingsandSetAwaitingPhotoCaptureto useDataCollectionViewModelUI effects.Steps to verify:
@andreia-ferreira PTAL?