@@ -14,7 +14,6 @@ import androidx.compose.foundation.lazy.items
1414import androidx.compose.material.icons.Icons
1515import androidx.compose.material.icons.filled.Check
1616import androidx.compose.material.icons.filled.Search
17- import androidx.compose.material3.DividerDefaults
1817import androidx.compose.material3.HorizontalDivider
1918import androidx.compose.material3.Icon
2019import androidx.compose.material3.MaterialTheme
@@ -33,10 +32,11 @@ import androidx.navigation.NavController
3332import to.bitkit.R
3433import to.bitkit.models.FxRate
3534import to.bitkit.ui.LocalCurrencies
36- import to.bitkit.ui.components.LabelText
35+ import to.bitkit.ui.components.Caption13Up
3736import to.bitkit.ui.scaffold.AppTopBar
3837import to.bitkit.ui.scaffold.ScreenColumn
3938import to.bitkit.ui.theme.AppTextFieldDefaults
39+ import to.bitkit.ui.theme.Colors
4040import 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