From 1d822e1610509412cf2a60c99c12488455dfc4ec Mon Sep 17 00:00:00 2001
From: Albert Vaca Cintora <albertvaka@gmail.com>
Date: Mon, 21 Aug 2023 16:11:29 +0200
Subject: [PATCH] Fix keyboard/d-pad navigation

Allows navigating the app using the arrow keys on a keyboard or the
D-pad on a TV remote, up until the plugin list (I haven't checked
specific plugins).
---
 res/layout-v23/pairing_explanation_not_trusted.xml         | 1 +
 res/layout-w820dp/activity_main.xml                        | 1 +
 res/layout/activity_device.xml                             | 3 +++
 res/layout/activity_main.xml                               | 2 ++
 res/layout/devices_list.xml                                | 1 +
 res/layout/fragment_about.xml                              | 2 ++
 res/layout/pairing_explanation_not_trusted.xml             | 1 +
 res/layout/pairing_explanation_text.xml                    | 1 +
 src/org/kde/kdeconnect/UserInterface/List/SectionItem.java | 2 ++
 9 files changed, 14 insertions(+)

diff --git a/res/layout-v23/pairing_explanation_not_trusted.xml b/res/layout-v23/pairing_explanation_not_trusted.xml
index a1543234..c662f24e 100644
--- a/res/layout-v23/pairing_explanation_not_trusted.xml
+++ b/res/layout-v23/pairing_explanation_not_trusted.xml
@@ -5,6 +5,7 @@
     android:layout_height="wrap_content"
     android:background="?attr/selectableItemBackground"
     android:clickable="false"
+    android:focusable="false"
     android:drawablePadding="8dp"
     android:paddingTop="16dp"
     android:paddingBottom="12dp"
diff --git a/res/layout-w820dp/activity_main.xml b/res/layout-w820dp/activity_main.xml
index 97c651bc..268483f6 100644
--- a/res/layout-w820dp/activity_main.xml
+++ b/res/layout-w820dp/activity_main.xml
@@ -23,6 +23,7 @@
 
         <FrameLayout
             android:id="@+id/container"
+            android:descendantFocusability="afterDescendants"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
diff --git a/res/layout/activity_device.xml b/res/layout/activity_device.xml
index 10a282f6..ba234303 100644
--- a/res/layout/activity_device.xml
+++ b/res/layout/activity_device.xml
@@ -9,6 +9,8 @@ SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
+    android:descendantFocusability="afterDescendants"
+    android:focusable="false"
     android:layout_height="match_parent"
     tools:context="org.kde.kdeconnect.UserInterface.DeviceFragment">
 
@@ -26,6 +28,7 @@ SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted
 
     <androidx.core.widget.NestedScrollView
         android:id="@+id/device_view"
+        android:descendantFocusability="afterDescendants"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
diff --git a/res/layout/activity_main.xml b/res/layout/activity_main.xml
index c294ce83..e07deade 100644
--- a/res/layout/activity_main.xml
+++ b/res/layout/activity_main.xml
@@ -24,6 +24,8 @@ SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted
 
         <FrameLayout
             android:id="@+id/container"
+            android:descendantFocusability="afterDescendants"
+            android:focusable="false"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             app:layout_behavior="@string/appbar_scrolling_view_behavior"
diff --git a/res/layout/devices_list.xml b/res/layout/devices_list.xml
index b8bfee7b..4d983db3 100644
--- a/res/layout/devices_list.xml
+++ b/res/layout/devices_list.xml
@@ -19,6 +19,7 @@ SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted
         android:layout_height="match_parent"
         android:addStatesFromChildren="true"
         android:divider="@null"
+        android:descendantFocusability="afterDescendants"
         android:dividerHeight="12dp"
         android:orientation="vertical"
         tools:listitem="@layout/list_card_entry"
diff --git a/res/layout/fragment_about.xml b/res/layout/fragment_about.xml
index c5903a5f..a54e4ba1 100644
--- a/res/layout/fragment_about.xml
+++ b/res/layout/fragment_about.xml
@@ -26,6 +26,8 @@ SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="12dp"
+            android:clickable="false"
+            android:focusable="false"
             card_view:cardUseCompatPadding="true">
 
             <LinearLayout
diff --git a/res/layout/pairing_explanation_not_trusted.xml b/res/layout/pairing_explanation_not_trusted.xml
index 346f005d..2ba15d09 100644
--- a/res/layout/pairing_explanation_not_trusted.xml
+++ b/res/layout/pairing_explanation_not_trusted.xml
@@ -12,6 +12,7 @@ SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted
     android:layout_height="wrap_content"
     android:background="?attr/selectableItemBackground"
     android:clickable="false"
+    android:focusable="false"
     android:drawablePadding="8dp"
     android:paddingTop="16dp"
     android:paddingBottom="12dp"
diff --git a/res/layout/pairing_explanation_text.xml b/res/layout/pairing_explanation_text.xml
index 83d4b199..75ed9ed2 100644
--- a/res/layout/pairing_explanation_text.xml
+++ b/res/layout/pairing_explanation_text.xml
@@ -16,6 +16,7 @@ SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted
     android:paddingRight="16dp"
     android:text="@string/pairing_description"
     android:clickable="false"
+    android:focusable="false"
     android:background="@android:color/transparent"
     >
 
diff --git a/src/org/kde/kdeconnect/UserInterface/List/SectionItem.java b/src/org/kde/kdeconnect/UserInterface/List/SectionItem.java
index a867d73c..6823341b 100644
--- a/src/org/kde/kdeconnect/UserInterface/List/SectionItem.java
+++ b/src/org/kde/kdeconnect/UserInterface/List/SectionItem.java
@@ -30,6 +30,8 @@ public class SectionItem implements ListAdapter.Item {
         //Make it not selectable
         binding.getRoot().setOnClickListener(null);
         binding.getRoot().setOnLongClickListener(null);
+        binding.getRoot().setFocusable(false);
+        binding.getRoot().setClickable(false);
 
         binding.listItemCategoryText.setText(title);