From e9bb11e22de81910709cc3fc22e8cce42c70153d Mon Sep 17 00:00:00 2001
From: ValentinTimisica <valentin.timisica@softvision.ro>
Date: Fri, 12 Jun 2020 11:48:18 +0300
Subject: [PATCH] Fixes #9205: Changes add-ons and 'Open links in apps' icons
 from menus

---
 .../components/toolbar/DefaultToolbarMenu.kt      |  2 +-
 .../fenix/customtabs/CustomTabToolbarMenu.kt      |  2 +-
 .../main/java/org/mozilla/fenix/home/HomeMenu.kt  |  2 +-
 .../main/res/drawable/ic_addons_extensions.xml    | 15 +++++++++++++++
 app/src/main/res/drawable/ic_app_links.xml        | 14 --------------
 app/src/main/res/drawable/ic_open_in_app.xml      | 15 +++++++++++++++
 app/src/main/res/xml/preferences.xml              |  4 ++--
 7 files changed, 35 insertions(+), 19 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_addons_extensions.xml
 delete mode 100644 app/src/main/res/drawable/ic_app_links.xml
 create mode 100644 app/src/main/res/drawable/ic_open_in_app.xml

diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
index 2359ecf60..3ad4957d3 100644
--- a/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
@@ -302,7 +302,7 @@ class DefaultToolbarMenu(
 
     private val openInApp = BrowserMenuHighlightableItem(
         label = context.getString(R.string.browser_menu_open_app_link),
-        startImageResource = R.drawable.ic_app_links,
+        startImageResource = R.drawable.ic_open_in_app,
         iconTintColorResource = primaryTextColor(),
         highlight = BrowserMenuHighlight.LowPriority(
             label = context.getString(R.string.browser_menu_open_app_link),
diff --git a/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabToolbarMenu.kt b/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabToolbarMenu.kt
index b2deac1df..32a33b8d4 100644
--- a/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabToolbarMenu.kt
+++ b/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabToolbarMenu.kt
@@ -139,7 +139,7 @@ class CustomTabToolbarMenu(
 
     private val openInApp = BrowserMenuHighlightableItem(
         label = context.getString(R.string.browser_menu_open_app_link),
-        startImageResource = R.drawable.ic_app_links,
+        startImageResource = R.drawable.ic_open_in_app,
         iconTintColorResource = primaryTextColor(),
         highlight = BrowserMenuHighlight.LowPriority(
             label = context.getString(R.string.browser_menu_open_app_link),
diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt b/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt
index 93991155f..c38edf498 100644
--- a/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt
@@ -115,7 +115,7 @@ class HomeMenu(
 
         val addons = BrowserMenuImageText(
             context.getString(R.string.browser_menu_add_ons),
-            R.drawable.mozac_ic_extensions,
+            R.drawable.ic_addons_extensions,
             primaryTextColor
         ) {
             onItemTapped.invoke(Item.AddonsManager)
diff --git a/app/src/main/res/drawable/ic_addons_extensions.xml b/app/src/main/res/drawable/ic_addons_extensions.xml
new file mode 100644
index 000000000..c227de01c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_addons_extensions.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="m20.125,12c-1.213,0 -1.25,1.25 -2.187,1.25 -0.5138,-0.0101 -0.9279,-0.4242 -0.938,-0.938v-4.062c0,-0.6904 -0.5596,-1.25 -1.25,-1.25h-4.062c-0.5138,-0.0101 -0.9279,-0.4242 -0.938,-0.938 0,-0.937 1.25,-0.974 1.25,-2.187 0,-1.081 -1.119,-1.875 -2.5,-1.875s-2.5,0.794 -2.5,1.875c0,1.213 1.25,1.25 1.25,2.187 -0.0101,0.5138 -0.4242,0.9279 -0.938,0.938h-4.062c-0.3315,0 -0.6495,0.1317 -0.8839,0.3661 -0.2344,0.2344 -0.3661,0.5524 -0.3661,0.8839v2.812c0.0101,0.5138 0.4242,0.9279 0.938,0.938 0.937,0 0.974,-1.25 2.187,-1.25 1.081,0 1.875,1.119 1.875,2.5s-0.794,2.5 -1.875,2.5c-1.213,0 -1.25,-1.25 -2.187,-1.25 -0.5138,0.0101 -0.9279,0.4242 -0.938,0.938v5.312c0,0.6904 0.5596,1.25 1.25,1.25h4.062c0.5138,-0.0101 0.9279,-0.4242 0.938,-0.938 0,-0.937 -1.25,-0.974 -1.25,-2.187 0,-1.081 1.119,-1.875 2.5,-1.875s2.5,0.794 2.5,1.875c0,1.213 -1.25,1.25 -1.25,2.187 0.0101,0.5138 0.4242,0.9279 0.938,0.938h4.062c0.6904,0 1.25,-0.5596 1.25,-1.25v-4.062c0.0101,-0.5138 0.4242,-0.9279 0.938,-0.938 0.937,0 0.974,1.25 2.187,1.25 1.081,0 1.875,-1.119 1.875,-2.5s-0.794,-2.5 -1.875,-2.5z"
+      android:fillColor="?primaryText"
+      tools:ignore="VectorPath" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_app_links.xml b/app/src/main/res/drawable/ic_app_links.xml
deleted file mode 100644
index c6ee2fb0d..000000000
--- a/app/src/main/res/drawable/ic_app_links.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="?primaryText"
-        android:pathData="M4.5,7C3.12,7 2,5.88 2,4.5S3.12,2 4.5,2 7,3.12 7,4.5 5.88,7 4.5,7zM4.5,22C3.12,22 2,20.88 2,19.5S3.12,17 4.5,17 7,18.12 7,19.5 5.88,22 4.5,22zM4.5,14.5C3.12,14.5 2,13.38 2,12s1.12,-2.5 2.5,-2.5S7,10.62 7,12s-1.12,2.5 -2.5,2.5zM19.5,7C18.12,7 17,5.88 17,4.5S18.12,2 19.5,2 22,3.12 22,4.5 20.88,7 19.5,7zM19.5,22c-1.38,0 -2.5,-1.12 -2.5,-2.5s1.12,-2.5 2.5,-2.5 2.5,1.12 2.5,2.5 -1.12,2.5 -2.5,2.5zM19.5,14.5c-1.38,0 -2.5,-1.12 -2.5,-2.5s1.12,-2.5 2.5,-2.5S22,10.62 22,12s-1.12,2.5 -2.5,2.5zM12,7c-1.38,0 -2.5,-1.12 -2.5,-2.5S10.62,2 12,2s2.5,1.12 2.5,2.5S13.38,7 12,7zM12,22c-1.38,0 -2.5,-1.12 -2.5,-2.5S10.62,17 12,17s2.5,1.12 2.5,2.5S13.38,22 12,22zM12,14.5c-1.38,0 -2.5,-1.12 -2.5,-2.5s1.12,-2.5 2.5,-2.5 2.5,1.12 2.5,2.5 -1.12,2.5 -2.5,2.5z"
-        />
-</vector>
diff --git a/app/src/main/res/drawable/ic_open_in_app.xml b/app/src/main/res/drawable/ic_open_in_app.xml
new file mode 100644
index 000000000..be5f9f3d1
--- /dev/null
+++ b/app/src/main/res/drawable/ic_open_in_app.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="m5.5,16c1.3807,0 2.5,1.1193 2.5,2.5s-1.1193,2.5 -2.5,2.5 -2.5,-1.1193 -2.5,-2.5 1.1193,-2.5 2.5,-2.5zM18.5,16c1.3807,0 2.5,1.1193 2.5,2.5s-1.1193,2.5 -2.5,2.5 -2.5,-1.1193 -2.5,-2.5 1.1193,-2.5 2.5,-2.5zM12,16c1.3807,0 2.5,1.1193 2.5,2.5s-1.1193,2.5 -2.5,2.5 -2.5,-1.1193 -2.5,-2.5 1.1193,-2.5 2.5,-2.5zM5.5,9.5c1.3807,0 2.5,1.1193 2.5,2.5s-1.1193,2.5 -2.5,2.5 -2.5,-1.1193 -2.5,-2.5 1.1193,-2.5 2.5,-2.5zM18.5,9.5c1.3807,0 2.5,1.1193 2.5,2.5s-1.1193,2.5 -2.5,2.5 -2.5,-1.1193 -2.5,-2.5 1.1193,-2.5 2.5,-2.5zM12,9.5c1.3807,0 2.5,1.1193 2.5,2.5s-1.1193,2.5 -2.5,2.5 -2.5,-1.1193 -2.5,-2.5 1.1193,-2.5 2.5,-2.5zM5.5,3c1.3807,0 2.5,1.1193 2.5,2.5s-1.1193,2.5 -2.5,2.5 -2.5,-1.1193 -2.5,-2.5 1.1193,-2.5 2.5,-2.5zM18.5,3c1.3807,0 2.5,1.1193 2.5,2.5s-1.1193,2.5 -2.5,2.5 -2.5,-1.1193 -2.5,-2.5 1.1193,-2.5 2.5,-2.5zM12,3c1.3807,0 2.5,1.1193 2.5,2.5s-1.1193,2.5 -2.5,2.5 -2.5,-1.1193 -2.5,-2.5 1.1193,-2.5 2.5,-2.5z"
+      android:fillColor="?primaryText"
+      tools:ignore="VectorPath" />
+</vector>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 60471bd70..b9d8a73f4 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -122,13 +122,13 @@
         android:key="@string/pref_key_advanced"
         android:layout="@layout/preference_cat_style">
         <androidx.preference.Preference
-            android:icon="@drawable/mozac_ic_extensions_black"
+            android:icon="@drawable/ic_addons_extensions"
             android:key="@string/pref_key_addons"
             android:title="@string/preferences_addons" />
 
         <androidx.preference.SwitchPreference
             android:defaultValue="false"
-            android:icon="@drawable/ic_app_links"
+            android:icon="@drawable/ic_open_in_app"
             android:key="@string/pref_key_open_links_in_external_app"
             android:title="@string/preferences_open_links_in_apps" />