Skip to content

Commit

Permalink
Third pass for wiring breadcrumb content provider
Browse files Browse the repository at this point in the history 
For #8
  • Loading branch information
@kirill-grouchnikov
kirill-grouchnikov committed Jan 6, 2022
1 parent 5551f6b commit 05393e7
Show file tree
Hide file tree
Showing 2 changed files with 85 additions and 42 deletions.
29 changes: 25 additions & 4 deletions component/src/desktopMain/kotlin/org/pushingpixels/aurora/component/AuroraBreadcrumbBar.kt
View file
Expand Up @@ -236,7 +236,7 @@ fun <T> AuroraBreadcrumbBar(
shownPath.clear()
shownPath.add(rootChoice)
scope.launch {
if (shownPathChoices.size > 1) {
while (shownPathChoices.size > 1) {
shownPathChoices.removeLast()
}
val newPathChoices =
Expand All @@ -253,7 +253,10 @@ fun <T> AuroraBreadcrumbBar(
Command(
text = "root",
icon = null,
action = {},
action = {
// Clear all entries in the shown path
shownPath.clear()
},
secondaryContentModel = rootSecondaryContentModel
)
) + shownPath.mapIndexed { index, shownPathEntry ->
Expand All @@ -270,10 +273,22 @@ fun <T> AuroraBreadcrumbBar(
Command(text = entryChoice.displayName,
icon = entryChoice.icon,
action = {
if (shownPath.size > 1) {
// Clear all entries in shown path after the one that
// corresponds to the command with these choices
while (shownPath.size > indexInShownPathChoices) {
shownPath.removeLast()
}
shownPath.add(entryChoice)

// And load choices for this entry
scope.launch {
while (shownPathChoices.size > (indexInShownPathChoices + 1)) {
shownPathChoices.removeLast()
}
val newPathChoices =
contentProvider.getPathChoices(shownPath)
shownPathChoices.add(newPathChoices)
}
})
}
)
Expand All @@ -282,7 +297,13 @@ fun <T> AuroraBreadcrumbBar(
Command(
text = shownPathEntry.displayName,
icon = shownPathEntry.icon,
action = { println("Act on ${shownPathEntry.data}") },
action = {
// Clear all entries in shown path after the one that
// corresponds to this command
while (shownPath.size > indexInShownPathChoices) {
shownPath.removeLast()
}
},
secondaryContentModel = shownPathEntryMenuContentModel
)
}
Expand Down
98 changes: 60 additions & 38 deletions demo/src/desktopMain/kotlin/org/pushingpixels/aurora/demo/AuroraBreadcrumbBarDemo.kt
View file
Expand Up @@ -31,15 +31,17 @@ import org.pushingpixels.aurora.component.AuroraBreadcrumbBar
import org.pushingpixels.aurora.component.model.BreadcrumbBarContentProvider
import org.pushingpixels.aurora.component.model.BreadcrumbBarPresentationModel
import org.pushingpixels.aurora.component.model.BreadcrumbItem
import org.pushingpixels.aurora.component.model.Command
import org.pushingpixels.aurora.demo.svg.material.*
import org.pushingpixels.aurora.demo.svg.radiance_menu
import org.pushingpixels.aurora.theming.*
import org.pushingpixels.aurora.window.AuroraApplicationScope
import org.pushingpixels.aurora.window.AuroraDecorationArea
import org.pushingpixels.aurora.window.AuroraWindow
import org.pushingpixels.aurora.window.auroraApplication
import java.io.File
import java.io.InputStream
import java.util.*
import javax.swing.filechooser.FileSystemView

fun main() = auroraApplication {
val state = rememberWindowState(
Expand All @@ -64,47 +66,67 @@ fun main() = auroraApplication {

@Composable
fun AuroraApplicationScope.BreadcrumbContent(auroraSkinDefinition: MutableState<AuroraSkinDefinition>) {
val topContent = listOf(
BreadcrumbItem("account", account_box_24px(), "account activated"),
BreadcrumbItem("apps", apps_24px(), "apps activated"),
BreadcrumbItem("backup", backup_24px(), "backup activated"),
BreadcrumbItem("devices", devices_other_24px(), "devices activated"),
BreadcrumbItem("help", help_24px(), "help activated"),
BreadcrumbItem("keyboard", keyboard_capslock_24px(), "keyboard activated"),
BreadcrumbItem("location", location_on_24px(), "location activated"),
BreadcrumbItem("permissions", perm_device_information_24px(), "permission activated"),
BreadcrumbItem("storage", storage_24px(), "storage activated")
)
val secondaryContent = listOf(
BreadcrumbItem("bold", format_bold_black_24dp(), ""),
BreadcrumbItem("italic", format_italic_black_24dp(), ""),
BreadcrumbItem("strikethrough", format_strikethrough_black_24dp(), ""),
BreadcrumbItem("underlined", format_underlined_black_24dp(), ""),
)

val contentProvider: BreadcrumbBarContentProvider<String> = object : BreadcrumbBarContentProvider<String> {
override suspend fun getPathChoices(path: List<BreadcrumbItem<String>>): List<BreadcrumbItem<String>> {
// Sample delay to emulate slow loading of content
delay(500)
if (path.isEmpty()) {
return topContent
val fileSystemView = FileSystemView.getFileSystemView()
val contentProvider: BreadcrumbBarContentProvider<File> =
object : BreadcrumbBarContentProvider<File> {
override suspend fun getPathChoices(path: List<BreadcrumbItem<File>>): List<BreadcrumbItem<File>> {
// Sample delay to emulate slow loading of content
delay(500)
if (path.isEmpty()) {
// Get file system roots, filter out hidden ones, map the rest to
// what the content provider needs to return, and sort them by display name
return fileSystemView.roots.filterNot { fileSystemView.isHiddenFile(it) }
.map {
BreadcrumbItem(
displayName = fileSystemView.getSystemDisplayName(it)
.let { rootName -> rootName.ifEmpty { it.absolutePath } },
icon = null,
data = it
)
}
.sortedBy { it.displayName.lowercase() }
} else {
// Get all files under the last file in the path, filter out hidden ones and
// non-directory ones, map the rest to what the content provider needs to
// return, and sort them by display name
println(path.last().data.listFiles())
return path.last().data.listFiles()
.filterNot { !it.isDirectory || fileSystemView.isHiddenFile(it) }
.map {
BreadcrumbItem(
displayName = fileSystemView.getSystemDisplayName(it)
.let { childName -> childName.ifEmpty { it.absolutePath } },
icon = null,
data = it
)
}
.sortedBy { it.displayName.lowercase() }
}
}
if (path.size == 1) {
return secondaryContent
}
return emptyList()
}

override suspend fun getLeaves(path: List<BreadcrumbItem<String>>): List<BreadcrumbItem<String>> {
// Sample delay to emulate slow loading of content
delay(500)
return emptyList()
}
override suspend fun getLeaves(path: List<BreadcrumbItem<File>>): List<BreadcrumbItem<File>> {
// Sample delay to emulate slow loading of content
delay(500)
// Get all files under the last file in the path, filter out hidden ones and
// directory ones, map the rest to what the content provider needs to
// return, and sort them by display name
return path.last().data.listFiles()
.filterNot { it.isDirectory || fileSystemView.isHiddenFile(it) }
.map {
BreadcrumbItem(
displayName = fileSystemView.getSystemDisplayName(it)
.let { childName -> childName.ifEmpty { it.absolutePath } },
icon = null,
data = it
)
}
.sortedBy { it.displayName.lowercase() }
}

override suspend fun getLeafContent(leaf: String): InputStream? {
return null
override suspend fun getLeafContent(leaf: File): InputStream? {
return null
}
}
}

Column(modifier = Modifier.fillMaxSize()) {
AuroraDecorationArea(decorationAreaType = DecorationAreaType.Header) {
Expand Down

0 comments on commit 05393e7

Please sign in to comment.