Skip to content

Commit 300c425

Browse files
committed
chore: Rename receive screens with receive prefix
1 parent 9928630 commit 300c425

File tree

4 files changed

+27
-27
lines changed

4 files changed

+27
-27
lines changed

app/src/main/java/to/bitkit/ui/screens/wallets/receive/CreateCjitScreen.kt renamed to app/src/main/java/to/bitkit/ui/screens/wallets/receive/ReceiveAmountScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ import to.bitkit.ui.walletViewModel
4545
import to.bitkit.utils.Logger
4646

4747
@Composable
48-
fun CreateCjitScreen(
48+
fun ReceiveAmountScreen(
4949
onCjitCreated: (CjitEntryDetails) -> Unit,
5050
onBack: () -> Unit,
5151
) {

app/src/main/java/to/bitkit/ui/screens/wallets/receive/ConfirmCjitScreen.kt renamed to app/src/main/java/to/bitkit/ui/screens/wallets/receive/ReceiveConfirmScreen.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import to.bitkit.ui.theme.AppThemeSurface
3636
import to.bitkit.ui.theme.Colors
3737
import to.bitkit.ui.utils.withAccent
3838

39-
// TODO pass these to nav
39+
// TODO pass these to nav?
4040
@Serializable
4141
data class CjitEntryDetails(
4242
val networkFeeSat: Long,
@@ -48,7 +48,7 @@ data class CjitEntryDetails(
4848
)
4949

5050
@Composable
51-
fun ConfirmCjitScreen(
51+
fun ReceiveConfirmScreen(
5252
entry: CjitEntryDetails,
5353
onLearnMore: () -> Unit,
5454
onContinue: (String) -> Unit,
@@ -84,7 +84,7 @@ fun ConfirmCjitScreen(
8484
} ?: sats.toString()
8585
}
8686

87-
ConfirmCjitContent(
87+
ReceiveConfirmContent(
8888
receiveSats = entry.receiveAmountSats,
8989
networkFeeFormatted = networkFeeFormatted,
9090
serviceFeeFormatted = serviceFeeFormatted,
@@ -96,7 +96,7 @@ fun ConfirmCjitScreen(
9696
}
9797

9898
@Composable
99-
private fun ConfirmCjitContent(
99+
private fun ReceiveConfirmContent(
100100
receiveSats: Long,
101101
networkFeeFormatted: String,
102102
serviceFeeFormatted: String,
@@ -165,9 +165,9 @@ private fun ConfirmCjitContent(
165165

166166
@Preview(showBackground = true)
167167
@Composable
168-
private fun ConfirmCjitContentPreview() {
168+
private fun Preview() {
169169
AppThemeSurface {
170-
ConfirmCjitContent(
170+
ReceiveConfirmContent(
171171
receiveSats = 12500L,
172172
networkFeeFormatted = "$0.50",
173173
serviceFeeFormatted = "$1.00",

app/src/main/java/to/bitkit/ui/screens/wallets/receive/CjitLiquidityScreen.kt renamed to app/src/main/java/to/bitkit/ui/screens/wallets/receive/ReceiveLiquidityScreen.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import to.bitkit.ui.theme.Colors
2424
import kotlin.math.round
2525

2626
@Composable
27-
fun CjitLiquidityScreen(
27+
fun ReceiveLiquidityScreen(
2828
entry: CjitEntryDetails,
2929
onContinue: () -> Unit,
3030
onBack: () -> Unit,
@@ -76,7 +76,7 @@ fun CjitLiquidityScreen(
7676
@Composable
7777
private fun Preview() {
7878
AppThemeSurface {
79-
CjitLiquidityScreen(
79+
ReceiveLiquidityScreen(
8080
entry = CjitEntryDetails(
8181
channelSizeSat = 200_000L,
8282
receiveAmountSats = 50_000L,

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@ import to.bitkit.ui.utils.withAccent
6161
import to.bitkit.ui.walletViewModel
6262
import to.bitkit.viewmodels.MainUiState
6363

64-
private object Routes {
65-
const val QR = "qr_screen"
66-
const val CJIT = "cjit_screen"
67-
const val CJIT_CONFIRM = "cjit_confirm"
68-
const val CJIT_LIQUIDITY = "cjit_liquidity"
64+
private object ReceiveRoutes {
65+
const val QR = "qr"
66+
const val AMOUNT = "amount"
67+
const val CONFIRM = "confirm"
68+
const val LIQUIDITY = "liquidity"
6969
}
7070

7171
@Composable
@@ -102,9 +102,9 @@ fun ReceiveQrSheet(
102102
) {
103103
NavHost(
104104
navController = navController,
105-
startDestination = Routes.QR,
105+
startDestination = ReceiveRoutes.QR,
106106
) {
107-
composable(Routes.QR) {
107+
composable(ReceiveRoutes.QR) {
108108
LaunchedEffect(cjitInvoice.value) {
109109
showCreateCjit.value = !cjitInvoice.value.isNullOrBlank()
110110
}
@@ -117,36 +117,36 @@ fun ReceiveQrSheet(
117117
if (!active) {
118118
cjitInvoice.value = null
119119
} else if (cjitInvoice.value == null) {
120-
navController.navigate(Routes.CJIT)
120+
navController.navigate(ReceiveRoutes.AMOUNT)
121121
}
122122
}
123123
)
124124
}
125-
composable(Routes.CJIT) {
126-
CreateCjitScreen(
125+
composable(ReceiveRoutes.AMOUNT) {
126+
ReceiveAmountScreen(
127127
onCjitCreated = { entry ->
128128
cjitEntryDetails.value = entry
129-
navController.navigate(Routes.CJIT_CONFIRM)
129+
navController.navigate(ReceiveRoutes.CONFIRM)
130130
},
131131
onBack = { navController.popBackStack() },
132132
)
133133
}
134-
composable(Routes.CJIT_CONFIRM) {
134+
composable(ReceiveRoutes.CONFIRM) {
135135
cjitEntryDetails.value?.let { entryDetails ->
136-
ConfirmCjitScreen(
136+
ReceiveConfirmScreen(
137137
entry = entryDetails,
138-
onLearnMore = { navController.navigate(Routes.CJIT_LIQUIDITY) },
138+
onLearnMore = { navController.navigate(ReceiveRoutes.LIQUIDITY) },
139139
onContinue = { invoice ->
140140
cjitInvoice.value = invoice
141-
navController.navigate(Routes.QR) { popUpTo(Routes.QR) { inclusive = true } }
141+
navController.navigate(ReceiveRoutes.QR) { popUpTo(ReceiveRoutes.QR) { inclusive = true } }
142142
},
143143
onBack = { navController.popBackStack() },
144144
)
145145
}
146146
}
147-
composable(Routes.CJIT_LIQUIDITY) {
147+
composable(ReceiveRoutes.LIQUIDITY) {
148148
cjitEntryDetails.value?.let { entryDetails ->
149-
CjitLiquidityScreen(
149+
ReceiveLiquidityScreen(
150150
entry = entryDetails,
151151
onContinue = { navController.popBackStack() },
152152
onBack = { navController.popBackStack() },
@@ -405,7 +405,7 @@ private fun CopyAddressCard(
405405

406406
@Preview(showBackground = true)
407407
@Composable
408-
private fun ReceiveQRScreenPreview() {
408+
private fun ReceiveQrScreenPreview() {
409409
AppThemeSurface {
410410
ReceiveQrScreen(
411411
cjitInvoice = remember { mutableStateOf(null) },

0 commit comments

Comments
 (0)