Skip to content

Commit d4f6bbc

Browse files
committed
fix: transition from send sheet to lnurl-auth sheet
1 parent 2295731 commit d4f6bbc

File tree

4 files changed

+9
-3
lines changed

4 files changed

+9
-3
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ import to.bitkit.ui.sheets.BackupSheet
137137
import to.bitkit.ui.sheets.LnurlAuthSheet
138138
import to.bitkit.ui.sheets.PinSheet
139139
import to.bitkit.ui.sheets.SendSheet
140+
import to.bitkit.ui.theme.TRANSITION_SHEET_MS
140141
import to.bitkit.ui.utils.AutoReadClipboardHandler
141142
import to.bitkit.ui.utils.composableWithDefaultTransitions
142143
import 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
}

app/src/main/java/to/bitkit/ui/screens/transfer/SettingUpScreen.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff 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) {

app/src/main/java/to/bitkit/ui/theme/Defaults.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ object AppSwitchDefaults {
127127
}
128128

129129
val ScreenTransitionMs = AnimationConstants.DefaultDurationMillis.milliseconds // 300ms
130+
const val TRANSITION_SHEET_MS = 650L
130131

131132
object Insets {
132133
val Top: Dp

app/src/main/java/to/bitkit/viewmodels/AppViewModel.kt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ import to.bitkit.ui.Routes
8282
import to.bitkit.ui.components.Sheet
8383
import to.bitkit.ui.shared.toast.ToastEventBus
8484
import to.bitkit.ui.sheets.SendRoute
85+
import to.bitkit.ui.theme.ScreenTransitionMs
8586
import to.bitkit.utils.Logger
8687
import java.math.BigDecimal
8788
import 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

0 commit comments

Comments
 (0)