icerockdev#530 update sample

ExNDY · Aug 2, 2023 · 9fcfb79 · 9fcfb79
1 parent c98137b
commit 9fcfb79
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 7 deletions.
diff --git a/samples/compose-resources-gallery/gradle.properties b/samples/compose-resources-gallery/gradle.properties
@@ -14,6 +14,6 @@ kotlin.mpp.androidSourceSetLayoutVersion=2
 kotlin.mpp.androidGradlePluginCompatibility.nowarn=true
 # Enable kotlin/native experimental memory model
 kotlin.native.binary.memoryModel=experimental
-kotlin.version=1.8.21
+kotlin.version=1.9.0
 agp.version=8.0.1
 compose.version=1.4.3
diff --git a/samples/compose-resources-gallery/macosApp/src/commonMain/kotlin/Main.macos.kt b/samples/compose-resources-gallery/macosApp/src/commonMain/kotlin/Main.macos.kt
@@ -1,13 +1,15 @@
 import androidx.compose.ui.window.Window
 import com.icerockdev.library.MR
 import dev.icerock.moko.resources.desc.desc
+import kotlinx.cinterop.ExperimentalForeignApi
 import kotlinx.cinterop.staticCFunction
 import platform.AppKit.NSApplication
 import platform.AppKit.NSApplicationActivationPolicy
 import platform.AppKit.NSApplicationDelegateProtocol
 import platform.darwin.NSObject
 import platform.objc.objc_setUncaughtExceptionHandler
 
+@OptIn(ExperimentalForeignApi::class)
 @Suppress("UNUSED_PARAMETER")
 fun main(args: Array<String>) {
  setUnhandledExceptionHook {

diff --git a/samples/compose-resources-gallery/shared/build.gradle.kts b/samples/compose-resources-gallery/shared/build.gradle.kts
@@ -51,9 +51,9 @@ kotlin {
  }
  val androidMain by getting {
  dependencies {
- api("androidx.activity:activity-compose:1.7.1")
+ api("androidx.activity:activity-compose:1.7.2")
  api("androidx.appcompat:appcompat:1.6.1")
- api("androidx.core:core-ktx:1.10.0")
+ api("androidx.core:core-ktx:1.10.1")
  }
  }
  val iosMain by getting
@@ -85,7 +85,6 @@ kotlin {
 android {
  compileSdk = 33
  sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
- sourceSets["main"].res.srcDirs("src/androidMain/res")
 
  defaultConfig {
  minSdk = 26

diff --git a/samples/compose-resources-gallery/shared/src/commonMain/kotlin/App.kt b/samples/compose-resources-gallery/shared/src/commonMain/kotlin/App.kt
@@ -1,9 +1,23 @@
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.isSystemInDarkTheme
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.*
-import androidx.compose.runtime.*
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material.Button
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.OutlinedTextField
+import androidx.compose.material.Text
+import androidx.compose.material.TextFieldDefaults
+import androidx.compose.material.darkColors
+import androidx.compose.material.lightColors
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.ColorFilter