From a75c7abbdf7af09135de6df1e552ddab227ffbdb Mon Sep 17 00:00:00 2001 From: cketti Date: Fri, 6 Oct 2023 10:41:49 +0200 Subject: [PATCH 1/3] Combine settings for navigation action after removing a message After the user deletes or moves a message in the message view screen, the available navigation options are: - Return to message list - Show previous message - Show next message We get rid of the "magic" mode that tries to keep going in the direction in which the user was moving previously. --- app/core/src/main/java/com/fsck/k9/K9.kt | 23 ++++++++------ .../GeneralSettingsDescriptions.java | 12 +++++-- .../com/fsck/k9/preferences/Settings.java | 2 +- .../upgrader/GeneralSettingsUpgraderTo89.kt | 23 ++++++++++++++ .../values/arrays_general_settings_values.xml | 6 ++++ .../k9/preferences/K9StoragePersister.java | 2 +- .../migrations/StorageMigrationTo21.kt | 26 ++++++++++++++++ .../migrations/StorageMigrations.kt | 2 ++ .../java/com/fsck/k9/activity/MessageList.kt | 31 ++++++++----------- .../k9/ui/messageview/MessageViewFragment.kt | 10 +++--- .../general/GeneralSettingsDataStore.kt | 7 ++--- .../arrays_general_settings_strings.xml | 6 ++++ app/ui/legacy/src/main/res/values/strings.xml | 6 ++++ .../src/main/res/xml/general_settings.xml | 18 +++++------ 14 files changed, 123 insertions(+), 51 deletions(-) create mode 100644 app/core/src/main/java/com/fsck/k9/preferences/upgrader/GeneralSettingsUpgraderTo89.kt create mode 100644 app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo21.kt diff --git a/app/core/src/main/java/com/fsck/k9/K9.kt b/app/core/src/main/java/com/fsck/k9/K9.kt index a6c13be7bdb..dcacdd450ba 100644 --- a/app/core/src/main/java/com/fsck/k9/K9.kt +++ b/app/core/src/main/java/com/fsck/k9/K9.kt @@ -183,11 +183,7 @@ object K9 : EarlyInit { @JvmStatic var isUseMessageViewFixedWidthFont = false - @JvmStatic - var isMessageViewReturnToList = false - - @JvmStatic - var isMessageViewShowNext = false + var messageViewPostRemoveNavigation: PostRemoveNavigation = PostRemoveNavigation.ReturnToMessageList @JvmStatic var isUseVolumeKeysForNavigation = false @@ -331,8 +327,8 @@ object K9 : EarlyInit { isChangeContactNameColor = storage.getBoolean("changeRegisteredNameColor", false) contactNameColor = storage.getInt("registeredNameColor", 0xFF1093F5.toInt()) isUseMessageViewFixedWidthFont = storage.getBoolean("messageViewFixedWidthFont", false) - isMessageViewReturnToList = storage.getBoolean("messageViewReturnToList", false) - isMessageViewShowNext = storage.getBoolean("messageViewShowNext", false) + messageViewPostRemoveNavigation = + storage.getEnum("messageViewPostDeleteAction", PostRemoveNavigation.ReturnToMessageList) isHideUserAgent = storage.getBoolean("hideUserAgent", false) isHideTimeZone = storage.getBoolean("hideTimeZone", false) @@ -405,8 +401,7 @@ object K9 : EarlyInit { editor.putBoolean("changeRegisteredNameColor", isChangeContactNameColor) editor.putInt("registeredNameColor", contactNameColor) editor.putBoolean("messageViewFixedWidthFont", isUseMessageViewFixedWidthFont) - editor.putBoolean("messageViewReturnToList", isMessageViewReturnToList) - editor.putBoolean("messageViewShowNext", isMessageViewShowNext) + editor.putEnum("messageViewPostDeleteAction", messageViewPostRemoveNavigation) editor.putBoolean("hideUserAgent", isHideUserAgent) editor.putBoolean("hideTimeZone", isHideTimeZone) @@ -535,4 +530,14 @@ object K9 : EarlyInit { NEVER, WHEN_IN_LANDSCAPE, } + + /** + * The navigation actions that can be to performed after the user has deleted or moved a message from the message + * view screen. + */ + enum class PostRemoveNavigation { + ReturnToMessageList, + ShowPreviousMessage, + ShowNextMessage, + } } diff --git a/app/core/src/main/java/com/fsck/k9/preferences/GeneralSettingsDescriptions.java b/app/core/src/main/java/com/fsck/k9/preferences/GeneralSettingsDescriptions.java index 16f056b593e..fd1fb5b65af 100644 --- a/app/core/src/main/java/com/fsck/k9/preferences/GeneralSettingsDescriptions.java +++ b/app/core/src/main/java/com/fsck/k9/preferences/GeneralSettingsDescriptions.java @@ -17,6 +17,7 @@ import com.fsck.k9.K9; import com.fsck.k9.K9.BACKGROUND_OPS; import com.fsck.k9.K9.NotificationQuickDelete; +import com.fsck.k9.K9.PostRemoveNavigation; import com.fsck.k9.K9.SplitViewMode; import com.fsck.k9.SwipeAction; import com.fsck.k9.UiDensity; @@ -37,6 +38,7 @@ import com.fsck.k9.preferences.upgrader.GeneralSettingsUpgraderTo58; import com.fsck.k9.preferences.upgrader.GeneralSettingsUpgraderTo69; import com.fsck.k9.preferences.upgrader.GeneralSettingsUpgraderTo79; +import com.fsck.k9.preferences.upgrader.GeneralSettingsUpgraderTo89; import static com.fsck.k9.K9.LockScreenNotificationVisibility; @@ -138,10 +140,12 @@ public class GeneralSettingsDescriptions { new V(1, new BooleanSetting(false)) )); s.put("messageViewReturnToList", Settings.versions( - new V(1, new BooleanSetting(false)) + new V(1, new BooleanSetting(false)), + new V(89, null) )); s.put("messageViewShowNext", Settings.versions( - new V(1, new BooleanSetting(false)) + new V(1, new BooleanSetting(false)), + new V(89, null) )); s.put("quietTimeEnabled", Settings.versions( new V(1, new BooleanSetting(false)) @@ -285,6 +289,9 @@ public class GeneralSettingsDescriptions { s.put("fontSizeMessageViewAccountName", Settings.versions( new V(87, new FontSizeSetting(FontSizes.FONT_DEFAULT)) )); + s.put("messageViewPostDeleteAction", Settings.versions( + new V(89, new EnumSetting<>(PostRemoveNavigation.class, PostRemoveNavigation.ReturnToMessageList)) + )); SETTINGS = Collections.unmodifiableMap(s); @@ -294,6 +301,7 @@ public class GeneralSettingsDescriptions { u.put(58, new GeneralSettingsUpgraderTo58()); u.put(69, new GeneralSettingsUpgraderTo69()); u.put(79, new GeneralSettingsUpgraderTo79()); + u.put(89, new GeneralSettingsUpgraderTo89()); UPGRADERS = Collections.unmodifiableMap(u); } diff --git a/app/core/src/main/java/com/fsck/k9/preferences/Settings.java b/app/core/src/main/java/com/fsck/k9/preferences/Settings.java index 3e617a5ec42..e07e1f1b492 100644 --- a/app/core/src/main/java/com/fsck/k9/preferences/Settings.java +++ b/app/core/src/main/java/com/fsck/k9/preferences/Settings.java @@ -36,7 +36,7 @@ public class Settings { * * @see SettingsExporter */ - public static final int VERSION = 88; + public static final int VERSION = 89; static Map validate(int version, Map> settings, Map importedSettings, boolean useDefaultValues) { diff --git a/app/core/src/main/java/com/fsck/k9/preferences/upgrader/GeneralSettingsUpgraderTo89.kt b/app/core/src/main/java/com/fsck/k9/preferences/upgrader/GeneralSettingsUpgraderTo89.kt new file mode 100644 index 00000000000..9a8c254dee6 --- /dev/null +++ b/app/core/src/main/java/com/fsck/k9/preferences/upgrader/GeneralSettingsUpgraderTo89.kt @@ -0,0 +1,23 @@ +package com.fsck.k9.preferences.upgrader + +import com.fsck.k9.preferences.Settings.SettingsUpgrader + +/** + * Combine `messageViewReturnToList` and `messageViewShowNext` into `messageViewPostDeleteAction`. + */ +class GeneralSettingsUpgraderTo89 : SettingsUpgrader { + override fun upgrade(settings: MutableMap): Set { + val messageViewReturnToList = settings["messageViewReturnToList"] as? Boolean + val messageViewShowNext = settings["messageViewShowNext"] as? Boolean + + if (messageViewReturnToList == true) { + settings["messageViewPostDeleteAction"] = "ReturnToMessageList" + } else if (messageViewShowNext == true) { + settings["messageViewPostDeleteAction"] = "ShowNextMessage" + } else { + settings["messageViewPostDeleteAction"] = "ShowPreviousMessage" + } + + return setOf("messageViewReturnToList", "messageViewShowNext") + } +} diff --git a/app/core/src/main/res/values/arrays_general_settings_values.xml b/app/core/src/main/res/values/arrays_general_settings_values.xml index 95fca883f9a..98090fc646c 100644 --- a/app/core/src/main/res/values/arrays_general_settings_values.xml +++ b/app/core/src/main/res/values/arrays_general_settings_values.xml @@ -221,4 +221,10 @@ move + + ReturnToMessageList + ShowPreviousMessage + ShowNextMessage + + diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/K9StoragePersister.java b/app/storage/src/main/java/com/fsck/k9/preferences/K9StoragePersister.java index a3f9003e283..e3f19a5c8af 100644 --- a/app/storage/src/main/java/com/fsck/k9/preferences/K9StoragePersister.java +++ b/app/storage/src/main/java/com/fsck/k9/preferences/K9StoragePersister.java @@ -21,7 +21,7 @@ public class K9StoragePersister implements StoragePersister { - private static final int DB_VERSION = 20; + private static final int DB_VERSION = 21; private static final String DB_NAME = "preferences_storage"; private final Context context; diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo21.kt b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo21.kt new file mode 100644 index 00000000000..11794e94361 --- /dev/null +++ b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo21.kt @@ -0,0 +1,26 @@ +package com.fsck.k9.preferences.migrations + +import android.database.sqlite.SQLiteDatabase + +/** + * Combine `messageViewReturnToList` and `messageViewShowNext` into `messageViewPostDeleteAction`. + */ +class StorageMigrationTo21( + private val db: SQLiteDatabase, + private val migrationsHelper: StorageMigrationsHelper, +) { + fun createPostRemoveNavigationSetting() { + val messageViewReturnToList = migrationsHelper.readValue(db, "messageViewReturnToList").toBoolean() + val messageViewShowNext = migrationsHelper.readValue(db, "messageViewShowNext").toBoolean() + + val postRemoveNavigation = when { + messageViewReturnToList -> "ReturnToMessageList" + messageViewShowNext -> "ShowNextMessage" + else -> "ShowPreviousMessage" + } + + migrationsHelper.writeValue(db, "messageViewPostDeleteAction", postRemoveNavigation) + migrationsHelper.writeValue(db, "messageViewReturnToList", null) + migrationsHelper.writeValue(db, "messageViewShowNext", null) + } +} diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrations.kt b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrations.kt index d6ff640d395..ebddafd6c4c 100644 --- a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrations.kt +++ b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrations.kt @@ -3,6 +3,7 @@ package com.fsck.k9.preferences.migrations import android.database.sqlite.SQLiteDatabase internal object StorageMigrations { + @Suppress("MagicNumber", "CyclomaticComplexMethod") @JvmStatic fun upgradeDatabase(db: SQLiteDatabase, migrationsHelper: StorageMigrationsHelper) { val oldVersion = db.version @@ -26,5 +27,6 @@ internal object StorageMigrations { if (oldVersion < 18) StorageMigrationTo18(db, migrationsHelper).rewriteImapCompressionSettings() if (oldVersion < 19) StorageMigrationTo19(db, migrationsHelper).markGmailAccounts() if (oldVersion < 20) StorageMigrationTo20(db, migrationsHelper).fixIdentities() + if (oldVersion < 21) StorageMigrationTo21(db, migrationsHelper).createPostRemoveNavigationSetting() } } diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt b/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt index 8f98f9b6476..5099eb4c870 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt @@ -31,6 +31,7 @@ import app.k9mail.core.android.common.contact.ContactRepository import app.k9mail.feature.launcher.FeatureLauncherActivity import com.fsck.k9.Account import com.fsck.k9.K9 +import com.fsck.k9.K9.PostRemoveNavigation import com.fsck.k9.K9.SplitViewMode import com.fsck.k9.Preferences import com.fsck.k9.account.BackgroundAccountRemover @@ -54,7 +55,6 @@ import com.fsck.k9.ui.managefolders.ManageFoldersActivity import com.fsck.k9.ui.messagelist.DefaultFolderProvider import com.fsck.k9.ui.messagelist.MessageListFragment import com.fsck.k9.ui.messagelist.MessageListFragment.MessageListFragmentListener -import com.fsck.k9.ui.messageview.Direction import com.fsck.k9.ui.messageview.MessageViewContainerFragment import com.fsck.k9.ui.messageview.MessageViewContainerFragment.MessageViewContainerListener import com.fsck.k9.ui.messageview.MessageViewFragment.MessageViewFragmentListener @@ -109,12 +109,6 @@ open class MessageList : private var search: LocalSearch? = null private var singleFolderMode = false - private val lastDirection: Direction - get() { - return messageViewContainerFragment?.lastDirection - ?: if (K9.isMessageViewShowNext) Direction.NEXT else Direction.PREVIOUS - } - private var messageListActivityConfig: MessageListActivityConfig? = null /** @@ -1151,9 +1145,11 @@ open class MessageList : messageListFragment.setActiveMessage(messageReference) } - override fun showNextMessageOrReturn() { - if (K9.isMessageViewReturnToList || !showLogicalNextMessage()) { - returnToMessageList() + override fun performNavigationAfterMessageRemoval() { + when (K9.messageViewPostRemoveNavigation) { + PostRemoveNavigation.ReturnToMessageList -> returnToMessageList() + PostRemoveNavigation.ShowPreviousMessage -> showPreviousMessageOrReturn() + PostRemoveNavigation.ShowNextMessage -> showNextMessageOrReturn() } } @@ -1165,16 +1161,15 @@ open class MessageList : } } - private fun showLogicalNextMessage(): Boolean { - val couldMoveInLastDirection = when (lastDirection) { - Direction.NEXT -> showNextMessage() - Direction.PREVIOUS -> showPreviousMessage() + private fun showPreviousMessageOrReturn() { + if (!showPreviousMessage()) { + returnToMessageList() } + } - return if (couldMoveInLastDirection) { - true - } else { - showNextMessage() || showPreviousMessage() + private fun showNextMessageOrReturn() { + if (!showNextMessage()) { + returnToMessageList() } } diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.kt index d1f873451d1..efc2931ebea 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.kt @@ -425,7 +425,7 @@ class MessageViewFragment : private fun delete() { disableDeleteMenuItem() - fragmentListener.showNextMessageOrReturn() + fragmentListener.performNavigationAfterMessageRemoval() messagingController.deleteMessage(messageReference) } @@ -454,7 +454,7 @@ class MessageViewFragment : } private fun refileMessage(destinationFolderId: Long) { - fragmentListener.showNextMessageOrReturn() + fragmentListener.performNavigationAfterMessageRemoval() val sourceFolderId = messageReference.folderId messagingController.moveMessage(account, sourceFolderId, messageReference, destinationFolderId) @@ -527,7 +527,7 @@ class MessageViewFragment : } private fun onMoveToDrafts() { - fragmentListener.showNextMessageOrReturn() + fragmentListener.performNavigationAfterMessageRemoval() val account = account val folderId = messageReference.folderId @@ -613,7 +613,7 @@ class MessageViewFragment : account.setLastSelectedFolderId(destinationFolderId) - fragmentListener.showNextMessageOrReturn() + fragmentListener.performNavigationAfterMessageRemoval() moveMessage(messageReference, destinationFolderId) } @@ -863,7 +863,7 @@ class MessageViewFragment : fun onReplyAll(messageReference: MessageReference, decryptionResultForReply: Parcelable?) fun onReply(messageReference: MessageReference, decryptionResultForReply: Parcelable?) fun setProgress(enable: Boolean) - fun showNextMessageOrReturn() + fun performNavigationAfterMessageRemoval() } private val messageLoaderCallbacks: MessageLoaderCallbacks = object : MessageLoaderCallbacks { diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsDataStore.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsDataStore.kt index 31be0d19d24..de172c9577e 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsDataStore.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsDataStore.kt @@ -2,6 +2,7 @@ package com.fsck.k9.ui.settings.general import androidx.preference.PreferenceDataStore import com.fsck.k9.K9 +import com.fsck.k9.K9.PostRemoveNavigation import com.fsck.k9.SwipeAction import com.fsck.k9.UiDensity import com.fsck.k9.job.K9JobManager @@ -36,8 +37,6 @@ class GeneralSettingsDataStore( "threaded_view" -> K9.isThreadedViewEnabled "messageview_fixedwidth_font" -> K9.isUseMessageViewFixedWidthFont "messageview_autofit_width" -> K9.isAutoFitWidth - "messageview_return_to_list" -> K9.isMessageViewReturnToList - "messageview_show_next" -> K9.isMessageViewShowNext "quiet_time_enabled" -> K9.isQuietTimeEnabled "disable_notifications_during_quiet_time" -> !K9.isNotificationDuringQuietTimeEnabled "privacy_hide_useragent" -> K9.isHideUserAgent @@ -67,8 +66,6 @@ class GeneralSettingsDataStore( "threaded_view" -> K9.isThreadedViewEnabled = value "messageview_fixedwidth_font" -> K9.isUseMessageViewFixedWidthFont = value "messageview_autofit_width" -> K9.isAutoFitWidth = value - "messageview_return_to_list" -> K9.isMessageViewReturnToList = value - "messageview_show_next" -> K9.isMessageViewShowNext = value "quiet_time_enabled" -> K9.isQuietTimeEnabled = value "disable_notifications_during_quiet_time" -> K9.isNotificationDuringQuietTimeEnabled = !value "privacy_hide_useragent" -> K9.isHideUserAgent = value @@ -126,6 +123,7 @@ class GeneralSettingsDataStore( "swipe_action_right" -> swipeActionToString(K9.swipeRightAction) "swipe_action_left" -> swipeActionToString(K9.swipeLeftAction) "message_list_density" -> K9.messageListDensity.toString() + "post_remove_navigation" -> K9.messageViewPostRemoveNavigation.name else -> defValue } } @@ -162,6 +160,7 @@ class GeneralSettingsDataStore( "swipe_action_right" -> K9.swipeRightAction = stringToSwipeAction(value) "swipe_action_left" -> K9.swipeLeftAction = stringToSwipeAction(value) "message_list_density" -> K9.messageListDensity = UiDensity.valueOf(value) + "post_remove_navigation" -> K9.messageViewPostRemoveNavigation = PostRemoveNavigation.valueOf(value) else -> return } diff --git a/app/ui/legacy/src/main/res/values/arrays_general_settings_strings.xml b/app/ui/legacy/src/main/res/values/arrays_general_settings_strings.xml index 213f6ea87d0..76f0980d458 100644 --- a/app/ui/legacy/src/main/res/values/arrays_general_settings_strings.xml +++ b/app/ui/legacy/src/main/res/values/arrays_general_settings_strings.xml @@ -174,4 +174,10 @@ @string/general_settings_ui_density_relaxed + + @string/general_settings_post_remove_action_return_to_list + @string/general_settings_post_remove_action_show_previous_message + @string/general_settings_post_remove_action_show_next_message + + diff --git a/app/ui/legacy/src/main/res/values/strings.xml b/app/ui/legacy/src/main/res/values/strings.xml index 4b2a76e0484..db74c8f5885 100644 --- a/app/ui/legacy/src/main/res/values/strings.xml +++ b/app/ui/legacy/src/main/res/values/strings.xml @@ -272,6 +272,12 @@ Show next message after delete Show next message by default after message deletion + + After deleting or moving a message + Return to message list + Show previous message + Show next message + Confirm actions Show a dialog whenever you perform selected actions Delete diff --git a/app/ui/legacy/src/main/res/xml/general_settings.xml b/app/ui/legacy/src/main/res/xml/general_settings.xml index a6cb64b2196..96ff70b28be 100644 --- a/app/ui/legacy/src/main/res/xml/general_settings.xml +++ b/app/ui/legacy/src/main/res/xml/general_settings.xml @@ -314,17 +314,13 @@ android:key="volume_navigation" android:title="@string/volume_navigation_title" /> - - - + Date: Thu, 28 Sep 2023 23:36:18 +0200 Subject: [PATCH 2/3] Remove unused functionality from `MessageViewContainerFragment` --- .../com/fsck/k9/ui/messageview/Direction.kt | 6 ----- .../MessageViewContainerFragment.kt | 27 +++---------------- 2 files changed, 4 insertions(+), 29 deletions(-) delete mode 100644 app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/Direction.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/Direction.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/Direction.kt deleted file mode 100644 index 172ecf0a585..00000000000 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/Direction.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.fsck.k9.ui.messageview - -enum class Direction { - PREVIOUS, - NEXT, -} diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewContainerFragment.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewContainerFragment.kt index 84de6c46dce..83ad356af59 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewContainerFragment.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewContainerFragment.kt @@ -36,15 +36,10 @@ class MessageViewContainerFragment : Fragment() { private var activeMessageReference: MessageReference? = null - var lastDirection: Direction? = null - private set - private lateinit var fragmentListener: MessageViewContainerListener private lateinit var viewPager: ViewPager2 private lateinit var adapter: MessageViewContainerAdapter - private var currentPosition: Int? = null - private val messageViewFragment: MessageViewFragment get() { check(isResumed) @@ -64,14 +59,12 @@ class MessageViewContainerFragment : Fragment() { setHasOptionsMenu(true) - if (savedInstanceState == null) { - messageReference = MessageReference.parse(arguments?.getString(ARG_REFERENCE)) + messageReference = if (savedInstanceState == null) { + MessageReference.parse(arguments?.getString(ARG_REFERENCE)) ?: error("Missing argument $ARG_REFERENCE") } else { - messageReference = MessageReference.parse(savedInstanceState.getString(STATE_MESSAGE_REFERENCE)) + MessageReference.parse(savedInstanceState.getString(STATE_MESSAGE_REFERENCE)) ?: error("Missing state $STATE_MESSAGE_REFERENCE") - - lastDirection = savedInstanceState.getSerializable(STATE_LAST_DIRECTION) as Direction? } showAccountChip = arguments?.getBoolean(ARG_SHOW_ACCOUNT_CHIP) ?: showAccountChip @@ -123,7 +116,6 @@ class MessageViewContainerFragment : Fragment() { override fun onSaveInstanceState(outState: Bundle) { super.onSaveInstanceState(outState) outState.putString(STATE_MESSAGE_REFERENCE, messageReference.toIdentityString()) - outState.putSerializable(STATE_LAST_DIRECTION, lastDirection) } fun setViewModel(viewModel: MessageListViewModel) { @@ -161,25 +153,15 @@ class MessageViewContainerFragment : Fragment() { val newMessageReference = adapter.getMessageReference(position) ?: return if (newMessageReference == activeMessageReference) { // If the position of current message changes (e.g. because messages were added or removed from the list), - // we keep track of the new position but otherwise ignore the event. - currentPosition = position + // we ignore the event. return } - rememberNavigationDirection(position) - messageReference = newMessageReference activeMessageReference = newMessageReference fragmentListener.setActiveMessage(newMessageReference) } - private fun rememberNavigationDirection(newPosition: Int) { - currentPosition?.let { currentPosition -> - lastDirection = if (newPosition < currentPosition) Direction.PREVIOUS else Direction.NEXT - } - currentPosition = newPosition - } - fun showPreviousMessage(): Boolean { val newPosition = viewPager.currentItem - 1 return if (newPosition >= 0) { @@ -318,7 +300,6 @@ class MessageViewContainerFragment : Fragment() { private const val ARG_SHOW_ACCOUNT_CHIP = "showAccountChip" private const val STATE_MESSAGE_REFERENCE = "messageReference" - private const val STATE_LAST_DIRECTION = "lastDirection" fun newInstance(reference: MessageReference, showAccountChip: Boolean): MessageViewContainerFragment { return MessageViewContainerFragment().withArguments( From 4d434b2d0b2e986b9cea126d4b9f0f60277f5b5f Mon Sep 17 00:00:00 2001 From: cketti Date: Fri, 29 Sep 2023 15:22:02 +0200 Subject: [PATCH 3/3] Remove unused strings --- app/ui/legacy/src/main/res/values-ar/strings.xml | 4 ---- app/ui/legacy/src/main/res/values-be/strings.xml | 4 ---- app/ui/legacy/src/main/res/values-bg/strings.xml | 4 ---- app/ui/legacy/src/main/res/values-br/strings.xml | 4 ---- app/ui/legacy/src/main/res/values-ca/strings.xml | 4 ---- app/ui/legacy/src/main/res/values-cs/strings.xml | 4 ---- app/ui/legacy/src/main/res/values-cy/strings.xml | 4 ---- app/ui/legacy/src/main/res/values-da/strings.xml | 4 ---- app/ui/legacy/src/main/res/values-de/strings.xml | 4 ---- app/ui/legacy/src/main/res/values-el/strings.xml | 4 ---- app/ui/legacy/src/main/res/values-eo/strings.xml | 4 ---- app/ui/legacy/src/main/res/values-es/strings.xml | 4 ---- app/ui/legacy/src/main/res/values-et/strings.xml | 4 ---- app/ui/legacy/src/main/res/values-eu/strings.xml | 4 ---- app/ui/legacy/src/main/res/values-fa/strings.xml | 4 ---- app/ui/legacy/src/main/res/values-fi/strings.xml | 4 ---- app/ui/legacy/src/main/res/values-fr/strings.xml | 4 ---- app/ui/legacy/src/main/res/values-fy/strings.xml | 4 ---- app/ui/legacy/src/main/res/values-gd/strings.xml | 4 ---- app/ui/legacy/src/main/res/values-gl/strings.xml | 4 ---- app/ui/legacy/src/main/res/values-hr/strings.xml | 4 ---- app/ui/legacy/src/main/res/values-hu/strings.xml | 4 ---- app/ui/legacy/src/main/res/values-in/strings.xml | 4 ---- app/ui/legacy/src/main/res/values-is/strings.xml | 4 ---- app/ui/legacy/src/main/res/values-it/strings.xml | 4 ---- app/ui/legacy/src/main/res/values-iw/strings.xml | 4 ---- app/ui/legacy/src/main/res/values-ja/strings.xml | 4 ---- app/ui/legacy/src/main/res/values-ko/strings.xml | 4 ---- app/ui/legacy/src/main/res/values-lt/strings.xml | 4 ---- app/ui/legacy/src/main/res/values-lv/strings.xml | 4 ---- app/ui/legacy/src/main/res/values-ml/strings.xml | 4 ---- app/ui/legacy/src/main/res/values-nb/strings.xml | 4 ---- app/ui/legacy/src/main/res/values-nl/strings.xml | 4 ---- app/ui/legacy/src/main/res/values-pl/strings.xml | 4 ---- app/ui/legacy/src/main/res/values-pt-rBR/strings.xml | 4 ---- app/ui/legacy/src/main/res/values-pt-rPT/strings.xml | 4 ---- app/ui/legacy/src/main/res/values-ro/strings.xml | 4 ---- app/ui/legacy/src/main/res/values-ru/strings.xml | 4 ---- app/ui/legacy/src/main/res/values-sk/strings.xml | 4 ---- app/ui/legacy/src/main/res/values-sl/strings.xml | 4 ---- app/ui/legacy/src/main/res/values-sq/strings.xml | 4 ---- app/ui/legacy/src/main/res/values-sr/strings.xml | 4 ---- app/ui/legacy/src/main/res/values-sv/strings.xml | 4 ---- app/ui/legacy/src/main/res/values-tr/strings.xml | 4 ---- app/ui/legacy/src/main/res/values-uk/strings.xml | 4 ---- app/ui/legacy/src/main/res/values-zh-rCN/strings.xml | 4 ---- app/ui/legacy/src/main/res/values-zh-rTW/strings.xml | 4 ---- app/ui/legacy/src/main/res/values/strings.xml | 4 ---- 48 files changed, 192 deletions(-) diff --git a/app/ui/legacy/src/main/res/values-ar/strings.xml b/app/ui/legacy/src/main/res/values-ar/strings.xml index 093602b105a..3f86b0f789f 100644 --- a/app/ui/legacy/src/main/res/values-ar/strings.xml +++ b/app/ui/legacy/src/main/res/values-ar/strings.xml @@ -229,10 +229,6 @@ استخدم خطًا ذا عرض ثابت عند إظهار رسائل نصية عادية ﻻئم الرسالة تلقائيًا تقليص الرسالة لتناسب الشاشة - عودة إلى اللائحة بعد الحذف - عودة إلى لائحة الرسائل بعد حذف الرسالة - إظهار الرسالة التالية بعد الحذف - إظهار الرسالة التالية دائمًا بعد حذف الرسالة أكّد الإجاءات إظهار مربع حوار كلما قمت بتنفيذ الإجراءات المحددة احذف diff --git a/app/ui/legacy/src/main/res/values-be/strings.xml b/app/ui/legacy/src/main/res/values-be/strings.xml index 70ee6338db2..6893b48fb6e 100644 --- a/app/ui/legacy/src/main/res/values-be/strings.xml +++ b/app/ui/legacy/src/main/res/values-be/strings.xml @@ -225,10 +225,6 @@ Выкарыстоўваць шрыфты з фіксаванай шырынёй для адлюстравання лістоў з простым тэкстам Аўтазапаўненне лістоў Падладжваць тэкст лістоў да шырыні экрана - Вяртацца да спіса пасля выдалення - Вяртацца да спіса лістоў пасля выдалення ліста - Паказваць наступны ліст пасля выдалення - Паказваць наступны ліст пасля выдалення ліста Пацвярджаць дзеянні Паказваць дыялог пацвярджэння дзеянняў Выдаліць diff --git a/app/ui/legacy/src/main/res/values-bg/strings.xml b/app/ui/legacy/src/main/res/values-bg/strings.xml index 637a4389a96..c9e3c20be34 100644 --- a/app/ui/legacy/src/main/res/values-bg/strings.xml +++ b/app/ui/legacy/src/main/res/values-bg/strings.xml @@ -205,10 +205,6 @@ Използва шрифт с фиксирана широчина за показване на съобщения съдържащи само текст Автоматично мащабиране Смалява съобщението за да се събере на екрана - Върни се в списъка след изтриване - Връща в списъка със съобщение след изтриване - Покажи следващо съобщение след изтриване - Покажи следващото съобщение по подразбиране след изтриване на съобщение Потвърди операциите Показва прозорец за потвърждение при действие Изтрий diff --git a/app/ui/legacy/src/main/res/values-br/strings.xml b/app/ui/legacy/src/main/res/values-br/strings.xml index 490485ef4f3..03348eae810 100644 --- a/app/ui/legacy/src/main/res/values-br/strings.xml +++ b/app/ui/legacy/src/main/res/values-br/strings.xml @@ -186,10 +186,6 @@ Arverañ un nodrezh digemm e ledander pa vez skrammet kemennadennoù e testenn blaen Klotañ ar c’hemennadennoù Krennat ar c’hemennadennoù evit klotañ ouzh ar skramm - Distreiñ d’ar roll goude an dilamadur - Distreiñ d’ar roll kemennadennoù goude dilamadur ar gemennadenn - Kemennadenn da-heul goude an dilamadur - Diskouez ar gemennadenn da-heul dre ziouer goude dilamadur ar gemennadenn Kadarnat ar gwezhioù Diskouez un diflugell bewech ma rit ar gwezhioù diuzet Dilemel diff --git a/app/ui/legacy/src/main/res/values-ca/strings.xml b/app/ui/legacy/src/main/res/values-ca/strings.xml index 4cdd9f2a05d..28d79d53833 100644 --- a/app/ui/legacy/src/main/res/values-ca/strings.xml +++ b/app/ui/legacy/src/main/res/values-ca/strings.xml @@ -221,10 +221,6 @@ Utilitza un tipus de lletra d\'amplada fixa quan es mostrin missatges de text pla. Ajusta l\'amplada dels missatges automàticament Retalla els missatges per adaptar la seva amplada a la pantalla. - Torna a la llista després de l\'eliminació - Torna a la llista de missatges després d\'eliminar missatges. - Mostra el missatge següent després de l\'eliminació - Mostra el missatge següent per defecte després d\'eliminar-ne un. Confirma accions Mostra un diàleg cada vegada que executis accions seleccionades Elimina diff --git a/app/ui/legacy/src/main/res/values-cs/strings.xml b/app/ui/legacy/src/main/res/values-cs/strings.xml index 094bfa09b29..d7ca3691702 100644 --- a/app/ui/legacy/src/main/res/values-cs/strings.xml +++ b/app/ui/legacy/src/main/res/values-cs/strings.xml @@ -225,10 +225,6 @@ Pro zobrazování neformátovaných textových zpráv použít písmo s pevnou šířkou Automatické přizpůsobení zpráv Zmenšit zprávy aby se vešly na obrazovku - Návrat do seznamu po smazání - Vrátit se do seznamu zpráv po smazání zprávy - Zobraz další zprávu po smazání - Zobraz další zprávu automaticky po smazání Potvrzování akcí Zobrazit dialog, když provádíte zvolené akce Smazat diff --git a/app/ui/legacy/src/main/res/values-cy/strings.xml b/app/ui/legacy/src/main/res/values-cy/strings.xml index 8e6f2de8f73..0e1871549a9 100644 --- a/app/ui/legacy/src/main/res/values-cy/strings.xml +++ b/app/ui/legacy/src/main/res/values-cy/strings.xml @@ -220,10 +220,6 @@ Defnyddio ffont gyda lled sefydlog wrth ddangos negeseuon testun plaen Awto-ffitio negeseuon Lleihau negeseuon i ffitio\'r sgrin. - Nôl i\'r rhestr ar ôl dileu - Dychwelyd i\'r rhestr negeseuon ar ôl dileu neges - Ymlaen i\'r neges nesaf ar ôl dileu - Symud ymlaen i\'r neges nesaf ar ôl dileu neges Cadarnhau gweithredoedd Dewis pryd i ofyn am gadarnhad cyn gwneud rhywbeth Dileu diff --git a/app/ui/legacy/src/main/res/values-da/strings.xml b/app/ui/legacy/src/main/res/values-da/strings.xml index a459659149d..e8d37101c75 100644 --- a/app/ui/legacy/src/main/res/values-da/strings.xml +++ b/app/ui/legacy/src/main/res/values-da/strings.xml @@ -219,10 +219,6 @@ Benyt tegnsæt med fast bredde til visning af mails med ren tekst Auto tilpas størrelse på meddelelser Afkort meddelser så de passer til skærm - Retur til liste efter sletning - Returner til mailliste efter sletning af mail - Vis næste mail efter sletning - Vis som standard næste mail efter sletning af mail Bekræft handlinger Vis dialogvindue når du udfører valgte handlinger Slet diff --git a/app/ui/legacy/src/main/res/values-de/strings.xml b/app/ui/legacy/src/main/res/values-de/strings.xml index d9a42fdec6c..0f07f7eb1c7 100644 --- a/app/ui/legacy/src/main/res/values-de/strings.xml +++ b/app/ui/legacy/src/main/res/values-de/strings.xml @@ -220,10 +220,6 @@ Schriftart mit gleicher Zeichenbreite für Nur-Text-Nachrichten verwenden Nachrichtendarstellung Nachrichten auf Displaygröße verkleinern - Nach Löschen zurück - Nach Löschen zur Nachrichtenliste zurückkehren - Nach Löschen nächste Nachricht - Nach Löschen standardmäßig die nächste Nachricht anzeigen Bestätigungsdialog Bei Ausführung der ausgewählten Aktionen einen Bestätigungsdialog anzeigen Löschen diff --git a/app/ui/legacy/src/main/res/values-el/strings.xml b/app/ui/legacy/src/main/res/values-el/strings.xml index e8f7904ea2e..bfc356d04f1 100644 --- a/app/ui/legacy/src/main/res/values-el/strings.xml +++ b/app/ui/legacy/src/main/res/values-el/strings.xml @@ -221,10 +221,6 @@ Να χρησιμοποιείται γραμματοσειρά σταθερού πλάτους όταν προβάλλονται μηνύματα απλού κειμένου Αυτόματη προσαρμογή Ρύθμιση μεγέθους μηνύματος για να χωρά στην οθόνη - Επιστροφή στη λίστα - Επιστροφή στη λίστα μηνυμάτων μετά τη διαγραφή ενός μηνύματος - Εμφάνιση επόμενου μηνύματος μετά τη διαγραφή - Εμφάνιση επόμενου μηνύματος μετά τη διαγραφή ενός μηνύματος Επιβεβαίωση ενεργειών Προβολή διαλόγου όποτε εκτελούνται επιλεγμένες ενέργειες Διαγραφή diff --git a/app/ui/legacy/src/main/res/values-eo/strings.xml b/app/ui/legacy/src/main/res/values-eo/strings.xml index 7a7f66fd064..05a027baeb2 100644 --- a/app/ui/legacy/src/main/res/values-eo/strings.xml +++ b/app/ui/legacy/src/main/res/values-eo/strings.xml @@ -204,10 +204,6 @@ Uzas egallarĝan tiparon por vidigi plattekstajn mesaĝojn Aŭtomate adapti mesaĝojn al ekrana larĝo Etigas mesaĝojn por enspaci en la ekrano - Forigi kaj reveni listen - Revenas al listo de mesaĝoj post forigado de mesaĝo - Forigi kaj montri sekvan - Montras sekvan mesaĝon por forigado de mesaĝo Konfirmi agojn Montras averton kiam vi faras elektitajn agojn Forigi diff --git a/app/ui/legacy/src/main/res/values-es/strings.xml b/app/ui/legacy/src/main/res/values-es/strings.xml index 6248565f4c8..bda34a91b2d 100644 --- a/app/ui/legacy/src/main/res/values-es/strings.xml +++ b/app/ui/legacy/src/main/res/values-es/strings.xml @@ -222,10 +222,6 @@ Utilizar tipos de letra de ancho fijo al mostrar mensajes en formato texto Auto-ajustar los mensajes Encoger los mensajes para que quepan en la pantalla - Volver a la lista después de borrar - Volver a la lista después de borrar un mensaje - Mostrar siguiente mensaje después de borrar - Mostrar de manera predeterminada el siguiente mensaje después de borrar Confirmar acciones Mostrar un diálogo cuando se realice una de estas acciones Borrar diff --git a/app/ui/legacy/src/main/res/values-et/strings.xml b/app/ui/legacy/src/main/res/values-et/strings.xml index 36bd310a322..88fdd91bc52 100644 --- a/app/ui/legacy/src/main/res/values-et/strings.xml +++ b/app/ui/legacy/src/main/res/values-et/strings.xml @@ -221,10 +221,6 @@ Kasuta lihtteksti kirjades fikseeritud laiusega fonti Sobita kirjad automaatselt Kahanda kirju ekraanile mahutamiseks - Peale kustutamist pöördu tagasi nimekirja - Pöördu tagasi kirjade loendisse kui oled mõne kustutanud - Peale kustutamist näita järgmist kirja - Peale mõne kirja kustutamist näita järgmist kirja Kinnita toiming Näita alati dialoogiakent kui teed valitud toiminguid Kustuta diff --git a/app/ui/legacy/src/main/res/values-eu/strings.xml b/app/ui/legacy/src/main/res/values-eu/strings.xml index c06cb032989..77e62c1cfda 100644 --- a/app/ui/legacy/src/main/res/values-eu/strings.xml +++ b/app/ui/legacy/src/main/res/values-eu/strings.xml @@ -220,10 +220,6 @@ Erabili zabalera finkoko letra-tipoak testu arrunteko mezuak erakustean Doitu mezuak automatikoki Txikiagotu mezuak pantailan sar daitezen - Itzuli zerrendara ezabatu ondoren - Itzuli mezuen zerrendara mezu bat ezabatzean - Erakutsi hurrengo mezua ezabatu ondoren - Erakutsi hurrengo mezua lehenespenez mezua ezabatzean Berretsi ekintzak Erakutsi elkarrizketa bat hautatutako ekintzak egitean Ezabatu diff --git a/app/ui/legacy/src/main/res/values-fa/strings.xml b/app/ui/legacy/src/main/res/values-fa/strings.xml index 4d175bce576..6e434501890 100644 --- a/app/ui/legacy/src/main/res/values-fa/strings.xml +++ b/app/ui/legacy/src/main/res/values-fa/strings.xml @@ -221,10 +221,6 @@ هنگام نمایش پیام‌های متنی از قلم تک‌عرض استفاده کن جاگیری خودکار پیام‌ها پیام‌ها را کوچک می‌کند تا در صفحه جا شوند - برگشت به لیست پس از حذف - پس از حذف پیام به لیست پیام‌ها برگرد - نمایش پیام بعدی پس از حذف - با حذف پیام به‌طور خودکار پیام بعدی را نمایش بده تأیید کنش‌ها برای اجرای هر کدام از کنش‌های انتخاب‌شده سؤال کن حذف diff --git a/app/ui/legacy/src/main/res/values-fi/strings.xml b/app/ui/legacy/src/main/res/values-fi/strings.xml index f33387294e6..b4fa02e3d9a 100644 --- a/app/ui/legacy/src/main/res/values-fi/strings.xml +++ b/app/ui/legacy/src/main/res/values-fi/strings.xml @@ -220,10 +220,6 @@ Käytä kiinteää kirjasinleveyttä muotoilemattomille viesteille Sovita viestit automaattisesti Kutista viestit sopimaan näytölle - Palaa poiston jälkeen listanäkymään - Palaa viestilistaan viestin poiston jälkeen - Näytä poiston jälkeen seuraava viesti - Näytä viestin poiston jälkeen oletusarvoisesti seuraava viesti Vahvista toiminnot Näytä valintaikkuna valitun toiminnon suorittamisesta Poista diff --git a/app/ui/legacy/src/main/res/values-fr/strings.xml b/app/ui/legacy/src/main/res/values-fr/strings.xml index 3d49033a719..921e644a252 100644 --- a/app/ui/legacy/src/main/res/values-fr/strings.xml +++ b/app/ui/legacy/src/main/res/values-fr/strings.xml @@ -224,10 +224,6 @@ Utiliser une police à largeur fixe pour les courriels en texte brut Ajustement automatique des courriels Rétrécir les courriels pour les adapter à l’écran - Retourner à la liste après suppression - Retourner à la liste de courriels après suppression d’un courriel - Afficher le courriel suivant après suppression - Afficher le courriel suivant par défaut après suppression d’un courriel Confirmer les actions Afficher une fenêtre de dialogue lors de certaines actions Supprimer diff --git a/app/ui/legacy/src/main/res/values-fy/strings.xml b/app/ui/legacy/src/main/res/values-fy/strings.xml index 49a39319278..e1caa57d7d4 100644 --- a/app/ui/legacy/src/main/res/values-fy/strings.xml +++ b/app/ui/legacy/src/main/res/values-fy/strings.xml @@ -220,10 +220,6 @@ Brûk in lettertype mei fêste breedte by it werjaan fan platte-tekstberjochten Berjochten auto-passe Berjochten passend meitsje op it skerm - Werom nei list nei fuortsmiten - Werom nei berjochtelist nei fuortsmiten berjocht - Folgjend berjocht toane nei fuortsmiten - Standert folgjend berjocht toane nei fuortsmiten Aksjes befêstigje Altyd in dialoochfinster toane wannear’t jo de selektearre aksjes útfiere Fuortsmite diff --git a/app/ui/legacy/src/main/res/values-gd/strings.xml b/app/ui/legacy/src/main/res/values-gd/strings.xml index fa60dca35f6..d80d4218c14 100644 --- a/app/ui/legacy/src/main/res/values-gd/strings.xml +++ b/app/ui/legacy/src/main/res/values-gd/strings.xml @@ -199,10 +199,6 @@ Cleachd cruth-clò le leud socraichte nuair a thèid teachdaireachd ann an teacsa lom a shealltainn Fèin-fhreagair teachdaireachdan Crùb teachdaireachdan ach am freagair iad ris an sgrìn - Till gun liosta an dèidh sguabaidh às - Till gun liosta an dèidh teachdaireachd a sguabadh às - Seall an ath-theachdaireachd an dèidh sguabaidh às - Seall an ath-theachdaireachd a ghnàth an dèidh teachdaireachd a sguabadh às Dearbh gnìomhan Seall còmhradh uair sam bith a nì thu gnìomh sònraichte Sguab às diff --git a/app/ui/legacy/src/main/res/values-gl/strings.xml b/app/ui/legacy/src/main/res/values-gl/strings.xml index 0c92d468d68..121e5846c99 100644 --- a/app/ui/legacy/src/main/res/values-gl/strings.xml +++ b/app/ui/legacy/src/main/res/values-gl/strings.xml @@ -208,10 +208,6 @@ Usar tamaño fixo de fonte nas mensaxes en texto plano Auto axustar mensaxes Recortar mensaxes para axustar na pantalla - Voltar á lista despois de borrar - Voltar á lista despois da acción de borrado - Mostrar a seguinte mensaxe tras eliminar - Por omisión mostrar a seguinte mensaxe tras borrar unha mensaxe Confirmar acción Amosar un diálogo cuando se realice una de estas acciones Eliminar diff --git a/app/ui/legacy/src/main/res/values-hr/strings.xml b/app/ui/legacy/src/main/res/values-hr/strings.xml index 30f24ade377..26dad7e6424 100644 --- a/app/ui/legacy/src/main/res/values-hr/strings.xml +++ b/app/ui/legacy/src/main/res/values-hr/strings.xml @@ -188,10 +188,6 @@ Koristi popravljenu širinu fonta prilikom prikaza običnog teksta poruke Automatska prilstajanje poruke Stisni poruke kako bi pristajale zaslonu - Vraćanje na popis nakon brisanja - Vraćanje na popis poruka nakon brisanja poruke - Prikaži slijedeću poruku nakon brisanja - Prikaži slijedeću poruku po zadanom nakon brisanja poruke Potvrdi radnje Prikazuje dijalog prilikom izvođenja odabranih radnji Obriši diff --git a/app/ui/legacy/src/main/res/values-hu/strings.xml b/app/ui/legacy/src/main/res/values-hu/strings.xml index bb806ce25b8..ec10a9fdb29 100644 --- a/app/ui/legacy/src/main/res/values-hu/strings.xml +++ b/app/ui/legacy/src/main/res/values-hu/strings.xml @@ -220,10 +220,6 @@ Rögzített szélességű betű használata az egyszerű szöveges üzeneteknél Üzenetek automatikus méretezése Üzenetek összehúzása és képernyőhöz igazítása - Visszatérés a listához törlés után - Visszatérés az üzenetekhez az üzenet törlése után - Következő üzenet megjelenítése törlés után - A következő üzenet alapértelmezett megjelenítése az üzenet törlése után Műveletek megerősítése Párbeszédablak megjelenítése a kiválasztott műveletek végrehajtásakor Törlés diff --git a/app/ui/legacy/src/main/res/values-in/strings.xml b/app/ui/legacy/src/main/res/values-in/strings.xml index eba4eceed60..435b4c6bf01 100644 --- a/app/ui/legacy/src/main/res/values-in/strings.xml +++ b/app/ui/legacy/src/main/res/values-in/strings.xml @@ -197,10 +197,6 @@ Gunakan font lebar tetap saat menampilkan pesan teks biasa Pesan pas otomatis Kecilkan pesan agar sesuai dengan layar - Kembali ke daftar setelah menghapus - Kembali ke daftar pesan setelah menghapus pesan - Tampilkan pesan selanjutnya setelah menghapus - Secara bawaan menampilkan pesan selanjutnya setelah menghapus pesan Konfirmasi tindakan Tampilkan dialog setiap kali Anda melakukan tindakan yang dipilih Hapus diff --git a/app/ui/legacy/src/main/res/values-is/strings.xml b/app/ui/legacy/src/main/res/values-is/strings.xml index 9bbb88e1b15..3a343473a42 100644 --- a/app/ui/legacy/src/main/res/values-is/strings.xml +++ b/app/ui/legacy/src/main/res/values-is/strings.xml @@ -221,10 +221,6 @@ Nota jafnbreitt letur til að birta skilaboð með hreinum texta Skilaboð passi sjálfvirkt Breyta stærð skilaboða svo þau passi á skjáinn - Fara aftur í lista eftir eyðingu - Fara aftur í skilaboðalista eftir að skilaboðum er eytt - Sýna næstu skilaboð eftir eyðingu - Sýna næstu skilaboð eftir að skilaboðum er eytt Staðfesta aðgerðir Alltaf birta samskiptaglugga þegar þú framkvæmir valdar aðgerðir Fjarlægja diff --git a/app/ui/legacy/src/main/res/values-it/strings.xml b/app/ui/legacy/src/main/res/values-it/strings.xml index 62f45978622..0e146c4caca 100644 --- a/app/ui/legacy/src/main/res/values-it/strings.xml +++ b/app/ui/legacy/src/main/res/values-it/strings.xml @@ -223,10 +223,6 @@ Usa carattere a larghezza fissa nei messaggi di testo Adattamento automatico messaggi Riduci i messaggi per adattarli allo schermo - Torna all\'elenco dopo l\'eliminazione - Ritorna all\'elenco dei messaggi dopo l\'eliminazione di un messaggio - Mostra messaggio successivo dopo l\'eliminazione - Mostra messaggio successivo in modo predefinito dopo l\'eliminazione di un messaggio Conferma azioni Mostra una finestra ogni volta che esegui le azioni selezionate Elimina diff --git a/app/ui/legacy/src/main/res/values-iw/strings.xml b/app/ui/legacy/src/main/res/values-iw/strings.xml index 81a3902efa1..6831d3c47a2 100644 --- a/app/ui/legacy/src/main/res/values-iw/strings.xml +++ b/app/ui/legacy/src/main/res/values-iw/strings.xml @@ -198,10 +198,6 @@ צבע שמות ברשימת אנשי הקשר שלך גופנים ברוחב קבוע השתמש בגופן ברוחב קבוע בעת הצגת הודעות טקסט רגילות - חזור לרשימה לאחר המחיקה - חזור אל רשימת ההודעות לאחר מחיקת הודעה - הצג את ההודעה הבאה אחרי מחיקה - הצג את הודעה הבאה כברירת מחדל לאחר מחיקת הודעה אישור פעולות הצג דו שיח בכל פעם שאתה מבצע את פעולות הנבחרות מחק diff --git a/app/ui/legacy/src/main/res/values-ja/strings.xml b/app/ui/legacy/src/main/res/values-ja/strings.xml index 7b3c5f55824..80fe71530b8 100644 --- a/app/ui/legacy/src/main/res/values-ja/strings.xml +++ b/app/ui/legacy/src/main/res/values-ja/strings.xml @@ -217,10 +217,6 @@ プレーンテキストメッセージの表示に固定幅フォントを利用 メッセージサイズ自動調整 画面サイズに合うようにメッセージを縮小する - 削除後メッセージ一覧に戻る - メッセージの削除後、メッセージ一覧に戻る - 削除後次のメッセージを表示 - メッセージの削除後、次のメッセージを表示する 確認 選択した動作を実行するときに常にダイアログを表示する 削除 diff --git a/app/ui/legacy/src/main/res/values-ko/strings.xml b/app/ui/legacy/src/main/res/values-ko/strings.xml index cee6760e43f..bb688fad6ba 100644 --- a/app/ui/legacy/src/main/res/values-ko/strings.xml +++ b/app/ui/legacy/src/main/res/values-ko/strings.xml @@ -200,10 +200,6 @@ 평문 메시지를 보여줄때 고정폭 폰트를 사용합니다 너비 자동 맞춤 화면에 맞도록 메시지를 줄입니다 - 삭제 후 목록으로 - 메시지 삭제 후에 메시지 목록으로 돌아갑니다 - 삭제 후 다음 메시지 보기 - 메시지 삭제 후 다음 메시지를 보도록 기본값으로 설정합니다 동작시 행동 설정한 행동을 할 경우 대화 상자를 보여 줍니다 삭제 diff --git a/app/ui/legacy/src/main/res/values-lt/strings.xml b/app/ui/legacy/src/main/res/values-lt/strings.xml index 774f336b0b7..5399daeb042 100644 --- a/app/ui/legacy/src/main/res/values-lt/strings.xml +++ b/app/ui/legacy/src/main/res/values-lt/strings.xml @@ -224,10 +224,6 @@ Atvaizduojant gryno teksto laiškus naudoti lygiaplotį šriftą Automatiškai pritaikyti laiškus Sutrumpinti žinutes, kad tilptų ekrane - Pašalinus grįžti į sąrašą - Pašalinus laišką, grįžti į laiškų sąrašą - Pašalinus laišką pereiti prie kito - Pašalinus laišką, pagal nutylėjimą pereiti prie sekančio Patvirtinti veiksmus Atliekant pasirinktus veiksmus rodyti dialogą Šalinti diff --git a/app/ui/legacy/src/main/res/values-lv/strings.xml b/app/ui/legacy/src/main/res/values-lv/strings.xml index bf945df1826..16f81b94b8d 100644 --- a/app/ui/legacy/src/main/res/values-lv/strings.xml +++ b/app/ui/legacy/src/main/res/values-lv/strings.xml @@ -223,10 +223,6 @@ pat %d vairāk Izmantot fiksēta platuma šriftu, lai parādīt vienkārša teksta vēstules Automātiski ietilpināt vēstules Samazināt vēstules, lai tās ietilptu ekrānā - Atgriezties uz sarakstu pēc dzēšanas - Atgriezties uz vēstuļu sarakstu pēc vēstules izdzēšanas - Rādīt nākošo vēstuli pēc dzēšanas - Rādīt nākošo vēstuli pēc noklusējuma pēc vēstules izdzēšanas Apstiprināt darbības Rādīt dialogu, kad veicat izvēlētās darbības Dzēst diff --git a/app/ui/legacy/src/main/res/values-ml/strings.xml b/app/ui/legacy/src/main/res/values-ml/strings.xml index 9f67fcb0a7f..284af63d526 100644 --- a/app/ui/legacy/src/main/res/values-ml/strings.xml +++ b/app/ui/legacy/src/main/res/values-ml/strings.xml @@ -210,10 +210,6 @@ പ്ലെയിൻ-ടെക്സ്റ്റ് സന്ദേശങ്ങൾ കാണിക്കുമ്പോൾ ഒരു നിശ്ചിത-വീതിയുള്ള ഫോണ്ട് ഉപയോഗിക്കുക യാന്ത്രികയോജക സന്ദേശങ്ങൾ സ്‌ക്രീനിന് അനുയോജ്യമായ രീതിയിൽ സന്ദേശങ്ങൾ ചുരുക്കുക - ഇല്ലാതാക്കിയതിന് ശേഷം ലിസ്റ്റിലേക്ക് മടങ്ങുക - സന്ദേശം ഇല്ലാതാക്കിയതിനുശേഷം സന്ദേശ ലിസ്റ്റിലേക്ക് മടങ്ങുക - ഇല്ലാതാക്കിയതിനുശേഷം അടുത്ത സന്ദേശം കാണിക്കുക - സന്ദേശം ഇല്ലാതാക്കിയതിനുശേഷം സ്ഥിരമായി അടുത്ത സന്ദേശം കാണിക്കുക പ്രവർത്തനങ്ങൾ സ്ഥിരീകരിക്കുക നിങ്ങൾ തിരഞ്ഞെടുത്ത പ്രവർത്തനങ്ങൾ നടത്തുമ്പോഴെല്ലാം ഒരു ഡയലോഗ് കാണിക്കുക ഇല്ലാതാക്കുക diff --git a/app/ui/legacy/src/main/res/values-nb/strings.xml b/app/ui/legacy/src/main/res/values-nb/strings.xml index 3e7259a779f..0d6e2f76eea 100644 --- a/app/ui/legacy/src/main/res/values-nb/strings.xml +++ b/app/ui/legacy/src/main/res/values-nb/strings.xml @@ -194,10 +194,6 @@ til %d flere Bruk fastbreddeskrift ved visning av meldinger i ren tekst. Autojuster meldinger Tilpass meldinger til skjermstørrelse - Gå tilbake til liste etter sletting - Gå tilbake til meldingsliste etter sletting av melding - Vis neste melding etter sletting - Vis neste melding som standard etter sletting av melding Bekreft handlinger Vis dialog når du gjennomfører valgte handlinger Slett diff --git a/app/ui/legacy/src/main/res/values-nl/strings.xml b/app/ui/legacy/src/main/res/values-nl/strings.xml index 65cf24d2dbc..97f57165c5a 100644 --- a/app/ui/legacy/src/main/res/values-nl/strings.xml +++ b/app/ui/legacy/src/main/res/values-nl/strings.xml @@ -220,10 +220,6 @@ Gebruik een lettertype met vaste breedte bij het weergeven van plain-tekstberichten Berichten auto-passen Berichten passend maken op het scherm - Terug naar lijst na verwijderen - Terug naar berichtenlijst na bericht verwijderen - Volgend bericht laten zien na verwijderen - Standaard volgend bericht laten zien na verwijderen Acties bevestigen Toon een dialoogvenster altijd wanneer je de geselecteerde acties uitvoert Verwijderen diff --git a/app/ui/legacy/src/main/res/values-pl/strings.xml b/app/ui/legacy/src/main/res/values-pl/strings.xml index ad3b7c0108a..56d60987fc7 100644 --- a/app/ui/legacy/src/main/res/values-pl/strings.xml +++ b/app/ui/legacy/src/main/res/values-pl/strings.xml @@ -225,10 +225,6 @@ Wysłane z urządzenia Android za pomocą K-9 Mail. Proszę wybaczyć moją zwi Użyj czcionki o stałej szerokości do wyświetlania wiadomości tekstowych Dopasuj wiadomość do rozmiaru ekranu Zmniejsza wiadomości, aby mieściły się na ekranie - Skasuj i wróć do listy - Wraca do listy wiadomości po usunięciu danej wiadomości - Pokaż następną wiadomość po usunięciu - Pokaż domyślnie następną wiadomość po usunięciu Potwierdź czynności Pokaż potwierdzające okno dialogowe, gdy wykonujesz wybrane czynności Usuń diff --git a/app/ui/legacy/src/main/res/values-pt-rBR/strings.xml b/app/ui/legacy/src/main/res/values-pt-rBR/strings.xml index 6b0336b28b3..53f2a07f1a0 100644 --- a/app/ui/legacy/src/main/res/values-pt-rBR/strings.xml +++ b/app/ui/legacy/src/main/res/values-pt-rBR/strings.xml @@ -222,10 +222,6 @@ Usa uma fonte monoespaçada ao exibir mensagens que contenham somente texto Ajustar mensagens automaticamente Ajusta as mensagens para que caibam na tela - Retornar para lista após excluir - Retorna para a lista de mensagens após excluir mensagens - Exibir a próxima mensagem após excluir - Exibe, por padrão, a próxima mensagem, após excluir mensagens Confirmar ações Exibe um diálogo sempre que você efetuar determinada ação Excluir diff --git a/app/ui/legacy/src/main/res/values-pt-rPT/strings.xml b/app/ui/legacy/src/main/res/values-pt-rPT/strings.xml index f4d35af52f3..327853f0248 100644 --- a/app/ui/legacy/src/main/res/values-pt-rPT/strings.xml +++ b/app/ui/legacy/src/main/res/values-pt-rPT/strings.xml @@ -223,10 +223,6 @@ Usar uma fonte de largura fixa quando forem visualizadas mensagens em texto simples Ajustar automaticamente as mensagens Encolher as mensagens para caberem no ecrã - Voltar à lista depois de eliminar - Voltar à lista de mensagens depois da eliminação de mensagens - Mostrar a mensagem seguinte depois de eliminar - Mostrar por predefinição a seguinte mensagem depois da eliminação de mensagens Confirmar ações Mostrar um diálogo sempre que executa as ações selecionadas Eliminar diff --git a/app/ui/legacy/src/main/res/values-ro/strings.xml b/app/ui/legacy/src/main/res/values-ro/strings.xml index 0e41f471ed0..5cde7163087 100644 --- a/app/ui/legacy/src/main/res/values-ro/strings.xml +++ b/app/ui/legacy/src/main/res/values-ro/strings.xml @@ -223,10 +223,6 @@ cel mult încă %d Utilizează un font cu lățime fixă când mesajele sunt afișate ca text simplu Auto-dimensionează mesajele Micșorează mesajele pentru a se potrivi pe ecran - Înapoi la listă după ștergere - Înapoi la lista de mesaje după ștergerea mesajului - Arată următorul mesaj după ștergere - Arată următorul mesaj implicit după mesaj ștergere Confirmă acţiuni Afișează un dialog de fiecare dată când efectuați acțiuni selectate Şterge diff --git a/app/ui/legacy/src/main/res/values-ru/strings.xml b/app/ui/legacy/src/main/res/values-ru/strings.xml index 17f527e72cc..dfe979de8d2 100644 --- a/app/ui/legacy/src/main/res/values-ru/strings.xml +++ b/app/ui/legacy/src/main/res/values-ru/strings.xml @@ -224,10 +224,6 @@ Показать сообщения в формате «Только текст» моноширинным шрифтом Вписать по ширине Подогнать текст сообщения по ширине экрана - В список после удаления - Перейти в список сообщений после удаления сообщения - В следующее после удаления - Открыть следующее сообщение после удаления сообщения Подтверждать действия Запросить подтверждение действий Удалить diff --git a/app/ui/legacy/src/main/res/values-sk/strings.xml b/app/ui/legacy/src/main/res/values-sk/strings.xml index 4e9274fd364..77f05f4a9f8 100644 --- a/app/ui/legacy/src/main/res/values-sk/strings.xml +++ b/app/ui/legacy/src/main/res/values-sk/strings.xml @@ -199,10 +199,6 @@ Používať písmo s pevnou šírkou pri zobrazovaní textových správ Automaticky prispôsobiť správy Zmenšiť správy, aby sa zmestili na obrazovku - Návrat do zoznamu po zmazaní - Návrat do zoznamu správ po zmazaní správy - Zobraziť ďalšiu správu po zmazaní - Zobraziť ďalšiu správu automaticky po zmazaní správy Potvrdzovanie akcií Zobraziť dialógové okno pri vykonávaní vybraných akcií Vymazať diff --git a/app/ui/legacy/src/main/res/values-sl/strings.xml b/app/ui/legacy/src/main/res/values-sl/strings.xml index 71786f5921c..3f2f6824756 100644 --- a/app/ui/legacy/src/main/res/values-sl/strings.xml +++ b/app/ui/legacy/src/main/res/values-sl/strings.xml @@ -224,10 +224,6 @@ dodatnih %d sporočil Pri prikazu neoblikovanih besedilnih sporočil se uporabi pisava s črkami stalne širine Samodejno prilagodi prikaz sporočil Prikaz sporočila se skrči, da se po širini prilagodi zaslonu - Po brisanju sporočil znova pokaži seznam - Po brisanju sporočil se pogled vrne na seznam sporočil - Po brisanju sporočil pokaži naslednje sporočilo - Pokaže naslednje neizbrisano sporočilo na seznamu sporočil Zahtevaj potrditev dejanj Prikaže pogovorno okno za potrditev izbranih dejanj Brisanje vseh vrst sporočil diff --git a/app/ui/legacy/src/main/res/values-sq/strings.xml b/app/ui/legacy/src/main/res/values-sq/strings.xml index cbfe68e312e..2b84d8e24c2 100644 --- a/app/ui/legacy/src/main/res/values-sq/strings.xml +++ b/app/ui/legacy/src/main/res/values-sq/strings.xml @@ -221,10 +221,6 @@ Kur shfaqen mesazhe tekst i thjeshtë, përdor shkronja me gjerësi të fiksuar. Rregulloje vetvetiu nxënien e mesazhit Tkurri mesazhet t\’i nxërë ekrani - Pas fshirjes, kthehu te lista - Kthehuni te lista e mesazheve pas fshirjes së mesazheve - Pas fshirjes shfaq mesazhin pasues - Si parazgjedhje, shfaq mesazhin pasues, pas fshirjes së mesazhit Ripohoni veprimet Shfaq një dialog kurdo që kryeni veprime që keni përzgjedhur Fshije diff --git a/app/ui/legacy/src/main/res/values-sr/strings.xml b/app/ui/legacy/src/main/res/values-sr/strings.xml index a4360481987..4b4b3c72d6b 100644 --- a/app/ui/legacy/src/main/res/values-sr/strings.xml +++ b/app/ui/legacy/src/main/res/values-sr/strings.xml @@ -198,10 +198,6 @@ Користи фонт фиксне ширине за приказ обичних текстуалних порука Уклопи поруке Скупи поруке да стану на екран - Врати на листу након брисања - Враћа се на листу порука након брисања поруке - Приказ следеће након брисања - Приказаће следећу поруку након брисања поруке Потврде за радње Приказује дијалог за потврду изабраних радњи брисања diff --git a/app/ui/legacy/src/main/res/values-sv/strings.xml b/app/ui/legacy/src/main/res/values-sv/strings.xml index e47fb9ff641..9527758d7ce 100644 --- a/app/ui/legacy/src/main/res/values-sv/strings.xml +++ b/app/ui/legacy/src/main/res/values-sv/strings.xml @@ -221,10 +221,6 @@ Använd ett teckensnitt med fast bredd när meddelanden med enbart oformaterad text visas Anpassa automatiskt meddelanden Krymp meddelanden så att de får plats på skärmen - Återvänd till listan efter borttagning - Återvänd till meddelandelistan efter att meddelande tagits bort - Visa nästa meddelande efter borttagning - Visa nästa meddelande som standard efter borttagning av meddelande Bekräfta åtgärder Visa en dialogruta när du genomför valda åtgärder Ta bort diff --git a/app/ui/legacy/src/main/res/values-tr/strings.xml b/app/ui/legacy/src/main/res/values-tr/strings.xml index a6e55f65c42..c3a97a555bf 100644 --- a/app/ui/legacy/src/main/res/values-tr/strings.xml +++ b/app/ui/legacy/src/main/res/values-tr/strings.xml @@ -213,10 +213,6 @@ Düz metin mesajları gösterdiğinde sabit genişlikli yazı tipi kullan Mesajları otomatik sığdır İletileri ekrana sığacak şekilde küçült - Sildikten sonra listeye dön - Mesajı sildikten sonra mesaj listesine döner - Sildikten sonra sonraki mesajı göster - Mesaj siliminden sonra varsayılan olarak sonraki mesajı gösterir Eylemleri onaylayın Seçilmiş eylemleri yaptığınız zaman bir diyalog göster Sil diff --git a/app/ui/legacy/src/main/res/values-uk/strings.xml b/app/ui/legacy/src/main/res/values-uk/strings.xml index efff762606e..7ff80c751f9 100644 --- a/app/ui/legacy/src/main/res/values-uk/strings.xml +++ b/app/ui/legacy/src/main/res/values-uk/strings.xml @@ -225,10 +225,6 @@ Використовувати моноширинний шрифт для відображення звичайних текстових повідомлень Припасовувати текст повідомлень до ширини екрану Стискати повідомлення до ширини екрану - Повернутися до списку після видалення - Повернутися до списку повідомлень після видалення поточного повідомлення - Показувати наступне повідомлення після видалення - Показувати наступне повідомлення після видалення поточного повідомлення Підтвердження дій Показати діалогове вікно щоразу, коли ви виконуєте вибрані дії Видалити diff --git a/app/ui/legacy/src/main/res/values-zh-rCN/strings.xml b/app/ui/legacy/src/main/res/values-zh-rCN/strings.xml index 8c4d27bdcff..b035a85b7ab 100644 --- a/app/ui/legacy/src/main/res/values-zh-rCN/strings.xml +++ b/app/ui/legacy/src/main/res/values-zh-rCN/strings.xml @@ -218,10 +218,6 @@ 使用等宽字体显示纯文本邮件 自适应邮件 缩小邮件以适应屏幕 - 删除后回到自动返回到列表 - 邮件删除后自动返回到邮件列表 - 删除后显示下一封邮件 - 邮件删除后自动显示下一封邮件 确认操作 进行选择操作时总是显示一个对话框进行确认 删除 diff --git a/app/ui/legacy/src/main/res/values-zh-rTW/strings.xml b/app/ui/legacy/src/main/res/values-zh-rTW/strings.xml index c85159a9c3d..12a7a0666a4 100644 --- a/app/ui/legacy/src/main/res/values-zh-rTW/strings.xml +++ b/app/ui/legacy/src/main/res/values-zh-rTW/strings.xml @@ -218,10 +218,6 @@ 使用固定寬度字體顯示純文字郵件 自動調整訊息 調整訊息內容符合螢幕大小 - 刪除後自動返回到列表 - 郵件刪除後自動返回到郵件列表 - 刪除並顯示下一郵件 - 刪除郵件後自動顯示下一郵件 確認操作 進行選擇操作時總是顯示一個對話框進行確認 刪除 diff --git a/app/ui/legacy/src/main/res/values/strings.xml b/app/ui/legacy/src/main/res/values/strings.xml index db74c8f5885..42f9aa1ffbb 100644 --- a/app/ui/legacy/src/main/res/values/strings.xml +++ b/app/ui/legacy/src/main/res/values/strings.xml @@ -267,10 +267,6 @@ Use a fixed-width font when showing plain-text messages Auto-fit messages Shrink messages to fit the screen - Return to list after delete - Return to message list after message deletion - Show next message after delete - Show next message by default after message deletion After deleting or moving a message