Timed sheets

app/src/main/java/to/bitkit/data/SettingsStore.kt

@@ -80,6 +80,7 @@ data class SettingsData(
     val hasSeenShopIntro: Boolean = false,
     val hasSeenProfileIntro: Boolean = false,
     val quickPayIntroSeen: Boolean = false,
+    val bgPaymentsIntroSeen: Boolean = false,
     val isQuickPayEnabled: Boolean = false,
     val quickPayAmount: Int = 5,
     val lightningSetupStep: Int = 0,
@@ -99,8 +100,12 @@ data class SettingsData(
     val enableAutoReadClipboard: Boolean = false,
     val enableSendAmountWarning: Boolean = false,
     val backupVerified: Boolean = false,
+    val notificationsGranted: Boolean = false,
+    val showNotificationDetails: Boolean = true,
     val dismissedSuggestions: List<String> = emptyList(),
-    val lastTimeAskedBalanceWarningMillis: Long = 0,
+    val balanceWarningIgnoredMillis: Long = 0,
+    val backupWarningIgnoredMillis: Long = 0,
+    val notificationsIgnoredMillis: Long = 0,
     val balanceWarningTimes: Int = 0,
     val coinSelectAuto: Boolean = true,
     val coinSelectPreference: CoinSelectionPreference = CoinSelectionPreference.BranchAndBound,

app/src/main/java/to/bitkit/fcm/WakeNodeWorker.kt

@@ -8,14 +8,17 @@ import androidx.work.workDataOf
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.withTimeout
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.JsonPrimitive
 import kotlinx.serialization.json.contentOrNull
 import kotlinx.serialization.json.jsonObject
 import org.lightningdevkit.ldknode.Event
+import to.bitkit.data.SettingsStore
 import to.bitkit.di.json
 import to.bitkit.ext.amountOnClose
+import to.bitkit.models.BITCOIN_SYMBOL
 import to.bitkit.models.BlocktankNotificationType
 import to.bitkit.models.BlocktankNotificationType.cjitPaymentArrived
 import to.bitkit.models.BlocktankNotificationType.incomingHtlc
@@ -42,6 +45,7 @@ class WakeNodeWorker @AssistedInject constructor(
     private val lightningRepo: LightningRepo,
     private val blocktankRepo: BlocktankRepo,
     private val activityRepo: ActivityRepo,
+    private val settingsStore: SettingsStore,
 ) : CoroutineWorker(appContext, workerParams) {
     private val self = this
 
@@ -113,6 +117,8 @@ class WakeNodeWorker @AssistedInject constructor(
      * @param event The LDK event to check.
      */
     private suspend fun handleLdkEvent(event: Event) {
+        val showDetails = settingsStore.data.first().showNotificationDetails
+        val openBitkitMessage = "Open Bitkit to see details"
         when (event) {
             is Event.PaymentReceived -> {
                 bestAttemptContent?.title = "Payment Received"
@@ -127,7 +133,8 @@ class WakeNodeWorker @AssistedInject constructor(
                         sats = sats.toLong(),
                     )
                 )
-                bestAttemptContent?.body = "⚡ $sats"
+                val content = if (showDetails) "$BITCOIN_SYMBOL $sats" else openBitkitMessage
+                bestAttemptContent?.body = content
                 if (self.notificationType == incomingHtlc) {
                     self.deliver()
                 }
@@ -146,19 +153,17 @@ class WakeNodeWorker @AssistedInject constructor(
 
                     lightningRepo.getChannels()?.find { it.channelId == event.channelId }?.let { channel ->
                         val sats = channel.amountOnClose
-                        self.bestAttemptContent?.title = "Received ⚡ $sats sats"
-
+                        val content = if (showDetails) "$BITCOIN_SYMBOL $sats" else openBitkitMessage
+                        self.bestAttemptContent?.title = content
                         val cjitEntry = channel.let { blocktankRepo.getCjitEntry(it) }
                         if (cjitEntry != null) {
-                            val amount = channel.amountOnClose.toLong()
-
                             // Save for UI to pick up
                             NewTransactionSheetDetails.save(
                                 appContext,
                                 NewTransactionSheetDetails(
                                     type = NewTransactionSheetType.LIGHTNING,
                                     direction = NewTransactionSheetDirection.RECEIVED,
-                                    sats = amount,
+                                    sats = sats.toLong(),
                                 )
                             )
                             activityRepo.insertActivityFromCjit(cjitEntry = cjitEntry, channel = channel)

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
@@ -114,6 +119,8 @@ import to.bitkit.ui.settings.advanced.CoinSelectPreferenceScreen
 import to.bitkit.ui.settings.advanced.ElectrumConfigScreen
 import to.bitkit.ui.settings.advanced.RgsServerScreen
 import to.bitkit.ui.settings.appStatus.AppStatusScreen
+import to.bitkit.ui.settings.backgroundPayments.BackgroundPaymentsIntroScreen
+import to.bitkit.ui.settings.backgroundPayments.BackgroundPaymentsSettings
 import to.bitkit.ui.settings.backups.ResetAndRestoreScreen
 import to.bitkit.ui.settings.general.DefaultUnitSettingsScreen
 import to.bitkit.ui.settings.general.GeneralSettingsScreen
@@ -136,10 +143,14 @@ 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
@@ -320,7 +331,7 @@ fun ContentView(
         ) {
             AutoReadClipboardHandler()
 
-            val currentSheet by appViewModel.currentSheet
+            val currentSheet by appViewModel.currentSheet.collectAsStateWithLifecycle()
             SheetHost(
                 shouldExpand = currentSheet != null,
                 onDismiss = { appViewModel.hideSheet() },
@@ -340,7 +351,7 @@ fun ContentView(
                             ReceiveSheet(
                                 walletState = walletUiState,
                                 navigateToExternalConnection = {
-                                    navController.navigate(Routes.ExternalConnection())
+                                    navController.navigate(ExternalConnection())
                                     appViewModel.hideSheet()
                                 }
                             )
@@ -349,10 +360,53 @@ fun ContentView(
                         is Sheet.ActivityDateRangeSelector -> DateRangeSelectorSheet()
                         is Sheet.ActivityTagSelector -> TagSelectorSheet()
                         is Sheet.Pin -> PinSheet(sheet, appViewModel)
-                        is Sheet.Backup -> BackupSheet(sheet, appViewModel)
+                        is Sheet.Backup -> BackupSheet(sheet, onDismiss = { appViewModel.hideSheet() })
                         is Sheet.LnurlAuth -> LnurlAuthSheet(sheet, appViewModel)
-                        Sheet.Update -> UpdateSheet(onCancel = { appViewModel.hideSheet() })
                         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)
+                                        }
+                                    )
+                                }
+                            }
+                        }
                     }
                 }
             ) {
@@ -763,6 +817,22 @@ private fun NavGraphBuilder.generalSettings(navController: NavHostController) {
     composableWithDefaultTransitions<Routes.TagsSettings> {
         TagsSettingsScreen(navController)
     }
+    composableWithDefaultTransitions<Routes.BackgroundPaymentsSettings> {
+        BackgroundPaymentsSettings(
+            onBack = { navController.popBackStack() },
+            onClose = { navController.navigateToHome() },
+        )
+    }
+
+    composableWithDefaultTransitions<Routes.BackgroundPaymentsIntro> {
+        BackgroundPaymentsIntroScreen(
+            onBack = { navController.popBackStack() },
+            onClose = { navController.navigateToHome() },
+            onContinue = {
+                navController.navigate(Routes.BackgroundPaymentsSettings)
+            }
+        )
+    }
 }
 
 private fun NavGraphBuilder.advancedSettings(navController: NavHostController) {
@@ -1031,7 +1101,7 @@ private fun NavGraphBuilder.update() {
 
 private fun NavGraphBuilder.recoveryMode(
     navController: NavHostController,
-    appViewModel: AppViewModel
+    appViewModel: AppViewModel,
 ) {
     composableWithDefaultTransitions<Routes.RecoveryMode> {
         RecoveryModeScreen(
@@ -1719,4 +1789,10 @@ sealed interface Routes {
 
     @Serializable
     data object RecoveryMnemonic : Routes
+
+    @Serializable
+    data object BackgroundPaymentsIntro : Routes
+
+    @Serializable
+    data object BackgroundPaymentsSettings : Routes
 }

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

@@ -45,7 +45,7 @@ internal fun Context.notificationBuilder(
     val pendingIntent = PendingIntent.getActivity(this, 0, intent, flags)
 
     return NotificationCompat.Builder(this, channelId)
-        .setSmallIcon(R.drawable.ic_notification)
+        .setSmallIcon(R.drawable.ic_launcher_fg_regtest)
         .setPriority(NotificationCompat.PRIORITY_HIGH)
         .setSound(RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION))
         .setContentIntent(pendingIntent) // fired on tap

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

@@ -0,0 +1,100 @@
+package to.bitkit.ui.components
+
+import androidx.compose.animation.AnimatedContent
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import to.bitkit.R
+import to.bitkit.ui.theme.AppThemeSurface
+import to.bitkit.ui.theme.Colors
+import to.bitkit.ui.theme.Shapes
+
+@Composable
+fun NotificationPreview(
+    enabled: Boolean,
+    title: String,
+    description: String,
+    showDetails: Boolean,
+    modifier: Modifier = Modifier,
+) {
+    Box(modifier = modifier) {
+        Row(
+            horizontalArrangement = Arrangement.spacedBy(8.dp),
+            modifier = Modifier
+                .clip(Shapes.medium)
+                .background(Colors.White80)
+                .padding(9.dp)
+        ) {
+            Image(
+                painter = painterResource(R.drawable.ic_notification),
+                contentDescription = null,
+                modifier = Modifier
+                    .size(38.dp)
+            )
+
+            Column(
+                modifier = Modifier.weight(1f),
+                verticalArrangement = Arrangement.SpaceBetween
+            ) {
+                BodySSB(text = title, color = Colors.Black)
+                val textDescription = if (showDetails) description else "Open Bitkit to see details" // TODO Transifex
+                AnimatedContent(targetState = textDescription) { text ->
+                    Footnote(text = text, color = Colors.Gray3)
+                }
+            }
+
+            Caption("3m ago", color = Colors.Gray2)
+        }
+
+        if (!enabled) {
+            Box(
+                modifier = Modifier
+                    .matchParentSize()
+                    .clip(Shapes.medium)
+                    .background(Colors.Black70)
+            )
+        }
+    }
+}
+
+@Preview(showSystemUi = true)
+@Composable
+private fun Preview() {
+    AppThemeSurface {
+        Column(
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(8.dp),
+            verticalArrangement = Arrangement.Center
+        ) {
+            NotificationPreview(
+                enabled = true,
+                title = "Payment Received",
+                description = "₿ 21 000",
+                showDetails = true,
+                modifier = Modifier.fillMaxWidth()
+            )
+            VerticalSpacer(16.dp)
+            NotificationPreview(
+                enabled = false,
+                title = "Payment Received",
+                description = "₿ 21 000",
+                showDetails = false,
+                modifier = Modifier.fillMaxWidth()
+            )
+        }
+    }
+}

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

@@ -38,8 +38,18 @@ sealed interface Sheet {
     data object ActivityDateRangeSelector : Sheet
     data object ActivityTagSelector : Sheet
     data class LnurlAuth(val domain: String, val lnurl: String, val k1: String) : Sheet
-    data object Update : 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)