mirrors/grayjay
0
0
Fork 0
mirror of https://gitlab.futo.org/videostreaming/grayjay.git synced 2025-08-10 01:59:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

implement the quick PiP feature

Browse source 
https://developer.android.com/develop/ui/views/picture-in-picture#setautoenterenabled

Changelog: changed
This commit is contained in:
Kai 2025-05-29 12:38:37 -05:00
commit 4fa0229ccb
No known key found for this signature in database
2 changed files with 50 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

18
app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailFragment.kt
View file

@ -337,13 +337,6 @@ class VideoDetailFragment() : MainFragment() {
closeVideoDetails();
};
it.onMaximize.subscribe { maximizeVideoDetail(it) };
it.onPlayChanged.subscribe {
if(isInPictureInPicture) {
val params = _viewDetail?.getPictureInPictureParams();
if (params != null)
activity?.setPictureInPictureParams(params);
}
};
it.onEnterPictureInPicture.subscribe {
Logger.i(TAG, "onEnterPictureInPicture")
isInPictureInPicture = true;
@ -446,9 +439,14 @@ class VideoDetailFragment() : MainFragment() {
val viewDetail = _viewDetail;
Logger.i(TAG, "onUserLeaveHint preventPictureInPicture=${viewDetail?.preventPictureInPicture} isCasting=${StateCasting.instance.isCasting} isBackgroundPictureInPicture=${Settings.instance.playback.isBackgroundPictureInPicture()} allowBackground=${viewDetail?.allowBackground}");
if(viewDetail?.preventPictureInPicture == false && !StateCasting.instance.isCasting && Settings.instance.playback.isBackgroundPictureInPicture() && !viewDetail.allowBackground) {
_leavingPiP = false;
if (viewDetail === null) {
return
}
if (viewDetail.shouldEnterPictureInPicture) {
_leavingPiP = false
}
if(Build.VERSION.SDK_INT < Build.VERSION_CODES.S && viewDetail.preventPictureInPicture == false && !StateCasting.instance.isCasting && Settings.instance.playback.isBackgroundPictureInPicture() && !viewDetail.allowBackground) {
val params = _viewDetail?.getPictureInPictureParams();
if(params != null) {
Logger.i(TAG, "enterPictureInPictureMode")
@ -457,7 +455,7 @@ class VideoDetailFragment() : MainFragment() {
}
if (isFullscreen) {
viewDetail?.restoreBrightness()
viewDetail.restoreBrightness()
}
}

51
app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt
View file

@ -13,6 +13,7 @@ import android.graphics.drawable.BitmapDrawable
import android.graphics.drawable.Drawable
import android.graphics.drawable.Icon
import android.net.Uri
import android.os.Build
import android.support.v4.media.session.PlaybackStateCompat
import android.text.Spanned
import android.util.AttributeSet
@ -47,6 +48,7 @@ import com.futo.platformplayer.Settings
import com.futo.platformplayer.UIDialogs
import com.futo.platformplayer.UISlideOverlays
import com.futo.platformplayer.activities.MainActivity
import com.futo.platformplayer.activities.SyncShowPairingCodeActivity.Companion.activity
import com.futo.platformplayer.api.media.IPluginSourced
import com.futo.platformplayer.api.media.LiveChatManager
import com.futo.platformplayer.api.media.PlatformID
@ -240,7 +242,13 @@ class VideoDetailView : ConstraintLayout {
private val _buttonPins: RoundButtonGroup;
//private val _buttonMore: RoundButton;
var preventPictureInPicture: Boolean = false;
var preventPictureInPicture: Boolean = false
set(value) {
if (field != value) {
field = value
onShouldEnterPictureInPictureChanged.emit()
}
}
private val _addCommentView: AddCommentView;
private var _tabIndex: Int? = null;
@ -309,11 +317,24 @@ class VideoDetailView : ConstraintLayout {
val onClose = Event0();
val onFullscreenChanged = Event1<Boolean>();
val onEnterPictureInPicture = Event0();
val onPlayChanged = Event1<Boolean>();
val onVideoChanged = Event2<Int, Int>()
var allowBackground : Boolean = false
private set;
var allowBackground: Boolean = false
private set(value) {
if (field != value) {
field = value
onShouldEnterPictureInPictureChanged.emit()
}
}
val shouldEnterPictureInPicture: Boolean
get() = !preventPictureInPicture &&
!StateCasting.instance.isCasting &&
Settings.instance.playback.isBackgroundPictureInPicture() &&
!allowBackground &&
isPlaying
val onShouldEnterPictureInPictureChanged = Event0();
val onTouchCancel = Event0();
private var _lastPositionSaveTime: Long = -1;
@ -603,6 +624,11 @@ class VideoDetailView : ConstraintLayout {
}
};
onShouldEnterPictureInPictureChanged.subscribe {
val params = getPictureInPictureParams()
fragment.activity?.setPictureInPictureParams(params)
}
if (!isInEditMode) {
StateCasting.instance.onActiveDeviceConnectionStateChanged.subscribe(this) { _, connectionState ->
if (_onPauseCalled) {
@ -2332,7 +2358,7 @@ class VideoDetailView : ConstraintLayout {
}
isPlaying = playing;
onPlayChanged.emit(playing);
onShouldEnterPictureInPictureChanged.emit()
updateTracker(lastPositionMilliseconds, playing, true);
}
@ -2492,6 +2518,8 @@ class VideoDetailView : ConstraintLayout {
if (changed) {
stopAllGestures();
}
onShouldEnterPictureInPictureChanged.emit()
}
fun isLandscapeVideo(): Boolean? {
@ -2759,11 +2787,16 @@ class VideoDetailView : ConstraintLayout {
RemoteAction(Icon.createWithResource(context, R.drawable.ic_play_notif), context.getString(R.string.play), context.getString(R.string.resumes_the_video), MediaControlReceiver.getPlayIntent(context, 6));
val toBackgroundAction = RemoteAction(Icon.createWithResource(context, R.drawable.ic_screen_share), context.getString(R.string.background), context.getString(R.string.background_switch_audio), MediaControlReceiver.getToBackgroundIntent(context, 7));
return PictureInPictureParams.Builder()
.setAspectRatio(Rational(videoSourceWidth, videoSourceHeight))
.setSourceRectHint(r)
val params = PictureInPictureParams.Builder()
.setAspectRatio(Rational(videoSourceWidth, videoSourceHeight)).setSourceRectHint(r)
.setActions(listOf(toBackgroundAction, playpauseAction))
.build();
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
params.setAutoEnterEnabled(shouldEnterPictureInPicture)
}
return params.build()
}
//Other