For mozilla-mobile#23121 - Replace @drawable/ic_new with @drawable/mo…

…zac_ic_new
gexsi · Mar 9, 2022 · e7f7d71 · e7f7d71
1 parent 29a9f3d
commit e7f7d71
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 27 deletions.
diff --git a/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationBottomBarView.kt b/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationBottomBarView.kt
@@ -84,7 +84,7 @@ class CollectionCreationBottomBarView(
 
         iconButton.apply {
             val drawable = context.getDrawableWithTint(
-                R.drawable.ic_new,
+                R.drawable.mozac_ic_new,
                 ContextCompat.getColor(context, R.color.photonWhite)
             )
             setImageDrawable(drawable)

diff --git a/app/src/main/java/org/mozilla/fenix/collections/CollectionsListAdapter.kt b/app/src/main/java/org/mozilla/fenix/collections/CollectionsListAdapter.kt
@@ -49,7 +49,7 @@ class CollectionsListAdapter(
             holder.textView.putCompoundDrawablesRelativeWithIntrinsicBounds(
                 start = AppCompatResources.getDrawable(
                     holder.textView.context,
-                    R.drawable.ic_new
+                    R.drawable.mozac_ic_new
                 )
             )
         } else {

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
@@ -204,7 +204,7 @@ open class DefaultToolbarMenu(
 
     val newTabItem = BrowserMenuImageText(
         context.getString(R.string.library_new_tab),
-        R.drawable.ic_new,
+        R.drawable.mozac_ic_new,
         primaryTextColor()
     ) {
         onItemTapped.invoke(ToolbarMenu.Item.NewTab)

diff --git a/app/src/main/java/org/mozilla/fenix/settings/creditcards/CreditCardsSettingFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/creditcards/CreditCardsSettingFragment.kt
@@ -157,7 +157,7 @@ class CreditCardsSettingFragment : BiometricPromptPreferenceFragment() {
             manageSavedCardsPreference.title =
                 getString(R.string.preferences_credit_cards_manage_saved_cards)
         } else {
-            manageSavedCardsPreference.setIcon(R.drawable.ic_new)
+            manageSavedCardsPreference.setIcon(R.drawable.mozac_ic_new)
             manageSavedCardsPreference.title =
                 getString(R.string.preferences_credit_cards_add_credit_card)
         }

diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/FloatingActionButtonBinding.kt b/app/src/main/java/org/mozilla/fenix/tabstray/FloatingActionButtonBinding.kt
@@ -44,7 +44,7 @@ class FloatingActionButtonBinding(
                     shrink()
                     show()
                     contentDescription = context.getString(R.string.add_tab)
-                    setIconResource(R.drawable.ic_new)
+                    setIconResource(R.drawable.mozac_ic_new)
                     setOnClickListener {
                         browserTrayInteractor.onFabClicked(false)
                     }
@@ -56,7 +56,7 @@ class FloatingActionButtonBinding(
                     extend()
                     show()
                     contentDescription = context.getString(R.string.add_private_tab)
-                    setIconResource(R.drawable.ic_new)
+                    setIconResource(R.drawable.mozac_ic_new)
                     setOnClickListener {
                         browserTrayInteractor.onFabClicked(true)
                     }

diff --git a/app/src/main/res/drawable/ic_new.xml b/app/src/main/res/drawable/ic_new.xml
diff --git a/app/src/main/res/layout/component_collection_creation_select_collection.xml b/app/src/main/res/layout/component_collection_creation_select_collection.xml
@@ -131,7 +131,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/ic_new"
+            app:srcCompat="@drawable/mozac_ic_new"
             app:tint="?neutral" />
 
         <TextView

diff --git a/app/src/main/res/layout/component_tabstray_fab.xml b/app/src/main/res/layout/component_tabstray_fab.xml
@@ -20,5 +20,5 @@
     android:visibility="gone"
     app:elevation="99dp"
     app:borderWidth="0dp"
-    app:icon="@drawable/ic_new"
+    app:icon="@drawable/mozac_ic_new"
     app:iconTint="@color/photonWhite" />
diff --git a/app/src/main/res/layout/layout_add_credit_card.xml b/app/src/main/res/layout/layout_add_credit_card.xml
@@ -17,7 +17,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/credit_cards_saved_cards_item_margin_start"
-        app:srcCompat="@drawable/ic_new"
+        app:srcCompat="@drawable/mozac_ic_new"
         android:importantForAccessibility="no"
         app:layout_constraintBottom_toBottomOf="@id/add_credit_card_text"
         app:layout_constraintStart_toStartOf="parent"

diff --git a/app/src/main/res/layout/layout_add_login.xml b/app/src/main/res/layout/layout_add_login.xml
@@ -17,7 +17,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/credit_cards_saved_cards_item_margin_start"
-        app:srcCompat="@drawable/ic_new"
+        app:srcCompat="@drawable/mozac_ic_new"
         android:importantForAccessibility="no"
         app:layout_constraintBottom_toBottomOf="@id/add_login_text"
         app:layout_constraintStart_toStartOf="parent"

diff --git a/app/src/main/res/layout/preference_search_add_engine.xml b/app/src/main/res/layout/preference_search_add_engine.xml
@@ -22,7 +22,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_new" />
+        app:srcCompat="@drawable/mozac_ic_new" />
 
     <TextView
         android:id="@+id/add_engine_text"

diff --git a/app/src/main/res/menu/bookmarks_select_folder.xml b/app/src/main/res/menu/bookmarks_select_folder.xml
@@ -6,7 +6,7 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
             android:id="@+id/add_folder_button"
-            android:icon="@drawable/ic_new"
+            android:icon="@drawable/mozac_ic_new"
             app:iconTint="?primaryText"
             android:title="@string/bookmark_add_folder"
             app:showAsAction="ifRoom" />

diff --git a/app/src/test/java/org/mozilla/fenix/tabstray/FloatingActionButtonBindingTest.kt b/app/src/test/java/org/mozilla/fenix/tabstray/FloatingActionButtonBindingTest.kt
@@ -99,7 +99,7 @@ class FloatingActionButtonBindingTest {
         verify(exactly = 1) { actionButton.show() }
         verify(exactly = 0) { actionButton.extend() }
         verify(exactly = 0) { actionButton.hide() }
-        verify(exactly = 1) { actionButton.setIconResource(R.drawable.ic_new) }
+        verify(exactly = 1) { actionButton.setIconResource(R.drawable.mozac_ic_new) }
         verify(exactly = 1) { actionButton.contentDescription = any() }
 
         tabsTrayStore.dispatch(TabsTrayAction.PageSelected(Page.positionToPage(Page.PrivateTabs.ordinal)))
@@ -110,7 +110,7 @@ class FloatingActionButtonBindingTest {
         verify(exactly = 1) { actionButton.extend() }
         verify(exactly = 0) { actionButton.hide() }
         verify(exactly = 1) { actionButton.setText(R.string.tab_drawer_fab_content) }
-        verify(exactly = 2) { actionButton.setIconResource(R.drawable.ic_new) }
+        verify(exactly = 2) { actionButton.setIconResource(R.drawable.mozac_ic_new) }
         verify(exactly = 2) { actionButton.contentDescription = any() }
 
         tabsTrayStore.dispatch(TabsTrayAction.PageSelected(Page.positionToPage(Page.SyncedTabs.ordinal)))