Merge pull request #4 from syxc/dev

Dev
syxc · Apr 27, 2024 · 4cb7f5b · 4cb7f5b
2 parents ac27e75 + fbeae15
commit 4cb7f5b
Show file tree

Hide file tree

Showing 10 changed files with 5 additions and 5 deletions.
diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts
@@ -83,7 +83,7 @@ android {
 
 dependencies {
   implementation(projects.shared)
-  implementation(projects.composeApp)
+  implementation(projects.sharedCompose)
   implementation(libs.compose.ui)
   implementation(libs.compose.ui.tooling.preview)
   implementation(libs.compose.material3)

diff --git a/androidApp/src/main/AndroidManifest.xml b/androidApp/src/main/AndroidManifest.xml
@@ -16,7 +16,7 @@
     tools:targetApi="s">
     <activity
       android:name=".MainActivity"
-      android:configChanges="orientation|screenSize|screenLayout|keyboardHidden|mnc|colorMode|density|fontScale|fontWeightAdjustment|keyboard|layoutDirection|locale|mcc|navigation|smallestScreenSize|touchscreen|uiMode"
+      android:configChanges="orientation"
       android:exported="true">
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -33,7 +33,7 @@ dependencyResolutionManagement {
 rootProject.name = "kmp-app"
 
 include(":androidApp")
-include(":composeApp")
+include(":shared-compose")
 include(":shared")
 
 /* Encountering the “Unable to make progress running work” Error in Gradle? */

diff --git a/composeApp/build.gradle.kts → shared-compose/build.gradle.kts b/composeApp/build.gradle.kts → shared-compose/build.gradle.kts
diff --git a/...seApp/src/androidMain/AndroidManifest.xml → ...mpose/src/androidMain/AndroidManifest.xml b/...seApp/src/androidMain/AndroidManifest.xml → ...mpose/src/androidMain/AndroidManifest.xml
diff --git a/...pp/src/androidMain/res/values/strings.xml → ...se/src/androidMain/res/values/strings.xml b/...pp/src/androidMain/res/values/strings.xml → ...se/src/androidMain/res/values/strings.xml
diff --git a/...ources/drawable/compose-multiplatform.xml → ...ources/drawable/compose-multiplatform.xml b/...ources/drawable/compose-multiplatform.xml → ...ources/drawable/compose-multiplatform.xml
diff --git a/composeApp/src/commonMain/kotlin/App.kt → shared-compose/src/commonMain/kotlin/App.kt b/composeApp/src/commonMain/kotlin/App.kt → shared-compose/src/commonMain/kotlin/App.kt
@@ -12,8 +12,8 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import kmp_app.composeapp.generated.resources.Res
-import kmp_app.composeapp.generated.resources.compose_multiplatform
+import kmp_app.shared_compose.generated.resources.Res
+import kmp_app.shared_compose.generated.resources.compose_multiplatform
 import org.jetbrains.compose.resources.ExperimentalResourceApi
 import org.jetbrains.compose.resources.painterResource
 import org.jetbrains.compose.ui.tooling.preview.Preview

diff --git a/composeApp/src/wasmJsMain/kotlin/main.kt → shared-compose/src/wasmJsMain/kotlin/main.kt b/composeApp/src/wasmJsMain/kotlin/main.kt → shared-compose/src/wasmJsMain/kotlin/main.kt
diff --git a/...seApp/src/wasmJsMain/resources/index.html → ...mpose/src/wasmJsMain/resources/index.html b/...seApp/src/wasmJsMain/resources/index.html → ...mpose/src/wasmJsMain/resources/index.html