Skip to content

Commit c320557

Browse files
committed
feat: coming soon sheet content preview & cleanup
1 parent 635fd8c commit c320557

2 files changed

Lines changed: 79 additions & 56 deletions

File tree

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
package to.bitkit.ui.sheets
2+
3+
import androidx.compose.foundation.Image
4+
import androidx.compose.foundation.layout.Column
5+
import androidx.compose.foundation.layout.fillMaxSize
6+
import androidx.compose.foundation.layout.fillMaxWidth
7+
import androidx.compose.foundation.layout.navigationBarsPadding
8+
import androidx.compose.foundation.layout.padding
9+
import androidx.compose.runtime.Composable
10+
import androidx.compose.ui.Modifier
11+
import androidx.compose.ui.platform.testTag
12+
import androidx.compose.ui.res.painterResource
13+
import androidx.compose.ui.res.stringResource
14+
import androidx.compose.ui.tooling.preview.Preview
15+
import androidx.compose.ui.unit.dp
16+
import to.bitkit.R
17+
import to.bitkit.ui.components.BodyM
18+
import to.bitkit.ui.components.BottomSheetPreview
19+
import to.bitkit.ui.components.Display
20+
import to.bitkit.ui.components.PrimaryButton
21+
import to.bitkit.ui.components.VerticalSpacer
22+
import to.bitkit.ui.scaffold.SheetTopBar
23+
import to.bitkit.ui.shared.modifiers.sheetHeight
24+
import to.bitkit.ui.shared.util.gradientBackground
25+
import to.bitkit.ui.theme.AppThemeSurface
26+
import to.bitkit.ui.theme.Colors
27+
import to.bitkit.ui.utils.withAccent
28+
29+
@Composable
30+
fun ComingSoonSheetContent(
31+
onBack: () -> Unit,
32+
modifier: Modifier = Modifier,
33+
) {
34+
Column(
35+
modifier = modifier
36+
.fillMaxSize()
37+
.gradientBackground()
38+
.navigationBarsPadding()
39+
.testTag("ComingSoonSheet")
40+
) {
41+
SheetTopBar(titleText = stringResource(R.string.coming_soon__title), onBack = onBack)
42+
Column(
43+
modifier = Modifier.padding(horizontal = 32.dp)
44+
) {
45+
Image(
46+
painter = painterResource(R.drawable.img_cronometer),
47+
contentDescription = null,
48+
modifier = Modifier
49+
.fillMaxWidth()
50+
.weight(1f)
51+
)
52+
Display(
53+
text = stringResource(R.string.coming_soon__headline).withAccent(accentColor = Colors.Brand),
54+
color = Colors.White,
55+
)
56+
VerticalSpacer(8.dp)
57+
BodyM(text = stringResource(R.string.coming_soon__description), color = Colors.White64)
58+
VerticalSpacer(54.dp)
59+
PrimaryButton(
60+
text = stringResource(R.string.coming_soon__button),
61+
onClick = onBack,
62+
)
63+
}
64+
}
65+
}
66+
67+
@Preview(showSystemUi = true)
68+
@Composable
69+
private fun Preview() {
70+
AppThemeSurface {
71+
BottomSheetPreview {
72+
ComingSoonSheetContent(
73+
onBack = {},
74+
modifier = Modifier.sheetHeight(),
75+
)
76+
}
77+
}
78+
}

app/src/main/java/to/bitkit/ui/sheets/SendSheet.kt

Lines changed: 1 addition & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,25 @@
11
package to.bitkit.ui.sheets
22

3-
import androidx.compose.foundation.Image
43
import androidx.compose.foundation.layout.Column
54
import androidx.compose.foundation.layout.fillMaxSize
65
import androidx.compose.foundation.layout.fillMaxWidth
76
import androidx.compose.foundation.layout.imePadding
87
import androidx.compose.foundation.layout.navigationBarsPadding
9-
import androidx.compose.foundation.layout.padding
108
import androidx.compose.runtime.Composable
119
import androidx.compose.runtime.LaunchedEffect
1210
import androidx.compose.runtime.getValue
1311
import androidx.compose.runtime.remember
1412
import androidx.compose.ui.Modifier
1513
import androidx.compose.ui.platform.testTag
16-
import androidx.compose.ui.res.painterResource
17-
import androidx.compose.ui.res.stringResource
18-
import androidx.compose.ui.unit.dp
1914
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
2015
import androidx.lifecycle.compose.collectAsStateWithLifecycle
2116
import androidx.navigation.compose.NavHost
2217
import androidx.navigation.compose.rememberNavController
2318
import androidx.navigation.toRoute
2419
import kotlinx.serialization.Serializable
25-
import to.bitkit.R
2620
import to.bitkit.models.NewTransactionSheetDetails
2721
import to.bitkit.models.NewTransactionSheetDirection
2822
import to.bitkit.models.NewTransactionSheetType
29-
import to.bitkit.ui.components.BodyM
30-
import to.bitkit.ui.components.Display
31-
import to.bitkit.ui.components.PrimaryButton
32-
import to.bitkit.ui.components.VerticalSpacer
33-
import to.bitkit.ui.scaffold.SheetTopBar
3423
import to.bitkit.ui.screens.scanner.QrScanningScreen
3524
import to.bitkit.ui.screens.wallets.send.AddTagScreen
3625
import to.bitkit.ui.screens.wallets.send.PIN_CHECK_RESULT_KEY
@@ -50,10 +39,8 @@ import to.bitkit.ui.screens.wallets.withdraw.WithdrawErrorScreen
5039
import to.bitkit.ui.settings.support.SupportScreen
5140
import to.bitkit.ui.shared.modifiers.sheetHeight
5241
import to.bitkit.ui.shared.util.gradientBackground
53-
import to.bitkit.ui.theme.Colors
5442
import to.bitkit.ui.utils.composableWithDefaultTransitions
5543
import to.bitkit.ui.utils.navigationWithDefaultTransitions
56-
import to.bitkit.ui.utils.withAccent
5744
import to.bitkit.viewmodels.AppViewModel
5845
import to.bitkit.viewmodels.SendEffect
5946
import to.bitkit.viewmodels.SendEvent
@@ -282,7 +269,7 @@ fun SendSheet(
282269
}
283270
composableWithDefaultTransitions<SendRoute.ComingSoon> {
284271
ComingSoonSheetContent(
285-
onBackClick = { navController.popBackStack() }
272+
onBack = { navController.popBackStack() }
286273
)
287274
}
288275
composableWithDefaultTransitions<SendRoute.Error> {
@@ -362,45 +349,3 @@ sealed interface SendRoute {
362349
@Serializable
363350
data class Error(val errorMessage: String) : SendRoute
364351
}
365-
366-
@Composable
367-
private fun ComingSoonSheetContent(
368-
onBackClick: () -> Unit,
369-
) {
370-
Column(
371-
modifier = Modifier
372-
.fillMaxSize()
373-
.gradientBackground()
374-
.navigationBarsPadding()
375-
) {
376-
SheetTopBar(
377-
titleText = stringResource(R.string.coming_soon__title),
378-
onBack = onBackClick
379-
)
380-
381-
Column(
382-
modifier = Modifier.padding(horizontal = 32.dp)
383-
) {
384-
Image(
385-
painter = painterResource(R.drawable.img_cronometer),
386-
contentDescription = null,
387-
modifier = Modifier
388-
.fillMaxWidth()
389-
.weight(1f)
390-
)
391-
392-
Display(
393-
text = stringResource(R.string.coming_soon__headline).withAccent(accentColor = Colors.Brand),
394-
color = Colors.White
395-
)
396-
VerticalSpacer(8.dp)
397-
BodyM(text = stringResource(R.string.coming_soon__description), color = Colors.White64)
398-
VerticalSpacer(54.dp)
399-
PrimaryButton(
400-
text = stringResource(R.string.coming_soon__button),
401-
onClick = onBackClick,
402-
)
403-
VerticalSpacer(16.dp)
404-
}
405-
}
406-
}

0 commit comments

Comments
 (0)