blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #10091 Also disable play/pause button when hiding it.

master
mcarare 2020-04-23 15:35:38 +03:00 committed by Emily Kager
parent 9dd8314d14
commit cc67de29bf
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlAdapter.kt
View File

@ -6,7 +6,6 @@ package org.mozilla.fenix.home.sessioncontrol
import android.content.Context import android.content.Context
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import androidx.annotation.DrawableRes import androidx.annotation.DrawableRes
import androidx.annotation.LayoutRes import androidx.annotation.LayoutRes
@ -18,6 +17,7 @@ import kotlinx.android.synthetic.main.tab_list_row.*
import mozilla.components.feature.tab.collections.TabCollection import mozilla.components.feature.tab.collections.TabCollection
import mozilla.components.feature.top.sites.TopSite import mozilla.components.feature.top.sites.TopSite
import org.mozilla.fenix.components.tips.Tip import org.mozilla.fenix.components.tips.Tip
import org.mozilla.fenix.ext.removeAndDisable
import org.mozilla.fenix.home.OnboardingState import org.mozilla.fenix.home.OnboardingState
import org.mozilla.fenix.home.Tab import org.mozilla.fenix.home.Tab
import org.mozilla.fenix.home.sessioncontrol.viewholders.CollectionHeaderViewHolder import org.mozilla.fenix.home.sessioncontrol.viewholders.CollectionHeaderViewHolder
@ -255,7 +255,7 @@ class SessionControlAdapter(
(holder as TabViewHolder).updateTab(it.tab) (holder as TabViewHolder).updateTab(it.tab)
// Always set the visibility to GONE to avoid the play button sticking around from previous draws // Always set the visibility to GONE to avoid the play button sticking around from previous draws
holder.play_pause_button.visibility = View.GONE holder.play_pause_button.removeAndDisable()
if (it.shouldUpdateHostname) { holder.updateHostname(it.tab.hostname) } if (it.shouldUpdateHostname) { holder.updateHostname(it.tab.hostname) }
if (it.shouldUpdateTitle) { if (it.shouldUpdateTitle) {

8
app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TabViewHolder.kt
View File

@ -19,6 +19,8 @@ import org.mozilla.fenix.components.metrics.Event
import org.mozilla.fenix.ext.components import org.mozilla.fenix.ext.components
import org.mozilla.fenix.ext.increaseTapArea import org.mozilla.fenix.ext.increaseTapArea
import org.mozilla.fenix.ext.loadIntoView import org.mozilla.fenix.ext.loadIntoView
import org.mozilla.fenix.ext.removeAndDisable
import org.mozilla.fenix.ext.showAndEnable
import org.mozilla.fenix.home.Tab import org.mozilla.fenix.home.Tab
import org.mozilla.fenix.home.sessioncontrol.TabSessionInteractor import org.mozilla.fenix.home.sessioncontrol.TabSessionInteractor
@ -93,10 +95,10 @@ class TabViewHolder(
internal fun updatePlayPauseButton(mediaState: MediaState.State) { internal fun updatePlayPauseButton(mediaState: MediaState.State) {
with(play_pause_button) { with(play_pause_button) {
visibility = if (mediaState == MediaState.State.PLAYING || mediaState == MediaState.State.PAUSED) { if (mediaState == MediaState.State.PLAYING || mediaState == MediaState.State.PAUSED) {
View.VISIBLE this.showAndEnable()
} else { } else {
View.GONE this.removeAndDisable()
} }
if (mediaState == MediaState.State.PLAYING) { if (mediaState == MediaState.State.PLAYING) {