Skip to content

Commit

Permalink
Fix rotate button cannot be clicked when slider is showing. #173
Browse files Browse the repository at this point in the history
  • Loading branch information
@oxyroid
oxyroid committed Jul 20, 2024
1 parent c1b8e9d commit 4daa580
Show file tree
Hide file tree
Showing 2 changed files with 71 additions and 83 deletions.
89 changes: 69 additions & 20 deletions feature/channel/src/main/java/com/m3u/feature/channel/ChannelMask.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package com.m3u.feature.channel
import android.content.pm.ActivityInfo
import android.view.KeyEvent
import androidx.activity.compose.BackHandler
import androidx.compose.animation.animateContentSize
import androidx.compose.animation.core.animateDpAsState
import androidx.compose.animation.core.animateFloatAsState
import androidx.compose.animation.core.animateIntAsState
Expand All @@ -15,8 +14,14 @@ import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.systemBarsIgnoringVisibility
import androidx.compose.foundation.layout.windowInsetsPadding
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.rounded.ArrowBack
Expand Down Expand Up @@ -73,6 +78,7 @@ import com.m3u.feature.channel.MaskCenterState.Play
import com.m3u.feature.channel.MaskCenterState.Replay
import com.m3u.feature.channel.components.MaskTextButton
import com.m3u.feature.channel.components.PlayerMask
import com.m3u.feature.channel.components.VerticalGestureArea
import com.m3u.i18n.R.string
import com.m3u.material.components.mask.MaskButton
import com.m3u.material.components.mask.MaskCircleButton
Expand Down Expand Up @@ -101,7 +107,6 @@ internal fun ChannelMask(
playerState: PlayerState,
volume: Float,
brightness: Float,
gesture: MaskGesture?,
maskState: MaskState,
favourite: Boolean,
isSeriesPlaylist: Boolean,
Expand All @@ -114,6 +119,7 @@ internal fun ChannelMask(
openOrClosePanel: () -> Unit,
onEnterPipMode: () -> Unit,
onVolume: (Float) -> Unit,
onBrightness: (Float) -> Unit,
modifier: Modifier = Modifier
) {
val preferences = hiltPreferences()
Expand All @@ -123,11 +129,13 @@ internal fun ChannelMask(
val leanback = leanback()
val coroutineScope = rememberCoroutineScope()

var gesture: MaskGesture? by remember { mutableStateOf(null) }

// because they will be updated frequently,
// they must be wrapped with rememberUpdatedState when using them.
val currentVolume by rememberUpdatedState(volume)
val currentBrightness by rememberUpdatedState(brightness)
val currentGesture by rememberUpdatedState(gesture)

val muted = currentVolume == 0f

val defaultBrightnessOrVolumeContentDescription = when {
Expand All @@ -137,7 +145,7 @@ internal fun ChannelMask(

val brightnessOrVolumeText by remember {
derivedStateOf {
when (currentGesture) {
when (gesture) {
MaskGesture.VOLUME -> "${(currentVolume.coerceIn(0f..1f) * 100).roundToInt()}%"
MaskGesture.BRIGHTNESS -> "${(currentBrightness.coerceIn(0f..1f) * 100).roundToInt()}%"
else -> null
Expand Down Expand Up @@ -226,7 +234,7 @@ internal fun ChannelMask(

MaskTextButton(
state = maskState,
icon = when (currentGesture) {
icon = when (gesture) {
MaskGesture.BRIGHTNESS -> when {
brightness < 0.5f -> Icons.Rounded.DarkMode
else -> Icons.Rounded.LightMode
Expand All @@ -239,7 +247,7 @@ internal fun ChannelMask(
}
},
text = brightnessOrVolumeText,
tint = when (currentGesture) {
tint = when (gesture) {
null -> if (muted) MaterialTheme.colorScheme.error else Color.Unspecified
MaskGesture.VOLUME -> if (muted) MaterialTheme.colorScheme.error else Color.Unspecified
MaskGesture.BRIGHTNESS -> Color.Unspecified
Expand Down Expand Up @@ -302,20 +310,61 @@ internal fun ChannelMask(
}
},
body = {
val maskCenterState = MaskCenterState.of(
playerState.playState,
playerState.isPlaying,
preferences.alwaysShowReplay,
isPanelExpanded,
playerState.playerError
)
MaskCenterButton(
maskCenterState = maskCenterState,
maskState = maskState,
onPlay = { playerState.player?.play() },
onPause = { playerState.player?.pause() },
onRetry = { coroutineScope.launch { helper.replay() } }
)
Box {
Row(
horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.CenterVertically,
modifier = Modifier
.fillMaxSize()
.windowInsetsPadding(WindowInsets.systemBarsIgnoringVisibility)
) {
VerticalGestureArea(
percent = currentBrightness,
onDragStart = {
maskState.lock(MaskGesture.BRIGHTNESS)
gesture = MaskGesture.BRIGHTNESS
},
onDragEnd = {
maskState.unlock(MaskGesture.BRIGHTNESS, 400.milliseconds)
gesture = null
},
onDrag = onBrightness,
modifier = Modifier
.fillMaxHeight()
.fillMaxWidth(0.18f)
)
VerticalGestureArea(
percent = currentVolume,
onDragStart = {
maskState.lock(MaskGesture.VOLUME)
gesture = MaskGesture.VOLUME
},
onDragEnd = {
maskState.unlock(MaskGesture.VOLUME, 400.milliseconds)
gesture = null
},
onDrag = onVolume,
modifier = Modifier
.fillMaxHeight()
.fillMaxWidth(0.18f)
)
}
val maskCenterState = MaskCenterState.of(
playerState.playState,
playerState.isPlaying,
preferences.alwaysShowReplay,
isPanelExpanded,
playerState.playerError
)
MaskCenterButton(
maskCenterState = maskCenterState,
maskState = maskState,
onPlay = { playerState.player?.play() },
onPause = { playerState.player?.pause() },
onRetry = { coroutineScope.launch { helper.replay() } },
modifier = Modifier.align(Alignment.Center)
)
}
},
footer = {
if (preferences.fullInfoPlayer && cover.isNotEmpty()) {
Expand Down
65 changes: 2 additions & 63 deletions feature/channel/src/main/java/com/m3u/feature/channel/ChannelScreen.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,15 @@ package com.m3u.feature.channel
import android.content.Intent
import android.graphics.Rect
import android.net.Uri
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.asPaddingValues
import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.systemBarsIgnoringVisibility
import androidx.compose.runtime.Composable
import androidx.compose.runtime.DisposableEffect
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableFloatStateOf
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberUpdatedState
import androidx.compose.runtime.setValue
import androidx.compose.runtime.snapshotFlow
import androidx.compose.ui.Alignment
Expand All @@ -30,21 +20,19 @@ import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalConfiguration
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.compose.LifecycleResumeEffect
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.paging.compose.collectAsLazyPagingItems
import com.m3u.core.architecture.preferences.hiltPreferences
import com.m3u.core.util.basic.isNotEmpty
import com.m3u.core.util.basic.title
import com.m3u.data.database.model.Playlist
import com.m3u.data.database.model.Channel
import com.m3u.data.database.model.Playlist
import com.m3u.feature.channel.components.CoverPlaceholder
import com.m3u.feature.channel.components.DlnaDevicesBottomSheet
import com.m3u.feature.channel.components.FormatsBottomSheet
import com.m3u.feature.channel.components.PlayerPanel
import com.m3u.feature.channel.components.VerticalGestureArea
import com.m3u.i18n.R.string
import com.m3u.material.components.Background
import com.m3u.material.components.PullPanelLayout
Expand All @@ -53,7 +41,6 @@ import com.m3u.material.components.mask.MaskInterceptor
import com.m3u.material.components.mask.MaskState
import com.m3u.material.components.mask.rememberMaskState
import com.m3u.material.components.rememberPullPanelLayoutState
import com.m3u.material.ktx.plus
import com.m3u.ui.Player
import com.m3u.ui.helper.LocalHelper
import com.m3u.ui.helper.OnPipModeChanged
Expand Down Expand Up @@ -294,12 +281,6 @@ private fun ChannelPlayer(
val favourite = channel?.favourite ?: false

val preferences = hiltPreferences()
var gesture: MaskGesture? by remember { mutableStateOf(null) }

// because they will be updated frequently,
// they must be wrapped with rememberUpdatedState when using them.
val currentVolume by rememberUpdatedState(volume)
val currentBrightness by rememberUpdatedState(brightness)

Background(
color = Color.Black,
Expand Down Expand Up @@ -332,7 +313,6 @@ private fun ChannelPlayer(
playerState = playerState,
volume = volume,
brightness = brightness,
gesture = gesture,
maskState = maskState,
favourite = favourite,
isSeriesPlaylist = isSeriesPlaylist,
Expand All @@ -344,51 +324,10 @@ private fun ChannelPlayer(
openChooseFormat = openChooseFormat,
openOrClosePanel = openOrClosePanel,
onVolume = onVolume,
onBrightness = onBrightness,
onEnterPipMode = onEnterPipMode,
)

Row(
horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.CenterVertically,
modifier = Modifier
.fillMaxSize()
.padding(
WindowInsets.systemBarsIgnoringVisibility.asPaddingValues()
+ PaddingValues(vertical = 56.dp)
)
) {
VerticalGestureArea(
percent = currentBrightness,
onDragStart = {
maskState.lock(MaskGesture.BRIGHTNESS)
gesture = MaskGesture.BRIGHTNESS
},
onDragEnd = {
maskState.unlock(MaskGesture.BRIGHTNESS, 400.milliseconds)
gesture = null
},
onDrag = onBrightness,
modifier = Modifier
.fillMaxHeight()
.fillMaxWidth(0.18f)
)
VerticalGestureArea(
percent = currentVolume,
onDragStart = {
maskState.lock(MaskGesture.VOLUME)
gesture = MaskGesture.VOLUME
},
onDragEnd = {
maskState.unlock(MaskGesture.VOLUME, 400.milliseconds)
gesture = null
},
onDrag = onVolume,
modifier = Modifier
.fillMaxHeight()
.fillMaxWidth(0.18f)
)
}

LaunchedEffect(playerState.playerError) {
if (playerState.playerError != null) {
maskState.wake()
Expand Down

0 comments on commit 4daa580

Please sign in to comment.