fix: remove paddings as they're coming from commons now

This commit is contained in:
FunkyMuse
2023-08-23 11:33:25 +02:00
parent 85c31f897f
commit b9d6d483ea
2 changed files with 3 additions and 16 deletions

View File

@ -40,37 +40,29 @@ internal fun SettingsScreen(
lockedCustomizeColorText: String?, lockedCustomizeColorText: String?,
displayLanguage: String displayLanguage: String
) { ) {
val startingPadding = remember { Modifier.padding(horizontal = 4.dp) }
SettingsScaffold(title = stringResource(id = R.string.settings), goBack = goBack) { paddingValues -> SettingsScaffold(title = stringResource(id = R.string.settings), goBack = goBack) { paddingValues ->
SettingsGroup(title = { SettingsGroup(title = {
SettingsTitleTextComponent(text = stringResource(id = R.string.color_customization), modifier = startingPadding) SettingsTitleTextComponent(text = stringResource(id = R.string.color_customization))
}) { }) {
SettingsPreferenceComponent( SettingsPreferenceComponent(
modifier = Modifier
.padding(vertical = 12.dp)
.then(startingPadding),
preferenceTitle = stringResource(id = R.string.customize_colors), preferenceTitle = stringResource(id = R.string.customize_colors),
doOnPreferenceClick = customizeColors, doOnPreferenceClick = customizeColors,
isPreferenceEnabled = isOrWasThankYouInstalled, isPreferenceEnabled = isOrWasThankYouInstalled,
preferenceSummary = lockedCustomizeColorText preferenceSummary = lockedCustomizeColorText
) )
SettingsPreferenceComponent( SettingsPreferenceComponent(
modifier = Modifier
.padding(vertical = 12.dp)
.then(startingPadding),
preferenceTitle = stringResource(id = R.string.customize_widget_colors), preferenceTitle = stringResource(id = R.string.customize_widget_colors),
doOnPreferenceClick = customizeWidgetColors doOnPreferenceClick = customizeWidgetColors
) )
} }
HorizontalDivider(color = divider_grey) HorizontalDivider(color = divider_grey)
SettingsGroup(title = { SettingsGroup(title = {
SettingsTitleTextComponent(text = stringResource(id = R.string.general_settings), modifier = startingPadding) SettingsTitleTextComponent(text = stringResource(id = R.string.general_settings))
}) { }) {
if (!isOrWasThankYouInstalled) { if (!isOrWasThankYouInstalled) {
SettingsPreferenceComponent( SettingsPreferenceComponent(
preferenceTitle = stringResource(id = R.string.purchase_simple_thank_you), preferenceTitle = stringResource(id = R.string.purchase_simple_thank_you),
doOnPreferenceClick = onThankYou, doOnPreferenceClick = onThankYou,
modifier = startingPadding,
) )
} }
if (isUseEnglishEnabled) { if (isUseEnglishEnabled) {
@ -78,7 +70,6 @@ internal fun SettingsScreen(
title = stringResource(id = R.string.use_english_language), title = stringResource(id = R.string.use_english_language),
initialValue = isUseEnglishChecked, initialValue = isUseEnglishChecked,
onChange = onUseEnglishPress, onChange = onUseEnglishPress,
modifier = startingPadding,
) )
} }
if (isTiramisuPlus()) { if (isTiramisuPlus()) {
@ -87,26 +78,22 @@ internal fun SettingsScreen(
preferenceSummary = displayLanguage, preferenceSummary = displayLanguage,
doOnPreferenceClick = onSetupLanguagePress, doOnPreferenceClick = onSetupLanguagePress,
preferenceSummaryColor = MaterialTheme.colorScheme.onSurface, preferenceSummaryColor = MaterialTheme.colorScheme.onSurface,
modifier = startingPadding,
) )
} }
SettingsCheckBoxComponent( SettingsCheckBoxComponent(
title = stringResource(id = R.string.vibrate_on_button_press), title = stringResource(id = R.string.vibrate_on_button_press),
initialValue = vibrateOnButtonPressFlow, initialValue = vibrateOnButtonPressFlow,
onChange = onVibrateOnButtonPressFlow, onChange = onVibrateOnButtonPressFlow,
modifier = startingPadding,
) )
SettingsCheckBoxComponent( SettingsCheckBoxComponent(
title = stringResource(id = R.string.prevent_phone_from_sleeping), title = stringResource(id = R.string.prevent_phone_from_sleeping),
initialValue = preventPhoneFromSleeping, initialValue = preventPhoneFromSleeping,
onChange = onPreventPhoneFromSleeping, onChange = onPreventPhoneFromSleeping,
modifier = startingPadding,
) )
SettingsCheckBoxComponent( SettingsCheckBoxComponent(
title = stringResource(id = com.simplemobiletools.calculator.R.string.use_comma_as_decimal_mark), title = stringResource(id = com.simplemobiletools.calculator.R.string.use_comma_as_decimal_mark),
initialValue = useCommaAsDecimalMarkFlow, initialValue = useCommaAsDecimalMarkFlow,
onChange = onUseCommaAsDecimalMarkFlow, onChange = onUseCommaAsDecimalMarkFlow,
modifier = startingPadding,
) )
} }
Spacer(modifier = Modifier.padding(bottom = paddingValues.calculateBottomPadding())) Spacer(modifier = Modifier.padding(bottom = paddingValues.calculateBottomPadding()))

View File

@ -20,7 +20,7 @@ exp4j = "0.4.8"
#Room #Room
room = "2.5.2" room = "2.5.2"
#Simple tools #Simple tools
simple-commons = "c3d56ea0d0" simple-commons = "565200547d"
#Gradle #Gradle
gradlePlugins-agp = "8.1.1" gradlePlugins-agp = "8.1.1"
#build #build