From d9bec9ba367b6e319ff4262ccbd780a1102da6bb Mon Sep 17 00:00:00 2001 From: Gabriel Luong Date: Sat, 8 Jan 2022 17:34:04 -0500 Subject: [PATCH] [fenix] For https://github.com/mozilla-mobile/fenix/issues/23121 - Replace @drawble/ic_close with @drawable/mozac_ic_close --- .../collections/CollectionCreationBottomBarView.kt | 2 +- .../viewholders/ExceptionsListItemViewHolder.kt | 2 +- .../viewholders/TabInCollectionViewHolder.kt | 2 +- .../viewholders/HistoryListItemViewHolder.kt | 2 +- .../view/HistoryMetadataGroupItemViewHolder.kt | 2 +- .../recentlyclosed/RecentlyClosedItemViewHolder.kt | 2 +- app/src/main/res/drawable/ic_close.xml | 13 ------------- .../res/layout/activity_privacy_content_display.xml | 2 +- app/src/main/res/layout/button_tip_item.xml | 2 +- .../res/layout/component_collection_creation.xml | 2 +- ...omponent_collection_creation_name_collection.xml | 2 +- app/src/main/res/layout/component_tabstray2.xml | 2 +- app/src/main/res/layout/download_dialog_layout.xml | 2 +- app/src/main/res/layout/exception_item.xml | 2 +- .../main/res/layout/experiment_default_browser.xml | 4 ++-- .../main/res/layout/inactive_tabs_auto_close.xml | 2 +- app/src/main/res/layout/no_collections_message.xml | 2 +- .../res/layout/onboarding_inactive_tabs_cfr.xml | 2 +- .../main/res/layout/onboarding_jump_back_in_cfr.xml | 2 +- app/src/main/res/layout/share_close.xml | 2 +- .../res/layout/survey_inactive_tabs_disable.xml | 2 +- app/src/main/res/layout/tab_tray_grid_item.xml | 2 +- app/src/main/res/layout/tab_tray_item.xml | 2 +- app/src/main/res/menu/bookmarks_menu.xml | 2 +- app/src/main/res/menu/library_menu.xml | 2 +- 25 files changed, 25 insertions(+), 38 deletions(-) delete mode 100644 app/src/main/res/drawable/ic_close.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 12a85fe723..d114d6ff6b 100644 --- a/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationBottomBarView.kt +++ b/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationBottomBarView.kt @@ -39,7 +39,7 @@ class CollectionCreationBottomBarView( iconButton.apply { val drawable = context.getDrawableWithTint( - R.drawable.ic_close, + R.drawable.mozac_ic_close, ContextCompat.getColor(context, R.color.photonWhite) ) setImageDrawable(drawable) diff --git a/app/src/main/java/org/mozilla/fenix/exceptions/viewholders/ExceptionsListItemViewHolder.kt b/app/src/main/java/org/mozilla/fenix/exceptions/viewholders/ExceptionsListItemViewHolder.kt index d403703e1a..38907dc4a2 100644 --- a/app/src/main/java/org/mozilla/fenix/exceptions/viewholders/ExceptionsListItemViewHolder.kt +++ b/app/src/main/java/org/mozilla/fenix/exceptions/viewholders/ExceptionsListItemViewHolder.kt @@ -25,7 +25,7 @@ class ExceptionsListItemViewHolder( init { view.setSecondaryButton( - icon = R.drawable.ic_close, + icon = R.drawable.mozac_ic_close, contentDescription = R.string.history_delete_item ) { interactor.onDeleteOne(item) diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TabInCollectionViewHolder.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TabInCollectionViewHolder.kt index dd59e02f40..f51ac54fdb 100644 --- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TabInCollectionViewHolder.kt +++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TabInCollectionViewHolder.kt @@ -51,7 +51,7 @@ class TabInCollectionViewHolder( } view.setSecondaryButton( - icon = R.drawable.ic_close, + icon = R.drawable.mozac_ic_close, contentDescription = R.string.remove_tab_from_collection ) { interactor.onCollectionRemoveTab(collection, tab, wasSwiped = false) diff --git a/app/src/main/java/org/mozilla/fenix/library/history/viewholders/HistoryListItemViewHolder.kt b/app/src/main/java/org/mozilla/fenix/library/history/viewholders/HistoryListItemViewHolder.kt index 720c90d093..72062e2130 100644 --- a/app/src/main/java/org/mozilla/fenix/library/history/viewholders/HistoryListItemViewHolder.kt +++ b/app/src/main/java/org/mozilla/fenix/library/history/viewholders/HistoryListItemViewHolder.kt @@ -34,7 +34,7 @@ class HistoryListItemViewHolder( } binding.historyLayout.overflowView.apply { - setImageResource(R.drawable.ic_close) + setImageResource(R.drawable.mozac_ic_close) contentDescription = view.context.getString(R.string.history_delete_item) setOnClickListener { val item = item ?: return@setOnClickListener diff --git a/app/src/main/java/org/mozilla/fenix/library/historymetadata/view/HistoryMetadataGroupItemViewHolder.kt b/app/src/main/java/org/mozilla/fenix/library/historymetadata/view/HistoryMetadataGroupItemViewHolder.kt index e721a461bb..8e33919060 100644 --- a/app/src/main/java/org/mozilla/fenix/library/historymetadata/view/HistoryMetadataGroupItemViewHolder.kt +++ b/app/src/main/java/org/mozilla/fenix/library/historymetadata/view/HistoryMetadataGroupItemViewHolder.kt @@ -29,7 +29,7 @@ class HistoryMetadataGroupItemViewHolder( init { binding.historyLayout.overflowView.apply { - setImageResource(R.drawable.ic_close) + setImageResource(R.drawable.mozac_ic_close) contentDescription = view.context.getString(R.string.history_delete_item) setOnClickListener { val item = item ?: return@setOnClickListener diff --git a/app/src/main/java/org/mozilla/fenix/library/recentlyclosed/RecentlyClosedItemViewHolder.kt b/app/src/main/java/org/mozilla/fenix/library/recentlyclosed/RecentlyClosedItemViewHolder.kt index 4d6e20deac..eca152ea6e 100644 --- a/app/src/main/java/org/mozilla/fenix/library/recentlyclosed/RecentlyClosedItemViewHolder.kt +++ b/app/src/main/java/org/mozilla/fenix/library/recentlyclosed/RecentlyClosedItemViewHolder.kt @@ -25,7 +25,7 @@ class RecentlyClosedItemViewHolder( init { binding.historyLayout.overflowView.apply { - setImageResource(R.drawable.ic_close) + setImageResource(R.drawable.mozac_ic_close) contentDescription = view.context.getString(R.string.history_delete_item) setOnClickListener { val item = item ?: return@setOnClickListener diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml deleted file mode 100644 index 7b82c98466..0000000000 --- a/app/src/main/res/drawable/ic_close.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - diff --git a/app/src/main/res/layout/activity_privacy_content_display.xml b/app/src/main/res/layout/activity_privacy_content_display.xml index cee2f04991..8d1fcd069c 100644 --- a/app/src/main/res/layout/activity_privacy_content_display.xml +++ b/app/src/main/res/layout/activity_privacy_content_display.xml @@ -21,7 +21,7 @@ android:layout_marginLeft="10dp" android:background="@android:color/transparent" android:id="@+id/privacyContentCloseButton" - android:src="@drawable/ic_close" + android:src="@drawable/mozac_ic_close" android:contentDescription="@string/privacy_content_close_button_content_description" tools:ignore="AndroidSrcXmlDetector" /> diff --git a/app/src/main/res/layout/button_tip_item.xml b/app/src/main/res/layout/button_tip_item.xml index 5cd8d139a1..2199f1fe22 100644 --- a/app/src/main/res/layout/button_tip_item.xml +++ b/app/src/main/res/layout/button_tip_item.xml @@ -38,7 +38,7 @@ app:tint="@color/photonLightGrey05" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" - app:srcCompat="@drawable/ic_close" /> + app:srcCompat="@drawable/mozac_ic_close" /> + app:srcCompat="@drawable/mozac_ic_close" + tools:srcCompat="@drawable/mozac_ic_close" /> + app:srcCompat="@drawable/mozac_ic_close" /> + app:srcCompat="@drawable/mozac_ic_close" /> diff --git a/app/src/main/res/layout/onboarding_jump_back_in_cfr.xml b/app/src/main/res/layout/onboarding_jump_back_in_cfr.xml index 994dc2ca74..37d9cb62c9 100644 --- a/app/src/main/res/layout/onboarding_jump_back_in_cfr.xml +++ b/app/src/main/res/layout/onboarding_jump_back_in_cfr.xml @@ -44,7 +44,7 @@ android:contentDescription="@string/content_description_close_button" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" - app:srcCompat="@drawable/ic_close" + app:srcCompat="@drawable/mozac_ic_close" app:tint="@color/fx_mobile_private_text_color_primary" /> diff --git a/app/src/main/res/layout/share_close.xml b/app/src/main/res/layout/share_close.xml index 918f0c9f34..4ff87a7c79 100644 --- a/app/src/main/res/layout/share_close.xml +++ b/app/src/main/res/layout/share_close.xml @@ -24,7 +24,7 @@ app:iconTint="@color/neutral_text" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - app:srcCompat="@drawable/ic_close" /> + app:srcCompat="@drawable/mozac_ic_close" /> + app:srcCompat="@drawable/mozac_ic_close" />