diff --git a/examples/codeviewer/build.gradle.kts b/examples/codeviewer/build.gradle.kts index f4ead8617a..faf18408e3 100644 --- a/examples/codeviewer/build.gradle.kts +++ b/examples/codeviewer/build.gradle.kts @@ -9,7 +9,7 @@ buildscript { dependencies { // __LATEST_COMPOSE_RELEASE_VERSION__ - classpath("org.jetbrains.compose:compose-gradle-plugin:0.3.0-build135") + classpath("org.jetbrains.compose:compose-gradle-plugin:0.3.0-build141") classpath("com.android.tools.build:gradle:4.0.1") // __KOTLIN_COMPOSE_VERSION__ classpath(kotlin("gradle-plugin", version = "1.4.21")) diff --git a/examples/codeviewer/common/src/commonMain/kotlin/org/jetbrains/codeviewer/ui/editor/EditorEmptyView.kt b/examples/codeviewer/common/src/commonMain/kotlin/org/jetbrains/codeviewer/ui/editor/EditorEmptyView.kt index 336ffb745a..7a5694d651 100644 --- a/examples/codeviewer/common/src/commonMain/kotlin/org/jetbrains/codeviewer/ui/editor/EditorEmptyView.kt +++ b/examples/codeviewer/common/src/commonMain/kotlin/org/jetbrains/codeviewer/ui/editor/EditorEmptyView.kt @@ -19,7 +19,7 @@ import androidx.compose.ui.unit.sp fun EditorEmptyView() = Box(Modifier.fillMaxSize()) { Column(Modifier.align(Alignment.Center)) { Icon( - Icons.Default.Code.copy(defaultWidth = 48.dp, defaultHeight = 48.dp), + Icons.Default.Code, tint = AmbientContentColor.current.copy(alpha = 0.60f), modifier = Modifier.align(Alignment.CenterHorizontally) ) diff --git a/examples/codeviewer/common/src/commonMain/kotlin/org/jetbrains/codeviewer/util/Loadable.kt b/examples/codeviewer/common/src/commonMain/kotlin/org/jetbrains/codeviewer/util/Loadable.kt index 0565cbdf03..58d8945726 100644 --- a/examples/codeviewer/common/src/commonMain/kotlin/org/jetbrains/codeviewer/util/Loadable.kt +++ b/examples/codeviewer/common/src/commonMain/kotlin/org/jetbrains/codeviewer/util/Loadable.kt @@ -9,10 +9,12 @@ fun loadable(load: () -> T): MutableState { return loadableScoped { load() } } +private val loadingKey = Any() + @Composable fun loadableScoped(load: CoroutineScope.() -> T): MutableState { val state: MutableState = remember { mutableStateOf(null) } - LaunchedTask { + LaunchedEffect(loadingKey) { try { state.value = load() } catch (e: CancellationException) {