From 0ec114322edc7ba0cf03d6857a8e747ccee975be Mon Sep 17 00:00:00 2001
From: yuhan6665 <1588741+yuhan6665@users.noreply.github.com>
Date: Mon, 2 Mar 2020 09:06:16 -0500
Subject: [PATCH] Fix UI touch issues for Android TV

---
 .../res/drawable/background_test_button.xml   | 10 ++++++
 .../app/src/main/res/layout/activity_main.xml |  8 +++--
 .../res/layout/item_recycler_bypass_list.xml  |  6 +++-
 .../main/res/layout/item_recycler_main.xml    | 32 ++++++++++++-------
 .../res/layout/item_recycler_sub_setting.xml  | 21 ++++++++----
 V2rayNG/app/src/main/res/values/dimens.xml    |  1 +
 6 files changed, 58 insertions(+), 20 deletions(-)
 create mode 100644 V2rayNG/app/src/main/res/drawable/background_test_button.xml

diff --git a/V2rayNG/app/src/main/res/drawable/background_test_button.xml b/V2rayNG/app/src/main/res/drawable/background_test_button.xml
new file mode 100644
index 000000000..ed2c5e680
--- /dev/null
+++ b/V2rayNG/app/src/main/res/drawable/background_test_button.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true"
+            android:drawable="@color/secondary_text" />
+    <item android:state_focused="true"
+            android:drawable="@color/secondary_text" />
+    <item android:state_hovered="true"
+            android:drawable="@color/secondary_text" />
+    <item android:drawable="@color/colorPrimary_text" />
+</selector>
\ No newline at end of file
diff --git a/V2rayNG/app/src/main/res/layout/activity_main.xml b/V2rayNG/app/src/main/res/layout/activity_main.xml
index 054ba3ba6..ce364e7ad 100644
--- a/V2rayNG/app/src/main/res/layout/activity_main.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_main.xml
@@ -54,8 +54,10 @@
                         android:id="@+id/layout_test"
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/connection_test_height"
-                        android:background="@color/colorPrimary_text"
-                        android:gravity="center|left">
+                        android:background="@drawable/background_test_button"
+                        android:gravity="center|left"
+                        android:clickable="true"
+                        android:focusable="true">
 
                         <TextView
                             android:id="@+id/tv_test_state"
@@ -92,6 +94,8 @@
                         android:layout_marginLeft="16dp"
                         android:layout_marginTop="16dp"
                         android:src="@drawable/ic_v_idle"
+                        android:clickable="true"
+                        android:focusable="true"
                         app:layout_anchorGravity="bottom|right|end" />
 
                 </com.github.jorgecastilloprz.FABProgressCircle>
diff --git a/V2rayNG/app/src/main/res/layout/item_recycler_bypass_list.xml b/V2rayNG/app/src/main/res/layout/item_recycler_bypass_list.xml
index 2c4031d96..bde3c01de 100644
--- a/V2rayNG/app/src/main/res/layout/item_recycler_bypass_list.xml
+++ b/V2rayNG/app/src/main/res/layout/item_recycler_bypass_list.xml
@@ -2,7 +2,10 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:gravity="center_vertical">
+    android:gravity="center_vertical"
+    android:background="?android:attr/selectableItemBackground"
+    android:clickable="true"
+    android:focusable="true">
 
     <android.support.v7.widget.AppCompatImageView
         android:id="@+id/icon"
@@ -40,6 +43,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:clickable="false"
+        android:focusable="false"
         android:paddingStart="2dp"
         android:paddingLeft="2dp"
         android:paddingEnd="6dp"
diff --git a/V2rayNG/app/src/main/res/layout/item_recycler_main.xml b/V2rayNG/app/src/main/res/layout/item_recycler_main.xml
index 3751efd95..9b9f53034 100644
--- a/V2rayNG/app/src/main/res/layout/item_recycler_main.xml
+++ b/V2rayNG/app/src/main/res/layout/item_recycler_main.xml
@@ -9,10 +9,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="3dp"
-        android:clickable="true"
-        android:focusable="true"
-        android:foreground="?android:attr/selectableItemBackground"
-        android:orientation="horizontal"
         card_view:cardCornerRadius="5dp">
 
         <LinearLayout
@@ -21,7 +17,11 @@
             android:layout_height="@dimen/server_height"
             android:layout_gravity="center"
             android:gravity="center"
-            android:orientation="horizontal">
+            android:orientation="horizontal"
+            android:background="?android:attr/selectableItemBackground"
+            android:clickable="true"
+            android:focusable="true"
+            android:nextFocusRight="@+id/layout_share">
 
             <LinearLayout
                 android:layout_width="wrap_content"
@@ -111,10 +111,14 @@
                     <LinearLayout
                         android:id="@+id/layout_share"
                         android:layout_width="wrap_content"
-                        android:layout_height="@dimen/server_height"
+                        android:layout_height="match_parent"
                         android:gravity="center"
                         android:orientation="vertical"
-                        android:paddingEnd="@dimen/layout_margin_right_height">
+                        android:padding="@dimen/layout_margin_spacing"
+                        android:background="?android:attr/selectableItemBackground"
+                        android:clickable="true"
+                        android:focusable="true"
+                        android:nextFocusLeft="@+id/info_container">
 
                         <ImageView
                             android:layout_width="wrap_content"
@@ -126,10 +130,13 @@
                     <LinearLayout
                         android:id="@+id/layout_edit"
                         android:layout_width="wrap_content"
-                        android:layout_height="@dimen/server_height"
+                        android:layout_height="match_parent"
                         android:gravity="center"
                         android:orientation="vertical"
-                        android:paddingEnd="@dimen/layout_margin_right_height">
+                        android:padding="@dimen/layout_margin_spacing"
+                        android:background="?android:attr/selectableItemBackground"
+                        android:clickable="true"
+                        android:focusable="true">
 
                         <ImageView
                             android:layout_width="@dimen/png_height"
@@ -141,10 +148,13 @@
                     <LinearLayout
                         android:id="@+id/layout_remove"
                         android:layout_width="wrap_content"
-                        android:layout_height="@dimen/server_height"
+                        android:layout_height="match_parent"
                         android:gravity="center"
                         android:orientation="vertical"
-                        android:paddingEnd="@dimen/layout_margin_right_height">
+                        android:padding="@dimen/layout_margin_spacing"
+                        android:background="?android:attr/selectableItemBackground"
+                        android:clickable="true"
+                        android:focusable="true">
 
                         <ImageView
                             android:layout_width="@dimen/png_height"
diff --git a/V2rayNG/app/src/main/res/layout/item_recycler_sub_setting.xml b/V2rayNG/app/src/main/res/layout/item_recycler_sub_setting.xml
index 30f93c150..c4d66627d 100644
--- a/V2rayNG/app/src/main/res/layout/item_recycler_sub_setting.xml
+++ b/V2rayNG/app/src/main/res/layout/item_recycler_sub_setting.xml
@@ -6,6 +6,7 @@
     android:gravity="center_vertical">
 
     <android.support.v7.widget.CardView xmlns:card_view="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/item_cardview"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="3dp"
@@ -13,7 +14,8 @@
         android:focusable="true"
         android:foreground="?android:attr/selectableItemBackground"
         android:orientation="horizontal"
-        card_view:cardCornerRadius="5dp">
+        card_view:cardCornerRadius="5dp"
+        android:nextFocusRight="@+id/layout_edit">
 
         <LinearLayout
             android:id="@+id/info_container"
@@ -62,11 +64,14 @@
                 <LinearLayout
                     android:id="@+id/layout_share"
                     android:layout_width="wrap_content"
-                    android:layout_height="@dimen/server_height"
+                    android:layout_height="wrap_content"
                     android:gravity="center"
                     android:orientation="vertical"
-                    android:paddingEnd="@dimen/layout_margin_right_height"
-                    android:visibility="invisible">
+                    android:padding="@dimen/layout_margin_spacing"
+                    android:visibility="invisible"
+                    android:background="?android:attr/selectableItemBackground"
+                    android:clickable="true"
+                    android:focusable="true">
 
                     <ImageView
                         android:layout_width="@dimen/png_height"
@@ -78,10 +83,14 @@
                 <LinearLayout
                     android:id="@+id/layout_edit"
                     android:layout_width="wrap_content"
-                    android:layout_height="@dimen/server_height"
+                    android:layout_height="wrap_content"
                     android:gravity="center"
                     android:orientation="vertical"
-                    android:paddingEnd="@dimen/layout_margin_right_height">
+                    android:padding="@dimen/layout_margin_spacing"
+                    android:background="?android:attr/selectableItemBackground"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:nextFocusLeft="@+id/item_cardview">
 
                     <ImageView
                         android:layout_width="@dimen/png_height"
diff --git a/V2rayNG/app/src/main/res/values/dimens.xml b/V2rayNG/app/src/main/res/values/dimens.xml
index 144555196..1b6eae665 100644
--- a/V2rayNG/app/src/main/res/values/dimens.xml
+++ b/V2rayNG/app/src/main/res/values/dimens.xml
@@ -3,6 +3,7 @@
     <dimen name="bypass_list_header_height">50dp</dimen>
     <dimen name="layout_margin_top_height">16dp</dimen>
     <dimen name="layout_margin_right_height">16dp</dimen>
+    <dimen name="layout_margin_spacing">8dp</dimen>
     <dimen name="edit_height">50dp</dimen>
     <dimen name="png_height">24dp</dimen>
     <dimen name="server_height">72dp</dimen>