x/grayjay
1
0
Fork 0
mirror of https://gitlab.futo.org/videostreaming/grayjay.git synced 2026-05-16 04:52:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of gitlab.futo.org:videostreaming/grayjay

Browse Source
This commit is contained in:
Koen J
2025-12-03 18:19:26 +01:00
parent 042ced81ef b37f48380b
commit 3dcfe8c340
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/futo/platformplayer/activities/MainActivity.kt
+9 -1
View File
@@ -1302,7 +1302,15 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
finish(); finish();
} else { } else {
//UIDialogs.toast("Grayjay continues in background because of an open video.") //UIDialogs.toast("Grayjay continues in background because of an open video.")
moveTaskToBack(false); if(Settings.instance.playback.isBackgroundPictureInPicture()) {
try {
_fragVideoDetail._viewDetail?.startPictureInPicture();
_fragVideoDetail?.forcePictureInPicture();
} catch (ex: Throwable) {
} //Fail silently
}
else
moveTaskToBack(false);
/* /*
UIDialogs.showConfirmationDialog(this, "There is a video playing, are you sure you want to exit the app?", { UIDialogs.showConfirmationDialog(this, "There is a video playing, are you sure you want to exit the app?", {
finish(); finish();
app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailFragment.kt
+3 -2
View File
@@ -50,7 +50,7 @@ class VideoDetailFragment() : MainFragment() {
private var _isActive: Boolean = false; private var _isActive: Boolean = false;
private var _viewDetail : VideoDetailView? = null; var _viewDetail : VideoDetailView? = null;
private var _view : SingleViewTouchableMotionLayout? = null; private var _view : SingleViewTouchableMotionLayout? = null;
var isFullscreen : Boolean = false; var isFullscreen : Boolean = false;
@@ -450,7 +450,8 @@ class VideoDetailFragment() : MainFragment() {
if (viewDetail.shouldEnterPictureInPicture) { if (viewDetail.shouldEnterPictureInPicture) {
_leavingPiP = false _leavingPiP = false
} }
if(Build.VERSION.SDK_INT < Build.VERSION_CODES.S && viewDetail.preventPictureInPicture == false && !StateCasting.instance.isCasting && Settings.instance.playback.isBackgroundPictureInPicture() && !viewDetail.isAudioOnlyUserAction) { val shouldPiP = Settings.instance.playback.isBackgroundPictureInPicture()
if(Build.VERSION.SDK_INT < Build.VERSION_CODES.S && viewDetail.preventPictureInPicture == false && !StateCasting.instance.isCasting && shouldPiP && !viewDetail.isAudioOnlyUserAction) {
val params = _viewDetail?.getPictureInPictureParams(); val params = _viewDetail?.getPictureInPictureParams();
if(params != null) { if(params != null) {
Logger.i(TAG, "enterPictureInPictureMode") Logger.i(TAG, "enterPictureInPictureMode")