Merge pull request #8155 from wmontwe/add-drawer-unified-folder-support

Add drawer unified folder support

core/ui/compose/designsystem/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/atom/icon/Icons.kt

@@ -8,6 +8,7 @@ import androidx.compose.material.icons.filled.Outbox
 import androidx.compose.material.icons.filled.Star
 import androidx.compose.material.icons.filled.VisibilityOff
 import androidx.compose.material.icons.outlined.AccountCircle
+import androidx.compose.material.icons.outlined.AllInbox
 import androidx.compose.material.icons.outlined.Archive
 import androidx.compose.material.icons.outlined.Check
 import androidx.compose.material.icons.outlined.ChevronLeft
@@ -50,6 +51,9 @@ object Icons {
         val AccountCircle: ImageVector
             get() = MaterialIcons.Outlined.AccountCircle
 
+        val AllInbox: ImageVector
+            get() = MaterialIcons.Outlined.AllInbox
+
         val Archive: ImageVector
             get() = MaterialIcons.Outlined.Archive
 

feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/DrawerContentPreview.kt

@@ -4,6 +4,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.tooling.preview.Preview
 import app.k9mail.core.ui.compose.designsystem.PreviewWithTheme
 import app.k9mail.feature.navigation.drawer.ui.FakeData.DISPLAY_ACCOUNT
+import app.k9mail.feature.navigation.drawer.ui.FakeData.DISPLAY_FOLDER
+import app.k9mail.feature.navigation.drawer.ui.FakeData.UNIFIED_FOLDER
 import kotlinx.collections.immutable.persistentListOf
 
 @Composable
@@ -23,7 +25,7 @@ internal fun DrawerContentPreview() {
 
 @Composable
 @Preview(showBackground = true)
-fun DrawerContentWithAccountPreview() {
+internal fun DrawerContentWithAccountPreview() {
     PreviewWithTheme {
         DrawerContent(
             state = DrawerContract.State(
@@ -35,3 +37,44 @@ fun DrawerContentWithAccountPreview() {
         )
     }
 }
+
+@Composable
+@Preview(showBackground = true)
+internal fun DrawerContentWithFoldersPreview() {
+    PreviewWithTheme {
+        DrawerContent(
+            state = DrawerContract.State(
+                accounts = persistentListOf(
+                    DISPLAY_ACCOUNT,
+                ),
+                selectedAccount = null,
+                folders = persistentListOf(
+                    UNIFIED_FOLDER,
+                    DISPLAY_FOLDER,
+                ),
+            ),
+            onEvent = {},
+        )
+    }
+}
+
+@Composable
+@Preview(showBackground = true)
+internal fun DrawerContentWithSelectedFolderPreview() {
+    PreviewWithTheme {
+        DrawerContent(
+            state = DrawerContract.State(
+                accounts = persistentListOf(
+                    DISPLAY_ACCOUNT,
+                ),
+                selectedAccount = DISPLAY_ACCOUNT,
+                folders = persistentListOf(
+                    UNIFIED_FOLDER,
+                    DISPLAY_FOLDER,
+                ),
+                selectedFolder = DISPLAY_FOLDER,
+            ),
+            onEvent = {},
+        )
+    }
+}

feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/FakeData.kt

@@ -4,6 +4,8 @@ import app.k9mail.core.mail.folder.api.Folder
 import app.k9mail.core.mail.folder.api.FolderType
 import app.k9mail.feature.navigation.drawer.domain.entity.DisplayAccount
 import app.k9mail.feature.navigation.drawer.domain.entity.DisplayAccountFolder
+import app.k9mail.feature.navigation.drawer.domain.entity.DisplayUnifiedFolder
+import app.k9mail.feature.navigation.drawer.domain.entity.DisplayUnifiedFolderType
 import app.k9mail.legacy.account.Account
 import app.k9mail.legacy.account.Identity
 
@@ -52,4 +54,11 @@ internal object FakeData {
         unreadMessageCount = 14,
         starredMessageCount = 5,
     )
+
+    val UNIFIED_FOLDER = DisplayUnifiedFolder(
+        id = "unified_inbox",
+        unifiedType = DisplayUnifiedFolderType.INBOX,
+        unreadMessageCount = 123,
+        starredMessageCount = 567,
+    )
 }

feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/account/AccountAvatarPreview.kt

@@ -7,7 +7,7 @@ import app.k9mail.feature.navigation.drawer.ui.FakeData.DISPLAY_ACCOUNT
 
 @Composable
 @Preview(showBackground = true)
-fun AccountAvatarPreview() {
+internal fun AccountAvatarPreview() {
     PreviewWithThemes {
         AccountAvatar(
             account = DISPLAY_ACCOUNT,

feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/account/AccountListItemPreview.kt

@@ -7,7 +7,7 @@ import app.k9mail.feature.navigation.drawer.ui.FakeData.DISPLAY_ACCOUNT
 
 @Composable
 @Preview(showBackground = true)
-fun AccountListItemPreview() {
+internal fun AccountListItemPreview() {
     PreviewWithThemes {
         AccountListItem(
             account = DISPLAY_ACCOUNT,

feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/account/AccountListPreview.kt

@@ -8,7 +8,7 @@ import kotlinx.collections.immutable.persistentListOf
 
 @Composable
 @Preview(showBackground = true)
-fun AccountListPreview() {
+internal fun AccountListPreview() {
     PreviewWithTheme {
         AccountList(
             accounts = persistentListOf(
@@ -23,7 +23,7 @@ fun AccountListPreview() {
 
 @Composable
 @Preview(showBackground = true)
-fun AccountListWithSelectedPreview() {
+internal fun AccountListWithSelectedPreview() {
     PreviewWithTheme {
         AccountList(
             accounts = persistentListOf(

feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/folder/FolderListItemPreview.kt

@@ -1,66 +1,73 @@
 package app.k9mail.feature.navigation.drawer.ui.folder
 
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.tooling.preview.Preview
 import app.k9mail.core.mail.folder.api.FolderType
 import app.k9mail.core.ui.compose.designsystem.PreviewWithThemes
 import app.k9mail.feature.navigation.drawer.ui.FakeData.DISPLAY_FOLDER
+import app.k9mail.feature.navigation.drawer.ui.FakeData.UNIFIED_FOLDER
+import app.k9mail.legacy.ui.folder.FolderNameFormatter
 
 @Composable
 @Preview(showBackground = true)
-fun FolderListItemPreview() {
+internal fun FolderListItemPreview() {
     PreviewWithThemes {
         FolderListItem(
             displayFolder = DISPLAY_FOLDER,
             selected = false,
             showStarredCount = false,
             onClick = {},
+            folderNameFormatter = FolderNameFormatter(LocalContext.current.resources),
         )
     }
 }
 
 @Composable
 @Preview(showBackground = true)
-fun FolderListItemSelectedPreview() {
+internal fun FolderListItemSelectedPreview() {
     PreviewWithThemes {
         FolderListItem(
             displayFolder = DISPLAY_FOLDER,
             selected = true,
             showStarredCount = false,
             onClick = {},
+            folderNameFormatter = FolderNameFormatter(LocalContext.current.resources),
         )
     }
 }
 
 @Composable
 @Preview(showBackground = true)
-fun FolderListItemWithStarredPreview() {
+internal fun FolderListItemWithStarredPreview() {
     PreviewWithThemes {
         FolderListItem(
             displayFolder = DISPLAY_FOLDER,
             selected = false,
             showStarredCount = true,
             onClick = {},
+            folderNameFormatter = FolderNameFormatter(LocalContext.current.resources),
         )
     }
 }
 
 @Composable
 @Preview(showBackground = true)
-fun FolderListItemWithStarredSelectedPreview() {
+internal fun FolderListItemWithStarredSelectedPreview() {
     PreviewWithThemes {
         FolderListItem(
             displayFolder = DISPLAY_FOLDER,
             selected = true,
             showStarredCount = true,
             onClick = {},
+            folderNameFormatter = FolderNameFormatter(LocalContext.current.resources),
         )
     }
 }
 
 @Composable
 @Preview(showBackground = true)
-fun FolderListItemWithInboxFolderPreview() {
+internal fun FolderListItemWithInboxFolderPreview() {
     PreviewWithThemes {
         FolderListItem(
             displayFolder = DISPLAY_FOLDER.copy(
@@ -71,6 +78,21 @@ fun FolderListItemWithInboxFolderPreview() {
             selected = false,
             showStarredCount = true,
             onClick = {},
+            folderNameFormatter = FolderNameFormatter(LocalContext.current.resources),
+        )
+    }
+}
+
+@Composable
+@Preview(showBackground = true)
+internal fun FolderListItemWithUnifiedFolderPreview() {
+    PreviewWithThemes {
+        FolderListItem(
+            displayFolder = UNIFIED_FOLDER,
+            selected = false,
+            showStarredCount = false,
+            onClick = {},
+            folderNameFormatter = FolderNameFormatter(LocalContext.current.resources),
         )
     }
 }

feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/folder/FolderListPreview.kt

@@ -0,0 +1,54 @@
+package app.k9mail.feature.navigation.drawer.ui.folder
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.tooling.preview.Preview
+import app.k9mail.core.ui.compose.designsystem.PreviewWithTheme
+import app.k9mail.feature.navigation.drawer.ui.FakeData.DISPLAY_FOLDER
+import app.k9mail.feature.navigation.drawer.ui.FakeData.UNIFIED_FOLDER
+import kotlinx.collections.immutable.persistentListOf
+
+@Composable
+@Preview(showBackground = true)
+internal fun FolderListPreview() {
+    PreviewWithTheme {
+        FolderList(
+            folders = persistentListOf(
+                DISPLAY_FOLDER,
+            ),
+            selectedFolder = null,
+            onFolderClick = {},
+            showStarredCount = false,
+        )
+    }
+}
+
+@Composable
+@Preview(showBackground = true)
+internal fun FolderListPreviewSelected() {
+    PreviewWithTheme {
+        FolderList(
+            folders = persistentListOf(
+                DISPLAY_FOLDER,
+            ),
+            selectedFolder = DISPLAY_FOLDER,
+            onFolderClick = {},
+            showStarredCount = false,
+        )
+    }
+}
+
+@Composable
+@Preview(showBackground = true)
+internal fun FolderListWithUnifiedFolderPreview() {
+    PreviewWithTheme {
+        FolderList(
+            folders = persistentListOf(
+                UNIFIED_FOLDER,
+                DISPLAY_FOLDER,
+            ),
+            selectedFolder = DISPLAY_FOLDER,
+            onFolderClick = {},
+            showStarredCount = false,
+        )
+    }
+}

feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/setting/SettingItemPreview.kt

@@ -6,7 +6,7 @@ import app.k9mail.core.ui.compose.designsystem.PreviewWithThemes
 
 @Composable
 @Preview(showBackground = true)
-fun SettingItemPreview() {
+internal fun SettingItemPreview() {
     PreviewWithThemes {
         SettingItem(
             label = "Setting",

feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/setting/SettingListItemPreview.kt

@@ -7,7 +7,7 @@ import app.k9mail.core.ui.compose.designsystem.atom.icon.Icons
 
 @Composable
 @Preview(showBackground = true)
-fun SettingListItemPreview() {
+internal fun SettingListItemPreview() {
     PreviewWithThemes {
         SettingListItem(
             label = "Settings",

feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/setting/SettingListPreview.kt

@@ -6,7 +6,7 @@ import app.k9mail.core.ui.compose.designsystem.PreviewWithTheme
 
 @Composable
 @Preview(showBackground = true)
-fun SettingListPreview() {
+internal fun SettingListPreview() {
     PreviewWithTheme {
         SettingList(
             onAccountSelectorClick = {},
@@ -18,7 +18,7 @@ fun SettingListPreview() {
 
 @Composable
 @Preview(showBackground = true)
-fun SettingListShowAccountSelectorPreview() {
+internal fun SettingListShowAccountSelectorPreview() {
     PreviewWithTheme {
         SettingList(
             onAccountSelectorClick = {},

feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/FolderDrawer.kt

@@ -17,6 +17,7 @@ class FolderDrawer(
     override val parent: AppCompatActivity,
     private val openAccount: (account: Account) -> Unit,
     private val openFolder: (folderId: Long) -> Unit,
+    private val openUnifiedFolder: () -> Unit,
     private val openManageFolders: () -> Unit,
     private val openSettings: () -> Unit,
     createDrawerListener: () -> DrawerLayout.DrawerListener,
@@ -40,6 +41,7 @@ class FolderDrawer(
                 DrawerView(
                     openAccount = openAccount,
                     openFolder = openFolder,
+                    openUnifiedFolder = openUnifiedFolder,
                     openManageFolders = openManageFolders,
                     openSettings = openSettings,
                     closeDrawer = { close() },

feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/NavigationDrawerModule.kt

@@ -33,6 +33,7 @@ val navigationDrawerModule: Module = module {
     single<UseCase.GetDisplayFoldersForAccount> {
         GetDisplayFoldersForAccount(
             repository = get(),
+            messageCountsProvider = get(),
         )
     }
 

feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/domain/DomainContract.kt

@@ -1,7 +1,7 @@
 package app.k9mail.feature.navigation.drawer.domain
 
 import app.k9mail.feature.navigation.drawer.domain.entity.DisplayAccount
-import app.k9mail.feature.navigation.drawer.domain.entity.DisplayAccountFolder
+import app.k9mail.feature.navigation.drawer.domain.entity.DisplayFolder
 import app.k9mail.feature.navigation.drawer.domain.entity.DrawerConfig
 import app.k9mail.legacy.account.Account
 import kotlinx.coroutines.flow.Flow
@@ -18,7 +18,7 @@ interface DomainContract {
         }
 
         fun interface GetDisplayFoldersForAccount {
-            operator fun invoke(accountUuid: String): Flow<List<DisplayAccountFolder>>
+            operator fun invoke(accountUuid: String, includeUnifiedFolders: Boolean): Flow<List<DisplayFolder>>
         }
 
         /**

feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/domain/entity/DisplayAccountFolder.kt

@@ -6,6 +6,8 @@ data class DisplayAccountFolder(
     val accountUuid: String,
     val folder: Folder,
     val isInTopGroup: Boolean,
-    val unreadMessageCount: Int,
-    val starredMessageCount: Int,
-)
+    override val unreadMessageCount: Int,
+    override val starredMessageCount: Int,
+) : DisplayFolder {
+    override val id: String = accountUuid + folder.id
+}

feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/domain/entity/DisplayFolder.kt

@@ -0,0 +1,7 @@
+package app.k9mail.feature.navigation.drawer.domain.entity
+
+interface DisplayFolder {
+    val id: String
+    val unreadMessageCount: Int
+    val starredMessageCount: Int
+}