From 3bea7f01ef974e5c4e119f59cb5c02b46e1dc747 Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Sun, 25 Sep 2022 00:21:58 +0200
Subject: [PATCH 1/2] Probable fix for Fire TV home provider categories
 selection

---
 .../lagradost/cloudstream3/ui/home/HomeFragment.kt | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
index 0071ab49..11318ce6 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
@@ -352,11 +352,25 @@ class HomeFragment : Fragment() {
                     arrayAdapter.notifyDataSetChanged()
                 }
 
+                /**
+                 * Since fire tv is fucked we need to manually define the focus layout.
+                 * Since visible buttons are only known in runtime this is required.
+                 **/
+                var lastButton: MaterialButton? = null
+
                 for ((button, validTypes) in pairList) {
                     val isValid =
                         validAPIs.any { api -> validTypes.any { api.supportedTypes.contains(it) } }
                     button?.isVisible = isValid
                     if (isValid) {
+
+                        // Set focus navigation
+                        button?.let { currentButton ->
+                            lastButton?.nextFocusRightId = currentButton.id
+                            lastButton?.id?.let { currentButton.nextFocusLeftId = it }
+                            lastButton = currentButton
+                        }
+
                         fun buttonContains(): Boolean {
                             return preSelectedTypes.any { validTypes.contains(it) }
                         }

From fd0fb969b2113aa2ac7fed5489d791b9025e17e1 Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Sun, 25 Sep 2022 00:50:14 +0200
Subject: [PATCH 2/2] Real fix for Fire TV home screen categories

---
 .../com/lagradost/cloudstream3/ui/home/HomeFragment.kt   | 9 +++++----
 app/src/main/res/layout/home_select_mainpage.xml         | 5 +++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
index 11318ce6..4620b11f 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
@@ -256,13 +256,14 @@ class HomeFragment : Fragment() {
             nsfw: MaterialButton?,
             others: MaterialButton?,
         ): List<Pair<MaterialButton?, List<TvType>>> {
+            // This list should be same order as home screen to aid navigation
             return listOf(
-                Pair(anime, listOf(TvType.Anime, TvType.OVA, TvType.AnimeMovie)),
-                Pair(cartoons, listOf(TvType.Cartoon)),
-                Pair(tvs, listOf(TvType.TvSeries)),
-                Pair(docs, listOf(TvType.Documentary)),
                 Pair(movies, listOf(TvType.Movie, TvType.Torrent)),
+                Pair(tvs, listOf(TvType.TvSeries)),
+                Pair(anime, listOf(TvType.Anime, TvType.OVA, TvType.AnimeMovie)),
                 Pair(asian, listOf(TvType.AsianDrama)),
+                Pair(cartoons, listOf(TvType.Cartoon)),
+                Pair(docs, listOf(TvType.Documentary)),
                 Pair(livestream, listOf(TvType.Live)),
                 Pair(nsfw, listOf(TvType.NSFW)),
                 Pair(others, listOf(TvType.Others)),
diff --git a/app/src/main/res/layout/home_select_mainpage.xml b/app/src/main/res/layout/home_select_mainpage.xml
index 6f86d40c..ca9fa517 100644
--- a/app/src/main/res/layout/home_select_mainpage.xml
+++ b/app/src/main/res/layout/home_select_mainpage.xml
@@ -52,6 +52,11 @@
 
                      android:id="@+id/home_select_none"
                      style="@style/RoundedSelectableButtonIcon"/>-->
+
+            <!--
+            If you reorder this fix getPairList() too!
+            That shit is responsible for focus selection
+            -->
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/home_select_movies"