From f0b1f62bb16b2d101a3eaa9adf601be19457b8c4 Mon Sep 17 00:00:00 2001 From: Koen Date: Tue, 7 Nov 2023 17:16:06 +0100 Subject: [PATCH] Casting button no longer visible when disabled (may require restart). --- .../fragment/mainactivity/bottombar/MenuBottomBarFragment.kt | 4 ++-- .../com/futo/platformplayer/views/video/FutoVideoPlayer.kt | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/bottombar/MenuBottomBarFragment.kt b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/bottombar/MenuBottomBarFragment.kt index 7c5b6fab..6d7b8991 100644 --- a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/bottombar/MenuBottomBarFragment.kt +++ b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/bottombar/MenuBottomBarFragment.kt @@ -218,14 +218,14 @@ class MenuBottomBarFragment : MainActivityFragment() { if (buyIndex != -1) { val button = buttons[buyIndex] buttons.removeAt(buyIndex) - buttons.add(buttons.size, button) + buttons.add(0, button) } //Force faq to be second val faqIndex = buttons.indexOfFirst { b -> b.id == 97 }; if (faqIndex != -1) { val button = buttons[faqIndex] buttons.removeAt(faqIndex) - buttons.add(buttons.size, button) + buttons.add(if (buttons.size == 1) 1 else 0, button) } for (data in buttons) { diff --git a/app/src/main/java/com/futo/platformplayer/views/video/FutoVideoPlayer.kt b/app/src/main/java/com/futo/platformplayer/views/video/FutoVideoPlayer.kt index 5f7435cb..a02be8b5 100644 --- a/app/src/main/java/com/futo/platformplayer/views/video/FutoVideoPlayer.kt +++ b/app/src/main/java/com/futo/platformplayer/views/video/FutoVideoPlayer.kt @@ -133,6 +133,10 @@ class FutoVideoPlayer : FutoVideoPlayerBase { _control_chapter_fullscreen = _videoControls_fullscreen.findViewById(R.id.text_chapter_current); _time_bar_fullscreen = _videoControls_fullscreen.findViewById(com.google.android.exoplayer2.ui.R.id.exo_progress); + val castVisibility = if (Settings.instance.casting.enabled) View.VISIBLE else View.GONE + _control_cast.visibility = castVisibility + _control_cast_fullscreen.visibility = castVisibility + _overlay_brightness = findViewById(R.id.overlay_brightness); _title_fullscreen = _videoControls_fullscreen.findViewById(R.id.exo_title);