From 29fb5bcb42ff3dc104df120a6315410553070fe0 Mon Sep 17 00:00:00 2001 From: "dima.avdeev" Date: Sun, 20 Aug 2023 16:39:55 +0400 Subject: [PATCH 1/5] Preview works on Android --- androidApp/build.gradle.kts | 47 +++++++++++++----- .../{androidMain => main}/AndroidManifest.xml | 0 .../kotlin/com/myapplication/MainActivity.kt | 10 +++- .../drawable-v24/ic_launcher_foreground.xml | 0 .../res/drawable/ic_launcher_background.xml | 0 .../res/mipmap-anydpi-v26/ic_launcher.xml | 0 .../mipmap-anydpi-v26/ic_launcher_round.xml | 0 .../res/mipmap-hdpi/ic_launcher.png | Bin .../res/mipmap-hdpi/ic_launcher_round.png | Bin .../res/mipmap-mdpi/ic_launcher.png | Bin .../res/mipmap-mdpi/ic_launcher_round.png | Bin .../res/mipmap-xhdpi/ic_launcher.png | Bin .../res/mipmap-xhdpi/ic_launcher_round.png | Bin .../res/mipmap-xxhdpi/ic_launcher.png | Bin .../res/mipmap-xxhdpi/ic_launcher_round.png | Bin .../res/mipmap-xxxhdpi/ic_launcher.png | Bin .../res/mipmap-xxxhdpi/ic_launcher_round.png | Bin .../res/values/strings.xml | 0 18 files changed, 43 insertions(+), 14 deletions(-) rename androidApp/src/{androidMain => main}/AndroidManifest.xml (100%) rename androidApp/src/{androidMain => main}/kotlin/com/myapplication/MainActivity.kt (66%) rename androidApp/src/{androidMain => main}/res/drawable-v24/ic_launcher_foreground.xml (100%) rename androidApp/src/{androidMain => main}/res/drawable/ic_launcher_background.xml (100%) rename androidApp/src/{androidMain => main}/res/mipmap-anydpi-v26/ic_launcher.xml (100%) rename androidApp/src/{androidMain => main}/res/mipmap-anydpi-v26/ic_launcher_round.xml (100%) rename androidApp/src/{androidMain => main}/res/mipmap-hdpi/ic_launcher.png (100%) rename androidApp/src/{androidMain => main}/res/mipmap-hdpi/ic_launcher_round.png (100%) rename androidApp/src/{androidMain => main}/res/mipmap-mdpi/ic_launcher.png (100%) rename androidApp/src/{androidMain => main}/res/mipmap-mdpi/ic_launcher_round.png (100%) rename androidApp/src/{androidMain => main}/res/mipmap-xhdpi/ic_launcher.png (100%) rename androidApp/src/{androidMain => main}/res/mipmap-xhdpi/ic_launcher_round.png (100%) rename androidApp/src/{androidMain => main}/res/mipmap-xxhdpi/ic_launcher.png (100%) rename androidApp/src/{androidMain => main}/res/mipmap-xxhdpi/ic_launcher_round.png (100%) rename androidApp/src/{androidMain => main}/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename androidApp/src/{androidMain => main}/res/mipmap-xxxhdpi/ic_launcher_round.png (100%) rename androidApp/src/{androidMain => main}/res/values/strings.xml (100%) diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts index 5c1da2f..2480072 100644 --- a/androidApp/build.gradle.kts +++ b/androidApp/build.gradle.kts @@ -1,25 +1,32 @@ plugins { - kotlin("multiplatform") +// kotlin("multiplatform") id("com.android.application") - id("org.jetbrains.compose") +// id("org.jetbrains.compose") + id("org.jetbrains.kotlin.android") } -kotlin { - androidTarget() - sourceSets { - val androidMain by getting { - dependencies { - implementation(project(":shared")) - } - } - } -} +//kotlin { +// androidTarget() +// sourceSets { +// val androidMain by getting { +// dependencies { +// implementation(project(":shared")) +// } +// } +// } +//} android { + buildFeatures { + compose = true + } + composeOptions { + kotlinCompilerExtensionVersion = "1.5.1" + } compileSdk = (findProperty("android.compileSdk") as String).toInt() namespace = "com.myapplication" - sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml") + sourceSets["main"].manifest.srcFile("src/main/AndroidManifest.xml") defaultConfig { applicationId = "com.myapplication.MyApplication" @@ -36,3 +43,17 @@ android { jvmToolchain(11) } } + +dependencies { + implementation(platform("androidx.compose:compose-bom:2023.03.00")) + + implementation(project(":shared")) + implementation("androidx.appcompat:appcompat:1.6.1") + implementation("androidx.activity:activity-compose:1.7.2") + implementation("androidx.compose.ui:ui") + implementation("androidx.compose.ui:ui-graphics") + implementation("androidx.compose.ui:ui-tooling-preview") + implementation("androidx.compose.material3:material3") + debugImplementation("androidx.compose.ui:ui-tooling") + debugImplementation("androidx.compose.ui:ui-test-manifest") +} diff --git a/androidApp/src/androidMain/AndroidManifest.xml b/androidApp/src/main/AndroidManifest.xml similarity index 100% rename from androidApp/src/androidMain/AndroidManifest.xml rename to androidApp/src/main/AndroidManifest.xml diff --git a/androidApp/src/androidMain/kotlin/com/myapplication/MainActivity.kt b/androidApp/src/main/kotlin/com/myapplication/MainActivity.kt similarity index 66% rename from androidApp/src/androidMain/kotlin/com/myapplication/MainActivity.kt rename to androidApp/src/main/kotlin/com/myapplication/MainActivity.kt index fd6e831..71d53c5 100644 --- a/androidApp/src/androidMain/kotlin/com/myapplication/MainActivity.kt +++ b/androidApp/src/main/kotlin/com/myapplication/MainActivity.kt @@ -4,6 +4,8 @@ import MainView import android.os.Bundle import androidx.activity.compose.setContent import androidx.appcompat.app.AppCompatActivity +import androidx.compose.runtime.Composable +import androidx.compose.ui.tooling.preview.Preview class MainActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { @@ -13,4 +15,10 @@ class MainActivity : AppCompatActivity() { MainView() } } -} \ No newline at end of file +} + +@Preview(showBackground = true) +@Composable +fun GreetingPreview() { + MainView() +} diff --git a/androidApp/src/androidMain/res/drawable-v24/ic_launcher_foreground.xml b/androidApp/src/main/res/drawable-v24/ic_launcher_foreground.xml similarity index 100% rename from androidApp/src/androidMain/res/drawable-v24/ic_launcher_foreground.xml rename to androidApp/src/main/res/drawable-v24/ic_launcher_foreground.xml diff --git a/androidApp/src/androidMain/res/drawable/ic_launcher_background.xml b/androidApp/src/main/res/drawable/ic_launcher_background.xml similarity index 100% rename from androidApp/src/androidMain/res/drawable/ic_launcher_background.xml rename to androidApp/src/main/res/drawable/ic_launcher_background.xml diff --git a/androidApp/src/androidMain/res/mipmap-anydpi-v26/ic_launcher.xml b/androidApp/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from androidApp/src/androidMain/res/mipmap-anydpi-v26/ic_launcher.xml rename to androidApp/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/androidApp/src/androidMain/res/mipmap-anydpi-v26/ic_launcher_round.xml b/androidApp/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from androidApp/src/androidMain/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to androidApp/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/androidApp/src/androidMain/res/mipmap-hdpi/ic_launcher.png b/androidApp/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from androidApp/src/androidMain/res/mipmap-hdpi/ic_launcher.png rename to androidApp/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/androidApp/src/androidMain/res/mipmap-hdpi/ic_launcher_round.png b/androidApp/src/main/res/mipmap-hdpi/ic_launcher_round.png similarity index 100% rename from androidApp/src/androidMain/res/mipmap-hdpi/ic_launcher_round.png rename to androidApp/src/main/res/mipmap-hdpi/ic_launcher_round.png diff --git a/androidApp/src/androidMain/res/mipmap-mdpi/ic_launcher.png b/androidApp/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from androidApp/src/androidMain/res/mipmap-mdpi/ic_launcher.png rename to androidApp/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/androidApp/src/androidMain/res/mipmap-mdpi/ic_launcher_round.png b/androidApp/src/main/res/mipmap-mdpi/ic_launcher_round.png similarity index 100% rename from androidApp/src/androidMain/res/mipmap-mdpi/ic_launcher_round.png rename to androidApp/src/main/res/mipmap-mdpi/ic_launcher_round.png diff --git a/androidApp/src/androidMain/res/mipmap-xhdpi/ic_launcher.png b/androidApp/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from androidApp/src/androidMain/res/mipmap-xhdpi/ic_launcher.png rename to androidApp/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/androidApp/src/androidMain/res/mipmap-xhdpi/ic_launcher_round.png b/androidApp/src/main/res/mipmap-xhdpi/ic_launcher_round.png similarity index 100% rename from androidApp/src/androidMain/res/mipmap-xhdpi/ic_launcher_round.png rename to androidApp/src/main/res/mipmap-xhdpi/ic_launcher_round.png diff --git a/androidApp/src/androidMain/res/mipmap-xxhdpi/ic_launcher.png b/androidApp/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from androidApp/src/androidMain/res/mipmap-xxhdpi/ic_launcher.png rename to androidApp/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/androidApp/src/androidMain/res/mipmap-xxhdpi/ic_launcher_round.png b/androidApp/src/main/res/mipmap-xxhdpi/ic_launcher_round.png similarity index 100% rename from androidApp/src/androidMain/res/mipmap-xxhdpi/ic_launcher_round.png rename to androidApp/src/main/res/mipmap-xxhdpi/ic_launcher_round.png diff --git a/androidApp/src/androidMain/res/mipmap-xxxhdpi/ic_launcher.png b/androidApp/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from androidApp/src/androidMain/res/mipmap-xxxhdpi/ic_launcher.png rename to androidApp/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/androidApp/src/androidMain/res/mipmap-xxxhdpi/ic_launcher_round.png b/androidApp/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png similarity index 100% rename from androidApp/src/androidMain/res/mipmap-xxxhdpi/ic_launcher_round.png rename to androidApp/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png diff --git a/androidApp/src/androidMain/res/values/strings.xml b/androidApp/src/main/res/values/strings.xml similarity index 100% rename from androidApp/src/androidMain/res/values/strings.xml rename to androidApp/src/main/res/values/strings.xml From 5fb2ed5fb53ab5a4ffeeed4505e5956b5b3e76fe Mon Sep 17 00:00:00 2001 From: "dima.avdeev" Date: Mon, 21 Aug 2023 08:25:40 +0400 Subject: [PATCH 2/5] Shared Preview on Android --- shared/build.gradle.kts | 9 +++++++++ shared/src/androidMain/kotlin/main.android.kt | 8 ++++++++ 2 files changed, 17 insertions(+) diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts index f9c222d..c56ea6e 100644 --- a/shared/build.gradle.kts +++ b/shared/build.gradle.kts @@ -42,6 +42,8 @@ kotlin { api("androidx.activity:activity-compose:1.6.1") api("androidx.appcompat:appcompat:1.6.1") api("androidx.core:core-ktx:1.9.0") + api(compose.preview) + api(compose.uiTooling) } } val iosX64Main by getting @@ -62,6 +64,13 @@ kotlin { } android { + buildFeatures { + compose = true + } + composeOptions { + kotlinCompilerExtensionVersion = "1.5.1" + } + compileSdk = (findProperty("android.compileSdk") as String).toInt() namespace = "com.myapplication.common" diff --git a/shared/src/androidMain/kotlin/main.android.kt b/shared/src/androidMain/kotlin/main.android.kt index d5723a2..e3794fa 100644 --- a/shared/src/androidMain/kotlin/main.android.kt +++ b/shared/src/androidMain/kotlin/main.android.kt @@ -1,5 +1,13 @@ +import androidx.compose.material.Text import androidx.compose.runtime.Composable +import androidx.compose.ui.tooling.preview.Preview actual fun getPlatformName(): String = "Android" @Composable fun MainView() = App() + +@Preview +@Composable +fun SharedPreview() { + Text("Hello shared Preview on Android") +} From d33ebfcba882138347fdfa838276f709331fadd6 Mon Sep 17 00:00:00 2001 From: "dima.avdeev" Date: Mon, 21 Aug 2023 08:57:28 +0400 Subject: [PATCH 3/5] Preview function --- shared/src/androidMain/kotlin/main.android.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shared/src/androidMain/kotlin/main.android.kt b/shared/src/androidMain/kotlin/main.android.kt index e3794fa..99aec6a 100644 --- a/shared/src/androidMain/kotlin/main.android.kt +++ b/shared/src/androidMain/kotlin/main.android.kt @@ -8,6 +8,6 @@ actual fun getPlatformName(): String = "Android" @Preview @Composable -fun SharedPreview() { - Text("Hello shared Preview on Android") +fun MainPreview() { + MainView() } From 46f03c632b3a588315df519c9d92fbabcbb9a4c5 Mon Sep 17 00:00:00 2001 From: "dima.avdeev" Date: Mon, 21 Aug 2023 08:57:42 +0400 Subject: [PATCH 4/5] Revert "Preview works on Android" This reverts commit 29fb5bcb42ff3dc104df120a6315410553070fe0. --- androidApp/build.gradle.kts | 47 +++++------------- .../{main => androidMain}/AndroidManifest.xml | 0 .../kotlin/com/myapplication/MainActivity.kt | 10 +--- .../drawable-v24/ic_launcher_foreground.xml | 0 .../res/drawable/ic_launcher_background.xml | 0 .../res/mipmap-anydpi-v26/ic_launcher.xml | 0 .../mipmap-anydpi-v26/ic_launcher_round.xml | 0 .../res/mipmap-hdpi/ic_launcher.png | Bin .../res/mipmap-hdpi/ic_launcher_round.png | Bin .../res/mipmap-mdpi/ic_launcher.png | Bin .../res/mipmap-mdpi/ic_launcher_round.png | Bin .../res/mipmap-xhdpi/ic_launcher.png | Bin .../res/mipmap-xhdpi/ic_launcher_round.png | Bin .../res/mipmap-xxhdpi/ic_launcher.png | Bin .../res/mipmap-xxhdpi/ic_launcher_round.png | Bin .../res/mipmap-xxxhdpi/ic_launcher.png | Bin .../res/mipmap-xxxhdpi/ic_launcher_round.png | Bin .../res/values/strings.xml | 0 18 files changed, 14 insertions(+), 43 deletions(-) rename androidApp/src/{main => androidMain}/AndroidManifest.xml (100%) rename androidApp/src/{main => androidMain}/kotlin/com/myapplication/MainActivity.kt (66%) rename androidApp/src/{main => androidMain}/res/drawable-v24/ic_launcher_foreground.xml (100%) rename androidApp/src/{main => androidMain}/res/drawable/ic_launcher_background.xml (100%) rename androidApp/src/{main => androidMain}/res/mipmap-anydpi-v26/ic_launcher.xml (100%) rename androidApp/src/{main => androidMain}/res/mipmap-anydpi-v26/ic_launcher_round.xml (100%) rename androidApp/src/{main => androidMain}/res/mipmap-hdpi/ic_launcher.png (100%) rename androidApp/src/{main => androidMain}/res/mipmap-hdpi/ic_launcher_round.png (100%) rename androidApp/src/{main => androidMain}/res/mipmap-mdpi/ic_launcher.png (100%) rename androidApp/src/{main => androidMain}/res/mipmap-mdpi/ic_launcher_round.png (100%) rename androidApp/src/{main => androidMain}/res/mipmap-xhdpi/ic_launcher.png (100%) rename androidApp/src/{main => androidMain}/res/mipmap-xhdpi/ic_launcher_round.png (100%) rename androidApp/src/{main => androidMain}/res/mipmap-xxhdpi/ic_launcher.png (100%) rename androidApp/src/{main => androidMain}/res/mipmap-xxhdpi/ic_launcher_round.png (100%) rename androidApp/src/{main => androidMain}/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename androidApp/src/{main => androidMain}/res/mipmap-xxxhdpi/ic_launcher_round.png (100%) rename androidApp/src/{main => androidMain}/res/values/strings.xml (100%) diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts index 2480072..5c1da2f 100644 --- a/androidApp/build.gradle.kts +++ b/androidApp/build.gradle.kts @@ -1,32 +1,25 @@ plugins { -// kotlin("multiplatform") + kotlin("multiplatform") id("com.android.application") -// id("org.jetbrains.compose") - id("org.jetbrains.kotlin.android") + id("org.jetbrains.compose") } -//kotlin { -// androidTarget() -// sourceSets { -// val androidMain by getting { -// dependencies { -// implementation(project(":shared")) -// } -// } -// } -//} +kotlin { + androidTarget() + sourceSets { + val androidMain by getting { + dependencies { + implementation(project(":shared")) + } + } + } +} android { - buildFeatures { - compose = true - } - composeOptions { - kotlinCompilerExtensionVersion = "1.5.1" - } compileSdk = (findProperty("android.compileSdk") as String).toInt() namespace = "com.myapplication" - sourceSets["main"].manifest.srcFile("src/main/AndroidManifest.xml") + sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml") defaultConfig { applicationId = "com.myapplication.MyApplication" @@ -43,17 +36,3 @@ android { jvmToolchain(11) } } - -dependencies { - implementation(platform("androidx.compose:compose-bom:2023.03.00")) - - implementation(project(":shared")) - implementation("androidx.appcompat:appcompat:1.6.1") - implementation("androidx.activity:activity-compose:1.7.2") - implementation("androidx.compose.ui:ui") - implementation("androidx.compose.ui:ui-graphics") - implementation("androidx.compose.ui:ui-tooling-preview") - implementation("androidx.compose.material3:material3") - debugImplementation("androidx.compose.ui:ui-tooling") - debugImplementation("androidx.compose.ui:ui-test-manifest") -} diff --git a/androidApp/src/main/AndroidManifest.xml b/androidApp/src/androidMain/AndroidManifest.xml similarity index 100% rename from androidApp/src/main/AndroidManifest.xml rename to androidApp/src/androidMain/AndroidManifest.xml diff --git a/androidApp/src/main/kotlin/com/myapplication/MainActivity.kt b/androidApp/src/androidMain/kotlin/com/myapplication/MainActivity.kt similarity index 66% rename from androidApp/src/main/kotlin/com/myapplication/MainActivity.kt rename to androidApp/src/androidMain/kotlin/com/myapplication/MainActivity.kt index 71d53c5..fd6e831 100644 --- a/androidApp/src/main/kotlin/com/myapplication/MainActivity.kt +++ b/androidApp/src/androidMain/kotlin/com/myapplication/MainActivity.kt @@ -4,8 +4,6 @@ import MainView import android.os.Bundle import androidx.activity.compose.setContent import androidx.appcompat.app.AppCompatActivity -import androidx.compose.runtime.Composable -import androidx.compose.ui.tooling.preview.Preview class MainActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { @@ -15,10 +13,4 @@ class MainActivity : AppCompatActivity() { MainView() } } -} - -@Preview(showBackground = true) -@Composable -fun GreetingPreview() { - MainView() -} +} \ No newline at end of file diff --git a/androidApp/src/main/res/drawable-v24/ic_launcher_foreground.xml b/androidApp/src/androidMain/res/drawable-v24/ic_launcher_foreground.xml similarity index 100% rename from androidApp/src/main/res/drawable-v24/ic_launcher_foreground.xml rename to androidApp/src/androidMain/res/drawable-v24/ic_launcher_foreground.xml diff --git a/androidApp/src/main/res/drawable/ic_launcher_background.xml b/androidApp/src/androidMain/res/drawable/ic_launcher_background.xml similarity index 100% rename from androidApp/src/main/res/drawable/ic_launcher_background.xml rename to androidApp/src/androidMain/res/drawable/ic_launcher_background.xml diff --git a/androidApp/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/androidApp/src/androidMain/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from androidApp/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to androidApp/src/androidMain/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/androidApp/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/androidApp/src/androidMain/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from androidApp/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to androidApp/src/androidMain/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/androidApp/src/main/res/mipmap-hdpi/ic_launcher.png b/androidApp/src/androidMain/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from androidApp/src/main/res/mipmap-hdpi/ic_launcher.png rename to androidApp/src/androidMain/res/mipmap-hdpi/ic_launcher.png diff --git a/androidApp/src/main/res/mipmap-hdpi/ic_launcher_round.png b/androidApp/src/androidMain/res/mipmap-hdpi/ic_launcher_round.png similarity index 100% rename from androidApp/src/main/res/mipmap-hdpi/ic_launcher_round.png rename to androidApp/src/androidMain/res/mipmap-hdpi/ic_launcher_round.png diff --git a/androidApp/src/main/res/mipmap-mdpi/ic_launcher.png b/androidApp/src/androidMain/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from androidApp/src/main/res/mipmap-mdpi/ic_launcher.png rename to androidApp/src/androidMain/res/mipmap-mdpi/ic_launcher.png diff --git a/androidApp/src/main/res/mipmap-mdpi/ic_launcher_round.png b/androidApp/src/androidMain/res/mipmap-mdpi/ic_launcher_round.png similarity index 100% rename from androidApp/src/main/res/mipmap-mdpi/ic_launcher_round.png rename to androidApp/src/androidMain/res/mipmap-mdpi/ic_launcher_round.png diff --git a/androidApp/src/main/res/mipmap-xhdpi/ic_launcher.png b/androidApp/src/androidMain/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from androidApp/src/main/res/mipmap-xhdpi/ic_launcher.png rename to androidApp/src/androidMain/res/mipmap-xhdpi/ic_launcher.png diff --git a/androidApp/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/androidApp/src/androidMain/res/mipmap-xhdpi/ic_launcher_round.png similarity index 100% rename from androidApp/src/main/res/mipmap-xhdpi/ic_launcher_round.png rename to androidApp/src/androidMain/res/mipmap-xhdpi/ic_launcher_round.png diff --git a/androidApp/src/main/res/mipmap-xxhdpi/ic_launcher.png b/androidApp/src/androidMain/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from androidApp/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to androidApp/src/androidMain/res/mipmap-xxhdpi/ic_launcher.png diff --git a/androidApp/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/androidApp/src/androidMain/res/mipmap-xxhdpi/ic_launcher_round.png similarity index 100% rename from androidApp/src/main/res/mipmap-xxhdpi/ic_launcher_round.png rename to androidApp/src/androidMain/res/mipmap-xxhdpi/ic_launcher_round.png diff --git a/androidApp/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/androidApp/src/androidMain/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from androidApp/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to androidApp/src/androidMain/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/androidApp/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/androidApp/src/androidMain/res/mipmap-xxxhdpi/ic_launcher_round.png similarity index 100% rename from androidApp/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png rename to androidApp/src/androidMain/res/mipmap-xxxhdpi/ic_launcher_round.png diff --git a/androidApp/src/main/res/values/strings.xml b/androidApp/src/androidMain/res/values/strings.xml similarity index 100% rename from androidApp/src/main/res/values/strings.xml rename to androidApp/src/androidMain/res/values/strings.xml From 5bdda25abeab2a9207b32e84bb5de6bf766d148e Mon Sep 17 00:00:00 2001 From: "dima.avdeev" Date: Mon, 21 Aug 2023 08:59:22 +0400 Subject: [PATCH 5/5] private fun --- shared/src/androidMain/kotlin/main.android.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/shared/src/androidMain/kotlin/main.android.kt b/shared/src/androidMain/kotlin/main.android.kt index 99aec6a..2c8eb67 100644 --- a/shared/src/androidMain/kotlin/main.android.kt +++ b/shared/src/androidMain/kotlin/main.android.kt @@ -1,13 +1,13 @@ -import androidx.compose.material.Text import androidx.compose.runtime.Composable import androidx.compose.ui.tooling.preview.Preview actual fun getPlatformName(): String = "Android" -@Composable fun MainView() = App() +@Composable +fun MainView() = App() @Preview @Composable -fun MainPreview() { +private fun AndroidPreview() { MainView() }