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

79
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 sharedpreferences = getActivity().getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
SharedPreferences.Editor editor = sharedpreferences.edit(); SharedPreferences.Editor editor = sharedpreferences.edit();
int i = 0; int i = 0;
if (theme.compareTo("2") == 0) { if (theme.compareTo("1") == 0) {
editor.putInt(Helper.SET_THEME, Helper.THEME_LIGHT); 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); editor.putInt(Helper.SET_THEME, Helper.THEME_DARK);
i = 1; i = 1;
} else if (theme.compareTo("3") == 0) { } else if (theme.compareTo("3") == 0) {
@ -130,6 +130,7 @@ public class ColorSettingsFragment extends PreferenceFragmentCompat implements S
} }
editor.commit(); editor.commit();
list.get(i).apply(Cyanea.getInstance()).recreate(getActivity()); list.get(i).apply(Cyanea.getInstance()).recreate(getActivity());
restart();
} }
} }
} }
@ -269,49 +270,55 @@ public class ColorSettingsFragment extends PreferenceFragmentCompat implements S
CharSequence[] entryValues = new CharSequence[3]; CharSequence[] entryValues = new CharSequence[3];
final SharedPreferences sharedpref = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); final SharedPreferences sharedpref = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
int theme = sharedpref.getInt(Helper.SET_THEME, Helper.THEME_DARK); int theme = sharedpref.getInt(Helper.SET_THEME, Helper.THEME_DARK);
entryValues[0] = String.valueOf(Helper.THEME_LIGHT); entryValues[0] = String.valueOf(Helper.THEME_DARK);
entryValues[1] = String.valueOf(Helper.THEME_DARK); entryValues[1] = String.valueOf(Helper.THEME_LIGHT);
entryValues[2] = String.valueOf(Helper.THEME_BLACK); entryValues[2] = String.valueOf(Helper.THEME_BLACK);
pref_theme_picker.setEntries(entries); 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.setEntryValues(entryValues);
pref_theme_picker.setDefaultValue(String.valueOf(theme)); pref_theme_picker.setValueIndex(default_theme_value);
pref_export.setOnPreferenceClickListener(preference -> {
pref_export.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() { exportColors();
@Override return true;
public boolean onPreferenceClick(Preference preference) {
exportColors();
return true;
}
}); });
pref_import.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() { pref_import.setOnPreferenceClickListener(preference -> {
@Override if (ContextCompat.checkSelfPermission(Objects.requireNonNull(getActivity()), Manifest.permission.READ_EXTERNAL_STORAGE) !=
public boolean onPreferenceClick(Preference preference) { PackageManager.PERMISSION_GRANTED) {
if (ContextCompat.checkSelfPermission(Objects.requireNonNull(getActivity()), Manifest.permission.READ_EXTERNAL_STORAGE) != ActivityCompat.requestPermissions(getActivity(),
PackageManager.PERMISSION_GRANTED) { new String[]{Manifest.permission.READ_EXTERNAL_STORAGE},
ActivityCompat.requestPermissions(getActivity(), TootActivity.MY_PERMISSIONS_REQUEST_READ_EXTERNAL_STORAGE);
new String[]{Manifest.permission.READ_EXTERNAL_STORAGE},
TootActivity.MY_PERMISSIONS_REQUEST_READ_EXTERNAL_STORAGE);
return true;
}
Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
intent.addCategory(Intent.CATEGORY_OPENABLE);
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT) {
intent.setType("*/*");
String[] mimetypes = {"*/*"};
intent.putExtra(Intent.EXTRA_MIME_TYPES, mimetypes);
startActivityForResult(intent, PICK_IMPORT_THEME);
} else {
intent.setType("*/*");
Intent pickIntent = new Intent(Intent.ACTION_PICK, android.provider.MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
Intent chooserIntent = Intent.createChooser(intent, getString(R.string.toot_select_import));
chooserIntent.putExtra(Intent.EXTRA_INITIAL_INTENTS, new Intent[]{pickIntent});
startActivityForResult(chooserIntent, PICK_IMPORT_THEME);
}
return true; return true;
} }
Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
intent.addCategory(Intent.CATEGORY_OPENABLE);
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT) {
intent.setType("*/*");
String[] mimetypes = {"*/*"};
intent.putExtra(Intent.EXTRA_MIME_TYPES, mimetypes);
startActivityForResult(intent, PICK_IMPORT_THEME);
} else {
intent.setType("*/*");
Intent pickIntent = new Intent(Intent.ACTION_PICK, android.provider.MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
Intent chooserIntent = Intent.createChooser(intent, getString(R.string.toot_select_import));
chooserIntent.putExtra(Intent.EXTRA_INITIAL_INTENTS, new Intent[]{pickIntent});
startActivityForResult(chooserIntent, PICK_IMPORT_THEME);
}
return true;
}); });
reset_pref.setOnPreferenceClickListener(preference -> { reset_pref.setOnPreferenceClickListener(preference -> {