From 98dabfb20c95c99e4db72268e45a00a137d70b6a Mon Sep 17 00:00:00 2001 From: shamim-emon Date: Sat, 8 Nov 2025 16:48:24 +0600 Subject: [PATCH 1/5] feat: add new general settings 'drawerExpandAllFolder' --- .../visualSettings/DisplayVisualSettings.kt | 2 ++ .../DisplayVisualSettingsPreferenceManager.kt | 2 ++ ...aultDisplayVisualSettingsPreferenceManager.kt | 5 +++++ .../preferences/GeneralSettingsDescriptions.java | 3 +++ .../java/com/fsck/k9/preferences/Settings.java | 2 +- .../settings/general/GeneralSettingsDataStore.kt | 16 ++++++++++++++++ 6 files changed, 29 insertions(+), 1 deletion(-) diff --git a/core/preference/api/src/commonMain/kotlin/net/thunderbird/core/preference/display/visualSettings/DisplayVisualSettings.kt b/core/preference/api/src/commonMain/kotlin/net/thunderbird/core/preference/display/visualSettings/DisplayVisualSettings.kt index 3dc3a52f897..88fda69bed7 100644 --- a/core/preference/api/src/commonMain/kotlin/net/thunderbird/core/preference/display/visualSettings/DisplayVisualSettings.kt +++ b/core/preference/api/src/commonMain/kotlin/net/thunderbird/core/preference/display/visualSettings/DisplayVisualSettings.kt @@ -10,6 +10,7 @@ const val DISPLAY_SETTINGS_DEFAULT_IS_AUTO_FIT_WIDTH = true const val DISPLAY_SETTINGS_DEFAULT_IS_SHOW_ANIMATION = true const val DISPLAY_SETTINGS_DEFAULT_IS_SHOW_CORRESPONDENT_NAMES = true const val DISPLAY_SETTINGS_DEFAULT_MESSAGE_LIST_PREVIEW_LINES = 2 +const val DISPLAY_SETTINGS_DEFAULT_DRAWER_EXPAND_ALL_FOLDER = false data class DisplayVisualSettings( val isShowAnimations: Boolean = DISPLAY_SETTINGS_DEFAULT_IS_SHOW_ANIMATION, @@ -22,4 +23,5 @@ data class DisplayVisualSettings( val isUseMessageViewFixedWidthFont: Boolean = DISPLAY_SETTINGS_DEFAULT_IS_USE_MESSAGE_VIEW_FIXED_WIDTH_FONT, val isAutoFitWidth: Boolean = DISPLAY_SETTINGS_DEFAULT_IS_AUTO_FIT_WIDTH, val messageListPreviewLines: Int = DISPLAY_SETTINGS_DEFAULT_MESSAGE_LIST_PREVIEW_LINES, + val drawerExpandAllFolder: Boolean = DISPLAY_SETTINGS_DEFAULT_DRAWER_EXPAND_ALL_FOLDER, ) diff --git a/core/preference/api/src/commonMain/kotlin/net/thunderbird/core/preference/display/visualSettings/DisplayVisualSettingsPreferenceManager.kt b/core/preference/api/src/commonMain/kotlin/net/thunderbird/core/preference/display/visualSettings/DisplayVisualSettingsPreferenceManager.kt index 22535fe0b30..2f9034d1256 100644 --- a/core/preference/api/src/commonMain/kotlin/net/thunderbird/core/preference/display/visualSettings/DisplayVisualSettingsPreferenceManager.kt +++ b/core/preference/api/src/commonMain/kotlin/net/thunderbird/core/preference/display/visualSettings/DisplayVisualSettingsPreferenceManager.kt @@ -13,4 +13,6 @@ const val KEY_AUTO_FIT_WIDTH = "autofitWidth" const val KEY_SHOW_CONTACT_PICTURE = "showContactPicture" const val KEY_MESSAGE_LIST_VIEW_PREVIEW_LINES = "messageListPreviewLines" +const val KEY_DRAWER_EXPAND_ALL_FOLDER = "drawerExpandAllFolder" + interface DisplayVisualSettingsPreferenceManager : PreferenceManager diff --git a/core/preference/impl/src/commonMain/kotlin/net/thunderbird/core/preference/display/visualSettings/DefaultDisplayVisualSettingsPreferenceManager.kt b/core/preference/impl/src/commonMain/kotlin/net/thunderbird/core/preference/display/visualSettings/DefaultDisplayVisualSettingsPreferenceManager.kt index 836c70036d2..187d6e650c5 100644 --- a/core/preference/impl/src/commonMain/kotlin/net/thunderbird/core/preference/display/visualSettings/DefaultDisplayVisualSettingsPreferenceManager.kt +++ b/core/preference/impl/src/commonMain/kotlin/net/thunderbird/core/preference/display/visualSettings/DefaultDisplayVisualSettingsPreferenceManager.kt @@ -74,6 +74,10 @@ class DefaultDisplayVisualSettingsPreferenceManager( KEY_MESSAGE_LIST_VIEW_PREVIEW_LINES, DISPLAY_SETTINGS_DEFAULT_MESSAGE_LIST_PREVIEW_LINES, ), + drawerExpandAllFolder = storage.getBoolean( + KEY_DRAWER_EXPAND_ALL_FOLDER, + DISPLAY_SETTINGS_DEFAULT_DRAWER_EXPAND_ALL_FOLDER, + ), ) private fun writeConfig(config: DisplayVisualSettings) { @@ -111,6 +115,7 @@ class DefaultDisplayVisualSettingsPreferenceManager( KEY_MESSAGE_LIST_VIEW_PREVIEW_LINES, config.messageListPreviewLines, ) + storageEditor.putBoolean(KEY_DRAWER_EXPAND_ALL_FOLDER, config.drawerExpandAllFolder) storageEditor.commit().also { commited -> logger.verbose(TAG) { "writeConfig: storageEditor.commit() resulted in: $commited" } } diff --git a/legacy/core/src/main/java/com/fsck/k9/preferences/GeneralSettingsDescriptions.java b/legacy/core/src/main/java/com/fsck/k9/preferences/GeneralSettingsDescriptions.java index 68f1532810f..5d802b2a743 100644 --- a/legacy/core/src/main/java/com/fsck/k9/preferences/GeneralSettingsDescriptions.java +++ b/legacy/core/src/main/java/com/fsck/k9/preferences/GeneralSettingsDescriptions.java @@ -333,6 +333,9 @@ class GeneralSettingsDescriptions { s.put("shouldShowSetupArchiveFolderDialog", Settings.versions( new V(105, new BooleanSetting(DISPLAY_SETTINGS_DEFAULT_SHOULD_SHOW_SETUP_ARCHIVE_FOLDER_DIALOG))) ); + s.put("drawerExpandAllFolder", Settings.versions( + new V(108, new BooleanSetting(false)) + )); // TODO: Add a way to properly support feature-specific settings. if (telemetryManager.isTelemetryFeatureIncluded()) { diff --git a/legacy/core/src/main/java/com/fsck/k9/preferences/Settings.java b/legacy/core/src/main/java/com/fsck/k9/preferences/Settings.java index e1702a0977e..551f29bf521 100644 --- a/legacy/core/src/main/java/com/fsck/k9/preferences/Settings.java +++ b/legacy/core/src/main/java/com/fsck/k9/preferences/Settings.java @@ -34,7 +34,7 @@ class Settings { * * @see SettingsExporter */ - public static final int VERSION = 107; + public static final int VERSION = 108; static Map validate(int version, Map>> settings, Map importedSettings, boolean useDefaultValues) { diff --git a/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsDataStore.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsDataStore.kt index 4ab201be89a..5f6a8b67a16 100644 --- a/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsDataStore.kt +++ b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsDataStore.kt @@ -64,6 +64,8 @@ class GeneralSettingsDataStore( "messageview_autofit_width" -> generalSettingsManager.getConfig() .display.visualSettings.isAutoFitWidth + "drawerExpandAllFolder" -> generalSettingsManager.getConfig() + .display.visualSettings.drawerExpandAllFolder "quiet_time_enabled" -> generalSettingsManager.getConfig() .notification.isQuietTimeEnabled @@ -86,6 +88,7 @@ class GeneralSettingsDataStore( when (key) { "fixed_message_view_theme" -> setFixedMessageViewTheme(value) "animations" -> setIsShowAnimations(isShowAnimations = value) + "drawerExpandAllFolder" -> setDrawerExpandAllFolder(drawerExpandAllFolder = value) "show_unified_inbox" -> setIsShowUnifiedInbox(value) "show_starred_count" -> setIsShowStarredCount(isShowStarredCount = value) "messagelist_stars" -> setIsShowMessageListStars(isShowMessageListStars = value) @@ -426,6 +429,19 @@ class GeneralSettingsDataStore( } } + private fun setDrawerExpandAllFolder(drawerExpandAllFolder: Boolean) { + skipSaveSettings = true + generalSettingsManager.update { settings -> + settings.copy( + display = settings.display.copy( + visualSettings = settings.display.visualSettings.copy( + drawerExpandAllFolder = drawerExpandAllFolder, + ), + ), + ) + } + } + private fun setIsShowCorrespondentNames(isShowCorrespondentNames: Boolean) { skipSaveSettings = true generalSettingsManager.update { settings -> From 7052a76f55fc5c403bda4e8ff238236c63a85fb5 Mon Sep 17 00:00:00 2001 From: shamim-emon Date: Sat, 8 Nov 2025 16:52:00 +0600 Subject: [PATCH 2/5] feat: integrate 'drawerExpandAllFolder' general setting into DrawerContract.kt and expose it to UI to control initial collapsed/expanded state of side menu folders --- .../drawer/api/NavigationDrawerExternalContract.kt | 1 + .../drawer/dropdown/ui/DrawerContentPreview.kt | 7 +++++++ .../navigation/drawer/dropdown/ui/DrawerContent.kt | 1 + .../navigation/drawer/dropdown/ui/DrawerContract.kt | 1 + .../drawer/dropdown/ui/folder/FolderList.kt | 2 ++ .../drawer/dropdown/ui/folder/FolderListItem.kt | 3 ++- .../k9/preferences/DefaultDrawerConfigManager.kt | 13 ++++++++++++- .../main/java/com/fsck/k9/preferences/KoinModule.kt | 1 + 8 files changed, 27 insertions(+), 2 deletions(-) diff --git a/feature/navigation/drawer/api/src/main/kotlin/net/thunderbird/feature/navigation/drawer/api/NavigationDrawerExternalContract.kt b/feature/navigation/drawer/api/src/main/kotlin/net/thunderbird/feature/navigation/drawer/api/NavigationDrawerExternalContract.kt index c944310acda..01809805241 100644 --- a/feature/navigation/drawer/api/src/main/kotlin/net/thunderbird/feature/navigation/drawer/api/NavigationDrawerExternalContract.kt +++ b/feature/navigation/drawer/api/src/main/kotlin/net/thunderbird/feature/navigation/drawer/api/NavigationDrawerExternalContract.kt @@ -8,6 +8,7 @@ interface NavigationDrawerExternalContract { val showUnifiedFolders: Boolean, val showStarredCount: Boolean, val showAccountSelector: Boolean, + val expandAllFolder: Boolean, ) fun interface DrawerConfigLoader { diff --git a/feature/navigation/drawer/dropdown/src/debug/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/ui/DrawerContentPreview.kt b/feature/navigation/drawer/dropdown/src/debug/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/ui/DrawerContentPreview.kt index 5a9d1d8fa18..53497be6801 100644 --- a/feature/navigation/drawer/dropdown/src/debug/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/ui/DrawerContentPreview.kt +++ b/feature/navigation/drawer/dropdown/src/debug/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/ui/DrawerContentPreview.kt @@ -126,6 +126,7 @@ internal fun DrawerContentSingleAccountPreview() { showUnifiedFolders = false, showStarredCount = false, showAccountSelector = false, + expandAllFolder = false, ), ), onEvent = {}, @@ -151,6 +152,7 @@ internal fun DrawerContentSingleAccountWithAccountSelectionPreview() { showUnifiedFolders = false, showStarredCount = false, showAccountSelector = true, + expandAllFolder = false, ), ), onEvent = {}, @@ -175,6 +177,7 @@ internal fun DrawerContentMultipleAccountsAccountPreview() { showUnifiedFolders = false, showStarredCount = false, showAccountSelector = false, + expandAllFolder = false, ), ), onEvent = {}, @@ -198,6 +201,7 @@ internal fun DrawerContentMultipleAccountsWithAccountSelectionPreview() { showUnifiedFolders = false, showStarredCount = false, showAccountSelector = true, + expandAllFolder = false, ), ), onEvent = {}, @@ -221,6 +225,7 @@ internal fun DrawerContentMultipleAccountsWithDifferentAccountSelectionPreview() showUnifiedFolders = false, showStarredCount = false, showAccountSelector = true, + expandAllFolder = false, ), ), onEvent = {}, @@ -249,6 +254,7 @@ internal fun DrawerContentSmallScreenPreview() { showUnifiedFolders = false, showStarredCount = false, showAccountSelector = true, + expandAllFolder = false, ), ), onEvent = {}, @@ -278,6 +284,7 @@ internal fun DrawerContentVerySmallScreenPreview() { showUnifiedFolders = false, showStarredCount = false, showAccountSelector = true, + expandAllFolder = false, ), ), onEvent = {}, diff --git a/feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/ui/DrawerContent.kt b/feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/ui/DrawerContent.kt index 1254403c73a..c3a2fecc413 100644 --- a/feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/ui/DrawerContent.kt +++ b/feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/ui/DrawerContent.kt @@ -135,6 +135,7 @@ private fun FolderContent( modifier = Modifier.fillMaxSize(), ) { FolderList( + isExpandedInitial = state.config.expandAllFolder, rootFolder = state.rootFolder, selectedFolder = state.selectedFolder, onFolderClick = { folder -> diff --git a/feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/ui/DrawerContract.kt b/feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/ui/DrawerContract.kt index 7a03a3e3ed8..fd031b6e705 100644 --- a/feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/ui/DrawerContract.kt +++ b/feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/ui/DrawerContract.kt @@ -19,6 +19,7 @@ internal interface DrawerContract { showUnifiedFolders = false, showStarredCount = false, showAccountSelector = true, + expandAllFolder = false, ), val accounts: ImmutableList = persistentListOf(), val selectedAccountId: String? = null, diff --git a/feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/ui/folder/FolderList.kt b/feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/ui/folder/FolderList.kt index 50883e52551..60a1fbd5282 100644 --- a/feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/ui/folder/FolderList.kt +++ b/feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/ui/folder/FolderList.kt @@ -21,6 +21,7 @@ internal fun FolderList( onFolderClick: (DisplayFolder) -> Unit, showStarredCount: Boolean, modifier: Modifier = Modifier, + isExpandedInitial: Boolean = false, ) { val resources = LocalContext.current.resources val folderNameFormatter = remember { FolderNameFormatter(resources) } @@ -45,6 +46,7 @@ internal fun FolderList( onClick = onFolderClick, folderNameFormatter = folderNameFormatter, selectedFolderId = selectedFolder?.id, + isExpandInitial = isExpandedInitial, ) } } diff --git a/feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/ui/folder/FolderListItem.kt b/feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/ui/folder/FolderListItem.kt index 7e9ff0ee38f..bc00447f4f2 100644 --- a/feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/ui/folder/FolderListItem.kt +++ b/feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/ui/folder/FolderListItem.kt @@ -42,11 +42,12 @@ internal fun FolderListItem( folderNameFormatter: FolderNameFormatter, selectedFolderId: String?, modifier: Modifier = Modifier, + isExpandInitial: Boolean = false, treeFolder: DisplayTreeFolder? = null, parentPrefix: String? = "", indentationLevel: Int = 1, ) { - val isExpanded = rememberSaveable { mutableStateOf(false) } + val isExpanded = rememberSaveable(isExpandInitial) { mutableStateOf(isExpandInitial) } var unreadCount = displayFolder.unreadMessageCount var starredCount = displayFolder.starredMessageCount diff --git a/legacy/core/src/main/java/com/fsck/k9/preferences/DefaultDrawerConfigManager.kt b/legacy/core/src/main/java/com/fsck/k9/preferences/DefaultDrawerConfigManager.kt index 88a88211454..6a39bd27f82 100644 --- a/legacy/core/src/main/java/com/fsck/k9/preferences/DefaultDrawerConfigManager.kt +++ b/legacy/core/src/main/java/com/fsck/k9/preferences/DefaultDrawerConfigManager.kt @@ -11,6 +11,7 @@ import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.flow.update import net.thunderbird.core.preference.display.inboxSettings.DisplayInboxSettingsPreferenceManager +import net.thunderbird.core.preference.display.visualSettings.DisplayVisualSettingsPreferenceManager import net.thunderbird.core.preference.update import net.thunderbird.feature.navigation.drawer.api.NavigationDrawerExternalContract.DrawerConfig @@ -18,14 +19,23 @@ internal class DefaultDrawerConfigManager( private val preferences: Preferences, coroutineScope: CoroutineScope, private val displayInboxSettingsPreferenceManager: DisplayInboxSettingsPreferenceManager, + private val displayVisualSettingsPreferenceManager: DisplayVisualSettingsPreferenceManager, ) : DrawerConfigManager { private val showAccountSelector = MutableStateFlow(K9.isShowAccountSelector) private val drawerConfig: StateFlow = showAccountSelector - .combine(displayInboxSettingsPreferenceManager.getConfigFlow()) { showAccSelector, displayInboxSettings -> + .combine( + displayInboxSettingsPreferenceManager.getConfigFlow(), + ) { showAccSelector, displayInboxSettings -> + Pair(showAccSelector, displayInboxSettings) + } + .combine( + displayVisualSettingsPreferenceManager.getConfigFlow(), + ) { (showAccSelector, displayInboxSettings), displayVisualSettings -> DrawerConfig( showAccountSelector = showAccSelector, showStarredCount = displayInboxSettings.isShowStarredCount, showUnifiedFolders = displayInboxSettings.isShowUnifiedInbox, + expandAllFolder = displayVisualSettings.drawerExpandAllFolder, ) } .stateIn( @@ -35,6 +45,7 @@ internal class DefaultDrawerConfigManager( showAccountSelector = false, showStarredCount = false, showUnifiedFolders = false, + expandAllFolder = false, ), ) diff --git a/legacy/core/src/main/java/com/fsck/k9/preferences/KoinModule.kt b/legacy/core/src/main/java/com/fsck/k9/preferences/KoinModule.kt index bab0fd9ae3e..633e651d369 100644 --- a/legacy/core/src/main/java/com/fsck/k9/preferences/KoinModule.kt +++ b/legacy/core/src/main/java/com/fsck/k9/preferences/KoinModule.kt @@ -153,6 +153,7 @@ val preferencesModule = module { preferences = get(), coroutineScope = get(named("AppCoroutineScope")), displayInboxSettingsPreferenceManager = get(), + displayVisualSettingsPreferenceManager = get(), ) } bind DrawerConfigManager::class From 92ef4edbf4efe94c8ddadfc554404bf950522284 Mon Sep 17 00:00:00 2001 From: shamim-emon Date: Sat, 8 Nov 2025 16:55:29 +0600 Subject: [PATCH 3/5] =?UTF-8?q?feat:=20add=20'drawerExpandAllFolder'=20to?= =?UTF-8?q?=20display=20preferences,=20allowing=20it=20to=20be=20toggled?= =?UTF-8?q?=20from=20General=20Settings=20=E2=86=92=20Display=20Settings?= =?UTF-8?q?=20section?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- legacy/ui/legacy/src/main/res/values/strings.xml | 2 ++ .../ui/legacy/src/main/res/xml/general_settings.xml | 12 ++++++++++++ 2 files changed, 14 insertions(+) diff --git a/legacy/ui/legacy/src/main/res/values/strings.xml b/legacy/ui/legacy/src/main/res/values/strings.xml index 029ab3c87b2..d493f86ce7a 100644 --- a/legacy/ui/legacy/src/main/res/values/strings.xml +++ b/legacy/ui/legacy/src/main/res/values/strings.xml @@ -619,6 +619,7 @@ Network Interaction Account list + Side Menu Message lists Messages Theme @@ -659,6 +660,7 @@ Show Unified Inbox Show starred count + Expand Folders Unified Inbox All messages in unified folders diff --git a/legacy/ui/legacy/src/main/res/xml/general_settings.xml b/legacy/ui/legacy/src/main/res/xml/general_settings.xml index d5d1a07cd4b..bc2f5ba5ad2 100644 --- a/legacy/ui/legacy/src/main/res/xml/general_settings.xml +++ b/legacy/ui/legacy/src/main/res/xml/general_settings.xml @@ -200,6 +200,18 @@ + + + + + + Date: Sat, 8 Nov 2025 16:56:40 +0600 Subject: [PATCH 4/5] test: update test cases to accommodate the inclusion of 'drawerExpandAllFolder' setting` --- .../drawer/dropdown/domain/usecase/GetDrawerConfigTest.kt | 1 + .../feature/navigation/drawer/dropdown/ui/DrawerStateTest.kt | 1 + .../navigation/drawer/dropdown/ui/DrawerViewModelTest.kt | 2 ++ 3 files changed, 4 insertions(+) diff --git a/feature/navigation/drawer/dropdown/src/test/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/domain/usecase/GetDrawerConfigTest.kt b/feature/navigation/drawer/dropdown/src/test/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/domain/usecase/GetDrawerConfigTest.kt index b8d177de64f..07d5902d485 100644 --- a/feature/navigation/drawer/dropdown/src/test/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/domain/usecase/GetDrawerConfigTest.kt +++ b/feature/navigation/drawer/dropdown/src/test/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/domain/usecase/GetDrawerConfigTest.kt @@ -20,6 +20,7 @@ internal class GetDrawerConfigTest { showUnifiedFolders = true, showStarredCount = true, showAccountSelector = true, + expandAllFolder = false, ) val testSubject = GetDrawerConfig(configLoader = configLoader) diff --git a/feature/navigation/drawer/dropdown/src/test/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/ui/DrawerStateTest.kt b/feature/navigation/drawer/dropdown/src/test/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/ui/DrawerStateTest.kt index 360802ab8bc..152734fd938 100644 --- a/feature/navigation/drawer/dropdown/src/test/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/ui/DrawerStateTest.kt +++ b/feature/navigation/drawer/dropdown/src/test/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/ui/DrawerStateTest.kt @@ -20,6 +20,7 @@ internal class DrawerStateTest { showUnifiedFolders = false, showStarredCount = false, showAccountSelector = true, + expandAllFolder = false, ), accounts = persistentListOf(), selectedAccountId = null, diff --git a/feature/navigation/drawer/dropdown/src/test/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/ui/DrawerViewModelTest.kt b/feature/navigation/drawer/dropdown/src/test/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/ui/DrawerViewModelTest.kt index 20b74655592..15d93990fc3 100644 --- a/feature/navigation/drawer/dropdown/src/test/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/ui/DrawerViewModelTest.kt +++ b/feature/navigation/drawer/dropdown/src/test/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/ui/DrawerViewModelTest.kt @@ -500,11 +500,13 @@ internal class DrawerViewModelTest { showUnifiedInbox: Boolean = false, showStarredCount: Boolean = false, showAccountSelector: Boolean = true, + expandAllFolder: Boolean = false, ): DrawerConfig { return DrawerConfig( showUnifiedFolders = showUnifiedInbox, showStarredCount = showStarredCount, showAccountSelector = showAccountSelector, + expandAllFolder = expandAllFolder, ) } From 123c306ed506c9a6749bb48d010f17955d5fcd9b Mon Sep 17 00:00:00 2001 From: shamim-emon Date: Sun, 9 Nov 2025 20:00:30 +0600 Subject: [PATCH 5/5] refactor: updated title for key 'account_setup_auto_expand_folder' to avoid confusion --- legacy/ui/legacy/src/main/res/values-ar/strings.xml | 1 - legacy/ui/legacy/src/main/res/values-be/strings.xml | 1 - legacy/ui/legacy/src/main/res/values-bg/strings.xml | 1 - legacy/ui/legacy/src/main/res/values-br/strings.xml | 1 - legacy/ui/legacy/src/main/res/values-ca/strings.xml | 1 - legacy/ui/legacy/src/main/res/values-co/strings.xml | 1 - legacy/ui/legacy/src/main/res/values-cs/strings.xml | 1 - legacy/ui/legacy/src/main/res/values-cy/strings.xml | 1 - legacy/ui/legacy/src/main/res/values-da/strings.xml | 1 - legacy/ui/legacy/src/main/res/values-de/strings.xml | 1 - legacy/ui/legacy/src/main/res/values-el/strings.xml | 1 - legacy/ui/legacy/src/main/res/values-en-rGB/strings.xml | 1 - legacy/ui/legacy/src/main/res/values-eo/strings.xml | 1 - legacy/ui/legacy/src/main/res/values-es/strings.xml | 1 - legacy/ui/legacy/src/main/res/values-et/strings.xml | 1 - legacy/ui/legacy/src/main/res/values-eu/strings.xml | 1 - legacy/ui/legacy/src/main/res/values-fa/strings.xml | 1 - legacy/ui/legacy/src/main/res/values-fi/strings.xml | 1 - legacy/ui/legacy/src/main/res/values-fr/strings.xml | 1 - legacy/ui/legacy/src/main/res/values-fy/strings.xml | 1 - legacy/ui/legacy/src/main/res/values-ga/strings.xml | 1 - legacy/ui/legacy/src/main/res/values-gd/strings.xml | 1 - legacy/ui/legacy/src/main/res/values-gl/strings.xml | 1 - legacy/ui/legacy/src/main/res/values-hr/strings.xml | 1 - legacy/ui/legacy/src/main/res/values-hu/strings.xml | 1 - legacy/ui/legacy/src/main/res/values-in/strings.xml | 1 - legacy/ui/legacy/src/main/res/values-is/strings.xml | 1 - legacy/ui/legacy/src/main/res/values-it/strings.xml | 1 - legacy/ui/legacy/src/main/res/values-iw/strings.xml | 1 - legacy/ui/legacy/src/main/res/values-ja/strings.xml | 1 - legacy/ui/legacy/src/main/res/values-ko/strings.xml | 1 - legacy/ui/legacy/src/main/res/values-lt/strings.xml | 1 - legacy/ui/legacy/src/main/res/values-lv/strings.xml | 1 - legacy/ui/legacy/src/main/res/values-ml/strings.xml | 1 - legacy/ui/legacy/src/main/res/values-nb/strings.xml | 1 - legacy/ui/legacy/src/main/res/values-nl/strings.xml | 1 - legacy/ui/legacy/src/main/res/values-nn/strings.xml | 1 - legacy/ui/legacy/src/main/res/values-pl/strings.xml | 1 - legacy/ui/legacy/src/main/res/values-pt-rBR/strings.xml | 1 - legacy/ui/legacy/src/main/res/values-pt-rPT/strings.xml | 1 - legacy/ui/legacy/src/main/res/values-ro/strings.xml | 1 - legacy/ui/legacy/src/main/res/values-ru/strings.xml | 1 - legacy/ui/legacy/src/main/res/values-sk/strings.xml | 1 - legacy/ui/legacy/src/main/res/values-sl/strings.xml | 1 - legacy/ui/legacy/src/main/res/values-sq/strings.xml | 1 - legacy/ui/legacy/src/main/res/values-sr/strings.xml | 1 - legacy/ui/legacy/src/main/res/values-sv/strings.xml | 1 - legacy/ui/legacy/src/main/res/values-ta-rIN/strings.xml | 1 - legacy/ui/legacy/src/main/res/values-tr/strings.xml | 1 - legacy/ui/legacy/src/main/res/values-uk/strings.xml | 1 - legacy/ui/legacy/src/main/res/values-vi/strings.xml | 1 - legacy/ui/legacy/src/main/res/values-zh-rCN/strings.xml | 1 - legacy/ui/legacy/src/main/res/values-zh-rTW/strings.xml | 1 - legacy/ui/legacy/src/main/res/values/strings.xml | 2 +- legacy/ui/legacy/src/main/res/xml/account_settings.xml | 2 +- 55 files changed, 2 insertions(+), 55 deletions(-) diff --git a/legacy/ui/legacy/src/main/res/values-ar/strings.xml b/legacy/ui/legacy/src/main/res/values-ar/strings.xml index d9dce4cc809..bbcf1bb3dc0 100644 --- a/legacy/ui/legacy/src/main/res/values-ar/strings.xml +++ b/legacy/ui/legacy/src/main/res/values-ar/strings.xml @@ -277,7 +277,6 @@ مجلد الأرشيف مجلد البريد المزعج إظهار المجلدات المشتركة فقط - توسيع المجلد تلقائيا أبدًا كل 15 دقيقة كل 30 دقيقة diff --git a/legacy/ui/legacy/src/main/res/values-be/strings.xml b/legacy/ui/legacy/src/main/res/values-be/strings.xml index 2f3f0c78e0d..fd6c3346b39 100644 --- a/legacy/ui/legacy/src/main/res/values-be/strings.xml +++ b/legacy/ui/legacy/src/main/res/values-be/strings.xml @@ -274,7 +274,6 @@ Каталог архіва Каталог спаму Паказваць толькі падпісаныя каталогі - Аўтапераход у каталог Ніколі Кожныя 15 хвілін Кожныя 30 хвілін diff --git a/legacy/ui/legacy/src/main/res/values-bg/strings.xml b/legacy/ui/legacy/src/main/res/values-bg/strings.xml index 174b9b85fcd..9b307e52dc6 100644 --- a/legacy/ui/legacy/src/main/res/values-bg/strings.xml +++ b/legacy/ui/legacy/src/main/res/values-bg/strings.xml @@ -246,7 +246,6 @@ Папка Архиви Папка Спам Показвай само абонираните папките - Автоматично разгъване на папка Никога На всеки 15 минути На всеки 30 минути diff --git a/legacy/ui/legacy/src/main/res/values-br/strings.xml b/legacy/ui/legacy/src/main/res/values-br/strings.xml index 6c123bd95ae..1ae4e40bff0 100644 --- a/legacy/ui/legacy/src/main/res/values-br/strings.xml +++ b/legacy/ui/legacy/src/main/res/values-br/strings.xml @@ -227,7 +227,6 @@ Teuliad dielloù Teuliad lastez Diskouez an teuliadoù koumanantet hepken - Kreskaat an teuliad ent emgefreek Morse Bep 15 munutenn Bep 30 munutenn diff --git a/legacy/ui/legacy/src/main/res/values-ca/strings.xml b/legacy/ui/legacy/src/main/res/values-ca/strings.xml index 0459ebf8a83..2180bc6557a 100644 --- a/legacy/ui/legacy/src/main/res/values-ca/strings.xml +++ b/legacy/ui/legacy/src/main/res/values-ca/strings.xml @@ -273,7 +273,6 @@ Carpeta d\'arxiu Carpeta brossa Mostra només carpetes subscrites - Autoexpandeix la carpeta Mai Cada 15 minuts Cada 30 minuts diff --git a/legacy/ui/legacy/src/main/res/values-co/strings.xml b/legacy/ui/legacy/src/main/res/values-co/strings.xml index a218a307882..ca335a919c2 100644 --- a/legacy/ui/legacy/src/main/res/values-co/strings.xml +++ b/legacy/ui/legacy/src/main/res/values-co/strings.xml @@ -260,7 +260,6 @@ Ùn squassà micca nant’à u servitore Cartulare di a curbella Affissà solu i cartulari à quelli mi sò abbunatu - Spiegà autumaticamente u cartulare Mai Tutti i 15 minuti Tutti i 30 minuti diff --git a/legacy/ui/legacy/src/main/res/values-cs/strings.xml b/legacy/ui/legacy/src/main/res/values-cs/strings.xml index 5035e222657..322b7fac973 100644 --- a/legacy/ui/legacy/src/main/res/values-cs/strings.xml +++ b/legacy/ui/legacy/src/main/res/values-cs/strings.xml @@ -275,7 +275,6 @@ Název složky Archív Název složky Nevyžádaná Zobrazit jen odebírané složky - Aut. rozbalená složka Nikdy Každých 15 minut Každých 30 minut diff --git a/legacy/ui/legacy/src/main/res/values-cy/strings.xml b/legacy/ui/legacy/src/main/res/values-cy/strings.xml index 5f61708b7e1..4ea7804d799 100644 --- a/legacy/ui/legacy/src/main/res/values-cy/strings.xml +++ b/legacy/ui/legacy/src/main/res/values-cy/strings.xml @@ -264,7 +264,6 @@ Ffolder archif Ffolder sbam Dangos dim ond y ffolderi dwi\'n eu dewis - Awto-ehangu ffolder Byth Pob 15 munud Pob 30 munud diff --git a/legacy/ui/legacy/src/main/res/values-da/strings.xml b/legacy/ui/legacy/src/main/res/values-da/strings.xml index ef9659f17ac..cd524e9277c 100644 --- a/legacy/ui/legacy/src/main/res/values-da/strings.xml +++ b/legacy/ui/legacy/src/main/res/values-da/strings.xml @@ -268,7 +268,6 @@ Arkiv mappen Spam mappe Vis kun mapper du abonerer på - Udvid mapper automatisk Aldrig Hver 15 minut Hver 30 minut diff --git a/legacy/ui/legacy/src/main/res/values-de/strings.xml b/legacy/ui/legacy/src/main/res/values-de/strings.xml index 7e2d5382da9..4b0781f9a60 100644 --- a/legacy/ui/legacy/src/main/res/values-de/strings.xml +++ b/legacy/ui/legacy/src/main/res/values-de/strings.xml @@ -268,7 +268,6 @@ Ordner für archivierte Nachrichten Ordner für Spam Nur ausgewählte Ordner anzeigen - Startordner Nie (nur manuell) Alle 15 Minuten Alle 30 Minuten diff --git a/legacy/ui/legacy/src/main/res/values-el/strings.xml b/legacy/ui/legacy/src/main/res/values-el/strings.xml index 367f5534966..9f76f7fc55d 100644 --- a/legacy/ui/legacy/src/main/res/values-el/strings.xml +++ b/legacy/ui/legacy/src/main/res/values-el/strings.xml @@ -270,7 +270,6 @@ Φάκελος «Αρχειοθήκη» Φάκελος «Ανεπιθύμητα» Προβολή μόνον φακέλων υπό παρακολούθηση - Αυτόματη επέκταση φακέλου Ποτέ Κάθε 15 λεπτά Κάθε 10 λεπτά diff --git a/legacy/ui/legacy/src/main/res/values-en-rGB/strings.xml b/legacy/ui/legacy/src/main/res/values-en-rGB/strings.xml index ba136a1f676..4fff65def72 100644 --- a/legacy/ui/legacy/src/main/res/values-en-rGB/strings.xml +++ b/legacy/ui/legacy/src/main/res/values-en-rGB/strings.xml @@ -533,7 +533,6 @@ 4 KiB Checking mail Remove messages when deleted on server - Auto-expand folder Remove attachment Delete Show only subscribed folders diff --git a/legacy/ui/legacy/src/main/res/values-eo/strings.xml b/legacy/ui/legacy/src/main/res/values-eo/strings.xml index 17fc78a9d33..879581af3ec 100644 --- a/legacy/ui/legacy/src/main/res/values-eo/strings.xml +++ b/legacy/ui/legacy/src/main/res/values-eo/strings.xml @@ -245,7 +245,6 @@ Arĥivujo Trudmesaĝujo Montri nur abonitajn mesaĝujojn - Ĉiam etendi mesaĝujon Neniam Je ĉiuj 15 minutoj Je ĉiuj 30 minutoj diff --git a/legacy/ui/legacy/src/main/res/values-es/strings.xml b/legacy/ui/legacy/src/main/res/values-es/strings.xml index 2a9c79b5148..9c36ec0eaf1 100644 --- a/legacy/ui/legacy/src/main/res/values-es/strings.xml +++ b/legacy/ui/legacy/src/main/res/values-es/strings.xml @@ -271,7 +271,6 @@ Carpeta Archivados Carpeta Spam Ver sólo carpetas suscritas - Autoexpandir carpeta Nunca Cada 15 minutos Cada 30 minutos diff --git a/legacy/ui/legacy/src/main/res/values-et/strings.xml b/legacy/ui/legacy/src/main/res/values-et/strings.xml index 6de217b262e..b3b37744a20 100644 --- a/legacy/ui/legacy/src/main/res/values-et/strings.xml +++ b/legacy/ui/legacy/src/main/res/values-et/strings.xml @@ -270,7 +270,6 @@ Arhiivi kaust Rämpsposti kaust Näita üksnes tellitud kaustu - Kaustade automaatne laiendamine Mitte kunagi Iga 15 minuti tagant Iga 30 minuti tagant diff --git a/legacy/ui/legacy/src/main/res/values-eu/strings.xml b/legacy/ui/legacy/src/main/res/values-eu/strings.xml index 55329e481ef..7dd37f89600 100644 --- a/legacy/ui/legacy/src/main/res/values-eu/strings.xml +++ b/legacy/ui/legacy/src/main/res/values-eu/strings.xml @@ -269,7 +269,6 @@ Artxibatuen karpeta Zabor-posta karpeta Erakutsi harpidetutako karpetak bakarrik - Automatikoki irekitako karpeta Inoiz ez 15 minutuero 30 minutuero diff --git a/legacy/ui/legacy/src/main/res/values-fa/strings.xml b/legacy/ui/legacy/src/main/res/values-fa/strings.xml index 5fc11b97acd..9edd203b45c 100644 --- a/legacy/ui/legacy/src/main/res/values-fa/strings.xml +++ b/legacy/ui/legacy/src/main/res/values-fa/strings.xml @@ -271,7 +271,6 @@ پوشهٔ بایگانی پوشهٔ هرزنامه فقط پوشه‌هایی که مشترک آن‌ها هستم را نمایش بده - پوشهٔ آغازین هرگز هر ۱۵ دقیقه هر ۳۰ دقیقه diff --git a/legacy/ui/legacy/src/main/res/values-fi/strings.xml b/legacy/ui/legacy/src/main/res/values-fi/strings.xml index bb8f7abf01c..15bd60015cd 100644 --- a/legacy/ui/legacy/src/main/res/values-fi/strings.xml +++ b/legacy/ui/legacy/src/main/res/values-fi/strings.xml @@ -269,7 +269,6 @@ Arkisto-kansio Roskapostikansio Näytä vain tilatut kansiot - Avaa kansio automaattisesti Ei koskaan Joka 15 minuutti Joka 30 minuutti diff --git a/legacy/ui/legacy/src/main/res/values-fr/strings.xml b/legacy/ui/legacy/src/main/res/values-fr/strings.xml index b1fe3226fca..0f2af8dc074 100644 --- a/legacy/ui/legacy/src/main/res/values-fr/strings.xml +++ b/legacy/ui/legacy/src/main/res/values-fr/strings.xml @@ -271,7 +271,6 @@ Dossier des archives Dossier des pourriels (indésirables) Afficher seulement les dossiers auxquels je suis abonné - Ouvrir automatiquement le dossier Jamais Toutes les 15 minutes Toutes les 30 minutes diff --git a/legacy/ui/legacy/src/main/res/values-fy/strings.xml b/legacy/ui/legacy/src/main/res/values-fy/strings.xml index a3aeb8864b1..1f91a35b77a 100644 --- a/legacy/ui/legacy/src/main/res/values-fy/strings.xml +++ b/legacy/ui/legacy/src/main/res/values-fy/strings.xml @@ -269,7 +269,6 @@ Argyf Net-winske Allinnich abonnearre mappen toane - Map automatysk útklappe Nea Elke 15 minuten Elke 30 minuten diff --git a/legacy/ui/legacy/src/main/res/values-ga/strings.xml b/legacy/ui/legacy/src/main/res/values-ga/strings.xml index 5a7384b59e9..66018f0a141 100644 --- a/legacy/ui/legacy/src/main/res/values-ga/strings.xml +++ b/legacy/ui/legacy/src/main/res/values-ga/strings.xml @@ -344,7 +344,6 @@ Dréachtaí fillteán Fillteán seolta Ná taispeáin ach fillteáin shuibscríofa - Fillteán fairsingithe go huathoibríoch Riamh Gach 6 uair an chloig Gach 12 uair an chloig diff --git a/legacy/ui/legacy/src/main/res/values-gd/strings.xml b/legacy/ui/legacy/src/main/res/values-gd/strings.xml index bf639d4832f..cdd628f012e 100644 --- a/legacy/ui/legacy/src/main/res/values-gd/strings.xml +++ b/legacy/ui/legacy/src/main/res/values-gd/strings.xml @@ -240,7 +240,6 @@ Pasgan nan tasg-lann Pasgan an spama Na seall ach pasganan le fo-sgrìobhadh - Leudaich am pasgan gu fèin-obrachail Chan ann idir Gach cairteal na h-uarach Gach leth-uair a thìde diff --git a/legacy/ui/legacy/src/main/res/values-gl/strings.xml b/legacy/ui/legacy/src/main/res/values-gl/strings.xml index 8b19a7ef4a6..b37257a1d0c 100644 --- a/legacy/ui/legacy/src/main/res/values-gl/strings.xml +++ b/legacy/ui/legacy/src/main/res/values-gl/strings.xml @@ -249,7 +249,6 @@ Carpeta Arquivados Carpeta SPAM Ver só carpetas suscritas - Autoexpandir carpeta Nunca Cada 15 minutos Cada 30 minutos diff --git a/legacy/ui/legacy/src/main/res/values-hr/strings.xml b/legacy/ui/legacy/src/main/res/values-hr/strings.xml index 509f49d4412..7eed3d952be 100644 --- a/legacy/ui/legacy/src/main/res/values-hr/strings.xml +++ b/legacy/ui/legacy/src/main/res/values-hr/strings.xml @@ -230,7 +230,6 @@ Mapa arhive Mapa neželjene pošte Prikaži samo pretplaćene mape - Automatsko proširivanje mapa Nikad Svakih 15 minuta Svakih 30 minuta diff --git a/legacy/ui/legacy/src/main/res/values-hu/strings.xml b/legacy/ui/legacy/src/main/res/values-hu/strings.xml index 8ea7a349bf9..bf49fad3ee9 100644 --- a/legacy/ui/legacy/src/main/res/values-hu/strings.xml +++ b/legacy/ui/legacy/src/main/res/values-hu/strings.xml @@ -269,7 +269,6 @@ Archívum mappa Levélszemét mappa Csak feliratkozott mappák megjelenítése - Mappa automatikus kinyitása Soha 15 percenként 30 percenként diff --git a/legacy/ui/legacy/src/main/res/values-in/strings.xml b/legacy/ui/legacy/src/main/res/values-in/strings.xml index 747a41557ca..87d4630ab6f 100644 --- a/legacy/ui/legacy/src/main/res/values-in/strings.xml +++ b/legacy/ui/legacy/src/main/res/values-in/strings.xml @@ -236,7 +236,6 @@ Folder arsip Folder spam Hanya tampilkan folder langganan - Otomatis lebarkan folder Tidak pernah Setiap 15 menit Setiap 30 menit diff --git a/legacy/ui/legacy/src/main/res/values-is/strings.xml b/legacy/ui/legacy/src/main/res/values-is/strings.xml index 6ace945f2ba..f42e3489dc4 100644 --- a/legacy/ui/legacy/src/main/res/values-is/strings.xml +++ b/legacy/ui/legacy/src/main/res/values-is/strings.xml @@ -270,7 +270,6 @@ Setja möppu í geymslu Ruslpóstmappa Sýna einungis möppur í áskrift - Fletta möppu út sjálfvirkt Aldrei Á 15 mínútna fresti Á 30 mínútna fresti diff --git a/legacy/ui/legacy/src/main/res/values-it/strings.xml b/legacy/ui/legacy/src/main/res/values-it/strings.xml index c33f4f11027..056207240bb 100644 --- a/legacy/ui/legacy/src/main/res/values-it/strings.xml +++ b/legacy/ui/legacy/src/main/res/values-it/strings.xml @@ -271,7 +271,6 @@ Cartella Archivio Cartella Spam Mostra solo le cartelle sottoscritte - Auto-espandi cartella Mai Ogni 15 minuti Ogni 30 minuti diff --git a/legacy/ui/legacy/src/main/res/values-iw/strings.xml b/legacy/ui/legacy/src/main/res/values-iw/strings.xml index b528d8abdd7..25bf6479338 100644 --- a/legacy/ui/legacy/src/main/res/values-iw/strings.xml +++ b/legacy/ui/legacy/src/main/res/values-iw/strings.xml @@ -227,7 +227,6 @@ תיקיית ארכיון תיקיית דואר זבל הצג רק תיקיות רשומות - הרחב את התיקייה אוטומטית אפ פעם כל רבע שעה כל חצי שעה diff --git a/legacy/ui/legacy/src/main/res/values-ja/strings.xml b/legacy/ui/legacy/src/main/res/values-ja/strings.xml index 22b071cd762..e18827de9bf 100644 --- a/legacy/ui/legacy/src/main/res/values-ja/strings.xml +++ b/legacy/ui/legacy/src/main/res/values-ja/strings.xml @@ -269,7 +269,6 @@ アーカイブフォルダー 迷惑メールフォルダー 購読したフォルダーのみ表示する - 自動展開するフォルダー 同期しない 15 分ごと 30 分ごと diff --git a/legacy/ui/legacy/src/main/res/values-ko/strings.xml b/legacy/ui/legacy/src/main/res/values-ko/strings.xml index 49316e960f0..cf208f89efb 100644 --- a/legacy/ui/legacy/src/main/res/values-ko/strings.xml +++ b/legacy/ui/legacy/src/main/res/values-ko/strings.xml @@ -243,7 +243,6 @@ 보관 폴더 스팸 폴더 설정한 폴더만 보기 - 폴더 자동 펼치기 하지 않음 15분마다 30분마다 diff --git a/legacy/ui/legacy/src/main/res/values-lt/strings.xml b/legacy/ui/legacy/src/main/res/values-lt/strings.xml index 7657493553b..7e728a61a61 100644 --- a/legacy/ui/legacy/src/main/res/values-lt/strings.xml +++ b/legacy/ui/legacy/src/main/res/values-lt/strings.xml @@ -264,7 +264,6 @@ Archyvas Brukalo aplankas Rodyti tik prenumeruotus aplankus - Automatiškai išskleisti aplanką Niekada Kas 15 minučių Kas 30 minučių diff --git a/legacy/ui/legacy/src/main/res/values-lv/strings.xml b/legacy/ui/legacy/src/main/res/values-lv/strings.xml index 0bae90a4eb1..de99278cd58 100644 --- a/legacy/ui/legacy/src/main/res/values-lv/strings.xml +++ b/legacy/ui/legacy/src/main/res/values-lv/strings.xml @@ -273,7 +273,6 @@ Arhīva mape Mēstuļu mape Rādīt tikai izvēlētās mapes - Automātiski izvērst mapi Nekad Ik 15 minūtes Katras 30 minūtes diff --git a/legacy/ui/legacy/src/main/res/values-ml/strings.xml b/legacy/ui/legacy/src/main/res/values-ml/strings.xml index 5254aae963b..8c7f7a11987 100644 --- a/legacy/ui/legacy/src/main/res/values-ml/strings.xml +++ b/legacy/ui/legacy/src/main/res/values-ml/strings.xml @@ -251,7 +251,6 @@ ആർക്കൈവ് ഫോൾഡർ സ്പാം ഫോൾഡർ സബ്‌സ്‌ക്രൈബുചെയ്‌ത ഫോൾഡറുകൾ മാത്രം കാണിക്കുക - ഫോൾഡർ യാന്ത്രികമായി വികസിപ്പിക്കുക ഒരിക്കലും ഓരോ 15 മിനിറ്റിലും ഓരോ 33 മിനിറ്റിലും diff --git a/legacy/ui/legacy/src/main/res/values-nb/strings.xml b/legacy/ui/legacy/src/main/res/values-nb/strings.xml index 89b0e7c99c0..a2ec790f717 100644 --- a/legacy/ui/legacy/src/main/res/values-nb/strings.xml +++ b/legacy/ui/legacy/src/main/res/values-nb/strings.xml @@ -234,7 +234,6 @@ Arkiv-mappe Søppelpost-mappe Kun vis mapper du abonnerer på - Auto-utvid mappe Aldri Hvert kvarter Hver halvtime diff --git a/legacy/ui/legacy/src/main/res/values-nl/strings.xml b/legacy/ui/legacy/src/main/res/values-nl/strings.xml index d4f8e867fd0..6efaf79d830 100644 --- a/legacy/ui/legacy/src/main/res/values-nl/strings.xml +++ b/legacy/ui/legacy/src/main/res/values-nl/strings.xml @@ -269,7 +269,6 @@ Archief Spam Alleen geabonneerde mappen tonen - Map automatisch uitvouwen Nooit Elke 15 minuten Elke 30 minuten diff --git a/legacy/ui/legacy/src/main/res/values-nn/strings.xml b/legacy/ui/legacy/src/main/res/values-nn/strings.xml index 3fcfce059b1..afb281bf6e2 100644 --- a/legacy/ui/legacy/src/main/res/values-nn/strings.xml +++ b/legacy/ui/legacy/src/main/res/values-nn/strings.xml @@ -621,7 +621,6 @@ Krypter malar kun om kryptering er aktivert 2 KiB Spørjefrekvens for mappe - Auto-utvid mapper Inkluder utgåande e-post Berre kontaktar Marker som lesen etter opning diff --git a/legacy/ui/legacy/src/main/res/values-pl/strings.xml b/legacy/ui/legacy/src/main/res/values-pl/strings.xml index 7ee581e56e9..6a8de830850 100644 --- a/legacy/ui/legacy/src/main/res/values-pl/strings.xml +++ b/legacy/ui/legacy/src/main/res/values-pl/strings.xml @@ -274,7 +274,6 @@ Folder archiwum Folder spamu Pokaż tylko subskrybowane foldery - Zawsze rozwijaj folder Nigdy Co 15 minut Co 30 minut diff --git a/legacy/ui/legacy/src/main/res/values-pt-rBR/strings.xml b/legacy/ui/legacy/src/main/res/values-pt-rBR/strings.xml index 5ef22be4424..0a6e21ecebb 100644 --- a/legacy/ui/legacy/src/main/res/values-pt-rBR/strings.xml +++ b/legacy/ui/legacy/src/main/res/values-pt-rBR/strings.xml @@ -271,7 +271,6 @@ Pasta de arquivamento Pasta de spam Exibir somente pastas assinadas - Expandir as pastas automaticamente Nunca A cada 15 minutos A cada 30 minutos diff --git a/legacy/ui/legacy/src/main/res/values-pt-rPT/strings.xml b/legacy/ui/legacy/src/main/res/values-pt-rPT/strings.xml index b77614ba2aa..ee3c74a64d2 100644 --- a/legacy/ui/legacy/src/main/res/values-pt-rPT/strings.xml +++ b/legacy/ui/legacy/src/main/res/values-pt-rPT/strings.xml @@ -272,7 +272,6 @@ Pasta de arquivos Pasta de spam Mostrar apenas pastas subscritas - Expandir automaticamente a pasta Nunca A cada 15 minutos A cada 30 minutos diff --git a/legacy/ui/legacy/src/main/res/values-ro/strings.xml b/legacy/ui/legacy/src/main/res/values-ro/strings.xml index 12efde23a50..f95ce28c550 100644 --- a/legacy/ui/legacy/src/main/res/values-ro/strings.xml +++ b/legacy/ui/legacy/src/main/res/values-ro/strings.xml @@ -271,7 +271,6 @@ Dosar arhive Dosar spam Arată doar dosarele înregistrate - Auto-extinde dosar Niciodată La fiecare 15 minute La fiecare 30 de minute diff --git a/legacy/ui/legacy/src/main/res/values-ru/strings.xml b/legacy/ui/legacy/src/main/res/values-ru/strings.xml index f784771d9dd..047d5ac42c4 100644 --- a/legacy/ui/legacy/src/main/res/values-ru/strings.xml +++ b/legacy/ui/legacy/src/main/res/values-ru/strings.xml @@ -275,7 +275,6 @@ Папка архива Папка спам Только подписанные папки - Автопереход в папку Вручную 15 минут 30 минут diff --git a/legacy/ui/legacy/src/main/res/values-sk/strings.xml b/legacy/ui/legacy/src/main/res/values-sk/strings.xml index 8f0c09555ef..495af04390c 100644 --- a/legacy/ui/legacy/src/main/res/values-sk/strings.xml +++ b/legacy/ui/legacy/src/main/res/values-sk/strings.xml @@ -239,7 +239,6 @@ Priečinok Archív Priečinok Nevyžiadaná Zobraziť iba odoberané priečinky - Automaticky rozbaliť priečinok Nikdy Každých 15 minút Každých 30 minút diff --git a/legacy/ui/legacy/src/main/res/values-sl/strings.xml b/legacy/ui/legacy/src/main/res/values-sl/strings.xml index 33ebc7382b7..0dad580bd26 100644 --- a/legacy/ui/legacy/src/main/res/values-sl/strings.xml +++ b/legacy/ui/legacy/src/main/res/values-sl/strings.xml @@ -269,7 +269,6 @@ Mapa za arhivirano pošto Mapa neželene pošte Pokaži samo naročene mape - Samodejno razširi mape Ročno preverjanje Vsakih 15 minut Vsakih 30 minut diff --git a/legacy/ui/legacy/src/main/res/values-sq/strings.xml b/legacy/ui/legacy/src/main/res/values-sq/strings.xml index fa12f7bc957..fab343c4d9a 100644 --- a/legacy/ui/legacy/src/main/res/values-sq/strings.xml +++ b/legacy/ui/legacy/src/main/res/values-sq/strings.xml @@ -267,7 +267,6 @@ Dosje arkivi Dosje të padëshiruarish Shfaq vetëm dosje me pajtim - Dosje për vetë-zgjerim Kurrë Çdo 15 minuta Çdo 30 minuta diff --git a/legacy/ui/legacy/src/main/res/values-sr/strings.xml b/legacy/ui/legacy/src/main/res/values-sr/strings.xml index 4292ea566cd..f417c8ed0d0 100644 --- a/legacy/ui/legacy/src/main/res/values-sr/strings.xml +++ b/legacy/ui/legacy/src/main/res/values-sr/strings.xml @@ -237,7 +237,6 @@ Фолдер архиве Фолдер непожељног Прикажи само претплаћене фолдере - Аутоматски прошири фолдер Никада Сваких 15 минута Сваких 30 минута diff --git a/legacy/ui/legacy/src/main/res/values-sv/strings.xml b/legacy/ui/legacy/src/main/res/values-sv/strings.xml index 60b02110fac..d943f1c268c 100644 --- a/legacy/ui/legacy/src/main/res/values-sv/strings.xml +++ b/legacy/ui/legacy/src/main/res/values-sv/strings.xml @@ -270,7 +270,6 @@ Arkivmapp Skräppostmapp Visa endast prenumererade mappar - Expandera automatiskt mapp Aldrig Var 15:e minut Var 30:e minut diff --git a/legacy/ui/legacy/src/main/res/values-ta-rIN/strings.xml b/legacy/ui/legacy/src/main/res/values-ta-rIN/strings.xml index 4007a549791..5494e441bf8 100644 --- a/legacy/ui/legacy/src/main/res/values-ta-rIN/strings.xml +++ b/legacy/ui/legacy/src/main/res/values-ta-rIN/strings.xml @@ -358,7 +358,6 @@ காப்பக கோப்புறை ச்பேம் கோப்புறை சந்தா கோப்புறைகளை மட்டுமே காட்டு - தானாக காலாவதியான கோப்புறை ஒவ்வொரு மணி நேரமும் ஒவ்வொரு 2 மணி நேரமும் ஒவ்வொரு 3 மணி நேரமும் diff --git a/legacy/ui/legacy/src/main/res/values-tr/strings.xml b/legacy/ui/legacy/src/main/res/values-tr/strings.xml index 7dd4507def1..5652413e5c0 100644 --- a/legacy/ui/legacy/src/main/res/values-tr/strings.xml +++ b/legacy/ui/legacy/src/main/res/values-tr/strings.xml @@ -259,7 +259,6 @@ Arşiv klasörü Spam klasörü Yalnızca abone olduğum klasörleri göster - Otomatik genişleyecek klasör Hiçbir zaman 15 dakikada bir 30 dakikada bir diff --git a/legacy/ui/legacy/src/main/res/values-uk/strings.xml b/legacy/ui/legacy/src/main/res/values-uk/strings.xml index e7a98e62944..a1cb6b1f2ee 100644 --- a/legacy/ui/legacy/src/main/res/values-uk/strings.xml +++ b/legacy/ui/legacy/src/main/res/values-uk/strings.xml @@ -273,7 +273,6 @@ Тека «Архів» Тека «Спам» Показувати лише теки, на які ви підписані - Автоматично відкривати теку Ніколи Що 15 хвилин Що 30 хвилин diff --git a/legacy/ui/legacy/src/main/res/values-vi/strings.xml b/legacy/ui/legacy/src/main/res/values-vi/strings.xml index df787255fd9..95f82f0cc1e 100644 --- a/legacy/ui/legacy/src/main/res/values-vi/strings.xml +++ b/legacy/ui/legacy/src/main/res/values-vi/strings.xml @@ -354,7 +354,6 @@ Mỗi 24 giờ Mỗi 2 giờ Thư mục bản nháp - Tự động mở rộng thư mục Chỉ hiển thị các thư mục đã đăng ký Mỗi 6 giờ Thư mục lưu trữ diff --git a/legacy/ui/legacy/src/main/res/values-zh-rCN/strings.xml b/legacy/ui/legacy/src/main/res/values-zh-rCN/strings.xml index 7ab0deca0a1..21407d8966b 100644 --- a/legacy/ui/legacy/src/main/res/values-zh-rCN/strings.xml +++ b/legacy/ui/legacy/src/main/res/values-zh-rCN/strings.xml @@ -267,7 +267,6 @@ 归档文件夹 垃圾邮件文件夹 只显示订阅的文件夹 - 自动展开文件夹 从不 每 15 分钟 每 30 分钟 diff --git a/legacy/ui/legacy/src/main/res/values-zh-rTW/strings.xml b/legacy/ui/legacy/src/main/res/values-zh-rTW/strings.xml index a4e77fdb6ec..72190455be6 100644 --- a/legacy/ui/legacy/src/main/res/values-zh-rTW/strings.xml +++ b/legacy/ui/legacy/src/main/res/values-zh-rTW/strings.xml @@ -267,7 +267,6 @@ 封存信件匣名稱 垃圾郵件匣名稱 只顯示訂閱的資料夾 - 自動展開資料夾 不要 15 分鐘一次 30 分鐘一次 diff --git a/legacy/ui/legacy/src/main/res/values/strings.xml b/legacy/ui/legacy/src/main/res/values/strings.xml index d493f86ce7a..51cfd047356 100644 --- a/legacy/ui/legacy/src/main/res/values/strings.xml +++ b/legacy/ui/legacy/src/main/res/values/strings.xml @@ -346,7 +346,7 @@ Spam folder Show only subscribed folders - Auto-expand folder + Auto-select folder Never Every 15 minutes diff --git a/legacy/ui/legacy/src/main/res/xml/account_settings.xml b/legacy/ui/legacy/src/main/res/xml/account_settings.xml index edff9b436bb..0363f44c6b2 100644 --- a/legacy/ui/legacy/src/main/res/xml/account_settings.xml +++ b/legacy/ui/legacy/src/main/res/xml/account_settings.xml @@ -239,7 +239,7 @@