Archives/iceraven-browser
2
0
Fork 0
mirror of https://github.com/fork-maintainers/iceraven-browser synced 2024-11-17 15:26:23 +00:00
Code Issues Releases Wiki Activity

[fenix] For https://github.com/mozilla-mobile/fenix/issues/23121 - Replace @drawble/ic_delete with @drawable/mozac_ic_delete

Browse Source
This commit is contained in:
Gabriel Luong 2022-01-08 17:20:05 -05:00 committed by mergify[bot]
parent dfc62d921a
commit 17c7edb7ed
9 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SwipeToDeleteCallback.kt
View File

@ -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 {

2
app/src/main/java/org/mozilla/fenix/library/downloads/viewholders/DownloadsListItemViewHolder.kt
View File

@ -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()

2
app/src/main/java/org/mozilla/fenix/tabstray/browser/TabsTouchHelper.kt
View File

@ -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(

16
app/src/main/res/drawable/ic_delete.xml
View File

@ -1,16 +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:pathData="M20.25,6L16,6L16,4.5A2.5,2.5 0,0 0,13.5 2h-3A2.5,2.5 0,0 0,8 4.5L8,6L3.75,6a0.75,0.75 0,0 0,0 1.5L4,7.5v12A2.5,2.5 0,0 0,6.5 22h11a2.5,2.5 0,0 0,2.5 -2.5v-12h0.25a0.75,0.75 0,0 0,0 -1.5zM9.5,4.3l0.8,-0.8h3.4l0.8,0.8L14.5,6h-5L9.5,4.3zM18.5,19.7 L17.7,20.5L6.3,20.5l-0.8,-0.8L5.5,7.5h13v12.2z"
android:fillColor="?primaryText"/>
<path
android:pathData="M10.5,10.75v6.5a0.75,0.75 0,0 1,-1.5 0v-6.5a0.75,0.75 0,0 1,1.5 0zM15,10.75v6.5a0.75,0.75 0,0 1,-1.5 0v-6.5a0.75,0.75 0,0 1,1.5 0z"
android:fillColor="?primaryText"/>
</vector>

2
app/src/main/res/layout/inactive_header_item.xml
View File

@ -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>

2
app/src/main/res/menu/bookmarks_edit.xml
View File

@ -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"

2
app/src/main/res/menu/credit_card_editor.xml
View File

@ -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"

2
app/src/main/res/menu/history_menu.xml
View File

@ -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" />

2
app/src/main/res/menu/login_options_menu.xml
View File

@ -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"