Merge pull request #7323 from Bnyro/master

feat: smoothen background player -> new video player and video player -> new background player transitions

app/src/main/java/com/github/libretube/helpers/NavigationHelper.kt

@@ -1,18 +1,14 @@
 package com.github.libretube.helpers
 
+import android.annotation.SuppressLint
 import android.app.NotificationManager
 import android.content.Context
 import android.content.Intent
-import android.os.Handler
-import android.os.Looper
 import android.os.Process
-import androidx.annotation.OptIn
 import androidx.core.content.getSystemService
 import androidx.core.os.bundleOf
-import androidx.core.os.postDelayed
 import androidx.fragment.app.commitNow
 import androidx.fragment.app.replace
-import androidx.media3.common.util.UnstableApi
 import com.github.libretube.NavDirections
 import com.github.libretube.R
 import com.github.libretube.constants.IntentData
@@ -29,8 +25,6 @@ import com.github.libretube.ui.views.SingleViewTouchableMotionLayout
 import com.github.libretube.util.PlayingQueue
 
 object NavigationHelper {
-    private val handler = Handler(Looper.getMainLooper())
-
     fun navigateChannel(context: Context, channelUrlOrId: String?) {
         if (channelUrlOrId == null) return
 
@@ -52,6 +46,7 @@ object NavigationHelper {
      * Navigate to the given video using the other provided parameters as well
      * If the audio only mode is enabled, play it in the background, else as a normal video
      */
+    @SuppressLint("UnsafeOptInUsageError")
     fun navigateVideo(
         context: Context,
         videoUrlOrId: String?,
@@ -60,22 +55,27 @@ object NavigationHelper {
         keepQueue: Boolean = false,
         timestamp: Long = 0,
         alreadyStarted: Boolean = false,
-        forceVideo: Boolean = false
+        forceVideo: Boolean = false,
+        audioOnlyPlayerRequested: Boolean = false,
     ) {
         if (videoUrlOrId == null) return
 
-        if (PreferenceHelper.getBoolean(PreferenceKeys.AUDIO_ONLY_MODE, false) && !forceVideo) {
+        // attempt to attach to the current media session first by using the corresponding
-            navigateAudio(context, videoUrlOrId.toID(), playlistId, channelId, keepQueue, timestamp)
+        // video/audio player instance
-            return
-        }
-
         val activity = ContextHelper.unwrapActivity<MainActivity>(context)
         val attachedToRunningPlayer = activity.runOnPlayerFragment {
             try {
                 this.playNextVideo(videoUrlOrId.toID())
+                PlayingQueue.clear()
+
+                if (audioOnlyPlayerRequested) {
+                    // switch to audio only player
+                    this.switchToAudioMode()
+                } else {
                     // maximize player
                     this.binding.playerMotionLayout.transitionToStart()
-                PlayingQueue.clear()
+                }
+
                 true
             } catch (e: Exception) {
                 this.onDestroy()
@@ -84,45 +84,46 @@ object NavigationHelper {
         }
         if (attachedToRunningPlayer) return
 
-        val playerData =
+        val attachedToRunningAudioPlayer = activity.runOnAudioPlayerFragment {
-            PlayerData(videoUrlOrId.toID(), playlistId, channelId, keepQueue, timestamp)
+            this.playNextVideo(videoUrlOrId.toID())
-        val bundle = bundleOf(
+            PlayingQueue.clear()
-            IntentData.playerData to playerData,
+
-            IntentData.alreadyStarted to alreadyStarted
+            if (!audioOnlyPlayerRequested) {
-        )
+                // switch to video only player
-        activity.supportFragmentManager.commitNow {
+                this.switchToVideoMode()
-            replace<PlayerFragment>(R.id.container, args = bundle)
+            } else {
-        }
+                // maximize player
+                this.binding.playerMotionLayout.transitionToStart()
             }
 
-    @OptIn(UnstableApi::class)
-    fun navigateAudio(
-        context: Context,
-        videoId: String,
-        playlistId: String? = null,
-        channelId: String? = null,
-        keepQueue: Boolean = false,
-        timestamp: Long = 0,
-        minimizeByDefault: Boolean = false
-    ) {
-        val activity = ContextHelper.unwrapActivity<MainActivity>(context)
-        val attachedToRunningPlayer = activity.runOnAudioPlayerFragment {
-            this.playNextVideo(videoId)
             true
         }
-        if (attachedToRunningPlayer) return
+        if (attachedToRunningAudioPlayer) return
 
+        val audioOnlyMode = PreferenceHelper.getBoolean(PreferenceKeys.AUDIO_ONLY_MODE, false)
+        if (audioOnlyPlayerRequested || (audioOnlyMode && !forceVideo)) {
+            // in contrast to the video player, the audio player doesn't start a media service on
+            // its own!
             BackgroundHelper.playOnBackground(
                 context,
-            videoId,
+                videoUrlOrId.toID(),
                 timestamp,
                 playlistId,
                 channelId,
                 keepQueue
             )
 
-        handler.postDelayed(500) {
+            openAudioPlayerFragment(context, minimizeByDefault = true)
-            openAudioPlayerFragment(context, minimizeByDefault = minimizeByDefault)
+        } else {
+            openVideoPlayerFragment(
+                context,
+                videoUrlOrId.toID(),
+                playlistId,
+                channelId,
+                keepQueue,
+                timestamp,
+                alreadyStarted
+            )
         }
     }
 
@@ -153,6 +154,31 @@ object NavigationHelper {
         }
     }
 
+    /**
+     * Starts the video player fragment for an already existing med
+     */
+    fun openVideoPlayerFragment(
+        context: Context,
+        videoId: String,
+        playlistId: String? = null,
+        channelId: String? = null,
+        keepQueue: Boolean = false,
+        timestamp: Long = 0,
+        alreadyStarted: Boolean = false
+    ) {
+        val activity = ContextHelper.unwrapActivity<BaseActivity>(context)
+
+        val playerData =
+            PlayerData(videoId, playlistId, channelId, keepQueue, timestamp)
+        val bundle = bundleOf(
+            IntentData.playerData to playerData,
+            IntentData.alreadyStarted to alreadyStarted
+        )
+        activity.supportFragmentManager.commitNow {
+            replace<PlayerFragment>(R.id.container, args = bundle)
+        }
+    }
+
     /**
      * Open a large, zoomable image preview
      */

app/src/main/java/com/github/libretube/ui/fragments/AudioPlayerFragment.kt

@@ -33,6 +33,7 @@ import com.github.libretube.enums.PlayerCommand
 import com.github.libretube.extensions.navigateVideo
 import com.github.libretube.extensions.normalize
 import com.github.libretube.extensions.seekBy
+import com.github.libretube.extensions.toID
 import com.github.libretube.extensions.togglePlayPauseState
 import com.github.libretube.extensions.updateIfChanged
 import com.github.libretube.helpers.AudioHelper
@@ -174,19 +175,7 @@ class AudioPlayerFragment : Fragment(R.layout.fragment_audio_player), AudioPlaye
         }
 
         binding.openVideo.setOnClickListener {
-            playerController?.sendCustomCommand(
+            switchToVideoMode()
-                AbstractPlayerService.runPlayerActionCommand,
-                bundleOf(PlayerCommand.TOGGLE_AUDIO_ONLY_MODE.name to false)
-            )
-
-            killFragment(false)
-
-            NavigationHelper.navigateVideo(
-                context = requireContext(),
-                videoUrlOrId = PlayingQueue.getCurrent()?.url,
-                alreadyStarted = true,
-                forceVideo = true
-            )
         }
 
         childFragmentManager.setFragmentResultListener(
@@ -271,6 +260,21 @@ class AudioPlayerFragment : Fragment(R.layout.fragment_audio_player), AudioPlaye
         }
     }
 
+    fun switchToVideoMode() {
+        playerController?.sendCustomCommand(
+            AbstractPlayerService.runPlayerActionCommand,
+            bundleOf(PlayerCommand.TOGGLE_AUDIO_ONLY_MODE.name to false)
+        )
+
+        killFragment(false)
+
+        NavigationHelper.openVideoPlayerFragment(
+            context = requireContext(),
+            videoId = PlayingQueue.getCurrent()?.url!!.toID(),
+            alreadyStarted = true,
+        )
+    }
+
     private fun killFragment(stopPlayer: Boolean) {
         viewModel.isMiniPlayerVisible.value = false
 

app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt

@@ -218,7 +218,7 @@ class PlayerFragment : Fragment(R.layout.fragment_player), OnlinePlayerOptions {
                 }
 
                 PlayerEvent.Background -> {
-                    playOnBackground()
+                    switchToAudioMode()
                     // wait some time in order for the service to get started properly
                     handler.postDelayed(500) {
                         pipActivity?.moveTaskToBack(false)
@@ -698,7 +698,7 @@ class PlayerFragment : Fragment(R.layout.fragment_player), OnlinePlayerOptions {
 
         binding.relPlayerBackground.setOnClickListener {
             // start the background mode
-            playOnBackground()
+            switchToAudioMode()
         }
 
         binding.relPlayerPip.isVisible =
@@ -777,7 +777,7 @@ class PlayerFragment : Fragment(R.layout.fragment_player), OnlinePlayerOptions {
         chaptersViewModel.maxSheetHeightPx = maxHeight
     }
 
-    private fun playOnBackground() {
+    fun switchToAudioMode() {
         playerController.sendCustomCommand(
             AbstractPlayerService.runPlayerActionCommand,
             bundleOf(PlayerCommand.TOGGLE_AUDIO_ONLY_MODE.name to true)

app/src/main/java/com/github/libretube/ui/sheets/VideoOptionsBottomSheet.kt

@@ -57,7 +57,7 @@ class VideoOptionsBottomSheet : BaseBottomSheet() {
             when (optionsList[which]) {
                 // Start the background mode
                 R.string.playOnBackground -> {
-                    NavigationHelper.navigateAudio(requireContext(), videoId, minimizeByDefault = true)
+                    NavigationHelper.navigateVideo(requireContext(), videoId, audioOnlyPlayerRequested = true)
                 }
                 // Add Video to Playlist Dialog
                 R.string.addToPlaylist -> {