Skip to content

Commit 3482940

Browse files
committed
fix: align price edit title bg
1 parent 342e94f commit 3482940

1 file changed

Lines changed: 36 additions & 59 deletions

File tree

app/src/main/java/to/bitkit/ui/screens/widgets/price/PriceEditScreen.kt

Lines changed: 36 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,20 @@
11
package to.bitkit.ui.screens.widgets.price
22

3-
import androidx.compose.foundation.background
43
import androidx.compose.foundation.clickable
54
import androidx.compose.foundation.layout.Arrangement
6-
import androidx.compose.foundation.layout.Box
75
import androidx.compose.foundation.layout.Column
86
import androidx.compose.foundation.layout.Row
9-
import androidx.compose.foundation.layout.fillMaxSize
107
import androidx.compose.foundation.layout.fillMaxWidth
118
import androidx.compose.foundation.layout.padding
129
import androidx.compose.foundation.layout.size
1310
import androidx.compose.foundation.rememberScrollState
1411
import androidx.compose.foundation.verticalScroll
1512
import androidx.compose.material3.HorizontalDivider
1613
import androidx.compose.material3.Icon
17-
import androidx.compose.material3.MaterialTheme
1814
import androidx.compose.runtime.Composable
1915
import androidx.compose.runtime.getValue
2016
import androidx.compose.ui.Alignment
2117
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
2518
import androidx.compose.ui.platform.testTag
2619
import androidx.compose.ui.res.painterResource
2720
import androidx.compose.ui.res.stringResource
@@ -84,66 +77,50 @@ fun PriceEditContent(
8477
.widgetSheetContent()
8578
.testTag("price_edit_screen")
8679
) {
87-
Box(
80+
SheetTopBar(
81+
titleText = stringResource(R.string.widgets__price__name),
82+
onBack = onBack,
83+
)
84+
85+
Column(
8886
modifier = Modifier
8987
.weight(1f)
9088
.fillMaxWidth()
89+
.padding(horizontal = 16.dp)
90+
.verticalScroll(rememberScrollState())
91+
.testTag("WidgetEditScrollView")
9192
) {
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)
10694

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+
)
123100

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+
)
132108
}
133109

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,
147124
)
148125
}
149126
}

0 commit comments

Comments
 (0)