Skip to content

Commit 42c85e8

Browse files
committed
refactor: receive screens preview
1 parent b095b54 commit 42c85e8

File tree

6 files changed

+209
-150
lines changed

6 files changed

+209
-150
lines changed

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

Lines changed: 64 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ import to.bitkit.ui.LocalCurrencies
4848
import to.bitkit.ui.blocktankViewModel
4949
import to.bitkit.ui.components.AmountInputHandler
5050
import to.bitkit.ui.components.BodySSB
51+
import to.bitkit.ui.components.BottomSheetPreview
5152
import to.bitkit.ui.components.ButtonSize
5253
import to.bitkit.ui.components.Caption13Up
5354
import to.bitkit.ui.components.Keyboard
@@ -57,6 +58,7 @@ import to.bitkit.ui.components.TagButton
5758
import to.bitkit.ui.components.UnitButton
5859
import to.bitkit.ui.currencyViewModel
5960
import to.bitkit.ui.scaffold.SheetTopBar
61+
import to.bitkit.ui.shared.modifiers.sheetHeight
6062
import to.bitkit.ui.shared.util.clickableAlpha
6163
import to.bitkit.ui.shared.util.gradientBackground
6264
import to.bitkit.ui.theme.AppTextFieldDefaults
@@ -172,9 +174,10 @@ fun EditInvoiceContent(
172174
onTextChanged: (String) -> Unit,
173175
onClickTag: (String) -> Unit,
174176
onInputChanged: (String) -> Unit,
177+
modifier: Modifier = Modifier,
175178
) {
176179
Box(
177-
modifier = Modifier
180+
modifier = modifier
178181
.fillMaxSize()
179182
.gradientBackground()
180183
.navigationBarsPadding()
@@ -365,70 +368,79 @@ fun EditInvoiceContent(
365368
@Composable
366369
private fun Preview() {
367370
AppThemeSurface {
368-
EditInvoiceContent(
369-
input = "123",
370-
noteText = "",
371-
primaryDisplay = PrimaryDisplay.BITCOIN,
372-
displayUnit = BitcoinDisplayUnit.MODERN,
373-
onBack = {},
374-
onTextChanged = {},
375-
numericKeyboardVisible = false,
376-
onClickBalance = {},
377-
onInputChanged = {},
378-
onContinueGeneral = {},
379-
onContinueKeyboard = {},
380-
tags = listOf(),
381-
onClickAddTag = {},
382-
onClickTag = {},
383-
isSoftKeyboardVisible = false,
384-
)
371+
BottomSheetPreview {
372+
EditInvoiceContent(
373+
input = "123",
374+
noteText = "",
375+
primaryDisplay = PrimaryDisplay.BITCOIN,
376+
displayUnit = BitcoinDisplayUnit.MODERN,
377+
onBack = {},
378+
onTextChanged = {},
379+
numericKeyboardVisible = false,
380+
onClickBalance = {},
381+
onInputChanged = {},
382+
onContinueGeneral = {},
383+
onContinueKeyboard = {},
384+
tags = listOf(),
385+
onClickAddTag = {},
386+
onClickTag = {},
387+
isSoftKeyboardVisible = false,
388+
modifier = Modifier.sheetHeight(),
389+
)
390+
}
385391
}
386392
}
387393

388394
@Preview(showSystemUi = true)
389395
@Composable
390396
private fun Preview2() {
391397
AppThemeSurface {
392-
EditInvoiceContent(
393-
input = "123",
394-
noteText = "Note text",
395-
primaryDisplay = PrimaryDisplay.BITCOIN,
396-
displayUnit = BitcoinDisplayUnit.MODERN,
397-
onBack = {},
398-
onTextChanged = {},
399-
numericKeyboardVisible = false,
400-
onClickBalance = {},
401-
onInputChanged = {},
402-
onContinueGeneral = {},
403-
onContinueKeyboard = {},
404-
tags = listOf("Team", "Dinner", "Home", "Work"),
405-
onClickAddTag = {},
406-
onClickTag = {},
407-
isSoftKeyboardVisible = false,
408-
)
398+
BottomSheetPreview {
399+
EditInvoiceContent(
400+
input = "123",
401+
noteText = "Note text",
402+
primaryDisplay = PrimaryDisplay.BITCOIN,
403+
displayUnit = BitcoinDisplayUnit.MODERN,
404+
onBack = {},
405+
onTextChanged = {},
406+
numericKeyboardVisible = false,
407+
onClickBalance = {},
408+
onInputChanged = {},
409+
onContinueGeneral = {},
410+
onContinueKeyboard = {},
411+
tags = listOf("Team", "Dinner", "Home", "Work"),
412+
onClickAddTag = {},
413+
onClickTag = {},
414+
isSoftKeyboardVisible = false,
415+
modifier = Modifier.sheetHeight(),
416+
)
417+
}
409418
}
410419
}
411420

412421
@Preview(showSystemUi = true)
413422
@Composable
414423
private fun Preview3() {
415424
AppThemeSurface {
416-
EditInvoiceContent(
417-
input = "123",
418-
noteText = "Note text",
419-
primaryDisplay = PrimaryDisplay.BITCOIN,
420-
displayUnit = BitcoinDisplayUnit.MODERN,
421-
onBack = {},
422-
onTextChanged = {},
423-
numericKeyboardVisible = true,
424-
onClickBalance = {},
425-
onInputChanged = {},
426-
onContinueGeneral = {},
427-
onContinueKeyboard = {},
428-
tags = listOf("Team", "Dinner", "Home"),
429-
onClickAddTag = {},
430-
onClickTag = {},
431-
isSoftKeyboardVisible = false,
432-
)
425+
BottomSheetPreview {
426+
EditInvoiceContent(
427+
input = "123",
428+
noteText = "Note text",
429+
primaryDisplay = PrimaryDisplay.BITCOIN,
430+
displayUnit = BitcoinDisplayUnit.MODERN,
431+
onBack = {},
432+
onTextChanged = {},
433+
numericKeyboardVisible = true,
434+
onClickBalance = {},
435+
onInputChanged = {},
436+
onContinueGeneral = {},
437+
onContinueKeyboard = {},
438+
tags = listOf("Team", "Dinner", "Home"),
439+
onClickAddTag = {},
440+
onClickTag = {},
441+
isSoftKeyboardVisible = false,
442+
modifier = Modifier.sheetHeight(),
443+
)
444+
}
433445
}
434446
}

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

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@ import androidx.compose.ui.tooling.preview.Preview
1717
import androidx.compose.ui.unit.dp
1818
import to.bitkit.R
1919
import to.bitkit.ui.components.BodyM
20+
import to.bitkit.ui.components.BottomSheetPreview
2021
import to.bitkit.ui.components.PrimaryButton
2122
import to.bitkit.ui.scaffold.SheetTopBar
23+
import to.bitkit.ui.shared.modifiers.sheetHeight
2224
import to.bitkit.ui.shared.util.gradientBackground
2325
import to.bitkit.ui.theme.AppThemeSurface
2426
import to.bitkit.ui.theme.Colors
@@ -27,9 +29,10 @@ import to.bitkit.ui.theme.Colors
2729
fun LocationBlockScreen(
2830
onBackPressed: () -> Unit,
2931
navigateAdvancedSetup: () -> Unit,
32+
modifier: Modifier = Modifier,
3033
) {
3134
Column(
32-
modifier = Modifier
35+
modifier = modifier
3336
.fillMaxSize()
3437
.gradientBackground()
3538
.navigationBarsPadding()
@@ -51,7 +54,9 @@ fun LocationBlockScreen(
5154
painter = painterResource(R.drawable.globe),
5255
contentScale = ContentScale.FillWidth,
5356
contentDescription = null,
54-
modifier = Modifier.fillMaxWidth().padding(horizontal = 60.dp)
57+
modifier = Modifier
58+
.fillMaxWidth()
59+
.padding(horizontal = 60.dp)
5560
)
5661

5762
Spacer(modifier = Modifier.weight(1f))
@@ -66,9 +71,12 @@ fun LocationBlockScreen(
6671
@Composable
6772
private fun Preview() {
6873
AppThemeSurface {
69-
LocationBlockScreen(
70-
onBackPressed = {},
71-
navigateAdvancedSetup = {}
72-
)
74+
BottomSheetPreview {
75+
LocationBlockScreen(
76+
onBackPressed = {},
77+
navigateAdvancedSetup = {},
78+
modifier = Modifier.sheetHeight(),
79+
)
80+
}
7381
}
7482
}

0 commit comments

Comments
 (0)