From ae38410106d7ed0eb65f3eda43ef45ecb7fecc73 Mon Sep 17 00:00:00 2001 From: Gabriel Luong Date: Sat, 8 Jan 2022 14:29:42 -0500 Subject: [PATCH] For #23121 - Replace @drawable/ic_new with @drawable/mozac_ic_new --- .../collections/CollectionCreationBottomBarView.kt | 2 +- .../fenix/collections/CollectionsListAdapter.kt | 2 +- .../fenix/components/toolbar/DefaultToolbarMenu.kt | 2 +- .../creditcards/CreditCardsSettingFragment.kt | 2 +- .../fenix/tabstray/FloatingActionButtonBinding.kt | 4 ++-- app/src/main/res/drawable/ic_new.xml | 13 ------------- ...ponent_collection_creation_select_collection.xml | 2 +- app/src/main/res/layout/component_tabstray_fab.xml | 2 +- app/src/main/res/layout/layout_add_credit_card.xml | 2 +- app/src/main/res/layout/layout_add_login.xml | 2 +- .../res/layout/preference_search_add_engine.xml | 2 +- app/src/main/res/menu/bookmarks_select_folder.xml | 2 +- .../tabstray/FloatingActionButtonBindingTest.kt | 4 ++-- 13 files changed, 14 insertions(+), 27 deletions(-) delete mode 100644 app/src/main/res/drawable/ic_new.xml diff --git a/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationBottomBarView.kt b/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationBottomBarView.kt index 33370f09e8..12a85fe723 100644 --- 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 index 71ede56dfa..68575e5882 100644 --- 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 index 6033b700fb..cd6474e7e0 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 @@ -197,7 +197,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 index b74cbcf50e..5d7016a38e 100644 --- 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 index 3d2b1796e3..3e49e87309 100644 --- 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 deleted file mode 100644 index ea1ea7ba16..0000000000 --- a/app/src/main/res/drawable/ic_new.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - 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 index 6e801ff825..dc3892abc5 100644 --- 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" /> diff --git a/app/src/main/res/layout/layout_add_credit_card.xml b/app/src/main/res/layout/layout_add_credit_card.xml index 4857fb1613..efb18ce2f3 100644 --- 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 index 23750d5c9f..970cd04317 100644 --- 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 index 32d33ab8b3..623ba2f81e 100644 --- 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" /> diff --git a/app/src/test/java/org/mozilla/fenix/tabstray/FloatingActionButtonBindingTest.kt b/app/src/test/java/org/mozilla/fenix/tabstray/FloatingActionButtonBindingTest.kt index ff742a5e58..d7a20f1f83 100644 --- 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)))