diff --git a/app-k9mail/src/debug/kotlin/app/k9mail/featureflag/K9FeatureFlagFactory.kt b/app-k9mail/src/debug/kotlin/app/k9mail/featureflag/K9FeatureFlagFactory.kt index cc7feab6239..d78b26a72c3 100644 --- a/app-k9mail/src/debug/kotlin/app/k9mail/featureflag/K9FeatureFlagFactory.kt +++ b/app-k9mail/src/debug/kotlin/app/k9mail/featureflag/K9FeatureFlagFactory.kt @@ -18,7 +18,6 @@ class K9FeatureFlagFactory : FeatureFlagFactory { FeatureFlag("archive_marks_as_read".toFeatureFlagKey(), enabled = true), FeatureFlag("disable_font_size_config".toFeatureFlagKey(), enabled = true), FeatureFlag("email_notification_default".toFeatureFlagKey(), enabled = true), - FeatureFlag("enable_dropdown_drawer_ui".toFeatureFlagKey(), enabled = true), FeatureFlag(FeatureFlagKey.DisplayInAppNotifications, enabled = false), FeatureFlag(FeatureFlagKey.UseNotificationSenderForSystemNotifications, enabled = false), FeatureFlag(MessageListFeatureFlags.UseComposeForMessageListItems, enabled = false), diff --git a/app-k9mail/src/release/kotlin/app/k9mail/featureflag/K9FeatureFlagFactory.kt b/app-k9mail/src/release/kotlin/app/k9mail/featureflag/K9FeatureFlagFactory.kt index 6059febf4b2..c02ae801788 100644 --- a/app-k9mail/src/release/kotlin/app/k9mail/featureflag/K9FeatureFlagFactory.kt +++ b/app-k9mail/src/release/kotlin/app/k9mail/featureflag/K9FeatureFlagFactory.kt @@ -21,7 +21,6 @@ class K9FeatureFlagFactory : FeatureFlagFactory { FeatureFlag("archive_marks_as_read".toFeatureFlagKey(), enabled = true), FeatureFlag("disable_font_size_config".toFeatureFlagKey(), enabled = true), FeatureFlag("email_notification_default".toFeatureFlagKey(), enabled = true), - FeatureFlag("enable_dropdown_drawer_ui".toFeatureFlagKey(), enabled = true), FeatureFlag(FeatureFlagKey.DisplayInAppNotifications, enabled = false), FeatureFlag(FeatureFlagKey.UseNotificationSenderForSystemNotifications, enabled = false), FeatureFlag(MessageListFeatureFlags.UseComposeForMessageListItems, enabled = false), diff --git a/app-thunderbird/src/beta/kotlin/net/thunderbird/android/featureflag/TbFeatureFlagFactory.kt b/app-thunderbird/src/beta/kotlin/net/thunderbird/android/featureflag/TbFeatureFlagFactory.kt index bc16fd6d153..53429b93ac5 100644 --- a/app-thunderbird/src/beta/kotlin/net/thunderbird/android/featureflag/TbFeatureFlagFactory.kt +++ b/app-thunderbird/src/beta/kotlin/net/thunderbird/android/featureflag/TbFeatureFlagFactory.kt @@ -21,7 +21,6 @@ class TbFeatureFlagFactory : FeatureFlagFactory { FeatureFlag("archive_marks_as_read".toFeatureFlagKey(), enabled = true), FeatureFlag("disable_font_size_config".toFeatureFlagKey(), enabled = true), FeatureFlag("email_notification_default".toFeatureFlagKey(), enabled = true), - FeatureFlag("enable_dropdown_drawer_ui".toFeatureFlagKey(), enabled = true), FeatureFlag(FeatureFlagKey.DisplayInAppNotifications, enabled = true), FeatureFlag(FeatureFlagKey.UseNotificationSenderForSystemNotifications, enabled = false), FeatureFlag(MessageListFeatureFlags.UseComposeForMessageListItems, enabled = false), diff --git a/app-thunderbird/src/daily/kotlin/net/thunderbird/android/featureflag/TbFeatureFlagFactory.kt b/app-thunderbird/src/daily/kotlin/net/thunderbird/android/featureflag/TbFeatureFlagFactory.kt index 3f1616f94e4..7bac7aea8a5 100644 --- a/app-thunderbird/src/daily/kotlin/net/thunderbird/android/featureflag/TbFeatureFlagFactory.kt +++ b/app-thunderbird/src/daily/kotlin/net/thunderbird/android/featureflag/TbFeatureFlagFactory.kt @@ -21,7 +21,6 @@ class TbFeatureFlagFactory : FeatureFlagFactory { FeatureFlag("archive_marks_as_read".toFeatureFlagKey(), enabled = true), FeatureFlag("disable_font_size_config".toFeatureFlagKey(), enabled = true), FeatureFlag("email_notification_default".toFeatureFlagKey(), enabled = true), - FeatureFlag("enable_dropdown_drawer_ui".toFeatureFlagKey(), enabled = true), FeatureFlag(FeatureFlagKey.DisplayInAppNotifications, enabled = true), FeatureFlag(FeatureFlagKey.UseNotificationSenderForSystemNotifications, enabled = false), FeatureFlag(MessageListFeatureFlags.UseComposeForMessageListItems, enabled = false), diff --git a/app-thunderbird/src/debug/kotlin/net/thunderbird/android/featureflag/TbFeatureFlagFactory.kt b/app-thunderbird/src/debug/kotlin/net/thunderbird/android/featureflag/TbFeatureFlagFactory.kt index bf40e1cdff3..316c3207902 100644 --- a/app-thunderbird/src/debug/kotlin/net/thunderbird/android/featureflag/TbFeatureFlagFactory.kt +++ b/app-thunderbird/src/debug/kotlin/net/thunderbird/android/featureflag/TbFeatureFlagFactory.kt @@ -21,7 +21,6 @@ class TbFeatureFlagFactory : FeatureFlagFactory { FeatureFlag("archive_marks_as_read".toFeatureFlagKey(), enabled = true), FeatureFlag("disable_font_size_config".toFeatureFlagKey(), enabled = true), FeatureFlag("email_notification_default".toFeatureFlagKey(), enabled = true), - FeatureFlag("enable_dropdown_drawer_ui".toFeatureFlagKey(), enabled = true), FeatureFlag(FeatureFlagKey.DisplayInAppNotifications, enabled = true), FeatureFlag(FeatureFlagKey.UseNotificationSenderForSystemNotifications, enabled = true), FeatureFlag(MessageListFeatureFlags.UseComposeForMessageListItems, enabled = false), diff --git a/app-thunderbird/src/release/kotlin/net/thunderbird/android/featureflag/TbFeatureFlagFactory.kt b/app-thunderbird/src/release/kotlin/net/thunderbird/android/featureflag/TbFeatureFlagFactory.kt index 2e0a65670fb..89d818c1e65 100644 --- a/app-thunderbird/src/release/kotlin/net/thunderbird/android/featureflag/TbFeatureFlagFactory.kt +++ b/app-thunderbird/src/release/kotlin/net/thunderbird/android/featureflag/TbFeatureFlagFactory.kt @@ -21,7 +21,6 @@ class TbFeatureFlagFactory : FeatureFlagFactory { FeatureFlag("archive_marks_as_read".toFeatureFlagKey(), enabled = true), FeatureFlag("disable_font_size_config".toFeatureFlagKey(), enabled = true), FeatureFlag("email_notification_default".toFeatureFlagKey(), enabled = true), - FeatureFlag("enable_dropdown_drawer_ui".toFeatureFlagKey(), enabled = true), FeatureFlag(FeatureFlagKey.DisplayInAppNotifications, enabled = false), FeatureFlag(FeatureFlagKey.UseNotificationSenderForSystemNotifications, enabled = false), FeatureFlag(MessageListFeatureFlags.UseComposeForMessageListItems, enabled = false), diff --git a/feature/navigation/drawer/dropdown/src/debug/kotlin/net/thunderbird/feature/navigation/drawer/siderail/ui/account/SideRailAccountIndicatorPreview.kt b/feature/navigation/drawer/dropdown/src/debug/kotlin/net/thunderbird/feature/navigation/drawer/siderail/ui/account/SideRailAccountIndicatorPreview.kt deleted file mode 100644 index f82afaff0fa..00000000000 --- a/feature/navigation/drawer/dropdown/src/debug/kotlin/net/thunderbird/feature/navigation/drawer/siderail/ui/account/SideRailAccountIndicatorPreview.kt +++ /dev/null @@ -1,42 +0,0 @@ -package net.thunderbird.feature.navigation.drawer.siderail.ui.account - -import androidx.compose.foundation.layout.height -import androidx.compose.runtime.Composable -import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.tooling.preview.Preview -import app.k9mail.core.ui.compose.designsystem.PreviewWithThemes -import app.k9mail.core.ui.compose.theme2.MainTheme - -@Composable -@Preview(showBackground = true) -internal fun SideRailAccountIndicatorPreview() { - PreviewWithThemes { - SideRailAccountIndicator( - accountColor = Color.Unspecified, - modifier = Modifier.height(MainTheme.spacings.double), - ) - } -} - -@Composable -@Preview(showBackground = true) -internal fun SideRailAccountIndicatorPreviewWithYellowAccountColor() { - PreviewWithThemes { - SideRailAccountIndicator( - accountColor = Color.Yellow, - modifier = Modifier.height(MainTheme.spacings.double), - ) - } -} - -@Composable -@Preview(showBackground = true) -internal fun SideRailAccountIndicatorPreviewWithGrayAccountColor() { - PreviewWithThemes { - SideRailAccountIndicator( - accountColor = Color.Gray, - modifier = Modifier.height(MainTheme.spacings.double), - ) - } -} diff --git a/feature/navigation/drawer/dropdown/src/debug/kotlin/net/thunderbird/feature/navigation/drawer/siderail/ui/account/SideRailAccountListItemPreview.kt b/feature/navigation/drawer/dropdown/src/debug/kotlin/net/thunderbird/feature/navigation/drawer/siderail/ui/account/SideRailAccountListItemPreview.kt deleted file mode 100644 index c4a9656c0d6..00000000000 --- a/feature/navigation/drawer/dropdown/src/debug/kotlin/net/thunderbird/feature/navigation/drawer/siderail/ui/account/SideRailAccountListItemPreview.kt +++ /dev/null @@ -1,30 +0,0 @@ -package net.thunderbird.feature.navigation.drawer.siderail.ui.account - -import androidx.compose.runtime.Composable -import androidx.compose.ui.tooling.preview.Preview -import app.k9mail.core.ui.compose.designsystem.PreviewWithThemes -import net.thunderbird.feature.navigation.drawer.dropdown.ui.FakeData.MAIL_DISPLAY_ACCOUNT - -@Composable -@Preview(showBackground = true) -internal fun SideRailAccountListItemPreview() { - PreviewWithThemes { - SideRailAccountListItem( - account = MAIL_DISPLAY_ACCOUNT, - onClick = { }, - selected = false, - ) - } -} - -@Composable -@Preview(showBackground = true) -internal fun SideRailAccountListItemSelectedPreview() { - PreviewWithThemes { - SideRailAccountListItem( - account = MAIL_DISPLAY_ACCOUNT, - onClick = { }, - selected = true, - ) - } -} diff --git a/feature/navigation/drawer/dropdown/src/debug/kotlin/net/thunderbird/feature/navigation/drawer/siderail/ui/account/SideRailAccountListPreview.kt b/feature/navigation/drawer/dropdown/src/debug/kotlin/net/thunderbird/feature/navigation/drawer/siderail/ui/account/SideRailAccountListPreview.kt deleted file mode 100644 index 6ce318ee009..00000000000 --- a/feature/navigation/drawer/dropdown/src/debug/kotlin/net/thunderbird/feature/navigation/drawer/siderail/ui/account/SideRailAccountListPreview.kt +++ /dev/null @@ -1,39 +0,0 @@ -package net.thunderbird.feature.navigation.drawer.siderail.ui.account - -import androidx.compose.runtime.Composable -import androidx.compose.ui.tooling.preview.Preview -import app.k9mail.core.ui.compose.designsystem.PreviewWithTheme -import kotlinx.collections.immutable.persistentListOf -import net.thunderbird.feature.navigation.drawer.dropdown.ui.FakeData.MAIL_DISPLAY_ACCOUNT - -@Composable -@Preview(showBackground = true) -internal fun SideRailAccountListPreview() { - PreviewWithTheme { - SideRailAccountList( - accounts = persistentListOf( - MAIL_DISPLAY_ACCOUNT, - ), - selectedAccount = null, - onAccountClick = { }, - onSettingsClick = { }, - onSyncAllAccountsClick = { }, - ) - } -} - -@Composable -@Preview(showBackground = true) -internal fun SideRailAccountListWithSelectedPreview() { - PreviewWithTheme { - SideRailAccountList( - accounts = persistentListOf( - MAIL_DISPLAY_ACCOUNT, - ), - selectedAccount = MAIL_DISPLAY_ACCOUNT, - onAccountClick = { }, - onSettingsClick = { }, - onSyncAllAccountsClick = { }, - ) - } -} diff --git a/feature/navigation/drawer/dropdown/src/debug/kotlin/net/thunderbird/feature/navigation/drawer/siderail/ui/account/SideRailAccountViewPreview.kt b/feature/navigation/drawer/dropdown/src/debug/kotlin/net/thunderbird/feature/navigation/drawer/siderail/ui/account/SideRailAccountViewPreview.kt deleted file mode 100644 index 0c8593b6892..00000000000 --- a/feature/navigation/drawer/dropdown/src/debug/kotlin/net/thunderbird/feature/navigation/drawer/siderail/ui/account/SideRailAccountViewPreview.kt +++ /dev/null @@ -1,54 +0,0 @@ -package net.thunderbird.feature.navigation.drawer.siderail.ui.account - -import androidx.compose.runtime.Composable -import androidx.compose.ui.tooling.preview.Preview -import app.k9mail.core.ui.compose.designsystem.PreviewWithThemes -import net.thunderbird.feature.navigation.drawer.dropdown.ui.FakeData.MAIL_DISPLAY_ACCOUNT - -@Composable -@Preview(showBackground = true) -internal fun SideRailAccountViewPreview() { - PreviewWithThemes { - SideRailAccountView( - account = MAIL_DISPLAY_ACCOUNT, - onClick = {}, - showAvatar = false, - ) - } -} - -@Composable -@Preview(showBackground = true) -internal fun SideRailAccountViewWithColorPreview() { - PreviewWithThemes { - SideRailAccountView( - account = MAIL_DISPLAY_ACCOUNT, - onClick = {}, - showAvatar = false, - ) - } -} - -@Composable -@Preview(showBackground = true) -internal fun SideRailAccountViewWithLongDisplayName() { - PreviewWithThemes { - SideRailAccountView( - account = MAIL_DISPLAY_ACCOUNT, - onClick = {}, - showAvatar = false, - ) - } -} - -@Composable -@Preview(showBackground = true) -internal fun SideRailAccountViewWithLongEmailPreview() { - PreviewWithThemes { - SideRailAccountView( - account = MAIL_DISPLAY_ACCOUNT, - onClick = {}, - showAvatar = false, - ) - } -} diff --git a/feature/navigation/drawer/dropdown/src/debug/kotlin/net/thunderbird/feature/navigation/drawer/siderail/ui/setting/SideRailSettingItemPreview.kt b/feature/navigation/drawer/dropdown/src/debug/kotlin/net/thunderbird/feature/navigation/drawer/siderail/ui/setting/SideRailSettingItemPreview.kt deleted file mode 100644 index 4910c8e19f5..00000000000 --- a/feature/navigation/drawer/dropdown/src/debug/kotlin/net/thunderbird/feature/navigation/drawer/siderail/ui/setting/SideRailSettingItemPreview.kt +++ /dev/null @@ -1,18 +0,0 @@ -package net.thunderbird.feature.navigation.drawer.siderail.ui.setting - -import androidx.compose.runtime.Composable -import androidx.compose.ui.tooling.preview.Preview -import app.k9mail.core.ui.compose.designsystem.PreviewWithThemes -import net.thunderbird.core.ui.compose.designsystem.atom.icon.Icons - -@Composable -@Preview(showBackground = true) -internal fun SideRailSettingItemPreview() { - PreviewWithThemes { - SideRailSettingItem( - icon = Icons.Outlined.Settings, - label = "Setting", - onClick = {}, - ) - } -} diff --git a/feature/navigation/drawer/dropdown/src/debug/kotlin/net/thunderbird/feature/navigation/drawer/siderail/ui/setting/SideRailSettingListPreview.kt b/feature/navigation/drawer/dropdown/src/debug/kotlin/net/thunderbird/feature/navigation/drawer/siderail/ui/setting/SideRailSettingListPreview.kt deleted file mode 100644 index fd893eb423c..00000000000 --- a/feature/navigation/drawer/dropdown/src/debug/kotlin/net/thunderbird/feature/navigation/drawer/siderail/ui/setting/SideRailSettingListPreview.kt +++ /dev/null @@ -1,29 +0,0 @@ -package net.thunderbird.feature.navigation.drawer.siderail.ui.setting - -import androidx.compose.runtime.Composable -import androidx.compose.ui.tooling.preview.Preview -import app.k9mail.core.ui.compose.designsystem.PreviewWithTheme - -@Composable -@Preview(showBackground = true) -internal fun SideRailSettingListPreview() { - PreviewWithTheme { - SideRailSettingList( - onAccountSelectorClick = {}, - onManageFoldersClick = {}, - showAccountSelector = false, - ) - } -} - -@Composable -@Preview(showBackground = true) -internal fun SideRailSettingListShowAccountSelectorPreview() { - PreviewWithTheme { - SideRailSettingList( - onAccountSelectorClick = {}, - onManageFoldersClick = {}, - showAccountSelector = true, - ) - } -} diff --git a/feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/DropDownDrawer.kt b/feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/DropDownDrawer.kt index 05be9e00189..6b0284068c6 100644 --- a/feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/DropDownDrawer.kt +++ b/feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/DropDownDrawer.kt @@ -8,7 +8,6 @@ import androidx.drawerlayout.widget.DrawerLayout import androidx.lifecycle.compose.collectAsStateWithLifecycle import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.update -import net.thunderbird.core.featureflag.FeatureFlagProvider import net.thunderbird.core.ui.theme.api.FeatureThemeProvider import net.thunderbird.feature.navigation.drawer.api.NavigationDrawer import net.thunderbird.feature.navigation.drawer.api.R @@ -37,8 +36,6 @@ class DropDownDrawer( ) : NavigationDrawer, KoinComponent { private val themeProvider: FeatureThemeProvider by inject() - private val featureFlagProvider: FeatureFlagProvider by inject() - private val drawer: DrawerLayout = parent.findViewById(R.id.navigation_drawer_layout) private val drawerContent: ComposeView = parent.findViewById(R.id.navigation_drawer_content) @@ -65,7 +62,6 @@ class DropDownDrawer( openManageFolders = openManageFolders, openSettings = openSettings, openAddAccount = openAddAccount, - featureFlagProvider = featureFlagProvider, closeDrawer = { close() }, ) } diff --git a/feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/ui/DrawerView.kt b/feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/ui/DrawerView.kt index ef917527b71..2865bd7d1fa 100644 --- a/feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/ui/DrawerView.kt +++ b/feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/ui/DrawerView.kt @@ -2,16 +2,11 @@ package net.thunderbird.feature.navigation.drawer.dropdown.ui import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect -import androidx.compose.runtime.remember import app.k9mail.core.ui.compose.common.mvi.observe -import net.thunderbird.core.featureflag.FeatureFlagKey -import net.thunderbird.core.featureflag.FeatureFlagProvider -import net.thunderbird.core.featureflag.FeatureFlagResult import net.thunderbird.feature.navigation.drawer.dropdown.FolderDrawerState import net.thunderbird.feature.navigation.drawer.dropdown.ui.DrawerContract.Effect import net.thunderbird.feature.navigation.drawer.dropdown.ui.DrawerContract.Event import net.thunderbird.feature.navigation.drawer.dropdown.ui.DrawerContract.ViewModel -import net.thunderbird.feature.navigation.drawer.siderail.ui.SideRailDrawerContent import org.koin.androidx.compose.koinViewModel @Suppress("LongParameterList") @@ -25,7 +20,6 @@ internal fun DrawerView( openSettings: () -> Unit, openAddAccount: () -> Unit, closeDrawer: () -> Unit, - featureFlagProvider: FeatureFlagProvider, viewModel: ViewModel = koinViewModel(), ) { val (state, dispatch) = viewModel.observe { effect -> @@ -44,10 +38,6 @@ internal fun DrawerView( } } - val isDropdownDrawerEnabled = remember { - featureFlagProvider.provide(FeatureFlagKey("enable_dropdown_drawer_ui")) == FeatureFlagResult.Enabled - } - LaunchedEffect(drawerState.selectedAccountUuid) { dispatch(Event.SelectAccount(drawerState.selectedAccountUuid)) } @@ -56,15 +46,8 @@ internal fun DrawerView( dispatch(Event.SelectFolder(drawerState.selectedFolderId)) } - if (isDropdownDrawerEnabled) { - DrawerContent( - state = state.value, - onEvent = { dispatch(it) }, - ) - } else { - SideRailDrawerContent( - state = state.value, - onEvent = { dispatch(it) }, - ) - } + DrawerContent( + state = state.value, + onEvent = { dispatch(it) }, + ) } diff --git a/feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/siderail/ui/SideRailDrawerContent.kt b/feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/siderail/ui/SideRailDrawerContent.kt deleted file mode 100644 index 1c56603cde4..00000000000 --- a/feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/siderail/ui/SideRailDrawerContent.kt +++ /dev/null @@ -1,84 +0,0 @@ -package net.thunderbird.feature.navigation.drawer.siderail.ui - -import androidx.compose.animation.AnimatedVisibility -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.fillMaxHeight -import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.foundation.layout.width -import androidx.compose.runtime.Composable -import androidx.compose.ui.Modifier -import app.k9mail.core.ui.compose.designsystem.atom.DividerHorizontal -import app.k9mail.core.ui.compose.designsystem.atom.Surface -import net.thunderbird.core.ui.compose.common.modifier.testTagAsResourceId -import net.thunderbird.feature.navigation.drawer.dropdown.ui.DrawerContract.Event -import net.thunderbird.feature.navigation.drawer.dropdown.ui.DrawerContract.State -import net.thunderbird.feature.navigation.drawer.dropdown.ui.common.DRAWER_WIDTH -import net.thunderbird.feature.navigation.drawer.dropdown.ui.common.getAdditionalWidth -import net.thunderbird.feature.navigation.drawer.dropdown.ui.folder.FolderList -import net.thunderbird.feature.navigation.drawer.siderail.ui.account.SideRailAccountList -import net.thunderbird.feature.navigation.drawer.siderail.ui.account.SideRailAccountView -import net.thunderbird.feature.navigation.drawer.siderail.ui.setting.SideRailSettingList - -@Composable -internal fun SideRailDrawerContent( - state: State, - onEvent: (Event) -> Unit, - modifier: Modifier = Modifier, -) { - val additionalWidth = getAdditionalWidth() - - Surface( - modifier = modifier - .width(DRAWER_WIDTH + additionalWidth) - .fillMaxHeight() - .testTagAsResourceId("DrawerContent"), - ) { - val selectedAccount = state.accounts.firstOrNull { it.id == state.selectedAccountId } - Column { - selectedAccount?.let { - SideRailAccountView( - account = selectedAccount, - onClick = { onEvent(Event.OnAccountViewClick(selectedAccount)) }, - showAvatar = state.config.showAccountSelector, - ) - - DividerHorizontal() - } - Row { - AnimatedVisibility( - visible = state.config.showAccountSelector, - ) { - SideRailAccountList( - accounts = state.accounts, - selectedAccount = selectedAccount, - onAccountClick = { onEvent(Event.OnAccountClick(it)) }, - onSyncAllAccountsClick = { onEvent(Event.OnSyncAllAccounts) }, - onSettingsClick = { onEvent(Event.OnSettingsClick) }, - ) - } - Column( - modifier = Modifier - .weight(1f) - .fillMaxSize(), - ) { - FolderList( - rootFolder = state.rootFolder, - selectedFolder = state.folders.firstOrNull { it.id == state.selectedFolderId }, - onFolderClick = { folder -> - onEvent(Event.OnFolderClick(folder)) - }, - showStarredCount = state.config.showStarredCount, - modifier = Modifier.weight(1f), - ) - DividerHorizontal() - SideRailSettingList( - onAccountSelectorClick = { onEvent(Event.OnAccountSelectorClick) }, - onManageFoldersClick = { onEvent(Event.OnManageFoldersClick) }, - showAccountSelector = state.config.showAccountSelector, - ) - } - } - } - } -} diff --git a/feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/siderail/ui/account/SideRailAccountIndicator.kt b/feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/siderail/ui/account/SideRailAccountIndicator.kt deleted file mode 100644 index 33f6adf5e15..00000000000 --- a/feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/siderail/ui/account/SideRailAccountIndicator.kt +++ /dev/null @@ -1,26 +0,0 @@ -package net.thunderbird.feature.navigation.drawer.siderail.ui.account - -import androidx.compose.foundation.layout.defaultMinSize -import androidx.compose.foundation.layout.width -import androidx.compose.runtime.Composable -import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color -import app.k9mail.core.ui.compose.designsystem.atom.Surface -import app.k9mail.core.ui.compose.theme2.MainTheme -import net.thunderbird.feature.navigation.drawer.dropdown.ui.account.rememberCalculatedAccountColor - -@Composable -internal fun SideRailAccountIndicator( - accountColor: Color, - modifier: Modifier = Modifier, -) { - Surface( - modifier = modifier - .width(MainTheme.spacings.half) - .defaultMinSize( - minHeight = MainTheme.spacings.default, - ), - color = rememberCalculatedAccountColor(accountColor), - shape = MainTheme.shapes.medium, - ) {} -} diff --git a/feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/siderail/ui/account/SideRailAccountList.kt b/feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/siderail/ui/account/SideRailAccountList.kt deleted file mode 100644 index 96915e098dc..00000000000 --- a/feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/siderail/ui/account/SideRailAccountList.kt +++ /dev/null @@ -1,75 +0,0 @@ -package net.thunderbird.feature.navigation.drawer.siderail.ui.account - -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.PaddingValues -import androidx.compose.foundation.layout.Spacer -import androidx.compose.foundation.layout.fillMaxHeight -import androidx.compose.foundation.layout.height -import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.width -import androidx.compose.foundation.lazy.LazyColumn -import androidx.compose.foundation.lazy.items -import androidx.compose.runtime.Composable -import androidx.compose.ui.Modifier -import androidx.compose.ui.res.stringResource -import androidx.compose.ui.unit.dp -import app.k9mail.core.ui.compose.designsystem.atom.Surface -import app.k9mail.core.ui.compose.theme2.MainTheme -import kotlinx.collections.immutable.ImmutableList -import net.thunderbird.core.ui.compose.designsystem.atom.icon.Icons -import net.thunderbird.feature.navigation.drawer.dropdown.R -import net.thunderbird.feature.navigation.drawer.dropdown.domain.entity.DisplayAccount -import net.thunderbird.feature.navigation.drawer.siderail.ui.setting.SideRailSettingItem - -@Composable -internal fun SideRailAccountList( - accounts: ImmutableList, - selectedAccount: DisplayAccount?, - onAccountClick: (DisplayAccount) -> Unit, - onSyncAllAccountsClick: () -> Unit, - onSettingsClick: () -> Unit, - modifier: Modifier = Modifier, -) { - Surface( - modifier = modifier, - color = MainTheme.colors.surfaceContainer, - ) { - Column( - modifier = Modifier - .fillMaxHeight() - .width(MainTheme.sizes.large), - ) { - LazyColumn( - modifier = Modifier.weight(1f), - contentPadding = PaddingValues(vertical = MainTheme.spacings.default), - ) { - items( - items = accounts, - key = { account -> account.id }, - ) { account -> - SideRailAccountListItem( - account = account, - onClick = { onAccountClick(account) }, - selected = selectedAccount == account, - ) - } - } - Column( - modifier = Modifier.padding(vertical = MainTheme.spacings.oneHalf), - ) { - SideRailSettingItem( - icon = Icons.Outlined.Sync, - label = stringResource(id = R.string.navigation_drawer_dropdown_action_sync_all_accounts), - onClick = onSyncAllAccountsClick, - ) - // Hack to compensate the column placement at an uneven coordinate, caused by the 1.dp divider. - Spacer(modifier = Modifier.height(7.dp)) - SideRailSettingItem( - icon = Icons.Outlined.Settings, - label = stringResource(id = R.string.navigation_drawer_dropdown_action_settings), - onClick = onSettingsClick, - ) - } - } - } -} diff --git a/feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/siderail/ui/account/SideRailAccountListItem.kt b/feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/siderail/ui/account/SideRailAccountListItem.kt deleted file mode 100644 index 6551503f9f4..00000000000 --- a/feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/siderail/ui/account/SideRailAccountListItem.kt +++ /dev/null @@ -1,33 +0,0 @@ -package net.thunderbird.feature.navigation.drawer.siderail.ui.account - -import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.width -import androidx.compose.runtime.Composable -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import app.k9mail.core.ui.compose.theme2.MainTheme -import net.thunderbird.feature.navigation.drawer.dropdown.domain.entity.DisplayAccount -import net.thunderbird.feature.navigation.drawer.dropdown.ui.account.AccountAvatar - -@Composable -internal fun SideRailAccountListItem( - account: DisplayAccount, - onClick: (DisplayAccount) -> Unit, - selected: Boolean, - modifier: Modifier = Modifier, -) { - Box( - modifier = modifier - .width(MainTheme.sizes.large) - .padding(vertical = MainTheme.spacings.half), - contentAlignment = Alignment.Center, - ) { - AccountAvatar( - account = account, - selected = selected, - onClick = onClick, - showBadge = true, - ) - } -} diff --git a/feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/siderail/ui/account/SideRailAccountView.kt b/feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/siderail/ui/account/SideRailAccountView.kt deleted file mode 100644 index d86638d0e27..00000000000 --- a/feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/siderail/ui/account/SideRailAccountView.kt +++ /dev/null @@ -1,112 +0,0 @@ -package net.thunderbird.feature.navigation.drawer.siderail.ui.account - -import androidx.compose.animation.AnimatedVisibility -import androidx.compose.foundation.clickable -import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.IntrinsicSize -import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.WindowInsets -import androidx.compose.foundation.layout.WindowInsetsSides -import androidx.compose.foundation.layout.defaultMinSize -import androidx.compose.foundation.layout.displayCutout -import androidx.compose.foundation.layout.fillMaxHeight -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.height -import androidx.compose.foundation.layout.only -import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.width -import androidx.compose.runtime.Composable -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.platform.LocalLayoutDirection -import androidx.compose.ui.unit.LayoutDirection -import app.k9mail.core.ui.compose.designsystem.atom.Surface -import app.k9mail.core.ui.compose.designsystem.atom.text.TextBodyLarge -import app.k9mail.core.ui.compose.designsystem.atom.text.TextBodyMedium -import app.k9mail.core.ui.compose.theme2.MainTheme -import net.thunderbird.feature.navigation.drawer.dropdown.domain.entity.DisplayAccount -import net.thunderbird.feature.navigation.drawer.dropdown.domain.entity.MailDisplayAccount -import net.thunderbird.feature.navigation.drawer.dropdown.ui.account.AccountAvatar -import net.thunderbird.feature.navigation.drawer.dropdown.ui.common.getDisplayAccountColor -import net.thunderbird.feature.navigation.drawer.dropdown.ui.common.getDisplayAccountName - -@Suppress("LongMethod") -@Composable -internal fun SideRailAccountView( - account: DisplayAccount, - onClick: () -> Unit, - showAvatar: Boolean, - modifier: Modifier = Modifier, -) { - Row( - modifier = Modifier.fillMaxWidth() - .height(intrinsicSize = IntrinsicSize.Max), - verticalAlignment = Alignment.CenterVertically, - ) { - AnimatedVisibility(visible = showAvatar) { - Surface( - color = MainTheme.colors.surfaceContainer, - modifier = Modifier.fillMaxHeight(), - ) { - Box( - modifier = Modifier - .width(MainTheme.sizes.large), - contentAlignment = Alignment.Center, - ) { - AccountAvatar( - account = account, - onClick = null, - selected = false, - showBadge = true, - ) - } - } - } - Row( - modifier = modifier - .clickable(onClick = onClick) - .height(intrinsicSize = IntrinsicSize.Max) - .fillMaxWidth() - .defaultMinSize(minHeight = MainTheme.sizes.large) - .padding( - top = MainTheme.spacings.double, - start = MainTheme.spacings.double, - end = MainTheme.spacings.triple, - bottom = MainTheme.spacings.double, - ), - verticalAlignment = Alignment.CenterVertically, - ) { - val color = getDisplayAccountColor(account) - val name = getDisplayAccountName(account) - - SideRailAccountIndicator( - accountColor = color, - modifier = Modifier - .fillMaxHeight() - .padding(end = MainTheme.spacings.oneHalf), - ) - Column( - verticalArrangement = Arrangement.spacedBy(MainTheme.spacings.half), - ) { - TextBodyLarge( - text = name, - color = MainTheme.colors.onSurface, - ) - if (account is MailDisplayAccount && account.name != account.email) { - TextBodyMedium( - text = account.email, - color = MainTheme.colors.onSurfaceVariant, - ) - } - } - } - } -} - -@Composable -fun getDisplayCutOutHorizontalInsetPadding(): WindowInsets { - val isRtl = LocalLayoutDirection.current == LayoutDirection.Rtl - return WindowInsets.displayCutout.only(if (isRtl) WindowInsetsSides.Right else WindowInsetsSides.Left) -} diff --git a/feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/siderail/ui/setting/SideRailSettingItem.kt b/feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/siderail/ui/setting/SideRailSettingItem.kt deleted file mode 100644 index ff8fcf6307a..00000000000 --- a/feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/siderail/ui/setting/SideRailSettingItem.kt +++ /dev/null @@ -1,40 +0,0 @@ -package net.thunderbird.feature.navigation.drawer.siderail.ui.setting - -import androidx.compose.foundation.clickable -import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.width -import androidx.compose.foundation.shape.CircleShape -import androidx.compose.runtime.Composable -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.vector.ImageVector -import app.k9mail.core.ui.compose.designsystem.atom.Surface -import app.k9mail.core.ui.compose.theme2.MainTheme -import net.thunderbird.core.ui.compose.designsystem.atom.icon.Icon - -@Composable -internal fun SideRailSettingItem( - icon: ImageVector, - label: String, - onClick: () -> Unit, - modifier: Modifier = Modifier, -) { - Box( - modifier = modifier.width(MainTheme.sizes.large), - contentAlignment = Alignment.Center, - ) { - Surface( - color = MainTheme.colors.surfaceContainer, - shape = CircleShape, - ) { - Icon( - imageVector = icon, - contentDescription = label, - modifier = Modifier - .clickable(onClick = onClick) - .padding(MainTheme.spacings.oneHalf), - ) - } - } -} diff --git a/feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/siderail/ui/setting/SideRailSettingList.kt b/feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/siderail/ui/setting/SideRailSettingList.kt deleted file mode 100644 index 7a403083e01..00000000000 --- a/feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/siderail/ui/setting/SideRailSettingList.kt +++ /dev/null @@ -1,45 +0,0 @@ -package net.thunderbird.feature.navigation.drawer.siderail.ui.setting - -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.padding -import androidx.compose.runtime.Composable -import androidx.compose.ui.Modifier -import androidx.compose.ui.res.stringResource -import app.k9mail.core.ui.compose.theme2.MainTheme -import net.thunderbird.core.ui.compose.designsystem.atom.icon.Icons -import net.thunderbird.feature.navigation.drawer.dropdown.R -import net.thunderbird.feature.navigation.drawer.dropdown.ui.setting.SettingListItem - -@Composable -internal fun SideRailSettingList( - onAccountSelectorClick: () -> Unit, - onManageFoldersClick: () -> Unit, - showAccountSelector: Boolean, - modifier: Modifier = Modifier, -) { - Column( - modifier = modifier - .padding(vertical = MainTheme.spacings.default) - .fillMaxWidth(), - ) { - SettingListItem( - label = stringResource(R.string.navigation_drawer_dropdown_action_manage_folders), - onClick = onManageFoldersClick, - icon = Icons.Outlined.FolderManaged, - ) - SettingListItem( - label = if (showAccountSelector) { - stringResource(R.string.navigation_drawer_dropdown_action_hide_accounts) - } else { - stringResource(R.string.navigation_drawer_dropdown_action_show_accounts) - }, - onClick = onAccountSelectorClick, - icon = if (showAccountSelector) { - Icons.Outlined.ChevronLeft - } else { - Icons.Outlined.ChevronRight - }, - ) - } -} diff --git a/feature/navigation/drawer/dropdown/src/main/res/values-am/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values-am/strings.xml index c00b9f2b1b0..c48fd7930b4 100644 --- a/feature/navigation/drawer/dropdown/src/main/res/values-am/strings.xml +++ b/feature/navigation/drawer/dropdown/src/main/res/values-am/strings.xml @@ -2,8 +2,6 @@ ማህደሮችን ማስተዳደር ሁሉንም አካውንቶች አሳይ - አካውንቶችን አሳይ - አካውንቶችን ደብቅ ጠቅላላ መልእክት ማስቀመጫ 99+ ዘጠና ዘጠኝ እና ከዛ በላይ diff --git a/feature/navigation/drawer/dropdown/src/main/res/values-ar/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values-ar/strings.xml index 92ffdc72c28..66770dc1762 100644 --- a/feature/navigation/drawer/dropdown/src/main/res/values-ar/strings.xml +++ b/feature/navigation/drawer/dropdown/src/main/res/values-ar/strings.xml @@ -3,8 +3,6 @@ الإعدادات إدارة المجلدات البريد الوارد - إخفاء الحسابات - إظهار الحسابات 99+ 1k+ مزامنة جميع الحسابات diff --git a/feature/navigation/drawer/dropdown/src/main/res/values-be/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values-be/strings.xml index 0b76c2e928c..23b78751569 100644 --- a/feature/navigation/drawer/dropdown/src/main/res/values-be/strings.xml +++ b/feature/navigation/drawer/dropdown/src/main/res/values-be/strings.xml @@ -4,8 +4,6 @@ Кіраванне каталогамі Усе атрыманыя Сінхранізаваць усе акаўнты - Паказаць акаўнты - Схаваць акаўнты 99+ 1000+ diff --git a/feature/navigation/drawer/dropdown/src/main/res/values-bg/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values-bg/strings.xml index 77881285c4c..8f36bff4684 100644 --- a/feature/navigation/drawer/dropdown/src/main/res/values-bg/strings.xml +++ b/feature/navigation/drawer/dropdown/src/main/res/values-bg/strings.xml @@ -7,8 +7,6 @@ Обединен профил Синхронизация на всички профили Добавяне на профил - Показване на профилите - Скриване на профилите 99+ 1000+ diff --git a/feature/navigation/drawer/dropdown/src/main/res/values-br/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values-br/strings.xml index f463752f701..c25d38f30e5 100644 --- a/feature/navigation/drawer/dropdown/src/main/res/values-br/strings.xml +++ b/feature/navigation/drawer/dropdown/src/main/res/values-br/strings.xml @@ -7,8 +7,6 @@ Kont unanet Sinkronaat an holl gontoù Ouzhpennañ ur gont - Diskwel ar c\'hontoù - Kuzhat ar c\'hontoù >99 >1 k diff --git a/feature/navigation/drawer/dropdown/src/main/res/values-ca/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values-ca/strings.xml index f6b961b3aa5..0f66da86267 100644 --- a/feature/navigation/drawer/dropdown/src/main/res/values-ca/strings.xml +++ b/feature/navigation/drawer/dropdown/src/main/res/values-ca/strings.xml @@ -4,8 +4,6 @@ Gestioneu les carpetes Bústia d\'entrada unificada Sincronitza tots els comptes - Mostra els comptes - Amaga els comptes 99+ 1000+ Llistat de comptes diff --git a/feature/navigation/drawer/dropdown/src/main/res/values-co/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values-co/strings.xml index 6acaa278b88..6be869e3486 100644 --- a/feature/navigation/drawer/dropdown/src/main/res/values-co/strings.xml +++ b/feature/navigation/drawer/dropdown/src/main/res/values-co/strings.xml @@ -4,9 +4,7 @@ Ghjestione di i cartulari Currieru ricevutu Sincrunizà tutti i conti - Affissà i conti > 99 - Piattà i conti > 1000 Lista di i conti Contu di cuncolta diff --git a/feature/navigation/drawer/dropdown/src/main/res/values-cs/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values-cs/strings.xml index 9dc0efdb1bd..82ee5449596 100644 --- a/feature/navigation/drawer/dropdown/src/main/res/values-cs/strings.xml +++ b/feature/navigation/drawer/dropdown/src/main/res/values-cs/strings.xml @@ -5,9 +5,7 @@ Doručené 99+ 1 tis.+ - Zobrazit účty Synchronizovat všechny účty - Skrýt účty Seznam účtů Jednotný účet Přidat účet diff --git a/feature/navigation/drawer/dropdown/src/main/res/values-cy/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values-cy/strings.xml index 1a3d1caeece..505bc8103ae 100644 --- a/feature/navigation/drawer/dropdown/src/main/res/values-cy/strings.xml +++ b/feature/navigation/drawer/dropdown/src/main/res/values-cy/strings.xml @@ -7,8 +7,6 @@ Cyfrif Cyfun Cydweddu pob cyfrif Ychwanegu cyfrif - Dangos cyfrifon - Cuddio cyfrifon 99+ 1k+ Cydweddu cyfrif diff --git a/feature/navigation/drawer/dropdown/src/main/res/values-de/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values-de/strings.xml index adc918914d7..ad76b085b09 100644 --- a/feature/navigation/drawer/dropdown/src/main/res/values-de/strings.xml +++ b/feature/navigation/drawer/dropdown/src/main/res/values-de/strings.xml @@ -5,9 +5,7 @@ Posteingang 1k+ 99+ - Konten ausblenden Alle Konten synchronisieren - Konten anzeigen Kontenliste Konto hinzufügen Gemeinsames Konto diff --git a/feature/navigation/drawer/dropdown/src/main/res/values-el/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values-el/strings.xml index 918bde821de..ff378ae6bee 100644 --- a/feature/navigation/drawer/dropdown/src/main/res/values-el/strings.xml +++ b/feature/navigation/drawer/dropdown/src/main/res/values-el/strings.xml @@ -6,8 +6,6 @@ 1χ+ 99+ Συγχρονισμός όλων των λογαριασμών - Εμφάνιση λογαριασμών - Απόκρυψη λογαριασμών Λίστα λογαριασμών Ενοποιημένος Λογαριασμός Προσθήκη λογαριασμού diff --git a/feature/navigation/drawer/dropdown/src/main/res/values-en-rGB/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values-en-rGB/strings.xml index 33c8605c52c..12ab044c17c 100644 --- a/feature/navigation/drawer/dropdown/src/main/res/values-en-rGB/strings.xml +++ b/feature/navigation/drawer/dropdown/src/main/res/values-en-rGB/strings.xml @@ -7,8 +7,6 @@ Unified Account 99+ 1k+ - Show accounts - Hide accounts Add account Sync all accounts diff --git a/feature/navigation/drawer/dropdown/src/main/res/values-eo/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values-eo/strings.xml index bbb47aebc88..21d878e0e5e 100644 --- a/feature/navigation/drawer/dropdown/src/main/res/values-eo/strings.xml +++ b/feature/navigation/drawer/dropdown/src/main/res/values-eo/strings.xml @@ -3,7 +3,5 @@ Agordoj Administri mesaĝujojn Unuigita ricevujo - Montri kontojn Samtempigi ĉiujn kontojn - Kaŝi kontojn diff --git a/feature/navigation/drawer/dropdown/src/main/res/values-es/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values-es/strings.xml index 63b119563c5..35f5a4ff1ce 100644 --- a/feature/navigation/drawer/dropdown/src/main/res/values-es/strings.xml +++ b/feature/navigation/drawer/dropdown/src/main/res/values-es/strings.xml @@ -6,8 +6,6 @@ >99 >mil Sincronizar todas las cuentas - Mostrar cuentas - Ocultar cuentas Cuentas disponibles Cuenta unificada Añadir cuenta diff --git a/feature/navigation/drawer/dropdown/src/main/res/values-et/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values-et/strings.xml index f71b0b91b20..b7fd54fe695 100644 --- a/feature/navigation/drawer/dropdown/src/main/res/values-et/strings.xml +++ b/feature/navigation/drawer/dropdown/src/main/res/values-et/strings.xml @@ -4,8 +4,6 @@ Halda kaustu Sisendkaust Sünkroniseeri kõik kasutajakontod - Näita kasutajakontosid - Peida kasutajakontod 1k+ 99+ Kasutajakontode loend diff --git a/feature/navigation/drawer/dropdown/src/main/res/values-eu/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values-eu/strings.xml index 3c74e80faff..2603a3d72d0 100644 --- a/feature/navigation/drawer/dropdown/src/main/res/values-eu/strings.xml +++ b/feature/navigation/drawer/dropdown/src/main/res/values-eu/strings.xml @@ -4,8 +4,6 @@ Kudeatu karpetak Sarrerako ontzi bateratua Sinkronizatu kontu guztiak - Erakutsi kontuak - Ezkutatu kontuak 1.000+ 99+ Kontuen zerrenda diff --git a/feature/navigation/drawer/dropdown/src/main/res/values-fa/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values-fa/strings.xml index 10beca69b39..f4d3f1790c6 100644 --- a/feature/navigation/drawer/dropdown/src/main/res/values-fa/strings.xml +++ b/feature/navigation/drawer/dropdown/src/main/res/values-fa/strings.xml @@ -3,9 +3,7 @@ تنظیمات مدیریت پوشه‌ها صندوق ورودی - نهفتن حساب‌ها هم‌گام سازی همهٔ آشنایان - نمایش حساب‌ها ۹۹+ ه+ لیست حساب diff --git a/feature/navigation/drawer/dropdown/src/main/res/values-fi/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values-fi/strings.xml index fccd6a4b190..f5ad4bb9b6b 100644 --- a/feature/navigation/drawer/dropdown/src/main/res/values-fi/strings.xml +++ b/feature/navigation/drawer/dropdown/src/main/res/values-fi/strings.xml @@ -4,8 +4,6 @@ Hallitse kansioita Postilaatikko Synkronoi kaikki tilit - Näytä tilit - Piilota tilit 99+ 1k+ Tililuettelo diff --git a/feature/navigation/drawer/dropdown/src/main/res/values-fr/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values-fr/strings.xml index 1a6130ddb7a..2fb856f487d 100644 --- a/feature/navigation/drawer/dropdown/src/main/res/values-fr/strings.xml +++ b/feature/navigation/drawer/dropdown/src/main/res/values-fr/strings.xml @@ -3,10 +3,8 @@ Paramètres Gérer les dossiers Boîte de réception - Cacher les comptes >99 >1 k - Afficher les comptes Synchroniser tous les comptes Liste des comptes Compte unifié diff --git a/feature/navigation/drawer/dropdown/src/main/res/values-fy/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values-fy/strings.xml index d2be1cdd70c..818f6f578b6 100644 --- a/feature/navigation/drawer/dropdown/src/main/res/values-fy/strings.xml +++ b/feature/navigation/drawer/dropdown/src/main/res/values-fy/strings.xml @@ -6,8 +6,6 @@ 99+ 1k+ Alle accounts syngronisearje - Accounts toane - Accounts ferstopje Accountlist Kombinearre account Account tafoegje diff --git a/feature/navigation/drawer/dropdown/src/main/res/values-ga/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values-ga/strings.xml index 6bdd4cbf596..03bcada1d5f 100644 --- a/feature/navigation/drawer/dropdown/src/main/res/values-ga/strings.xml +++ b/feature/navigation/drawer/dropdown/src/main/res/values-ga/strings.xml @@ -4,8 +4,6 @@ Bainistigh fillteáin Sioncronaigh gach cuntas 1k+ - Taispeáin cuntais - Folaigh cuntais Bosca isteach 99+ Liosta cuntas diff --git a/feature/navigation/drawer/dropdown/src/main/res/values-gd/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values-gd/strings.xml index f2dc8a2299f..f0697ef8534 100644 --- a/feature/navigation/drawer/dropdown/src/main/res/values-gd/strings.xml +++ b/feature/navigation/drawer/dropdown/src/main/res/values-gd/strings.xml @@ -6,6 +6,4 @@ Còrr is 99 Còrr is 1k Sioncronaich a h-uile cunntas - Seall na cunntasan - Falaich na cunntasan diff --git a/feature/navigation/drawer/dropdown/src/main/res/values-hr/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values-hr/strings.xml index 37d62cca950..3eef377ad8e 100644 --- a/feature/navigation/drawer/dropdown/src/main/res/values-hr/strings.xml +++ b/feature/navigation/drawer/dropdown/src/main/res/values-hr/strings.xml @@ -4,8 +4,6 @@ Upravljanje mapama Objedinjena dolazna pošta Sinkroniziraj sve račune - Prikaži račune - Sakrij račune 1k+ 99+ diff --git a/feature/navigation/drawer/dropdown/src/main/res/values-hu/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values-hu/strings.xml index be889e05414..e0bc584280d 100644 --- a/feature/navigation/drawer/dropdown/src/main/res/values-hu/strings.xml +++ b/feature/navigation/drawer/dropdown/src/main/res/values-hu/strings.xml @@ -4,9 +4,7 @@ Mappák kezelése Bérkezett üzenetek Összes fiók szinkronizálása - Fiókok megjelenítése 99+ - Fiókok elrejtése 1e+ Fióklista Egyesített fiók diff --git a/feature/navigation/drawer/dropdown/src/main/res/values-in/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values-in/strings.xml index e5dc0c61387..75870d59788 100644 --- a/feature/navigation/drawer/dropdown/src/main/res/values-in/strings.xml +++ b/feature/navigation/drawer/dropdown/src/main/res/values-in/strings.xml @@ -6,7 +6,5 @@ 99+ 1rb+ Sinkronkan semua akun - Tampilkan akun - Sembunyikan akun Daftar akun diff --git a/feature/navigation/drawer/dropdown/src/main/res/values-is/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values-is/strings.xml index 13a2da440c1..fd69a6e20d6 100644 --- a/feature/navigation/drawer/dropdown/src/main/res/values-is/strings.xml +++ b/feature/navigation/drawer/dropdown/src/main/res/values-is/strings.xml @@ -6,8 +6,6 @@ >99 >1.000 Samstilla alla reikninga - Sýna reikninga - Fela reikninga Aðgangalisti Sameinaður aðgangur Bæta við aðgangi diff --git a/feature/navigation/drawer/dropdown/src/main/res/values-it/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values-it/strings.xml index fbd1ae0f37e..70db2a73155 100644 --- a/feature/navigation/drawer/dropdown/src/main/res/values-it/strings.xml +++ b/feature/navigation/drawer/dropdown/src/main/res/values-it/strings.xml @@ -5,9 +5,7 @@ Posta in arrivo 1k+ 99+ - Nascondi gli account Sincronizza tutti gli account - Mostra gli account Aggiungi un account Elenco degli account Account unificato diff --git a/feature/navigation/drawer/dropdown/src/main/res/values-iw/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values-iw/strings.xml index ebc3774cb5e..8c88f19d18a 100644 --- a/feature/navigation/drawer/dropdown/src/main/res/values-iw/strings.xml +++ b/feature/navigation/drawer/dropdown/src/main/res/values-iw/strings.xml @@ -4,8 +4,6 @@ נהל תיקיות תיבת דואר נכנס מאוחדת סנכרן את כל החשבונות - הצג חשבונות - הסתר חשבונות 99+ 1k+ רשימת חשבונות diff --git a/feature/navigation/drawer/dropdown/src/main/res/values-ja/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values-ja/strings.xml index 412b64e109e..ab7fde0f653 100644 --- a/feature/navigation/drawer/dropdown/src/main/res/values-ja/strings.xml +++ b/feature/navigation/drawer/dropdown/src/main/res/values-ja/strings.xml @@ -3,9 +3,7 @@ 設定 フォルダーを管理 受信トレイ - アカウントを開く すべてのアカウントを同期 - アカウントを閉じる 99+ 1000+ アカウント一覧 diff --git a/feature/navigation/drawer/dropdown/src/main/res/values-kab/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values-kab/strings.xml index 183d648de71..b9baf69057c 100644 --- a/feature/navigation/drawer/dropdown/src/main/res/values-kab/strings.xml +++ b/feature/navigation/drawer/dropdown/src/main/res/values-kab/strings.xml @@ -3,8 +3,6 @@ Iɣewwaren Sefrek ikaramen Mtawi meṛṛa imiḍanen - Sken imiḍanen - Ffer imiḍanen Tabdart n imiḍanen 99+ 1k+ diff --git a/feature/navigation/drawer/dropdown/src/main/res/values-kk/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values-kk/strings.xml index 84398524703..d27c6da3f37 100644 --- a/feature/navigation/drawer/dropdown/src/main/res/values-kk/strings.xml +++ b/feature/navigation/drawer/dropdown/src/main/res/values-kk/strings.xml @@ -1,6 +1,5 @@ Баптаулар - Тіркелгілерді көрсету 99+ diff --git a/feature/navigation/drawer/dropdown/src/main/res/values-lt/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values-lt/strings.xml index 84248e8d549..2a2b1a96fb6 100644 --- a/feature/navigation/drawer/dropdown/src/main/res/values-lt/strings.xml +++ b/feature/navigation/drawer/dropdown/src/main/res/values-lt/strings.xml @@ -3,12 +3,10 @@ Nustatymai Tvarkyti aplankus Gautieji - Rodyti paskyras Sinchronizuoti visas paskyras Paskyrų sąrašas Suvestinė paskyra Pridėti paskyrą - Slėpti paskyras 99+ 1k+ diff --git a/feature/navigation/drawer/dropdown/src/main/res/values-nb/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values-nb/strings.xml index cf8888e6e14..634367e758c 100644 --- a/feature/navigation/drawer/dropdown/src/main/res/values-nb/strings.xml +++ b/feature/navigation/drawer/dropdown/src/main/res/values-nb/strings.xml @@ -3,9 +3,7 @@ Innstillinger Behandle mapper Inboks - Vis kontoer Synkronisér alle kontoer - Skjul kontoer 99+ 1T+ Kontoliste diff --git a/feature/navigation/drawer/dropdown/src/main/res/values-nl/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values-nl/strings.xml index 270a9d134d9..12279a5bf72 100644 --- a/feature/navigation/drawer/dropdown/src/main/res/values-nl/strings.xml +++ b/feature/navigation/drawer/dropdown/src/main/res/values-nl/strings.xml @@ -6,8 +6,6 @@ 1k+ 99+ Alle accounts synchroniseren - Accounts tonen - Accounts verbergen Accountlijst Samengevoegd account Account toevoegen diff --git a/feature/navigation/drawer/dropdown/src/main/res/values-nn/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values-nn/strings.xml index ab4a42df447..e0723527383 100644 --- a/feature/navigation/drawer/dropdown/src/main/res/values-nn/strings.xml +++ b/feature/navigation/drawer/dropdown/src/main/res/values-nn/strings.xml @@ -3,8 +3,6 @@ Innstillingar Handsam mapper Synkroniser alle kontoar - Vis kontoar - Skjul kontoar 99+ Innboks 1k+ diff --git a/feature/navigation/drawer/dropdown/src/main/res/values-pl/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values-pl/strings.xml index d3566c93aa8..eec54731f80 100644 --- a/feature/navigation/drawer/dropdown/src/main/res/values-pl/strings.xml +++ b/feature/navigation/drawer/dropdown/src/main/res/values-pl/strings.xml @@ -6,8 +6,6 @@ 99+ 1k+ Synchronizuj wszystkie konta - Ukryj konta - Pokaż konta Lista kont Konto zintegrowane Dodaj konto diff --git a/feature/navigation/drawer/dropdown/src/main/res/values-pt-rBR/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values-pt-rBR/strings.xml index 2f6bdf67bf5..af9c589a7cb 100644 --- a/feature/navigation/drawer/dropdown/src/main/res/values-pt-rBR/strings.xml +++ b/feature/navigation/drawer/dropdown/src/main/res/values-pt-rBR/strings.xml @@ -5,8 +5,6 @@ Caixa de entrada 99+ Sincronizar todas as contas - Esconder contas - Mostrar contas 1k+ Lista de contas Conta unificada diff --git a/feature/navigation/drawer/dropdown/src/main/res/values-pt-rPT/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values-pt-rPT/strings.xml index c1eb1b039ed..b78c21b5b46 100644 --- a/feature/navigation/drawer/dropdown/src/main/res/values-pt-rPT/strings.xml +++ b/feature/navigation/drawer/dropdown/src/main/res/values-pt-rPT/strings.xml @@ -4,8 +4,6 @@ Gerir pastas Caixa de entrada unificada Sincronizar todas as contas - Mostrar contas - Esconder contas >99 >1k diff --git a/feature/navigation/drawer/dropdown/src/main/res/values-ro/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values-ro/strings.xml index 214b7d8f788..b25c3b222ab 100644 --- a/feature/navigation/drawer/dropdown/src/main/res/values-ro/strings.xml +++ b/feature/navigation/drawer/dropdown/src/main/res/values-ro/strings.xml @@ -4,8 +4,6 @@ Gestionează dosarele Primite Sincronizează toate conturile - Arată conturile - Ascunde conturile 99+ 1k+ Lista de conturi diff --git a/feature/navigation/drawer/dropdown/src/main/res/values-ru/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values-ru/strings.xml index a9ee37529b6..0ae19667ee4 100644 --- a/feature/navigation/drawer/dropdown/src/main/res/values-ru/strings.xml +++ b/feature/navigation/drawer/dropdown/src/main/res/values-ru/strings.xml @@ -4,8 +4,6 @@ Выбрать папки Входящие Синхронизировать все учётные записи - Показать учётные записи - Скрыть учётные записи 1000+ 99+ Список учётных записей diff --git a/feature/navigation/drawer/dropdown/src/main/res/values-sk/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values-sk/strings.xml index b2956703cea..cba30378346 100644 --- a/feature/navigation/drawer/dropdown/src/main/res/values-sk/strings.xml +++ b/feature/navigation/drawer/dropdown/src/main/res/values-sk/strings.xml @@ -6,7 +6,5 @@ 99+ 1k+ Synchronizovať všetky kontá - Ukázať kontá - Skryť kontá Zoznam účtov diff --git a/feature/navigation/drawer/dropdown/src/main/res/values-sl/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values-sl/strings.xml index 9e4ecebb77a..ed45518a5b6 100644 --- a/feature/navigation/drawer/dropdown/src/main/res/values-sl/strings.xml +++ b/feature/navigation/drawer/dropdown/src/main/res/values-sl/strings.xml @@ -6,8 +6,6 @@ 99+ 1k+ Uskladi vse račune - Prikaži račune - Skrij račune Seznam računov Enoten račun Dodaj račun diff --git a/feature/navigation/drawer/dropdown/src/main/res/values-sq/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values-sq/strings.xml index 115c6c7de4f..102df7a5c40 100644 --- a/feature/navigation/drawer/dropdown/src/main/res/values-sq/strings.xml +++ b/feature/navigation/drawer/dropdown/src/main/res/values-sq/strings.xml @@ -4,8 +4,6 @@ Administroni dosje Kuti Poste Njëkohëso krejt llogaritë - Shfaq llogari - Fshihi llogaritë 99+ 1k+ Listë llogarish diff --git a/feature/navigation/drawer/dropdown/src/main/res/values-sr/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values-sr/strings.xml index c59160302b7..d094fd27b47 100644 --- a/feature/navigation/drawer/dropdown/src/main/res/values-sr/strings.xml +++ b/feature/navigation/drawer/dropdown/src/main/res/values-sr/strings.xml @@ -4,8 +4,6 @@ Управљај фолдерима Сандуче Синхронизуј све налоге - Прикажи налоге - Сакриј налоге 99+ 1к+ Листа налога diff --git a/feature/navigation/drawer/dropdown/src/main/res/values-sv/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values-sv/strings.xml index b1babb27d1b..492011e6742 100644 --- a/feature/navigation/drawer/dropdown/src/main/res/values-sv/strings.xml +++ b/feature/navigation/drawer/dropdown/src/main/res/values-sv/strings.xml @@ -3,11 +3,9 @@ Inställningar Hantera mappar Inkorg - Visa konton Synkronisera alla konton 99+ 1tn+ - Göm konton Kontolista Enhetligt konto Lägg till konto diff --git a/feature/navigation/drawer/dropdown/src/main/res/values-ta-rIN/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values-ta-rIN/strings.xml index 492cdb45a31..2805bb0b6bb 100644 --- a/feature/navigation/drawer/dropdown/src/main/res/values-ta-rIN/strings.xml +++ b/feature/navigation/drawer/dropdown/src/main/res/values-ta-rIN/strings.xml @@ -1,11 +1,9 @@ அமைப்புகள் - கணக்குகளைக் காட்டு 1 கே+ கோப்புறைகளை நிர்வகிக்கவும் எல்லா கணக்குகளையும் ஒத்திசைக்கவும் - கணக்குகளை மறைக்கவும் ஒருங்கிணைந்த இன்பாக்ச் 99+ diff --git a/feature/navigation/drawer/dropdown/src/main/res/values-tr/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values-tr/strings.xml index f13ac64bf36..00463d7e52a 100644 --- a/feature/navigation/drawer/dropdown/src/main/res/values-tr/strings.xml +++ b/feature/navigation/drawer/dropdown/src/main/res/values-tr/strings.xml @@ -5,9 +5,7 @@ Gelen Kutusu 1.000+ 99+ - Hesapları gizle Tüm hesapları eşitle - Hesapları göster Hesap listesi Birleşik hesap Hesap ekle diff --git a/feature/navigation/drawer/dropdown/src/main/res/values-uk/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values-uk/strings.xml index 414251825c8..114644d2294 100644 --- a/feature/navigation/drawer/dropdown/src/main/res/values-uk/strings.xml +++ b/feature/navigation/drawer/dropdown/src/main/res/values-uk/strings.xml @@ -4,10 +4,8 @@ Керувати теками Вхідні Синхронізувати всі облікові записи - Показати облікові записи 1 тис.+ 99+ - Сховати облікові записи Список облікових записів Уніфікований обліковий запис Додати обліковий запис diff --git a/feature/navigation/drawer/dropdown/src/main/res/values-vi/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values-vi/strings.xml index 2fca60a5931..929c3dc74ec 100644 --- a/feature/navigation/drawer/dropdown/src/main/res/values-vi/strings.xml +++ b/feature/navigation/drawer/dropdown/src/main/res/values-vi/strings.xml @@ -4,8 +4,6 @@ Quản lý thư mục Hộp thư đồng nhất 1n+ - Hiên các tài khoản - Ấn các tài khoản 99+ Đồng bộ tất cả các tài khoản diff --git a/feature/navigation/drawer/dropdown/src/main/res/values-zh-rCN/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values-zh-rCN/strings.xml index 5018533208a..4ffbda5e7a5 100644 --- a/feature/navigation/drawer/dropdown/src/main/res/values-zh-rCN/strings.xml +++ b/feature/navigation/drawer/dropdown/src/main/res/values-zh-rCN/strings.xml @@ -5,8 +5,6 @@ 收件箱 99+ 1000+ - 显示账号 - 隐藏账号 同步全部账号 账号列表 添加账号 diff --git a/feature/navigation/drawer/dropdown/src/main/res/values-zh-rTW/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values-zh-rTW/strings.xml index 416c34d33fe..de4408e00e6 100644 --- a/feature/navigation/drawer/dropdown/src/main/res/values-zh-rTW/strings.xml +++ b/feature/navigation/drawer/dropdown/src/main/res/values-zh-rTW/strings.xml @@ -6,8 +6,6 @@ 99+ 1k+ 同步所有帳號 - 顯示所有帳號 - 隱藏其他帳號 帳戶列表 統一賬戶 添加賬戶 diff --git a/feature/navigation/drawer/dropdown/src/main/res/values/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values/strings.xml index 36695ed2278..d267dbfb219 100644 --- a/feature/navigation/drawer/dropdown/src/main/res/values/strings.xml +++ b/feature/navigation/drawer/dropdown/src/main/res/values/strings.xml @@ -7,8 +7,6 @@ Sync all accounts Sync account Add account - Show accounts - Hide accounts Inbox 99+ diff --git a/feature/navigation/drawer/dropdown/src/test/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/ui/DrawerViewKtTest.kt b/feature/navigation/drawer/dropdown/src/test/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/ui/DrawerViewKtTest.kt index 71c84b0cfc0..75b8f70e415 100644 --- a/feature/navigation/drawer/dropdown/src/test/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/ui/DrawerViewKtTest.kt +++ b/feature/navigation/drawer/dropdown/src/test/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/ui/DrawerViewKtTest.kt @@ -33,7 +33,6 @@ internal class DrawerViewKtTest : ComposeTest() { openSettings = { counter.openSettingsCount++ }, openAddAccount = { counter.openAddAccountCount++ }, closeDrawer = { counter.closeDrawerCount++ }, - featureFlagProvider = FakeFeatureFlagProvider(isEnabled = true), viewModel = viewModel, ) } @@ -88,7 +87,6 @@ internal class DrawerViewKtTest : ComposeTest() { openSettings = { }, openAddAccount = { }, closeDrawer = { }, - featureFlagProvider = FakeFeatureFlagProvider(isEnabled = true), viewModel = viewModel, ) }