mirrors
/
Fedilab
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Merge pull request 'accent_color_corrections' (#934) from Zekovski/Fedilab:accent_color_corrections into develop

Browse Source 
Reviewed-on: https://codeberg.org/tom79/Fedilab/pulls/934
pull/946/head
Thomas 1 year ago
parent 50e88b3f86 ed9563d380
commit 23aec94de7
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File

27
app/src/main/java/app/fedilab/android/mastodon/ui/fragment/settings/FragmentThemingSettings.java
Unescape View File

@ -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);
}
}

Write Preview
Loading…
Cancel
Save