From e7bff01dc8af2caf67792a43b9e21e83aa8677db Mon Sep 17 00:00:00 2001 From: fankesyooni Date: Sat, 18 Nov 2023 03:30:19 +0800 Subject: [PATCH] feat: update demo --- samples/shared/src/androidMain/kotlin/App.android.kt | 4 +--- samples/shared/src/commonMain/kotlin/App.kt | 7 +++---- samples/shared/src/desktopMain/kotlin/App.desktop.kt | 4 +--- samples/shared/src/iosMain/kotlin/App.ios.kt | 4 +--- 4 files changed, 6 insertions(+), 13 deletions(-) diff --git a/samples/shared/src/androidMain/kotlin/App.android.kt b/samples/shared/src/androidMain/kotlin/App.android.kt index 4d00ce2..0569dd4 100644 --- a/samples/shared/src/androidMain/kotlin/App.android.kt +++ b/samples/shared/src/androidMain/kotlin/App.android.kt @@ -22,6 +22,4 @@ import androidx.compose.runtime.Composable @Composable -fun MainView() = App() - -actual val isAndroidPlatform = true \ No newline at end of file +fun MainView() = App() \ No newline at end of file diff --git a/samples/shared/src/commonMain/kotlin/App.kt b/samples/shared/src/commonMain/kotlin/App.kt index 5f39316..80d7d56 100644 --- a/samples/shared/src/commonMain/kotlin/App.kt +++ b/samples/shared/src/commonMain/kotlin/App.kt @@ -56,6 +56,7 @@ import com.highcapable.flexiui.component.TextField import com.highcapable.flexiui.defaultColors import com.highcapable.flexiui.dynamicColors import com.highcapable.flexiui.greenColors +import com.highcapable.flexiui.isDynamicColorsAvailable import com.highcapable.flexiui.orangeColors import com.highcapable.flexiui.pinkColors import com.highcapable.flexiui.purpleColors @@ -187,7 +188,7 @@ private fun ThemeColorsView(themeColor: MutableState) { }, actived = choosedColorName == name ) { Text(text = name) } - if (isAndroidPlatform && index == 3) + if (isDynamicColorsAvailable() && index == 3) DynamicColors.forEach { (name, colors) -> createItem(name, colors) } else createItem(name, colors) } @@ -234,6 +235,4 @@ private val ThemeColors = listOf( "Blue" to blueColors(), "Blue (Dark)" to blueColors(darkMode = true), "Blue (Black)" to blueColors(darkMode = true, blackDarkMode = true) -) - -expect val isAndroidPlatform: Boolean \ No newline at end of file +) \ No newline at end of file diff --git a/samples/shared/src/desktopMain/kotlin/App.desktop.kt b/samples/shared/src/desktopMain/kotlin/App.desktop.kt index 7fdcb27..0569dd4 100644 --- a/samples/shared/src/desktopMain/kotlin/App.desktop.kt +++ b/samples/shared/src/desktopMain/kotlin/App.desktop.kt @@ -22,6 +22,4 @@ import androidx.compose.runtime.Composable @Composable -fun MainView() = App() - -actual val isAndroidPlatform = false \ No newline at end of file +fun MainView() = App() \ No newline at end of file diff --git a/samples/shared/src/iosMain/kotlin/App.ios.kt b/samples/shared/src/iosMain/kotlin/App.ios.kt index fd7b8e2..b9b1d7e 100644 --- a/samples/shared/src/iosMain/kotlin/App.ios.kt +++ b/samples/shared/src/iosMain/kotlin/App.ios.kt @@ -27,6 +27,4 @@ import androidx.compose.ui.window.ComposeUIViewController fun createUIViewController() = ComposeUIViewController { MainView() } @Composable -fun MainView() = App() - -actual val isAndroidPlatform = false \ No newline at end of file +fun MainView() = App() \ No newline at end of file