diff --git a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailFragment.kt b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailFragment.kt index b91ee6f6..d388f192 100644 --- a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailFragment.kt +++ b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailFragment.kt @@ -301,7 +301,6 @@ class VideoDetailFragment() : MainFragment() { } fun closeVideoDetails() { Logger.i(TAG, "closeVideoDetails()") - _viewDetail?.onPlayChanged?.emit(false) state = State.CLOSED; _viewDetail?.onStop(); close(); @@ -326,11 +325,6 @@ class VideoDetailFragment() : MainFragment() { closeVideoDetails(); }; viewDetail.onMaximize.subscribe { maximizeVideoDetail(it) }; - viewDetail.onPlayChanged.subscribe { - val params = _viewDetail?.getPictureInPictureParams(it) - if (params != null) - activity?.setPictureInPictureParams(params) - } viewDetail.onEnterPictureInPicture.subscribe { Logger.i(TAG, "onEnterPictureInPicture") isInPictureInPicture = true; @@ -419,7 +413,7 @@ class VideoDetailFragment() : MainFragment() { } fun forcePictureInPicture() { - val params = _viewDetail?.getPictureInPictureParams(true); + val params = _viewDetail?.getPictureInPictureParams(); if(params != null) activity?.enterPictureInPictureMode(params); } diff --git a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt index e915015d..eae1666b 100644 --- a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt +++ b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt @@ -2733,7 +2733,7 @@ class VideoDetailView(fragment: VideoDetailFragment, inflater: LayoutInflater) : _container_content.visibility = GONE _layoutPlayerContainer.setPadding(0, 0, 0, 0); - val lp = _container_content.layoutParams as LayoutParams; + val lp = _container_content.layoutParams as ConstraintLayout.LayoutParams; lp.topMargin = 0; _container_content.layoutParams = lp; @@ -2747,7 +2747,7 @@ class VideoDetailView(fragment: VideoDetailFragment, inflater: LayoutInflater) : _container_content.visibility = VISIBLE _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(); _container_content.layoutParams = lp; @@ -3031,7 +3031,7 @@ class VideoDetailView(fragment: VideoDetailFragment, inflater: LayoutInflater) : _container_content.visibility = VISIBLE } } - fun getPictureInPictureParams(isPlaying: Boolean) : PictureInPictureParams { + fun getPictureInPictureParams() : PictureInPictureParams { var videoSourceWidth = _player.exoPlayer?.player?.videoSize?.width ?: 0; var videoSourceHeight = _player.exoPlayer?.player?.videoSize?.height ?: 0; diff --git a/app/src/stable/assets/sources/apple-podcast b/app/src/stable/assets/sources/apple-podcast deleted file mode 160000 index f79c7141..00000000 --- a/app/src/stable/assets/sources/apple-podcast +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f79c7141bcb11464103abc56fd7be492fe8568ab