From 2f7de17ac910481d5d214b337562b0ae12b77f8e Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 22 Jan 2019 15:12:20 +0000 Subject: [PATCH] Made dark/black theme free --- README.md | 1 - .../java/eu/faircode/email/ActivityBase.java | 12 ++++---- .../java/eu/faircode/email/ActivitySetup.java | 30 ++++++++----------- 3 files changed, 17 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index 5dcb53ca8b..8e4c7ed769 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,6 @@ This app starts a foreground service with a low priority status bar notification ## Pro features * Signatures -* Dark/black theme * Account/identity colors * Notifications per account * Notifications with message preview (requires Android 7 Nougat or later) diff --git a/app/src/main/java/eu/faircode/email/ActivityBase.java b/app/src/main/java/eu/faircode/email/ActivityBase.java index 2ed4e87d16..dd480a663c 100644 --- a/app/src/main/java/eu/faircode/email/ActivityBase.java +++ b/app/src/main/java/eu/faircode/email/ActivityBase.java @@ -48,13 +48,11 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc == PackageManager.PERMISSION_GRANTED); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); - if (Helper.isPro(this)) { - String theme = prefs.getString("theme", null); - if ("dark".equals(theme)) - setTheme(R.style.AppThemeDark); - else if ("black".equals(theme)) - setTheme(R.style.AppThemeBlack); - } + String theme = prefs.getString("theme", null); + if ("dark".equals(theme)) + setTheme(R.style.AppThemeDark); + else if ("black".equals(theme)) + setTheme(R.style.AppThemeBlack); prefs.registerOnSharedPreferenceChangeListener(this); diff --git a/app/src/main/java/eu/faircode/email/ActivitySetup.java b/app/src/main/java/eu/faircode/email/ActivitySetup.java index 1b24afd401..41b9062fb2 100644 --- a/app/src/main/java/eu/faircode/email/ActivitySetup.java +++ b/app/src/main/java/eu/faircode/email/ActivitySetup.java @@ -352,23 +352,17 @@ public class ActivitySetup extends ActivityBilling implements FragmentManager.On } private void onMenuTheme(int id) { - if (Helper.isPro(this)) { - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); - switch (id) { - case R.string.title_setup_light_theme: - prefs.edit().putString("theme", "light").apply(); - break; - case R.string.title_setup_dark_theme: - prefs.edit().putString("theme", "dark").apply(); - break; - case R.string.title_setup_black_theme: - prefs.edit().putString("theme", "black").apply(); - break; - } - } else { - FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction(); - fragmentTransaction.replace(R.id.content_frame, new FragmentPro()).addToBackStack("pro"); - fragmentTransaction.commit(); + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); + switch (id) { + case R.string.title_setup_light_theme: + prefs.edit().putString("theme", "light").apply(); + break; + case R.string.title_setup_dark_theme: + prefs.edit().putString("theme", "dark").apply(); + break; + case R.string.title_setup_black_theme: + prefs.edit().putString("theme", "black").apply(); + break; } } @@ -639,7 +633,7 @@ public class ActivitySetup extends ActivityBilling implements FragmentManager.On for (int s = 0; s < jsettings.length(); s++) { JSONObject jsetting = (JSONObject) jsettings.get(s); String key = jsetting.getString("key"); - if (!"pro".equals(key) && !"theme".equals(key)) { + if (!"pro".equals(key)) { Object value = jsetting.get("value"); if (value instanceof Boolean) editor.putBoolean(key, (Boolean) value);