From cb87ef9f806728863a320166cb05f2ee8d2a562d Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 7 Nov 2021 16:34:08 +0100
Subject: [PATCH] Added configurable card padding

---
 .../eu/faircode/email/AdapterMessage.java     |  8 +++++++
 .../eu/faircode/email/FragmentMessages.java   | 21 ++++++++++++++++++-
 .../eu/faircode/email/ViewCardOptional.java   |  4 +++-
 app/src/main/res/menu/menu_messages.xml       |  5 +++++
 app/src/main/res/values/strings.xml           |  1 +
 5 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 777c80cd75..c0837dd1ae 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -6543,6 +6543,14 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         return this.zoom;
     }
 
+    void setPadding(int padding) {
+        if (rv != null) {
+            rv.getRecycledViewPool().clear();
+            rv.getLayoutManager().removeAllViews();
+        }
+        properties.refresh();
+    }
+
     void setSort(String sort) {
         if (!sort.equals(this.sort)) {
             this.sort = sort;
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index b3392f59a7..21d441eba4 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -4517,6 +4517,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         menu.findItem(R.id.menu_filter_duplicates).setChecked(filter_duplicates);
 
         menu.findItem(R.id.menu_compact).setChecked(compact);
+        menu.findItem(R.id.menu_padding).setVisible(cards);
         menu.findItem(R.id.menu_theme).setVisible(viewType == AdapterMessage.ViewType.UNIFIED);
 
         menu.findItem(R.id.menu_select_all).setVisible(folder);
@@ -4623,6 +4624,9 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         } else if (itemId == R.id.menu_zoom) {
             onMenuZoom();
             return true;
+        } else if (itemId == R.id.menu_padding) {
+            onMenuPadding();
+            return true;
         } else if (itemId == R.id.menu_compact) {
             onMenuCompact();
             return true;
@@ -4875,16 +4879,31 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         adapter.setZoom(zoom);
     }
 
+    private void onMenuPadding() {
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
+        boolean compact = prefs.getBoolean("compact", false);
+        int padding = prefs.getInt("view_padding", compact ? 0 : 1);
+        padding = ++padding % 3;
+        prefs.edit().putInt("view_padding", padding).apply();
+        clearMeasurements();
+        adapter.setPadding(padding);
+    }
+
     private void onMenuCompact() {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
         boolean compact = !prefs.getBoolean("compact", false);
         prefs.edit().putBoolean("compact", compact).apply();
 
         int zoom = (compact ? 0 : 1);
-        prefs.edit().putInt("view_zoom", zoom).apply();
+        int padding = (compact ? 0 : 1);
+        prefs.edit()
+                .putInt("view_zoom", zoom)
+                .putInt("view_padding", padding)
+                .apply();
 
         adapter.setCompact(compact);
         adapter.setZoom(zoom);
+        adapter.setPadding(padding);
         clearMeasurements();
         invalidateOptionsMenu();
     }
diff --git a/app/src/main/java/eu/faircode/email/ViewCardOptional.java b/app/src/main/java/eu/faircode/email/ViewCardOptional.java
index 7984c25d73..f3f073daa3 100644
--- a/app/src/main/java/eu/faircode/email/ViewCardOptional.java
+++ b/app/src/main/java/eu/faircode/email/ViewCardOptional.java
@@ -33,6 +33,7 @@ import androidx.preference.PreferenceManager;
 public class ViewCardOptional extends CardView {
     private boolean cards;
     private boolean compact;
+    private int padding;
     private int margin;
     private int ident;
     private Integer color = null;
@@ -56,8 +57,9 @@ public class ViewCardOptional extends CardView {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         cards = prefs.getBoolean("cards", true);
         compact = prefs.getBoolean("compact", false);
+        padding = prefs.getInt("view_padding", compact ? 0 : 1);
 
-        margin = Helper.dp2pixels(context, compact ? 3 : 6);
+        margin = Helper.dp2pixels(context, (padding + 1) * 3);
 
         setRadius(cards ? margin : 0);
         setCardElevation(0);
diff --git a/app/src/main/res/menu/menu_messages.xml b/app/src/main/res/menu/menu_messages.xml
index f85bf931f6..58e0f6a261 100644
--- a/app/src/main/res/menu/menu_messages.xml
+++ b/app/src/main/res/menu/menu_messages.xml
@@ -130,6 +130,11 @@
             android:title="@string/title_zoom"
             app:showAsAction="ifRoom" />
 
+        <item
+            android:id="@+id/menu_padding"
+            android:title="@string/title_padding"
+            app:showAsAction="never" />
+
         <item
             android:id="@+id/menu_compact"
             android:checkable="true"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 280ddc8476..cd2c7c2bf4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1391,6 +1391,7 @@
 
     <string name="title_compact">Compact view</string>
     <string name="title_zoom">Text size</string>
+    <string name="title_padding">Padding size</string>
     <string name="title_select_language">Select language</string>
     <string name="title_select_all">Select all</string>
     <string name="title_select_found">Select found</string>