For #225 - Address small nits, changes default color of ic_delete
parent
3a44d66fd7
commit
e3031378bc
|
@ -12,6 +12,7 @@ import androidx.recyclerview.widget.ItemTouchHelper
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import io.reactivex.Observer
|
import io.reactivex.Observer
|
||||||
import org.mozilla.fenix.R
|
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.TabInCollectionViewHolder
|
||||||
import org.mozilla.fenix.home.sessioncontrol.viewholders.TabViewHolder
|
import org.mozilla.fenix.home.sessioncontrol.viewholders.TabViewHolder
|
||||||
|
|
||||||
|
@ -47,6 +48,7 @@ class SwipeToDeleteCallback(
|
||||||
) {
|
) {
|
||||||
super.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive)
|
super.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive)
|
||||||
val icon = ContextCompat.getDrawable(recyclerView.context, R.drawable.ic_delete)
|
val icon = ContextCompat.getDrawable(recyclerView.context, R.drawable.ic_delete)
|
||||||
|
icon?.setTint(R.attr.destructive.getColorFromAttr(recyclerView.context))
|
||||||
|
|
||||||
val backgroundDrawable = when {
|
val backgroundDrawable = when {
|
||||||
viewHolder is TabInCollectionViewHolder && viewHolder.isLastTab -> {
|
viewHolder is TabInCollectionViewHolder && viewHolder.isLastTab -> {
|
||||||
|
|
|
@ -133,16 +133,16 @@ class DeleteBrowsingDataFragment : Fragment(), CoroutineScope {
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun deleteSelected() {
|
private fun deleteSelected() {
|
||||||
val openTabs = view!!.open_tabs_item!!.isChecked
|
val openTabsChecked = view!!.open_tabs_item!!.isChecked
|
||||||
val browsingData = view!!.browsing_data_item!!.isChecked
|
val browsingDataChecked = view!!.browsing_data_item!!.isChecked
|
||||||
val collections = view!!.collections_item!!.isChecked
|
val collectionsChecked = view!!.collections_item!!.isChecked
|
||||||
|
|
||||||
startDeletion()
|
startDeletion()
|
||||||
launch(Dispatchers.IO) {
|
launch(Dispatchers.IO) {
|
||||||
var jobs = mutableListOf<Deferred<Unit>>()
|
var jobs = mutableListOf<Deferred<Unit>>()
|
||||||
if (openTabs) jobs.add(deleteTabsAsync())
|
if (openTabsChecked) jobs.add(deleteTabsAsync())
|
||||||
if (browsingData) jobs.add(deleteBrowsingDataAsync())
|
if (browsingDataChecked) jobs.add(deleteBrowsingDataAsync())
|
||||||
if (collections) jobs.add(deleteCollectionsAsync())
|
if (collectionsChecked) jobs.add(deleteCollectionsAsync())
|
||||||
|
|
||||||
jobs.awaitAll()
|
jobs.awaitAll()
|
||||||
|
|
||||||
|
|
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue