.gitignore

@@ -13,4 +13,3 @@
 .externalNativeBuild
 .cxx
 local.properties
-.kotlin

gradle/libs.versions.toml

@@ -46,7 +46,6 @@ coil = "2.7.0"
 reorderable = "2.4.0-alpha02"
 media3Session = "1.4.1"
 media3ExoplayerDash = "1.4.1"
-adaptiveAndroid = "1.0.0"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
@@ -84,7 +83,6 @@ coil-compose = { group = "io.coil-kt", name = "coil-compose", version.ref = "coi
 reorderable = { group = "sh.calvin.reorderable", name = "reorderable", version.ref = "reorderable" }
 androidx-media3-session = { group = "androidx.media3", name = "media3-session", version.ref = "media3Session" }
 androidx-media3-exoplayer-dash = { group = "androidx.media3", name = "media3-exoplayer-dash", version.ref = "media3ExoplayerDash" }
-androidx-adaptive-android = { group = "androidx.compose.material3.adaptive", name = "adaptive-android", version.ref = "adaptiveAndroid" }
 
 
 

new-player/build.gradle.kts

@@ -70,7 +70,6 @@ dependencies {
     implementation(libs.reorderable)
     implementation(libs.androidx.media3.session)
     implementation(libs.androidx.media3.exoplayer.dash)
-    implementation(libs.androidx.adaptive.android)
 
     ksp(libs.hilt.android.compiler)
     ksp(libs.androidx.hilt.compiler)

new-player/src/main/AndroidManifest.xml

@@ -4,8 +4,7 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
 
-    <application
+    <application>
-        android:resizeableActivity="true">
         <service
             android:name=".service.NewPlayerService"
             android:foregroundServiceType="mediaPlayback"

new-player/src/main/java/net/newpipe/newplayer/model/NewPlayerViewModel.kt

@@ -38,15 +38,16 @@ interface NewPlayerViewModel {
     var contentFitMode: ContentScale
     val embeddedPlayerDraggedDownBy: SharedFlow<Float>
     val onBackPressed: SharedFlow<Unit>
-    var deviceInPowerSaveMode: Boolean
 
     fun initUIState(instanceState: Bundle)
     fun play()
     fun pause()
     fun prevStream()
     fun nextStream()
-    fun changeUiMode(newUiModeState: UIModeState, embeddedUiConfig: EmbeddedUiConfig?)
+    fun changeUiMode(newUiModeState: UIModeState, embeddedUiConfig: EmbeddedUiConfig)
     fun onBackPressed()
+    fun showUi()
+    fun hideUi()
     fun seekPositionChanged(newValue: Float)
     fun seekingFinished()
     fun embeddedDraggedDown(offset: Float)

new-player/src/main/java/net/newpipe/newplayer/model/NewPlayerViewModelDummy.kt

@@ -18,7 +18,6 @@ open class NewPlayerViewModelDummy : NewPlayerViewModel {
     override var contentFitMode = ContentScale.FIT_INSIDE
     override val embeddedPlayerDraggedDownBy = MutableSharedFlow<Float>().asSharedFlow()
     override val onBackPressed: SharedFlow<Unit> = MutableSharedFlow<Unit>().asSharedFlow()
-    override var deviceInPowerSaveMode: Boolean = false
 
     override fun initUIState(instanceState: Bundle) {
         println("dummy impl")
@@ -32,6 +31,14 @@ open class NewPlayerViewModelDummy : NewPlayerViewModel {
         println("dummy impl")
     }
 
+    override fun showUi() {
+        println("dummy impl")
+    }
+
+    override fun hideUi() {
+        println("dummy impl")
+    }
+
     override fun seekPositionChanged(newValue: Float) {
         println("dymmy seekPositionChanged: newValue: ${newValue}")
     }
@@ -108,7 +115,7 @@ open class NewPlayerViewModelDummy : NewPlayerViewModel {
         println("dummy impl")
     }
 
-    override fun changeUiMode(newUiModeState: UIModeState, embeddedUiConfig: EmbeddedUiConfig?) {
+    override fun changeUiMode(newUiModeState: UIModeState, embeddedUiConfig: EmbeddedUiConfig) {
         println("dummy uiMode change: New UI Mode State: $newUiModeState")
     }
 }

new-player/src/main/java/net/newpipe/newplayer/model/NewPlayerViewModelImpl.kt

@@ -47,11 +47,9 @@ import kotlinx.coroutines.launch
 import net.newpipe.newplayer.utils.VideoSize
 import net.newpipe.newplayer.NewPlayer
 import net.newpipe.newplayer.NewPlayerException
-import net.newpipe.newplayer.PlayMode
 import net.newpipe.newplayer.RepeatMode
 import net.newpipe.newplayer.ui.ContentScale
 import java.util.LinkedList
-import kotlin.math.abs
 
 val VIDEOPLAYER_UI_STATE = "video_player_ui_state"
 
@@ -72,15 +70,13 @@ class NewPlayerViewModelImpl @Inject constructor(
     private var playlistItemToBeMoved: Int? = null
     private var playlistItemNewPosition: Int = 0
 
-    private var hideUiDelayedJob: Job? = null
+    private var uiVisibilityJob: Job? = null
     private var progressUpdaterJob: Job? = null
     private var playlistProgressUpdaterJob: Job? = null
 
     // this is necesary to restore the embedded view UI configuration when returning from fullscreen
     private var embeddedUiConfig: EmbeddedUiConfig? = null
 
-    private var playbackPositionWhenFastSeekStarted = 0L
-
     private val audioManager =
         getSystemService(application.applicationContext, AudioManager::class.java)!!
 
@@ -140,15 +136,6 @@ class NewPlayerViewModelImpl @Inject constructor(
     private var mutableOnBackPressed = MutableSharedFlow<Unit>()
     override val onBackPressed: SharedFlow<Unit> = mutableOnBackPressed.asSharedFlow()
 
-    override var deviceInPowerSaveMode: Boolean = false
-        get() = field
-        set(value) {
-            field = value
-            if (progressUpdaterJob?.isActive == true) {
-                startProgressUpdatePeriodicallyJob()
-            }
-        }
-
     private fun installNewPlayer() {
         newPlayer?.let { newPlayer ->
             viewModelScope.launch {
@@ -164,9 +151,9 @@ class NewPlayerViewModelImpl @Inject constructor(
                                 it.copy(playing = isPlaying, isLoading = false)
                             }
                             if (isPlaying && uiState.value.uiMode.videoControllerUiVisible) {
-                                startHideUiDelayedJob()
+                                resetHideUiDelayedJob()
                             } else {
-                                hideUiDelayedJob?.cancel()
+                                uiVisibilityJob?.cancel()
                             }
                         }
 
@@ -208,7 +195,12 @@ class NewPlayerViewModelImpl @Inject constructor(
                     val currentMode = mutableUiState.value.uiMode.toPlayMode()
 
                     if (currentMode != newMode) {
-                        changeUiMode(UIModeState.fromPlayMode(newMode), embeddedUiConfig)
+                        mutableUiState.update {
+                            it.copy(
+                                uiMode = UIModeState.fromPlayMode(newMode),
+                                embeddedUiConfig = embeddedUiConfig
+                            )
+                        }
                     }
                 }
             }
@@ -307,18 +299,18 @@ class NewPlayerViewModelImpl @Inject constructor(
     }
 
     override fun play() {
-        changeUiMode(uiState.value.uiMode.getUiHiddenState(), null)
+        hideUi()
         newPlayer?.play()
     }
 
     override fun pause() {
-        hideUiDelayedJob?.cancel()
+        uiVisibilityJob?.cancel()
         newPlayer?.pause()
 
     }
 
     override fun prevStream() {
-        startHideUiDelayedJob()
+        resetHideUiDelayedJob()
         newPlayer?.let { newPlayer ->
             if (0 <= newPlayer.currentlyPlayingPlaylistItem - 1) {
                 newPlayer.currentlyPlayingPlaylistItem -= 1
@@ -327,7 +319,7 @@ class NewPlayerViewModelImpl @Inject constructor(
     }
 
     override fun nextStream() {
-        startHideUiDelayedJob()
+        resetHideUiDelayedJob()
         newPlayer?.let { newPlayer ->
             if (newPlayer.currentlyPlayingPlaylistItem + 1 <
                 (newPlayer.exoPlayer.value?.mediaItemCount ?: 0)
@@ -337,72 +329,65 @@ class NewPlayerViewModelImpl @Inject constructor(
         }
     }
 
-    override fun changeUiMode(newUiModeState: UIModeState, embeddedUiConfig: EmbeddedUiConfig?) {
+    override fun changeUiMode(newUiModeState: UIModeState, embeddedUiConfig: EmbeddedUiConfig) {
-        if (newUiModeState == uiState.value.uiMode) {
+        if (!uiState.value.uiMode.fullscreen && newUiModeState.fullscreen) {
-            return;
-        }
-
-        if (!uiState.value.uiMode.fullscreen && newUiModeState.fullscreen && embeddedUiConfig != null) {
             this.embeddedUiConfig = embeddedUiConfig
         }
 
-        if (!(newUiModeState == UIModeState.EMBEDDED_VIDEO_CONTROLLER_UI ||
+        if(!(newUiModeState == UIModeState.EMBEDDED_VIDEO_CONTROLLER_UI ||
-                    newUiModeState == UIModeState.FULLSCREEN_VIDEO_CONTROLLER_UI)
+            newUiModeState == UIModeState.FULLSCREEN_VIDEO_CONTROLLER_UI)) {
-        ) {
+            uiVisibilityJob?.cancel()
-            hideUiDelayedJob?.cancel()
         } else {
-            startHideUiDelayedJob()
+            resetHideUiDelayedJob()
         }
 
         if (newUiModeState.isStreamSelect) {
-            startPlaylistProgressUpdaterJob()
+            resetPlaylistProgressUpdaterJob()
-        } else {
-            playlistProgressUpdaterJob?.cancel()
         }
 
-        if (newUiModeState.requiresProgressUpdate) {
+        if (newUiModeState.isChapterSelect) {
-            startProgressUpdatePeriodicallyJob()
+            resetPlaylistProgressUpdaterJob()
-        } else {
+        }
+
+        if ((uiState.value.uiMode.isStreamSelect || uiState.value.uiMode.isChapterSelect)
+            && (!newUiModeState.isStreamSelect && !newUiModeState.isChapterSelect)
+        ) {
+            playlistProgressUpdaterJob?.cancel()
             progressUpdaterJob?.cancel()
         }
 
-        if (uiState.value.uiMode.fullscreen && !newUiModeState.fullscreen) {
+        updateUiMode(newUiModeState)
-            mutableUiState.update {
-                it.copy(uiMode = newUiModeState, embeddedUiConfig = this.embeddedUiConfig)
-            }
-        } else {
-            mutableUiState.update {
-                it.copy(uiMode = newUiModeState)
-            }
-        }
-
-        val newPlayMode = newUiModeState.toPlayMode()
-        // take the next value from the player because changeUiMode is called when the playBackMode
-        // of the player changes. If this value was taken from the viewModel instead
-        // this would lead to an endless loop. of changeMode state calling it self over and over again
-        // through the callback of the newPlayer?.playBackMode change
-        val currentPlayMode = newPlayer?.playBackMode?.value ?: PlayMode.IDLE
-        if (newPlayMode != currentPlayMode) {
-            newPlayer?.playBackMode?.update {
-                newPlayMode
-            }
-        }
     }
 
-    private fun startHideUiDelayedJob() {
+    override fun showUi() {
-        hideUiDelayedJob?.cancel()
+        mutableUiState.update {
-        hideUiDelayedJob = viewModelScope.launch {
+            it.copy(uiMode = it.uiMode.getControllerUiVisibleState())
+        }
+        resetHideUiDelayedJob()
+        resetProgressUpdatePeriodicallyJob()
+    }
+
+    private fun resetHideUiDelayedJob() {
+        var ex:Exception? = null
+        try {
+            throw Exception()
+        } catch(e: Exception) {
+            ex = e
+        }
+        uiVisibilityJob?.cancel()
+        uiVisibilityJob = viewModelScope.launch {
             delay(2000)
-            changeUiMode(uiState.value.uiMode.getUiHiddenState(), null)
+            hideUi()
+            ex?.printStackTrace()
         }
     }
 
-    private fun startProgressUpdatePeriodicallyJob() {
+    private fun resetProgressUpdatePeriodicallyJob() {
         progressUpdaterJob?.cancel()
         progressUpdaterJob = viewModelScope.launch {
             while (true) {
                 updateProgressOnce()
-                delay(if (deviceInPowerSaveMode) 1000 else 1000 / 30/*fps*/)
+                delay(1000)
             }
         }
     }
@@ -423,7 +408,7 @@ class NewPlayerViewModelImpl @Inject constructor(
         }
     }
 
-    private fun startPlaylistProgressUpdaterJob() {
+    private fun resetPlaylistProgressUpdaterJob() {
         playlistProgressUpdaterJob?.cancel()
         playlistProgressUpdaterJob = viewModelScope.launch {
             while (true) {
@@ -450,24 +435,25 @@ class NewPlayerViewModelImpl @Inject constructor(
         }
     }
 
-    override fun seekPositionChanged(newValue: Float) {
+    override fun hideUi() {
-        hideUiDelayedJob?.cancel()
         progressUpdaterJob?.cancel()
+        uiVisibilityJob?.cancel()
+        mutableUiState.update {
+            it.copy(uiMode = it.uiMode.getUiHiddenState())
+        }
+    }
+
+    override fun seekPositionChanged(newValue: Float) {
+        uiVisibilityJob?.cancel()
+        mutableUiState.update { it.copy(seekerPosition = newValue) }
+    }
+
+    override fun seekingFinished() {
+        resetHideUiDelayedJob()
         val seekerPosition = mutableUiState.value.seekerPosition
         val seekPositionInMs = (newPlayer?.duration?.toFloat() ?: 0F) * seekerPosition
         newPlayer?.currentPosition = seekPositionInMs.toLong()
         Log.i(TAG, "Seek to Ms: $seekPositionInMs")
-        mutableUiState.update {
-            it.copy(
-                seekerPosition = newValue,
-                playbackPositionInMs = seekPositionInMs.toLong()
-            )
-        }
-    }
-
-    override fun seekingFinished() {
-        startHideUiDelayedJob()
-        startProgressUpdatePeriodicallyJob()
     }
 
     override fun embeddedDraggedDown(offset: Float) {
@@ -475,37 +461,30 @@ class NewPlayerViewModelImpl @Inject constructor(
     }
 
     override fun fastSeek(count: Int) {
-        if(abs(count) == 1) {
-            playbackPositionWhenFastSeekStarted = newPlayer?.currentPosition ?: 0
-        }
-
-        val fastSeekAmountInS = count * (newPlayer?.fastSeekAmountSec ?: 10)
         mutableUiState.update {
             it.copy(
-                fastSeekSeconds = fastSeekAmountInS
+                fastSeekSeconds = count * (newPlayer?.fastSeekAmountSec ?: 10)
             )
         }
 
-
-        if (fastSeekAmountInS != 0) {
-            Log.d(TAG, "fast seeking seeking by $fastSeekAmountInS seconds")
-
-            newPlayer?.currentPosition =
-                playbackPositionWhenFastSeekStarted + (fastSeekAmountInS * 1000)
-
-        }
-
         if (mutableUiState.value.uiMode.videoControllerUiVisible) {
-            startHideUiDelayedJob()
+            resetHideUiDelayedJob()
         }
     }
 
     override fun finishFastSeek() {
         if (mutableUiState.value.uiMode.videoControllerUiVisible) {
-            startHideUiDelayedJob()
+            resetHideUiDelayedJob()
         }
-        mutableUiState.update {
+
-            it.copy(fastSeekSeconds = 0)
+        val fastSeekAmount = mutableUiState.value.fastSeekSeconds
+        if (fastSeekAmount != 0) {
+            Log.d(TAG, "$fastSeekAmount")
+
+            newPlayer?.currentPosition = (newPlayer?.currentPosition ?: 0) + (fastSeekAmount * 1000)
+            mutableUiState.update {
+                it.copy(fastSeekSeconds = 0)
+            }
         }
     }
 
@@ -543,7 +522,7 @@ class NewPlayerViewModelImpl @Inject constructor(
     override fun onBackPressed() {
         val nextMode = uiState.value.uiMode.getNextModeWhenBackPressed()
         if (nextMode != null) {
-            changeUiMode(nextMode, null)
+            updateUiMode(nextMode)
         } else {
             safeTryEmit(mutableOnBackPressed, Unit)
         }
@@ -591,7 +570,7 @@ class NewPlayerViewModelImpl @Inject constructor(
                 playList = tempList
             )
         }
-        startPlaylistProgressUpdaterJob()
+        resetPlaylistProgressUpdaterJob()
     }
 
     override fun onStreamItemDragFinished() {
@@ -603,9 +582,9 @@ class NewPlayerViewModelImpl @Inject constructor(
 
     override fun dialogVisible(visible: Boolean) {
         if (visible) {
-            hideUiDelayedJob?.cancel()
+            uiVisibilityJob?.cancel()
         } else {
-            startHideUiDelayedJob()
+            resetHideUiDelayedJob()
         }
     }
 
@@ -613,6 +592,21 @@ class NewPlayerViewModelImpl @Inject constructor(
         newPlayer?.removePlaylistItem(uniqueId)
     }
 
+
+    private fun updateUiMode(newState: UIModeState) {
+        val newPlayMode = newState.toPlayMode()
+        val currentPlayMode = mutableUiState.value.uiMode.toPlayMode()
+        if (newPlayMode != currentPlayMode) {
+            newPlayer?.playBackMode?.update {
+                newPlayMode!!
+            }
+        } else {
+            mutableUiState.update {
+                it.copy(uiMode = newState)
+            }
+        }
+    }
+
     private fun getEmbeddedUiRatio() = newPlayer?.exoPlayer?.value?.let { player ->
         val videoRatio = VideoSize.fromMedia3VideoSize(player.videoSize).getRatio()
         return (if (videoRatio.isNaN()) currentContentRatio

new-player/src/main/java/net/newpipe/newplayer/model/UIModeState.kt

@@ -98,24 +98,6 @@ enum class UIModeState {
                 else -> false
             }
 
-    val requiresProgressUpdate: Boolean
-        get() =
-            when(this) {
-                PLACEHOLDER -> false
-                EMBEDDED_VIDEO -> false
-                EMBEDDED_VIDEO_CONTROLLER_UI -> true
-                EMBEDDED_VIDEO_CHAPTER_SELECT -> false
-                EMBEDDED_VIDEO_STREAM_SELECT -> false
-                FULLSCREEN_VIDEO -> false
-                FULLSCREEN_VIDEO_CONTROLLER_UI -> true
-                FULLSCREEN_VIDEO_CHAPTER_SELECT -> false
-                FULLSCREEN_VIDEO_STREAM_SELECT -> false
-                EMBEDDED_AUDIO -> true
-                FULLSCREEN_AUDIO -> true
-                AUDIO_CHAPTER_SELECT -> false
-                AUDIO_STREAM_SELECT -> false
-            }
-
     // STATE TRANSITIONS
 
     fun getControllerUiVisibleState() =

new-player/src/main/java/net/newpipe/newplayer/ui/NewPlayerUI.kt

@@ -22,7 +22,6 @@ package net.newpipe.newplayer.ui
 
 import android.app.Activity
 import android.content.pm.ActivityInfo
-import android.os.Build
 import android.util.Log
 import android.view.SurfaceView
 import androidx.activity.compose.BackHandler
@@ -31,7 +30,6 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.material3.adaptive.currentWindowSize
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
@@ -56,7 +54,6 @@ import net.newpipe.newplayer.ui.theme.VideoPlayerTheme
 import net.newpipe.newplayer.ui.videoplayer.VideoPlayerUi
 import net.newpipe.newplayer.utils.LockScreenOrientation
 import net.newpipe.newplayer.utils.getDefaultBrightness
-import net.newpipe.newplayer.utils.isInPowerSaveMode
 import net.newpipe.newplayer.utils.setScreenBrightness
 
 private const val TAG = "VideoPlayerUI"
@@ -115,13 +112,6 @@ fun NewPlayerUI(
             }
         }
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            val isInPowerSaveMode = isInPowerSaveMode()
-            LaunchedEffect(key1 = isInPowerSaveMode) {
-                viewModel.deviceInPowerSaveMode = isInPowerSaveMode
-            }
-        }
-
         if (uiState.uiMode.fitScreenRotation) {
             if (uiState.contentRatio < 1) {
                 LockScreenOrientation(orientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT)
@@ -152,13 +142,10 @@ fun NewPlayerUI(
         ) {
             VideoPlayerUi(viewModel = viewModel, uiState = uiState)
         } else if (uiState.uiMode == UIModeState.FULLSCREEN_AUDIO ||
-            uiState.uiMode == UIModeState.EMBEDDED_AUDIO ||
             uiState.uiMode == UIModeState.AUDIO_STREAM_SELECT ||
             uiState.uiMode == UIModeState.AUDIO_CHAPTER_SELECT
         ) {
-            val windowSize = currentWindowSize()
+            AudioPlayerUI(viewModel = viewModel, uiState = uiState)
-            AudioPlayerUI(viewModel = viewModel, uiState = uiState,
-                isLandScape = windowSize.height < windowSize.width)
         } else {
             LoadingPlaceholder(uiState.embeddedUiRatio)
         }

new-player/src/main/java/net/newpipe/newplayer/ui/audioplayer/AudioPlaybackController.kt

@@ -57,24 +57,19 @@ import net.newpipe.newplayer.ui.LoadingPlaceholder
 import net.newpipe.newplayer.ui.theme.VideoPlayerTheme
 
 @androidx.annotation.OptIn(UnstableApi::class)
+@OptIn(UnstableApi::class)
 @Composable
-fun AudioPlaybackController(
+fun AudioPlaybackController(viewModel: NewPlayerViewModel, uiState: NewPlayerUIState) {
-    modifier: Modifier = Modifier,
-    viewModel: NewPlayerViewModel,
-    uiState: NewPlayerUIState
-) {
     Row(
-        modifier = modifier.background(MaterialTheme.colorScheme.background),
+        modifier = Modifier.background(MaterialTheme.colorScheme.background),
         verticalAlignment = Alignment.CenterVertically
     ) {
         //ShuffleModeButton(viewModel = viewModel, uiState = uiState)
 
-        Box(
+        Box(modifier = Modifier
-            modifier = Modifier
+            .fillMaxWidth()
-                .fillMaxWidth()
+            .aspectRatio(1F)
-                .aspectRatio(1F)
+            .weight(1F), contentAlignment = Alignment.Center) {
-                .weight(1F), contentAlignment = Alignment.Center
-        ) {
             Button(
                 modifier = Modifier
                     .fillMaxWidth()
@@ -92,12 +87,10 @@ fun AudioPlaybackController(
             }
         }
 
-        Box(
+        Box(modifier = Modifier
-            modifier = Modifier
+            .fillMaxWidth()
-                .fillMaxWidth()
+            .aspectRatio(1F)
-                .aspectRatio(1F)
+            .weight(1F), contentAlignment = Alignment.Center) {
-                .weight(1F), contentAlignment = Alignment.Center
-        ) {
             Button(
                 modifier = Modifier
                     .fillMaxWidth()
@@ -121,14 +114,11 @@ fun AudioPlaybackController(
             onClick = if (uiState.playing) viewModel::pause else viewModel::play,
             shape = CircleShape
         ) {
-            if (uiState.isLoading) {
+            if(uiState.isLoading) {
                 Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
                     CircularProgressIndicator(
-                        modifier = Modifier
+                        modifier = Modifier.fillMaxSize().aspectRatio(1F),
-                            .fillMaxSize()
+                        color = MaterialTheme.colorScheme.onSurface)
-                            .aspectRatio(1F),
-                        color = MaterialTheme.colorScheme.onSurface
-                    )
                 }
 
             } else {
@@ -143,12 +133,10 @@ fun AudioPlaybackController(
             }
         }
 
-        Box(
+        Box(modifier = Modifier
-            modifier = Modifier
+            .fillMaxWidth()
-                .fillMaxWidth()
+            .aspectRatio(1F)
-                .aspectRatio(1F)
+            .weight(1F), contentAlignment = Alignment.Center) {
-                .weight(1F), contentAlignment = Alignment.Center
-        ) {
             Button(
                 modifier = Modifier
                     .fillMaxWidth()
@@ -167,12 +155,10 @@ fun AudioPlaybackController(
             }
         }
 
-        Box(
+        Box(modifier = Modifier
-            modifier = Modifier
+            .fillMaxWidth()
-                .fillMaxWidth()
+            .aspectRatio(1F)
-                .aspectRatio(1F)
+            .weight(1F), contentAlignment = Alignment.Center) {
-                .weight(1F), contentAlignment = Alignment.Center
-        ) {
             Button(
                 modifier = Modifier
                     .fillMaxWidth()

new-player/src/main/java/net/newpipe/newplayer/ui/audioplayer/AudioPlayerEmbeddedUI.kt

@@ -1,181 +0,0 @@
-/* NewPlayer
- *
- * @author Christian Schabesberger
- *
- * Copyright (C) NewPipe e.V. 2024 <code(at)newpipe-ev.de>
- *
- * NewPlayer is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPlayer is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPlayer.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package net.newpipe.newplayer.ui.audioplayer
-
-import android.app.Activity
-import androidx.annotation.OptIn
-import androidx.collection.emptyLongSet
-import androidx.compose.foundation.background
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.wrapContentSize
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.LinearProgressIndicator
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Surface
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import androidx.media3.common.util.UnstableApi
-import net.newpipe.newplayer.R
-import net.newpipe.newplayer.model.EmbeddedUiConfig
-import net.newpipe.newplayer.model.NewPlayerUIState
-import net.newpipe.newplayer.model.NewPlayerViewModel
-import net.newpipe.newplayer.model.NewPlayerViewModelDummy
-import net.newpipe.newplayer.model.UIModeState
-import net.newpipe.newplayer.ui.selection_ui.ITEM_CORNER_SHAPE
-import net.newpipe.newplayer.ui.theme.VideoPlayerTheme
-import net.newpipe.newplayer.ui.videoplayer.CONTROLLER_UI_BACKGROUND_COLOR
-import net.newpipe.newplayer.ui.videoplayer.PreviewBackgroundSurface
-import net.newpipe.newplayer.utils.Thumbnail
-import net.newpipe.newplayer.utils.getEmbeddedUiConfig
-import net.newpipe.newplayer.utils.getLocale
-import net.newpipe.newplayer.utils.getTimeStringFromMs
-
-@OptIn(androidx.media3.common.util.UnstableApi::class)
-@Composable
-fun AudioPlayerEmbeddedUI(viewModel: NewPlayerViewModel, uiState: NewPlayerUIState) {
-    val locale = getLocale()!!
-
-    val embeddedUIConfig = if (LocalContext.current is Activity)
-        getEmbeddedUiConfig(activity = LocalContext.current as Activity)
-    else
-        EmbeddedUiConfig.DUMMY
-
-    Box(modifier = Modifier.wrapContentSize()) {
-        Thumbnail(
-            modifier = Modifier.fillMaxWidth(),
-            thumbnail = uiState.currentlyPlaying?.mediaMetadata?.artworkUri,
-            contentDescription = stringResource(
-                id = R.string.stream_thumbnail
-            )
-        )
-        Row(
-            modifier = Modifier
-                .fillMaxWidth()
-                .align(Alignment.BottomStart)
-        ) {
-            Surface(
-                color = MaterialTheme.colorScheme.primary,
-                shape = RoundedCornerShape(20.dp),
-                modifier = Modifier
-                    .wrapContentSize()
-                    .padding(start = 10.dp, bottom = 14.dp)
-            ) {
-                Text(
-                    modifier = Modifier.padding(
-                        start = 4.dp,
-                        end = 4.dp,
-                        top = 0.5.dp,
-                        bottom = 0.5.dp
-                    ),
-                    text = getTimeStringFromMs(
-                        uiState.playbackPositionInMs,
-                        locale,
-                        leadingZerosForMinutes = false
-                    ),
-                    fontSize = 14.sp,
-                )
-            }
-
-            Box(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .weight(1f)
-            )
-
-            Surface(
-                color = CONTROLLER_UI_BACKGROUND_COLOR,
-                shape = RoundedCornerShape(20.dp),
-                modifier = Modifier
-                    .wrapContentSize()
-                    .padding(bottom = 14.dp, end = 10.dp)
-            ) {
-                Text(
-                    modifier = Modifier.padding(
-                        start = 4.dp,
-                        end = 4.dp,
-                        top = 0.5.dp,
-                        bottom = 0.5.dp
-                    ),
-                    color = MaterialTheme.colorScheme.onBackground,
-                    text = getTimeStringFromMs(
-                        uiState.durationInMs,
-                        locale,
-                        leadingZerosForMinutes = false
-                    ),
-                    fontSize = 14.sp,
-                )
-            }
-        }
-        LinearProgressIndicator(modifier = Modifier
-            .align(Alignment.BottomStart)
-            .fillMaxWidth(),
-            progress = {
-                val duration = if (uiState.durationInMs == 0L) {
-                    0.000000001f
-                } else {
-                    uiState.durationInMs.toFloat()
-                }
-
-                (uiState.playbackPositionInMs.toFloat() / duration)
-            })
-
-
-        Surface(
-            modifier = Modifier
-                .matchParentSize()
-                .clickable {
-                    viewModel.changeUiMode(
-                        UIModeState.FULLSCREEN_AUDIO,
-                        embeddedUiConfig = embeddedUIConfig
-                    )
-                }, color = Color.Transparent
-        ) {
-
-        }
-    }
-}
-
-@OptIn(UnstableApi::class)
-@Preview(device = "spec:width=1080px,height=1080px,dpi=440,orientation=landscape")
-@Composable
-fun AuidioPlayerEmbeddedPreview() {
-    VideoPlayerTheme {
-        PreviewBackgroundSurface {
-            AudioPlayerEmbeddedUI(
-                viewModel = NewPlayerViewModelDummy(),
-                uiState = NewPlayerUIState.DUMMY,
-            )
-        }
-    }
-}

new-player/src/main/java/net/newpipe/newplayer/ui/audioplayer/AudioPlayerUI.kt

@@ -21,36 +21,27 @@
 
 package net.newpipe.newplayer.ui.audioplayer
 
-import android.icu.text.CaseMap.Title
 import androidx.annotation.OptIn
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.core.tween
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.windowInsetsPadding
-import androidx.compose.foundation.layout.wrapContentSize
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.Card
 import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
-import androidx.compose.material3.adaptive.currentWindowAdaptiveInfo
-import androidx.compose.material3.adaptive.currentWindowSize
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
@@ -68,8 +59,6 @@ import net.newpipe.newplayer.ui.selection_ui.StreamSelectUI
 import net.newpipe.newplayer.ui.theme.VideoPlayerTheme
 import net.newpipe.newplayer.utils.Thumbnail
 import net.newpipe.newplayer.utils.getInsets
-import net.newpipe.newplayer.utils.getLocale
-import net.newpipe.newplayer.utils.getTimeStringFromMs
 
 
 private val UI_ENTER_ANIMATION = fadeIn(tween(200))
@@ -84,12 +73,11 @@ fun lightAudioControlButtonColorScheme() = ButtonDefaults.buttonColors().copy(
 
 @OptIn(UnstableApi::class)
 @Composable
-fun AudioPlayerUI(viewModel: NewPlayerViewModel, uiState: NewPlayerUIState, isLandScape: Boolean) {
+fun AudioPlayerUI(viewModel: NewPlayerViewModel, uiState: NewPlayerUIState) {
     val insets = getInsets()
-
     Box(
         modifier = Modifier
-            .wrapContentSize()
+            .fillMaxSize()
             .background(color = MaterialTheme.colorScheme.background)
     ) {
         AnimatedVisibility(
@@ -108,14 +96,6 @@ fun AudioPlayerUI(viewModel: NewPlayerViewModel, uiState: NewPlayerUIState, isLa
             StreamSelectUI(viewModel = viewModel, uiState = uiState, shownInAudioPlayer = true)
         }
 
-        AnimatedVisibility(
-            visible = uiState.uiMode == UIModeState.EMBEDDED_AUDIO,
-            enter = UI_ENTER_ANIMATION,
-            exit = UI_EXIT_ANIMATION
-        ) {
-            AudioPlayerEmbeddedUI(viewModel = viewModel, uiState = uiState)
-        }
-
         AnimatedVisibility(
             uiState.uiMode == UIModeState.FULLSCREEN_AUDIO,
             enter = UI_ENTER_ANIMATION,
@@ -127,254 +107,94 @@ fun AudioPlayerUI(viewModel: NewPlayerViewModel, uiState: NewPlayerUIState, isLa
                 topBar = {
 
                 }) { innerPadding ->
-                if (isLandScape) {
+                Box(
-                    LandscapeLayout(
+                    modifier = Modifier
-                        viewModel = viewModel,
+                        .fillMaxSize()
-                        uiState = uiState,
+                        .padding(innerPadding)
-                        innerPadding = innerPadding
+                ) {
-                    )
+                    Column(
-                } else {
+                        modifier = Modifier
-                    PortraitLayout(
+                            .fillMaxSize()
-                        viewModel = viewModel,
+                    ) {
-                        uiState = uiState,
+                        Column(
-                        innerPadding = innerPadding
+                            modifier = Modifier
-                    )
+                                .fillMaxSize()
+                                .padding(20.dp)
+                                .weight(1f),
+                            horizontalAlignment = Alignment.CenterHorizontally,
+                        ) {
+                            Box(
+                                modifier = Modifier
+                                    .fillMaxSize()
+                                    .weight(1f)
+                            )
+                            Box {
+                                Card(
+                                    elevation = CardDefaults.cardElevation(defaultElevation = 4.dp),
+                                ) {
+                                    Thumbnail(
+                                        modifier = Modifier.fillMaxWidth(),
+                                        thumbnail = uiState.currentlyPlaying?.mediaMetadata?.artworkUri,
+                                        contentDescription = stringResource(
+                                            id = R.string.stream_thumbnail
+                                        ),
+                                    )
+                                }
+                            }
+                            Box(
+                                modifier = Modifier
+                                    .fillMaxSize()
+                                    .weight(1f)
+                            )
+                            Text(
+                                text = uiState.currentlyPlaying?.mediaMetadata?.title.toString(),
+                                overflow = TextOverflow.Ellipsis,
+                                maxLines = 1,
+                                fontSize = 6.em
+                            )
+                            Text(
+                                text = uiState.currentlyPlaying?.mediaMetadata?.artist.toString(),
+                                overflow = TextOverflow.Ellipsis,
+                                maxLines = 1,
+                                fontSize = 4.em
+                            )
+
+                            Box(
+                                modifier = Modifier
+                                    .fillMaxSize()
+                                    .weight(0.2f)
+                            )
+                            NewPlayerSeeker(viewModel = viewModel, uiState = uiState)
+                            Box(
+                                modifier = Modifier
+                                    .fillMaxSize()
+                                    .weight(0.2f)
+                            )
+                            AudioPlaybackController(viewModel = viewModel, uiState = uiState)
+                            Box(
+                                modifier = Modifier
+                                    .fillMaxSize()
+                                    .weight(0.2f)
+                            )
+                        }
+                        AudioBottomUI(viewModel, uiState)
+                        Box(
+                            modifier = Modifier
+                                .fillMaxSize()
+                                .weight(0.025f)
+                        )
+                    }
                 }
             }
         }
     }
 }
 
-@OptIn(UnstableApi::class)
-@Composable
-private fun LandscapeLayout(
-    modifier: Modifier = Modifier,
-    viewModel: NewPlayerViewModel,
-    uiState: NewPlayerUIState,
-    innerPadding: PaddingValues
-) {
-    Row(modifier = modifier
-        .fillMaxSize()
-        .padding(20.dp)) {
-        Column(
-            modifier = Modifier
-                .fillMaxSize()
-                .weight(1f)
-        ) {
-            CoverArt(modifier = Modifier
-                .fillMaxSize()
-                .weight(0.9f), uiState = uiState)
-
-            TitleView(modifier = Modifier
-                .fillMaxSize()
-                .weight(0.1f), uiState = uiState)
-        }
-
-        Box(modifier = Modifier.width(20.dp))
-
-        Column(
-            modifier = Modifier
-                .fillMaxSize()
-                .weight(1f)
-        ) {
-            Column(
-                verticalArrangement = Arrangement.SpaceAround,
-                modifier = Modifier
-                    .fillMaxSize()
-                    .weight(1f)
-            ) {
-                ProgressUI(
-                    viewModel = viewModel,
-                    uiState = uiState
-                )
-                AudioPlaybackController(
-                    viewModel = viewModel,
-                    uiState = uiState
-                )
-            }
-            AudioBottomUI(viewModel, uiState)
-            Box(
-                modifier = Modifier
-                    .fillMaxSize()
-                    .weight(0.025f)
-            )
-        }
-    }
-}
-
-@OptIn(UnstableApi::class)
-@Composable
-private fun PortraitLayout(
-    modifier: Modifier = Modifier,
-    viewModel: NewPlayerViewModel,
-    uiState: NewPlayerUIState,
-    innerPadding: PaddingValues
-) {
-    Box(
-        modifier = modifier
-            .fillMaxSize()
-            .padding(innerPadding)
-    ) {
-        Column(
-            modifier = Modifier
-                .fillMaxSize()
-        ) {
-            Column(
-                modifier = Modifier
-                    .fillMaxSize()
-                    .padding(20.dp)
-                    .weight(1f),
-                horizontalAlignment = Alignment.CenterHorizontally,
-            ) {
-                Box(
-                    modifier = Modifier
-                        .fillMaxSize()
-                        .weight(1f)
-                )
-                CoverArt(uiState = uiState)
-                Box(
-                    modifier = Modifier
-                        .fillMaxSize()
-                        .weight(0.3f)
-                )
-
-                TitleView(uiState = uiState)
-
-                Box(
-                    modifier = Modifier
-                        .fillMaxSize()
-                        .weight(0.6f)
-                )
-
-                ProgressUI(viewModel = viewModel, uiState = uiState)
-
-                Box(
-                    modifier = Modifier
-                        .fillMaxSize()
-                        .weight(0.2f)
-                )
-                AudioPlaybackController(viewModel = viewModel, uiState = uiState)
-                Box(
-                    modifier = Modifier
-                        .fillMaxSize()
-                        .weight(0.2f)
-                )
-            }
-            AudioBottomUI(viewModel, uiState)
-            Box(
-                modifier = Modifier
-                    .fillMaxSize()
-                    .weight(0.025f)
-            )
-        }
-    }
-}
-
-@OptIn(UnstableApi::class)
-@Composable
-private fun ProgressUI(
-    modifier: Modifier = Modifier,
-    viewModel: NewPlayerViewModel,
-    uiState: NewPlayerUIState
-) {
-    val locale = getLocale()!!
-
-    Column(modifier = modifier) {
-        NewPlayerSeeker(viewModel = viewModel, uiState = uiState)
-        Row {
-            Text(
-                getTimeStringFromMs(
-                    uiState.playbackPositionInMs,
-                    getLocale() ?: locale
-                )
-            )
-            Box(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .weight(1f)
-            )
-            Text(
-                getTimeStringFromMs(
-                    uiState.durationInMs,
-                    getLocale() ?: locale
-                )
-            )
-        }
-    }
-}
-
-@OptIn(UnstableApi::class)
-@Composable
-private fun TitleView(modifier: Modifier = Modifier, uiState: NewPlayerUIState) {
-    Column(modifier = modifier) {
-        Text(
-            text = uiState.currentlyPlaying?.mediaMetadata?.title.toString(),
-            overflow = TextOverflow.Ellipsis,
-            maxLines = 1,
-            fontSize = 6.em
-        )
-        Text(
-            text = uiState.currentlyPlaying?.mediaMetadata?.artist.toString(),
-            overflow = TextOverflow.Ellipsis,
-            maxLines = 1,
-            fontSize = 4.em
-        )
-    }
-}
-
-@OptIn(UnstableApi::class)
-@Composable
-private fun CoverArt(modifier: Modifier = Modifier, uiState: NewPlayerUIState) {
-    Box {
-        Card(
-            elevation = CardDefaults.cardElevation(defaultElevation = 4.dp),
-        ) {
-            Thumbnail(
-                modifier = Modifier.fillMaxWidth(),
-                thumbnail = uiState.currentlyPlaying?.mediaMetadata?.artworkUri,
-                contentDescription = stringResource(
-                    id = R.string.stream_thumbnail
-                ),
-            )
-        }
-    }
-}
-
 @OptIn(UnstableApi::class)
 @Preview(device = "id:pixel_6", showSystemUi = true)
 @Composable
-fun AudioPlayerUIPortraitPreview() {
+fun AudioPlayerUIPreview() {
     VideoPlayerTheme {
-        AudioPlayerUI(
+        AudioPlayerUI(viewModel = NewPlayerViewModelDummy(), uiState = NewPlayerUIState.DUMMY)
-            viewModel = NewPlayerViewModelDummy(),
-            uiState = NewPlayerUIState.DUMMY.copy(uiMode = UIModeState.FULLSCREEN_AUDIO),
-            isLandScape = false
-        )
-    }
-}
-
-@OptIn(UnstableApi::class)
-@Preview(device = "spec:parent=pixel_6,orientation=landscape", showSystemUi = true)
-@Composable
-fun AudioPlayerUILandscapePreview() {
-    VideoPlayerTheme {
-        AudioPlayerUI(
-            viewModel = NewPlayerViewModelDummy(),
-            uiState = NewPlayerUIState.DUMMY.copy(uiMode = UIModeState.FULLSCREEN_AUDIO),
-            isLandScape = true
-        )
-    }
-}
-
-@OptIn(UnstableApi::class)
-@Preview(device = "spec:parent=pixel_6,orientation=portrait", showSystemUi = true)
-@Composable
-fun AudioPlayerUIEmbeddedPreview() {
-    VideoPlayerTheme {
-        AudioPlayerUI(
-            viewModel = NewPlayerViewModelDummy(),
-            uiState = NewPlayerUIState.DUMMY.copy(uiMode = UIModeState.EMBEDDED_AUDIO),
-            isLandScape = false
-        )
     }
 }

new-player/src/main/java/net/newpipe/newplayer/ui/theme/Color.kt

@@ -56,9 +56,7 @@ val video_player_onErrorContainer = Color(0xFFFFDAD6)
 // background color
 val video_player_background = Color(0xFF1F1B16)
 
-// Font color on background
 val video_player_onBackground = Color(0xFFEAE1D9)
-
 val video_player_surface = Color(0xFF000000)
 
 // The color of the Text and icons
@@ -106,13 +104,13 @@ fun VideoPlayerControllerUIPreviewEmbeddedColorPreview() {
 @OptIn(UnstableApi::class)
 @Preview(device = "id:pixel_6")
 @Composable
-fun AudioPlayerUIColorPreview() {
+fun AudioPlayerUIPreviewEmbeddedColorPreview() {
     VideoPlayerTheme {
         PreviewBackgroundSurface {
             AudioPlayerUI(
                 viewModel = NewPlayerViewModelDummy(),
                 uiState = NewPlayerUIState.DUMMY.copy(
-                    uiMode = UIModeState.FULLSCREEN_AUDIO,
+                    uiMode = UIModeState.EMBEDDED_VIDEO_CONTROLLER_UI,
                     playing = true,
                     seekerPosition = 0.3f,
                     isLoading = false,
@@ -121,7 +119,6 @@ fun AudioPlayerUIColorPreview() {
                     bufferedPercentage = 0.4f,
                     fastSeekSeconds = 10,
                 ),
-                isLandScape = false
             )
         }
     }

new-player/src/main/java/net/newpipe/newplayer/ui/videoplayer/controller/BottomUI.kt

@@ -23,9 +23,7 @@ package net.newpipe.newplayer.ui.videoplayer.controller
 import android.app.Activity
 import androidx.annotation.OptIn
 import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Fullscreen
 import androidx.compose.material.icons.filled.FullscreenExit
@@ -40,7 +38,6 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
 import androidx.media3.common.util.UnstableApi
 import net.newpipe.newplayer.R
 import net.newpipe.newplayer.model.EmbeddedUiConfig
@@ -70,13 +67,7 @@ fun BottomUI(
         val locale = getLocale()!!
         Text(getTimeStringFromMs(uiState.playbackPositionInMs, getLocale() ?: locale))
 
-        NewPlayerSeeker(
+        NewPlayerSeeker(modifier = Modifier.weight(1F), viewModel = viewModel, uiState = uiState)
-            modifier = Modifier
-                .weight(1F)
-                .padding(start = 4.dp, end = 4.dp),
-            viewModel = viewModel,
-            uiState = uiState
-        )
 
         Text(getTimeStringFromMs(uiState.durationInMs, getLocale() ?: locale))
 
@@ -121,7 +112,7 @@ fun VideoPlayerControllerBottomUIPreview() {
                 viewModel = NewPlayerViewModelDummy(),
                 uiState = NewPlayerUIState.DUMMY.copy(
                     uiMode = UIModeState.FULLSCREEN_VIDEO_CONTROLLER_UI,
-                    seekerPosition = 0.0f,
+                    seekerPosition = 0.2f,
                     playbackPositionInMs = 3 * 60 * 1000,
                     bufferedPercentage = 0.4f
                 ),

new-player/src/main/java/net/newpipe/newplayer/ui/videoplayer/gesture_ui/EmbeddedGestureUI.kt

@@ -87,9 +87,9 @@ fun EmbeddedGestureUI(
 
     val defaultOnRegularTap = {
         if (uiState.uiMode.videoControllerUiVisible) {
-            viewModel.changeUiMode(uiState.uiMode.getUiHiddenState(), null)
+            viewModel.hideUi()
         } else {
-            viewModel.changeUiMode(uiState.uiMode.getControllerUiVisibleState(), null)
+            viewModel.showUi()
         }
     }
 
@@ -124,7 +124,7 @@ fun EmbeddedGestureUI(
                 if (count == 1) {
                     if (uiState.playing) {
                         viewModel.pause()
-                        viewModel.changeUiMode(uiState.uiMode.getControllerUiVisibleState(), null)
+                        viewModel.showUi()
                     } else {
                         viewModel.play()
                     }

new-player/src/main/java/net/newpipe/newplayer/ui/videoplayer/gesture_ui/FullscreenGestureUI.kt

@@ -36,8 +36,6 @@ import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableFloatStateOf
-import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
@@ -48,7 +46,6 @@ import androidx.compose.ui.layout.onGloballyPositioned
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.media3.common.util.UnstableApi
-import net.newpipe.newplayer.model.EmbeddedUiConfig
 import net.newpipe.newplayer.model.UIModeState
 import net.newpipe.newplayer.model.NewPlayerUIState
 import net.newpipe.newplayer.model.NewPlayerViewModel
@@ -58,7 +55,7 @@ import net.newpipe.newplayer.utils.getDefaultBrightness
 import net.newpipe.newplayer.utils.getEmbeddedUiConfig
 
 private enum class IndicatorMode {
-    NONE, VOLUME_INDICATOR_VISIBLE, BRIGHTNESS_INDICATOR_VISIBLE
+    NONE, VOLUME_INDICATOR_VISSIBLE, BRIGHTNESS_INDICATOR_VISSIBLE
 }
 
 @OptIn(UnstableApi::class)
@@ -68,7 +65,7 @@ fun FullscreenGestureUI(
 ) {
 
     var heightPx by remember {
-        mutableFloatStateOf(0f)
+        mutableStateOf(0f)
     }
 
     var indicatorMode by remember {
@@ -77,9 +74,9 @@ fun FullscreenGestureUI(
 
     val defaultOnRegularTap = {
         if (uiState.uiMode.videoControllerUiVisible) {
-            viewModel.changeUiMode(uiState.uiMode.getUiHiddenState(), null)
+            viewModel.hideUi()
         } else {
-            viewModel.changeUiMode(uiState.uiMode.getControllerUiVisibleState(), null)
+            viewModel.showUi()
         }
     }
 
@@ -103,8 +100,8 @@ fun FullscreenGestureUI(
                     indicatorMode = IndicatorMode.NONE
                 },
                 onMovement = { change ->
-                    if (indicatorMode == IndicatorMode.NONE || indicatorMode == IndicatorMode.BRIGHTNESS_INDICATOR_VISIBLE) {
+                    if (indicatorMode == IndicatorMode.NONE || indicatorMode == IndicatorMode.BRIGHTNESS_INDICATOR_VISSIBLE) {
-                        indicatorMode = IndicatorMode.BRIGHTNESS_INDICATOR_VISIBLE
+                        indicatorMode = IndicatorMode.BRIGHTNESS_INDICATOR_VISSIBLE
 
                         if (heightPx != 0f) {
                             viewModel.brightnessChange(-change.y / heightPx, defaultBrightness)
@@ -134,7 +131,7 @@ fun FullscreenGestureUI(
                     if(count == 1)  {
                         if(uiState.playing) {
                             viewModel.pause()
-                            viewModel.changeUiMode(uiState.uiMode.getControllerUiVisibleState(), null)
+                            viewModel.showUi()
                         } else {
                             viewModel.play()
                         }
@@ -148,8 +145,8 @@ fun FullscreenGestureUI(
                     indicatorMode = IndicatorMode.NONE
                 },
                 onMovement = { change ->
-                    if (indicatorMode == IndicatorMode.NONE || indicatorMode == IndicatorMode.VOLUME_INDICATOR_VISIBLE) {
+                    if (indicatorMode == IndicatorMode.NONE || indicatorMode == IndicatorMode.VOLUME_INDICATOR_VISSIBLE) {
-                        indicatorMode = IndicatorMode.VOLUME_INDICATOR_VISIBLE
+                        indicatorMode = IndicatorMode.VOLUME_INDICATOR_VISSIBLE
                         if (heightPx != 0f) {
                             viewModel.volumeChange(-change.y / heightPx)
                         }
@@ -169,14 +166,14 @@ fun FullscreenGestureUI(
 
         IndicatorAnimation(
             modifier = Modifier.align(Alignment.Center),
-            visible = indicatorMode == IndicatorMode.VOLUME_INDICATOR_VISIBLE,
+            visible = indicatorMode == IndicatorMode.VOLUME_INDICATOR_VISSIBLE,
         ) {
             VolumeCircle(volumeFraction = uiState.soundVolume)
         }
 
         IndicatorAnimation(
             modifier = Modifier.align(Alignment.Center),
-            visible = indicatorMode == IndicatorMode.BRIGHTNESS_INDICATOR_VISIBLE,
+            visible = indicatorMode == IndicatorMode.BRIGHTNESS_INDICATOR_VISSIBLE,
         ) {
             VolumeCircle(
                 volumeFraction = uiState.brightness ?: defaultBrightness,
@@ -246,15 +243,15 @@ fun FullscreenGestureUIPreview() {
 fun FullscreenGestureUIPreviewInteractive() {
 
     var seekSeconds by remember {
-        mutableIntStateOf(0)
+        mutableStateOf(0)
     }
 
     var brightnessValue by remember {
-        mutableFloatStateOf(0f)
+        mutableStateOf(0f)
     }
 
     var soundVolume by remember {
-        mutableFloatStateOf(0f)
+        mutableStateOf(0f)
     }
 
     var uiVisible by remember {
@@ -267,12 +264,12 @@ fun FullscreenGestureUIPreviewInteractive() {
                 modifier = Modifier,
                 @OptIn(UnstableApi::class)
                 object : NewPlayerViewModelDummy() {
-                    override fun changeUiMode(
+                    override fun hideUi() {
-                        newUiModeState: UIModeState,
+                        uiVisible = false
-                        embeddedUiConfig: EmbeddedUiConfig?
+                    }
-                    ) {
+
-                        super.changeUiMode(newUiModeState, embeddedUiConfig)
+                    override fun showUi() {
-                        uiVisible = newUiModeState.videoControllerUiVisible
+                        uiVisible = true
                     }
 
                     override fun fastSeek(steps: Int) {
@@ -302,7 +299,7 @@ fun FullscreenGestureUIPreviewInteractive() {
         }
 
         AnimatedVisibility(uiVisible) {
-            Text("UI is Visible")
+            Text("UI is Vissible")
         }
     }
 }

new-player/src/main/java/net/newpipe/newplayer/utils/VideoSize.kt

@@ -1,24 +1,3 @@
-/* NewPlayer
- *
- * @author Christian Schabesberger
- *
- * Copyright (C) NewPipe e.V. 2024 <code(at)newpipe-ev.de>
- *
- * NewPlayer is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPlayer is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPlayer.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package net.newpipe.newplayer.utils
 
 data class VideoSize(

new-player/src/main/java/net/newpipe/newplayer/utils/utils.kt

@@ -24,23 +24,25 @@ import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Context
 import android.content.ContextWrapper
+import android.graphics.drawable.shapes.Shape
 import android.net.Uri
-import android.os.Build
-import android.os.PowerManager
 import android.view.WindowManager
 import androidx.annotation.OptIn
-import androidx.annotation.RequiresApi
+import androidx.compose.animation.core.withInfiniteAnimationFrameMillis
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.displayCutout
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.systemBars
 import androidx.compose.foundation.layout.union
 import androidx.compose.foundation.layout.waterfall
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.ReadOnlyComposable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalView
@@ -182,13 +184,6 @@ fun Thumbnail(
     }
 }
 
-@RequiresApi(Build.VERSION_CODES.LOLLIPOP)
-@Composable
-fun isInPowerSaveMode() =
-    (LocalContext.current.getSystemService(Context.POWER_SERVICE) as PowerManager)
-        .isPowerSaveMode
-
-
 @OptIn(UnstableApi::class)
 fun getPlaylistDurationInMS(playlist: List<MediaItem>) : Long {
     var duration = 0L

test-app/src/main/java/net/newpipe/newplayer/testapp/MainActivity.kt

@@ -26,7 +26,6 @@ import androidx.activity.enableEdgeToEdge
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.flow.update
 import net.newpipe.newplayer.ActivityBrainSlug
 import net.newpipe.newplayer.NewPlayer
 import net.newpipe.newplayer.PlayMode
@@ -54,54 +53,42 @@ class MainActivity : AppCompatActivity() {
         binding = ActivityMainBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
-        binding.buttons.start6502StreamButton.setOnClickListener {
+        binding.start6502StreamButton.setOnClickListener {
             newPlayer.playWhenReady = true
             newPlayer.playStream("6502", PlayMode.EMBEDDED_VIDEO)
         }
 
-        binding.buttons.startImuStreamButton.setOnClickListener {
+        binding.startImuStreamButton.setOnClickListener {
             newPlayer.playWhenReady = true
             newPlayer.playStream("imu", PlayMode.EMBEDDED_VIDEO)
         }
 
-        binding.buttons.startPortraitStreamButton.setOnClickListener {
+        binding.startPortraitStreamButton.setOnClickListener {
             newPlayer.playWhenReady = true
             newPlayer.playStream("portrait", PlayMode.EMBEDDED_VIDEO)
         }
 
-        binding.buttons.startYtTestVideoButton.setOnClickListener {
+        binding.startYtTestVideoButton.setOnClickListener {
             newPlayer.playWhenReady = true
             newPlayer.playStream("yt_test", PlayMode.EMBEDDED_VIDEO)
         }
 
-        binding.buttons.add6502StreamButton.setOnClickListener {
+        binding.add6502StreamButton.setOnClickListener {
             newPlayer.addToPlaylist("6502")
         }
 
-        binding.buttons.addImuStreamButton.setOnClickListener {
+        binding.addImuStreamButton.setOnClickListener {
             newPlayer.addToPlaylist("imu")
         }
 
-        binding.buttons.addPortraitStreamButton.setOnClickListener {
+        binding.addPortraitStreamButton.setOnClickListener {
             newPlayer.addToPlaylist("portrait")
         }
 
-        binding.buttons.addYtTestVideoButton.setOnClickListener {
+        binding.addYtTestVideoButton.setOnClickListener {
             newPlayer.addToPlaylist("yt_test")
         }
 
-        binding.buttons.listenModeButton.setOnClickListener {
-            newPlayer.playBackMode.update {
-                PlayMode.FULLSCREEN_AUDIO
-            }
-        }
-
-        binding.buttons.pipModeButton.setOnClickListener {
-            newPlayer.playBackMode.update {
-                PlayMode.PIP
-            }
-        }
-
         newPlayerViewModel.newPlayer = newPlayer
         newPlayerViewModel.contentFitMode = ContentScale.FIT_INSIDE
 

test-app/src/main/res/drawable/headphones.xml

@@ -1,5 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:viewportHeight="960" android:viewportWidth="960" android:width="24dp">
-      
-    <path android:fillColor="#e8eaed" android:pathData="M360,840L200,840q-33,0 -56.5,-23.5T120,760v-280q0,-75 28.5,-140.5t77,-114q48.5,-48.5 114,-77T480,120q75,0 140.5,28.5t114,77q48.5,48.5 77,114T840,480v280q0,33 -23.5,56.5T760,840L600,840v-320h160v-40q0,-117 -81.5,-198.5T480,200q-117,0 -198.5,81.5T200,480v40h160v320ZM280,600h-80v160h80v-160ZM680,600v160h80v-160h-80ZM280,600h-80,80ZM680,600h80,-80Z"/>
-    
-</vector>

test-app/src/main/res/drawable/pip.xml

@@ -1,5 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:viewportHeight="960" android:viewportWidth="960" android:width="24dp">
-      
-    <path android:fillColor="#e8eaed" android:pathData="M160,800q-33,0 -56.5,-23.5T80,720v-480q0,-33 23.5,-56.5T160,160h640q33,0 56.5,23.5T880,240v480q0,33 -23.5,56.5T800,800L160,800ZM160,720h640v-480L160,240v480ZM160,720v-480,480ZM440,520h320v-240L440,280v240ZM520,440v-80h160v80L520,440Z"/>
-    
-</vector>

test-app/src/main/res/layout-land/activity_main.xml

@@ -73,11 +73,73 @@
         app:layout_constraintStart_toEndOf="@id/embedded_player_layout"
         app:layout_constraintTop_toTopOf="parent">
 
-        <include
+        <LinearLayout
-            android:id="@+id/buttons"
+            android:layout_width="match_parent"
-            layout="@layout/buttons" />
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
 
 
+            <Button
+                android:id="@+id/start_6502_stream_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:text="Start 6502 Stream" />
+
+            <Button
+                android:id="@+id/start_imu_stream_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:text="Start IMU Stream" />
+
+            <Button
+                android:id="@+id/start_portrait_stream_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:text="Start Portrait Stream" />
+
+            <Button
+                android:id="@+id/start_yt_test_video_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:text="Start Yt Test Video" />
+
+            <Button
+                android:id="@+id/add_6502_stream_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:backgroundTint="@color/material_dynamic_primary50"
+                android:text="Append 6502 Stream" />
+
+            <Button
+                android:id="@+id/add_imu_stream_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:backgroundTint="@color/material_dynamic_primary50"
+                android:text="Append IMU Stream" />
+
+            <Button
+                android:id="@+id/add_portrait_stream_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:backgroundTint="@color/material_dynamic_primary50"
+                android:text="Append Portrait Stream" />
+
+            <Button
+                android:id="@+id/add_yt_test_video_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:backgroundTint="@color/material_dynamic_primary50"
+                android:text="Add Yt Test Video" />
+
+        </LinearLayout>
     </ScrollView>
 
 </androidx.constraintlayout.widget.ConstraintLayout>

test-app/src/main/res/layout/activity_main.xml

@@ -40,13 +40,14 @@
     <LinearLayout
         android:id="@+id/embedded_player_layout"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
         app:layout_constraintBottom_toTopOf="@+id/buttons_layout"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.0">
+        app:layout_constraintVertical_bias="0.0"
+        app:layout_constraintVertical_weight="1">
 
         <net.newpipe.newplayer.VideoPlayerView
             android:id="@+id/embedded_player"
@@ -71,9 +72,73 @@
         app:layout_constraintTop_toBottomOf="@id/embedded_player_layout"
         app:layout_constraintVertical_weight="1">
 
-        <include
+        <LinearLayout
-            android:id="@+id/buttons"
+            android:layout_width="match_parent"
-            layout="@layout/buttons"/>
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+
+            <Button
+                android:id="@+id/start_6502_stream_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:text="Start 6502 Stream" />
+
+            <Button
+                android:id="@+id/start_imu_stream_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:text="Start IMU Stream" />
+
+            <Button
+                android:id="@+id/start_portrait_stream_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:text="Start Portrait Stream" />
+
+            <Button
+                android:id="@+id/start_yt_test_video_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:text="Start Yt Test Video" />
+
+            <Button
+                android:id="@+id/add_6502_stream_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:backgroundTint="@color/material_dynamic_primary50"
+                android:text="Append 6502 Stream" />
+
+            <Button
+                android:id="@+id/add_imu_stream_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:backgroundTint="@color/material_dynamic_primary50"
+                android:text="Append IMU Stream" />
+
+            <Button
+                android:id="@+id/add_portrait_stream_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:backgroundTint="@color/material_dynamic_primary50"
+                android:text="Append Portrait Stream" />
+
+            <Button
+                android:id="@+id/add_yt_test_video_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:backgroundTint="@color/material_dynamic_primary50"
+                android:text="Add Yt Test Video" />
+
+        </LinearLayout>
 
     </ScrollView>
 

test-app/src/main/res/layout/buttons.xml

@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:orientation="horizontal">
-
-        <ImageButton
-            android:id="@+id/listen_mode_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@drawable/headphones"
-            android:contentDescription="Headphone mode" />
-
-        <ImageButton
-            android:id="@+id/pip_mode_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@drawable/pip"
-            android:contentDescription="Picture in Picture mode" />
-
-    </LinearLayout>
-
-    <Button
-        android:id="@+id/start_6502_stream_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:text="Start 6502 Stream" />
-
-    <Button
-        android:id="@+id/start_imu_stream_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:text="Start IMU Stream" />
-
-    <Button
-        android:id="@+id/start_portrait_stream_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:text="Start Portrait Stream" />
-
-    <Button
-        android:id="@+id/start_yt_test_video_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:text="Start Yt Test Video" />
-
-    <Button
-        android:id="@+id/add_6502_stream_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:backgroundTint="@color/material_dynamic_primary50"
-        android:text="Append 6502 Stream" />
-
-    <Button
-        android:id="@+id/add_imu_stream_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:backgroundTint="@color/material_dynamic_primary50"
-        android:text="Append IMU Stream" />
-
-    <Button
-        android:id="@+id/add_portrait_stream_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:backgroundTint="@color/material_dynamic_primary50"
-        android:text="Append Portrait Stream" />
-
-    <Button
-        android:id="@+id/add_yt_test_video_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:backgroundTint="@color/material_dynamic_primary50"
-        android:text="Add Yt Test Video" />
-
-</LinearLayout>

test-app/src/main/res/values/test_streams.xml

@@ -33,6 +33,7 @@
         <item>1200000</item>
         <item>1800000</item>
         <item>2400000</item>
+        <item>3600000</item>
     </integer-array>
     <integer name="ccc_6502_length">3116</integer>