Tree Upload Reminder Dialog #1081
Merged
Conversation
This file contains 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
Elforama
requested changes
Mar 21, 2023
Comment on lines
69
to
70
| title = "Upload Trees Soon", | ||
| message ="You have over 2000 trees, please upload as soon as you can.", |
There was a problem hiding this comment.
Text that the user sees should always use string resources to allow translations.
| Dashboard( | ||
| state = state, | ||
| snackBar = snackBar, | ||
| onSyncClicked = { viewModel.sync() }, | ||
| onOrgClicked = { navController.navigate(NavRoute.Org.route) }, | ||
| onCaptureClicked = { navController.navigate(NavRoute.UserSelect.route) }, | ||
| onCaptureClicked = { | ||
| if (state.totalTreesToSync >=2000){ |
There was a problem hiding this comment.
We can move this check into a boolean method on the state object that returns true or false
| import androidx.compose.ui.unit.sp | ||
|
|
||
| @Composable | ||
| fun DisplayAlertDialog( |
There was a problem hiding this comment.
We have a dialog method we can reuse that has a special style that matches the app. Please use that instead
-Added treesToSyncThreshold on the viewmodel and updated state
Elforama
requested changes
Mar 30, 2023
| @@ -63,13 +61,29 @@ fun DashboardScreen( | |||
| val state by viewModel.state.observeAsState(DashboardState()) | |||
| val snackBar by viewModel.snackBar.observeAsState() | |||
| val navController = LocalNavHostController.current | |||
| var dialogOpened by remember { mutableStateOf(false) } | |||
There was a problem hiding this comment.
dialogOpened doesn't seem to be used
| @@ -36,6 +36,7 @@ data class DashboardState( | |||
| val totalTreesToSync: Int = 0, | |||
| val isOrgButtonEnabled: Boolean = false, | |||
| val showUnreadMessageNotification: Boolean = false, | |||
| val totalTreesToSyncThreshold:Boolean = false | |||
There was a problem hiding this comment.
This should be renamed to something more descriptive like "showTreeSyncReminderDialog"
Elforama
approved these changes
Apr 5, 2023
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.
This PR adds Alert Dialog to users who have planted trees above 2000 and reminds them to upload the trees.
Fixes on Issue #1057