diff options
author | Thomas <tschneider.ac@gmail.com> | 2023-08-23 09:35:54 +0200 |
---|---|---|
committer | Thomas <tschneider.ac@gmail.com> | 2023-08-23 09:35:54 +0200 |
commit | 30f3ab8dca9f4e0b12b7dfc1cb04fadf3c66551c (patch) | |
tree | d7b1ff43b3da65655d4a30c20bdc9f1ab68c3fdf /app | |
parent | 14bd5e9750af3ed92983d3fc6372139666856d26 (diff) | |
parent | 6805c214bc1be0a6bd12e8dca8b2f0f48e36ed44 (diff) |
Merge remote-tracking branch 'origin/develop' into develop
Diffstat (limited to 'app')
-rw-r--r-- | app/src/main/java/app/fedilab/android/mastodon/ui/fragment/settings/FragmentThemingSettings.java | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/settings/FragmentThemingSettings.java b/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/settings/FragmentThemingSettings.java index a25df4b29..a38c15ac7 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/settings/FragmentThemingSettings.java +++ b/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/settings/FragmentThemingSettings.java @@ -31,6 +31,7 @@ import androidx.preference.PreferenceFragmentCompat; import androidx.preference.PreferenceManager; import androidx.preference.SwitchPreferenceCompat; +import com.google.android.material.color.DynamicColors; import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.jaredrummler.android.colorpicker.ColorPreferenceCompat; @@ -118,31 +119,31 @@ public class FragmentThemingSettings extends PreferenceFragmentCompat implements SwitchPreferenceCompat SET_CUSTOM_ACCENT = findPreference(getString(R.string.SET_CUSTOM_ACCENT)); ColorPreferenceCompat SET_CUSTOM_ACCENT_DARK_VALUE = findPreference(getString(R.string.SET_CUSTOM_ACCENT_DARK_VALUE)); ColorPreferenceCompat SET_CUSTOM_ACCENT_LIGHT_VALUE = findPreference(getString(R.string.SET_CUSTOM_ACCENT_LIGHT_VALUE)); - if (android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.S) { - if (SET_DYNAMIC_COLOR != null) { - getPreferenceScreen().removePreference(SET_DYNAMIC_COLOR); - } + if (DynamicColors.isDynamicColorAvailable()) { if (SET_CUSTOM_ACCENT != null) { - getPreferenceScreen().removePreference(SET_CUSTOM_ACCENT); + boolean customAccentEnabled = sharedpreferences.getBoolean(getString(R.string.SET_CUSTOM_ACCENT) + currentUserID + currentInstance, false); + SET_CUSTOM_ACCENT.setChecked(customAccentEnabled); } if (SET_CUSTOM_ACCENT_DARK_VALUE != null) { - getPreferenceScreen().removePreference(SET_CUSTOM_ACCENT_DARK_VALUE); + int darkValue = sharedpreferences.getInt(getString(R.string.SET_CUSTOM_ACCENT_DARK_VALUE) + currentUserID + currentInstance, -1); + SET_CUSTOM_ACCENT_DARK_VALUE.setColor(darkValue); } if (SET_CUSTOM_ACCENT_LIGHT_VALUE != null) { - getPreferenceScreen().removePreference(SET_CUSTOM_ACCENT_LIGHT_VALUE); + int lightValue = sharedpreferences.getInt(getString(R.string.SET_CUSTOM_ACCENT_LIGHT_VALUE) + currentUserID + currentInstance, -1); + SET_CUSTOM_ACCENT_LIGHT_VALUE.setColor(lightValue); } } else { + if (SET_DYNAMIC_COLOR != null) { + getPreferenceScreen().removePreference(SET_DYNAMIC_COLOR); + } if (SET_CUSTOM_ACCENT != null) { - boolean customAccentEnabled = sharedpreferences.getBoolean(getString(R.string.SET_CUSTOM_ACCENT) + currentUserID + currentInstance, false); - SET_CUSTOM_ACCENT.setChecked(customAccentEnabled); + getPreferenceScreen().removePreference(SET_CUSTOM_ACCENT); } if (SET_CUSTOM_ACCENT_DARK_VALUE != null) { - int darkValue = sharedpreferences.getInt(getString(R.string.SET_CUSTOM_ACCENT_DARK_VALUE) + currentUserID + currentInstance, -1); - SET_CUSTOM_ACCENT_DARK_VALUE.setColor(darkValue); + getPreferenceScreen().removePreference(SET_CUSTOM_ACCENT_DARK_VALUE); } if (SET_CUSTOM_ACCENT_LIGHT_VALUE != null) { - int darkValue = sharedpreferences.getInt(getString(R.string.SET_CUSTOM_ACCENT_LIGHT_VALUE) + currentUserID + currentInstance, -1); - SET_CUSTOM_ACCENT_LIGHT_VALUE.setColor(darkValue); + getPreferenceScreen().removePreference(SET_CUSTOM_ACCENT_LIGHT_VALUE); } } |