From 4f54bf3ae47b4946e506521c241870785b110501 Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Fri, 9 Dec 2022 00:37:59 +0100
Subject: [PATCH] Added outlines to more things to increase accessibility on
 Android TV

---
 .../res/color/white_transparent_toggle.xml    |   5 +
 .../layout/player_select_source_and_subs.xml  | 215 +++++++++---------
 .../main/res/layout/search_history_item.xml   |  65 +++---
 .../res/layout/sort_bottom_single_choice.xml  |   8 +-
 app/src/main/res/values/styles.xml            |   9 +-
 5 files changed, 157 insertions(+), 145 deletions(-)
 create mode 100644 app/src/main/res/color/white_transparent_toggle.xml

diff --git a/app/src/main/res/color/white_transparent_toggle.xml b/app/src/main/res/color/white_transparent_toggle.xml
new file mode 100644
index 00000000..a94501bd
--- /dev/null
+++ b/app/src/main/res/color/white_transparent_toggle.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_focused="true" android:color="?attr/white"/>
+    <item android:color="@color/transparent"/>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/player_select_source_and_subs.xml b/app/src/main/res/layout/player_select_source_and_subs.xml
index 1efa00be..369f6776 100644
--- a/app/src/main/res/layout/player_select_source_and_subs.xml
+++ b/app/src/main/res/layout/player_select_source_and_subs.xml
@@ -1,148 +1,149 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@null"
-        android:orientation="vertical">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@null"
+    android:orientation="vertical">
 
     <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginBottom="60dp"
-            android:baselineAligned="false"
-            android:orientation="horizontal">
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginBottom="60dp"
+        android:baselineAligned="false"
+        android:orientation="horizontal">
 
         <LinearLayout
-                android:id="@+id/sort_sources_holder"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="50"
-                android:orientation="vertical">
+            android:id="@+id/sort_sources_holder"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="50"
+            android:orientation="vertical">
 
             <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_rowWeight="1"
-                    android:layout_marginTop="10dp"
-                    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-                    android:paddingTop="10dp"
-                    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-                    android:paddingBottom="10dp"
-                    android:text="@string/pick_source"
-                    android:textColor="?attr/textColor"
-                    android:textSize="20sp"
-                    android:textStyle="bold" />
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_rowWeight="1"
+                android:layout_marginTop="10dp"
+                android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+                android:paddingTop="10dp"
+                android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+                android:paddingBottom="10dp"
+                android:text="@string/pick_source"
+                android:textColor="?attr/textColor"
+                android:textSize="20sp"
+                android:textStyle="bold" />
 
             <ListView
-                    android:requiresFadingEdge="vertical"
-                    android:id="@+id/sort_providers"
-                    android:layout_width="match_parent"
-
-                    android:layout_height="match_parent"
-                    android:layout_rowWeight="1"
-                    android:background="?attr/primaryBlackBackground"
-                    android:nextFocusLeft="@id/sort_subtitles"
-                    android:nextFocusRight="@id/apply_btt"
-                    tools:listitem="@layout/sort_bottom_single_choice" />
+                android:id="@+id/sort_providers"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_rowWeight="1"
+                android:background="?attr/primaryBlackBackground"
+                android:listSelector="@drawable/outline_drawable_less"
+                android:nextFocusLeft="@id/sort_subtitles"
+                android:nextFocusRight="@id/apply_btt"
+                android:requiresFadingEdge="vertical"
+                tools:listitem="@layout/sort_bottom_single_choice" />
         </LinearLayout>
 
         <LinearLayout
-                android:id="@+id/sort_subtitles_holder"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="50"
-                android:orientation="vertical">
+            android:id="@+id/sort_subtitles_holder"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="50"
+            android:orientation="vertical">
 
             <!--   android:id="@+id/subs_settings"                 android:foreground="?android:attr/selectableItemBackgroundBorderless"
 -->
             <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    tools:ignore="UseCompoundDrawables">
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                tools:ignore="UseCompoundDrawables">
 
                 <LinearLayout
-                        android:foreground="?attr/selectableItemBackgroundBorderless"
-                        android:id="@+id/subtitles_click_settings"
-                        android:layout_rowWeight="1"
-                        android:paddingTop="10dp"
-                        android:paddingBottom="10dp"
-                        android:layout_marginTop="10dp"
-                        android:orientation="horizontal"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
+                    android:id="@+id/subtitles_click_settings"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_rowWeight="1"
+                    android:layout_marginTop="10dp"
+                    android:background="@drawable/outline_drawable_less"
+                    android:foreground="?attr/selectableItemBackgroundBorderless"
+                    android:orientation="horizontal"
+                    android:paddingTop="10dp"
+                    android:paddingBottom="10dp">
 
                     <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-                            android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-                            android:text="@string/pick_subtitle"
-                            android:textColor="?attr/textColor"
-                            android:textSize="20sp"
-                            android:textStyle="bold" />
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+                        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+                        android:text="@string/pick_subtitle"
+                        android:textColor="?attr/textColor"
+                        android:textSize="20sp"
+                        android:textStyle="bold" />
 
                     <TextView
-                            android:textSize="15sp"
-                            android:id="@+id/subtitles_encoding_format"
-                            android:textColor="?attr/textColor"
-                            android:layout_gravity="center"
-                            android:gravity="center"
-                            tools:text="Thai (TIS 620-2533/ISO 8859-11)"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content" />
+                        android:id="@+id/subtitles_encoding_format"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:gravity="center"
+                        android:textColor="?attr/textColor"
+                        android:textSize="15sp"
+                        tools:text="Thai (TIS 620-2533/ISO 8859-11)" />
                 </LinearLayout>
 
                 <ImageView
-                        android:layout_width="25dp"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="end|center_vertical"
-                        android:layout_marginTop="0dp"
-                        android:layout_marginEnd="10dp"
+                    android:layout_width="25dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end|center_vertical"
+                    android:layout_marginTop="0dp"
+                    android:layout_marginEnd="10dp"
 
-                        android:contentDescription="@string/home_change_provider_img_des"
-                        android:src="@drawable/ic_outline_settings_24"
-                        android:visibility="gone" />
+                    android:contentDescription="@string/home_change_provider_img_des"
+                    android:src="@drawable/ic_outline_settings_24"
+                    android:visibility="gone" />
             </LinearLayout>
 
             <ListView
-                    android:requiresFadingEdge="vertical"
-                    android:id="@+id/sort_subtitles"
-                    android:layout_width="match_parent"
-
-                    android:layout_height="match_parent"
-                    android:layout_rowWeight="1"
-                    android:background="?attr/primaryBlackBackground"
-                    android:nextFocusLeft="@id/sort_providers"
-                    android:nextFocusRight="@id/cancel_btt"
-                    tools:listfooter="@layout/sort_bottom_footer_add_choice"
-                    tools:listitem="@layout/sort_bottom_single_choice" />
+                android:id="@+id/sort_subtitles"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_rowWeight="1"
+                android:background="?attr/primaryBlackBackground"
+                android:listSelector="@drawable/outline_drawable_less"
+                android:nextFocusLeft="@id/sort_providers"
+                android:nextFocusRight="@id/cancel_btt"
+                android:requiresFadingEdge="vertical"
+                tools:listfooter="@layout/sort_bottom_footer_add_choice"
+                tools:listitem="@layout/sort_bottom_single_choice" />
         </LinearLayout>
     </LinearLayout>
 
     <LinearLayout
-            android:id="@+id/apply_btt_holder"
-            android:orientation="horizontal"
-            android:layout_gravity="bottom"
-            android:gravity="bottom|end"
-            android:layout_marginTop="-60dp"
-            android:layout_width="match_parent"
-            android:layout_height="60dp">
+        android:id="@+id/apply_btt_holder"
+        android:layout_width="match_parent"
+        android:layout_height="60dp"
+        android:layout_gravity="bottom"
+        android:layout_marginTop="-60dp"
+        android:gravity="bottom|end"
+        android:orientation="horizontal">
 
 
         <com.google.android.material.button.MaterialButton
-                style="@style/WhiteButton"
-                android:layout_gravity="center_vertical|end"
-                android:text="@string/sort_apply"
-                android:id="@+id/apply_btt"
-                android:layout_width="wrap_content" />
+            android:id="@+id/apply_btt"
+            style="@style/WhiteButton"
+            android:layout_width="wrap_content"
+            android:layout_gravity="center_vertical|end"
+            android:text="@string/sort_apply" />
 
         <com.google.android.material.button.MaterialButton
-                style="@style/BlackButton"
-                android:layout_gravity="center_vertical|end"
-                android:text="@string/sort_cancel"
-                android:id="@+id/cancel_btt"
-                android:layout_width="wrap_content" />
+            android:id="@+id/cancel_btt"
+            style="@style/BlackButton"
+            android:layout_width="wrap_content"
+            android:layout_gravity="center_vertical|end"
+            android:text="@string/sort_cancel" />
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/search_history_item.xml b/app/src/main/res/layout/search_history_item.xml
index 34cd59bc..ef441234 100644
--- a/app/src/main/res/layout/search_history_item.xml
+++ b/app/src/main/res/layout/search_history_item.xml
@@ -1,39 +1,42 @@
 <?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"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:id="@+id/home_history_tab"
-        android:foreground="?android:attr/selectableItemBackgroundBorderless"
-        android:nextFocusRight="@id/home_history_remove">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/home_history_tab"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/outline_drawable_less"
+    android:foreground="?android:attr/selectableItemBackgroundBorderless"
+    android:nextFocusRight="@id/home_history_remove"
+    android:orientation="horizontal">
 
     <TextView
-            android:id="@+id/home_history_title"
-            android:textColor="?attr/textColor"
-            android:textSize="18sp"
-            tools:text="Hello World"
-            android:padding="10dp"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent" />
+        android:id="@+id/home_history_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="10dp"
+        android:textColor="?attr/textColor"
+        android:textSize="18sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="Hello World" />
 
     <ImageView
-            android:padding="10dp"
-            android:id="@+id/home_history_remove"
-            android:nextFocusLeft="@id/home_history_tab"
-            android:background="?android:attr/selectableItemBackgroundBorderless"
+        android:id="@+id/home_history_remove"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_gravity="center_vertical|end"
 
-            android:src="@drawable/ic_baseline_close_24"
-            android:layout_width="wrap_content"
-            android:layout_gravity="center_vertical|end"
-            android:layout_height="match_parent"
-            app:tint="?attr/white"
-            tools:ignore="ContentDescription"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" />
+        android:background="@drawable/outline_drawable_less"
+        android:foreground="?android:attr/selectableItemBackgroundBorderless"
+
+        android:nextFocusLeft="@id/home_history_tab"
+        android:padding="10dp"
+        android:src="@drawable/ic_baseline_close_24"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:tint="?attr/white"
+        tools:ignore="ContentDescription" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/sort_bottom_single_choice.xml b/app/src/main/res/layout/sort_bottom_single_choice.xml
index 6e81cf2e..3d0a70ff 100644
--- a/app/src/main/res/layout/sort_bottom_single_choice.xml
+++ b/app/src/main/res/layout/sort_bottom_single_choice.xml
@@ -14,7 +14,7 @@
 -->
 
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
-        style="@style/CheckLabel"
-        tools:text="hello"
-        android:id="@android:id/text1" />
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@android:id/text1"
+    style="@style/CheckLabel"
+    tools:text="hello" />
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 4fde7ae8..12da27de 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -70,6 +70,8 @@
 
     <style name="ListViewStyle" parent="Widget.AppCompat.ListView">
         <item name="android:divider">@null</item>
+        <item name="android:listSelector">@drawable/outline_drawable_less</item>
+        <item name="android:drawSelectorOnTop">false</item>
     </style>
 
     <style name="AmoledModeLight" parent="AmoledMode">
@@ -78,7 +80,8 @@
 
     <style name="ChipFilled" parent="@style/Widget.Material3.Chip.Filter">
         <item name="chipBackgroundColor">@color/chip_color</item>
-        <item name="chipStrokeColor">@color/transparent</item>
+        <item name="chipStrokeColor">@color/white_transparent_toggle</item>
+        <item name="chipStrokeWidth">2dp</item>
         <item name="textColor">@color/chip_color_text</item>
         <item name="android:textColor">@color/chip_color_text</item>
         <item name="checkedIconTint">@color/chip_color_text</item>
@@ -97,7 +100,7 @@
         <item name="white">@color/white</item>
         <item name="colorOnPrimary">@color/whiteText</item>
     </style>
-    
+
     <style name="DubButton" parent="@style/SearchBox">
         <item name="android:background">@drawable/dub_bg_color</item>
         <item name="android:text">@string/app_dubbed_text</item>
@@ -455,7 +458,7 @@
         <item name="android:paddingStart">20dp</item>
         <item name="android:paddingEnd">20dp</item>
         <item name="android:selectAllOnFocus">true</item>
-        <item name="android:background">@color/transparent</item>
+        <item name="android:background">@drawable/outline_drawable_less</item>
         <item name="android:textColor">?attr/textColor</item>
         <item name="android:foreground">?attr/selectableItemBackgroundBorderless</item>
         <item name="android:textAppearance">?android:attr/textAppearanceListItemSmall</item>