fenix
/
Simple-Calculator
mirror of https://github.com/SimpleMobileTools/Simple-Calculator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: customize colors locked color

This commit is contained in:
FunkyMuse 2023-09-29 10:31:12 +02:00
parent b1b66ad5a7
commit cfbd2d5399
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,12 +40,13 @@ internal fun SettingsScreen(
SettingsTitleTextComponent(text = stringResource(id = R.string.color_customization)) SettingsTitleTextComponent(text = stringResource(id = R.string.color_customization))
}) { }) {
SettingsPreferenceComponent( SettingsPreferenceComponent(
preferenceTitle = lockedCustomizeColorText, label = lockedCustomizeColorText,
doOnPreferenceClick = customizeColors, doOnPreferenceClick = customizeColors,
isPreferenceEnabled = isOrWasThankYouInstalled, isPreferenceEnabled = isOrWasThankYouInstalled,
preferenceLabelColor = MaterialTheme.colorScheme.onSurface
) )
SettingsPreferenceComponent( SettingsPreferenceComponent(
preferenceTitle = stringResource(id = R.string.customize_widget_colors), label = stringResource(id = R.string.customize_widget_colors),
doOnPreferenceClick = customizeWidgetColors doOnPreferenceClick = customizeWidgetColors
) )
} }
@ -55,37 +56,37 @@ internal fun SettingsScreen(
}) { }) {
if (!isOrWasThankYouInstalled) { if (!isOrWasThankYouInstalled) {
SettingsPreferenceComponent( SettingsPreferenceComponent(
preferenceTitle = stringResource(id = R.string.purchase_simple_thank_you), label = stringResource(id = R.string.purchase_simple_thank_you),
doOnPreferenceClick = onThankYou, doOnPreferenceClick = onThankYou,
) )
} }
if (isUseEnglishEnabled) { if (isUseEnglishEnabled) {
SettingsCheckBoxComponent( SettingsCheckBoxComponent(
title = stringResource(id = R.string.use_english_language), label = stringResource(id = R.string.use_english_language),
initialValue = isUseEnglishChecked, initialValue = isUseEnglishChecked,
onChange = onUseEnglishPress, onChange = onUseEnglishPress,
) )
} }
if (isTiramisuPlus()) { if (isTiramisuPlus()) {
SettingsPreferenceComponent( SettingsPreferenceComponent(
preferenceTitle = stringResource(id = R.string.language), label = stringResource(id = R.string.language),
preferenceSummary = displayLanguage, value = displayLanguage,
doOnPreferenceClick = onSetupLanguagePress, doOnPreferenceClick = onSetupLanguagePress,
preferenceSummaryColor = MaterialTheme.colorScheme.onSurface, preferenceValueColor = MaterialTheme.colorScheme.onSurface,
) )
} }
SettingsCheckBoxComponent( SettingsCheckBoxComponent(
title = stringResource(id = R.string.vibrate_on_button_press), label = stringResource(id = R.string.vibrate_on_button_press),
initialValue = vibrateOnButtonPressFlow, initialValue = vibrateOnButtonPressFlow,
onChange = onVibrateOnButtonPressFlow, onChange = onVibrateOnButtonPressFlow,
) )
SettingsCheckBoxComponent( SettingsCheckBoxComponent(
title = stringResource(id = R.string.prevent_phone_from_sleeping), label = stringResource(id = R.string.prevent_phone_from_sleeping),
initialValue = preventPhoneFromSleeping, initialValue = preventPhoneFromSleeping,
onChange = onPreventPhoneFromSleeping, onChange = onPreventPhoneFromSleeping,
) )
SettingsCheckBoxComponent( SettingsCheckBoxComponent(
title = stringResource(id = com.simplemobiletools.calculator.R.string.use_comma_as_decimal_mark), label = stringResource(id = com.simplemobiletools.calculator.R.string.use_comma_as_decimal_mark),
initialValue = useCommaAsDecimalMarkFlow, initialValue = useCommaAsDecimalMarkFlow,
onChange = onUseCommaAsDecimalMarkFlow, onChange = onUseCommaAsDecimalMarkFlow,
) )

10
gradle/libs.versions.toml
View File

@ -8,10 +8,10 @@ androidx-customView = "1.2.0-alpha02"
androidx-customViewPooling = "1.0.0" androidx-customViewPooling = "1.0.0"
androidx-lifecycle = "2.7.0-alpha02" androidx-lifecycle = "2.7.0-alpha02"
#Compose #Compose
composeActivity = "1.8.0-beta01" composeActivity = "1.8.0-rc01"
compose = "1.6.0-alpha05" compose = "1.6.0-alpha06"
composeCompiler = "1.5.3" composeCompiler = "1.5.3"
composeMaterial3 = "1.2.0-alpha07" composeMaterial3 = "1.2.0-alpha08"
accompanist = "0.33.1-alpha" accompanist = "0.33.1-alpha"
#AutoFitTextView #AutoFitTextView
autofittextview = "0.2.1" autofittextview = "0.2.1"
@ -20,9 +20,9 @@ exp4j = "0.4.8"
#Room #Room
room = "2.5.2" room = "2.5.2"
#Simple tools #Simple tools
simple-commons = "fd7f0ed81f" simple-commons = "5df1c152c5"
#Gradle #Gradle
gradlePlugins-agp = "8.1.1" gradlePlugins-agp = "8.1.2"
#build #build
app-build-compileSDKVersion = "34" app-build-compileSDKVersion = "34"
app-build-targetSDK = "34" app-build-targetSDK = "34"