From bb9c5eb5f49aca2c2f4e0cefe11aedfb6bc0d48a Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 28 Jul 2021 13:52:20 +0200
Subject: [PATCH] Nav icon extra

---
 .../java/eu/faircode/email/ActivityView.java  |  2 +-
 .../eu/faircode/email/AdapterNavAccount.java  |  6 +++---
 .../eu/faircode/email/AdapterNavFolder.java   |  6 +++---
 .../eu/faircode/email/AdapterNavMenu.java     |  8 +++----
 .../eu/faircode/email/AdapterNavUnified.java  |  6 +++---
 .../java/eu/faircode/email/NavMenuItem.java   | 21 ++++++++++++-------
 app/src/main/res/layout/item_nav.xml          |  4 ++--
 7 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java
index fb748fafbe..ef2ce168f7 100644
--- a/app/src/main/java/eu/faircode/email/ActivityView.java
+++ b/app/src/main/java/eu/faircode/email/ActivityView.java
@@ -612,7 +612,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
                     drawerLayout.closeDrawer(drawerContainer);
                 startActivity(new Intent(ActivityView.this, ActivityBilling.class));
             }
-        }));
+        }).setExtraIcon(ActivityBilling.isPro(this) ? R.drawable.twotone_check_24 : 0));
 
         if ((Helper.isPlayStoreInstall() || BuildConfig.DEBUG))
             extra.add(new NavMenuItem(R.drawable.twotone_star_24, R.string.menu_rate, new Runnable() {
diff --git a/app/src/main/java/eu/faircode/email/AdapterNavAccount.java b/app/src/main/java/eu/faircode/email/AdapterNavAccount.java
index 1556b2dc2c..e1e9460fe0 100644
--- a/app/src/main/java/eu/faircode/email/AdapterNavAccount.java
+++ b/app/src/main/java/eu/faircode/email/AdapterNavAccount.java
@@ -67,7 +67,7 @@ public class AdapterNavAccount extends RecyclerView.Adapter<AdapterNavAccount.Vi
         private ImageView ivItem;
         private TextView tvItem;
         private TextView tvItemExtra;
-        private ImageView ivExternal;
+        private ImageView ivExtra;
         private ImageView ivWarning;
 
         ViewHolder(View itemView) {
@@ -77,7 +77,7 @@ public class AdapterNavAccount extends RecyclerView.Adapter<AdapterNavAccount.Vi
             ivItem = itemView.findViewById(R.id.ivItem);
             tvItem = itemView.findViewById(R.id.tvItem);
             tvItemExtra = itemView.findViewById(R.id.tvItemExtra);
-            ivExternal = itemView.findViewById(R.id.ivExternal);
+            ivExtra = itemView.findViewById(R.id.ivExtra);
             ivWarning = itemView.findViewById(R.id.ivWarning);
         }
 
@@ -119,7 +119,7 @@ public class AdapterNavAccount extends RecyclerView.Adapter<AdapterNavAccount.Vi
 
             tvItemExtra.setText(account.last_connected == null ? null : TF.format(account.last_connected));
 
-            ivExternal.setVisibility(View.GONE);
+            ivExtra.setVisibility(View.GONE);
 
             Integer percent = account.getQuotaPercentage();
 
diff --git a/app/src/main/java/eu/faircode/email/AdapterNavFolder.java b/app/src/main/java/eu/faircode/email/AdapterNavFolder.java
index 654f50e4f2..262e5566ef 100644
--- a/app/src/main/java/eu/faircode/email/AdapterNavFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterNavFolder.java
@@ -63,7 +63,7 @@ public class AdapterNavFolder extends RecyclerView.Adapter<AdapterNavFolder.View
         private ImageView ivItem;
         private TextView tvItem;
         private TextView tvItemExtra;
-        private ImageView ivExternal;
+        private ImageView ivExtra;
         private ImageView ivWarning;
 
         ViewHolder(View itemView) {
@@ -73,7 +73,7 @@ public class AdapterNavFolder extends RecyclerView.Adapter<AdapterNavFolder.View
             ivItem = itemView.findViewById(R.id.ivItem);
             tvItem = itemView.findViewById(R.id.tvItem);
             tvItemExtra = itemView.findViewById(R.id.tvItemExtra);
-            ivExternal = itemView.findViewById(R.id.ivExternal);
+            ivExtra = itemView.findViewById(R.id.ivExtra);
             ivWarning = itemView.findViewById(R.id.ivWarning);
         }
 
@@ -130,7 +130,7 @@ public class AdapterNavFolder extends RecyclerView.Adapter<AdapterNavFolder.View
             tvItemExtra.setText(NF.format(folder.messages));
             tvItemExtra.setVisibility(nav_count ? View.VISIBLE : View.GONE);
 
-            ivExternal.setVisibility(View.GONE);
+            ivExtra.setVisibility(View.GONE);
             ivWarning.setVisibility(folder.error == null ? View.GONE : View.VISIBLE);
         }
 
diff --git a/app/src/main/java/eu/faircode/email/AdapterNavMenu.java b/app/src/main/java/eu/faircode/email/AdapterNavMenu.java
index ae5b8441db..cc31974dab 100644
--- a/app/src/main/java/eu/faircode/email/AdapterNavMenu.java
+++ b/app/src/main/java/eu/faircode/email/AdapterNavMenu.java
@@ -39,7 +39,6 @@ import androidx.recyclerview.widget.RecyclerView;
 import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 
 public class AdapterNavMenu extends RecyclerView.Adapter<AdapterNavMenu.ViewHolder> {
     private Context context;
@@ -59,7 +58,7 @@ public class AdapterNavMenu extends RecyclerView.Adapter<AdapterNavMenu.ViewHold
         private ImageView ivItem;
         private TextView tvItem;
         private TextView tvItemExtra;
-        private ImageView ivExternal;
+        private ImageView ivExtra;
         private ImageView ivWarning;
 
         ViewHolder(View itemView) {
@@ -69,7 +68,7 @@ public class AdapterNavMenu extends RecyclerView.Adapter<AdapterNavMenu.ViewHold
             ivItem = itemView.findViewById(R.id.ivItem);
             tvItem = itemView.findViewById(R.id.tvItem);
             tvItemExtra = itemView.findViewById(R.id.tvItemExtra);
-            ivExternal = itemView.findViewById(R.id.ivExternal);
+            ivExtra = itemView.findViewById(R.id.ivExtra);
             ivWarning = itemView.findViewById(R.id.ivWarning);
         }
 
@@ -101,7 +100,8 @@ public class AdapterNavMenu extends RecyclerView.Adapter<AdapterNavMenu.ViewHold
             tvItemExtra.setText(menu.getSubtitle());
             tvItemExtra.setVisibility(menu.getSubtitle() == null ? View.GONE : View.VISIBLE);
 
-            ivExternal.setVisibility(menu.isExternal() ? View.VISIBLE : View.GONE);
+            ivExtra.setImageResource(menu.getExtraIcon());
+            ivExtra.setVisibility(menu.getExtraIcon() == 0 ? View.GONE : View.VISIBLE);
             ivWarning.setVisibility(menu.hasWarning() ? View.VISIBLE : 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 e7bd000bcb..6e4b697134 100644
--- a/app/src/main/java/eu/faircode/email/AdapterNavUnified.java
+++ b/app/src/main/java/eu/faircode/email/AdapterNavUnified.java
@@ -61,7 +61,7 @@ public class AdapterNavUnified extends RecyclerView.Adapter<AdapterNavUnified.Vi
         private ImageView ivItem;
         private TextView tvItem;
         private TextView tvItemExtra;
-        private ImageView ivExternal;
+        private ImageView ivExtra;
         private ImageView ivWarning;
 
         ViewHolder(View itemView) {
@@ -71,7 +71,7 @@ public class AdapterNavUnified extends RecyclerView.Adapter<AdapterNavUnified.Vi
             ivItem = itemView.findViewById(R.id.ivItem);
             tvItem = itemView.findViewById(R.id.tvItem);
             tvItemExtra = itemView.findViewById(R.id.tvItemExtra);
-            ivExternal = itemView.findViewById(R.id.ivExternal);
+            ivExtra = itemView.findViewById(R.id.ivExtra);
             ivWarning = itemView.findViewById(R.id.ivWarning);
         }
 
@@ -107,7 +107,7 @@ public class AdapterNavUnified extends RecyclerView.Adapter<AdapterNavUnified.Vi
             tvItemExtra.setText(NF.format(folder.messages));
             tvItemExtra.setVisibility(nav_count ? View.VISIBLE : View.GONE);
 
-            ivExternal.setVisibility(View.GONE);
+            ivExtra.setVisibility(View.GONE);
             ivWarning.setVisibility(View.GONE);
         }
 
diff --git a/app/src/main/java/eu/faircode/email/NavMenuItem.java b/app/src/main/java/eu/faircode/email/NavMenuItem.java
index 73999c6710..c9017cd2d9 100644
--- a/app/src/main/java/eu/faircode/email/NavMenuItem.java
+++ b/app/src/main/java/eu/faircode/email/NavMenuItem.java
@@ -26,8 +26,8 @@ public class NavMenuItem {
     private Integer color;
     private int title;
     private String subtitle = null;
+    private int extraicon;
     private Integer count = null;
-    private boolean external = false;
     private boolean warning = false;
     private boolean separated = false;
     private Runnable click;
@@ -56,6 +56,11 @@ public class NavMenuItem {
         return this;
     }
 
+    NavMenuItem setExtraIcon(int icon) {
+        this.extraicon = icon;
+        return this;
+    }
+
     void setCount(Integer count) {
         if (count != null && count == 0)
             count = null;
@@ -63,7 +68,7 @@ public class NavMenuItem {
     }
 
     NavMenuItem setExternal(boolean external) {
-        this.external = external;
+        setExtraIcon(external ? R.drawable.twotone_open_in_new_24 : 0);
         return this;
     }
 
@@ -92,6 +97,10 @@ public class NavMenuItem {
         return this.subtitle;
     }
 
+    int getExtraIcon() {
+        return this.extraicon;
+    }
+
     Integer getCount() {
         return this.count;
     }
@@ -100,10 +109,6 @@ public class NavMenuItem {
         return this.separated;
     }
 
-    boolean isExternal() {
-        return this.external;
-    }
-
     boolean hasWarning() {
         return this.warning;
     }
@@ -135,8 +140,8 @@ public class NavMenuItem {
                     Objects.equals(this.color, other.color) &&
                     this.title == other.title &&
                     Objects.equals(this.subtitle, other.subtitle) &&
+                    this.extraicon == other.extraicon &&
                     Objects.equals(this.count, other.count) &&
-                    this.external == other.external &&
                     this.warning == other.warning &&
                     this.separated == other.separated);
         } else
@@ -145,6 +150,6 @@ public class NavMenuItem {
 
     @Override
     public int hashCode() {
-        return Objects.hash(icon, color, title, subtitle, count, external, warning, separated);
+        return Objects.hash(icon, color, title, subtitle, extraicon, count, warning, separated);
     }
 }
diff --git a/app/src/main/res/layout/item_nav.xml b/app/src/main/res/layout/item_nav.xml
index 915452e373..775fac9495 100644
--- a/app/src/main/res/layout/item_nav.xml
+++ b/app/src/main/res/layout/item_nav.xml
@@ -49,11 +49,11 @@
             android:text="Extra"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/ivExternal"
+            app:layout_constraintEnd_toStartOf="@+id/ivExtra"
             app:layout_constraintTop_toTopOf="parent" />
 
         <ImageView
-            android:id="@+id/ivExternal"
+            android:id="@+id/ivExtra"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="12dp"