File tree Expand file tree Collapse file tree 4 files changed +9
-3
lines changed
app/src/main/java/to/bitkit Expand file tree Collapse file tree 4 files changed +9
-3
lines changed Original file line number Diff line number Diff line change @@ -137,6 +137,7 @@ import to.bitkit.ui.sheets.BackupSheet
137137import to.bitkit.ui.sheets.LnurlAuthSheet
138138import to.bitkit.ui.sheets.PinSheet
139139import to.bitkit.ui.sheets.SendSheet
140+ import to.bitkit.ui.theme.TRANSITION_SHEET_MS
140141import to.bitkit.ui.utils.AutoReadClipboardHandler
141142import to.bitkit.ui.utils.composableWithDefaultTransitions
142143import to.bitkit.ui.utils.screenSlideIn
@@ -961,7 +962,7 @@ private fun NavGraphBuilder.qrScanner(
961962 QrScanningScreen (navController = navController) { qrCode ->
962963 appViewModel.onScanResult(
963964 data = qrCode,
964- delayMs = 650 // slight delay for nav transition before showing send sheet
965+ delayMs = TRANSITION_SHEET_MS ,
965966 )
966967 }
967968 }
Original file line number Diff line number Diff line change @@ -170,7 +170,6 @@ private fun SettingUpScreen(
170170 )
171171 }
172172
173-
174173 val randomOkText = localizedRandom(R .string.common__ok_random)
175174 PrimaryButton (
176175 text = if (inProgress) {
Original file line number Diff line number Diff line change @@ -127,6 +127,7 @@ object AppSwitchDefaults {
127127}
128128
129129val ScreenTransitionMs = AnimationConstants .DefaultDurationMillis .milliseconds // 300ms
130+ const val TRANSITION_SHEET_MS = 650L
130131
131132object Insets {
132133 val Top : Dp
Original file line number Diff line number Diff line change @@ -82,6 +82,7 @@ import to.bitkit.ui.Routes
8282import to.bitkit.ui.components.Sheet
8383import to.bitkit.ui.shared.toast.ToastEventBus
8484import to.bitkit.ui.sheets.SendRoute
85+ import to.bitkit.ui.theme.ScreenTransitionMs
8586import to.bitkit.utils.Logger
8687import java.math.BigDecimal
8788import javax.inject.Inject
@@ -695,8 +696,12 @@ class AppViewModel @Inject constructor(
695696 }
696697 }
697698
698- private fun onScanLnurlAuth (data : LnurlAuthData , lnurl : String ) {
699+ private suspend fun onScanLnurlAuth (data : LnurlAuthData , lnurl : String ) {
699700 Logger .debug(" LNURL: $data " , context = TAG )
701+ if (! isMainScanner) {
702+ hideSheet()
703+ delay(ScreenTransitionMs )
704+ }
700705 showSheet(Sheet .LnurlAuth (domain = data.domain, lnurl = lnurl, k1 = data.k1))
701706 }
702707
You can’t perform that action at this time.
0 commit comments