From 2fb065cb28bca3290947b16d1ce1880ebe418bd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adriel=20Caf=C3=A9?= Date: Wed, 13 Apr 2022 22:00:24 -0300 Subject: [PATCH] fix: remove non-multiplatform imports --- README.md | 3 +-- .../src/commonMain/kotlin/cafe/adriel/bonsai/core/Bonsai.kt | 3 +-- .../kotlin/cafe/adriel/bonsai/filesystem/FileSystemNode.kt | 4 ++-- .../kotlin/cafe/adriel/bonsai/filesystem/JvmFileSystemNode.kt | 3 +++ 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 5188f4e..a502190 100644 --- a/README.md +++ b/README.md @@ -8,12 +8,11 @@
Bonsai -

A batteries-included Tree View for Jetpack Compose -
+

diff --git a/bonsai-core/src/commonMain/kotlin/cafe/adriel/bonsai/core/Bonsai.kt b/bonsai-core/src/commonMain/kotlin/cafe/adriel/bonsai/core/Bonsai.kt index 77de59f..b0f6fc8 100644 --- a/bonsai-core/src/commonMain/kotlin/cafe/adriel/bonsai/core/Bonsai.kt +++ b/bonsai-core/src/commonMain/kotlin/cafe/adriel/bonsai/core/Bonsai.kt @@ -1,6 +1,5 @@ package cafe.adriel.bonsai.core -import androidx.annotation.FloatRange import androidx.compose.animation.EnterTransition import androidx.compose.animation.ExitTransition import androidx.compose.animation.expandVertically @@ -53,7 +52,7 @@ public data class BonsaiStyle( public val toggleIconSize: Dp = 16.dp, public val toggleIconColorFilter: ColorFilter? = null, public val toggleShape: Shape = CircleShape, - @FloatRange(from = 0.0) public val toggleIconRotationDegrees: Float = 90f, + public val toggleIconRotationDegrees: Float = 90f, public val nodeIconSize: Dp = 24.dp, public val nodePadding: PaddingValues = PaddingValues(all = 4.dp), public val nodeShape: Shape = RoundedCornerShape(size = 4.dp), diff --git a/bonsai-file-system/src/commonMain/kotlin/cafe/adriel/bonsai/filesystem/FileSystemNode.kt b/bonsai-file-system/src/commonMain/kotlin/cafe/adriel/bonsai/filesystem/FileSystemNode.kt index 916f625..5c426d8 100644 --- a/bonsai-file-system/src/commonMain/kotlin/cafe/adriel/bonsai/filesystem/FileSystemNode.kt +++ b/bonsai-file-system/src/commonMain/kotlin/cafe/adriel/bonsai/filesystem/FileSystemNode.kt @@ -32,8 +32,8 @@ public fun FileSystemBonsaiStyle(): BonsaiStyle = public fun fileSystemNodes( rootPath: Path, - selfInclude: Boolean = false, - fileSystem: FileSystem = FileSystem.SYSTEM + fileSystem: FileSystem, + selfInclude: Boolean = false ): List> = with( FileSystemNodeScope( diff --git a/bonsai-file-system/src/jvmMain/kotlin/cafe/adriel/bonsai/filesystem/JvmFileSystemNode.kt b/bonsai-file-system/src/jvmMain/kotlin/cafe/adriel/bonsai/filesystem/JvmFileSystemNode.kt index 194d820..1969f91 100644 --- a/bonsai-file-system/src/jvmMain/kotlin/cafe/adriel/bonsai/filesystem/JvmFileSystemNode.kt +++ b/bonsai-file-system/src/jvmMain/kotlin/cafe/adriel/bonsai/filesystem/JvmFileSystemNode.kt @@ -1,6 +1,7 @@ package cafe.adriel.bonsai.filesystem import cafe.adriel.bonsai.core.node.Node +import okio.FileSystem import okio.Path import okio.Path.Companion.toOkioPath import java.io.File @@ -12,6 +13,7 @@ public fun fileSystemNodes( ): List> = fileSystemNodes( rootPath = rootPath.toOkioPath(), + fileSystem = FileSystem.SYSTEM, selfInclude = selfInclude ) @@ -21,5 +23,6 @@ public fun fileSystemNodes( ): List> = fileSystemNodes( rootPath = rootPath.toOkioPath(), + fileSystem = FileSystem.SYSTEM, selfInclude = selfInclude )