fenix/Simple-Calculator
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calculator.git synced 2025-06-05 21:49:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix ui discrepancies and text color for language

Browse Source
This commit is contained in:
FunkyMuse
2023-07-10 00:08:03 +02:00
parent 481a8a8297
commit 9976b836e8
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/kotlin/com/simplemobiletools/calculator/compose/screens/SettingsScreen.kt
View File

@ -116,7 +116,7 @@ fun SettingsScreen(
preferenceTitle = stringResource(id = R.string.customize_widget_colors), preferenceTitle = stringResource(id = R.string.customize_widget_colors),
doOnPreferenceClick = customizeWidgetColors doOnPreferenceClick = customizeWidgetColors
) )
Spacer(modifier = Modifier.padding(bottom = 16.dp)) Spacer(modifier = Modifier.padding(bottom = 8.dp))
} }
Divider() Divider()
SettingsGroup(title = { SettingsGroup(title = {
@ -136,7 +136,8 @@ fun SettingsScreen(
SettingsPreferenceComponent( SettingsPreferenceComponent(
preferenceTitle = stringResource(id = R.string.language), preferenceTitle = stringResource(id = R.string.language),
preferenceSummary = displayLanguage, preferenceSummary = displayLanguage,
doOnPreferenceClick = onSetupLanguagePress doOnPreferenceClick = onSetupLanguagePress,
preferenceSummaryColor = MaterialTheme.colorScheme.onSurface
) )
} }
SettingsCheckBoxComponent( SettingsCheckBoxComponent(

4
app/src/main/kotlin/com/simplemobiletools/calculator/compose/settings/SettingsPreferenceComponent.kt
View File

@ -8,6 +8,7 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp import androidx.compose.ui.unit.sp
@ -25,6 +26,7 @@ fun SettingsPreferenceComponent(
isPreferenceEnabled: Boolean = true, isPreferenceEnabled: Boolean = true,
doOnPreferenceLongClick: (() -> Unit)? = null, doOnPreferenceLongClick: (() -> Unit)? = null,
doOnPreferenceClick: (() -> Unit)? = null, doOnPreferenceClick: (() -> Unit)? = null,
preferenceSummaryColor: Color = preferenceSummaryColor(isEnabled = isPreferenceEnabled)
) { ) {
Column( Column(
modifier = modifier modifier = modifier
@ -47,7 +49,7 @@ fun SettingsPreferenceComponent(
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.padding(vertical = 4.dp), .padding(vertical = 4.dp),
color = preferenceSummaryColor(isEnabled = isPreferenceEnabled), color = preferenceSummaryColor.copy(alpha = 0.6f),
) )
} }
} }

2
app/src/main/kotlin/com/simplemobiletools/calculator/compose/settings/SettingsTitleTextComponent.kt
View File

@ -18,7 +18,7 @@ fun SettingsTitleTextComponent(
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
text: String, text: String,
) { ) {
Box(modifier = Modifier.padding(top = 24.dp, bottom = 8.dp)) { Box(modifier = Modifier.padding(top = 16.dp, bottom = 8.dp)) {
Text( Text(
text = text.uppercase(), text = text.uppercase(),
modifier = modifier, modifier = modifier,