Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix issue #430

This commit is contained in:
Thomas 2020-05-08 15:52:13 +02:00
parent 9335c22eb2
commit 40d742e4a0
1 changed files with 43 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
app/src/main/java/app/fedilab/android/fragments/ColorSettingsFragment.java
View File

@ -119,9 +119,9 @@ public class ColorSettingsFragment extends PreferenceFragmentCompat implements S
SharedPreferences sharedpreferences = getActivity().getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
SharedPreferences.Editor editor = sharedpreferences.edit();
int i = 0;
if (theme.compareTo("2") == 0) {
if (theme.compareTo("1") == 0) {
editor.putInt(Helper.SET_THEME, Helper.THEME_LIGHT);
} else if (theme.compareTo("1") == 0) {
} else if (theme.compareTo("2") == 0) {
editor.putInt(Helper.SET_THEME, Helper.THEME_DARK);
i = 1;
} else if (theme.compareTo("3") == 0) {
@ -130,6 +130,7 @@ public class ColorSettingsFragment extends PreferenceFragmentCompat implements S
}
editor.commit();
list.get(i).apply(Cyanea.getInstance()).recreate(getActivity());
restart();
}
}
}
@ -269,26 +270,33 @@ public class ColorSettingsFragment extends PreferenceFragmentCompat implements S
CharSequence[] entryValues = new CharSequence[3];
final SharedPreferences sharedpref = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
int theme = sharedpref.getInt(Helper.SET_THEME, Helper.THEME_DARK);
entryValues[0] = String.valueOf(Helper.THEME_LIGHT);
entryValues[1] = String.valueOf(Helper.THEME_DARK);
entryValues[0] = String.valueOf(Helper.THEME_DARK);
entryValues[1] = String.valueOf(Helper.THEME_LIGHT);
entryValues[2] = String.valueOf(Helper.THEME_BLACK);
pref_theme_picker.setEntries(entries);
int default_theme_value;
switch (theme){
case Helper.THEME_LIGHT:
default_theme_value = 1;
break;
case Helper.THEME_BLACK:
default_theme_value = 2;
break;
default:
default_theme_value = 0;
}
pref_theme_picker.setEntryValues(entryValues);
pref_theme_picker.setDefaultValue(String.valueOf(theme));
pref_theme_picker.setValueIndex(default_theme_value);
pref_export.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
@Override
public boolean onPreferenceClick(Preference preference) {
pref_export.setOnPreferenceClickListener(preference -> {
exportColors();
return true;
}
});
pref_import.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
@Override
public boolean onPreferenceClick(Preference preference) {
pref_import.setOnPreferenceClickListener(preference -> {
if (ContextCompat.checkSelfPermission(Objects.requireNonNull(getActivity()), Manifest.permission.READ_EXTERNAL_STORAGE) !=
PackageManager.PERMISSION_GRANTED) {
ActivityCompat.requestPermissions(getActivity(),
@ -311,7 +319,6 @@ public class ColorSettingsFragment extends PreferenceFragmentCompat implements S
startActivityForResult(chooserIntent, PICK_IMPORT_THEME);
}
return true;
}
});
reset_pref.setOnPreferenceClickListener(preference -> {