From 2e4b6beb2f05f71c5ce63ed71270dd814e607d76 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Sun, 23 Oct 2022 15:58:06 +0200
Subject: [PATCH] Add a toggle at the player fragment

---
 .../libretube/ui/activities/MainActivity.kt   |  5 +--
 .../libretube/ui/fragments/PlayerFragment.kt  |  3 +-
 app/src/main/res/drawable/ic_queue.xml        | 10 +++++
 .../layout/exo_styled_player_control_view.xml |  9 +++-
 app/src/main/res/layout/fragment_player.xml   | 43 +------------------
 app/src/main/res/layout/queue_row.xml         |  1 +
 6 files changed, 23 insertions(+), 48 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_queue.xml

diff --git a/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt b/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt
index bdf30f72c..d1d6f1840 100644
--- a/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt
+++ b/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt
@@ -311,10 +311,7 @@ class MainActivity : BaseActivity() {
                 true
             }
             R.id.action_queue -> {
-                Log.e("open queue", "open queue")
-                supportFragmentManager.let {
-                    PlayingQueueSheet().show(it, null)
-                }
+                PlayingQueueSheet().show(supportFragmentManager, null)
                 true
             }
             else -> super.onOptionsItemSelected(item)
diff --git a/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt
index 398800cc0..6f470ce70 100644
--- a/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt
+++ b/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt
@@ -404,7 +404,8 @@ class PlayerFragment : BaseFragment() {
             toggleComments()
         }
 
-        binding.queueToggle.setOnClickListener {
+        playerBinding.queueToggle.visibility = View.VISIBLE
+       playerBinding.queueToggle.setOnClickListener {
             PlayingQueueSheet().show(childFragmentManager, null)
         }
 
diff --git a/app/src/main/res/drawable/ic_queue.xml b/app/src/main/res/drawable/ic_queue.xml
new file mode 100644
index 000000000..1bc9c0aad
--- /dev/null
+++ b/app/src/main/res/drawable/ic_queue.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M32,40q-2.45,0 -4.2,-1.675t-1.75,-4.075q0,-2.4 1.675,-4.075Q29.4,28.5 31.8,28.5q0.8,0 1.575,0.15 0.775,0.15 1.525,0.5L34.9,12L44,12v3.55h-6.1L37.9,34.3q0,2.35 -1.725,4.025Q34.45,40 32,40ZM6,31.5v-3h15.3v3ZM6,23.25v-3h23.65v3ZM6,15v-3h23.65v3Z" />
+</vector>
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 6aaeb0d73..e508662f6 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
@@ -67,10 +67,17 @@
                 android:layout_gravity="center"
                 android:layoutDirection="ltr">
 
+                <ImageButton
+                    android:id="@+id/queue_toggle"
+                    style="@style/PlayerControlTop"
+                    android:layout_marginEnd="2dp"
+                    android:src="@drawable/ic_queue"
+                    android:visibility="gone"
+                    app:tint="@android:color/white" />
+
                 <ImageButton
                     android:id="@+id/toggle_options"
                     style="@style/PlayerControlTop"
-                    android:layout_marginTop="-1dp"
                     android:src="@drawable/ic_arrow_down"
                     app:tint="@android:color/white" />
 
diff --git a/app/src/main/res/layout/fragment_player.xml b/app/src/main/res/layout/fragment_player.xml
index a0680cc65..f6326dda2 100644
--- a/app/src/main/res/layout/fragment_player.xml
+++ b/app/src/main/res/layout/fragment_player.xml
@@ -298,53 +298,12 @@
                     app:cornerRadius="11dp" />
             </LinearLayout>
 
-            <com.google.android.material.card.MaterialCardView
-                android:id="@+id/queue_toggle"
-                style="@style/Widget.Material3.CardView.Elevated"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:layout_marginTop="10dp"
-                android:layout_marginEnd="16dp"
-                android:layout_marginBottom="10dp"
-                app:cardCornerRadius="18dp">
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_margin="8dp"
-                    android:orientation="horizontal">
-
-                    <TextView
-                        android:id="@+id/queueToggleTV"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="8dp"
-                        android:layout_weight="1"
-                        android:text="@string/playing_queue"
-                        android:textSize="17sp" />
-
-                    <ImageView
-                        android:id="@+id/queueToggleIV"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:layout_marginEnd="3dp"
-                        android:src="@drawable/ic_arrow_up_down" />
-
-                </LinearLayout>
-
-            </com.google.android.material.card.MaterialCardView>
-
             <com.google.android.material.card.MaterialCardView
                 android:id="@+id/comments_toggle"
                 style="@style/Widget.Material3.CardView.Elevated"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:layout_marginTop="10dp"
-                android:layout_marginEnd="16dp"
-                android:layout_marginBottom="10dp"
+                android:layout_margin="16dp"
                 app:cardCornerRadius="18dp">
 
                 <LinearLayout
diff --git a/app/src/main/res/layout/queue_row.xml b/app/src/main/res/layout/queue_row.xml
index e03c06e5f..b834fbdf7 100644
--- a/app/src/main/res/layout/queue_row.xml
+++ b/app/src/main/res/layout/queue_row.xml
@@ -34,6 +34,7 @@
             android:id="@+id/title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginBottom="2dp"
             android:ellipsize="end"
             android:maxLines="1"
             android:textSize="16sp"