From d028cc09c9a556cfaed5ea906e443c4876dad9d2 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 20 Feb 2021 14:41:06 +0100
Subject: [PATCH] Show version number in about nav menu

---
 app/src/main/java/eu/faircode/email/ActivityView.java  |  2 +-
 .../main/java/eu/faircode/email/AdapterNavMenu.java    |  3 ++-
 app/src/main/java/eu/faircode/email/NavMenuItem.java   | 10 ++++++++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java
index fb4f439548..f88f2b7d9c 100644
--- a/app/src/main/java/eu/faircode/email/ActivityView.java
+++ b/app/src/main/java/eu/faircode/email/ActivityView.java
@@ -555,7 +555,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
                     checkUpdate(true);
                 }
             }
-        }).setSeparated());
+        }).setSeparated().setSubtitle(BuildConfig.VERSION_NAME));
 
         extra.add(new NavMenuItem(R.drawable.twotone_monetization_on_24, R.string.menu_pro, new Runnable() {
             @Override
diff --git a/app/src/main/java/eu/faircode/email/AdapterNavMenu.java b/app/src/main/java/eu/faircode/email/AdapterNavMenu.java
index ef40deec34..0fbc3b89ad 100644
--- a/app/src/main/java/eu/faircode/email/AdapterNavMenu.java
+++ b/app/src/main/java/eu/faircode/email/AdapterNavMenu.java
@@ -93,7 +93,8 @@ public class AdapterNavMenu extends RecyclerView.Adapter<AdapterNavMenu.ViewHold
             tvItem.setTextColor(menu.getCount() == null ? textColorSecondary : colorUnread);
             tvItem.setTypeface(menu.getCount() == null ? Typeface.DEFAULT : Typeface.DEFAULT_BOLD);
 
-            tvItemExtra.setVisibility(View.GONE);
+            tvItemExtra.setText(menu.getSubtitle());
+            tvItemExtra.setVisibility(menu.getSubtitle() == null ? View.GONE : View.VISIBLE);
 
             ivExternal.setVisibility(menu.isExternal() ? View.VISIBLE : View.GONE);
             ivWarning.setVisibility(menu.hasWarning() ? View.VISIBLE : 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 6c613457d6..0ea9db9488 100644
--- a/app/src/main/java/eu/faircode/email/NavMenuItem.java
+++ b/app/src/main/java/eu/faircode/email/NavMenuItem.java
@@ -22,6 +22,7 @@ package eu.faircode.email;
 public class NavMenuItem {
     private int icon;
     private int title;
+    private String subtitle = null;
     private Integer count = null;
     private boolean external = false;
     private boolean warning = false;
@@ -42,6 +43,11 @@ public class NavMenuItem {
         this.longClick = longClick;
     }
 
+    NavMenuItem setSubtitle(String subtitle) {
+        this.subtitle = subtitle;
+        return this;
+    }
+
     void setCount(Integer count) {
         if (count != null && count == 0)
             count = null;
@@ -70,6 +76,10 @@ public class NavMenuItem {
         return this.title;
     }
 
+    String getSubtitle() {
+        return this.subtitle;
+    }
+
     Integer getCount() {
         return this.count;
     }