From 4f8f5024cb9e588f41b6ef752777a783cdc8b8d0 Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Tue, 13 Sep 2022 11:06:11 +0200
Subject: [PATCH] TV Navigation improvements

---
 app/src/main/res/layout/fragment_plugins.xml     | 3 +++
 app/src/main/res/layout/fragment_search.xml      | 4 +++-
 app/src/main/res/layout/home_select_mainpage.xml | 6 ++++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/layout/fragment_plugins.xml b/app/src/main/res/layout/fragment_plugins.xml
index 54eae80f..15e0d2f9 100644
--- a/app/src/main/res/layout/fragment_plugins.xml
+++ b/app/src/main/res/layout/fragment_plugins.xml
@@ -102,18 +102,21 @@
 
                     style="@style/RoundedSelectableButton"
                     android:nextFocusLeft="@id/home_select_cartoons"
+                    android:nextFocusRight="@id/home_select_livestreams"
                     android:text="@string/documentaries" />
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/home_select_livestreams"
                     style="@style/RoundedSelectableButton"
                     android:nextFocusLeft="@id/home_select_documentaries"
+                    android:nextFocusRight="@id/home_select_nsfw"
                     android:text="@string/livestreams" />
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/home_select_nsfw"
                     style="@style/RoundedSelectableButton"
                     android:nextFocusLeft="@id/home_select_livestreams"
+                    android:nextFocusRight="@id/home_select_nsfw"
                     android:text="@string/nsfw" />
 
                 <com.google.android.material.button.MaterialButton
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index a6177a29..31a6b7cd 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -136,21 +136,23 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/search_select_documentaries"
-
                 style="@style/RoundedSelectableButton"
                 android:nextFocusLeft="@id/search_select_cartoons"
+                android:nextFocusRight="@id/search_select_livestreams"
                 android:text="@string/documentaries" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/search_select_livestreams"
                 style="@style/RoundedSelectableButton"
                 android:nextFocusLeft="@id/search_select_documentaries"
+                android:nextFocusRight="@id/search_select_nsfw"
                 android:text="@string/livestreams" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/search_select_nsfw"
                 style="@style/RoundedSelectableButton"
                 android:nextFocusLeft="@id/search_select_livestreams"
+                android:nextFocusRight="@id/search_select_others"
                 android:text="@string/nsfw" />
 
             <com.google.android.material.button.MaterialButton
diff --git a/app/src/main/res/layout/home_select_mainpage.xml b/app/src/main/res/layout/home_select_mainpage.xml
index 51d218fe..6f86d40c 100644
--- a/app/src/main/res/layout/home_select_mainpage.xml
+++ b/app/src/main/res/layout/home_select_mainpage.xml
@@ -31,7 +31,7 @@
         android:paddingEnd="10dp"
         android:requiresFadingEdge="horizontal">
 
-<!--        Man what the fuck we need a recyclerview -->
+        <!--        Man what the fuck we need a recyclerview -->
 
         <LinearLayout
             android:layout_width="wrap_content"
@@ -93,21 +93,23 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/home_select_documentaries"
-
                 style="@style/RoundedSelectableButton"
                 android:nextFocusLeft="@id/home_select_cartoons"
+                android:nextFocusRight="@id/home_select_livestreams"
                 android:text="@string/documentaries" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/home_select_livestreams"
                 style="@style/RoundedSelectableButton"
                 android:nextFocusLeft="@id/home_select_documentaries"
+                android:nextFocusRight="@id/home_select_nsfw"
                 android:text="@string/livestreams" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/home_select_nsfw"
                 style="@style/RoundedSelectableButton"
                 android:nextFocusLeft="@id/home_select_livestreams"
+                android:nextFocusRight="@id/home_select_others"
                 android:text="@string/nsfw" />
 
             <com.google.android.material.button.MaterialButton