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 index 7c220e79f..a97ea18e6 100644 --- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SwipeToDeleteCallback.kt +++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SwipeToDeleteCallback.kt @@ -12,6 +12,7 @@ import androidx.recyclerview.widget.ItemTouchHelper import androidx.recyclerview.widget.RecyclerView import io.reactivex.Observer import org.mozilla.fenix.R +import org.mozilla.fenix.ext.getColorFromAttr import org.mozilla.fenix.home.sessioncontrol.viewholders.TabInCollectionViewHolder import org.mozilla.fenix.home.sessioncontrol.viewholders.TabViewHolder @@ -47,6 +48,7 @@ class SwipeToDeleteCallback( ) { super.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive) val icon = ContextCompat.getDrawable(recyclerView.context, R.drawable.ic_delete) + icon?.setTint(R.attr.destructive.getColorFromAttr(recyclerView.context)) val backgroundDrawable = when { viewHolder is TabInCollectionViewHolder && viewHolder.isLastTab -> { diff --git a/app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataFragment.kt index 0212b886a..bdd922dde 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataFragment.kt @@ -133,16 +133,16 @@ class DeleteBrowsingDataFragment : Fragment(), CoroutineScope { } private fun deleteSelected() { - val openTabs = view!!.open_tabs_item!!.isChecked - val browsingData = view!!.browsing_data_item!!.isChecked - val collections = view!!.collections_item!!.isChecked + val openTabsChecked = view!!.open_tabs_item!!.isChecked + val browsingDataChecked = view!!.browsing_data_item!!.isChecked + val collectionsChecked = view!!.collections_item!!.isChecked startDeletion() launch(Dispatchers.IO) { var jobs = mutableListOf>() - if (openTabs) jobs.add(deleteTabsAsync()) - if (browsingData) jobs.add(deleteBrowsingDataAsync()) - if (collections) jobs.add(deleteCollectionsAsync()) + if (openTabsChecked) jobs.add(deleteTabsAsync()) + if (browsingDataChecked) jobs.add(deleteBrowsingDataAsync()) + if (collectionsChecked) jobs.add(deleteCollectionsAsync()) jobs.awaitAll() diff --git a/app/src/main/res/drawable/ic_delete.xml b/app/src/main/res/drawable/ic_delete.xml index bc8e0f720..0458e46cb 100644 --- a/app/src/main/res/drawable/ic_delete.xml +++ b/app/src/main/res/drawable/ic_delete.xml @@ -1,3 +1,7 @@ + + + android:fillColor="?primaryText" />