From 4ef4cf33d5bc4f857ba14c81a0d7443850153c83 Mon Sep 17 00:00:00 2001
From: FineFindus <FineFindus@proton.me>
Date: Mon, 14 Aug 2023 15:21:36 +0200
Subject: [PATCH 1/8] feat:(queue): add tooltips

---
 .../github/libretube/ui/sheets/PlayingQueueSheet.kt | 13 +++++++++++++
 app/src/main/res/layout/queue_bottom_sheet.xml      |  1 +
 app/src/main/res/values/strings.xml                 |  8 ++++++++
 3 files changed, 22 insertions(+)

diff --git a/app/src/main/java/com/github/libretube/ui/sheets/PlayingQueueSheet.kt b/app/src/main/java/com/github/libretube/ui/sheets/PlayingQueueSheet.kt
index 9b4724c00..8f5cdc7f8 100644
--- a/app/src/main/java/com/github/libretube/ui/sheets/PlayingQueueSheet.kt
+++ b/app/src/main/java/com/github/libretube/ui/sheets/PlayingQueueSheet.kt
@@ -1,6 +1,7 @@
 package com.github.libretube.ui.sheets
 
 import android.annotation.SuppressLint
+import android.os.Build
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -49,6 +50,18 @@ class PlayingQueueSheet : ExpandedBottomSheet() {
         val currentPlayingIndex = PlayingQueue.currentIndex()
         if (currentPlayingIndex != -1) binding.optionsRecycler.scrollToPosition(currentPlayingIndex)
 
+        // tooltips are only supported since API 26
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            binding.repeat.tooltipText = getString(R.string.repeat)
+            binding.shuffle.tooltipText = getString(R.string.shuffle)
+            binding.reverse.tooltipText = getString(R.string.reverse)
+            binding.addToPlaylist.tooltipText = getString(R.string.addToPlaylist)
+            binding.sort.tooltipText = getString(R.string.sort)
+            binding.watchPositionsOptions.tooltipText = getString(R.string.watch_position)
+            binding.clearQueue.tooltipText = getString(R.string.clear_queue)
+            binding.dismiss?.tooltipText = getString(R.string.dismiss)
+        }
+
         binding.shuffle.setOnClickListener {
             val streams = PlayingQueue.getStreams().toMutableList()
             val currentIndex = PlayingQueue.currentIndex()
diff --git a/app/src/main/res/layout/queue_bottom_sheet.xml b/app/src/main/res/layout/queue_bottom_sheet.xml
index 63f94d7d0..4761258e9 100644
--- a/app/src/main/res/layout/queue_bottom_sheet.xml
+++ b/app/src/main/res/layout/queue_bottom_sheet.xml
@@ -73,6 +73,7 @@
                     android:src="@drawable/ic_close" />
 
                 <ImageView
+                    android:id="@+id/dismiss"
                     style="@style/QueueSheetOption"
                     android:layout_width="0dp"
                     android:layout_weight="1"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index dc9f0ee61..16417de10 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -486,4 +486,12 @@
         <item quantity="one">%d new stream</item>
         <item quantity="other">%d new streams</item>
     </plurals>
+
+    <!--Tooltips for queue options-->
+    <string name="repeat">Repeat</string>
+    <string name="reverse">Reverse</string>
+    <string name="sort">Sort</string>
+    <string name="watch_position">Watch position</string>
+    <string name="clear_queue">Clear queue</string>
+    <string name="dismiss">Dismiss</string>
 </resources>
\ No newline at end of file

From 7052c621bcc16ae8f9f873eb09032909ae3d6530 Mon Sep 17 00:00:00 2001
From: FineFindus <FineFindus@proton.me>
Date: Mon, 14 Aug 2023 15:49:49 +0200
Subject: [PATCH 2/8] feat(player): add tooltips player buttons

---
 .../libretube/ui/sheets/PlayingQueueSheet.kt  | 13 ---
 .../libretube/ui/views/CustomExoPlayerView.kt | 13 ++-
 .../res/layout-v26/queue_bottom_sheet.xml     | 88 +++++++++++++++++++
 .../layout/exo_styled_player_control_view.xml |  6 ++
 app/src/main/res/layout/fragment_player.xml   |  2 +
 .../main/res/layout/queue_bottom_sheet.xml    |  8 ++
 app/src/main/res/values/strings.xml           | 22 +++--
 7 files changed, 126 insertions(+), 26 deletions(-)
 create mode 100644 app/src/main/res/layout-v26/queue_bottom_sheet.xml

diff --git a/app/src/main/java/com/github/libretube/ui/sheets/PlayingQueueSheet.kt b/app/src/main/java/com/github/libretube/ui/sheets/PlayingQueueSheet.kt
index 8f5cdc7f8..9b4724c00 100644
--- a/app/src/main/java/com/github/libretube/ui/sheets/PlayingQueueSheet.kt
+++ b/app/src/main/java/com/github/libretube/ui/sheets/PlayingQueueSheet.kt
@@ -1,7 +1,6 @@
 package com.github.libretube.ui.sheets
 
 import android.annotation.SuppressLint
-import android.os.Build
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -50,18 +49,6 @@ class PlayingQueueSheet : ExpandedBottomSheet() {
         val currentPlayingIndex = PlayingQueue.currentIndex()
         if (currentPlayingIndex != -1) binding.optionsRecycler.scrollToPosition(currentPlayingIndex)
 
-        // tooltips are only supported since API 26
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            binding.repeat.tooltipText = getString(R.string.repeat)
-            binding.shuffle.tooltipText = getString(R.string.shuffle)
-            binding.reverse.tooltipText = getString(R.string.reverse)
-            binding.addToPlaylist.tooltipText = getString(R.string.addToPlaylist)
-            binding.sort.tooltipText = getString(R.string.sort)
-            binding.watchPositionsOptions.tooltipText = getString(R.string.watch_position)
-            binding.clearQueue.tooltipText = getString(R.string.clear_queue)
-            binding.dismiss?.tooltipText = getString(R.string.dismiss)
-        }
-
         binding.shuffle.setOnClickListener {
             val streams = PlayingQueue.getStreams().toMutableList()
             val currentIndex = PlayingQueue.currentIndex()
diff --git a/app/src/main/java/com/github/libretube/ui/views/CustomExoPlayerView.kt b/app/src/main/java/com/github/libretube/ui/views/CustomExoPlayerView.kt
index ed33c0a59..4080717a4 100644
--- a/app/src/main/java/com/github/libretube/ui/views/CustomExoPlayerView.kt
+++ b/app/src/main/java/com/github/libretube/ui/views/CustomExoPlayerView.kt
@@ -5,6 +5,7 @@ import android.app.Activity
 import android.content.Context
 import android.content.res.Configuration
 import android.graphics.Color
+import android.os.Build
 import android.os.Handler
 import android.os.Looper
 import android.text.format.DateUtils
@@ -127,13 +128,11 @@ open class CustomExoPlayerView(
         // locking the player
         binding.lockPlayer.setOnClickListener {
             // change the locked/unlocked icon
-            binding.lockPlayer.setImageResource(
-                if (!isPlayerLocked) {
-                    R.drawable.ic_locked
-                } else {
-                    R.drawable.ic_unlocked
-                }
-            )
+            val icon = if (!isPlayerLocked)  R.drawable.ic_locked else  R.drawable.ic_unlocked;
+            val tooltip = if (!isPlayerLocked)  R.string.tooltip_unlocked else  R.string.tooltip_locked;
+            binding.lockPlayer.setImageResource(icon)
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
+                binding.lockPlayer.tooltipText = context.getString(tooltip)
 
             // show/hide all the controls
             lockPlayer(isPlayerLocked)
diff --git a/app/src/main/res/layout-v26/queue_bottom_sheet.xml b/app/src/main/res/layout-v26/queue_bottom_sheet.xml
new file mode 100644
index 000000000..c739db968
--- /dev/null
+++ b/app/src/main/res/layout-v26/queue_bottom_sheet.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <FrameLayout
+        android:id="@+id/standard_bottom_sheet"
+        style="@style/Widget.Material3.BottomSheet"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingBottom="20dp"
+        app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <!-- Drag handle for accessibility -->
+            <com.google.android.material.bottomsheet.BottomSheetDragHandleView
+                android:id="@+id/drag_handle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/options_recycler"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
+
+            <LinearLayout
+                android:id="@+id/bottom_controls"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="5dp"
+                android:background="@drawable/rounded_ripple"
+                android:padding="10dp">
+
+                <ImageView
+                    android:id="@+id/repeat"
+                    style="@style/QueueSheetOption"
+                    android:src="@drawable/ic_repeat" />
+
+                <ImageView
+                    android:id="@+id/shuffle"
+                    style="@style/QueueSheetOption"
+                    android:src="@drawable/ic_shuffle" />
+
+                <ImageView
+                    android:id="@+id/reverse"
+                    style="@style/QueueSheetOption"
+                    android:src="@drawable/ic_reverse" />
+
+                <ImageView
+                    android:id="@+id/add_to_playlist"
+                    style="@style/QueueSheetOption"
+                    android:src="@drawable/ic_playlist_add" />
+
+                <ImageView
+                    android:id="@+id/sort"
+                    style="@style/QueueSheetOption"
+                    android:src="@drawable/ic_sort" />
+
+                <ImageView
+                    android:id="@+id/watch_positions_options"
+                    style="@style/QueueSheetOption"
+                    android:src="@drawable/ic_eye" />
+
+                <ImageView
+                    android:id="@+id/clear_queue"
+                    style="@style/QueueSheetOption"
+                    android:src="@drawable/ic_close" />
+
+                <ImageView
+                    style="@style/QueueSheetOption"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:tooltipText="Dismiss"
+                    android:src="@drawable/ic_arrow_down" />
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+    </FrameLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
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 59af57a25..8fd0f3b3c 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
@@ -32,6 +32,7 @@
 
                 <ImageView
                     android:id="@+id/close_imageButton"
+                    android:tooltipText="@string/tooltip_minimize"
                     style="@style/PlayerControlTop"
                     android:layout_marginEnd="-10dp"
                     android:src="@drawable/ic_close"
@@ -68,6 +69,7 @@
 
                 <androidx.appcompat.widget.SwitchCompat
                     android:id="@+id/autoPlay"
+                    android:tooltipText="@string/player_autoplayyy"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="2dp"
@@ -81,6 +83,7 @@
 
                 <ImageButton
                     android:id="@+id/sb_toggle"
+                    android:tooltipText="@string/tooltip_sponsorblock"
                     style="@style/PlayerControlTop"
                     android:layout_marginEnd="2dp"
                     android:src="@drawable/ic_sb_enabled"
@@ -89,6 +92,7 @@
 
                 <ImageButton
                     android:id="@+id/queue_toggle"
+                    android:tooltipText="@string/queue"
                     style="@style/PlayerControlTop"
                     android:layout_marginEnd="2dp"
                     android:src="@drawable/ic_queue"
@@ -97,6 +101,7 @@
 
                 <ImageButton
                     android:id="@+id/toggle_options"
+                    android:tooltipText="@string/tooltip_options"
                     style="@style/PlayerControlTop"
                     android:src="@drawable/ic_player_settings"
                     app:tint="@android:color/white" />
@@ -311,6 +316,7 @@
 
                 <ImageButton
                     android:id="@+id/fullscreen"
+                    android:tooltipText="@string/tooltip_fullscreen"
                     style="@style/PlayerControlBottom"
                     android:src="@drawable/ic_fullscreen"
                     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 c35ce684d..ce02638df 100644
--- a/app/src/main/res/layout/fragment_player.xml
+++ b/app/src/main/res/layout/fragment_player.xml
@@ -367,6 +367,7 @@
 
     <ImageView
         android:id="@+id/close_imageView"
+        android:tooltipText="@string/tooltip_close"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:alpha="0"
@@ -380,6 +381,7 @@
 
     <ImageView
         android:id="@+id/play_imageView"
+        android:tooltipText="@string/tooltip_play"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:alpha="0"
diff --git a/app/src/main/res/layout/queue_bottom_sheet.xml b/app/src/main/res/layout/queue_bottom_sheet.xml
index 4761258e9..7e876c705 100644
--- a/app/src/main/res/layout/queue_bottom_sheet.xml
+++ b/app/src/main/res/layout/queue_bottom_sheet.xml
@@ -39,41 +39,49 @@
 
                 <ImageView
                     android:id="@+id/repeat"
+                    android:tooltipText="@string/tooltip_repeat"
                     style="@style/QueueSheetOption"
                     android:src="@drawable/ic_repeat" />
 
                 <ImageView
                     android:id="@+id/shuffle"
+                    android:tooltipText="@string/shuffle"
                     style="@style/QueueSheetOption"
                     android:src="@drawable/ic_shuffle" />
 
                 <ImageView
                     android:id="@+id/reverse"
+                    android:tooltipText="@string/tooltip_reverse"
                     style="@style/QueueSheetOption"
                     android:src="@drawable/ic_reverse" />
 
                 <ImageView
                     android:id="@+id/add_to_playlist"
+                    android:tooltipText="@string/addToPlaylist"
                     style="@style/QueueSheetOption"
                     android:src="@drawable/ic_playlist_add" />
 
                 <ImageView
                     android:id="@+id/sort"
+                    android:tooltipText="@string/tooltip_sort"
                     style="@style/QueueSheetOption"
                     android:src="@drawable/ic_sort" />
 
                 <ImageView
                     android:id="@+id/watch_positions_options"
+                    android:tooltipText="@string/tooltip_watch_position"
                     style="@style/QueueSheetOption"
                     android:src="@drawable/ic_eye" />
 
                 <ImageView
                     android:id="@+id/clear_queue"
+                    android:tooltipText="@string/tooltip_clear_queue"
                     style="@style/QueueSheetOption"
                     android:src="@drawable/ic_close" />
 
                 <ImageView
                     android:id="@+id/dismiss"
+                    android:tooltipText="@string/tooltip_dismiss"
                     style="@style/QueueSheetOption"
                     android:layout_width="0dp"
                     android:layout_weight="1"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 16417de10..44951c874 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -488,10 +488,20 @@
     </plurals>
 
     <!--Tooltips for queue options-->
-    <string name="repeat">Repeat</string>
-    <string name="reverse">Reverse</string>
-    <string name="sort">Sort</string>
-    <string name="watch_position">Watch position</string>
-    <string name="clear_queue">Clear queue</string>
-    <string name="dismiss">Dismiss</string>
+    <string name="tooltip_repeat">Repeat</string>
+    <string name="tooltip_reverse">Reverse</string>
+    <string name="tooltip_sort">Sort</string>
+    <string name="tooltip_watch_position">Watch position</string>
+    <string name="tooltip_clear_queue">Clear queue</string>
+    <string name="tooltip_dismiss">Dismiss</string>
+
+    <!--Tooltips for player-->
+    <string name="tooltip_locked">Lock player</string>
+    <string name="tooltip_unlocked">Unlock player</string>
+    <string name="tooltip_sponsorblock">Toggle Sponsorblock</string>
+    <string name="tooltip_options">Options</string>
+    <string name="tooltip_minimize">Minimze</string>
+    <string name="tooltip_fullscreen">Fullscreen</string>
+    <string name="tooltip_close">Close</string>
+    <string name="tooltip_play">Play</string>
 </resources>
\ No newline at end of file

From ca9990d700692ed0c2409450f8c6fd576e3f5894 Mon Sep 17 00:00:00 2001
From: FineFindus <FineFindus@proton.me>
Date: Mon, 14 Aug 2023 18:15:02 +0200
Subject: [PATCH 3/8] feat: add tooltips channels

---
 app/src/main/res/layout/fragment_channel.xml | 2 ++
 app/src/main/res/values/strings.xml          | 4 +---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/layout/fragment_channel.xml b/app/src/main/res/layout/fragment_channel.xml
index 7ad2cf94f..bde329a77 100644
--- a/app/src/main/res/layout/fragment_channel.xml
+++ b/app/src/main/res/layout/fragment_channel.xml
@@ -72,12 +72,14 @@
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/channel_share"
+                    android:tooltipText="@string/share"
                     style="@style/ElevatedIconButton"
                     app:icon="@drawable/ic_share"
                     tools:targetApi="m" />
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/notification_bell"
+                    android:tooltipText="@string/notifications"
                     style="@style/ElevatedIconButton"
                     app:icon="@drawable/ic_notification"
                     tools:targetApi="m" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 44951c874..23005827b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -487,15 +487,13 @@
         <item quantity="other">%d new streams</item>
     </plurals>
 
-    <!--Tooltips for queue options-->
+    <!--Tooltips -->
     <string name="tooltip_repeat">Repeat</string>
     <string name="tooltip_reverse">Reverse</string>
     <string name="tooltip_sort">Sort</string>
     <string name="tooltip_watch_position">Watch position</string>
     <string name="tooltip_clear_queue">Clear queue</string>
     <string name="tooltip_dismiss">Dismiss</string>
-
-    <!--Tooltips for player-->
     <string name="tooltip_locked">Lock player</string>
     <string name="tooltip_unlocked">Unlock player</string>
     <string name="tooltip_sponsorblock">Toggle Sponsorblock</string>

From f506a75a2abe11029f6830b8d3d42cdfd642f985 Mon Sep 17 00:00:00 2001
From: FineFindus <FineFindus@proton.me>
Date: Mon, 14 Aug 2023 18:19:59 +0200
Subject: [PATCH 4/8] feat: add tooltips to subscription fragment

---
 app/src/main/res/layout/exo_styled_player_control_view.xml | 2 +-
 app/src/main/res/layout/fragment_subscriptions.xml         | 3 +++
 app/src/main/res/values/strings.xml                        | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

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 8fd0f3b3c..be215a963 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
@@ -69,7 +69,7 @@
 
                 <androidx.appcompat.widget.SwitchCompat
                     android:id="@+id/autoPlay"
-                    android:tooltipText="@string/player_autoplayyy"
+                    android:tooltipText="@string/player_autoplay"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="2dp"
diff --git a/app/src/main/res/layout/fragment_subscriptions.xml b/app/src/main/res/layout/fragment_subscriptions.xml
index 399ba9db4..8f9ff3e4d 100644
--- a/app/src/main/res/layout/fragment_subscriptions.xml
+++ b/app/src/main/res/layout/fragment_subscriptions.xml
@@ -106,6 +106,7 @@
 
                         <TextView
                             android:id="@+id/filterTV"
+                            android:tooltipText="@string/tooltip_filter"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="start"
@@ -118,6 +119,7 @@
 
                         <TextView
                             android:id="@+id/sortTV"
+                            android:tooltipText="@string/tooltip_sort"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="end"
@@ -142,6 +144,7 @@
 
                             <ImageView
                                 android:id="@+id/edit_groups"
+                                android:tooltipText="@string/tooltip_edit_groups"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_gravity="center"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 23005827b..a63119396 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -502,4 +502,6 @@
     <string name="tooltip_fullscreen">Fullscreen</string>
     <string name="tooltip_close">Close</string>
     <string name="tooltip_play">Play</string>
+    <string name="tooltip_filter">Filter</string>
+    <string name="tooltip_edit_groups">Edit groups</string>
 </resources>
\ No newline at end of file

From 432c88bc4cebc9d2cef25dafec2c49eec703d71b Mon Sep 17 00:00:00 2001
From: FineFindus <FineFindus@proton.me>
Date: Mon, 14 Aug 2023 18:22:10 +0200
Subject: [PATCH 5/8] feat: add tooltips to library

---
 app/src/main/res/layout/fragment_library.xml | 2 ++
 app/src/main/res/values/strings.xml          | 1 +
 2 files changed, 3 insertions(+)

diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml
index 20e4c903d..53a2df5ba 100644
--- a/app/src/main/res/layout/fragment_library.xml
+++ b/app/src/main/res/layout/fragment_library.xml
@@ -96,6 +96,7 @@
                             <TextView
                                 android:id="@+id/sortTV"
                                 android:layout_width="0dp"
+                                android:tooltipText="@string/tooltip_sort"
                                 android:layout_height="wrap_content"
                                 android:layout_weight="1"
                                 android:drawablePadding="5dp"
@@ -182,6 +183,7 @@
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/create_playlist"
+        android:tooltipText="@string/tooltip_create_playlist"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a63119396..bfe814c0d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -504,4 +504,5 @@
     <string name="tooltip_play">Play</string>
     <string name="tooltip_filter">Filter</string>
     <string name="tooltip_edit_groups">Edit groups</string>
+    <string name="tooltip_create_playlist">Create playlist</string>
 </resources>
\ No newline at end of file

From bfa99d2b7ef66e722cb9d18648d0c9639b3bc92b Mon Sep 17 00:00:00 2001
From: FineFindus <FineFindus@proton.me>
Date: Mon, 14 Aug 2023 18:23:15 +0200
Subject: [PATCH 6/8] feat: add tooltip to channel subscription

---
 app/src/main/res/layout/channel_subscription_row.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/layout/channel_subscription_row.xml b/app/src/main/res/layout/channel_subscription_row.xml
index 068b52d2d..4c1114279 100644
--- a/app/src/main/res/layout/channel_subscription_row.xml
+++ b/app/src/main/res/layout/channel_subscription_row.xml
@@ -30,6 +30,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/notification_bell"
+        android:tooltipText="@string/notifications"
         style="@style/ElevatedIconButton"
         android:layout_gravity="center"
         app:icon="@drawable/ic_notification"

From 609449f1e764c0368bc970cd5f49fe07fad46b26 Mon Sep 17 00:00:00 2001
From: FineFindus <FineFindus@proton.me>
Date: Mon, 14 Aug 2023 18:27:47 +0200
Subject: [PATCH 7/8] feat: add tooltips to commentsheet

---
 app/src/main/res/layout/comments_sheet.xml | 2 ++
 app/src/main/res/values/strings.xml        | 1 +
 2 files changed, 3 insertions(+)

diff --git a/app/src/main/res/layout/comments_sheet.xml b/app/src/main/res/layout/comments_sheet.xml
index d17114b65..840def92e 100644
--- a/app/src/main/res/layout/comments_sheet.xml
+++ b/app/src/main/res/layout/comments_sheet.xml
@@ -54,6 +54,7 @@
 
                 <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/btnScrollToTop"
+                    android:tooltipText="@string/tooltip_scroll_to_top"
                     android:layout_width="35dp"
                     android:layout_height="35dp"
                     android:background="?selectableItemBackgroundBorderless"
@@ -64,6 +65,7 @@
 
                 <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/btnClose"
+                    android:tooltipText="@string/tooltip_close"
                     android:layout_width="35dp"
                     android:layout_height="35dp"
                     android:background="?selectableItemBackgroundBorderless"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bfe814c0d..c95da2511 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -505,4 +505,5 @@
     <string name="tooltip_filter">Filter</string>
     <string name="tooltip_edit_groups">Edit groups</string>
     <string name="tooltip_create_playlist">Create playlist</string>
+    <string name="tooltip_scroll_to_top">Scroll to top</string>
 </resources>
\ No newline at end of file

From e5efe97693da5120cb319d6ab55702ea2ea5a0f5 Mon Sep 17 00:00:00 2001
From: FineFindus <FineFindus@proton.me>
Date: Mon, 14 Aug 2023 18:40:52 +0200
Subject: [PATCH 8/8] feat: add tooltips to playback sheet

---
 .../github/libretube/helpers/ImportHelper.kt  |  2 +-
 .../ui/dialogs/AddToPlaylistDialog.kt         |  6 +-
 .../libretube/ui/extensions/TrySetTooltip.kt  | 15 ++++
 .../libretube/ui/views/CustomExoPlayerView.kt | 14 +--
 .../res/layout-v26/queue_bottom_sheet.xml     | 88 -------------------
 .../main/res/layout/playback_bottom_sheet.xml |  2 +
 6 files changed, 32 insertions(+), 95 deletions(-)
 create mode 100644 app/src/main/java/com/github/libretube/ui/extensions/TrySetTooltip.kt
 delete mode 100644 app/src/main/res/layout-v26/queue_bottom_sheet.xml

diff --git a/app/src/main/java/com/github/libretube/helpers/ImportHelper.kt b/app/src/main/java/com/github/libretube/helpers/ImportHelper.kt
index f6a1d2b32..3294ac40c 100644
--- a/app/src/main/java/com/github/libretube/helpers/ImportHelper.kt
+++ b/app/src/main/java/com/github/libretube/helpers/ImportHelper.kt
@@ -19,11 +19,11 @@ import com.github.libretube.obj.NewPipeSubscription
 import com.github.libretube.obj.NewPipeSubscriptions
 import com.github.libretube.obj.PipedImportPlaylist
 import com.github.libretube.obj.PipedImportPlaylistFile
+import java.util.stream.Collectors
 import kotlin.streams.toList
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.json.decodeFromStream
 import kotlinx.serialization.json.encodeToStream
-import java.util.stream.Collectors
 
 object ImportHelper {
     /**
diff --git a/app/src/main/java/com/github/libretube/ui/dialogs/AddToPlaylistDialog.kt b/app/src/main/java/com/github/libretube/ui/dialogs/AddToPlaylistDialog.kt
index 42452f6cc..079c7a2bb 100644
--- a/app/src/main/java/com/github/libretube/ui/dialogs/AddToPlaylistDialog.kt
+++ b/app/src/main/java/com/github/libretube/ui/dialogs/AddToPlaylistDialog.kt
@@ -62,7 +62,11 @@ class AddToPlaylistDialog(
                 if (playlists.isEmpty()) return@repeatOnLifecycle
 
                 binding.playlistsSpinner.adapter =
-                    ArrayAdapter(requireContext(), R.layout.dropdown_item, playlists.map { it.name!! })
+                    ArrayAdapter(
+                        requireContext(),
+                        R.layout.dropdown_item,
+                        playlists.map { it.name!! }
+                    )
 
                 // select the last used playlist
                 viewModel.lastSelectedPlaylistId?.let { id ->
diff --git a/app/src/main/java/com/github/libretube/ui/extensions/TrySetTooltip.kt b/app/src/main/java/com/github/libretube/ui/extensions/TrySetTooltip.kt
new file mode 100644
index 000000000..f5860cfe4
--- /dev/null
+++ b/app/src/main/java/com/github/libretube/ui/extensions/TrySetTooltip.kt
@@ -0,0 +1,15 @@
+package com.github.libretube.ui.extensions
+
+import android.os.Build
+import android.widget.ImageView
+
+/**
+ * Attempts to set the tooltip for the ImageView.
+ * If the OS does not support tooltips, this function will have no effect.
+ * @param tooltip The tooltip of the image
+ */
+fun ImageView.trySetTooltip(tooltip: String) {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+        tooltipText = tooltip
+    }
+}
diff --git a/app/src/main/java/com/github/libretube/ui/views/CustomExoPlayerView.kt b/app/src/main/java/com/github/libretube/ui/views/CustomExoPlayerView.kt
index 4080717a4..01250cdbd 100644
--- a/app/src/main/java/com/github/libretube/ui/views/CustomExoPlayerView.kt
+++ b/app/src/main/java/com/github/libretube/ui/views/CustomExoPlayerView.kt
@@ -5,7 +5,6 @@ import android.app.Activity
 import android.content.Context
 import android.content.res.Configuration
 import android.graphics.Color
-import android.os.Build
 import android.os.Handler
 import android.os.Looper
 import android.text.format.DateUtils
@@ -50,6 +49,7 @@ import com.github.libretube.helpers.PreferenceHelper
 import com.github.libretube.obj.BottomSheetItem
 import com.github.libretube.ui.base.BaseActivity
 import com.github.libretube.ui.extensions.toggleSystemBars
+import com.github.libretube.ui.extensions.trySetTooltip
 import com.github.libretube.ui.interfaces.PlayerGestureOptions
 import com.github.libretube.ui.interfaces.PlayerOptions
 import com.github.libretube.ui.listeners.PlayerGestureController
@@ -128,11 +128,15 @@ open class CustomExoPlayerView(
         // locking the player
         binding.lockPlayer.setOnClickListener {
             // change the locked/unlocked icon
-            val icon = if (!isPlayerLocked)  R.drawable.ic_locked else  R.drawable.ic_unlocked;
-            val tooltip = if (!isPlayerLocked)  R.string.tooltip_unlocked else  R.string.tooltip_locked;
+            val icon = if (!isPlayerLocked) R.drawable.ic_locked else R.drawable.ic_unlocked
+            val tooltip = if (!isPlayerLocked) {
+                R.string.tooltip_unlocked
+            } else {
+                R.string.tooltip_locked
+            }
+
             binding.lockPlayer.setImageResource(icon)
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
-                binding.lockPlayer.tooltipText = context.getString(tooltip)
+            binding.lockPlayer.trySetTooltip(context.getString(tooltip))
 
             // show/hide all the controls
             lockPlayer(isPlayerLocked)
diff --git a/app/src/main/res/layout-v26/queue_bottom_sheet.xml b/app/src/main/res/layout-v26/queue_bottom_sheet.xml
deleted file mode 100644
index c739db968..000000000
--- a/app/src/main/res/layout-v26/queue_bottom_sheet.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <FrameLayout
-        android:id="@+id/standard_bottom_sheet"
-        style="@style/Widget.Material3.BottomSheet"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:paddingBottom="20dp"
-        app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <!-- Drag handle for accessibility -->
-            <com.google.android.material.bottomsheet.BottomSheetDragHandleView
-                android:id="@+id/drag_handle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/options_recycler"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1" />
-
-            <LinearLayout
-                android:id="@+id/bottom_controls"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="5dp"
-                android:background="@drawable/rounded_ripple"
-                android:padding="10dp">
-
-                <ImageView
-                    android:id="@+id/repeat"
-                    style="@style/QueueSheetOption"
-                    android:src="@drawable/ic_repeat" />
-
-                <ImageView
-                    android:id="@+id/shuffle"
-                    style="@style/QueueSheetOption"
-                    android:src="@drawable/ic_shuffle" />
-
-                <ImageView
-                    android:id="@+id/reverse"
-                    style="@style/QueueSheetOption"
-                    android:src="@drawable/ic_reverse" />
-
-                <ImageView
-                    android:id="@+id/add_to_playlist"
-                    style="@style/QueueSheetOption"
-                    android:src="@drawable/ic_playlist_add" />
-
-                <ImageView
-                    android:id="@+id/sort"
-                    style="@style/QueueSheetOption"
-                    android:src="@drawable/ic_sort" />
-
-                <ImageView
-                    android:id="@+id/watch_positions_options"
-                    style="@style/QueueSheetOption"
-                    android:src="@drawable/ic_eye" />
-
-                <ImageView
-                    android:id="@+id/clear_queue"
-                    style="@style/QueueSheetOption"
-                    android:src="@drawable/ic_close" />
-
-                <ImageView
-                    style="@style/QueueSheetOption"
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:tooltipText="Dismiss"
-                    android:src="@drawable/ic_arrow_down" />
-
-            </LinearLayout>
-
-        </LinearLayout>
-
-    </FrameLayout>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/playback_bottom_sheet.xml b/app/src/main/res/layout/playback_bottom_sheet.xml
index 1d6c3c50b..063ba4e2d 100644
--- a/app/src/main/res/layout/playback_bottom_sheet.xml
+++ b/app/src/main/res/layout/playback_bottom_sheet.xml
@@ -57,6 +57,7 @@
 
                     <ImageView
                         android:id="@+id/reset_speed"
+                        android:tooltipText="@string/reset"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
@@ -95,6 +96,7 @@
 
                     <ImageView
                         android:id="@+id/reset_pitch"
+                        android:tooltipText="@string/reset"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"