From bbf6ce3f0c52e58493423ce2e2c62e3fb08f21b2 Mon Sep 17 00:00:00 2001
From: Gabriel Luong <gabriel.luong@gmail.com>
Date: Sun, 9 Jan 2022 01:06:33 -0500
Subject: [PATCH] For #23121 - Replace @drawble/ic_share with
 @drawable/mozac_ic_share

---
 .../fenix/components/toolbar/DefaultToolbarMenu.kt  |  2 +-
 app/src/main/res/drawable/ic_share.xml              | 13 -------------
 .../main/res/layout/collection_home_list_row.xml    |  2 +-
 .../main/res/layout/tabstray_multiselect_items.xml  |  2 +-
 app/src/main/res/menu/bookmarks_select_multi.xml    |  2 +-
 app/src/main/res/menu/history_select_multi.xml      |  2 +-
 6 files changed, 5 insertions(+), 18 deletions(-)
 delete mode 100644 app/src/main/res/drawable/ic_share.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 2bbf8d638..6204d5fbe 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
@@ -144,7 +144,7 @@ open class DefaultToolbarMenu(
         }
 
         val share = BrowserMenuItemToolbar.Button(
-            imageResource = R.drawable.ic_share,
+            imageResource = R.drawable.mozac_ic_share,
             contentDescription = context.getString(R.string.browser_menu_share),
             iconTintColorResource = primaryTextColor(),
             listener = {
diff --git a/app/src/main/res/drawable/ic_share.xml b/app/src/main/res/drawable/ic_share.xml
deleted file mode 100644
index c36e1839d..000000000
--- a/app/src/main/res/drawable/ic_share.xml
+++ /dev/null
@@ -1,13 +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="M18.4 14.1a3.5 3.5 0 0 0-3.6 1.2l-5-2.4a3.6 3.6 0 0 0 0-1.7l5-2.5a3.5 3.5 0 0 0 3.6 1.2 3.5 3.5 0 0 0 2.5-4.3 3.5 3.5 0 0 0-1.7-2.1 3.5 3.5 0 0 0-2.6-0.4A3.5 3.5 0 0 0 14 7.4L9.2 9.8 9 9.5a3.5 3.5 0 0 0-5 0 3.5 3.5 0 0 0 0 5 3.5 3.5 0 0 0 2.5 1c0.9 0 1.8-0.3 2.5-1l0.2-0.3 5 2.4a3.5 3.5 0 0 0 3.3 4.4c0.6 0 1.2-0.2 1.7-0.5a3.5 3.5 0 0 0 1.7-2 3.5 3.5 0 0 0-2.5-4.4zM17 4.6a2 2 0 0 1 1.5 0.2A2 2 0 0 1 18 8.4 2 2 0 0 1 15.6 7 2 2 0 0 1 17 4.6zm-9 8.8a2 2 0 0 1-3 0 2 2 0 0 1 0-2.8 2 2 0 0 1 3 0c0.7 0.8 0.7 2 0 2.8zM19.3 18a2 2 0 0 1-0.9 1.2 2 2 0 0 1-1.5 0.2 2 2 0 0 1-1.4-2.4 2 2 0 0 1 2.4-1.4 2 2 0 0 1 1.4 2.4z" />
-</vector>
diff --git a/app/src/main/res/layout/collection_home_list_row.xml b/app/src/main/res/layout/collection_home_list_row.xml
index a430a6de4..f11b59f0a 100644
--- a/app/src/main/res/layout/collection_home_list_row.xml
+++ b/app/src/main/res/layout/collection_home_list_row.xml
@@ -69,7 +69,7 @@
         app:layout_constraintBottom_toBottomOf="@id/collection_icon"
         app:layout_constraintEnd_toStartOf="@id/collection_overflow_button"
         app:layout_constraintTop_toTopOf="@id/collection_icon"
-        app:srcCompat="@drawable/ic_share"
+        app:srcCompat="@drawable/mozac_ic_share"
         tools:visibility="visible" />
 
     <ImageButton
diff --git a/app/src/main/res/layout/tabstray_multiselect_items.xml b/app/src/main/res/layout/tabstray_multiselect_items.xml
index 6b6ac5ff6..8e8daafd2 100644
--- a/app/src/main/res/layout/tabstray_multiselect_items.xml
+++ b/app/src/main/res/layout/tabstray_multiselect_items.xml
@@ -32,7 +32,7 @@
         app:layout_constraintBottom_toBottomOf="@id/topBar"
         app:layout_constraintEnd_toStartOf="@id/menu_multi_select"
         app:layout_constraintTop_toTopOf="@id/topBar"
-        app:srcCompat="@drawable/ic_share"
+        app:srcCompat="@drawable/mozac_ic_share"
         app:tint="@color/contrast_text_normal_theme" />
 
     <ImageButton
diff --git a/app/src/main/res/menu/bookmarks_select_multi.xml b/app/src/main/res/menu/bookmarks_select_multi.xml
index 7190328ce..d436e6f3c 100644
--- a/app/src/main/res/menu/bookmarks_select_multi.xml
+++ b/app/src/main/res/menu/bookmarks_select_multi.xml
@@ -6,7 +6,7 @@
         xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/share_bookmark_multi_select"
-        android:icon="@drawable/ic_share"
+        android:icon="@drawable/mozac_ic_share"
         app:iconTint="@color/white_color"
         android:title="@string/browser_menu_share"
         app:showAsAction="ifRoom" />
diff --git a/app/src/main/res/menu/history_select_multi.xml b/app/src/main/res/menu/history_select_multi.xml
index 344b19c44..df688d4bb 100644
--- a/app/src/main/res/menu/history_select_multi.xml
+++ b/app/src/main/res/menu/history_select_multi.xml
@@ -6,7 +6,7 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
             android:id="@+id/share_history_multi_select"
-            android:icon="@drawable/ic_share"
+            android:icon="@drawable/mozac_ic_share"
             app:iconTint="@color/white_color"
             android:title="@string/browser_menu_share"
             app:showAsAction="ifRoom" />