blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #9913, For #9914: Remove touch delegate when button is disabled.

master
mcarare 2020-04-27 16:33:22 +03:00 committed by Emily Kager
parent 21894a3cea
commit 1aa473b112
1 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/CollectionViewHolder.kt
View File

@ -19,6 +19,7 @@ import org.mozilla.fenix.R
import org.mozilla.fenix.ext.getIconColor import org.mozilla.fenix.ext.getIconColor
import org.mozilla.fenix.ext.increaseTapArea import org.mozilla.fenix.ext.increaseTapArea
import org.mozilla.fenix.ext.removeAndDisable import org.mozilla.fenix.ext.removeAndDisable
import org.mozilla.fenix.ext.removeTouchDelegate
import org.mozilla.fenix.ext.showAndEnable import org.mozilla.fenix.ext.showAndEnable
import org.mozilla.fenix.home.sessioncontrol.CollectionInteractor import org.mozilla.fenix.home.sessioncontrol.CollectionInteractor
import org.mozilla.fenix.theme.ThemeManager import org.mozilla.fenix.theme.ThemeManager
@ -45,20 +46,14 @@ class CollectionViewHolder(
} }
} }
collection_overflow_button.run { collection_overflow_button.setOnClickListener {
increaseTapArea(buttonIncreaseDps) collectionMenu.menuBuilder
setOnClickListener { .build(view.context)
collectionMenu.menuBuilder .show(anchor = it)
.build(view.context)
.show(anchor = it)
}
} }
collection_share_button.run { collection_share_button.setOnClickListener {
increaseTapArea(buttonIncreaseDps) interactor.onCollectionShareTabsClicked(collection)
setOnClickListener {
interactor.onCollectionShareTabsClicked(collection)
}
} }
view.clipToOutline = true view.clipToOutline = true
@ -80,11 +75,24 @@ class CollectionViewHolder(
view.isActivated = expanded view.isActivated = expanded
if (expanded) { if (expanded) {
view.collection_share_button.showAndEnable() view.collection_share_button.apply {
view.collection_overflow_button.showAndEnable() showAndEnable()
increaseTapArea(buttonIncreaseDps)
}
view.collection_overflow_button.apply {
showAndEnable()
increaseTapArea(buttonIncreaseDps)
}
} else { } else {
view.collection_share_button.removeAndDisable()
view.collection_overflow_button.removeAndDisable() view.collection_share_button.apply {
removeAndDisable()
removeTouchDelegate()
}
view.collection_overflow_button.apply {
removeAndDisable()
removeTouchDelegate()
}
} }
view.collection_icon.colorFilter = createBlendModeColorFilterCompat( view.collection_icon.colorFilter = createBlendModeColorFilterCompat(