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

fix merge

Browse Source 
Changelog: changed
This commit is contained in:
Kai
2025-08-18 11:21:25 -04:00
parent 493d77b43b
commit 11d4ec383e
3 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailFragment.kt
+1 -7
View File
@@ -301,7 +301,6 @@ class VideoDetailFragment() : MainFragment() {
} }
fun closeVideoDetails() { fun closeVideoDetails() {
Logger.i(TAG, "closeVideoDetails()") Logger.i(TAG, "closeVideoDetails()")
_viewDetail?.onPlayChanged?.emit(false)
state = State.CLOSED; state = State.CLOSED;
_viewDetail?.onStop(); _viewDetail?.onStop();
close(); close();
@@ -326,11 +325,6 @@ class VideoDetailFragment() : MainFragment() {
closeVideoDetails(); closeVideoDetails();
}; };
viewDetail.onMaximize.subscribe { maximizeVideoDetail(it) }; viewDetail.onMaximize.subscribe { maximizeVideoDetail(it) };
viewDetail.onPlayChanged.subscribe {
val params = _viewDetail?.getPictureInPictureParams(it)
if (params != null)
activity?.setPictureInPictureParams(params)
}
viewDetail.onEnterPictureInPicture.subscribe { viewDetail.onEnterPictureInPicture.subscribe {
Logger.i(TAG, "onEnterPictureInPicture") Logger.i(TAG, "onEnterPictureInPicture")
isInPictureInPicture = true; isInPictureInPicture = true;
@@ -419,7 +413,7 @@ class VideoDetailFragment() : MainFragment() {
} }
fun forcePictureInPicture() { fun forcePictureInPicture() {
val params = _viewDetail?.getPictureInPictureParams(true); val params = _viewDetail?.getPictureInPictureParams();
if(params != null) if(params != null)
activity?.enterPictureInPictureMode(params); activity?.enterPictureInPictureMode(params);
} }
app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt
+3 -3
View File
@@ -2733,7 +2733,7 @@ class VideoDetailView(fragment: VideoDetailFragment, inflater: LayoutInflater) :
_container_content.visibility = GONE _container_content.visibility = GONE
_layoutPlayerContainer.setPadding(0, 0, 0, 0); _layoutPlayerContainer.setPadding(0, 0, 0, 0);
val lp = _container_content.layoutParams as LayoutParams; val lp = _container_content.layoutParams as ConstraintLayout.LayoutParams;
lp.topMargin = 0; lp.topMargin = 0;
_container_content.layoutParams = lp; _container_content.layoutParams = lp;
@@ -2747,7 +2747,7 @@ class VideoDetailView(fragment: VideoDetailFragment, inflater: LayoutInflater) :
_container_content.visibility = VISIBLE _container_content.visibility = VISIBLE
_layoutPlayerContainer.setPadding(0, 0, 0, TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 6.0f, Resources.getSystem().displayMetrics).toInt()); _layoutPlayerContainer.setPadding(0, 0, 0, TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 6.0f, Resources.getSystem().displayMetrics).toInt());
val lp = _container_content.layoutParams as LayoutParams; val lp = _container_content.layoutParams as ConstraintLayout.LayoutParams;
lp.topMargin = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, -18.0f, Resources.getSystem().displayMetrics).toInt(); lp.topMargin = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, -18.0f, Resources.getSystem().displayMetrics).toInt();
_container_content.layoutParams = lp; _container_content.layoutParams = lp;
@@ -3031,7 +3031,7 @@ class VideoDetailView(fragment: VideoDetailFragment, inflater: LayoutInflater) :
_container_content.visibility = VISIBLE _container_content.visibility = VISIBLE
} }
} }
fun getPictureInPictureParams(isPlaying: Boolean) : PictureInPictureParams { fun getPictureInPictureParams() : PictureInPictureParams {
var videoSourceWidth = _player.exoPlayer?.player?.videoSize?.width ?: 0; var videoSourceWidth = _player.exoPlayer?.player?.videoSize?.width ?: 0;
var videoSourceHeight = _player.exoPlayer?.player?.videoSize?.height ?: 0; var videoSourceHeight = _player.exoPlayer?.player?.videoSize?.height ?: 0;
app/src/stable/assets/sources/apple-podcast
-1
Submodule app/src/stable/assets/sources/apple-podcast deleted from f79c7141bc