Skip to content

Commit 9692d92

Browse files
committed
feat: Add transitions to all send routes
1 parent 709b913 commit 9692d92

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

app/src/main/java/to/bitkit/ui/screens/wallets/send/SendOptionsView.kt

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,12 @@ import androidx.compose.ui.tooling.preview.Preview
2424
import androidx.compose.ui.unit.dp
2525
import androidx.lifecycle.compose.collectAsStateWithLifecycle
2626
import androidx.navigation.compose.NavHost
27-
import androidx.navigation.compose.composable
2827
import androidx.navigation.compose.rememberNavController
2928
import kotlinx.coroutines.launch
3029
import kotlinx.serialization.Serializable
3130
import to.bitkit.R
3231
import to.bitkit.models.NewTransactionSheetDetails
3332
import to.bitkit.ui.appViewModel
34-
import to.bitkit.ui.components.AuthCheckAction
3533
import to.bitkit.ui.components.Caption13Up
3634
import to.bitkit.ui.components.RectangleButton
3735
import to.bitkit.ui.composableWithDefaultTransitions
@@ -75,20 +73,20 @@ fun SendOptionsView(
7573
navController = navController,
7674
startDestination = startDestination,
7775
) {
78-
composable<SendRoute.Options> {
76+
composableWithDefaultTransitions<SendRoute.Options> {
7977
SendOptionsContent(
8078
onEvent = { appViewModel.setSendEvent(it) }
8179
)
8280
}
83-
composable<SendRoute.Address> {
81+
composableWithDefaultTransitions<SendRoute.Address> {
8482
val uiState by appViewModel.sendUiState.collectAsStateWithLifecycle()
8583
SendAddressScreen(
8684
uiState = uiState,
8785
onBack = { navController.popBackStack() },
8886
onEvent = { appViewModel.setSendEvent(it) },
8987
)
9088
}
91-
composable<SendRoute.Amount> {
89+
composableWithDefaultTransitions<SendRoute.Amount> {
9290
val uiState by appViewModel.sendUiState.collectAsStateWithLifecycle()
9391
val walletUiState by walletViewModel.uiState.collectAsStateWithLifecycle()
9492
SendAmountScreen(
@@ -98,13 +96,13 @@ fun SendOptionsView(
9896
onEvent = { appViewModel.setSendEvent(it) }
9997
)
10098
}
101-
composable<SendRoute.QrScanner> {
99+
composableWithDefaultTransitions<SendRoute.QrScanner> {
102100
QrScanningScreen(navController = navController) { qrCode ->
103101
navController.popBackStack()
104102
appViewModel.onScanSuccess(data = qrCode)
105103
}
106104
}
107-
composable<SendRoute.ReviewAndSend> { backStackEntry ->
105+
composableWithDefaultTransitions<SendRoute.ReviewAndSend> { backStackEntry ->
108106
val uiState by appViewModel.sendUiState.collectAsStateWithLifecycle()
109107
SendAndReviewScreen(
110108
savedStateHandle = backStackEntry.savedStateHandle,
@@ -116,7 +114,7 @@ fun SendOptionsView(
116114
onNavigateToPin = { navController.navigate(SendRoute.PinCheck) }
117115
)
118116
}
119-
composable<SendRoute.AddTag> {
117+
composableWithDefaultTransitions<SendRoute.AddTag> {
120118
AddTagScreen(
121119
onBack = { navController.popBackStack() },
122120
onTagSelected = { tag ->
@@ -231,7 +229,6 @@ private fun SendOptionsContent(
231229
}
232230
}
233231

234-
// region preview
235232
@Preview(showBackground = true)
236233
@Composable
237234
private fun SendOptionsContentPreview() {
@@ -241,7 +238,6 @@ private fun SendOptionsContentPreview() {
241238
)
242239
}
243240
}
244-
// endregion
245241

246242
interface SendRoute {
247243
@Serializable

0 commit comments

Comments
 (0)