Skip to content

Move sheets to parent view #435

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

Merged
jvsena42 merged 17 commits into from
Oct 13, 2025
Merged

Move sheets to parent view #435

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
d85b70b
chore: move timed sheets to parent
jvsena42 Oct 10, 2025
b271df8
chore: remove unnecessary state
jvsena42 Oct 10, 2025
627f3df
fix: timed sheet dismiss
jvsena42 Oct 10, 2025
af409e6
chore: remove sheet wrapper
jvsena42 Oct 10, 2025
a58a1a8
chore: lint
jvsena42 Oct 10, 2025
d1c3f96
chore: lint
jvsena42 Oct 10, 2025
b5e63a9
chore: lint
jvsena42 Oct 10, 2025
df850e6
chore: lint
jvsena42 Oct 10, 2025
dd2aa5d
chore: lint
jvsena42 Oct 10, 2025
208bad8
fix: don't display notifications intro if already granted
jvsena42 Oct 10, 2025
0163101
chore: lint
jvsena42 Oct 10, 2025
0c99fea
chore: add comment
jvsena42 Oct 13, 2025
75b09e8
feat: display notifications settings
jvsena42 Oct 13, 2025
a58768b
chore: remove animation
jvsena42 Oct 13, 2025
84e228d
fix: listen for balance change
jvsena42 Oct 13, 2025
c367549
chore: add log
jvsena42 Oct 13, 2025
90aedea
fix: skip queue check
jvsena42 Oct 13, 2025
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
58 changes: 56 additions & 2 deletions app/src/main/java/to/bitkit/ui/ContentView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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() },
Expand All @@ -341,7 +351,7 @@ fun ContentView(
ReceiveSheet(
walletState = walletUiState,
navigateToExternalConnection = {
navController.navigate(Routes.ExternalConnection())
navController.navigate(ExternalConnection())
appViewModel.hideSheet()
}
)
Expand All @@ -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()
navController.navigate(Routes.BackgroundPaymentsSettings)
settingsViewModel.setBgPaymentsIntroSeen(true)
},
)
}

TimedSheetType.QUICK_PAY -> {
QuickPayIntroSheet(
onContinue = {
appViewModel.dismissTimedSheet()
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()
}
)
}
}
}
}
}
) {
Expand Down
10 changes: 10 additions & 0 deletions app/src/main/java/to/bitkit/ui/components/SheetHost.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,16 @@ 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
}

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)
Expand Down
Loading