Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-07 01:23:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use dialog fragments to select theme, disable doze, boundary errors

Browse Source
This commit is contained in:
M66B
2019-06-30 22:52:33 +02:00
parent 976daac18a
commit be56a865cb
3 changed files with 101 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
View File

@@ -19,6 +19,7 @@ package eu.faircode.email;
Copyright 2018-2019 by Marcel Bokhorst (M66B)
*/
import android.app.Dialog;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.view.LayoutInflater;
@@ -35,7 +36,9 @@ import android.widget.Spinner;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.widget.SwitchCompat;
import androidx.fragment.app.DialogFragment;
import androidx.preference.PreferenceManager;
public class FragmentOptionsDisplay extends FragmentBase implements SharedPreferences.OnSharedPreferenceChangeListener {
@@ -97,7 +100,7 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
btnTheme.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
onSelectTheme();
new FragmentDialogTheme().show(getFragmentManager(), "setup:theme");
}
});
@@ -256,54 +259,6 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
editor.apply();
}
private void onSelectTheme() {
View dview = LayoutInflater.from(getContext()).inflate(R.layout.dialog_theme, null);
final RadioGroup rgTheme = dview.findViewById(R.id.rgTheme);
final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
String theme = prefs.getString("theme", "light");
switch (theme) {
case "dark":
rgTheme.check(R.id.rbThemeDark);
break;
case "black":
rgTheme.check(R.id.rbThemeBlack);
break;
case "system":
rgTheme.check(R.id.rbThemeSystem);
break;
default:
rgTheme.check(R.id.rbThemeLight);
}
rgTheme.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(RadioGroup group, int checkedId) {
getActivity().getIntent().putExtra("tab", "display");
switch (checkedId) {
case R.id.rbThemeLight:
prefs.edit().putString("theme", "light").apply();
break;
case R.id.rbThemeDark:
prefs.edit().putString("theme", "dark").apply();
break;
case R.id.rbThemeBlack:
prefs.edit().putString("theme", "black").apply();
break;
case R.id.rbThemeSystem:
prefs.edit().putString("theme", "system").apply();
break;
}
}
});
new DialogBuilderLifecycle(getContext(), getViewLifecycleOwner())
.setView(dview)
.show();
}
private void setOptions() {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
@@ -332,4 +287,56 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
swImages.setChecked(prefs.getBoolean("autoimages", false));
swActionbar.setChecked(prefs.getBoolean("actionbar", true));
}
public static class FragmentDialogTheme extends DialogFragment {
@NonNull
@Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
View dview = LayoutInflater.from(getContext()).inflate(R.layout.dialog_theme, null);
final RadioGroup rgTheme = dview.findViewById(R.id.rgTheme);
final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
String theme = prefs.getString("theme", "light");
switch (theme) {
case "dark":
rgTheme.check(R.id.rbThemeDark);
break;
case "black":
rgTheme.check(R.id.rbThemeBlack);
break;
case "system":
rgTheme.check(R.id.rbThemeSystem);
break;
default:
rgTheme.check(R.id.rbThemeLight);
}
rgTheme.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(RadioGroup group, int checkedId) {
getActivity().getIntent().putExtra("tab", "display");
switch (checkedId) {
case R.id.rbThemeLight:
prefs.edit().putString("theme", "light").apply();
break;
case R.id.rbThemeDark:
prefs.edit().putString("theme", "dark").apply();
break;
case R.id.rbThemeBlack:
prefs.edit().putString("theme", "black").apply();
break;
case R.id.rbThemeSystem:
prefs.edit().putString("theme", "system").apply();
break;
}
}
});
return new AlertDialog.Builder(getContext())
.setView(dview)
.create();
}
}
}