feat: update demo

This commit is contained in:
2023-11-18 03:10:15 +08:00
parent 0017f87175
commit 961f3d4cf7
4 changed files with 39 additions and 17 deletions

View File

@@ -19,8 +19,9 @@
* *
* This file is created by fankes on 2023/11/5. * This file is created by fankes on 2023/11/5.
*/ */
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
@Composable @Composable
fun MainView() = App() fun MainView() = App()
actual val isAndroidPlatform = true

View File

@@ -31,6 +31,7 @@ import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll import androidx.compose.foundation.verticalScroll
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.MutableState import androidx.compose.runtime.MutableState
import androidx.compose.runtime.ReadOnlyComposable
import androidx.compose.runtime.getValue import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
@@ -53,6 +54,7 @@ import com.highcapable.flexiui.component.Switch
import com.highcapable.flexiui.component.Text import com.highcapable.flexiui.component.Text
import com.highcapable.flexiui.component.TextField import com.highcapable.flexiui.component.TextField
import com.highcapable.flexiui.defaultColors import com.highcapable.flexiui.defaultColors
import com.highcapable.flexiui.dynamicColors
import com.highcapable.flexiui.greenColors import com.highcapable.flexiui.greenColors
import com.highcapable.flexiui.orangeColors import com.highcapable.flexiui.orangeColors
import com.highcapable.flexiui.pinkColors import com.highcapable.flexiui.pinkColors
@@ -141,7 +143,7 @@ private fun ContentView() {
Text(text = "Choose an item following.") Text(text = "Choose an item following.")
Spacer(Modifier.padding(10.dp)) Spacer(Modifier.padding(10.dp))
DropdownList( DropdownList(
modifier = Modifier.width(150.dp), modifier = Modifier.width(170.dp),
expanded = expanded, expanded = expanded,
onExpandedChange = { expanded = it }, onExpandedChange = { expanded = it },
text = { Text(text = curentItem) } text = { Text(text = curentItem) }
@@ -169,20 +171,25 @@ private fun ThemeColorsView(themeColor: MutableState<Colors>) {
themeColor.value = choosedColor themeColor.value = choosedColor
Row { Row {
DropdownList( DropdownList(
modifier = Modifier.width(150.dp), modifier = Modifier.width(170.dp),
expanded = showChooser, expanded = showChooser,
onExpandedChange = { showChooser = it }, onExpandedChange = { showChooser = it },
text = { Text(text = choosedColorName) } text = { Text(text = choosedColorName) }
) { ) {
ThemeColors.forEach { (name, color) -> ThemeColors.forEachIndexed { index, (name, colors) ->
DropdownMenuItem( @Composable
onClick = { fun createItem(name: String, colors: Colors) =
showChooser = false DropdownMenuItem(
choosedColorName = name onClick = {
choosedColor = color showChooser = false
}, choosedColorName = name
actived = choosedColorName == name choosedColor = colors
) { Text(text = name) } },
actived = choosedColorName == name
) { Text(text = name) }
if (isAndroidPlatform && index == 3)
DynamicColors.forEach { (name, colors) -> createItem(name, colors) }
else createItem(name, colors)
} }
} }
Spacer(modifier = Modifier.padding(5.dp)) Spacer(modifier = Modifier.padding(5.dp))
@@ -193,6 +200,15 @@ private fun ThemeColorsView(themeColor: MutableState<Colors>) {
} }
} }
private val DynamicColors
@Composable
@ReadOnlyComposable
get() = listOf(
"Dynamic" to dynamicColors(),
"Dynamic (Dark)" to dynamicColors(darkMode = true),
"Dynamic (Black)" to dynamicColors(darkMode = true, blackDarkMode = true)
)
private val ThemeColors = listOf( private val ThemeColors = listOf(
"Default" to defaultColors(), "Default" to defaultColors(),
"Default (Dark)" to defaultColors(darkMode = true), "Default (Dark)" to defaultColors(darkMode = true),
@@ -218,4 +234,6 @@ private val ThemeColors = listOf(
"Blue" to blueColors(), "Blue" to blueColors(),
"Blue (Dark)" to blueColors(darkMode = true), "Blue (Dark)" to blueColors(darkMode = true),
"Blue (Black)" to blueColors(darkMode = true, blackDarkMode = true) "Blue (Black)" to blueColors(darkMode = true, blackDarkMode = true)
) )
expect val isAndroidPlatform: Boolean

View File

@@ -19,8 +19,9 @@
* *
* This file is created by fankes on 2023/11/5. * This file is created by fankes on 2023/11/5.
*/ */
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
@Composable @Composable
fun MainView() = App() fun MainView() = App()
actual val isAndroidPlatform = false

View File

@@ -27,4 +27,6 @@ import androidx.compose.ui.window.ComposeUIViewController
fun createUIViewController() = ComposeUIViewController { MainView() } fun createUIViewController() = ComposeUIViewController { MainView() }
@Composable @Composable
fun MainView() = App() fun MainView() = App()
actual val isAndroidPlatform = false