Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 9bab605f authored by Rafael Tonholo's avatar Rafael Tonholo Committed by GitHub
Browse files

Merge pull request #9106 from shamim-emon/fix-issue-9105 

Bug: Unified Folder Not Showing And Navigation Drawer Selected Item Appearance Not Changing
parents 75e82e26 bef36ff9

feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/ui/folder/FolderList.kt

+11 −11
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ import androidx.compose.ui.platform.LocalContext 
import app.k9mail.core.ui.compose.designsystem.atom.DividerHorizontal

import app.k9mail.core.ui.compose.theme2.MainTheme

import app.k9mail.legacy.ui.folder.FolderNameFormatter

import net.thunderbird.feature.navigation.drawer.dropdown.domain.entity.DisplayAccountFolder

import net.thunderbird.feature.navigation.drawer.dropdown.domain.entity.DisplayFolder

import net.thunderbird.feature.navigation.drawer.dropdown.domain.entity.DisplayTreeFolder

import net.thunderbird.feature.navigation.drawer.dropdown.domain.entity.DisplayUnifiedFolder
@@ -41,16 +40,17 @@ internal fun FolderList( 
            key = { it.displayFolder?.id ?: '0' },

        ) { folder ->

            val currentDisplayFolder = folder.displayFolder

            if (currentDisplayFolder is DisplayAccountFolder) {

            FolderListItem(

                    displayFolder = currentDisplayFolder,

                displayFolder = requireNotNull(currentDisplayFolder) {

                    "Null DisplayFolder for folder ${folder.displayName}"

                },

                treeFolder = folder,

                    selected = currentDisplayFolder.folder == selectedFolder,

                selected = currentDisplayFolder == selectedFolder,

                showStarredCount = showStarredCount,

                onClick = onFolderClick,

                folderNameFormatter = folderNameFormatter,

                selectedFolderId = selectedFolder?.id,

            )

            }

            if (currentDisplayFolder is DisplayUnifiedFolder) {

                DividerHorizontal(

                    modifier = Modifier

feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/ui/folder/FolderListItem.kt

+2 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ internal fun FolderListItem( 
    modifier: Modifier = Modifier,

    treeFolder: DisplayTreeFolder? = null,

    parentPrefix: String? = "",

    selectedFolderId: String? = null,

    indentationLevel: Int = 1,

) {

    var isExpanded = rememberSaveable { mutableStateOf(false) }
@@ -79,7 +80,7 @@ internal fun FolderListItem( 
            if (displayChild === null) continue

            FolderListItem(

                displayFolder = displayChild,

                selected = false,

                selected = selectedFolderId?.let { displayChild.id == selectedFolderId } == true,

                showStarredCount = showStarredCount,

                onClick = onClick,

                folderNameFormatter = folderNameFormatter,