From 1d3074995866f43925c291444554d5a7ce5eff12 Mon Sep 17 00:00:00 2001 From: M66B Date: Sun, 30 Oct 2022 17:52:24 +0100 Subject: [PATCH] Simplification --- .../java/eu/faircode/email/ActivityWidget.java | 16 +++++++++------- .../eu/faircode/email/ActivityWidgetSync.java | 16 +++++++++------- .../eu/faircode/email/ActivityWidgetUnified.java | 16 +++++++++------- app/src/main/java/eu/faircode/email/Widget.java | 8 ++------ .../main/java/eu/faircode/email/WidgetSync.java | 8 ++------ .../java/eu/faircode/email/WidgetUnified.java | 8 ++------ 6 files changed, 33 insertions(+), 39 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ActivityWidget.java b/app/src/main/java/eu/faircode/email/ActivityWidget.java index 6b32ca6d69..86559cf8a5 100644 --- a/app/src/main/java/eu/faircode/email/ActivityWidget.java +++ b/app/src/main/java/eu/faircode/email/ActivityWidget.java @@ -81,12 +81,8 @@ public class ActivityWidget extends ActivityBase { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); long account = prefs.getLong("widget." + appWidgetId + ".account", -1L); boolean daynight = prefs.getBoolean("widget." + appWidgetId + ".daynight", false); - boolean semi = prefs.getBoolean("widget." + appWidgetId + ".semi", - Build.VERSION.SDK_INT < Build.VERSION_CODES.S); - int background = prefs.getInt("widget." + appWidgetId + ".background", - Build.VERSION.SDK_INT < Build.VERSION_CODES.S - ? Color.TRANSPARENT - : ColorUtils.setAlphaComponent(Color.BLACK, 127)); + boolean semi = prefs.getBoolean("widget." + appWidgetId + ".semi", true); + int background = prefs.getInt("widget." + appWidgetId + ".background", Color.TRANSPARENT); int layout = prefs.getInt("widget." + appWidgetId + ".layout", 1 /* new */); daynight = daynight && (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S); @@ -133,6 +129,12 @@ public class ActivityWidget extends ActivityBase { int color = btnColor.getColor(); int editTextColor = Helper.resolveColor(ActivityWidget.this, android.R.attr.editTextColor); + if (color == Color.TRANSPARENT) { + color = Color.WHITE; + if (cbSemiTransparent.isChecked() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) + color = ColorUtils.setAlphaComponent(color, 127); + } + ColorPickerDialogBuilder .with(ActivityWidget.this) .setTitle(R.string.title_widget_background) @@ -140,7 +142,7 @@ public class ActivityWidget extends ActivityBase { .setColorEditTextColor(editTextColor) .wheelType(ColorPickerView.WHEEL_TYPE.FLOWER) .density(6) - .initialColor(color == Color.TRANSPARENT ? Color.WHITE : color) + .initialColor(color) .showLightnessSlider(true) .showAlphaSlider(Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) .setPositiveButton(android.R.string.ok, new ColorPickerClickListener() { diff --git a/app/src/main/java/eu/faircode/email/ActivityWidgetSync.java b/app/src/main/java/eu/faircode/email/ActivityWidgetSync.java index e433df4abb..61a6bb630e 100644 --- a/app/src/main/java/eu/faircode/email/ActivityWidgetSync.java +++ b/app/src/main/java/eu/faircode/email/ActivityWidgetSync.java @@ -61,12 +61,8 @@ public class ActivityWidgetSync extends ActivityBase { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); boolean daynight = prefs.getBoolean("widget." + appWidgetId + ".daynight", false); - boolean semi = prefs.getBoolean("widget." + appWidgetId + ".semi", - Build.VERSION.SDK_INT < Build.VERSION_CODES.S); - int background = prefs.getInt("widget." + appWidgetId + ".background", - Build.VERSION.SDK_INT < Build.VERSION_CODES.S - ? Color.TRANSPARENT - : ColorUtils.setAlphaComponent(Color.BLACK, 127)); + boolean semi = prefs.getBoolean("widget." + appWidgetId + ".semi", true); + int background = prefs.getInt("widget." + appWidgetId + ".background", Color.TRANSPARENT); daynight = daynight && (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S); @@ -104,6 +100,12 @@ public class ActivityWidgetSync extends ActivityBase { int color = btnColor.getColor(); int editTextColor = Helper.resolveColor(ActivityWidgetSync.this, android.R.attr.editTextColor); + if (color == Color.TRANSPARENT) { + color = Color.WHITE; + if (cbSemiTransparent.isChecked() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) + color = ColorUtils.setAlphaComponent(color, 127); + } + ColorPickerDialogBuilder .with(ActivityWidgetSync.this) .setTitle(R.string.title_widget_background) @@ -111,7 +113,7 @@ public class ActivityWidgetSync extends ActivityBase { .setColorEditTextColor(editTextColor) .wheelType(ColorPickerView.WHEEL_TYPE.FLOWER) .density(6) - .initialColor(color == Color.TRANSPARENT ? Color.WHITE : color) + .initialColor(color) .showLightnessSlider(true) .showAlphaSlider(Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) .setPositiveButton(android.R.string.ok, new ColorPickerClickListener() { diff --git a/app/src/main/java/eu/faircode/email/ActivityWidgetUnified.java b/app/src/main/java/eu/faircode/email/ActivityWidgetUnified.java index de58e5f4da..267c908590 100644 --- a/app/src/main/java/eu/faircode/email/ActivityWidgetUnified.java +++ b/app/src/main/java/eu/faircode/email/ActivityWidgetUnified.java @@ -100,12 +100,8 @@ public class ActivityWidgetUnified extends ActivityBase { boolean daynight = prefs.getBoolean("widget." + appWidgetId + ".daynight", false); boolean highlight = prefs.getBoolean("widget." + appWidgetId + ".highlight", false); int highlight_color = prefs.getInt("widget." + appWidgetId + ".highlight_color", Color.TRANSPARENT); - boolean semi = prefs.getBoolean("widget." + appWidgetId + ".semi", - Build.VERSION.SDK_INT < Build.VERSION_CODES.S); - int background = prefs.getInt("widget." + appWidgetId + ".background", - Build.VERSION.SDK_INT < Build.VERSION_CODES.S - ? Color.TRANSPARENT - : ColorUtils.setAlphaComponent(Color.BLACK, 127)); + boolean semi = prefs.getBoolean("widget." + appWidgetId + ".semi", true); + int background = prefs.getInt("widget." + appWidgetId + ".background", Color.TRANSPARENT); boolean separators = prefs.getBoolean("widget." + appWidgetId + ".separators", true); int font = prefs.getInt("widget." + appWidgetId + ".font", 0); int padding = prefs.getInt("widget." + appWidgetId + ".padding", 0); @@ -203,6 +199,12 @@ public class ActivityWidgetUnified extends ActivityBase { int color = btnColor.getColor(); int editTextColor = Helper.resolveColor(ActivityWidgetUnified.this, android.R.attr.editTextColor); + if (color == Color.TRANSPARENT) { + color = Color.WHITE; + if (cbSemiTransparent.isChecked() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) + color = ColorUtils.setAlphaComponent(color, 127); + } + ColorPickerDialogBuilder .with(ActivityWidgetUnified.this) .setTitle(R.string.title_widget_background) @@ -210,7 +212,7 @@ public class ActivityWidgetUnified extends ActivityBase { .setColorEditTextColor(editTextColor) .wheelType(ColorPickerView.WHEEL_TYPE.FLOWER) .density(6) - .initialColor(color == Color.TRANSPARENT ? Color.WHITE : color) + .initialColor(color) .showLightnessSlider(true) .showAlphaSlider(Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) .setPositiveButton(android.R.string.ok, new ColorPickerClickListener() { diff --git a/app/src/main/java/eu/faircode/email/Widget.java b/app/src/main/java/eu/faircode/email/Widget.java index ad70ab9236..f51b4ac4fe 100644 --- a/app/src/main/java/eu/faircode/email/Widget.java +++ b/app/src/main/java/eu/faircode/email/Widget.java @@ -60,12 +60,8 @@ public class Widget extends AppWidgetProvider { String name = prefs.getString("widget." + appWidgetId + ".name", null); long account = prefs.getLong("widget." + appWidgetId + ".account", -1L); boolean daynight = prefs.getBoolean("widget." + appWidgetId + ".daynight", false); - boolean semi = prefs.getBoolean("widget." + appWidgetId + ".semi", - Build.VERSION.SDK_INT < Build.VERSION_CODES.S); - int background = prefs.getInt("widget." + appWidgetId + ".background", - Build.VERSION.SDK_INT < Build.VERSION_CODES.S - ? Color.TRANSPARENT - : ColorUtils.setAlphaComponent(Color.BLACK, 127)); + boolean semi = prefs.getBoolean("widget." + appWidgetId + ".semi", true); + int background = prefs.getInt("widget." + appWidgetId + ".background", Color.TRANSPARENT); int layout = prefs.getInt("widget." + appWidgetId + ".layout", 0); int version = prefs.getInt("widget." + appWidgetId + ".version", 0); diff --git a/app/src/main/java/eu/faircode/email/WidgetSync.java b/app/src/main/java/eu/faircode/email/WidgetSync.java index 084d6f0631..ed747862da 100644 --- a/app/src/main/java/eu/faircode/email/WidgetSync.java +++ b/app/src/main/java/eu/faircode/email/WidgetSync.java @@ -51,12 +51,8 @@ public class WidgetSync extends AppWidgetProvider { for (int appWidgetId : appWidgetIds) { boolean daynight = prefs.getBoolean("widget." + appWidgetId + ".daynight", false); - boolean semi = prefs.getBoolean("widget." + appWidgetId + ".semi", - Build.VERSION.SDK_INT < Build.VERSION_CODES.S); - int background = prefs.getInt("widget." + appWidgetId + ".background", - Build.VERSION.SDK_INT < Build.VERSION_CODES.S - ? Color.TRANSPARENT - : ColorUtils.setAlphaComponent(Color.BLACK, 127)); + boolean semi = prefs.getBoolean("widget." + appWidgetId + ".semi", true); + int background = prefs.getInt("widget." + appWidgetId + ".background", Color.TRANSPARENT); int version = prefs.getInt("widget." + appWidgetId + ".version", 0); if (version <= 1550) diff --git a/app/src/main/java/eu/faircode/email/WidgetUnified.java b/app/src/main/java/eu/faircode/email/WidgetUnified.java index 2de34d7b3b..98803adeb5 100644 --- a/app/src/main/java/eu/faircode/email/WidgetUnified.java +++ b/app/src/main/java/eu/faircode/email/WidgetUnified.java @@ -51,12 +51,8 @@ public class WidgetUnified extends AppWidgetProvider { long folder = prefs.getLong("widget." + appWidgetId + ".folder", -1L); String type = prefs.getString("widget." + appWidgetId + ".type", null); boolean daynight = prefs.getBoolean("widget." + appWidgetId + ".daynight", false); - boolean semi = prefs.getBoolean("widget." + appWidgetId + ".semi", - Build.VERSION.SDK_INT < Build.VERSION_CODES.S); - int background = prefs.getInt("widget." + appWidgetId + ".background", - Build.VERSION.SDK_INT < Build.VERSION_CODES.S - ? Color.TRANSPARENT - : ColorUtils.setAlphaComponent(Color.BLACK, 127)); + boolean semi = prefs.getBoolean("widget." + appWidgetId + ".semi", true); + int background = prefs.getInt("widget." + appWidgetId + ".background", Color.TRANSPARENT); boolean separators = prefs.getBoolean("widget." + appWidgetId + ".separators", true); int font = prefs.getInt("widget." + appWidgetId + ".font", 0); int padding = prefs.getInt("widget." + appWidgetId + ".padding", 0);