Skip to content

Commit f8ccbbb

Browse files
ovitrifovitrif
committed
fix: in-sheet navigation
1 parent cc74a6e commit f8ccbbb

File tree

1 file changed

+31
-93
lines changed

1 file changed

+31
-93
lines changed

‎app/src/main/java/to/bitkit/ui/nav/entries/SheetEntries.kt‎

Lines changed: 31 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -183,38 +183,30 @@ private fun EntryProviderScope<NavKey>.pinFlowEntries(navigator: Navigator) {
183183
)
184184
}
185185

186-
entry<Routes.Pin.Choose>(
187-
metadata = SheetSceneStrategy.sheet()
188-
) {
186+
entry<Routes.Pin.Choose> {
189187
PinChooseScreen(
190188
onPinChosen = { pin -> navigator.navigate(Routes.Pin.Confirm(pin)) },
191189
onBack = { navigator.goBack() },
192190
)
193191
}
194192

195-
entry<Routes.Pin.Confirm>(
196-
metadata = SheetSceneStrategy.sheet()
197-
) { route ->
193+
entry<Routes.Pin.Confirm> { route ->
198194
PinConfirmScreen(
199195
originalPin = route.pin,
200196
onPinConfirmed = { navigator.navigate(Routes.Pin.Biometrics) },
201197
onBack = { navigator.goBack() },
202198
)
203199
}
204200

205-
entry<Routes.Pin.Biometrics>(
206-
metadata = SheetSceneStrategy.sheet()
207-
) {
201+
entry<Routes.Pin.Biometrics> {
208202
PinBiometricsScreen(
209203
onContinue = { isBioOn -> navigator.navigate(Routes.Pin.Result(isBioOn)) },
210204
onSkip = { navigator.navigate(Routes.Pin.Result(isBioOn = false)) },
211205
onBack = { navigator.goBack() },
212206
)
213207
}
214208

215-
entry<Routes.Pin.Result>(
216-
metadata = SheetSceneStrategy.sheet()
217-
) { route ->
209+
entry<Routes.Pin.Result> { route ->
218210
PinResultScreen(
219211
isBioOn = route.isBioOn,
220212
onDismiss = { navigator.navigateToHome() },
@@ -235,9 +227,7 @@ private fun EntryProviderScope<NavKey>.backupFlowEntries(navigator: Navigator) {
235227
)
236228
}
237229

238-
entry<Routes.Backup.ShowMnemonic>(
239-
metadata = SheetSceneStrategy.sheet()
240-
) {
230+
entry<Routes.Backup.ShowMnemonic> {
241231
val viewModel = hiltViewModel<BackupNavSheetViewModel>()
242232
val uiState by viewModel.uiState.collectAsStateWithLifecycle()
243233
ShowMnemonicScreen(
@@ -247,9 +237,7 @@ private fun EntryProviderScope<NavKey>.backupFlowEntries(navigator: Navigator) {
247237
)
248238
}
249239

250-
entry<Routes.Backup.ShowPassphrase>(
251-
metadata = SheetSceneStrategy.sheet()
252-
) {
240+
entry<Routes.Backup.ShowPassphrase> {
253241
val viewModel = hiltViewModel<BackupNavSheetViewModel>()
254242
val uiState by viewModel.uiState.collectAsStateWithLifecycle()
255243
ShowPassphraseScreen(
@@ -259,9 +247,7 @@ private fun EntryProviderScope<NavKey>.backupFlowEntries(navigator: Navigator) {
259247
)
260248
}
261249

262-
entry<Routes.Backup.ConfirmMnemonic>(
263-
metadata = SheetSceneStrategy.sheet()
264-
) {
250+
entry<Routes.Backup.ConfirmMnemonic> {
265251
val viewModel = hiltViewModel<BackupNavSheetViewModel>()
266252
val uiState by viewModel.uiState.collectAsStateWithLifecycle()
267253
ConfirmMnemonicScreen(
@@ -271,9 +257,7 @@ private fun EntryProviderScope<NavKey>.backupFlowEntries(navigator: Navigator) {
271257
)
272258
}
273259

274-
entry<Routes.Backup.ConfirmPassphrase>(
275-
metadata = SheetSceneStrategy.sheet()
276-
) {
260+
entry<Routes.Backup.ConfirmPassphrase> {
277261
val viewModel = hiltViewModel<BackupNavSheetViewModel>()
278262
val uiState by viewModel.uiState.collectAsStateWithLifecycle()
279263
ConfirmPassphraseScreen(
@@ -284,36 +268,28 @@ private fun EntryProviderScope<NavKey>.backupFlowEntries(navigator: Navigator) {
284268
)
285269
}
286270

287-
entry<Routes.Backup.Warning>(
288-
metadata = SheetSceneStrategy.sheet()
289-
) {
271+
entry<Routes.Backup.Warning> {
290272
WarningScreen(
291273
onContinue = { navigator.navigate(Routes.Backup.Success) },
292274
onBack = { navigator.goBack() },
293275
)
294276
}
295277

296-
entry<Routes.Backup.Success>(
297-
metadata = SheetSceneStrategy.sheet()
298-
) {
278+
entry<Routes.Backup.Success> {
299279
SuccessScreen(
300280
onContinue = { navigator.navigate(Routes.Backup.MultipleDevices) },
301281
onBack = { navigator.goBack() },
302282
)
303283
}
304284

305-
entry<Routes.Backup.MultipleDevices>(
306-
metadata = SheetSceneStrategy.sheet()
307-
) {
285+
entry<Routes.Backup.MultipleDevices> {
308286
MultipleDevicesScreen(
309287
onContinue = { navigator.navigate(Routes.Backup.Metadata) },
310288
onBack = { navigator.goBack() },
311289
)
312290
}
313291

314-
entry<Routes.Backup.Metadata>(
315-
metadata = SheetSceneStrategy.sheet()
316-
) {
292+
entry<Routes.Backup.Metadata> {
317293
val viewModel = hiltViewModel<BackupNavSheetViewModel>()
318294
val uiState by viewModel.uiState.collectAsStateWithLifecycle()
319295
MetadataScreen(
@@ -342,9 +318,7 @@ private fun EntryProviderScope<NavKey>.sendFlowEntries(
342318
)
343319
}
344320

345-
entry<Routes.Send.Address>(
346-
metadata = SheetSceneStrategy.sheet()
347-
) {
321+
entry<Routes.Send.Address> {
348322
val uiState by appViewModel.sendUiState.collectAsStateWithLifecycle()
349323
SendAddressScreen(
350324
uiState = uiState,
@@ -353,9 +327,7 @@ private fun EntryProviderScope<NavKey>.sendFlowEntries(
353327
)
354328
}
355329

356-
entry<Routes.Send.Amount>(
357-
metadata = SheetSceneStrategy.sheet()
358-
) { route ->
330+
entry<Routes.Send.Amount> { route ->
359331
val uiState by appViewModel.sendUiState.collectAsStateWithLifecycle()
360332
val walletUiState by walletViewModel.uiState.collectAsStateWithLifecycle()
361333

@@ -374,9 +346,7 @@ private fun EntryProviderScope<NavKey>.sendFlowEntries(
374346
)
375347
}
376348

377-
entry<Routes.Send.QrScanner>(
378-
metadata = SheetSceneStrategy.sheet()
379-
) {
349+
entry<Routes.Send.QrScanner> {
380350
QrScanningScreen(
381351
navigator = navigator,
382352
onScanSuccess = { qrCode ->
@@ -386,9 +356,7 @@ private fun EntryProviderScope<NavKey>.sendFlowEntries(
386356
)
387357
}
388358

389-
entry<Routes.Send.CoinSelection>(
390-
metadata = SheetSceneStrategy.sheet()
391-
) {
359+
entry<Routes.Send.CoinSelection> {
392360
val sendUiState by appViewModel.sendUiState.collectAsStateWithLifecycle()
393361
SendCoinSelectionScreen(
394362
requiredAmount = sendUiState.amount,
@@ -398,9 +366,7 @@ private fun EntryProviderScope<NavKey>.sendFlowEntries(
398366
)
399367
}
400368

401-
entry<Routes.Send.FeeRate>(
402-
metadata = SheetSceneStrategy.sheet()
403-
) {
369+
entry<Routes.Send.FeeRate> {
404370
val sendUiState by appViewModel.sendUiState.collectAsStateWithLifecycle()
405371
val viewModel = hiltViewModel<SendFeeViewModel>()
406372
SendFeeRateScreen(
@@ -412,9 +378,7 @@ private fun EntryProviderScope<NavKey>.sendFlowEntries(
412378
)
413379
}
414380

415-
entry<Routes.Send.FeeCustom>(
416-
metadata = SheetSceneStrategy.sheet()
417-
) {
381+
entry<Routes.Send.FeeCustom> {
418382
val viewModel = hiltViewModel<SendFeeViewModel>()
419383
SendFeeCustomScreen(
420384
viewModel = viewModel,
@@ -423,9 +387,7 @@ private fun EntryProviderScope<NavKey>.sendFlowEntries(
423387
)
424388
}
425389

426-
entry<Routes.Send.Confirm>(
427-
metadata = SheetSceneStrategy.sheet()
428-
) {
390+
entry<Routes.Send.Confirm> {
429391
val uiState by appViewModel.sendUiState.collectAsStateWithLifecycle()
430392
val walletUiState by walletViewModel.uiState.collectAsStateWithLifecycle()
431393

@@ -442,9 +404,7 @@ private fun EntryProviderScope<NavKey>.sendFlowEntries(
442404
)
443405
}
444406

445-
entry<Routes.Send.Success>(
446-
metadata = SheetSceneStrategy.sheet()
447-
) {
407+
entry<Routes.Send.Success> {
448408
val sendDetail by appViewModel.successSendUiState.collectAsStateWithLifecycle()
449409
NewTransactionSheetView(
450410
details = sendDetail,
@@ -458,19 +418,15 @@ private fun EntryProviderScope<NavKey>.sendFlowEntries(
458418
)
459419
}
460420

461-
entry<Routes.Send.Error>(
462-
metadata = SheetSceneStrategy.sheet()
463-
) { route ->
421+
entry<Routes.Send.Error> { route ->
464422
SendErrorScreen(
465423
errorMessage = route.message,
466424
onRetry = { navigator.navigate(Routes.Send.Recipient) },
467425
onClose = { navigator.navigateToHome() },
468426
)
469427
}
470428

471-
entry<Routes.Send.WithdrawConfirm>(
472-
metadata = SheetSceneStrategy.sheet()
473-
) {
429+
entry<Routes.Send.WithdrawConfirm> {
474430
val uiState by appViewModel.sendUiState.collectAsStateWithLifecycle()
475431
WithdrawConfirmScreen(
476432
uiState = uiState,
@@ -479,9 +435,7 @@ private fun EntryProviderScope<NavKey>.sendFlowEntries(
479435
)
480436
}
481437

482-
entry<Routes.Send.WithdrawError>(
483-
metadata = SheetSceneStrategy.sheet()
484-
) {
438+
entry<Routes.Send.WithdrawError> {
485439
val uiState by appViewModel.sendUiState.collectAsStateWithLifecycle()
486440
WithdrawErrorScreen(
487441
uiState = uiState,
@@ -491,15 +445,11 @@ private fun EntryProviderScope<NavKey>.sendFlowEntries(
491445
)
492446
}
493447

494-
entry<Routes.Send.Support>(
495-
metadata = SheetSceneStrategy.sheet()
496-
) {
448+
entry<Routes.Send.Support> {
497449
SupportScreen(navigator)
498450
}
499451

500-
entry<Routes.Send.AddTag>(
501-
metadata = SheetSceneStrategy.sheet()
502-
) {
452+
entry<Routes.Send.AddTag> {
503453
AddTagScreen(
504454
onBack = { navigator.goBack() },
505455
onTagSelected = { tag ->
@@ -511,9 +461,7 @@ private fun EntryProviderScope<NavKey>.sendFlowEntries(
511461
)
512462
}
513463

514-
entry<Routes.Send.PinCheck>(
515-
metadata = SheetSceneStrategy.sheet()
516-
) {
464+
entry<Routes.Send.PinCheck> {
517465
SendPinCheckScreen(
518466
onBack = { navigator.goBack() },
519467
onSuccess = {
@@ -523,9 +471,7 @@ private fun EntryProviderScope<NavKey>.sendFlowEntries(
523471
)
524472
}
525473

526-
entry<Routes.Send.QuickPay>(
527-
metadata = SheetSceneStrategy.sheet()
528-
) {
474+
entry<Routes.Send.QuickPay> {
529475
val quickPayData by appViewModel.quickPayData.collectAsStateWithLifecycle()
530476
quickPayData?.let { data ->
531477
SendQuickPayScreen(
@@ -727,9 +673,7 @@ private fun EntryProviderScope<NavKey>.giftFlowEntries(
727673
GiftLoading(viewModel = viewModel)
728674
}
729675

730-
entry<Routes.Gift.Used>(
731-
metadata = SheetSceneStrategy.sheet()
732-
) {
676+
entry<Routes.Gift.Used> {
733677
GiftErrorSheet(
734678
titleRes = R.string.other__gift__used__title,
735679
textRes = R.string.other__gift__used__text,
@@ -738,9 +682,7 @@ private fun EntryProviderScope<NavKey>.giftFlowEntries(
738682
)
739683
}
740684

741-
entry<Routes.Gift.UsedUp>(
742-
metadata = SheetSceneStrategy.sheet()
743-
) {
685+
entry<Routes.Gift.UsedUp> {
744686
GiftErrorSheet(
745687
titleRes = R.string.other__gift__used_up__title,
746688
textRes = R.string.other__gift__used_up__text,
@@ -749,9 +691,7 @@ private fun EntryProviderScope<NavKey>.giftFlowEntries(
749691
)
750692
}
751693

752-
entry<Routes.Gift.Error>(
753-
metadata = SheetSceneStrategy.sheet()
754-
) {
694+
entry<Routes.Gift.Error> {
755695
GiftErrorSheet(
756696
titleRes = R.string.other__gift__error__title,
757697
textRes = R.string.other__gift__error__text,
@@ -760,9 +700,7 @@ private fun EntryProviderScope<NavKey>.giftFlowEntries(
760700
)
761701
}
762702

763-
entry<Routes.Gift.Success>(
764-
metadata = SheetSceneStrategy.sheet()
765-
) {
703+
entry<Routes.Gift.Success> {
766704
// This route is not navigated directly, success triggers navigation to home and shows transaction sheet.
767705
LaunchedEffect(Unit) {
768706
navigator.navigateToHome()

0 commit comments

Comments
 (0)