diff --git a/new-player/src/main/java/net/newpipe/newplayer/model/VideoPlayerUIState.kt b/new-player/src/main/java/net/newpipe/newplayer/model/VideoPlayerUIState.kt index 29ccc3b..fdf22b2 100644 --- a/new-player/src/main/java/net/newpipe/newplayer/model/VideoPlayerUIState.kt +++ b/new-player/src/main/java/net/newpipe/newplayer/model/VideoPlayerUIState.kt @@ -28,8 +28,7 @@ import net.newpipe.newplayer.ui.ContentScale data class VideoPlayerUIState( val playing: Boolean, var fullscreen: Boolean, - val uiVissible: Boolean, - var uiVisible: Boolean, + val uiVisible: Boolean, val contentRatio: Float, val embeddedUiRatio: Float, val contentFitMode: ContentScale, @@ -48,7 +47,6 @@ data class VideoPlayerUIState( val DEFAULT = VideoPlayerUIState( playing = false, fullscreen = false, - uiVissible = false, uiVisible = false, contentRatio = 16 / 9f, embeddedUiRatio = 16f / 9f, diff --git a/new-player/src/main/java/net/newpipe/newplayer/model/VideoPlayerViewModelImpl.kt b/new-player/src/main/java/net/newpipe/newplayer/model/VideoPlayerViewModelImpl.kt index 9afb258..e2b98b6 100644 --- a/new-player/src/main/java/net/newpipe/newplayer/model/VideoPlayerViewModelImpl.kt +++ b/new-player/src/main/java/net/newpipe/newplayer/model/VideoPlayerViewModelImpl.kt @@ -210,7 +210,7 @@ class VideoPlayerViewModelImpl @Inject constructor( override fun showUi() { mutableUiState.update { - it.copy(uiVissible = true) + it.copy(uiVisible = true) } resetHideUiDelayedJob() resetProgressUpdatePeriodicallyJob() @@ -255,7 +255,7 @@ class VideoPlayerViewModelImpl @Inject constructor( progressUpdaterJob?.cancel() uiVisibilityJob?.cancel() mutableUiState.update { - it.copy(uiVissible = false) + it.copy(uiVisible = false) } } @@ -336,7 +336,7 @@ class VideoPlayerViewModelImpl @Inject constructor( uiVisibilityJob?.cancel() finishFastSeek() mutableUiState.update { - it.copy(fullscreen = false, uiVissible = false) + it.copy(fullscreen = false, uiVisible = false) } } @@ -345,7 +345,7 @@ class VideoPlayerViewModelImpl @Inject constructor( uiVisibilityJob?.cancel() finishFastSeek() mutableUiState.update { - it.copy(fullscreen = true, uiVissible = false) + it.copy(fullscreen = true, uiVisible = false) } } diff --git a/new-player/src/main/java/net/newpipe/newplayer/ui/VideoPlayerControllerUI.kt b/new-player/src/main/java/net/newpipe/newplayer/ui/VideoPlayerControllerUI.kt index 44afe64..43808b7 100644 --- a/new-player/src/main/java/net/newpipe/newplayer/ui/VideoPlayerControllerUI.kt +++ b/new-player/src/main/java/net/newpipe/newplayer/ui/VideoPlayerControllerUI.kt @@ -33,7 +33,6 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.systemBars -import androidx.compose.foundation.layout.systemGestures import androidx.compose.foundation.layout.union import androidx.compose.foundation.layout.waterfall import androidx.compose.foundation.layout.width @@ -51,7 +50,6 @@ import androidx.compose.ui.unit.dp import net.newpipe.newplayer.model.VideoPlayerUIState import net.newpipe.newplayer.model.VideoPlayerViewModel import net.newpipe.newplayer.model.VideoPlayerViewModelDummy -import net.newpipe.newplayer.model.VideoPlayerViewModelImpl import net.newpipe.newplayer.ui.theme.VideoPlayerTheme import net.newpipe.newplayer.ui.videoplayer.BottomUI import net.newpipe.newplayer.ui.videoplayer.CenterUI @@ -83,7 +81,7 @@ fun VideoPlayerControllerUI( .union(WindowInsets.displayCutout) .union(WindowInsets.waterfall) - AnimatedVisibility(uiState.uiVissible) { + AnimatedVisibility(uiState.uiVisible) { Surface( modifier = Modifier.fillMaxSize(), color = Color(0x75000000) ) {} @@ -108,7 +106,8 @@ fun VideoPlayerControllerUI( } } - AnimatedVisibility(uiState.uiVissible) { + AnimatedVisibility(uiState.uiVisible) { + Box(modifier = Modifier.fillMaxSize()) { CenterUI( modifier = Modifier.align(Alignment.Center), diff --git a/new-player/src/main/java/net/newpipe/newplayer/ui/VideoPlayerUI.kt b/new-player/src/main/java/net/newpipe/newplayer/ui/VideoPlayerUI.kt index 32242de..a963edf 100644 --- a/new-player/src/main/java/net/newpipe/newplayer/ui/VideoPlayerUI.kt +++ b/new-player/src/main/java/net/newpipe/newplayer/ui/VideoPlayerUI.kt @@ -94,7 +94,7 @@ fun VideoPlayerUI( } // Setup immersive mode - if (uiState.fullscreen && !uiState.uiVissible) { + if (uiState.fullscreen && !uiState.uiVisible) { LaunchedEffect(key1 = true) { windowInsetsController.hide(WindowInsetsCompat.Type.systemBars()) } diff --git a/new-player/src/main/java/net/newpipe/newplayer/ui/theme/Color.kt b/new-player/src/main/java/net/newpipe/newplayer/ui/theme/Color.kt index d08c288..d97649d 100644 --- a/new-player/src/main/java/net/newpipe/newplayer/ui/theme/Color.kt +++ b/new-player/src/main/java/net/newpipe/newplayer/ui/theme/Color.kt @@ -79,7 +79,7 @@ fun VideoPlayerControllerUIPreviewEmbeddedColorPreview() { uiState = VideoPlayerUIState.DEFAULT.copy( playing = true, fullscreen = false, - uiVissible = true, + uiVisible = true, seekerPosition = 0.3f, isLoading = false, durationInMs = 9 * 60 * 1000, diff --git a/new-player/src/main/java/net/newpipe/newplayer/ui/videoplayer/gesture_ui/EmbeddedGestureUI.kt b/new-player/src/main/java/net/newpipe/newplayer/ui/videoplayer/gesture_ui/EmbeddedGestureUI.kt index 6172087..ac10731 100644 --- a/new-player/src/main/java/net/newpipe/newplayer/ui/videoplayer/gesture_ui/EmbeddedGestureUI.kt +++ b/new-player/src/main/java/net/newpipe/newplayer/ui/videoplayer/gesture_ui/EmbeddedGestureUI.kt @@ -54,7 +54,7 @@ fun EmbeddedGestureUI( } val defaultOnRegularTap = { - if (uiState.uiVissible) { + if (uiState.uiVisible) { viewModel.hideUi() } else { viewModel.showUi() diff --git a/new-player/src/main/java/net/newpipe/newplayer/ui/videoplayer/gesture_ui/FullscreenGestureUI.kt b/new-player/src/main/java/net/newpipe/newplayer/ui/videoplayer/gesture_ui/FullscreenGestureUI.kt index 42ee363..262a235 100644 --- a/new-player/src/main/java/net/newpipe/newplayer/ui/videoplayer/gesture_ui/FullscreenGestureUI.kt +++ b/new-player/src/main/java/net/newpipe/newplayer/ui/videoplayer/gesture_ui/FullscreenGestureUI.kt @@ -290,7 +290,7 @@ fun FullscreenGestureUIPreviewInteractive() { } }, uiState = VideoPlayerUIState.DEFAULT.copy( - uiVissible = uiVisible, + uiVisible = uiVisible, fastSeekSeconds = seekSeconds, soundVolume = soundVolume, brightness = brightnessValue