Skip to content

StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.

Fix PiP compatibility for API 25

David Nashash0e2b88ea2602
diff --git a/app/src/main/java/com/streamvault/app/MainActivity.kt b/app/src/main/java/com/streamvault/app/MainActivity.kt
index 33666866..5ae9b1c2 100644
--- a/app/src/main/java/com/streamvault/app/MainActivity.kt
+++ b/app/src/main/java/com/streamvault/app/MainActivity.kt
@@ -2,7 +2,6 @@ package com.streamvault.app
import android.app.SearchManager
import android.content.Intent
-import android.app.PictureInPictureParams
import android.content.pm.PackageManager
import android.os.Bundle
import android.os.Build
@@ -265,31 +264,18 @@ class MainActivity : ComponentActivity() {
if (!state.enabled || (requirePlaying && !state.isPlaying)) {
return false
}
- val params = buildPlayerPictureInPictureParams(state)
return runCatching {
- setPictureInPictureParams(params)
- enterPictureInPictureMode(params)
+ PictureInPictureCompat.enter(this, state)
}.getOrDefault(false)
}
private fun applyPlayerPictureInPictureParams() {
if (!supportsPictureInPicture()) return
runCatching {
- setPictureInPictureParams(buildPlayerPictureInPictureParams(playerPictureInPictureState))
+ PictureInPictureCompat.apply(this, playerPictureInPictureState)
}
}
- private fun buildPlayerPictureInPictureParams(
- state: PlayerPictureInPictureState
- ): PictureInPictureParams {
- val builder = PictureInPictureParams.Builder()
- state.aspectRatio?.let { builder.setAspectRatio(it) }
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
- builder.setAutoEnterEnabled(state.enabled && state.isPlaying)
- }
- return builder.build()
- }
-
private fun videoAspectRatioOrNull(
videoWidth: Int,
videoHeight: Int,
@@ -309,6 +295,30 @@ class MainActivity : ComponentActivity() {
packageManager.hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE)
}
+ @androidx.annotation.RequiresApi(Build.VERSION_CODES.O)
+ private object PictureInPictureCompat {
+ fun enter(activity: MainActivity, state: PlayerPictureInPictureState): Boolean {
+ val params = build(state)
+ activity.setPictureInPictureParams(params)
+ return activity.enterPictureInPictureMode(params)
+ }
+
+ fun apply(activity: MainActivity, state: PlayerPictureInPictureState) {
+ activity.setPictureInPictureParams(build(state))
+ }
+
+ private fun build(
+ state: PlayerPictureInPictureState
+ ): android.app.PictureInPictureParams {
+ val builder = android.app.PictureInPictureParams.Builder()
+ state.aspectRatio?.let { builder.setAspectRatio(it) }
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+ builder.setAutoEnterEnabled(state.enabled && state.isPlaying)
+ }
+ return builder.build()
+ }
+ }
+
private fun handleExternalIntent(intent: Intent?) {
val request = intent?.toExternalNavigationRequest() ?: return
_externalNavigationRequestFlow.value = request