Skip to content

Commit 2e0d70b

Browse files
committed
feat: Local currency settings UI improvements
1 parent b5b4563 commit 2e0d70b

File tree

2 files changed

+21
-7
lines changed

2 files changed

+21
-7
lines changed

app/src/main/java/to/bitkit/ui/ContentView.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -912,7 +912,6 @@ object Routes {
912912
@Serializable
913913
data object TransactionSpeedSettings
914914

915-
916915
@Serializable
917916
data object CustomFeeSettings
918917

app/src/main/java/to/bitkit/ui/settings/LocalCurrencySettingsScreen.kt

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import androidx.compose.foundation.lazy.items
1414
import androidx.compose.material.icons.Icons
1515
import androidx.compose.material.icons.filled.Check
1616
import androidx.compose.material.icons.filled.Search
17-
import androidx.compose.material3.DividerDefaults
1817
import androidx.compose.material3.HorizontalDivider
1918
import androidx.compose.material3.Icon
2019
import androidx.compose.material3.MaterialTheme
@@ -33,10 +32,11 @@ import androidx.navigation.NavController
3332
import to.bitkit.R
3433
import to.bitkit.models.FxRate
3534
import to.bitkit.ui.LocalCurrencies
36-
import to.bitkit.ui.components.LabelText
35+
import to.bitkit.ui.components.Caption13Up
3736
import to.bitkit.ui.scaffold.AppTopBar
3837
import to.bitkit.ui.scaffold.ScreenColumn
3938
import to.bitkit.ui.theme.AppTextFieldDefaults
39+
import to.bitkit.ui.theme.Colors
4040
import to.bitkit.viewmodels.CurrencyViewModel
4141

4242
@Composable
@@ -45,7 +45,10 @@ fun LocalCurrencySettingsScreen(
4545
navController: NavController,
4646
) {
4747
ScreenColumn {
48-
AppTopBar(stringResource(R.string.local_currency), onBackClick = { navController.popBackStack() })
48+
AppTopBar(
49+
titleText = stringResource(R.string.settings__general__currency_local_title),
50+
onBackClick = { navController.popBackStack() }
51+
)
4952
Column(
5053
modifier = Modifier
5154
.padding(horizontal = 16.dp)
@@ -85,7 +88,13 @@ fun LocalCurrencySettingsScreen(
8588

8689
LazyColumn {
8790
if (mostUsedRates.isNotEmpty()) {
88-
item { LabelText(text = "MOST USED", modifier = Modifier.padding(vertical = 8.dp)) }
91+
item {
92+
Caption13Up(
93+
text = stringResource(R.string.settings__general__currency_most_used),
94+
modifier = Modifier.padding(vertical = 8.dp),
95+
color = Colors.White64,
96+
)
97+
}
8998
items(mostUsedRates) { rate ->
9099
CurrencyRow(
91100
rate = rate,
@@ -97,7 +106,13 @@ fun LocalCurrencySettingsScreen(
97106
}
98107

99108
item { Spacer(modifier = Modifier.height(16.dp)) }
100-
item { LabelText(text = "OTHER CURRENCIES", modifier = Modifier.padding(vertical = 8.dp)) }
109+
item {
110+
Caption13Up(
111+
text = stringResource(R.string.settings__general__currency_other),
112+
modifier = Modifier.padding(vertical = 8.dp),
113+
color = Colors.White64,
114+
)
115+
}
101116

102117
items(otherCurrencies) { rate ->
103118
CurrencyRow(
@@ -137,6 +152,6 @@ private fun CurrencyRow(
137152
)
138153
}
139154
}
140-
HorizontalDivider(color = DividerDefaults.color.copy(alpha = 0.25f))
155+
HorizontalDivider()
141156
}
142157
}

0 commit comments

Comments
 (0)