Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tree Upload Reminder Dialog #1081

Merged
merged 6 commits into from
Apr 5, 2023
Merged

Tree Upload Reminder Dialog #1081

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8c71c9b
Created DisplayAlertDialog composable
CalebKL Mar 17, 2023
a379e84
Added functionality to display alert dialog when tracked trees are ab…
CalebKL Mar 17, 2023
c974b9e
-Added string resources for the raw strings
CalebKL Mar 22, 2023
6325851
formating cleanup
CalebKL Mar 22, 2023
8872803
Minor fixes on dashboard screen and dashboard ViewModel"
CalebKL Mar 30, 2023
4a5a94e
Merge branch 'master' into TreeUploadReminderDialog
CalebKL Apr 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions app/src/main/java/org/greenstand/android/TreeTracker/dashboard/DashboardScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,7 @@ import androidx.compose.material.ButtonColors
import androidx.compose.material.Scaffold
import androidx.compose.material.Text
import androidx.compose.material.rememberScaffoldState
import androidx.compose.runtime.Composable
import androidx.compose.runtime.ExperimentalComposeApi
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.*
import androidx.compose.runtime.livedata.observeAsState
import androidx.compose.ui.Alignment
import androidx.compose.ui.Alignment.Companion.CenterVertically
Expand Down Expand Up @@ -55,6 +52,7 @@ import org.greenstand.android.TreeTracker.view.LanguageButton
import org.greenstand.android.TreeTracker.view.TopBarTitle
import org.greenstand.android.TreeTracker.view.TreeTrackerButton
import org.greenstand.android.TreeTracker.view.TreeTrackerButtonShape
import org.greenstand.android.TreeTracker.view.dialogs.CustomDialog

@Composable
fun DashboardScreen(
Expand All @@ -63,13 +61,27 @@ fun DashboardScreen(
val state by viewModel.state.observeAsState(DashboardState())
val snackBar by viewModel.snackBar.observeAsState()
val navController = LocalNavHostController.current
var showDialog by remember { mutableStateOf(false) }

if (showDialog){
CustomDialog(
title = stringResource(R.string.upload_trees_soon_title),
textContent = stringResource(R.string.upload_trees_text_content),
onPositiveClick = {
navController.navigate(NavRoute.UserSelect.route)
}
)
}
Dashboard(
state = state,
snackBar = snackBar,
onSyncClicked = { viewModel.sync() },
onOrgClicked = { navController.navigate(NavRoute.Org.route) },
onCaptureClicked = { navController.navigate(NavRoute.UserSelect.route) },
onCaptureClicked = {
if (state.showTreeSyncReminderDialog){
showDialog = true
}else navController.navigate(NavRoute.UserSelect.route)
},
onMessagesClicked = {
viewModel.syncMessages()
navController.navigate(NavRoute.MessagesUserSelect.route)
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/java/org/greenstand/android/TreeTracker/dashboard/DashboardViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ data class DashboardState(
val totalTreesToSync: Int = 0,
val isOrgButtonEnabled: Boolean = false,
val showUnreadMessageNotification: Boolean = false,
val showTreeSyncReminderDialog:Boolean = false
)

class DashboardViewModel(
Expand Down Expand Up @@ -163,6 +164,7 @@ class DashboardViewModel(
treesSynced = syncedTreeCount,
isOrgButtonEnabled = orgRepo.getOrgs().size > 1,
showUnreadMessageNotification = messagesRepo.checkForUnreadMessages(),
showTreeSyncReminderDialog = totalTreesToSync >= 2000
)
}
}
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,4 +181,6 @@ Privacy Policy
<string name="select_tree_height_colour">Select tree height colour</string>
<string name="select_organization">Select organization</string>
<string name="no_messages_yet">No Messages, Yet.</string>
<string name="upload_trees_soon_title">Upload Trees Soon</string>
<string name="upload_trees_text_content">You have over 2000 trees, please upload as soon as you can.</string>
</resources>