+
Skip to content

Don't activate landscape player when in multiwindow mode #241

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 25, 2021
Merged

Don't activate landscape player when in multiwindow mode #241

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions app/src/main/java/me/vanpetegem/accentor/ui/player/PlayerOverlay.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package me.vanpetegem.accentor.ui.player

import android.app.Activity
import android.content.res.Configuration
import androidx.activity.compose.BackHandler
import androidx.compose.foundation.clickable
Expand Down Expand Up @@ -28,6 +29,7 @@ import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.layout.onSizeChanged
import androidx.compose.ui.platform.LocalConfiguration
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.unit.IntOffset
import androidx.compose.ui.unit.dp
import androidx.lifecycle.viewmodel.compose.viewModel
Expand All @@ -54,7 +56,8 @@ fun PlayerOverlay(
val showQueue by playerViewModel.showQueue.observeAsState()
val queueLength by mediaSessionConnection.queueLength.observeAsState()
val showPlayer = (queueLength ?: 0) > 0
val isLandscape = LocalConfiguration.current.orientation == Configuration.ORIENTATION_LANDSCAPE
val isLandscape = (LocalConfiguration.current.orientation == Configuration.ORIENTATION_LANDSCAPE)
val isMultiWindow = (LocalContext.current as Activity).isInMultiWindowMode()
LaunchedEffect(queueLength) {
if (queueLength == 0) {
scope.launch { swipeableState.snapTo(false) }
Expand Down Expand Up @@ -94,13 +97,13 @@ fun PlayerOverlay(
}
) {
if (swipeableState.currentValue) {
ToolBar(!isLandscape, closePlayer = closePlayer)
ToolBar(!(isLandscape && !isMultiWindow), closePlayer = closePlayer)
} else {
ControlBar()
}
}
Surface(Modifier.fillMaxSize()) {
if (isLandscape) {
if (isLandscape && !isMultiWindow) {
Row(modifier = Modifier.fillMaxSize()) {
Column(modifier = Modifier.fillMaxHeight().weight(0.4f)) {
Box(modifier = Modifier.weight(1f)) {
Expand Down
点击 这是indexloc提供的php浏览器服务，不要输入任何密码和下载