From 978f76ffb6c5dac36ba7b8d674415fc904f2ed35 Mon Sep 17 00:00:00 2001 From: Kai Date: Fri, 10 Jan 2025 14:38:54 -0600 Subject: [PATCH] Added current quality to auto item Changelog: added --- .../fragment/mainactivity/main/VideoDetailView.kt | 11 ++++++++++- .../views/overlays/slideup/SlideUpMenuGroup.kt | 9 +++++++++ .../views/overlays/slideup/SlideUpMenuItem.kt | 4 ++++ .../platformplayer/views/video/FutoVideoPlayerBase.kt | 2 +- 4 files changed, 24 insertions(+), 2 deletions(-) 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 4224d7e0..2c38fd0d 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 @@ -171,7 +171,6 @@ import kotlinx.coroutines.withContext import userpackage.Protocol import java.time.OffsetDateTime import kotlin.math.abs -import kotlin.math.max import kotlin.math.roundToLong @UnstableApi @@ -1923,9 +1922,19 @@ class VideoDetailView : ConstraintLayout { } } + var videoMenuGroup: SlideUpMenuGroup? = null + for (view in _overlay_quality_selector!!.groupItems) { + if (view is SlideUpMenuGroup && view.groupTag == "video") { + videoMenuGroup = view + } + } + if (selectedQuality != null) { + videoMenuGroup?.getItem("auto")?.setSubText("") _overlay_quality_selector?.selectOption("video", selectedQuality) } else { + videoMenuGroup?.getItem("auto") + ?.setSubText("${_player.exoPlayer?.player?.videoFormat?.width}x${_player.exoPlayer?.player?.videoFormat?.height}") _overlay_quality_selector?.selectOption("video", "auto") } } diff --git a/app/src/main/java/com/futo/platformplayer/views/overlays/slideup/SlideUpMenuGroup.kt b/app/src/main/java/com/futo/platformplayer/views/overlays/slideup/SlideUpMenuGroup.kt index 9f19018d..606c8746 100644 --- a/app/src/main/java/com/futo/platformplayer/views/overlays/slideup/SlideUpMenuGroup.kt +++ b/app/src/main/java/com/futo/platformplayer/views/overlays/slideup/SlideUpMenuGroup.kt @@ -61,6 +61,15 @@ class SlideUpMenuGroup : LinearLayout { return didSelect; } + fun getItem(tag: Any?): SlideUpMenuItem? { + for(item in items) { + if(item.itemTag == tag){ + return item + } + } + return null + } + private fun addItems(items: List) { for (item in items) { item.setParentClickListener { parentClickListener?.invoke() } diff --git a/app/src/main/java/com/futo/platformplayer/views/overlays/slideup/SlideUpMenuItem.kt b/app/src/main/java/com/futo/platformplayer/views/overlays/slideup/SlideUpMenuItem.kt index 8e5da990..29699ecd 100644 --- a/app/src/main/java/com/futo/platformplayer/views/overlays/slideup/SlideUpMenuItem.kt +++ b/app/src/main/java/com/futo/platformplayer/views/overlays/slideup/SlideUpMenuItem.kt @@ -82,6 +82,10 @@ class SlideUpMenuItem : ConstraintLayout { return isSelected; } + fun setSubText(subText: String) { + _subtext.text = subText + } + fun setParentClickListener(listener: (()->Unit)?) { _parentClickListener = listener; } diff --git a/app/src/main/java/com/futo/platformplayer/views/video/FutoVideoPlayerBase.kt b/app/src/main/java/com/futo/platformplayer/views/video/FutoVideoPlayerBase.kt index fd30f685..739da3c3 100644 --- a/app/src/main/java/com/futo/platformplayer/views/video/FutoVideoPlayerBase.kt +++ b/app/src/main/java/com/futo/platformplayer/views/video/FutoVideoPlayerBase.kt @@ -113,7 +113,7 @@ abstract class FutoVideoPlayerBase : RelativeLayout { var targetTrackVideoHeight = -1 private set - var _targetTrackAudioBitrate = -1 + private var _targetTrackAudioBitrate = -1 private var _toResume = false;