prevent hiding ui through hide ui delay timer when dialog is visible

TeamNewPipe · Nov 1, 2024 · 9d68cad · 9d68cad
1 parent 9efa1dd
commit 9d68cad
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/new-player/src/main/java/net/newpipe/newplayer/ui/videoplayer/PlaySurface.kt b/new-player/src/main/java/net/newpipe/newplayer/ui/videoplayer/PlaySurface.kt
@@ -79,13 +79,15 @@ internal fun PlaySurface(
         ActualView(modifier.fillMaxSize(), player)
     else {
         val modifier = modifier.aspectRatio(contentRatio)
-        if (uiRatio <= contentRatio) {
-            ActualView(modifier.fillMaxWidth(), player)
-        } else {
-            ActualView(modifier.fillMaxHeight(), player)
+        if (fitMode == ContentScale.FIT_INSIDE) {
+            ActualView(modifier.fillMaxSize(), player)
+        } else { /* if(fitMode == ContentScale.CROP) */
+            if (uiRatio <= contentRatio) {
+                ActualView(modifier.fillMaxHeight(), player)
+            } else {
+                ActualView(modifier.fillMaxWidth(), player)
+            }
         }
-
-
     }
 
 }

diff --git a/new-player/src/main/java/net/newpipe/newplayer/uiModel/NewPlayerViewModelImpl.kt b/new-player/src/main/java/net/newpipe/newplayer/uiModel/NewPlayerViewModelImpl.kt
@@ -82,6 +82,8 @@ class NewPlayerViewModelImpl @Inject constructor(
 
     private var playbackPositionWhenFastSeekStarted = 0L
 
+    private var dialogIsVisible = false
+
     private val audioManager =
         getSystemService(application.applicationContext, AudioManager::class.java)!!
 
@@ -398,9 +400,12 @@ class NewPlayerViewModelImpl @Inject constructor(
 
     override fun resetHideDelayTimer() {
         hideUiDelayedJob?.cancel()
-        hideUiDelayedJob = viewModelScope.launch {
-            delay(2000)
-            changeUiMode(uiState.value.uiMode.getUiHiddenState(), null)
+        if(!dialogIsVisible) {
+            hideUiDelayedJob = viewModelScope.launch {
+                delay(2000)
+                if(!dialogIsVisible)
+                    changeUiMode(uiState.value.uiMode.getUiHiddenState(), null)
+            }
         }
     }
 
@@ -673,6 +678,7 @@ class NewPlayerViewModelImpl @Inject constructor(
     }
 
     override fun dialogVisible(visible: Boolean) {
+        dialogIsVisible = visible
         if (visible) {
             hideUiDelayedJob?.cancel()
             if (!uiState.value.uiMode.videoControllerUiVisible) {