From adaaa3d2b9b1c9edeaaeb0fafe9a3cefce58c385 Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Mon, 28 Nov 2022 14:11:23 +0700
Subject: [PATCH] fix(android/app): Toggle keyboard update notification

---
 .../main/java/com/tavultesoft/kmapro/MainActivity.java | 10 ++++++++--
 android/KMAPro/kMAPro/src/main/res/menu-land/main.xml  |  8 +++++---
 .../KMAPro/kMAPro/src/main/res/menu-sw600dp/main.xml   | 10 ++++++----
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java
index 6930a91998..2233e9b8a0 100644
--- a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java
+++ b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java
@@ -353,6 +353,7 @@ public class MainActivity extends BaseActivity implements OnKeyboardEventListene
   @SuppressLint("RestrictedApi")
   @Override
   public boolean onPrepareOptionsMenu(final Menu menu) {
+    this.menu = menu;
     final MenuItem _overflowMenuItem = menu.findItem(R.id.action_overflow);
     if (_overflowMenuItem != null) {
       MenuItem updateKeyboards = this.menu.findItem(R.id.action_update_keyboards);
@@ -372,8 +373,8 @@ public class MainActivity extends BaseActivity implements OnKeyboardEventListene
     }
 
     final MenuItem _keyboardupdate = menu.findItem(R.id.action_update_keyboards);
-    if (_keyboardupdate != null) {
-      updateUpdateCountIndicator(_keyboardupdate, anUpdateCount, true);
+    if (_keyboardupdate != null && anUpdateCount > 0) {
+      _keyboardupdate.setVisible(true);
     }
   }
 
@@ -452,6 +453,11 @@ public class MainActivity extends BaseActivity implements OnKeyboardEventListene
         KMManager.getUpdateTool().executeOpenUpdates();
         // Dismiss icon
         updateUpdateCountIndicator(0);
+        final MenuItem _keyboardupdate = menu.findItem(R.id.action_update_keyboards);
+        if (_keyboardupdate != null && _keyboardupdate.isVisible()) {
+          _keyboardupdate.setVisible(false);
+        }
+
         return true;
       default:
         return super.onOptionsItemSelected(item);
diff --git a/android/KMAPro/kMAPro/src/main/res/menu-land/main.xml b/android/KMAPro/kMAPro/src/main/res/menu-land/main.xml
index 8319e98a66..f1f9e614a1 100644
--- a/android/KMAPro/kMAPro/src/main/res/menu-land/main.xml
+++ b/android/KMAPro/kMAPro/src/main/res/menu-land/main.xml
@@ -45,10 +45,12 @@
         android:title="@string/action_settings"
         android:icon="@drawable/ic_settings" />
 
-     <item
+    <!-- hidden until updates available -->
+    <item
       android:id="@+id/action_update_keyboards"
-      android:title="@string/action_install_updates"
       app:showAsAction="always"
-       app:actionLayout="@layout/update_count_view"/>
+      android:title="@string/action_install_updates"
+      android:visible="false"
+      android:icon="@drawable/ic_cloud_download" />
 
 </menu>
diff --git a/android/KMAPro/kMAPro/src/main/res/menu-sw600dp/main.xml b/android/KMAPro/kMAPro/src/main/res/menu-sw600dp/main.xml
index f79209cfbc..06852dac0c 100644
--- a/android/KMAPro/kMAPro/src/main/res/menu-sw600dp/main.xml
+++ b/android/KMAPro/kMAPro/src/main/res/menu-sw600dp/main.xml
@@ -45,10 +45,12 @@
         android:title="@string/action_settings"
         android:icon="@drawable/ic_settings" />
 
+    <!-- hidden until updates available -->
     <item
-      android:id="@+id/action_update_keyboards"
-      android:title="@string/action_install_updates"
-      app:showAsAction="always"
-      app:actionLayout="@layout/update_count_view"/>
+        android:id="@+id/action_update_keyboards"
+        app:showAsAction="always"
+        android:title="@string/action_install_updates"
+        android:visible="false"
+        android:icon="@drawable/ic_cloud_download" />
 
 </menu>