Fix menus

LouisWoong · Jan 27, 2021 · bc672e9 · bc672e9
1 parent 89159c1
commit bc672e9
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 51 deletions.
diff --git a/multiplatform-compose/src/iosX64Main/kotlin/com/rouge41/kmm/compose/ios/HostingController.kt b/multiplatform-compose/src/iosX64Main/kotlin/com/rouge41/kmm/compose/ios/HostingController.kt
@@ -16,7 +16,7 @@ import platform.CoreGraphics.CGSizeMake
 import platform.UIKit.*
 import kotlin.math.max
 
-val DEBUG_COMPOSE = true
+val DEBUG_COMPOSE = false
 
 open class HostingController(val controller: UIViewController, val content: @Composable () -> Unit, val imageViewLoader: (UIImageView, String) -> Unit) {
  @ThreadLocal

diff --git a/test/src/androidMain/kotlin/com/rouge41/kmm/compose/test/DrawerNavigation.kt b/test/src/androidMain/kotlin/com/rouge41/kmm/compose/test/DrawerNavigation.kt
@@ -1,6 +1,7 @@
 package com.rouge41.kmm.compose.test
 
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.material.*
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Menu
@@ -10,8 +11,11 @@ import androidx.compose.ui.Modifier
 import androidx.navigation.compose.*
 import com.rouge41.kmm.compose.runtime.MutableState
 import com.rouge41.kmm.compose.foundation.ScrollableColumn
+import com.rouge41.kmm.compose.foundation.layout.Spacer
 import com.rouge41.kmm.compose.ui.clickable
 import com.rouge41.kmm.compose.test.demos.*
+import com.rouge41.kmm.compose.ui.preferredHeight
+import com.rouge41.kmm.compose.ui.unit.dp
 
 @Composable
 fun DrawerNavigation(state: MutableState<Boolean>, resources: Resources) {
@@ -37,20 +41,29 @@ fun DrawerNavigation(state: MutableState<Boolean>, resources: Resources) {
  )
  },
  drawerContent = {
- Menu(state) { route ->
- navController.navigate(route) {
- launchSingleTop = true
+ LazyColumn {
+ items(Demo.values().dropLast(4)) { item ->
+ ListItem(text = { Text(item.toString()) }, modifier = Modifier.clickable {
+ navController.navigate(item.toString()) {
+ launchSingleTop = true
+ }
+ scaffoldState.drawerState.close()
+ })
+ Divider()
+ }
+ item {
+ ListItem(
+ text = { Text("Raw mode") },
+ modifier = Modifier.clickable(
+ onClick = {
+ state.value = false
+ }
+ )
+ )
+ Spacer(modifier = Modifier.preferredHeight(60.dp))
  }
- scaffoldState.drawerState.close()
  }
- ListItem(
- text = { Text("Raw mode") },
- modifier = Modifier.clickable(
- onClick = {
- state.value = false
- }
- )
- )
+
  },
  scaffoldState = scaffoldState
  ) {

diff --git a/test/src/commonMain/kotlin/com/rouge41/kmm/compose/test/Menu.kt b/test/src/commonMain/kotlin/com/rouge41/kmm/compose/test/Menu.kt
diff --git a/test/src/commonMain/kotlin/com/rouge41/kmm/compose/test/demos/TextFields.kt b/test/src/commonMain/kotlin/com/rouge41/kmm/compose/test/demos/TextFields.kt
@@ -2,24 +2,22 @@ package com.rouge41.kmm.compose.test.demos
 
 import com.rouge41.kmm.compose.*
 import com.rouge41.kmm.compose.foundation.layout.Column
+import com.rouge41.kmm.compose.foundation.layout.Spacer
 import com.rouge41.kmm.compose.material.Text
 import com.rouge41.kmm.compose.material.TextField
 import com.rouge41.kmm.compose.runtime.Composable
 import com.rouge41.kmm.compose.runtime.mutableStateOf
 import com.rouge41.kmm.compose.runtime.*
-import com.rouge41.kmm.compose.ui.Modifier
-import com.rouge41.kmm.compose.ui.background
-import com.rouge41.kmm.compose.ui.fillMaxWidth
+import com.rouge41.kmm.compose.ui.*
 import com.rouge41.kmm.compose.ui.graphics.Color
-import com.rouge41.kmm.compose.ui.padding
 import com.rouge41.kmm.compose.ui.unit.dp
 
 //FROM https://raw.githubusercontent.com/vinaygaba/Learn-Jetpack-Compose-By-Example/master/app/src/main/java/com/example/jetpackcompose/text/TextFieldActivity.kt
 
 @Composable
 fun TextFields() {
- Column(modifier = Modifier.fillMaxWidth()) {
- TitleComponent("This is a filled TextInput field based on Material Design")
+ Column(modifier = Modifier.fillMaxWidth().padding(16.dp)) {
+ Text("This is a filled TextInput field based on Material Design")
  MaterialTextInputComponent()
  }
 }
@@ -29,12 +27,12 @@ fun TextFields() {
 fun MaterialTextInputComponent() {
  var textValue by remember { mutableStateOf("") }
 
- Text("Text is ${textValue}", modifier = Modifier.padding(16.dp))
+ Text("Text is ${textValue}", modifier = Modifier)
+ Spacer(modifier = Modifier.preferredHeight(10.dp))
  TextField(
  value = textValue,
  onValueChange = { textValue = it },
  label = { Text("Enter Your Name") },
- placeholder = { Text(text = "John Doe") },
- modifier = Modifier.background(Color.LightGray).padding(16.dp).fillMaxWidth()
+ placeholder = { Text(text = "John Doe") }
  )
 }
diff --git a/test/src/iosX64Main/kotlin/com/rouge41/kmm/compose/test/Navigation.kt b/test/src/iosX64Main/kotlin/com/rouge41/kmm/compose/test/Navigation.kt
@@ -3,8 +3,10 @@ package com.rouge41.kmm.compose.test
 import com.rouge41.kmm.compose.navigation.*
 import com.rouge41.kmm.compose.foundation.ScrollableColumn
 import com.rouge41.kmm.compose.foundation.layout.Column
+import com.rouge41.kmm.compose.foundation.lazy.LazyColumn
 import com.rouge41.kmm.compose.ios.SafeArea
 import com.rouge41.kmm.compose.material.Button
+import com.rouge41.kmm.compose.material.Divider
 import com.rouge41.kmm.compose.material.ListItem
 import com.rouge41.kmm.compose.material.Text
 import com.rouge41.kmm.compose.runtime.Composable
@@ -27,17 +29,19 @@ actual fun Navigation(state: MutableState<Boolean>, resources: Resources) {
  }) { Text ("Trailing") }
  }) {
  SafeArea {
- Menu(state) { route ->
- navController.navigate(route)
+ LazyColumn {
+ items(Demo.values().dropLast(4)) { item ->
+ Text(
+ item.toString(),
+ modifier = Modifier.clickable { navController.navigate(item.toString()) })
+ Divider()
+ }
+ item {
+ Text(
+ "Raw mode",
+ modifier = Modifier.clickable { state.value = false })
+ }
  }
- ListItem(
- text = { Text("Raw mode") },
- modifier = Modifier.clickable(
- onClick = {
- state.value = false
- }
- )
- )
  }
  }
  Demo.values().dropLast(4).forEach { screen ->