From e135ec133c5bd376fd36c1f75d8ca942ddd9fbaf Mon Sep 17 00:00:00 2001 From: Abdelilah El Aissaoui Date: Fri, 1 Mar 2024 15:21:12 +0100 Subject: [PATCH] Fixed expanded folder icon not showing up --- src/main/kotlin/com/jetpackduba/gitnuro/ui/CommitChanges.kt | 1 + .../kotlin/com/jetpackduba/gitnuro/ui/UncommitedChanges.kt | 5 +++-- .../com/jetpackduba/gitnuro/ui/components/FileEntry.kt | 5 +++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/CommitChanges.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/CommitChanges.kt index af98e70..d15cf95 100644 --- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/CommitChanges.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/CommitChanges.kt @@ -453,6 +453,7 @@ private fun CommitTreeItemEntry( is TreeItem.Dir -> DirectoryEntry( dirName = entry.displayName, + isExpanded = entry.isExpanded, onClick = { onDirectoryClick(entry) }, depth = entry.depth, onGenerateContextMenu = { onGenerateDirectoryContextMenu(entry) }, diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/UncommitedChanges.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/UncommitedChanges.kt index 552a2ba..0e1bbe8 100644 --- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/UncommitedChanges.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/UncommitedChanges.kt @@ -1124,8 +1124,9 @@ private fun UncommittedTreeItemEntry( ) is TreeItem.Dir -> DirectoryEntry( - entry.displayName, - onClick, + dirName = entry.displayName, + isExpanded = entry.isExpanded, + onClick = onClick, depth = entry.depth, onGenerateContextMenu = { onGenerateDirectoryContextMenu(entry) }, ) diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/components/FileEntry.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/components/FileEntry.kt index a3016e7..17ac5c8 100644 --- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/components/FileEntry.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/components/FileEntry.kt @@ -141,13 +141,14 @@ fun FileEntry( @Composable fun DirectoryEntry( dirName: String, - onClick: () -> Unit, + isExpanded: Boolean, depth: Int = 0, + onClick: () -> Unit, onGenerateContextMenu: () -> List, ) { FileEntry( - icon = painterResource(AppIcons.FOLDER), + icon = painterResource(if (isExpanded) AppIcons.FOLDER_OPEN else AppIcons.FOLDER), iconColor = MaterialTheme.colors.onBackground, isSelected = false, onClick = onClick,