Skip to content

Commit 2f2a39d

Browse files
committed
feat: cjit navigation
1 parent e10b37f commit 2f2a39d

File tree

2 files changed

+27
-10
lines changed

2 files changed

+27
-10
lines changed

app/src/main/java/to/bitkit/ui/screens/wallets/receive/ReceiveQrScreen.kt

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ fun ReceiveQrScreen(
6969
walletState: MainUiState,
7070
lightningState: LightningState,
7171
onClickEditInvoice: () -> Unit,
72+
onClickReceiveCjit: () -> Unit,
7273
modifier: Modifier = Modifier,
7374
initialTab: ReceiveTab? = null,
7475
) {
@@ -203,14 +204,21 @@ fun ReceiveQrScreen(
203204
),
204205
icon = {
205206
if (showingCjitOnboarding) {
206-
Icon(
207-
painter = painterResource(R.drawable.ic_lightning_alt),
208-
tint = Colors.Purple,
209-
contentDescription = null
210-
)
211-
}
207+
Icon(
208+
painter = painterResource(R.drawable.ic_lightning_alt),
209+
tint = Colors.Purple,
210+
contentDescription = null
211+
)
212+
}
213+
},
214+
onClick = {
215+
if (showingCjitOnboarding) {
216+
onClickReceiveCjit()
217+
showDetails = false
218+
} else {
219+
showDetails = !showDetails
220+
}
212221
},
213-
onClick = { showDetails = !showDetails },
214222
fullWidth = true,
215223
modifier = Modifier.testTag("ReceiveToggleButton")
216224
)
@@ -494,7 +502,8 @@ private fun PreviewSavingsMode() {
494502
),
495503
onClickEditInvoice = {},
496504
modifier = Modifier.sheetHeight(),
497-
initialTab = ReceiveTab.SAVINGS
505+
initialTab = ReceiveTab.SAVINGS,
506+
onClickReceiveCjit = {},
498507
)
499508
}
500509
}
@@ -564,7 +573,8 @@ private fun PreviewAutoMode() {
564573
),
565574
onClickEditInvoice = {},
566575
modifier = Modifier.sheetHeight(),
567-
initialTab = ReceiveTab.AUTO
576+
initialTab = ReceiveTab.AUTO,
577+
onClickReceiveCjit = {},
568578
)
569579
}
570580
}
@@ -589,7 +599,8 @@ private fun PreviewSpendingMode() {
589599
),
590600
onClickEditInvoice = {},
591601
modifier = Modifier.sheetHeight(),
592-
initialTab = ReceiveTab.SPENDING
602+
initialTab = ReceiveTab.SPENDING,
603+
onClickReceiveCjit = {},
593604
)
594605
}
595606
}
@@ -610,6 +621,7 @@ private fun PreviewNodeNotReady() {
610621
shouldBlockLightningReceive = false,
611622
isGeoBlocked = false
612623
),
624+
onClickReceiveCjit = {},
613625
onClickEditInvoice = {},
614626
modifier = Modifier.sheetHeight(),
615627
)
@@ -634,6 +646,7 @@ private fun PreviewSmall() {
634646
),
635647
onClickEditInvoice = {},
636648
modifier = Modifier.sheetHeight(),
649+
onClickReceiveCjit = {},
637650
)
638651
}
639652
}

app/src/main/java/to/bitkit/ui/screens/wallets/receive/ReceiveSheet.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,10 @@ fun ReceiveSheet(
7878
cjitInvoice = cjitInvoice,
7979
walletState = walletState,
8080
lightningState = lightningState,
81+
onClickReceiveCjit = {
82+
showCreateCjit.value = true
83+
navController.navigate(ReceiveRoute.Amount)
84+
},
8185
onClickEditInvoice = { navController.navigate(ReceiveRoute.EditInvoice) },
8286
)
8387
}

0 commit comments

Comments
 (0)