From 1564fb579176a7c5a370b4571d479016f0e47d87 Mon Sep 17 00:00:00 2001 From: Arkadii Ivanov Date: Tue, 10 Aug 2021 09:14:14 +0100 Subject: [PATCH] Move TodoApp previews to compose-ui module (#1002) --- .../kotlin/example/todo/common/ui}/TodoEditPreview.kt | 7 +------ .../kotlin/example/todo/common/ui}/TodoMainPreview.kt | 7 +------ examples/todoapp/desktop/build.gradle.kts | 5 ----- 3 files changed, 2 insertions(+), 17 deletions(-) rename examples/todoapp/{desktop/src/jvmMain/kotlin/example/todo/desktop => common/compose-ui/src/desktopMain/kotlin/example/todo/common/ui}/TodoEditPreview.kt (80%) rename examples/todoapp/{desktop/src/jvmMain/kotlin/example/todo/desktop => common/compose-ui/src/desktopMain/kotlin/example/todo/common/ui}/TodoMainPreview.kt (86%) diff --git a/examples/todoapp/desktop/src/jvmMain/kotlin/example/todo/desktop/TodoEditPreview.kt b/examples/todoapp/common/compose-ui/src/desktopMain/kotlin/example/todo/common/ui/TodoEditPreview.kt similarity index 80% rename from examples/todoapp/desktop/src/jvmMain/kotlin/example/todo/desktop/TodoEditPreview.kt rename to examples/todoapp/common/compose-ui/src/desktopMain/kotlin/example/todo/common/ui/TodoEditPreview.kt index efcf63e0ae..2c917d9954 100644 --- a/examples/todoapp/desktop/src/jvmMain/kotlin/example/todo/desktop/TodoEditPreview.kt +++ b/examples/todoapp/common/compose-ui/src/desktopMain/kotlin/example/todo/common/ui/TodoEditPreview.kt @@ -1,8 +1,4 @@ -/* - * Should be in the compose-ui module, see https://github.com/JetBrains/compose-jb/issues/908 - */ - -package example.todo.desktop +package example.todo.common.ui import androidx.compose.desktop.ui.tooling.preview.Preview import androidx.compose.runtime.Composable @@ -10,7 +6,6 @@ import com.arkivanov.decompose.value.MutableValue import com.arkivanov.decompose.value.Value import example.todo.common.edit.TodoEdit import example.todo.common.edit.TodoEdit.Model -import example.todo.common.ui.TodoEditContent @Composable @Preview diff --git a/examples/todoapp/desktop/src/jvmMain/kotlin/example/todo/desktop/TodoMainPreview.kt b/examples/todoapp/common/compose-ui/src/desktopMain/kotlin/example/todo/common/ui/TodoMainPreview.kt similarity index 86% rename from examples/todoapp/desktop/src/jvmMain/kotlin/example/todo/desktop/TodoMainPreview.kt rename to examples/todoapp/common/compose-ui/src/desktopMain/kotlin/example/todo/common/ui/TodoMainPreview.kt index 89c0702cde..bff9c17b6b 100644 --- a/examples/todoapp/desktop/src/jvmMain/kotlin/example/todo/desktop/TodoMainPreview.kt +++ b/examples/todoapp/common/compose-ui/src/desktopMain/kotlin/example/todo/common/ui/TodoMainPreview.kt @@ -1,8 +1,4 @@ -/* - * Should be in the compose-ui module, see https://github.com/JetBrains/compose-jb/issues/908 - */ - -package example.todo.desktop +package example.todo.common.ui import androidx.compose.desktop.ui.tooling.preview.Preview import androidx.compose.runtime.Composable @@ -11,7 +7,6 @@ import com.arkivanov.decompose.value.Value import example.todo.common.main.TodoItem import example.todo.common.main.TodoMain import example.todo.common.main.TodoMain.Model -import example.todo.common.ui.TodoMainContent @Preview @Composable diff --git a/examples/todoapp/desktop/build.gradle.kts b/examples/todoapp/desktop/build.gradle.kts index e5172dcccc..2ff4363082 100755 --- a/examples/todoapp/desktop/build.gradle.kts +++ b/examples/todoapp/desktop/build.gradle.kts @@ -25,11 +25,6 @@ kotlin { implementation(Deps.ArkIvanov.MVIKotlin.mvikotlinMain) implementation(Deps.Badoo.Reaktive.reaktive) implementation(Deps.Badoo.Reaktive.coroutinesInterop) - - // The dependencies below are required only for previews, see https://github.com/JetBrains/compose-jb/issues/908 - implementation(compose.uiTooling) - implementation(project(":common:edit")) - implementation(project(":common:main")) } } }