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

Added grey light theme

Browse Source
This commit is contained in:
M66B
2019-09-09 09:31:55 +02:00
parent a262b2cbb0
commit 27258bae5e
6 changed files with 43 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/eu/faircode/email/ActivityBase.java
View File

@@ -78,8 +78,10 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc
setTheme(R.style.AppThemeDark);
else if ("black".equals(theme))
setTheme(R.style.AppThemeBlack);
else if ("grey".equals(theme))
setTheme(R.style.AppThemeGrey);
else if ("grey_light".equals(theme))
setTheme(R.style.AppThemeGreyLight);
else if ("grey_dark".equals(theme))
setTheme(R.style.AppThemeGreyDark);
else if ("system".equals(theme)) {
int uiMode = getResources().getConfiguration().uiMode;
Log.i("UI mode=" + uiMode);

6
app/src/main/java/eu/faircode/email/ApplicationEx.java
View File

@@ -130,9 +130,15 @@ public class ApplicationEx extends Application {
if (prefs.getBoolean("autonext", false))
editor.putString("onclose", "next");
editor.remove("autonext");
} else if (version < 693) {
editor.remove("message_swipe");
editor.remove("message_select");
} else if (version < 696) {
String theme = prefs.getString("theme", "light");
if ("grey".equals(theme))
editor.putString("theme", "grey_dark");
}
if (BuildConfig.DEBUG && false) {

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

@@ -392,8 +392,11 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
case "black":
rgTheme.check(R.id.rbThemeBlack);
break;
case "grey":
rgTheme.check(R.id.rbThemeGrey);
case "grey_light":
rgTheme.check(R.id.rbThemeGreyLight);
break;
case "grey_dark":
rgTheme.check(R.id.rbThemeGreyDark);
break;
case "system":
rgTheme.check(R.id.rbThemeSystem);
@@ -417,8 +420,11 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
case R.id.rbThemeBlack:
prefs.edit().putString("theme", "black").apply();
break;
case R.id.rbThemeGrey:
prefs.edit().putString("theme", "grey").apply();
case R.id.rbThemeGreyLight:
prefs.edit().putString("theme", "grey_light").apply();
break;
case R.id.rbThemeGreyDark:
prefs.edit().putString("theme", "grey_dark").apply();
break;
case R.id.rbThemeSystem:
prefs.edit().putString("theme", "system").apply();