From 693f69f25f32faf5555fd84e20d54746502cc7a1 Mon Sep 17 00:00:00 2001
From: firelight <147925818+fire-light42@users.noreply.github.com>
Date: Thu, 21 Aug 2025 03:51:52 +0200
Subject: [PATCH] Feat: Expandable navigation rail on focus

---
 .../lagradost/cloudstream3/MainActivity.kt    | 29 +++++++++++++++++++
 app/src/main/res/layout/activity_main_tv.xml  |  8 +++--
 gradle/libs.versions.toml                     |  2 +-
 3 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
index ed3db1493..4bf26ceed 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
@@ -1709,6 +1709,35 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
             }
         }
 
+        val rail = binding?.navRailView
+        if (rail != null && isLayout(TV)) {
+            val focus = mutableSetOf<Int>()
+            for (id in arrayOf(
+                R.id.navigation_home,
+                R.id.navigation_library,
+                R.id.navigation_search,
+                R.id.navigation_downloads,
+                R.id.navigation_settings
+            )) {
+                rail.findViewById<View?>(id)?.onFocusChangeListener =
+                    View.OnFocusChangeListener { v, hasFocus ->
+                        if (hasFocus) {
+                            focus += id
+                            binding?.navRailView?.labelVisibilityMode = NavigationRailView.LABEL_VISIBILITY_LABELED
+                            binding?.navRailView?.expand()
+                        } else {
+                            focus -= id
+                            v.post {
+                                if(focus.isEmpty()) {
+                                    binding?.navRailView?.labelVisibilityMode = NavigationRailView.LABEL_VISIBILITY_UNLABELED
+                                    binding?.navRailView?.collapse()
+                                }
+                            }
+                        }
+                    }
+            }
+        }
+
         // Navigation button long click functionality to scroll to top
         for (view in listOf(binding?.navView, binding?.navRailView)) {
             view?.findViewById<View?>(R.id.navigation_home)?.setOnLongClickListener {
diff --git a/app/src/main/res/layout/activity_main_tv.xml b/app/src/main/res/layout/activity_main_tv.xml
index 0003b2618..e36aacbcd 100644
--- a/app/src/main/res/layout/activity_main_tv.xml
+++ b/app/src/main/res/layout/activity_main_tv.xml
@@ -25,14 +25,18 @@
 
         <com.google.android.material.navigationrail.NavigationRailView
             android:id="@+id/nav_rail_view"
-            android:layout_width="62dp"
+            android:layout_width="wrap_content"
             android:layout_height="match_parent"
+            android:minWidth="62dp"
+            android:maxWidth="62dp"
+            app:expanded="false"
+            app:expandedMaxWidth="180dp"
             app:itemIconTint="@color/item_select_color"
             app:itemTextColor="@color/item_select_color"
             android:background="?attr/primaryGrayBackground"
             android:descendantFocusability="afterDescendants"
             app:headerLayout="@layout/rail_header"
-            app:labelVisibilityMode="unlabeled"
+            app:labelVisibilityMode="labeled"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:menu="@menu/bottom_nav_menu"
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 7a3fd9165..fa04e5a80 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -23,7 +23,7 @@ kotlinGradlePluginVersion = "2.1.10"
 kotlinxCoroutinesCore = "1.10.1"
 lifecycleLivedataKtx = "2.8.7"
 lifecycleViewmodelKtx = "2.8.7"
-material = "1.12.0"
+material = "1.14.0-alpha04"
 media3 = "1.6.1"
 navigationKtx = "2.8.9"
 newpipeextractor = "v0.24.6"