diff --git a/examples/notepad/build.gradle.kts b/examples/notepad/build.gradle.kts index 41fcc4d4d6..e9fdef80e1 100644 --- a/examples/notepad/build.gradle.kts +++ b/examples/notepad/build.gradle.kts @@ -3,9 +3,9 @@ import org.jetbrains.compose.desktop.application.dsl.TargetFormat plugins { // __KOTLIN_COMPOSE_VERSION__ - kotlin("jvm") version "1.5.21" + kotlin("jvm") version "1.5.31" // __LATEST_COMPOSE_RELEASE_VERSION__ - id("org.jetbrains.compose") version ("1.0.0-alpha1") + id("org.jetbrains.compose") version ("1.0.0-alpha4-build411") } repositories { diff --git a/examples/notepad/src/main/kotlin/NotepadApplication.kt b/examples/notepad/src/main/kotlin/NotepadApplication.kt index 270e036609..51eb402a15 100644 --- a/examples/notepad/src/main/kotlin/NotepadApplication.kt +++ b/examples/notepad/src/main/kotlin/NotepadApplication.kt @@ -2,6 +2,7 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.key import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.ui.ExperimentalComposeUiApi +import androidx.compose.ui.window.ApplicationScope import androidx.compose.ui.window.MenuScope import androidx.compose.ui.window.Tray import common.LocalAppResources @@ -9,7 +10,7 @@ import kotlinx.coroutines.launch import window.NotepadWindow @Composable -fun NotepadApplication(state: NotepadApplicationState) { +fun ApplicationScope.NotepadApplication(state: NotepadApplicationState) { if (state.settings.isTrayEnabled && state.windows.isNotEmpty()) { ApplicationTray(state) } @@ -23,11 +24,11 @@ fun NotepadApplication(state: NotepadApplicationState) { @OptIn(ExperimentalComposeUiApi::class) @Composable -private fun ApplicationTray(state: NotepadApplicationState) { +private fun ApplicationScope.ApplicationTray(state: NotepadApplicationState) { Tray( LocalAppResources.current.icon, state = state.tray, - hint = "Notepad", + tooltip = "Notepad", menu = { ApplicationMenu(state) } ) } diff --git a/examples/todoapp-lite/build.gradle.kts b/examples/todoapp-lite/build.gradle.kts index 72f7546fef..5991a85841 100755 --- a/examples/todoapp-lite/build.gradle.kts +++ b/examples/todoapp-lite/build.gradle.kts @@ -7,9 +7,9 @@ buildscript { dependencies { // __LATEST_COMPOSE_RELEASE_VERSION__ - classpath("org.jetbrains.compose:compose-gradle-plugin:1.0.0-alpha4-build331") + classpath("org.jetbrains.compose:compose-gradle-plugin:1.0.0-alpha4-build411") classpath("com.android.tools.build:gradle:4.1.0") - classpath(kotlin("gradle-plugin", version = "1.5.30")) + classpath(kotlin("gradle-plugin", version = "1.5.31")) } } diff --git a/examples/todoapp-lite/common/src/commonMain/kotlin/example/todoapp/lite/common/EditDialog.kt b/examples/todoapp-lite/common/src/commonMain/kotlin/example/todoapp/lite/common/EditDialog.kt index 308b83588c..89eb56caea 100644 --- a/examples/todoapp-lite/common/src/commonMain/kotlin/example/todoapp/lite/common/EditDialog.kt +++ b/examples/todoapp-lite/common/src/commonMain/kotlin/example/todoapp/lite/common/EditDialog.kt @@ -1,18 +1,14 @@ package example.todoapp.lite.common -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.Spacer -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.height -import androidx.compose.foundation.layout.sizeIn -import androidx.compose.foundation.layout.width +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.* import androidx.compose.material.Checkbox import androidx.compose.material.Text import androidx.compose.material.TextField import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp @Composable @@ -37,9 +33,7 @@ internal fun EditDialog( Spacer(modifier = Modifier.height(8.dp)) Row { - Text(text = "Completed") - - Spacer(modifier = Modifier.width(8.dp)) + Text(text = "Completed", Modifier.padding(15.dp)) Checkbox( checked = item.isDone,