From 8b1cbe882719036942b0db8be237827966583212 Mon Sep 17 00:00:00 2001 From: NicolasBourdin88 Date: Wed, 15 May 2024 15:41:11 +0200 Subject: [PATCH] Apply suggestion from code review --- .../com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt | 5 +---- .../com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt | 3 +-- .../com/infomaniak/mail/ui/main/thread/ThreadFragment.kt | 4 ++-- app/src/main/res/values-es/strings.xml | 4 ++-- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt index 0106a4b3702..af0ce6121d3 100644 --- a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt +++ b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt @@ -291,10 +291,7 @@ class ThreadListAdapter @Inject constructor( toggleMultiSelectedThread(thread) } else { previousThreadClickedPosition?.let { previousPosition -> - threadListAdapterCallback?.onPositionClickedChanged?.invoke( - position, - previousPosition - ) + threadListAdapterCallback?.onPositionClickedChanged?.invoke(position, previousPosition) } previousThreadClickedPosition = position diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt index 857889cd512..a0e35da51aa 100644 --- a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt +++ b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt @@ -314,8 +314,7 @@ class ThreadListFragment : TwoPaneFragment(), SwipeRefreshLayout.OnRefreshListen override var onPositionClickedChanged: ((position: Int, previousPosition: Int) -> Unit)? = ::updateAutoAdvanceNaturalThread }, - multiSelection = - object : MultiSelectionListener { + multiSelection = object : MultiSelectionListener { override var isEnabled by mainViewModel::isMultiSelectOn override val selectedItems by mainViewModel::selectedThreads override val publishSelectedItems = mainViewModel::publishSelectedItems diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt index 3ae518acdbc..1a17e642bfa 100644 --- a/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt +++ b/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt @@ -147,7 +147,7 @@ class ThreadFragment : Fragment() { observeCurrentFolderName() observeThreadOpening() - observeAutoAdavance() + observeAutoAdvance() } override fun onConfigurationChanged(newConfig: Configuration) { @@ -465,7 +465,7 @@ class ThreadFragment : Fragment() { } } - private fun observeAutoAdavance() { + private fun observeAutoAdvance() { mainViewModel.autoAdvanceThreadsUids.observe(viewLifecycleOwner) { listThreadsUids -> tryToAutoAdvance(listThreadsUids) } diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index b8049b7514b..3271c728077 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -393,8 +393,8 @@ Autorizar el seguimiento Seleccione qué mostrar cuando se archiva o elimina un mensaje Mostrar la siguiente conversación al archivar o borrar - Siguiendo la conversación - Mostrar lista de conversaciones al archivar o borrar + Conversación siguiente + Mostrar la lista de conversaciones al archivar o borrar Lista de conversaciones Repite la última acción realizada Selecciona automáticamente la conversación siguiente o anterior, en función de tu última interacción.