Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-05-19 13:34:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added option to enable unified system folders

Browse Source
This commit is contained in:
M66B
2019-07-19 09:21:54 +02:00
parent bc73d2f83a
commit ded0259acc
5 changed files with 35 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/eu/faircode/email/ActivityView.java
View File

@@ -358,14 +358,16 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
}
});
db.folder().liveUnifiedTypes().observe(this, new Observer<List<String>>() {
@Override
public void onChanged(List<String> types) {
if (types == null)
types = new ArrayList<>();
uadapter.set(types);
}
});
boolean unified_system = prefs.getBoolean("unified_system", false);
if (unified_system)
db.folder().liveUnifiedTypes().observe(this, new Observer<List<String>>() {
@Override
public void onChanged(List<String> types) {
if (types == null)
types = new ArrayList<>();
uadapter.set(types);
}
});
db.folder().liveNavigation().observe(this, new Observer<List<TupleFolderNav>>() {
@Override

2
app/src/main/java/eu/faircode/email/FragmentOptions.java
View File

@@ -39,7 +39,7 @@ public class FragmentOptions extends FragmentBase {
static String[] OPTIONS_RESTART = new String[]{
"startup", "date", "threading", "avatars", "identicons", "circular", "name_email", "subject_italic", "flags", "preview",
"addresses", "attachments_alt", "contrast", "monospaced", "autohtml", "autoimages", "actionbar",
"addresses", "attachments_alt", "contrast", "monospaced", "autohtml", "autoimages", "actionbar", "unified_system",
"autoscroll", "swipenav", "autoexpand", "autoclose", "autonext",
"subscriptions", "debug",
"biometrics"

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

@@ -63,11 +63,12 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
private SwitchCompat swCollapseQuotes;
private SwitchCompat swRemoteContent;
private SwitchCompat swActionbar;
private SwitchCompat swUnifiedSystem;
private final static String[] RESET_OPTIONS = new String[]{
"theme", "startup", "date", "threading", "avatars", "identicons", "circular", "name_email", "subject_italic",
"flags", "preview", "addresses", "attachments_alt",
"contrast", "monospaced", "inline_images", "autoimages", "collapse_quotes", "autocontent", "actionbar",
"contrast", "monospaced", "inline_images", "autoimages", "collapse_quotes", "autocontent", "actionbar", "unified_system"
};
@Override
@@ -100,6 +101,7 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
swCollapseQuotes = view.findViewById(R.id.swCollapseQuotes);
swRemoteContent = view.findViewById(R.id.swRemoteContent);
swActionbar = view.findViewById(R.id.swActionbar);
swUnifiedSystem = view.findViewById(R.id.swUnifiedSystem);
setOptions();
@@ -256,6 +258,13 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
}
});
swUnifiedSystem.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
prefs.edit().putBoolean("unified_system", checked).apply();
}
});
PreferenceManager.getDefaultSharedPreferences(getContext()).registerOnSharedPreferenceChangeListener(this);
return view;
@@ -329,6 +338,7 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
swCollapseQuotes.setChecked(prefs.getBoolean("collapse_quotes", false));
swRemoteContent.setChecked(prefs.getBoolean("autocontent", false));
swActionbar.setChecked(prefs.getBoolean("actionbar", true));
swUnifiedSystem.setChecked(prefs.getBoolean("unified_system", false));
}
public static class FragmentDialogTheme extends DialogFragmentEx {