|
1 | 1 | package to.bitkit.ui.screens.widgets.price |
2 | 2 |
|
3 | | -import androidx.compose.foundation.background |
4 | 3 | import androidx.compose.foundation.clickable |
5 | 4 | import androidx.compose.foundation.layout.Arrangement |
6 | | -import androidx.compose.foundation.layout.Box |
7 | 5 | import androidx.compose.foundation.layout.Column |
8 | 6 | import androidx.compose.foundation.layout.Row |
9 | | -import androidx.compose.foundation.layout.fillMaxSize |
10 | 7 | import androidx.compose.foundation.layout.fillMaxWidth |
11 | 8 | import androidx.compose.foundation.layout.padding |
12 | 9 | import androidx.compose.foundation.layout.size |
13 | 10 | import androidx.compose.foundation.rememberScrollState |
14 | 11 | import androidx.compose.foundation.verticalScroll |
15 | 12 | import androidx.compose.material3.HorizontalDivider |
16 | 13 | import androidx.compose.material3.Icon |
17 | | -import androidx.compose.material3.MaterialTheme |
18 | 14 | import androidx.compose.runtime.Composable |
19 | 15 | import androidx.compose.runtime.getValue |
20 | 16 | import androidx.compose.ui.Alignment |
21 | 17 | import androidx.compose.ui.Modifier |
22 | | -import androidx.compose.ui.graphics.Brush |
23 | | -import androidx.compose.ui.graphics.Color |
24 | | -import androidx.compose.ui.graphics.TileMode |
25 | 18 | import androidx.compose.ui.platform.testTag |
26 | 19 | import androidx.compose.ui.res.painterResource |
27 | 20 | import androidx.compose.ui.res.stringResource |
@@ -84,66 +77,50 @@ fun PriceEditContent( |
84 | 77 | .widgetSheetContent() |
85 | 78 | .testTag("price_edit_screen") |
86 | 79 | ) { |
87 | | - Box( |
| 80 | + SheetTopBar( |
| 81 | + titleText = stringResource(R.string.widgets__price__name), |
| 82 | + onBack = onBack, |
| 83 | + ) |
| 84 | + |
| 85 | + Column( |
88 | 86 | modifier = Modifier |
89 | 87 | .weight(1f) |
90 | 88 | .fillMaxWidth() |
| 89 | + .padding(horizontal = 16.dp) |
| 90 | + .verticalScroll(rememberScrollState()) |
| 91 | + .testTag("WidgetEditScrollView") |
91 | 92 | ) { |
92 | | - Column( |
93 | | - modifier = Modifier |
94 | | - .fillMaxSize() |
95 | | - .padding(horizontal = 16.dp) |
96 | | - .verticalScroll(rememberScrollState()) |
97 | | - .testTag("WidgetEditScrollView") |
98 | | - ) { |
99 | | - VerticalSpacer(82.dp) |
100 | | - |
101 | | - Caption13Up( |
102 | | - text = stringResource(R.string.appwidget__price__currency), |
103 | | - color = Colors.White64, |
104 | | - modifier = Modifier.padding(bottom = 16.dp) |
105 | | - ) |
| 93 | + VerticalSpacer(16.dp) |
106 | 94 |
|
107 | | - for (pair in TradingPair.entries) { |
108 | | - SelectableRow( |
109 | | - label = pair.displayName, |
110 | | - isSelected = pair == selectedPair, |
111 | | - onClick = { onSelectTradingPair(pair) }, |
112 | | - testTagPrefix = pair.displayName, |
113 | | - ) |
114 | | - } |
115 | | - |
116 | | - VerticalSpacer(16.dp) |
117 | | - |
118 | | - Caption13Up( |
119 | | - text = stringResource(R.string.appwidget__price__timeframe), |
120 | | - color = Colors.White64, |
121 | | - modifier = Modifier.padding(vertical = 16.dp) |
122 | | - ) |
| 95 | + Caption13Up( |
| 96 | + text = stringResource(R.string.appwidget__price__currency), |
| 97 | + color = Colors.White64, |
| 98 | + modifier = Modifier.padding(bottom = 16.dp) |
| 99 | + ) |
123 | 100 |
|
124 | | - for (period in GraphPeriod.entries) { |
125 | | - SelectableRow( |
126 | | - label = period.label(), |
127 | | - isSelected = period == preferences.period, |
128 | | - onClick = { onSelectPeriod(period) }, |
129 | | - testTagPrefix = period.value, |
130 | | - ) |
131 | | - } |
| 101 | + for (pair in TradingPair.entries) { |
| 102 | + SelectableRow( |
| 103 | + label = pair.displayName, |
| 104 | + isSelected = pair == selectedPair, |
| 105 | + onClick = { onSelectTradingPair(pair) }, |
| 106 | + testTagPrefix = pair.displayName, |
| 107 | + ) |
132 | 108 | } |
133 | 109 |
|
134 | | - Column { |
135 | | - SheetTopBar( |
136 | | - titleText = stringResource(R.string.widgets__price__name), |
137 | | - onBack = onBack, |
138 | | - modifier = Modifier.background( |
139 | | - Brush.verticalGradient( |
140 | | - colors = listOf( |
141 | | - MaterialTheme.colorScheme.background, |
142 | | - Color.Transparent, |
143 | | - ), |
144 | | - tileMode = TileMode.Decal, |
145 | | - ), |
146 | | - ) |
| 110 | + VerticalSpacer(16.dp) |
| 111 | + |
| 112 | + Caption13Up( |
| 113 | + text = stringResource(R.string.appwidget__price__timeframe), |
| 114 | + color = Colors.White64, |
| 115 | + modifier = Modifier.padding(vertical = 16.dp) |
| 116 | + ) |
| 117 | + |
| 118 | + for (period in GraphPeriod.entries) { |
| 119 | + SelectableRow( |
| 120 | + label = period.label(), |
| 121 | + isSelected = period == preferences.period, |
| 122 | + onClick = { onSelectPeriod(period) }, |
| 123 | + testTagPrefix = period.value, |
147 | 124 | ) |
148 | 125 | } |
149 | 126 | } |
|
0 commit comments