From 98ed264083374695054c42a62070a5475bbdb881 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Mon, 27 Jun 2022 19:13:31 +0200
Subject: [PATCH] player UI improvements

---
 .../libretube/fragments/PlayerFragment.kt     |  5 +--
 .../layout/exo_styled_player_control_view.xml | 40 ++++++++++++-------
 2 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt b/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt
index 0264319c0..87f7bdf55 100644
--- a/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt
+++ b/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt
@@ -267,7 +267,6 @@ class PlayerFragment : Fragment() {
                 toggleComments()
             }
 
-
         val fullScreenButton = view.findViewById<ImageButton>(R.id.fullscreen)
         val exoTitle = view.findViewById<TextView>(R.id.exo_title)
         val mainContainer = view.findViewById<ConstraintLayout>(R.id.main_container)
@@ -298,7 +297,7 @@ class PlayerFragment : Fragment() {
                 mainContainer.isClickable = false
                 linLayout.visibility = View.VISIBLE
                 fullScreenButton.setImageResource(R.drawable.ic_fullscreen)
-                exoTitle.visibility = View.GONE
+                exoTitle.visibility = View.INVISIBLE
 
                 val mainActivity = activity as MainActivity
                 mainActivity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT
@@ -770,7 +769,7 @@ class PlayerFragment : Fragment() {
         val defres = PreferenceHelper.getString(requireContext(), "default_res", "")!!
 
         val qualityText = view.findViewById<TextView>(R.id.quality_text)
-        val qualitySelect = view.findViewById<ImageButton>(R.id.quality_select)
+        val qualitySelect = view.findViewById<LinearLayout>(R.id.quality_linLayout)
 
         var videosNameArray: Array<CharSequence> = arrayOf()
         var videosUrlArray: Array<Uri> = arrayOf()
diff --git a/app/src/main/res/layout/exo_styled_player_control_view.xml b/app/src/main/res/layout/exo_styled_player_control_view.xml
index 41397298b..8392a9631 100644
--- a/app/src/main/res/layout/exo_styled_player_control_view.xml
+++ b/app/src/main/res/layout/exo_styled_player_control_view.xml
@@ -27,7 +27,7 @@
         android:layout_height="0dp"
         android:background="@color/exo_black_opacity_60" />
 
-    <FrameLayout
+    <LinearLayout
         android:id="@+id/top_bar"
         android:layout_width="match_parent"
         android:layout_height="@dimen/exo_styled_bottom_bar_height"
@@ -42,7 +42,7 @@
             android:paddingEnd="@dimen/exo_styled_bottom_bar_time_padding"
             android:paddingLeft="@dimen/exo_styled_bottom_bar_time_padding"
             android:paddingRight="@dimen/exo_styled_bottom_bar_time_padding"
-            android:layout_gravity="center_vertical|start"
+            android:layout_gravity="center"
             android:layoutDirection="ltr">
 
             <ImageButton
@@ -64,18 +64,21 @@
                 android:padding="@dimen/exo_icon_padding"
                 android:background="#00FFFFFF" />
 
-            <TextView
-                android:id="@+id/exo_title"
-                android:layout_width="500dp"
-                android:layout_height="match_parent"
-                android:layout_marginHorizontal="10dp"
-                android:textSize="20sp"
-                android:textColor="@android:color/white"
-                android:maxLines="1"
-                android:ellipsize="end"
-                android:visibility="gone"/>
         </LinearLayout>
 
+        <TextView
+            android:id="@+id/exo_title"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginHorizontal="10dp"
+            android:textSize="18sp"
+            android:textColor="@android:color/white"
+            android:maxLines="1"
+            android:ellipsize="end"
+            android:visibility="invisible"/>
+
         <LinearLayout
             android:id="@+id/controls_top_right"
             android:layout_width="wrap_content"
@@ -84,7 +87,7 @@
             android:paddingEnd="@dimen/exo_styled_bottom_bar_time_padding"
             android:paddingLeft="@dimen/exo_styled_bottom_bar_time_padding"
             android:paddingRight="@dimen/exo_styled_bottom_bar_time_padding"
-            android:layout_gravity="center_vertical|end"
+            android:layout_gravity="center"
             android:layoutDirection="ltr">
 
             <ImageButton
@@ -96,11 +99,16 @@
                 android:layout_marginEnd="12dp"
                 android:background="#00FFFFFF" />
 
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:id="@+id/quality_linLayout">
+
             <TextView
                 android:id="@+id/quality_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
+                android:layout_gravity="center"
                 android:padding="@dimen/exo_icon_padding"
                 android:text="HLS"
                 android:textColor="#FFFFFF" />
@@ -113,9 +121,11 @@
                 android:padding="@dimen/exo_icon_padding"
                 android:background="#00FFFFFF"
                 app:tint="@android:color/white" />
+
+            </LinearLayout>
         </LinearLayout>
 
-    </FrameLayout>
+    </LinearLayout>
 
     <FrameLayout
         android:id="@id/exo_bottom_bar"