From 130ec130cc4015e2bbc3d129bfc258b93121fda7 Mon Sep 17 00:00:00 2001
From: J-Jamet <jeremy.jamet@kunzisoft.com>
Date: Sat, 21 Aug 2021 13:21:24 +0200
Subject: [PATCH] Add link to download icon

---
 .../keepass/activities/IconPickerActivity.kt     | 16 ++++++++++++----
 .../res/drawable/ic_open_browser_white_24dp.xml  |  7 +++++++
 app/src/main/res/menu/icon.xml                   |  6 ++++++
 app/src/main/res/values/donottranslate.xml       |  1 +
 app/src/main/res/values/strings.xml              |  1 +
 5 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_open_browser_white_24dp.xml

diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/IconPickerActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/IconPickerActivity.kt
index 852fc06b0..93635b1a3 100644
--- a/app/src/main/java/com/kunzisoft/keepass/activities/IconPickerActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/IconPickerActivity.kt
@@ -192,13 +192,18 @@ class IconPickerActivity : DatabaseLockActivity() {
 
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {
         super.onCreateOptionsMenu(menu)
-
-        if (mCustomIconsSelectionMode) {
-            menuInflater.inflate(R.menu.icon, menu)
-        }
+        menuInflater.inflate(R.menu.icon, menu)
         return true
     }
 
+    override fun onPrepareOptionsMenu(menu: Menu?): Boolean {
+        menu?.findItem(R.id.menu_delete)?.apply {
+            isEnabled = mCustomIconsSelectionMode
+            isVisible = isEnabled
+        }
+        return super.onPrepareOptionsMenu(menu)
+    }
+
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
             android.R.id.home -> {
@@ -213,6 +218,9 @@ class IconPickerActivity : DatabaseLockActivity() {
                     removeCustomIcon(iconToRemove)
                 }
             }
+            R.id.menu_external_icon -> {
+                UriUtil.gotoUrl(this, R.string.external_icon_url)
+            }
         }
 
         return super.onOptionsItemSelected(item)
diff --git a/app/src/main/res/drawable/ic_open_browser_white_24dp.xml b/app/src/main/res/drawable/ic_open_browser_white_24dp.xml
new file mode 100644
index 000000000..f28823dd9
--- /dev/null
+++ b/app/src/main/res/drawable/ic_open_browser_white_24dp.xml
@@ -0,0 +1,7 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24">
+    <path android:fillColor="#FFFFFF" android:pathData="M19,4L5,4c-1.11,0 -2,0.9 -2,2v12c0,1.1 0.89,2 2,2h4v-2L5,18L5,8h14v10h-4v2h4c1.1,0 2,-0.9 2,-2L21,6c0,-1.1 -0.89,-2 -2,-2zM12,10l-4,4h3v6h2v-6h3l-4,-4z"/>
+</vector>
diff --git a/app/src/main/res/menu/icon.xml b/app/src/main/res/menu/icon.xml
index 987fbfb38..393a05411 100644
--- a/app/src/main/res/menu/icon.xml
+++ b/app/src/main/res/menu/icon.xml
@@ -25,4 +25,10 @@
         android:orderInCategory="10"
         app:iconTint="?attr/colorControlNormal"
         app:showAsAction="ifRoom" />
+    <item android:id="@+id/menu_external_icon"
+        android:icon="@drawable/ic_open_browser_white_24dp"
+        android:title="@string/menu_external_icon"
+        android:orderInCategory="15"
+        app:iconTint="?attr/colorControlNormal"
+        app:showAsAction="ifRoom" />
 </menu>
diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml
index cb21a9372..059cb9b49 100644
--- a/app/src/main/res/values/donottranslate.xml
+++ b/app/src/main/res/values/donottranslate.xml
@@ -33,6 +33,7 @@
     <string name="app_pro_url" translatable="false">https://play.google.com/store/apps/details?id=com.kunzisoft.keepass.pro</string>
     <string name="contribution_url" translatable="false">https://www.keepassdx.com/contribution</string>
     <string name="homepage_url" translatable="false">https://www.keepassdx.com</string>
+    <string name="external_icon_url" translatable="false">https://www.keepassdx.com/#icons</string>
     <string name="issues_url" translatable="false">https://github.com/Kunzisoft/KeePassDX/issues</string>
     <string name="credentials_explanation_url" translatable="false">https://github.com/Kunzisoft/KeePassDX/wiki/Credentials</string>
     <string name="otp_explanation_url" translatable="false">https://github.com/Kunzisoft/KeePassDX/wiki/OTP</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 239683060..0b68ec92a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -234,6 +234,7 @@
     <string name="menu_empty_recycle_bin">Empty the recycle bin</string>
     <string name="menu_restore_entry_history">Restore history</string>
     <string name="menu_delete_entry_history">Delete history</string>
+    <string name="menu_external_icon">External icon</string>
     <string name="minus">Minus</string>
     <string name="never">Never</string>
     <string name="no_results">No search results</string>