From d6148505c2266300ba559dd99ac5a22b1473ad80 Mon Sep 17 00:00:00 2001 From: M66B Date: Mon, 25 May 2020 09:42:54 +0200 Subject: [PATCH] Allow setting message widget font size --- .../faircode/email/ActivityWidgetUnified.java | 12 +++++++++++ .../java/eu/faircode/email/WidgetUnified.java | 16 +++++++++++++++ .../WidgetUnifiedRemoteViewsFactory.java | 12 +++++++++++ .../res/layout/activity_widget_unified.xml | 20 ++++++++++++++++++- app/src/main/res/values/strings.xml | 1 + 5 files changed, 60 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/eu/faircode/email/ActivityWidgetUnified.java b/app/src/main/java/eu/faircode/email/ActivityWidgetUnified.java index c075c7c76a..e729d22610 100644 --- a/app/src/main/java/eu/faircode/email/ActivityWidgetUnified.java +++ b/app/src/main/java/eu/faircode/email/ActivityWidgetUnified.java @@ -46,12 +46,14 @@ public class ActivityWidgetUnified extends ActivityBase { private CheckBox cbUnseen; private CheckBox cbFlagged; private CheckBox cbSemiTransparent; + private Spinner spFontSize; private Button btnSave; private ContentLoadingProgressBar pbWait; private Group grpReady; private ArrayAdapter adapterAccount; private ArrayAdapter adapterFolder; + private ArrayAdapter adapterFontSize; @Override protected void onCreate(Bundle savedInstanceState) { @@ -74,6 +76,7 @@ public class ActivityWidgetUnified extends ActivityBase { cbUnseen = findViewById(R.id.cbUnseen); cbFlagged = findViewById(R.id.cbFlagged); cbSemiTransparent = findViewById(R.id.cbSemiTransparent); + spFontSize = findViewById(R.id.spFontSize); btnSave = findViewById(R.id.btnSave); pbWait = findViewById(R.id.pbWait); grpReady = findViewById(R.id.grpReady); @@ -89,6 +92,7 @@ public class ActivityWidgetUnified extends ActivityBase { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(ActivityWidgetUnified.this); SharedPreferences.Editor editor = prefs.edit(); + if (account != null && account.id > 0) if (folder != null && folder.id > 0) editor.putString("widget." + appWidgetId + ".name", folder.getDisplayName(ActivityWidgetUnified.this)); @@ -96,12 +100,15 @@ public class ActivityWidgetUnified extends ActivityBase { editor.putString("widget." + appWidgetId + ".name", account.name); else editor.remove("widget." + appWidgetId + ".name"); + editor.putLong("widget." + appWidgetId + ".account", account == null ? -1L : account.id); editor.putLong("widget." + appWidgetId + ".folder", folder == null ? -1L : folder.id); editor.putString("widget." + appWidgetId + ".type", folder == null ? null : folder.type); editor.putBoolean("widget." + appWidgetId + ".unseen", cbUnseen.isChecked()); editor.putBoolean("widget." + appWidgetId + ".flagged", cbFlagged.isChecked()); editor.putBoolean("widget." + appWidgetId + ".semi", cbSemiTransparent.isChecked()); + editor.putInt("widget." + appWidgetId + ".font", spFontSize.getSelectedItemPosition()); + editor.apply(); WidgetUnified.init(ActivityWidgetUnified.this, appWidgetId); @@ -171,6 +178,11 @@ public class ActivityWidgetUnified extends ActivityBase { } }); + String[] sizes = getResources().getStringArray(R.array.fontSizeNames); + adapterFontSize = new ArrayAdapter<>(this, R.layout.spinner_item1, android.R.id.text1, sizes); + adapterFontSize.setDropDownViewResource(R.layout.spinner_item1_dropdown); + spFontSize.setAdapter(adapterFontSize); + grpReady.setVisibility(View.GONE); pbWait.setVisibility(View.VISIBLE); diff --git a/app/src/main/java/eu/faircode/email/WidgetUnified.java b/app/src/main/java/eu/faircode/email/WidgetUnified.java index 4f0c35efb8..52c9774087 100644 --- a/app/src/main/java/eu/faircode/email/WidgetUnified.java +++ b/app/src/main/java/eu/faircode/email/WidgetUnified.java @@ -28,6 +28,7 @@ import android.content.Intent; import android.content.SharedPreferences; import android.graphics.Color; import android.net.Uri; +import android.util.TypedValue; import android.widget.RemoteViews; import androidx.preference.PreferenceManager; @@ -43,6 +44,7 @@ public class WidgetUnified extends AppWidgetProvider { long folder = prefs.getLong("widget." + appWidgetId + ".folder", -1L); String type = prefs.getString("widget." + appWidgetId + ".type", null); boolean semi = prefs.getBoolean("widget." + appWidgetId + ".semi", true); + int font = prefs.getInt("widget." + appWidgetId + ".font", 0); Intent view = new Intent(context, ActivityView.class); view.setAction("folder:" + folder); @@ -57,6 +59,9 @@ public class WidgetUnified extends AppWidgetProvider { if (!semi) views.setInt(R.id.widget, "setBackgroundColor", Color.TRANSPARENT); + if (font > 0) + views.setTextViewTextSize(R.id.title, TypedValue.COMPLEX_UNIT_SP, getFontSizeSp(font)); + if (name == null) views.setTextViewText(R.id.title, context.getString(R.string.title_folder_unified)); else @@ -83,6 +88,17 @@ public class WidgetUnified extends AppWidgetProvider { } } + static int getFontSizeSp(int size) { + switch (size) { + case 1: // small + return 14; + case 3: // large + return 22; + default: // medium + return 18; + } + } + static void init(Context context, int appWidgetId) { Log.i("Widget unified init=" + appWidgetId); diff --git a/app/src/main/java/eu/faircode/email/WidgetUnifiedRemoteViewsFactory.java b/app/src/main/java/eu/faircode/email/WidgetUnifiedRemoteViewsFactory.java index 1cc8efab67..09e9873aae 100644 --- a/app/src/main/java/eu/faircode/email/WidgetUnifiedRemoteViewsFactory.java +++ b/app/src/main/java/eu/faircode/email/WidgetUnifiedRemoteViewsFactory.java @@ -28,6 +28,7 @@ import android.text.SpannableString; import android.text.Spanned; import android.text.TextUtils; import android.text.style.StyleSpan; +import android.util.TypedValue; import android.view.View; import android.widget.RemoteViews; import android.widget.RemoteViewsService; @@ -50,6 +51,7 @@ public class WidgetUnifiedRemoteViewsFactory implements RemoteViewsService.Remot private long account; private boolean unseen; private boolean flagged; + private int font; private int colorWidgetForeground; private int colorWidgetRead; private int colorSeparator; @@ -82,6 +84,7 @@ public class WidgetUnifiedRemoteViewsFactory implements RemoteViewsService.Remot folder = prefs.getLong("widget." + appWidgetId + ".folder", -1L); unseen = prefs.getBoolean("widget." + appWidgetId + ".unseen", false); flagged = prefs.getBoolean("widget." + appWidgetId + ".flagged", false); + font = prefs.getInt("widget." + appWidgetId + ".font", 0); colorWidgetForeground = ContextCompat.getColor(context, R.color.colorWidgetForeground); colorWidgetRead = ContextCompat.getColor(context, R.color.colorWidgetRead); colorSeparator = ContextCompat.getColor(context, R.color.lightColorSeparator); @@ -167,6 +170,15 @@ public class WidgetUnifiedRemoteViewsFactory implements RemoteViewsService.Remot ssAccount.setSpan(new StyleSpan(Typeface.BOLD), 0, ssAccount.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE); } + if (font > 0) { + int text_size = WidgetUnified.getFontSizeSp(font); + + views.setTextViewTextSize(idFrom, TypedValue.COMPLEX_UNIT_SP, text_size); + views.setTextViewTextSize(idTime, TypedValue.COMPLEX_UNIT_SP, text_size); + views.setTextViewTextSize(idSubject, TypedValue.COMPLEX_UNIT_SP, text_size); + views.setTextViewTextSize(idAccount, TypedValue.COMPLEX_UNIT_SP, text_size); + } + views.setTextViewText(idFrom, ssFrom); views.setTextViewText(idTime, ssTime); views.setTextViewText(idSubject, ssSubject); diff --git a/app/src/main/res/layout/activity_widget_unified.xml b/app/src/main/res/layout/activity_widget_unified.xml index 730d81c64e..d3cfa46cc8 100644 --- a/app/src/main/res/layout/activity_widget_unified.xml +++ b/app/src/main/res/layout/activity_widget_unified.xml @@ -69,6 +69,24 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/cbFlagged" /> + + + +