From 7fa6e846be3479a4b6534f6a0db2580577136c85 Mon Sep 17 00:00:00 2001
From: Bnyro <yannick.fehler@web.de>
Date: Sun, 10 Jul 2022 17:53:17 +0200
Subject: [PATCH 1/2] navbar label visibility option

---
 .../com/github/libretube/activities/MainActivity.kt  | 11 +++++++++++
 app/src/main/res/drawable/ic_label.xml               | 10 ++++++++++
 app/src/main/res/values/array.xml                    | 12 ++++++++++++
 app/src/main/res/values/strings.xml                  |  4 ++++
 app/src/main/res/xml/appearance_settings.xml         |  9 +++++++++
 5 files changed, 46 insertions(+)
 create mode 100644 app/src/main/res/drawable/ic_label.xml

diff --git a/app/src/main/java/com/github/libretube/activities/MainActivity.kt b/app/src/main/java/com/github/libretube/activities/MainActivity.kt
index d5618ef91..45f032df3 100644
--- a/app/src/main/java/com/github/libretube/activities/MainActivity.kt
+++ b/app/src/main/java/com/github/libretube/activities/MainActivity.kt
@@ -38,6 +38,7 @@ import com.github.libretube.util.RetrofitInstance
 import com.github.libretube.util.ThemeHelper
 import com.google.android.material.color.DynamicColors
 import com.google.android.material.elevation.SurfaceColors
+import com.google.android.material.navigation.NavigationBarView
 
 class MainActivity : AppCompatActivity() {
     val TAG = "MainActivity"
@@ -124,6 +125,16 @@ class MainActivity : AppCompatActivity() {
             // navigate to the default fragment
             navController.navigate(startFragmentId)
 
+            val labelVisibilityMode = when (
+                PreferenceHelper.getString(this, "label_visibility", "always")
+            ) {
+                "always" -> NavigationBarView.LABEL_VISIBILITY_LABELED
+                "selected" -> NavigationBarView.LABEL_VISIBILITY_SELECTED
+                "never" -> NavigationBarView.LABEL_VISIBILITY_UNLABELED
+                else -> NavigationBarView.LABEL_VISIBILITY_AUTO
+            }
+            binding.bottomNav.labelVisibilityMode = labelVisibilityMode
+
             binding.bottomNav.setOnItemSelectedListener {
                 // clear backstack if it's the start fragment
                 if (startFragmentId == it.itemId) navController.backQueue.clear()
diff --git a/app/src/main/res/drawable/ic_label.xml b/app/src/main/res/drawable/ic_label.xml
new file mode 100644
index 000000000..fc165149c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_label.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?android:attr/colorControlNormal"
+    android:viewportWidth="320"
+    android:viewportHeight="320">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M311.34,8.67c-5.61,-5.61 -13.24,-8.73 -21.18,-8.66L194.28,0.85c-7.76,0.07 -15.17,3.18 -20.66,8.66L8.66,174.47c-11.55,11.55 -11.55,30.28 0,41.83l95.03,95.03c11.55,11.56 30.28,11.56 41.83,0l164.96,-164.96c5.48,-5.49 8.59,-12.9 8.66,-20.66l0.85,-95.88C320.07,21.91 316.95,14.27 311.34,8.67zM254.04,113.77c-13.2,13.21 -34.61,13.2 -47.81,0c-13.2,-13.2 -13.2,-34.6 0,-47.81c13.2,-13.2 34.61,-13.2 47.81,0C267.24,79.16 267.24,100.57 254.04,113.77z" />
+</vector>
diff --git a/app/src/main/res/values/array.xml b/app/src/main/res/values/array.xml
index f57787c26..6c7eac38c 100644
--- a/app/src/main/res/values/array.xml
+++ b/app/src/main/res/values/array.xml
@@ -709,4 +709,16 @@
         <item>portrait</item>
     </string-array>
 
+    <string-array name="labelVisibility">
+        <item>@string/always</item>
+        <item>@string/selected</item>
+        <item>@string/never</item>
+    </string-array>
+
+    <string-array name="labelVisibilityValues">
+        <item>always</item>
+        <item>selected</item>
+        <item>never</item>
+    </string-array>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6f0f77787..141527a8f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -233,4 +233,8 @@
     <string name="change_playback_speed">Playback speed</string>
     <string name="require_restart">Restart required</string>
     <string name="require_restart_message">This change requires an app restart. Do you want to restart the app now? Otherwise the changes will be applied on the next app restart.</string>
+    <string name="navLabelVisibility">Navbar label visibility</string>
+    <string name="always">Always</string>
+    <string name="selected">Selected</string>
+    <string name="never">Never</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/appearance_settings.xml b/app/src/main/res/xml/appearance_settings.xml
index f044c2967..a8d3c834b 100644
--- a/app/src/main/res/xml/appearance_settings.xml
+++ b/app/src/main/res/xml/appearance_settings.xml
@@ -51,6 +51,15 @@
             app:title="@string/hideTrendingPage"
             app:useSimpleSummaryProvider="true" />
 
+        <ListPreference
+            android:icon="@drawable/ic_label"
+            app:defaultValue="always"
+            app:entries="@array/labelVisibility"
+            app:entryValues="@array/labelVisibilityValues"
+            app:key="label_visibility"
+            app:title="@string/navLabelVisibility"
+            app:useSimpleSummaryProvider="true" />
+
         <ListPreference
             android:icon="@drawable/ic_grid"
             app:defaultValue="@integer/grid_items"

From c8347637ae5f4d3b84f19915c20fa1f36a930908 Mon Sep 17 00:00:00 2001
From: Bnyro <yannick.fehler@web.de>
Date: Sun, 10 Jul 2022 17:55:56 +0200
Subject: [PATCH 2/2] fixes

---
 .../com/github/libretube/preferences/AppearanceSettings.kt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/src/main/java/com/github/libretube/preferences/AppearanceSettings.kt b/app/src/main/java/com/github/libretube/preferences/AppearanceSettings.kt
index a69755fc3..2658cb852 100644
--- a/app/src/main/java/com/github/libretube/preferences/AppearanceSettings.kt
+++ b/app/src/main/java/com/github/libretube/preferences/AppearanceSettings.kt
@@ -52,6 +52,13 @@ class AppearanceSettings : PreferenceFragmentCompat() {
             restartDialog.show(childFragmentManager, "RequireRestartDialog")
             true
         }
+
+        val labelVisibilityMode = findPreference<ListPreference>("label_visibility")
+        labelVisibilityMode?.setOnPreferenceChangeListener { _, _ ->
+            val restartDialog = RequireRestartDialog()
+            restartDialog.show(childFragmentManager, "RequireRestartDialog")
+            true
+        }
     }
 
     // remove material you from accent color option if not available