From 25326c35e3ac2d0a9813fb8e07e8da9f358c83b5 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 4 Aug 2021 17:49:07 +0200
Subject: [PATCH] Added tiny font size and padding for messages widget

---
 .../faircode/email/ActivityWidgetUnified.java | 22 ++++++++++++++++---
 .../java/eu/faircode/email/WidgetUnified.java |  4 ++++
 app/src/main/res/values/strings.xml           |  2 ++
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/ActivityWidgetUnified.java b/app/src/main/java/eu/faircode/email/ActivityWidgetUnified.java
index c8f2cfe4f5..adb279d1e3 100644
--- a/app/src/main/java/eu/faircode/email/ActivityWidgetUnified.java
+++ b/app/src/main/java/eu/faircode/email/ActivityWidgetUnified.java
@@ -45,6 +45,7 @@ import com.flask.colorpicker.builder.ColorPickerClickListener;
 import com.flask.colorpicker.builder.ColorPickerDialogBuilder;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
@@ -147,6 +148,19 @@ public class ActivityWidgetUnified extends ActivityBase {
                 else
                     editor.remove("widget." + appWidgetId + ".name");
 
+                int font = spFontSize.getSelectedItemPosition();
+                int padding = spPadding.getSelectedItemPosition();
+
+                if (font == 1) // tiny
+                    font = 4;
+                else if (font > 1)
+                    font--;
+
+                if (padding == 1) // tiny
+                    padding = 4;
+                else if (padding > 1)
+                    padding--;
+
                 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);
@@ -154,8 +168,8 @@ public class ActivityWidgetUnified extends ActivityBase {
                 editor.putBoolean("widget." + appWidgetId + ".flagged", cbFlagged.isChecked());
                 editor.putBoolean("widget." + appWidgetId + ".semi", cbSemiTransparent.isChecked());
                 editor.putInt("widget." + appWidgetId + ".background", btnColor.getColor());
-                editor.putInt("widget." + appWidgetId + ".font", spFontSize.getSelectedItemPosition());
-                editor.putInt("widget." + appWidgetId + ".padding", spPadding.getSelectedItemPosition());
+                editor.putInt("widget." + appWidgetId + ".font", font);
+                editor.putInt("widget." + appWidgetId + ".padding", padding);
                 editor.putInt("widget." + appWidgetId + ".version", BuildConfig.VERSION_CODE);
 
                 editor.apply();
@@ -247,7 +261,9 @@ public class ActivityWidgetUnified extends ActivityBase {
             }
         });
 
-        String[] sizes = getResources().getStringArray(R.array.fontSizeNames);
+        List<String> sizes = new ArrayList<>();
+        sizes.addAll(Arrays.asList(getResources().getStringArray(R.array.fontSizeNames)));
+        sizes.add(1, getString(R.string.title_size_tiny));
 
         adapterFontSize = new ArrayAdapter<>(this, R.layout.spinner_item1, android.R.id.text1, sizes);
         adapterFontSize.setDropDownViewResource(R.layout.spinner_item1_dropdown);
diff --git a/app/src/main/java/eu/faircode/email/WidgetUnified.java b/app/src/main/java/eu/faircode/email/WidgetUnified.java
index 3e0e147582..4de668ac64 100644
--- a/app/src/main/java/eu/faircode/email/WidgetUnified.java
+++ b/app/src/main/java/eu/faircode/email/WidgetUnified.java
@@ -137,6 +137,8 @@ public class WidgetUnified extends AppWidgetProvider {
                 return 14;
             case 3: // large
                 return 22;
+            case 4: // tiny
+                return 10;
             default: // medium
                 return 18;
         }
@@ -148,6 +150,8 @@ public class WidgetUnified extends AppWidgetProvider {
                 return Helper.dp2pixels(context, 3);
             case 3: // large
                 return Helper.dp2pixels(context, 9);
+            case 4: // tiny
+                return Helper.dp2pixels(context, 1);
             default: // medium
                 return Helper.dp2pixels(context, 6);
         }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e874d0cd69..78658ac379 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1886,6 +1886,8 @@
         <item>Large</item>
     </string-array>
 
+    <string name="title_size_tiny">Tiny</string>
+
     <string-array name="receiptNames">
         <item>Read receipt only</item>
         <item>Delivery receipt only</item>