From 5ee7398f64be39d3fb17028b92c1336869dd231d Mon Sep 17 00:00:00 2001 From: Christian Schabesberger Date: Mon, 22 Jul 2024 20:46:18 +0200 Subject: [PATCH] get foo working again --- .../java/net/newpipe/newplayer/model/VideoPlayerViewModel.kt | 4 +--- .../src/main/java/net/newpipe/newplayer/ui/VideoPlayerUI.kt | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/new-player/src/main/java/net/newpipe/newplayer/model/VideoPlayerViewModel.kt b/new-player/src/main/java/net/newpipe/newplayer/model/VideoPlayerViewModel.kt index 453c824..90c5665 100644 --- a/new-player/src/main/java/net/newpipe/newplayer/model/VideoPlayerViewModel.kt +++ b/new-player/src/main/java/net/newpipe/newplayer/model/VideoPlayerViewModel.kt @@ -58,7 +58,7 @@ data class VideoPlayerUIState( playing = false, fullscreen = false, uiVisible = false, - contentRatio = 0F, + contentRatio = 16 / 9F, uiRatio = 16F / 9F, contentFitMode = ContentFitMode.FIT_INSIDE ) @@ -137,7 +137,6 @@ class VideoPlayerViewModelImpl @Inject constructor( override fun onIsPlayingChanged(isPlaying: Boolean) { super.onIsPlayingChanged(isPlaying) Log.d(TAG, "Playing state changed. Is Playing: $isPlaying") - Log.d(TAG, "Gurken: ${VideoSize.fromMedia3VideoSize(player.videoSize)}") mutableUiState.update { it.copy(playing = isPlaying) } @@ -145,7 +144,6 @@ class VideoPlayerViewModelImpl @Inject constructor( override fun onVideoSizeChanged(videoSize: androidx.media3.common.VideoSize) { super.onVideoSizeChanged(videoSize) - println("gurken aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa") updateContentRatio(VideoSize.fromMedia3VideoSize(videoSize)) } }) 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 881eb21..bc6723f 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 @@ -56,7 +56,7 @@ fun VideoPlayerUI( ) { if (viewModel == null) { VideoPlayerLoadingPlaceholder() - } else if (viewModel.player == null || viewModel.uiState.collectAsState().value.contentRatio == 0.0F) { + } else if (viewModel.player == null) { VideoPlayerLoadingPlaceholder(viewModel.uiState.collectAsState().value.uiRatio) } else { val uiState by viewModel.uiState.collectAsState()