From e78419f6c4a14dc33ac9c595873bcaac3997482f Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 6 Mar 2022 08:50:16 +0100
Subject: [PATCH] Debug: extra count

---
 .../java/eu/faircode/email/ActivityView.java  |  2 +-
 .../email/AdapterNavAccountFolder.java        |  6 +++++-
 .../eu/faircode/email/AdapterNavMenu.java     | 12 +++++++++--
 .../eu/faircode/email/AdapterNavSearch.java   |  3 +++
 .../eu/faircode/email/AdapterNavUnified.java  |  3 +++
 .../java/eu/faircode/email/NavMenuItem.java   | 21 ++++++++++++++-----
 app/src/main/res/layout/item_nav.xml          | 14 +++++++++++++
 7 files changed, 52 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java
index a212905113..18ba3efe32 100644
--- a/app/src/main/java/eu/faircode/email/ActivityView.java
+++ b/app/src/main/java/eu/faircode/email/ActivityView.java
@@ -673,7 +673,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
                     drawerLayout.closeDrawer(drawerContainer);
                 onMenuOperations();
             }
-        });
+        }).setExtraCount(BuildConfig.DEBUG);
 
         menus.add(navOperations);
 
diff --git a/app/src/main/java/eu/faircode/email/AdapterNavAccountFolder.java b/app/src/main/java/eu/faircode/email/AdapterNavAccountFolder.java
index 0e96836f6f..b382965e5e 100644
--- a/app/src/main/java/eu/faircode/email/AdapterNavAccountFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterNavAccountFolder.java
@@ -78,6 +78,7 @@ public class AdapterNavAccountFolder extends RecyclerView.Adapter<AdapterNavAcco
         private View view;
         private ImageView ivItem;
         private ImageView ivBadge;
+        private TextView tvCount;
         private TextView tvItem;
         private TextView tvItemExtra;
         private ImageView ivExtra;
@@ -89,6 +90,7 @@ public class AdapterNavAccountFolder extends RecyclerView.Adapter<AdapterNavAcco
             view = itemView.findViewById(R.id.clItem);
             ivItem = itemView.findViewById(R.id.ivItem);
             ivBadge = itemView.findViewById(R.id.ivBadge);
+            tvCount = itemView.findViewById(R.id.tvCount);
             tvItem = itemView.findViewById(R.id.tvItem);
             tvItemExtra = itemView.findViewById(R.id.tvItemExtra);
             ivExtra = itemView.findViewById(R.id.ivExtra);
@@ -139,12 +141,14 @@ public class AdapterNavAccountFolder extends RecyclerView.Adapter<AdapterNavAcco
             else
                 count = account.unseen;
 
+            ivBadge.setVisibility(count == 0 || expanded ? View.GONE : View.VISIBLE);
+            tvCount.setVisibility(View.GONE);
+
             Integer color = (account.folderName == null ? account.color : account.folderColor);
             if (color == null || !ActivityBilling.isPro(context))
                 ivItem.clearColorFilter();
             else
                 ivItem.setColorFilter(color);
-            ivBadge.setVisibility(count == 0 || expanded ? View.GONE : View.VISIBLE);
 
             String name = account.getName(context);
             if (count == 0)
diff --git a/app/src/main/java/eu/faircode/email/AdapterNavMenu.java b/app/src/main/java/eu/faircode/email/AdapterNavMenu.java
index af742e8a43..c1483aa487 100644
--- a/app/src/main/java/eu/faircode/email/AdapterNavMenu.java
+++ b/app/src/main/java/eu/faircode/email/AdapterNavMenu.java
@@ -61,6 +61,7 @@ public class AdapterNavMenu extends RecyclerView.Adapter<AdapterNavMenu.ViewHold
         private View view;
         private ImageView ivItem;
         private ImageView ivBadge;
+        private TextView tvCount;
         private TextView tvItem;
         private TextView tvItemExtra;
         private ImageView ivExtra;
@@ -72,6 +73,7 @@ public class AdapterNavMenu extends RecyclerView.Adapter<AdapterNavMenu.ViewHold
             view = itemView.findViewById(R.id.clItem);
             ivItem = itemView.findViewById(R.id.ivItem);
             ivBadge = itemView.findViewById(R.id.ivBadge);
+            tvCount = itemView.findViewById(R.id.tvCount);
             tvItem = itemView.findViewById(R.id.tvItem);
             tvItemExtra = itemView.findViewById(R.id.tvItemExtra);
             ivExtra = itemView.findViewById(R.id.ivExtra);
@@ -92,10 +94,16 @@ public class AdapterNavMenu extends RecyclerView.Adapter<AdapterNavMenu.ViewHold
             ivItem.setImageResource(menu.getIcon());
 
             Integer color = menu.getColor();
-            ivItem.setImageTintList(ColorStateList.valueOf(color == null ? colorControlNormal : color));
+            ivItem.setImageTintList(ColorStateList.valueOf(color == null
+                    ? colorControlNormal : color));
 
             Integer count = menu.getCount();
-            ivBadge.setVisibility(count == null || count == 0 || expanded ? View.GONE : View.VISIBLE);
+            ivBadge.setVisibility(count == null || count == 0 || expanded
+                    ? View.GONE : View.VISIBLE);
+
+            tvCount.setText(count == null ? null : Integer.toString(count));
+            tvCount.setVisibility(count == null || count == 0 || expanded || !menu.getExtraCount()
+                    ? View.GONE : View.VISIBLE);
 
             if (count == null)
                 tvItem.setText(menu.getTitle());
diff --git a/app/src/main/java/eu/faircode/email/AdapterNavSearch.java b/app/src/main/java/eu/faircode/email/AdapterNavSearch.java
index f0f3103ecd..308faed0cb 100644
--- a/app/src/main/java/eu/faircode/email/AdapterNavSearch.java
+++ b/app/src/main/java/eu/faircode/email/AdapterNavSearch.java
@@ -54,6 +54,7 @@ public class AdapterNavSearch extends RecyclerView.Adapter<AdapterNavSearch.View
         private View view;
         private ImageView ivItem;
         private ImageView ivBadge;
+        private TextView tvCount;
         private TextView tvItem;
         private TextView tvItemExtra;
         private ImageView ivExtra;
@@ -65,6 +66,7 @@ public class AdapterNavSearch extends RecyclerView.Adapter<AdapterNavSearch.View
             view = itemView.findViewById(R.id.clItem);
             ivItem = itemView.findViewById(R.id.ivItem);
             ivBadge = itemView.findViewById(R.id.ivBadge);
+            tvCount = itemView.findViewById(R.id.tvCount);
             tvItem = itemView.findViewById(R.id.tvItem);
             tvItemExtra = itemView.findViewById(R.id.tvItemExtra);
             ivExtra = itemView.findViewById(R.id.ivExtra);
@@ -87,6 +89,7 @@ public class AdapterNavSearch extends RecyclerView.Adapter<AdapterNavSearch.View
                 ivItem.setColorFilter(search.color);
 
             ivBadge.setVisibility(View.GONE);
+            tvCount.setVisibility(View.GONE);
             tvItem.setText(search.name);
 
             tvItemExtra.setVisibility(View.GONE);
diff --git a/app/src/main/java/eu/faircode/email/AdapterNavUnified.java b/app/src/main/java/eu/faircode/email/AdapterNavUnified.java
index ca0a0bb0bb..f727a4ac49 100644
--- a/app/src/main/java/eu/faircode/email/AdapterNavUnified.java
+++ b/app/src/main/java/eu/faircode/email/AdapterNavUnified.java
@@ -62,6 +62,7 @@ public class AdapterNavUnified extends RecyclerView.Adapter<AdapterNavUnified.Vi
         private View view;
         private ImageView ivItem;
         private ImageView ivBadge;
+        private TextView tvCount;
         private TextView tvItem;
         private TextView tvItemExtra;
         private ImageView ivExtra;
@@ -73,6 +74,7 @@ public class AdapterNavUnified extends RecyclerView.Adapter<AdapterNavUnified.Vi
             view = itemView.findViewById(R.id.clItem);
             ivItem = itemView.findViewById(R.id.ivItem);
             ivBadge = itemView.findViewById(R.id.ivBadge);
+            tvCount = itemView.findViewById(R.id.tvCount);
             tvItem = itemView.findViewById(R.id.tvItem);
             tvItemExtra = itemView.findViewById(R.id.tvItemExtra);
             ivExtra = itemView.findViewById(R.id.ivExtra);
@@ -111,6 +113,7 @@ public class AdapterNavUnified extends RecyclerView.Adapter<AdapterNavUnified.Vi
                 count = folder.unseen;
 
             ivBadge.setVisibility(count == 0 || expanded ? View.GONE : View.VISIBLE);
+            tvCount.setVisibility(View.GONE);
 
             if (count == 0)
                 tvItem.setText(EntityFolder.localizeType(context, folder.type));
diff --git a/app/src/main/java/eu/faircode/email/NavMenuItem.java b/app/src/main/java/eu/faircode/email/NavMenuItem.java
index 7b8e3122fe..92104cc51b 100644
--- a/app/src/main/java/eu/faircode/email/NavMenuItem.java
+++ b/app/src/main/java/eu/faircode/email/NavMenuItem.java
@@ -26,8 +26,9 @@ public class NavMenuItem {
     private Integer color;
     private int title;
     private String subtitle = null;
-    private int extraicon;
+    private int extra_icon;
     private Integer count = null;
+    private boolean extra_count = false;
     private boolean warning = false;
     private boolean separated = false;
     private Runnable click;
@@ -57,7 +58,7 @@ public class NavMenuItem {
     }
 
     NavMenuItem setExtraIcon(int icon) {
-        this.extraicon = icon;
+        this.extra_icon = icon;
         return this;
     }
 
@@ -67,6 +68,11 @@ public class NavMenuItem {
         this.count = count;
     }
 
+    NavMenuItem setExtraCount(boolean value) {
+        this.extra_count = value;
+        return this;
+    }
+
     NavMenuItem setExternal(boolean external) {
         setExtraIcon(external ? R.drawable.twotone_open_in_new_24 : 0);
         return this;
@@ -99,13 +105,17 @@ public class NavMenuItem {
     }
 
     int getExtraIcon() {
-        return this.extraicon;
+        return this.extra_icon;
     }
 
     Integer getCount() {
         return this.count;
     }
 
+    boolean getExtraCount() {
+        return this.extra_count;
+    }
+
     boolean isSeparated() {
         return this.separated;
     }
@@ -141,8 +151,9 @@ public class NavMenuItem {
                     Objects.equals(this.color, other.color) &&
                     this.title == other.title &&
                     Objects.equals(this.subtitle, other.subtitle) &&
-                    this.extraicon == other.extraicon &&
+                    this.extra_icon == other.extra_icon &&
                     Objects.equals(this.count, other.count) &&
+                    this.extra_count == other.extra_count &&
                     this.warning == other.warning &&
                     this.separated == other.separated);
         } else
@@ -151,6 +162,6 @@ public class NavMenuItem {
 
     @Override
     public int hashCode() {
-        return Objects.hash(icon, color, title, subtitle, extraicon, count, warning, separated);
+        return Objects.hash(icon, color, title, subtitle, extra_icon, count, extra_count, warning, separated);
     }
 }
diff --git a/app/src/main/res/layout/item_nav.xml b/app/src/main/res/layout/item_nav.xml
index bdc8197b9c..f56a84bf18 100644
--- a/app/src/main/res/layout/item_nav.xml
+++ b/app/src/main/res/layout/item_nav.xml
@@ -31,6 +31,20 @@
             app:layout_constraintStart_toStartOf="@+id/ivItem"
             app:srcCompat="@drawable/badge" />
 
+        <eu.faircode.email.FixedTextView
+            android:id="@+id/tvCount"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:includeFontPadding="false"
+            android:singleLine="true"
+            android:text="123"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            android:textColor="?attr/colorBadge"
+            android:textSize="10sp"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toEndOf="@+id/ivItem"
+            app:layout_constraintTop_toTopOf="parent" />
+
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvItem"
             android:layout_width="0dp"