diff --git a/composeApp/src/androidMain/kotlin/mg/dot/feufaro/LaunchFilePicker.kt b/composeApp/src/androidMain/kotlin/mg/dot/feufaro/LaunchFilePicker.kt new file mode 100644 index 0000000..84dd5f1 --- /dev/null +++ b/composeApp/src/androidMain/kotlin/mg/dot/feufaro/LaunchFilePicker.kt @@ -0,0 +1,8 @@ +package mg.dot.feufaro + +actual fun launchFilePicker( + mimeTypes: Array, + onFileSelected: (path: String?) -> Unit +): Unit { + +} \ No newline at end of file diff --git a/composeApp/src/androidMain/kotlin/mg/dot/feufaro/ui/MyVerticalScrollbar.kt b/composeApp/src/androidMain/kotlin/mg/dot/feufaro/ui/MyVerticalScrollbar.kt new file mode 100644 index 0000000..b2d14b2 --- /dev/null +++ b/composeApp/src/androidMain/kotlin/mg/dot/feufaro/ui/MyVerticalScrollbar.kt @@ -0,0 +1,12 @@ +package mg.dot.feufaro.ui + +import androidx.compose.foundation.ScrollState +import androidx.compose.runtime.Composable + +@Composable +actual fun MyVerticalScrollbar ( + scrollState: ScrollState, + content: @Composable () -> Unit +){ + content() +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/mg/dot/feufaro/ScreenSolfa.kt b/composeApp/src/commonMain/kotlin/mg/dot/feufaro/ScreenSolfa.kt index 8f6f722..6723870 100644 --- a/composeApp/src/commonMain/kotlin/mg/dot/feufaro/ScreenSolfa.kt +++ b/composeApp/src/commonMain/kotlin/mg/dot/feufaro/ScreenSolfa.kt @@ -1,7 +1,6 @@ package mg.dot.feufaro import SharedScreenModel -import androidx.compose.foundation.VerticalScrollbar import androidx.compose.foundation.background import androidx.compose.foundation.gestures.detectTapGestures import androidx.compose.foundation.layout.Arrangement @@ -17,7 +16,6 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.safeDrawing import androidx.compose.foundation.layout.windowInsetsPadding import androidx.compose.foundation.rememberScrollState -import androidx.compose.foundation.rememberScrollbarAdapter import androidx.compose.foundation.verticalScroll import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -44,6 +42,7 @@ import cafe.adriel.voyager.core.screen.Screen import cafe.adriel.voyager.koin.koinScreenModel import kotlinx.coroutines.launch import mg.dot.feufaro.data.GridTUOData +import mg.dot.feufaro.ui.MyVerticalScrollbar import mg.dot.feufaro.viewmodel.SolfaScreenModel import java.io.ObjectStreamException @@ -186,10 +185,9 @@ object ScreenSolfa : Screen { } } } - VerticalScrollbar( - adapter = rememberScrollbarAdapter(scrollState), - modifier = Modifier.fillMaxHeight(0.5f).background(Color.Green).align(Alignment.CenterEnd) - ) + MyVerticalScrollbar( + scrollState, + ) {} } } diff --git a/composeApp/src/commonMain/kotlin/mg/dot/feufaro/ui/MyVerticalScrollbar.kt b/composeApp/src/commonMain/kotlin/mg/dot/feufaro/ui/MyVerticalScrollbar.kt new file mode 100644 index 0000000..bbd594b --- /dev/null +++ b/composeApp/src/commonMain/kotlin/mg/dot/feufaro/ui/MyVerticalScrollbar.kt @@ -0,0 +1,10 @@ +package mg.dot.feufaro.ui + +import androidx.compose.foundation.ScrollState +import androidx.compose.runtime.Composable + +@Composable +expect fun MyVerticalScrollbar ( + scrollState: ScrollState, + content: @Composable () -> Unit +) diff --git a/composeApp/src/desktopMain/kotlin/mg/dot/feufaro/ui/MyVerticalScrollbar.kt b/composeApp/src/desktopMain/kotlin/mg/dot/feufaro/ui/MyVerticalScrollbar.kt new file mode 100644 index 0000000..a5a4305 --- /dev/null +++ b/composeApp/src/desktopMain/kotlin/mg/dot/feufaro/ui/MyVerticalScrollbar.kt @@ -0,0 +1,26 @@ +package mg.dot.feufaro.ui + +import androidx.compose.foundation.ScrollState +import androidx.compose.foundation.VerticalScrollbar +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.fillMaxHeight +import androidx.compose.foundation.rememberScrollbarAdapter +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color + +@Composable +actual fun MyVerticalScrollbar ( + scrollState: ScrollState, + content: @Composable () -> Unit +) { + Box { + content() + VerticalScrollbar( + adapter = rememberScrollbarAdapter(scrollState = scrollState), + modifier = Modifier.fillMaxHeight(0.5f).background(Color.Green).align(Alignment.CenterEnd) + ) + } +}