From 3c2041933f38536f7454c2c4903878027ff5b09b Mon Sep 17 00:00:00 2001
From: nikk gitanes <tsynik@gmail.com>
Date: Tue, 24 Dec 2019 22:58:10 +0300
Subject: [PATCH] Remote focus fixes (classic UI)

---
 app/src/main/res/layout/fragment_modules.xml     | 4 +++-
 app/src/main/res/layout/item_console.xml         | 1 +
 app/src/main/res/layout/item_hide_app.xml        | 2 ++
 app/src/main/res/layout/item_hide_process.xml    | 2 ++
 app/src/main/res/layout/item_module.xml          | 4 ++++
 app/src/main/res/layout/item_page_magisk_log.xml | 5 ++++-
 app/src/main/res/layout/item_repo.xml            | 2 ++
 7 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/fragment_modules.xml b/app/src/main/res/layout/fragment_modules.xml
index 6c6b8f6da..7439ca496 100644
--- a/app/src/main/res/layout/fragment_modules.xml
+++ b/app/src/main/res/layout/fragment_modules.xml
@@ -59,10 +59,12 @@
             android:layout_gravity="bottom|center_horizontal"
             android:layout_margin="@dimen/fab_padding"
             android:onClick="@{() -> viewModel.fabPressed()}"
+            android:focusable="true"
+            android:clickable="true"
             app:fabSize="normal"
             app:layout_behavior="com.google.android.material.floatingactionbutton.FloatingActionButton$Behavior"
             app:srcCompat="@drawable/ic_add" />
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/item_console.xml b/app/src/main/res/layout/item_console.xml
index b0c4d4fb7..8fa6c0b93 100644
--- a/app/src/main/res/layout/item_console.xml
+++ b/app/src/main/res/layout/item_console.xml
@@ -16,6 +16,7 @@
     </data>
 
     <TextView
+        android:focusable="true"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:fontFamily="monospace"
diff --git a/app/src/main/res/layout/item_hide_app.xml b/app/src/main/res/layout/item_hide_app.xml
index e5f1de0a3..a3512e113 100644
--- a/app/src/main/res/layout/item_hide_app.xml
+++ b/app/src/main/res/layout/item_hide_app.xml
@@ -94,6 +94,8 @@
 
             <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/hide_app_checkbox"
+                android:focusable="true"
+                android:clickable="true"
                 style="@style/Widget.Icon"
                 isChecked="@{item.isHiddenState}"
                 android:onClick="@{() -> item.toggle()}"
diff --git a/app/src/main/res/layout/item_hide_process.xml b/app/src/main/res/layout/item_hide_process.xml
index 1e40e542c..e36a58e09 100644
--- a/app/src/main/res/layout/item_hide_process.xml
+++ b/app/src/main/res/layout/item_hide_process.xml
@@ -38,6 +38,8 @@
 
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/hide_process_icon"
+            android:focusable="true"
+            android:clickable="true"
             style="@style/Widget.Icon"
             isChecked="@{item.isHidden}"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/item_module.xml b/app/src/main/res/layout/item_module.xml
index 91d9f2e48..51b46f9a0 100644
--- a/app/src/main/res/layout/item_module.xml
+++ b/app/src/main/res/layout/item_module.xml
@@ -106,6 +106,8 @@
 
             <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/checkbox"
+                android:focusable="true"
+                android:clickable="true"
                 style="@style/Widget.Icon"
                 isChecked="@{item.isChecked}"
                 android:layout_marginEnd="@dimen/margin_generic"
@@ -127,6 +129,8 @@
 
             <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/delete"
+                android:focusable="true"
+                android:clickable="true"
                 style="@style/Widget.Icon"
                 srcCompat="@{item.isDeletable ? R.drawable.ic_undelete : R.drawable.ic_delete}"
                 android:onClick="@{() -> item.toggleDelete()}"
diff --git a/app/src/main/res/layout/item_page_magisk_log.xml b/app/src/main/res/layout/item_page_magisk_log.xml
index e513dd7cc..b2f4f8c91 100644
--- a/app/src/main/res/layout/item_page_magisk_log.xml
+++ b/app/src/main/res/layout/item_page_magisk_log.xml
@@ -29,6 +29,7 @@
                 items="@{item.items}"
                 scrollPosition="@={viewModel.scrollPosition}"
                 scrollPositionSmooth="@{true}"
+                android:focusable="true"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:orientation="vertical"
@@ -39,6 +40,8 @@
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
             hide="@{viewModel.scrollPosition == item.items.size - 1 || item.items.size == 0}"
+            android:focusable="true"
+            android:clickable="true"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|end"
@@ -50,4 +53,4 @@
     </FrameLayout>
 
 
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/item_repo.xml b/app/src/main/res/layout/item_repo.xml
index 6e876e5ea..efada5183 100644
--- a/app/src/main/res/layout/item_repo.xml
+++ b/app/src/main/res/layout/item_repo.xml
@@ -105,6 +105,8 @@
 
             <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/download"
+                android:focusable="true"
+                android:clickable="true"
                 style="@style/Widget.Icon"
                 isEnabled="@{viewModel.isConnected}"
                 android:alpha="@{viewModel.isConnected ? 1f : .2f}"