kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2024-12-14 22:30:30 +05:30
Code Issues Projects Releases Wiki Activity

Merge pull request #3432 from Isira-Seneviratne/Pip_support

Browse Source 
Disable picture-in-picture on Android Go devices.
This commit is contained in:
Bnyro 2023-03-28 17:09:07 +02:00 committed by GitHub
commit 446c9478e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/com/github/libretube/compat/PictureInPictureCompat.kt
View File

@ -1,9 +1,16 @@
package com.github.libretube.compat package com.github.libretube.compat
import android.app.Activity import android.app.Activity
import android.content.Context
import android.content.pm.PackageManager
import android.os.Build import android.os.Build
object PictureInPictureCompat { object PictureInPictureCompat {
fun isPictureInPictureAvailable(context: Context): Boolean {
return Build.VERSION.SDK_INT >= Build.VERSION_CODES.O &&
context.packageManager.hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE)
}
fun isInPictureInPictureMode(activity: Activity): Boolean { fun isInPictureInPictureMode(activity: Activity): Boolean {
return Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && activity.isInPictureInPictureMode return Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && activity.isInPictureInPictureMode
} }

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

@ -344,13 +344,12 @@ class PlayerFragment : Fragment(), OnlinePlayerOptions {
binding.playerMotionLayout.progress = 1.toFloat() binding.playerMotionLayout.progress = 1.toFloat()
binding.playerMotionLayout.transitionToStart() binding.playerMotionLayout.transitionToStart()
val activity = requireActivity()
if (PlayerHelper.pipEnabled) { if (PlayerHelper.pipEnabled) {
PictureInPictureCompat.setPictureInPictureParams(requireActivity(), pipParams) PictureInPictureCompat.setPictureInPictureParams(activity, pipParams)
}
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
binding.relPlayerPip.visibility = View.GONE
} }
binding.relPlayerPip.isVisible = PictureInPictureCompat
.isPictureInPictureAvailable(activity)
} }
// actions that don't depend on video information // actions that don't depend on video information

6
app/src/main/java/com/github/libretube/ui/preferences/PlayerSettings.kt
View File

@ -2,8 +2,6 @@ package com.github.libretube.ui.preferences
import android.content.ActivityNotFoundException import android.content.ActivityNotFoundException
import android.content.Intent import android.content.Intent
import android.os.Build
import android.os.Build.VERSION.SDK_INT
import android.os.Bundle import android.os.Bundle
import android.provider.Settings import android.provider.Settings
import android.widget.Toast import android.widget.Toast
@ -11,6 +9,7 @@ import androidx.preference.ListPreference
import androidx.preference.Preference import androidx.preference.Preference
import androidx.preference.SwitchPreferenceCompat import androidx.preference.SwitchPreferenceCompat
import com.github.libretube.R import com.github.libretube.R
import com.github.libretube.compat.PictureInPictureCompat
import com.github.libretube.constants.PreferenceKeys import com.github.libretube.constants.PreferenceKeys
import com.github.libretube.helpers.LocaleHelper import com.github.libretube.helpers.LocaleHelper
import com.github.libretube.helpers.PreferenceHelper import com.github.libretube.helpers.PreferenceHelper
@ -64,7 +63,8 @@ class PlayerSettings : BasePreferenceFragment() {
PreferenceKeys.PICTURE_IN_PICTURE PreferenceKeys.PICTURE_IN_PICTURE
)!! )!!
val pauseOnQuit = findPreference<SwitchPreferenceCompat>(PreferenceKeys.PAUSE_ON_QUIT) val pauseOnQuit = findPreference<SwitchPreferenceCompat>(PreferenceKeys.PAUSE_ON_QUIT)
pictureInPicture.isVisible = SDK_INT >= Build.VERSION_CODES.O pictureInPicture.isVisible = PictureInPictureCompat
.isPictureInPictureAvailable(requireContext())
pauseOnQuit?.isVisible = !pictureInPicture.isVisible || !pictureInPicture.isChecked pauseOnQuit?.isVisible = !pictureInPicture.isVisible || !pictureInPicture.isChecked
pictureInPicture.setOnPreferenceChangeListener { _, newValue -> pictureInPicture.setOnPreferenceChangeListener { _, newValue ->