Merge pull request #435 from synonymdev/chore/move-to-parent

Move sheets to parent view

Author: jvsena42

app/src/main/java/to/bitkit/ui/ContentView.kt

@@ -1,5 +1,6 @@
 package to.bitkit.ui
 
+import android.content.Intent
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.DisposableEffect
@@ -12,6 +13,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.platform.LocalContext
+import androidx.core.net.toUri
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
@@ -29,13 +31,16 @@ import androidx.navigation.toRoute
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.serialization.Serializable
+import to.bitkit.env.Env
 import to.bitkit.models.NewTransactionSheetDetails
 import to.bitkit.models.NodeLifecycleState
 import to.bitkit.models.Toast
 import to.bitkit.models.WidgetType
+import to.bitkit.ui.Routes.ExternalConnection
 import to.bitkit.ui.components.AuthCheckScreen
 import to.bitkit.ui.components.Sheet
 import to.bitkit.ui.components.SheetHost
+import to.bitkit.ui.components.TimedSheetType
 import to.bitkit.ui.onboarding.InitializingWalletView
 import to.bitkit.ui.onboarding.WalletRestoreErrorView
 import to.bitkit.ui.onboarding.WalletRestoreSuccessView
@@ -138,11 +143,16 @@ import to.bitkit.ui.settings.support.ReportIssueScreen
 import to.bitkit.ui.settings.support.SupportScreen
 import to.bitkit.ui.settings.transactionSpeed.CustomFeeSettingsScreen
 import to.bitkit.ui.settings.transactionSpeed.TransactionSpeedSettingsScreen
+import to.bitkit.ui.sheets.BackgroundPaymentsIntroSheet
+import to.bitkit.ui.sheets.BackupRoute
 import to.bitkit.ui.sheets.BackupSheet
 import to.bitkit.ui.sheets.ForceTransferSheet
+import to.bitkit.ui.sheets.HighBalanceWarningSheet
 import to.bitkit.ui.sheets.LnurlAuthSheet
 import to.bitkit.ui.sheets.PinSheet
+import to.bitkit.ui.sheets.QuickPayIntroSheet
 import to.bitkit.ui.sheets.SendSheet
+import to.bitkit.ui.sheets.UpdateSheet
 import to.bitkit.ui.theme.TRANSITION_SHEET_MS
 import to.bitkit.ui.utils.AutoReadClipboardHandler
 import to.bitkit.ui.utils.Transitions
@@ -321,7 +331,7 @@ fun ContentView(
         ) {
             AutoReadClipboardHandler()
 
-            val currentSheet by appViewModel.currentSheet
+            val currentSheet by appViewModel.currentSheet.collectAsStateWithLifecycle()
             SheetHost(
                 shouldExpand = currentSheet != null,
                 onDismiss = { appViewModel.hideSheet() },
@@ -341,7 +351,7 @@ fun ContentView(
                             ReceiveSheet(
                                 walletState = walletUiState,
                                 navigateToExternalConnection = {
-                                    navController.navigate(Routes.ExternalConnection())
+                                    navController.navigate(ExternalConnection())
                                     appViewModel.hideSheet()
                                 }
                             )
@@ -353,6 +363,50 @@ fun ContentView(
                         is Sheet.Backup -> BackupSheet(sheet, onDismiss = { appViewModel.hideSheet() })
                         is Sheet.LnurlAuth -> LnurlAuthSheet(sheet, appViewModel)
                         Sheet.ForceTransfer -> ForceTransferSheet(appViewModel, transferViewModel)
+                        is Sheet.TimedSheet -> {
+                            when (sheet.type) {
+                                TimedSheetType.APP_UPDATE -> {
+                                    UpdateSheet(onCancel = { appViewModel.dismissTimedSheet() })
+                                }
+
+                                TimedSheetType.BACKUP -> {
+                                    BackupSheet(
+                                        sheet = Sheet.Backup(BackupRoute.Intro),
+                                        onDismiss = { appViewModel.dismissTimedSheet() }
+                                    )
+                                }
+
+                                TimedSheetType.NOTIFICATIONS -> {
+                                    BackgroundPaymentsIntroSheet(
+                                        onContinue = {
+                                            appViewModel.dismissTimedSheet(skipQueue = true)
+                                            navController.navigate(Routes.BackgroundPaymentsSettings)
+                                            settingsViewModel.setBgPaymentsIntroSeen(true)
+                                        },
+                                    )
+                                }
+
+                                TimedSheetType.QUICK_PAY -> {
+                                    QuickPayIntroSheet(
+                                        onContinue = {
+                                            appViewModel.dismissTimedSheet(skipQueue = true)
+                                            navController.navigate(Routes.QuickPaySettings)
+                                        },
+                                    )
+                                }
+
+                                TimedSheetType.HIGH_BALANCE -> {
+                                    HighBalanceWarningSheet(
+                                        understoodClick = { appViewModel.dismissTimedSheet() },
+                                        learnMoreClick = {
+                                            val intent = Intent(Intent.ACTION_VIEW, Env.STORING_BITCOINS_URL.toUri())
+                                            context.startActivity(intent)
+                                            appViewModel.dismissTimedSheet(skipQueue = true)
+                                        }
+                                    )
+                                }
+                            }
+                        }
                     }
                 }
             ) {

app/src/main/java/to/bitkit/ui/components/SheetHost.kt

@@ -39,6 +39,17 @@ sealed interface Sheet {
     data object ActivityTagSelector : Sheet
     data class LnurlAuth(val domain: String, val lnurl: String, val k1: String) : Sheet
     data object ForceTransfer : Sheet
+
+    data class TimedSheet(val type: TimedSheetType) : Sheet
+}
+
+/**@param priority Priority levels for timed sheets (higher number = higher priority)*/
+enum class TimedSheetType(val priority: Int) {
+    APP_UPDATE(priority = 5),
+    BACKUP(priority = 4),
+    NOTIFICATIONS(priority = 3),
+    QUICK_PAY(priority = 2),
+    HIGH_BALANCE(priority = 1)
 }
 
 @OptIn(ExperimentalMaterial3Api::class)

app/src/main/java/to/bitkit/ui/screens/wallets/HomeNav.kt

@@ -50,9 +50,11 @@ fun HomeNav(
     val hasSeenShopIntro: Boolean by settingsViewModel.hasSeenShopIntro.collectAsStateWithLifecycle()
     val hazeState = rememberHazeState()
 
-    RequestNotificationPermissions { granted ->
-        settingsViewModel.setNotificationPreference(granted)
-    }
+    RequestNotificationPermissions(
+        onPermissionChange = { granted ->
+            settingsViewModel.setNotificationPreference(granted)
+        }
+    )
 
     Box(
         modifier = Modifier.fillMaxSize()