From c8ccb463530d6f97b3df42e5bbadae7af4a30d60 Mon Sep 17 00:00:00 2001
From: Juan Carlos Garrote <juanca_arrabal@hotmail.com>
Date: Tue, 16 Jul 2024 14:52:15 +0200
Subject: [PATCH 01/14] feat: toolbar now accessible with hardware keyboard via
 the arrow keys

---
 .../android/ui/activity/FileDisplayActivity.kt      | 13 +++++++++++++
 .../owncloud/android/ui/activity/ToolbarActivity.kt |  1 +
 .../android/ui/activity/UploadListActivity.java     | 12 ++++++++++++
 .../src/main/res/layout/owncloud_toolbar.xml        |  5 +++--
 4 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt
index 8469a3afc77..918fe51c3e7 100644
--- a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt
+++ b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt
@@ -41,6 +41,7 @@ import android.os.Build
 import android.os.Bundle
 import android.os.RemoteException
 import android.util.TypedValue
+import android.view.KeyEvent
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
@@ -1965,6 +1966,18 @@ class FileDisplayActivity : FileActivity(),
         }
     }
 
+    override fun onKeyUp(keyCode: Int, event: KeyEvent?): Boolean {
+        return when(keyCode) {
+            KeyEvent.KEYCODE_DPAD_DOWN -> {
+                if (findViewById<View>(R.id.owncloud_app_bar).hasFocus()) {
+                    findViewById<View>(R.id.left_fragment_container).requestFocus()
+                }
+                true
+            }
+            else -> super.onKeyUp(keyCode, event)
+        }
+    }
+
     companion object {
         private const val TAG_LIST_OF_FILES = "LIST_OF_FILES"
         private const val TAG_LIST_OF_SPACES = "LIST_OF_SPACES"
diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/ToolbarActivity.kt b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/ToolbarActivity.kt
index a1f7961844b..6470329b8fd 100644
--- a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/ToolbarActivity.kt
+++ b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/ToolbarActivity.kt
@@ -159,6 +159,7 @@ abstract class ToolbarActivity : BaseActivity() {
             searchText.setHintTextColor(getColor(R.color.search_view_hint_text))
             closeButton.setColorFilter(getColor(R.color.white))
             background = getDrawable(R.drawable.rounded_search_view)
+            isFocusable = false
         }
         return true
     }
diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/UploadListActivity.java b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/UploadListActivity.java
index ff3a96b3cbb..f7aaaafb254 100755
--- a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/UploadListActivity.java
+++ b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/UploadListActivity.java
@@ -31,6 +31,7 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
+import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.View;
 
@@ -177,4 +178,15 @@ protected void onAccountSet(boolean stateWasRecovered) {
     public boolean onCreateOptionsMenu(Menu menu) {
         return false;
     }
+
+    @Override
+    public boolean onKeyUp(int keyCode, KeyEvent event) {
+        if (keyCode == KeyEvent.KEYCODE_DPAD_DOWN) {
+            if (findViewById(R.id.owncloud_app_bar).hasFocus()) {
+                findViewById(R.id.left_fragment_container).requestFocus();
+                return true;
+            }
+        }
+        return super.onKeyUp(keyCode, event);
+    }
 }
diff --git a/owncloudApp/src/main/res/layout/owncloud_toolbar.xml b/owncloudApp/src/main/res/layout/owncloud_toolbar.xml
index a32958a439c..1ca157d4c99 100644
--- a/owncloudApp/src/main/res/layout/owncloud_toolbar.xml
+++ b/owncloudApp/src/main/res/layout/owncloud_toolbar.xml
@@ -17,7 +17,8 @@
     android:id="@+id/owncloud_app_bar"
     android:layout_width="match_parent"
     android:layout_height="?android:actionBarSize"
-    android:theme="@style/ownCloud.Appbar">
+    android:theme="@style/ownCloud.Appbar"
+    android:focusableInTouchMode="true">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/root_toolbar"
@@ -96,4 +97,4 @@
         android:layout_marginEnd="@dimen/standard_margin"
         app:navigationContentDescription="@string/common_back"
         app:popupTheme="?attr/actionBarPopupTheme" />
-</com.google.android.material.appbar.AppBarLayout>
\ No newline at end of file
+</com.google.android.material.appbar.AppBarLayout>

From 4be81904bdb4064774f3e79054ad15610a170035 Mon Sep 17 00:00:00 2001
From: Juan Carlos Garrote <juanca_arrabal@hotmail.com>
Date: Wed, 17 Jul 2024 08:17:45 +0200
Subject: [PATCH 02/14] feat: focus is moved to drawer menu when opened via
 keyboard

---
 .../java/com/owncloud/android/ui/activity/DrawerActivity.kt     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.kt b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.kt
index 6db7affc6e8..a7d06fd204d 100644
--- a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.kt
+++ b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.kt
@@ -279,7 +279,9 @@ abstract class DrawerActivity : ToolbarActivity() {
      * opens the drawer.
      */
     open fun openDrawer() {
+        // mover el foco al menú
         getDrawerLayout()?.openDrawer(GravityCompat.START)
+        findViewById<View>(R.id.nav_view).requestFocus()
     }
 
     /**

From 285eb1f74e53bc5fc188d527df3e0d698f21ba92 Mon Sep 17 00:00:00 2001
From: Juan Carlos Garrote <juanca_arrabal@hotmail.com>
Date: Wed, 17 Jul 2024 11:14:50 +0200
Subject: [PATCH 03/14] feat: expiration dates labels in public links dialog
 are not focusable anymore

---
 owncloudApp/src/main/res/layout/share_public_dialog.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/owncloudApp/src/main/res/layout/share_public_dialog.xml b/owncloudApp/src/main/res/layout/share_public_dialog.xml
index c6300e45da0..13e5a59916b 100644
--- a/owncloudApp/src/main/res/layout/share_public_dialog.xml
+++ b/owncloudApp/src/main/res/layout/share_public_dialog.xml
@@ -289,7 +289,8 @@
                     android:paddingTop="@dimen/standard_half_padding"
                     android:text="@string/share_via_link_expiration_date_label"
                     android:textColor="@color/black"
-                    android:textSize="15sp" />
+                    android:textSize="15sp"
+                    android:focusable="false"/>
 
                 <TextView
                     android:id="@+id/shareViaLinkExpirationValue"
@@ -303,7 +304,8 @@
                     android:paddingRight="@dimen/standard_half_padding"
                     android:textSize="12sp"
                     android:textColor="@color/list_item_lastmod_and_filesize_text"
-                    android:visibility="gone" />
+                    android:visibility="gone"
+                    android:focusable="false"/>
 
                 <TextView
                     android:id="@+id/shareViaLinkExpirationExplanationLabel"

From 76d8a374e9c76a8f500a3e63826891147b810248 Mon Sep 17 00:00:00 2001
From: Juan Carlos Garrote <juanca_arrabal@hotmail.com>
Date: Wed, 17 Jul 2024 14:27:18 +0200
Subject: [PATCH 04/14] feat: shares view now uses standard toolbar instead of
 default action bar

---
 owncloudApp/src/main/AndroidManifest.xml               |  2 +-
 .../android/presentation/sharing/ShareActivity.kt      | 10 ++++++++--
 .../android/presentation/sharing/ShareFileFragment.kt  |  6 +++---
 owncloudApp/src/main/res/layout/share_activity.xml     |  5 ++++-
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/owncloudApp/src/main/AndroidManifest.xml b/owncloudApp/src/main/AndroidManifest.xml
index b2669ed6d7e..b52f7fc1f6a 100644
--- a/owncloudApp/src/main/AndroidManifest.xml
+++ b/owncloudApp/src/main/AndroidManifest.xml
@@ -199,7 +199,7 @@
             android:exported="false"
             android:label="@string/share_dialog_title"
             android:launchMode="singleTop"
-            android:theme="@style/Theme.ownCloud"
+            android:theme="@style/Theme.ownCloud.Toolbar"
             android:windowSoftInputMode="adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH" />
diff --git a/owncloudApp/src/main/java/com/owncloud/android/presentation/sharing/ShareActivity.kt b/owncloudApp/src/main/java/com/owncloud/android/presentation/sharing/ShareActivity.kt
index 07c2348b2b3..838c13a8ca5 100644
--- a/owncloudApp/src/main/java/com/owncloud/android/presentation/sharing/ShareActivity.kt
+++ b/owncloudApp/src/main/java/com/owncloud/android/presentation/sharing/ShareActivity.kt
@@ -7,6 +7,7 @@
  * @author David González Verdugo
  * @author Christian Schabesberger
  * @author Aitor Ballesteros Pavón
+ * @author Juan Carlos Garrote Gascón
  *
  * Copyright (C) 2024 ownCloud GmbH.
  *
@@ -66,9 +67,14 @@ class ShareActivity : FileActivity(), ShareFragmentListener {
 
         setContentView(R.layout.share_activity)
 
-        // Set back button
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        setupStandardToolbar(
+            title = null,
+            displayHomeAsUpEnabled = true,
+            homeButtonEnabled = true,
+            displayShowTitleEnabled = true
+        )
         supportActionBar?.setHomeActionContentDescription(R.string.common_back)
+
         supportFragmentManager.transaction {
             if (savedInstanceState == null && file != null && account != null) {
                 // Add Share fragment on first creation
diff --git a/owncloudApp/src/main/java/com/owncloud/android/presentation/sharing/ShareFileFragment.kt b/owncloudApp/src/main/java/com/owncloud/android/presentation/sharing/ShareFileFragment.kt
index daae5824c06..1339dc4298d 100644
--- a/owncloudApp/src/main/java/com/owncloud/android/presentation/sharing/ShareFileFragment.kt
+++ b/owncloudApp/src/main/java/com/owncloud/android/presentation/sharing/ShareFileFragment.kt
@@ -6,7 +6,9 @@
  * @author Juan Carlos González Cabrero
  * @author David González Verdugo
  * @author Christian Schabesberger
- * Copyright (C) 2020 ownCloud GmbH.
+ * @author Juan Carlos Garrote Gascón
+ *
+ * Copyright (C) 2024 ownCloud GmbH.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2,
@@ -273,8 +275,6 @@ class ShareFileFragment : Fragment(), ShareUserListAdapter.ShareUserAdapterListe
         super.onActivityCreated(savedInstanceState)
         Timber.d("onActivityCreated")
 
-        activity?.setTitle(R.string.share_dialog_title)
-
         observeCapabilities() // Get capabilities to update some UI elements depending on them
         observeShares()
     }
diff --git a/owncloudApp/src/main/res/layout/share_activity.xml b/owncloudApp/src/main/res/layout/share_activity.xml
index 425a53fd13e..4dc73ec7bce 100644
--- a/owncloudApp/src/main/res/layout/share_activity.xml
+++ b/owncloudApp/src/main/res/layout/share_activity.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?><!--
   ownCloud Android client application
-  Copyright (C) 2020 ownCloud GmbH.
+  Copyright (C) 2024 ownCloud GmbH.
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License version 2,
@@ -23,8 +23,11 @@
     android:layout_height="match_parent"
     tools:context=".presentation.sharing.ShareActivity"
     android:filterTouchesWhenObscured="true"
+    android:orientation="vertical"
     >
 
+    <include layout="@layout/owncloud_toolbar" />
+
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"

From 7ecaecb401c7b9acc35ac429e994f1d4f5301420 Mon Sep 17 00:00:00 2001
From: Juan Carlos Garrote <juanca_arrabal@hotmail.com>
Date: Thu, 18 Jul 2024 14:53:23 +0200
Subject: [PATCH 05/14] feat: Tab key is now used to make toolbar appear in
 image previews

---
 .../android/ui/preview/PreviewImageActivity.kt      | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.kt b/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.kt
index dc21e3d8f63..9f86614a8c4 100644
--- a/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.kt
+++ b/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.kt
@@ -5,6 +5,7 @@
  * @author David González Verdugo
  * @author Christian Schabesberger
  * @author Aitor Ballesteros Pavón
+ * @author Juan Carlos Garrote Gascón
  *
  * Copyright (C) 2024 ownCloud GmbH.
  *
@@ -23,12 +24,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http:></http:>//www.gnu.org/licenses/>.
  */
+
 package com.owncloud.android.ui.preview
 
 import android.content.Intent
 import android.os.Bundle
 import android.os.Handler
 import android.os.Message
+import android.view.KeyEvent
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
@@ -397,6 +400,16 @@ class PreviewImageActivity : FileActivity(),
         return false
     }
 
+    override fun onKeyUp(keyCode: Int, event: KeyEvent?): Boolean {
+        return when(keyCode) {
+            KeyEvent.KEYCODE_TAB -> {
+                showSystemUI(fullScreenAnchorView)
+                true
+            }
+            else -> super.onKeyUp(keyCode, event)
+        }
+    }
+
     companion object {
         private const val INITIAL_HIDE_DELAY = 0 // immediate hide
     }

From cd62d5c08f5394f2847ac2263fde0241a3a89457 Mon Sep 17 00:00:00 2001
From: Juan Carlos Garrote <juanca_arrabal@hotmail.com>
Date: Fri, 19 Jul 2024 09:49:08 +0200
Subject: [PATCH 06/14] feat: improve toolbar navigation to the rest of the
 view in Share view

---
 .../android/presentation/sharing/ShareActivity.kt  | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/owncloudApp/src/main/java/com/owncloud/android/presentation/sharing/ShareActivity.kt b/owncloudApp/src/main/java/com/owncloud/android/presentation/sharing/ShareActivity.kt
index 838c13a8ca5..1f56506357a 100644
--- a/owncloudApp/src/main/java/com/owncloud/android/presentation/sharing/ShareActivity.kt
+++ b/owncloudApp/src/main/java/com/owncloud/android/presentation/sharing/ShareActivity.kt
@@ -30,8 +30,10 @@ package com.owncloud.android.presentation.sharing
 import android.app.SearchManager
 import android.content.Intent
 import android.os.Bundle
+import android.view.KeyEvent
 import android.view.Menu
 import android.view.MenuItem
+import android.view.View
 import androidx.fragment.app.transaction
 import com.owncloud.android.R
 import com.owncloud.android.domain.files.model.OCFile
@@ -310,6 +312,18 @@ class ShareActivity : FileActivity(), ShareFragmentListener {
         return false
     }
 
+    override fun onKeyUp(keyCode: Int, event: KeyEvent?): Boolean {
+        return when(keyCode) {
+            KeyEvent.KEYCODE_DPAD_DOWN -> {
+                if (findViewById<View>(R.id.owncloud_app_bar).hasFocus()) {
+                    findViewById<View>(R.id.share_fragment_container).requestFocus()
+                }
+                true
+            }
+            else -> super.onKeyUp(keyCode, event)
+        }
+    }
+
     companion object {
         const val TAG_SHARE_FRAGMENT = "SHARE_FRAGMENT"
         const val TAG_SEARCH_FRAGMENT = "SEARCH_USER_AND_GROUPS_FRAGMENT"

From 5a1c3f651df310a9381cae42a7bd51fe264afd97 Mon Sep 17 00:00:00 2001
From: Juan Carlos Garrote <juanca_arrabal@hotmail.com>
Date: Fri, 19 Jul 2024 09:51:56 +0200
Subject: [PATCH 07/14] fix: KtLint reports fixed

---
 .../com/owncloud/android/presentation/sharing/ShareActivity.kt  | 2 +-
 .../com/owncloud/android/ui/activity/FileDisplayActivity.kt     | 2 +-
 .../com/owncloud/android/ui/preview/PreviewImageActivity.kt     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/owncloudApp/src/main/java/com/owncloud/android/presentation/sharing/ShareActivity.kt b/owncloudApp/src/main/java/com/owncloud/android/presentation/sharing/ShareActivity.kt
index 1f56506357a..6399a6c5679 100644
--- a/owncloudApp/src/main/java/com/owncloud/android/presentation/sharing/ShareActivity.kt
+++ b/owncloudApp/src/main/java/com/owncloud/android/presentation/sharing/ShareActivity.kt
@@ -313,7 +313,7 @@ class ShareActivity : FileActivity(), ShareFragmentListener {
     }
 
     override fun onKeyUp(keyCode: Int, event: KeyEvent?): Boolean {
-        return when(keyCode) {
+        return when (keyCode) {
             KeyEvent.KEYCODE_DPAD_DOWN -> {
                 if (findViewById<View>(R.id.owncloud_app_bar).hasFocus()) {
                     findViewById<View>(R.id.share_fragment_container).requestFocus()
diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt
index 918fe51c3e7..2ce5a788f0f 100644
--- a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt
+++ b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt
@@ -1967,7 +1967,7 @@ class FileDisplayActivity : FileActivity(),
     }
 
     override fun onKeyUp(keyCode: Int, event: KeyEvent?): Boolean {
-        return when(keyCode) {
+        return when (keyCode) {
             KeyEvent.KEYCODE_DPAD_DOWN -> {
                 if (findViewById<View>(R.id.owncloud_app_bar).hasFocus()) {
                     findViewById<View>(R.id.left_fragment_container).requestFocus()
diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.kt b/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.kt
index 9f86614a8c4..aaef496e7d2 100644
--- a/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.kt
+++ b/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.kt
@@ -401,7 +401,7 @@ class PreviewImageActivity : FileActivity(),
     }
 
     override fun onKeyUp(keyCode: Int, event: KeyEvent?): Boolean {
-        return when(keyCode) {
+        return when (keyCode) {
             KeyEvent.KEYCODE_TAB -> {
                 showSystemUI(fullScreenAnchorView)
                 true

From f3072531816f0c52ca1db8075b6695a395c576d4 Mon Sep 17 00:00:00 2001
From: Juan Carlos Garrote <juanca_arrabal@hotmail.com>
Date: Fri, 19 Jul 2024 10:12:14 +0200
Subject: [PATCH 08/14] chore: added calens file

---
 changelog/unreleased/4438 | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 changelog/unreleased/4438

diff --git a/changelog/unreleased/4438 b/changelog/unreleased/4438
new file mode 100644
index 00000000000..532bd7df6b2
--- /dev/null
+++ b/changelog/unreleased/4438
@@ -0,0 +1,10 @@
+Enhancement: Hardware keyboard support
+
+Navigation via hardware keyboard has been improved so that now focus order has a logical path, every element
+is reachable and there are no traps. These improvements have been applied in main file list, spaces list,
+drawer menu, share view and image preview.
+
+https://github.com/owncloud/android/pull/4438
+https://github.com/owncloud/android/issues/4366
+https://github.com/owncloud/android/issues/4367
+https://github.com/owncloud/android/issues/4368

From 143490c6488c0cdde46c689927c9a4e09d4d2375 Mon Sep 17 00:00:00 2001
From: JuancaG05 <JuancaG05@users.noreply.github.com>
Date: Fri, 19 Jul 2024 08:12:44 +0000
Subject: [PATCH 09/14] docs: calens changelog updated

---
 CHANGELOG.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 280d41e0ea0..c115af71519 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,7 @@ ownCloud admins and users.
 
 * Enhancement - Changed the color of some elements to improve accessibility: [#4364](https://github.com/owncloud/android/issues/4364)
 * Enhancement - Improved SearchView accessibility: [#4365](https://github.com/owncloud/android/issues/4365)
+* Enhancement - Hardware keyboard support: [#4438](https://github.com/owncloud/android/pull/4438)
 
 ## Details
 
@@ -55,6 +56,18 @@ ownCloud admins and users.
    https://github.com/owncloud/android/issues/4365
    https://github.com/owncloud/android/pull/4433
 
+* Enhancement - Hardware keyboard support: [#4438](https://github.com/owncloud/android/pull/4438)
+
+   Navigation via hardware keyboard has been improved so that now focus order has a
+   logical path, every element is reachable and there are no traps. These
+   improvements have been applied in main file list, spaces list, drawer menu,
+   share view and image preview.
+
+   https://github.com/owncloud/android/issues/4366
+   https://github.com/owncloud/android/issues/4367
+   https://github.com/owncloud/android/issues/4368
+   https://github.com/owncloud/android/pull/4438
+
 # Changelog for ownCloud Android Client [4.3.1] (2024-07-22)
 
 The following sections list the changes in ownCloud Android Client 4.3.1 relevant to

From 8d02fa6c114aaf5a6e79c4baf8be295fed8aaa06 Mon Sep 17 00:00:00 2001
From: Juan Carlos Garrote <juanca_arrabal@hotmail.com>
Date: Fri, 19 Jul 2024 10:19:43 +0200
Subject: [PATCH 10/14] fix: removed unnecessary comment

---
 .../main/java/com/owncloud/android/ui/activity/DrawerActivity.kt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.kt b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.kt
index a7d06fd204d..bfebd6cafa3 100644
--- a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.kt
+++ b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.kt
@@ -279,7 +279,6 @@ abstract class DrawerActivity : ToolbarActivity() {
      * opens the drawer.
      */
     open fun openDrawer() {
-        // mover el foco al menú
         getDrawerLayout()?.openDrawer(GravityCompat.START)
         findViewById<View>(R.id.nav_view).requestFocus()
     }

From 6a890270757c9f193e03e41f0e67b9f83e4e6bc2 Mon Sep 17 00:00:00 2001
From: Juan Carlos Garrote <juanca_arrabal@hotmail.com>
Date: Fri, 19 Jul 2024 13:38:23 +0200
Subject: [PATCH 11/14] refactor: added trailing comma

---
 .../com/owncloud/android/presentation/sharing/ShareActivity.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/owncloudApp/src/main/java/com/owncloud/android/presentation/sharing/ShareActivity.kt b/owncloudApp/src/main/java/com/owncloud/android/presentation/sharing/ShareActivity.kt
index 6399a6c5679..14ae905174b 100644
--- a/owncloudApp/src/main/java/com/owncloud/android/presentation/sharing/ShareActivity.kt
+++ b/owncloudApp/src/main/java/com/owncloud/android/presentation/sharing/ShareActivity.kt
@@ -73,7 +73,7 @@ class ShareActivity : FileActivity(), ShareFragmentListener {
             title = null,
             displayHomeAsUpEnabled = true,
             homeButtonEnabled = true,
-            displayShowTitleEnabled = true
+            displayShowTitleEnabled = true,
         )
         supportActionBar?.setHomeActionContentDescription(R.string.common_back)
 

From bde500a1e42a18823628c415deb7b9e03f49047c Mon Sep 17 00:00:00 2001
From: Juan Carlos Garrote <juanca_arrabal@hotmail.com>
Date: Wed, 31 Jul 2024 08:56:23 +0200
Subject: [PATCH 12/14] feat: mini FABs only focusable when main FAB is
 expanded

---
 .../files/filelist/MainFileListFragment.kt    | 28 ++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/owncloudApp/src/main/java/com/owncloud/android/presentation/files/filelist/MainFileListFragment.kt b/owncloudApp/src/main/java/com/owncloud/android/presentation/files/filelist/MainFileListFragment.kt
index d0159e32a26..36a872d7b67 100644
--- a/owncloudApp/src/main/java/com/owncloud/android/presentation/files/filelist/MainFileListFragment.kt
+++ b/owncloudApp/src/main/java/com/owncloud/android/presentation/files/filelist/MainFileListFragment.kt
@@ -824,9 +824,16 @@ class MainFileListFragment : Fragment(),
             } else if (!currentFolder.hasAddSubdirectoriesPermission) {
                 binding.fabMkdir.isVisible = false
             }
+            registerFabMainListener()
             registerFabUploadListener()
             registerFabMkDirListener()
             registerFabNewShortcutListener()
+            binding.apply {
+                fabUpload.isFocusable = false
+                fabMkdir.isFocusable = false
+                fabNewfile.isFocusable = false
+                fabNewshortcut.isFocusable = false
+            }
         }
     }
 
@@ -844,6 +851,18 @@ class MainFileListFragment : Fragment(),
         binding.fabMkdir.isVisible = shouldBeShown
     }
 
+    private fun registerFabMainListener() {
+        binding.apply {
+            fabMain.findViewById<View>(R.id.fab_expand_menu_button).setOnClickListener {
+                fabMain.toggle()
+                fabUpload.isFocusable = isFabExpanded()
+                fabMkdir.isFocusable = isFabExpanded()
+                fabNewfile.isFocusable = isFabExpanded()
+                fabNewshortcut.isFocusable = isFabExpanded()
+            }
+        }
+    }
+
     /**
      * Registers [android.view.View.OnClickListener] on the 'Upload' mini FAB for the linked action.
      */
@@ -887,7 +906,14 @@ class MainFileListFragment : Fragment(),
     }
 
     fun collapseFab() {
-        binding.fabMain.collapse()
+        binding.apply {
+            fabMain.collapse()
+            fabUpload.isFocusable = false
+            fabMkdir.isFocusable = false
+            fabNewfile.isFocusable = false
+            fabNewshortcut.isFocusable = false
+        }
+
     }
 
     fun isFabExpanded() = binding.fabMain.isExpanded

From e1af32cccde301b120267529c4ae2f54184a8c0c Mon Sep 17 00:00:00 2001
From: Juan Carlos Garrote <juanca_arrabal@hotmail.com>
Date: Wed, 31 Jul 2024 10:08:57 +0200
Subject: [PATCH 13/14] feat: toolbar not a keyboard trap anymore when uploads
 list is empty

---
 .../com/owncloud/android/ui/activity/UploadListActivity.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/UploadListActivity.java b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/UploadListActivity.java
index f7aaaafb254..eabf08fec95 100755
--- a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/UploadListActivity.java
+++ b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/UploadListActivity.java
@@ -183,7 +183,10 @@ public boolean onCreateOptionsMenu(Menu menu) {
     public boolean onKeyUp(int keyCode, KeyEvent event) {
         if (keyCode == KeyEvent.KEYCODE_DPAD_DOWN) {
             if (findViewById(R.id.owncloud_app_bar).hasFocus()) {
-                findViewById(R.id.left_fragment_container).requestFocus();
+                boolean nonEmptyView = findViewById(R.id.left_fragment_container).requestFocus();
+                if (!nonEmptyView) {
+                    findViewById(R.id.bottom_nav_view).requestFocus();
+                }
                 return true;
             }
         }

From 56d2ffa0612bc46c20bd3da2db0fa867b9ec15e0 Mon Sep 17 00:00:00 2001
From: Juan Carlos Garrote <juanca_arrabal@hotmail.com>
Date: Wed, 31 Jul 2024 14:03:18 +0200
Subject: [PATCH 14/14] feat: normal toolbar not reachable via keyboard when in
 multiselection mode, just action mode toolbar

---
 .../presentation/files/filelist/MainFileListFragment.kt       | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/owncloudApp/src/main/java/com/owncloud/android/presentation/files/filelist/MainFileListFragment.kt b/owncloudApp/src/main/java/com/owncloud/android/presentation/files/filelist/MainFileListFragment.kt
index 36a872d7b67..8c5715a1b71 100644
--- a/owncloudApp/src/main/java/com/owncloud/android/presentation/files/filelist/MainFileListFragment.kt
+++ b/owncloudApp/src/main/java/com/owncloud/android/presentation/files/filelist/MainFileListFragment.kt
@@ -1349,6 +1349,8 @@ class MainFileListFragment : Fragment(),
             setDrawerStatus(enabled = false)
             actionMode = mode
 
+            requireActivity().findViewById<View>(R.id.owncloud_app_bar).isFocusableInTouchMode = false
+
             val inflater = requireActivity().menuInflater
             inflater.inflate(R.menu.file_actions_menu, menu)
             this@MainFileListFragment.menu = menu
@@ -1421,6 +1423,8 @@ class MainFileListFragment : Fragment(),
             setDrawerStatus(enabled = true)
             actionMode = null
 
+            requireActivity().findViewById<View>(R.id.owncloud_app_bar).isFocusableInTouchMode = true
+
             // reset to previous color
             requireActivity().window.statusBarColor = statusBarColor!!