mirrors/aniyomi
1
0
Fork 0
mirror of https://github.com/aniyomiorg/aniyomi.git synced 2024-11-25 14:19:27 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix auto Pip for non supported devices (#648)

Browse source 
* fix auto Pip for non supported devices

* clean up the code
This commit is contained in:
Quickdesh 2022-07-09 05:23:13 +09:00 committed by GitHub
parent 3fb99b290b
commit d63370487a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/src/main/java/eu/kanade/tachiyomi/ui/player/PlayerActivity.kt
View file

@ -101,6 +101,7 @@ class PlayerActivity :
private var isInPipMode: Boolean = false
private var isPipStarted: Boolean = false
internal var deviceSupportsPip: Boolean = false
internal var isDoubleTapSeeking: Boolean = false
@ -283,6 +284,8 @@ class PlayerActivity :
Utils.copyAssets(this)
super.onCreate(savedInstanceState)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) deviceSupportsPip = packageManager.hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE)
binding = PlayerActivityBinding.inflate(layoutInflater)
setContentView(binding.root)
this@PlayerActivity.requestedOrientation = preferences.defaultPlayerOrientationType()
@ -428,7 +431,7 @@ class PlayerActivity :
}
setupGestures()
setViewMode()
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) player.paused?.let { updatePictureInPictureActions(!it) }
if (deviceSupportsPip && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) player.paused?.let { updatePictureInPictureActions(!it) }
}
}
@ -1068,7 +1071,7 @@ class PlayerActivity :
}
private fun updatePlaybackStatus(paused: Boolean) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && isInPipMode) updatePictureInPictureActions(!paused)
if (deviceSupportsPip && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && isInPipMode) updatePictureInPictureActions(!paused)
val r = if (paused) R.drawable.ic_play_arrow_72dp else R.drawable.ic_pause_72dp
playerControls.binding.playBtn.setImageResource(r)
@ -1094,7 +1097,7 @@ class PlayerActivity :
}
override fun onBackPressed() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
if (deviceSupportsPip) {
if (player.paused == false && preferences.pipOnExit()) startPiP()
else {
finishAndRemoveTask()
@ -1121,8 +1124,7 @@ class PlayerActivity :
}
player.paused = true
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O &&
isInPipMode &&
if (deviceSupportsPip && isInPipMode &&
powerManager.isInteractive
) finishAndRemoveTask()
@ -1132,7 +1134,7 @@ class PlayerActivity :
override fun onResume() {
super.onResume()
setVisibilities()
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) player.paused?.let { updatePictureInPictureActions(!it) }
if (deviceSupportsPip && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) player.paused?.let { updatePictureInPictureActions(!it) }
}
@RequiresApi(Build.VERSION_CODES.O)
@ -1181,7 +1183,7 @@ class PlayerActivity :
@Suppress("DEPRECATION")
fun startPiP() {
if (isInPipMode) return
if (packageManager.hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE) && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
if (deviceSupportsPip && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
isPipStarted = true
playerControls.hideControls(true)
player.paused?.let { updatePictureInPictureActions(!it) }

5
app/src/main/java/eu/kanade/tachiyomi/ui/player/PlayerControlsView.kt
View file

@ -3,7 +3,6 @@ package eu.kanade.tachiyomi.ui.player
import android.annotation.SuppressLint
import android.content.Context
import android.content.ContextWrapper
import android.os.Build
import android.os.Handler
import android.os.Looper
import android.util.AttributeSet
@ -153,9 +152,7 @@ class PlayerControlsView @JvmOverloads constructor(context: Context, attrs: Attr
binding.pipBtn.setOnClickListener { activity.startPiP() }
binding.pipBtn.isVisible = !preferences.pipOnExit() &&
Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
binding.pipBtn.isVisible = !preferences.pipOnExit() && activity.deviceSupportsPip
binding.playbackPositionBtn.setOnClickListener {
preferences.invertedPlaybackTxt().set(!preferences.invertedPlaybackTxt().get())
if (activity.player.timePos != null) updatePlaybackPos(activity.player.timePos!!)