For mozilla-mobile#23121 - Replace @drawble/ic_delete with @drawable/…

…mozac_ic_delete
gabrielluong · Jan 20, 2022 · 0388535 · 0388535
1 parent d0ace12
commit 0388535
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 24 deletions.
diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SwipeToDeleteCallback.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SwipeToDeleteCallback.kt
@@ -44,7 +44,7 @@ class SwipeToDeleteCallback(
         isCurrentlyActive: Boolean
     ) {
         super.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive)
-        val icon = AppCompatResources.getDrawable(recyclerView.context, R.drawable.ic_delete)
+        val icon = AppCompatResources.getDrawable(recyclerView.context, R.drawable.mozac_ic_delete)
         icon?.setTint(recyclerView.context.getColorFromAttr(R.attr.destructive))
 
         val backgroundDrawable = when {

diff --git a/.../main/java/org/mozilla/fenix/library/downloads/viewholders/DownloadsListItemViewHolder.kt b/.../main/java/org/mozilla/fenix/library/downloads/viewholders/DownloadsListItemViewHolder.kt
@@ -48,7 +48,7 @@ class DownloadsListItemViewHolder(
 
         librarySiteItemBinding.favicon.setImageResource(item.getIcon())
 
-        librarySiteItemBinding.overflowMenu.setImageResource(R.drawable.ic_delete)
+        librarySiteItemBinding.overflowMenu.setImageResource(R.drawable.mozac_ic_delete)
 
         librarySiteItemBinding.overflowMenu.showAndEnable()
 

diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/browser/TabsTouchHelper.kt b/app/src/main/java/org/mozilla/fenix/tabstray/browser/TabsTouchHelper.kt
@@ -84,7 +84,7 @@ class TouchCallback(
         }
 
         val icon = recyclerView.context.getDrawableWithTint(
-            R.drawable.ic_delete,
+            R.drawable.mozac_ic_delete,
             recyclerView.context.getColorFromAttr(R.attr.destructive)
         )!!
         val background = AppCompatResources.getDrawable(

diff --git a/app/src/main/res/drawable/ic_delete.xml b/app/src/main/res/drawable/ic_delete.xml
diff --git a/app/src/main/res/layout/inactive_header_item.xml b/app/src/main/res/layout/inactive_header_item.xml
@@ -64,7 +64,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/ic_delete" />
+            app:srcCompat="@drawable/mozac_ic_delete" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </FrameLayout>
diff --git a/app/src/main/res/menu/bookmarks_edit.xml b/app/src/main/res/menu/bookmarks_edit.xml
@@ -6,7 +6,7 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/delete_bookmark_button"
-        android:icon="@drawable/ic_delete"
+        android:icon="@drawable/mozac_ic_delete"
         app:iconTint="?primaryText"
         android:title="@string/bookmark_menu_delete_button"
         android:contentDescription="@string/bookmark_menu_delete_button"

diff --git a/app/src/main/res/menu/credit_card_editor.xml b/app/src/main/res/menu/credit_card_editor.xml
@@ -6,7 +6,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/delete_credit_card_button"
-        android:icon="@drawable/ic_delete"
+        android:icon="@drawable/mozac_ic_delete"
         android:title="@string/credit_cards_menu_delete_card"
         android:visible="false"
         app:iconTint="?primaryText"

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

diff --git a/app/src/main/res/menu/login_options_menu.xml b/app/src/main/res/menu/login_options_menu.xml
@@ -25,7 +25,7 @@
     <item
         android:id="@+id/delete_login_button"
         android:contentDescription="@string/login_menu_delete_button"
-        android:icon="@drawable/ic_delete"
+        android:icon="@drawable/mozac_ic_delete"
         android:minWidth="82dp"
         android:padding="20dp"
         android:paddingStart="20dp"