Merge pull request #1993 from Infomaniak/better-focus

Allow keyboard navigation

app/src/main/java/com/infomaniak/mail/ui/MainActivity.kt

@@ -198,7 +198,7 @@ class MainActivity : BaseActivity() {
 
         setupSnackbar()
         setupNavController()
-        setupMenuDrawerCallbacks()
+        setupMenuDrawer()
 
         mainViewModel.updateUserInfo()
 
@@ -212,6 +212,11 @@ class MainActivity : BaseActivity() {
         initAppReviewManager()
     }
 
+    private fun setupMenuDrawer() {
+        binding.drawerLayout.isFocusable = false // Set here because not working in XML
+        setupMenuDrawerCallbacks()
+    }
+
     private fun initAppReviewManager() {
         inAppReviewManager.init(
             onDialogShown = { trackInAppReviewEvent("presentAlert") },

app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt

@@ -415,7 +415,13 @@ class ThreadListAdapter @Inject constructor(
 
     private fun CardviewThreadItemBinding.displayAvatar(thread: Thread) {
         val (recipient, bimi) = thread.computeAvatarRecipient()
-        expeditorAvatar.loadAvatar(recipient, bimi)
+        expeditorAvatar.apply {
+            loadAvatar(recipient, bimi)
+
+            // Set `isFocusable` here instead of in XML file because setting it in the
+            // XML doesn't trigger the overridden `setFocusable(boolean)` in AvatarView.
+            isFocusable = false
+        }
     }
 
     private fun CardviewThreadItemBinding.formatRecipientNames(recipients: List<Recipient>): String {

app/src/main/java/com/infomaniak/mail/ui/main/search/SearchFolderAdapter.kt

@@ -35,7 +35,6 @@ import com.infomaniak.mail.views.itemViews.SelectableFolderItemView
 
 class SearchFolderAdapter(
     val folders: List<Any>,
-    val onClickListener: (folder: Folder?, title: String) -> Unit,
 ) : ListAdapter {
 
     private var selectedFolder: Folder? = null
@@ -74,13 +73,9 @@ class SearchFolderAdapter(
     ): View {
         return (convertView ?: ItemSearchFolderBinding.inflate(LayoutInflater.from(context), parent, false).root).apply {
             findViewById<SelectableFolderItemView>(R.id.simpleFolderItemView).apply {
-                val entryName: String = context.getLocalizedNameOrAllFolders(folder)
-                text = entryName
+                text = context.getLocalizedNameOrAllFolders(folder)
                 icon = AppCompatResources.getDrawable(context, folder?.getIcon() ?: R.drawable.ic_all_folders)
-
                 setSelectedState(folder == selectedFolder)
-
-                setOnClickListener { onClickListener(folder, entryName) }
             }
         }
     }

app/src/main/java/com/infomaniak/mail/ui/main/search/SearchFragment.kt

@@ -206,13 +206,21 @@ class SearchFragment : TwoPaneFragment() {
                 .apply { add(0, SearchFolderElement.ALL_FOLDERS) }
                 .toList()
 
-            searchAdapter = SearchFolderAdapter(folders) { folder, title ->
-                onFolderSelected(folder, title)
-                popupMenu.dismiss()
-            }
+            searchAdapter = SearchFolderAdapter(folders)
 
             popupMenu.setAdapter(searchAdapter)
 
+            popupMenu.setOnItemClickListener { _, _, position, _ ->
+                if (searchAdapter.getItemViewType(position) != SearchFolderElement.DIVIDER.itemId) {
+
+                    val folder = folders[position] as? Folder
+                    val entryName = requireContext().getLocalizedNameOrAllFolders(folder)
+
+                    onFolderSelected(folder, entryName)
+                    popupMenu.dismiss()
+                }
+            }
+
             updateFolderDropDownUi(
                 folder = searchViewModel.filterFolder,
                 title = requireContext().getLocalizedNameOrAllFolders(searchViewModel.filterFolder),

app/src/main/java/com/infomaniak/mail/ui/main/settings/SettingsFragment.kt

@@ -37,6 +37,7 @@ import com.infomaniak.mail.data.LocalSettings
 import com.infomaniak.mail.data.models.FeatureFlag
 import com.infomaniak.mail.databinding.FragmentSettingsBinding
 import com.infomaniak.mail.ui.MainViewModel
+import com.infomaniak.mail.utils.UiUtils.saveFocusWhenNavigatingBack
 import com.infomaniak.mail.utils.extensions.animatedNavigation
 import com.infomaniak.mail.utils.extensions.launchSyncAutoConfigActivityForResult
 import com.infomaniak.mail.utils.extensions.observeNotNull
@@ -53,6 +54,11 @@ class SettingsFragment : Fragment() {
     @Inject
     lateinit var localSettings: LocalSettings
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        saveFocusWhenNavigatingBack(getLayout = { binding.linearLayoutContainer }, lifecycle)
+    }
+
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         return FragmentSettingsBinding.inflate(inflater, container, false).also { binding = it }.root
     }

app/src/main/java/com/infomaniak/mail/ui/main/settings/appearance/swipe/SwipeActionsSettingsFragment.kt

@@ -30,6 +30,7 @@ import com.infomaniak.mail.R
 import com.infomaniak.mail.data.LocalSettings
 import com.infomaniak.mail.data.LocalSettings.SwipeAction
 import com.infomaniak.mail.databinding.FragmentSwipeActionsSettingsBinding
+import com.infomaniak.mail.utils.UiUtils.saveFocusWhenNavigatingBack
 import com.infomaniak.mail.utils.extensions.animatedNavigation
 import com.infomaniak.mail.utils.extensions.setSystemBarsColors
 import dagger.hilt.android.AndroidEntryPoint
@@ -43,6 +44,11 @@ class SwipeActionsSettingsFragment : Fragment() {
     @Inject
     lateinit var localSettings: LocalSettings
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        saveFocusWhenNavigatingBack(getLayout = { binding.linearLayoutContainer }, lifecycle)
+    }
+
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         return FragmentSwipeActionsSettingsBinding.inflate(inflater, container, false).also { binding = it }.root
     }

app/src/main/java/com/infomaniak/mail/ui/main/settings/mailbox/MailboxSettingsFragment.kt

@@ -27,6 +27,7 @@ import com.infomaniak.lib.core.utils.safeBinding
 import com.infomaniak.mail.R
 import com.infomaniak.mail.databinding.FragmentMailboxSettingsBinding
 import com.infomaniak.mail.ui.main.settings.ItemSettingView
+import com.infomaniak.mail.utils.UiUtils.saveFocusWhenNavigatingBack
 import com.infomaniak.mail.utils.extensions.animatedNavigation
 import com.infomaniak.mail.utils.extensions.notYetImplemented
 import com.infomaniak.mail.utils.extensions.setSystemBarsColors
@@ -36,6 +37,11 @@ class MailboxSettingsFragment : Fragment() {
     private var binding: FragmentMailboxSettingsBinding by safeBinding()
     private val navigationArgs: MailboxSettingsFragmentArgs by navArgs()
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        saveFocusWhenNavigatingBack(getLayout = { binding.linearLayoutContainer }, lifecycle)
+    }
+
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         return FragmentMailboxSettingsBinding.inflate(inflater, container, false).also { binding = it }.root
     }

app/src/main/java/com/infomaniak/mail/ui/main/settings/privacy/DataManagementSettingsFragment.kt

@@ -28,6 +28,7 @@ import com.infomaniak.lib.core.utils.safeBinding
 import com.infomaniak.mail.BuildConfig
 import com.infomaniak.mail.MatomoMail.trackEvent
 import com.infomaniak.mail.databinding.FragmentDataManagementSettingsBinding
+import com.infomaniak.mail.utils.UiUtils.saveFocusWhenNavigatingBack
 import com.infomaniak.mail.utils.extensions.animatedNavigation
 import com.infomaniak.mail.utils.extensions.setSystemBarsColors
 import dagger.hilt.android.AndroidEntryPoint
@@ -37,6 +38,11 @@ class DataManagementSettingsFragment : Fragment() {
 
     private var binding: FragmentDataManagementSettingsBinding by safeBinding()
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        saveFocusWhenNavigatingBack(getLayout = { binding.linearLayoutContainer }, lifecycle)
+    }
+
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         return FragmentDataManagementSettingsBinding.inflate(inflater, container, false).also { binding = it }.root
     }

app/src/main/java/com/infomaniak/mail/ui/main/user/AccountFragment.kt

@@ -47,6 +47,7 @@ import com.infomaniak.mail.utils.ConfettiUtils
 import com.infomaniak.mail.utils.ConfettiUtils.ConfettiType
 import com.infomaniak.mail.utils.LogoutUser
 import com.infomaniak.mail.utils.PlayServicesUtils
+import com.infomaniak.mail.utils.UiUtils.saveFocusWhenNavigatingBack
 import com.infomaniak.mail.utils.extensions.animatedNavigation
 import com.infomaniak.mail.utils.extensions.bindAlertToViewLifecycle
 import com.infomaniak.mail.utils.extensions.setSystemBarsColors
@@ -83,6 +84,11 @@ class AccountFragment : Fragment(), MailboxListFragment {
     @Inject
     lateinit var descriptionDialog: DescriptionAlertDialog
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        saveFocusWhenNavigatingBack(getLayout = { binding.constraintLayoutContainer }, lifecycle)
+    }
+
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         return FragmentAccountBinding.inflate(inflater, container, false).also { binding = it }.root
     }

app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt

@@ -504,6 +504,10 @@ class NewMessageFragment : Fragment() {
             fromMailAddress.apply {
                 icon = AppCompatResources.getDrawable(context, R.drawable.ic_chevron_down)
                 setOnClickListener { _ -> addressListPopupWindow?.show() }
+
+                // Set `isFocusable` here instead of in XML file because setting it in the
+                // XML doesn't trigger the overridden `setFocusable(boolean)` in AvatarView.
+                isFocusable = true
             }
         }
     }

app/src/main/java/com/infomaniak/mail/utils/UiUtils.kt

@@ -22,14 +22,20 @@ import android.animation.ValueAnimator
 import android.content.Context
 import android.graphics.Color
 import android.os.Build
+import android.view.View
+import android.view.ViewGroup
 import android.view.Window
 import android.widget.TextView
 import androidx.annotation.ColorInt
 import androidx.annotation.FloatRange
+import androidx.annotation.IdRes
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.core.graphics.toColor
 import androidx.core.graphics.toColorInt
 import androidx.core.view.isGone
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
 import com.infomaniak.mail.R
 import com.infomaniak.mail.data.models.correspondent.Correspondent
 import com.infomaniak.mail.utils.extensions.updateNavigationBarColor
@@ -157,4 +163,30 @@ object UiUtils {
     }
 
     fun dividerDrawable(context: Context) = AppCompatResources.getDrawable(context, R.drawable.divider)
+
+    fun saveFocusWhenNavigatingBack(getLayout: () -> ViewGroup, lifecycle: Lifecycle) {
+
+        val lifecycleObserver = object : DefaultLifecycleObserver {
+
+            @IdRes
+            private var lastFocusViewId: Int? = null
+
+            override fun onStart(owner: LifecycleOwner) {
+                super.onStart(owner)
+                lastFocusViewId?.let { viewId -> getLayout().findViewById<View>(viewId).requestFocus() }
+            }
+
+            override fun onStop(owner: LifecycleOwner) {
+                getLayout().focusedChild?.let { lastFocusViewId = it.id }
+                super.onStop(owner)
+            }
+
+            override fun onDestroy(owner: LifecycleOwner) {
+                lifecycle.removeObserver(observer = this)
+                super.onDestroy(owner)
+            }
+        }
+
+        lifecycle.addObserver(lifecycleObserver)
+    }
 }

app/src/main/java/com/infomaniak/mail/views/AvatarView.kt

@@ -143,6 +143,10 @@ class AvatarView @JvmOverloads constructor(
         binding.root.setOnLongClickListener(onLongClickListener)
     }
 
+    override fun setFocusable(focusable: Boolean) {
+        binding.root.isFocusable = focusable
+    }
+
     fun loadAvatar(user: User) = with(binding.avatarImage) {
         contentDescription = user.email
         loadAvatar(

app/src/main/res/layout/cardview_thread_item.xml

@@ -29,6 +29,7 @@
         android:layout_height="wrap_content"
         android:layout_marginVertical="2dp"
         android:layout_marginStart="@dimen/marginStandardVerySmall"
+        android:nextFocusRight="@+id/newMessageFab"
         app:cardCornerRadius="@null"
         app:cardPreventCornerOverlap="false"
         app:shapeAppearanceOverlay="@style/RoundedDecoratedTextItemShapeAppearance">

app/src/main/res/layout/fragment_account.xml

@@ -35,6 +35,7 @@
             android:layout_weight="1">
 
             <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/constraintLayoutContainer"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
 

app/src/main/res/layout/fragment_ai_engine_choice.xml

@@ -26,6 +26,7 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:touchscreenBlocksFocus="false"
         app:navigationIconTint="@color/iconColor" />
 
     <TextView

app/src/main/res/layout/fragment_ai_prompt.xml

@@ -28,6 +28,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:clickable="true"
+        android:focusable="false"
         android:foregroundTint="@android:color/transparent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"

app/src/main/res/layout/fragment_ai_proposition.xml

@@ -27,6 +27,7 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:touchscreenBlocksFocus="false"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -66,6 +67,7 @@
                 android:id="@+id/contentLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:focusable="true"
                 android:paddingHorizontal="@dimen/marginStandardMedium"
                 android:paddingVertical="@dimen/marginStandard">
 

app/src/main/res/layout/fragment_data_management_settings.xml

@@ -26,6 +26,7 @@
         android:layout_height="match_parent">
 
         <LinearLayout
+            android:id="@+id/linearLayoutContainer"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">

app/src/main/res/layout/fragment_mailbox_settings.xml

@@ -29,6 +29,7 @@
         android:scrollbars="none">
 
         <LinearLayout
+            android:id="@+id/linearLayoutContainer"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:clipToPadding="false"

app/src/main/res/layout/fragment_move.xml

@@ -31,6 +31,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
+            android:touchscreenBlocksFocus="false"
             app:contentInsetEnd="0dp">
 
             <LinearLayout

app/src/main/res/layout/fragment_new_message.xml

@@ -33,6 +33,7 @@
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:background="@color/newMessageBackgroundColor"
+            android:touchscreenBlocksFocus="false"
             app:contentInsetEnd="@dimen/marginStandardSmall"
             app:layout_constraintBottom_toTopOf="@+id/compositionNestedScrollView"
             app:layout_constraintTop_toTopOf="parent"
@@ -368,6 +369,8 @@
                         android:layout_height="wrap_content"
                         android:layout_marginTop="-16dp"
                         android:layout_marginBottom="@dimen/marginStandardMedium"
+                        android:focusable="false"
+                        android:focusableInTouchMode="false"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toBottomOf="@id/editorWebView"
@@ -405,6 +408,7 @@
                         android:id="@+id/quoteWebView"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:focusableInTouchMode="false"
                         android:visibility="gone"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent"

app/src/main/res/layout/fragment_search.xml

@@ -30,7 +30,8 @@
 
         <com.google.android.material.appbar.AppBarLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:touchscreenBlocksFocus="false">
 
             <com.google.android.material.appbar.CollapsingToolbarLayout
                 android:id="@+id/collapsingToolbarLayout"
@@ -44,6 +45,7 @@
                     android:id="@+id/toolbar"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:touchscreenBlocksFocus="false"
                     app:contentInsetEnd="@dimen/marginStandardMedium"
                     app:layout_collapseMode="pin">
 
@@ -111,7 +113,6 @@
                         android:id="@+id/folderDropDown"
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
-                        android:backgroundTint="@color/chip_unread_background"
                         android:checkable="true"
                         android:drawableTint="@color/chip_unread_text_color"
                         android:ellipsize="end"
@@ -125,7 +126,9 @@
                         android:paddingEnd="@dimen/marginStandardMedium"
                         android:text="@string/searchFilterFolder"
                         android:textColor="@color/chip_unread_text_color"
+                        app:backgroundTint="@color/chip_unread_background"
                         app:closeIcon="@drawable/ic_chevron_down"
+                        app:rippleColor="?attr/colorControlHighlight"
                         app:strokeColor="?attr/colorPrimary"
                         app:strokeWidth="1dp"
                         app:toggleCheckedStateOnClick="false"

app/src/main/res/layout/fragment_settings.xml

@@ -31,6 +31,7 @@
         android:scrollbars="none">
 
         <LinearLayout
+            android:id="@+id/linearLayoutContainer"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:clipToPadding="false"