From 34e93cdb488d9290b676a9811ccabb2da3e815e6 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 26 May 2019 09:57:47 +0200
Subject: [PATCH] Improved layout

---
 .../java/eu/faircode/email/AdapterFolder.java |  9 ++++-----
 .../res/layout/fragment_legend_folders.xml    | 12 +++++------
 app/src/main/res/layout/item_folder.xml       | 20 +++++++++++++++++--
 app/src/main/res/values/strings.xml           |  2 +-
 4 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterFolder.java b/app/src/main/java/eu/faircode/email/AdapterFolder.java
index 2259af5ece..bcd01b95ca 100644
--- a/app/src/main/java/eu/faircode/email/AdapterFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterFolder.java
@@ -97,6 +97,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
         private ImageView ivType;
         private ImageView ivUnified;
         private TextView tvType;
+        private TextView tvTotal;
         private TextView tvAfter;
         private ImageView ivSync;
         private TextView tvKeywords;
@@ -121,6 +122,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
             ivType = itemView.findViewById(R.id.ivType);
             ivUnified = itemView.findViewById(R.id.ivUnified);
             tvType = itemView.findViewById(R.id.tvType);
+            tvTotal = itemView.findViewById(R.id.tvTotal);
             tvAfter = itemView.findViewById(R.id.tvAfter);
             ivSync = itemView.findViewById(R.id.ivSync);
             tvKeywords = itemView.findViewById(R.id.tvKeywords);
@@ -246,11 +248,6 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
                     sb.append(nf.format(folder.content));
                     sb.append('/');
                     sb.append(nf.format(folder.messages));
-                    sb.append('/');
-                    if (folder.total == null)
-                        sb.append('?');
-                    else
-                        sb.append(nf.format(folder.total));
                 }
                 tvMessages.setText(sb.toString());
 
@@ -273,6 +270,8 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
                     tvType.setText(resid > 0 ? context.getString(resid) : folder.type);
                 }
 
+                tvTotal.setText(folder.total == null ? "" : nf.format(folder.total));
+
                 if (folder.account == null) {
                     tvAfter.setText(null);
                     ivSync.setImageResource(R.drawable.baseline_sync_24);
diff --git a/app/src/main/res/layout/fragment_legend_folders.xml b/app/src/main/res/layout/fragment_legend_folders.xml
index 272250b81d..7d444384bd 100644
--- a/app/src/main/res/layout/fragment_legend_folders.xml
+++ b/app/src/main/res/layout/fragment_legend_folders.xml
@@ -239,10 +239,10 @@
 
             <TextView
                 android:id="@+id/tvDownloadFetch"
-                android:layout_width="72dp"
+                android:layout_width="48dp"
                 android:layout_height="0dp"
-                android:gravity="end|center_vertical"
-                android:text="12/34/56"
+                android:gravity="center"
+                android:text="1/23"
                 android:textAppearance="@android:style/TextAppearance.Small"
                 app:layout_constraintBottom_toBottomOf="@+id/tvDownloadFetchLegend"
                 app:layout_constraintStart_toStartOf="parent"
@@ -273,10 +273,10 @@
 
             <TextView
                 android:id="@+id/tvSyncKeep"
-                android:layout_width="72dp"
+                android:layout_width="48dp"
                 android:layout_height="0dp"
-                android:gravity="end|center_vertical"
-                android:text="12/34"
+                android:gravity="center"
+                android:text="1/23"
                 android:textAppearance="@android:style/TextAppearance.Small"
                 app:layout_constraintBottom_toBottomOf="@+id/tvSyncKeepLegend"
                 app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/item_folder.xml b/app/src/main/res/layout/item_folder.xml
index aa9bd11597..6f15f3ead8 100644
--- a/app/src/main/res/layout/item_folder.xml
+++ b/app/src/main/res/layout/item_folder.xml
@@ -147,17 +147,33 @@
 
         <TextView
             android:id="@+id/tvType"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="6dp"
+            android:gravity="center_vertical"
+            android:maxLines="1"
+            android:minHeight="24dp"
+            android:text="type"
+            android:textAppearance="@android:style/TextAppearance.Small"
+            android:textStyle="italic"
+            app:layout_constraintStart_toEndOf="@id/ivUnified"
+            app:layout_constraintTop_toBottomOf="@id/tvName" />
+
+        <TextView
+            android:id="@+id/tvTotal"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginStart="6dp"
             android:layout_marginTop="6dp"
             android:layout_marginEnd="6dp"
             android:gravity="center_vertical"
+            android:maxLines="1"
             android:minHeight="24dp"
-            android:text="type"
+            android:text="12,345"
             android:textAppearance="@android:style/TextAppearance.Small"
             android:textStyle="italic"
             app:layout_constraintEnd_toStartOf="@+id/tvAfter"
-            app:layout_constraintStart_toEndOf="@id/ivUnified"
+            app:layout_constraintStart_toEndOf="@id/tvType"
             app:layout_constraintTop_toBottomOf="@id/tvName" />
 
         <TextView
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a11dad95d0..d994adb035 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -605,7 +605,7 @@
     <string name="title_legend_notify">Notify new messages</string>
     <string name="title_legend_subscribed">Subscribed to</string>
     <string name="title_legend_sync_keep">Number of days to synchronize / to keep messages</string>
-    <string name="title_legend_download_fetch">Number of message bodies downloaded / headers fetched / on server</string>
+    <string name="title_legend_download_fetch">Number of message downloaded / headers fetched</string>
     <string name="title_legend_stop">Stop processing rules</string>
 
     <string name="title_legend_thread">Conversation</string>