Migrate all samples to the new resources library (#4386)

JetBrains · Feb 29, 2024 · e8e7afa · e8e7afa
1 parent 5780283
commit e8e7afa
Show file tree

Hide file tree

Showing 73 changed files with 109 additions and 158 deletions.
diff --git a/examples/chat/gradle.properties b/examples/chat/gradle.properties
@@ -2,6 +2,8 @@ kotlin.code.style=official
 xcodeproj=./iosApp
 android.useAndroidX=true
 org.gradle.jvmargs=-Xmx3g
+org.gradle.configuration-cache=true
+org.gradle.caching=true
 org.jetbrains.compose.experimental.jscanvas.enabled=true
 org.jetbrains.compose.experimental.macos.enabled=true
 kotlin.native.useEmbeddableCompilerJar=true

diff --git a/examples/chat/gradle/wrapper/gradle-wrapper.properties b/examples/chat/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/examples/chat/shared/build.gradle.kts b/examples/chat/shared/build.gradle.kts
@@ -46,12 +46,16 @@ kotlin {
     }
 
     sourceSets {
+        all {
+            languageSettings {
+                optIn("org.jetbrains.compose.resources.ExperimentalResourceApi")
+            }
+        }
         val commonMain by getting {
             dependencies {
                 implementation(compose.ui)
                 implementation(compose.foundation)
                 implementation(compose.material)
-                @OptIn(org.jetbrains.compose.ExperimentalComposeLibrary::class)
                 implementation(compose.components.resources)
                 implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.5.0")
             }
@@ -97,8 +101,6 @@ android {
     compileSdk = 34
     namespace = "org.jetbrains.chat"
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
-    sourceSets["main"].res.srcDirs("src/androidMain/res")
-    sourceSets["main"].resources.srcDirs("src/commonMain/resources")
 
     defaultConfig {
         minSdk = 26

diff --git a/...d/src/commonMain/resources/background.jpg → .../composeResources/drawable/background.jpg b/...d/src/commonMain/resources/background.jpg → .../composeResources/drawable/background.jpg
diff --git a/...hared/src/commonMain/resources/stock1.jpg → ...Main/composeResources/drawable/stock1.jpg b/...hared/src/commonMain/resources/stock1.jpg → ...Main/composeResources/drawable/stock1.jpg
diff --git a/...hared/src/commonMain/resources/stock2.jpg → ...Main/composeResources/drawable/stock2.jpg b/...hared/src/commonMain/resources/stock2.jpg → ...Main/composeResources/drawable/stock2.jpg
diff --git a/...hared/src/commonMain/resources/stock3.jpg → ...Main/composeResources/drawable/stock3.jpg b/...hared/src/commonMain/resources/stock3.jpg → ...Main/composeResources/drawable/stock3.jpg
diff --git a/...hared/src/commonMain/resources/stock4.jpg → ...Main/composeResources/drawable/stock4.jpg b/...hared/src/commonMain/resources/stock4.jpg → ...Main/composeResources/drawable/stock4.jpg
diff --git a/examples/chat/shared/src/commonMain/kotlin/ChatApp.kt b/examples/chat/shared/src/commonMain/kotlin/ChatApp.kt
@@ -18,6 +18,9 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.unit.sp
+import chat_mpp.shared.generated.resources.*
+import chat_mpp.shared.generated.resources.Res
+import chat_mpp.shared.generated.resources.background
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.delay
@@ -26,9 +29,9 @@ import org.jetbrains.compose.resources.painterResource
 
 val myUser = User("Me", picture = null)
 val friends = listOf(
-    User("Alex", picture = "stock1.jpg"),
-    User("Casey", picture = "stock2.jpg"),
-    User("Sam", picture = "stock3.jpg")
+    User("Alex", picture = Res.drawable.stock1),
+    User("Casey", picture = Res.drawable.stock2),
+    User("Sam", picture = Res.drawable.stock3)
 )
 val friendMessages = listOf(
     "How's everybody doing today?",
@@ -66,7 +69,7 @@ fun ChatApp(displayTextField: Boolean = true) {
     Theme {
         Surface {
             Box(modifier = Modifier.fillMaxSize()) {
-                Image(painterResource("background.jpg"), null, contentScale = ContentScale.Crop)
+                Image(painterResource(Res.drawable.background), null, contentScale = ContentScale.Crop)
                 Column(
                     modifier = Modifier.fillMaxSize()
                 ) {

diff --git a/examples/chat/shared/src/commonMain/kotlin/Data.kt b/examples/chat/shared/src/commonMain/kotlin/Data.kt
@@ -1,5 +1,7 @@
 import androidx.compose.ui.graphics.Color
 import kotlinx.datetime.Clock
+import org.jetbrains.compose.resources.DrawableResource
+import org.jetbrains.compose.resources.ExperimentalResourceApi
 import kotlin.random.Random
 import kotlin.random.nextInt
 
@@ -23,7 +25,7 @@ data class Message(
 data class User(
     val name: String,
     val color: Color = ColorProvider.getColor(),
-    val picture: String?
+    val picture: DrawableResource?
 )
 
 object ColorProvider {

diff --git a/examples/cocoapods-ios-example/gradle.properties b/examples/cocoapods-ios-example/gradle.properties
@@ -1,5 +1,7 @@
 #Gradle
 org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M"
+org.gradle.configuration-cache=true
+org.gradle.caching=true
 
 #Kotlin
 kotlin.code.style=official

diff --git a/examples/cocoapods-ios-example/gradle/wrapper/gradle-wrapper.properties b/examples/cocoapods-ios-example/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/examples/cocoapods-ios-example/shared/build.gradle.kts b/examples/cocoapods-ios-example/shared/build.gradle.kts
@@ -32,7 +32,6 @@ kotlin {
                 implementation(compose.runtime)
                 implementation(compose.foundation)
                 implementation(compose.material)
-                @OptIn(org.jetbrains.compose.ExperimentalComposeLibrary::class)
                 implementation(compose.components.resources)
             }
         }
@@ -49,11 +48,7 @@ kotlin {
 android {
     compileSdk = (findProperty("android.compileSdk") as String).toInt()
     namespace = "com.myapplication.common"
-
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
-    sourceSets["main"].res.srcDirs("src/androidMain/res")
-    sourceSets["main"].resources.srcDirs("src/commonMain/resources")
-
     defaultConfig {
         minSdk = (findProperty("android.minSdk") as String).toInt()
     }

diff --git a/...nMain/resources/compose-multiplatform.xml → ...ources/drawable/compose-multiplatform.xml b/...nMain/resources/compose-multiplatform.xml → ...ources/drawable/compose-multiplatform.xml
diff --git a/examples/cocoapods-ios-example/shared/src/commonMain/kotlin/App.kt b/examples/cocoapods-ios-example/shared/src/commonMain/kotlin/App.kt
@@ -12,6 +12,8 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import cocoapodsiosexample.shared.generated.resources.Res
+import cocoapodsiosexample.shared.generated.resources.compose_multiplatform
 import org.jetbrains.compose.resources.ExperimentalResourceApi
 import org.jetbrains.compose.resources.painterResource
 
@@ -30,7 +32,7 @@ fun App() {
             }
             AnimatedVisibility(showImage) {
                 Image(
-                    painterResource("compose-multiplatform.xml"),
+                    painterResource(Res.drawable.compose_multiplatform),
                     null
                 )
             }

diff --git a/examples/codeviewer/gradle.properties b/examples/codeviewer/gradle.properties
@@ -2,6 +2,8 @@ kotlin.code.style=official
 xcodeproj=./iosApp
 android.useAndroidX=true
 org.gradle.jvmargs=-Xmx3g
+org.gradle.configuration-cache=true
+org.gradle.caching=true
 org.jetbrains.compose.experimental.jscanvas.enabled=true
 org.jetbrains.compose.experimental.macos.enabled=true
 kotlin.native.useEmbeddableCompilerJar=true

diff --git a/examples/codeviewer/gradle/wrapper/gradle-wrapper.properties b/examples/codeviewer/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/examples/codeviewer/shared/build.gradle.kts b/examples/codeviewer/shared/build.gradle.kts
@@ -25,13 +25,17 @@ kotlin {
     }
 
     sourceSets {
+        all {
+            languageSettings {
+                optIn("org.jetbrains.compose.resources.ExperimentalResourceApi")
+            }
+        }
         val commonMain by getting {
             dependencies {
                 implementation(compose.runtime)
                 implementation(compose.foundation)
                 implementation(compose.material)
                 implementation(compose.materialIconsExtended)
-                 @OptIn(org.jetbrains.compose.ExperimentalComposeLibrary::class)
                 implementation(compose.components.resources)
             }
         }
@@ -68,7 +72,6 @@ android {
     compileSdk = 34
     namespace = "org.jetbrains.codeviewer.common"
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
-    sourceSets["main"].res.srcDirs("src/androidMain/res", "src/commonMain/resources")
     defaultConfig {
         minSdk = 26
     }

diff --git a/...s/codeviewer/shared/src/androidMain/kotlin/org/jetbrains/codeviewer/platform/Resources.kt b/...s/codeviewer/shared/src/androidMain/kotlin/org/jetbrains/codeviewer/platform/Resources.kt
diff --git a/...ain/resources/font/jetbrainsmono_bold.ttf → ...poseResources/font/jetbrainsmono_bold.ttf b/...ain/resources/font/jetbrainsmono_bold.ttf → ...poseResources/font/jetbrainsmono_bold.ttf
diff --git a/...ources/font/jetbrainsmono_bold_italic.ttf → ...ources/font/jetbrainsmono_bold_italic.ttf b/...ources/font/jetbrainsmono_bold_italic.ttf → ...ources/font/jetbrainsmono_bold_italic.ttf
diff --git a/...esources/font/jetbrainsmono_extrabold.ttf → ...esources/font/jetbrainsmono_extrabold.ttf b/...esources/font/jetbrainsmono_extrabold.ttf → ...esources/font/jetbrainsmono_extrabold.ttf
diff --git a/...s/font/jetbrainsmono_extrabold_italic.ttf → ...s/font/jetbrainsmono_extrabold_italic.ttf b/...s/font/jetbrainsmono_extrabold_italic.ttf → ...s/font/jetbrainsmono_extrabold_italic.ttf
diff --git a/...n/resources/font/jetbrainsmono_italic.ttf → ...seResources/font/jetbrainsmono_italic.ttf b/...n/resources/font/jetbrainsmono_italic.ttf → ...seResources/font/jetbrainsmono_italic.ttf
diff --git a/...n/resources/font/jetbrainsmono_medium.ttf → ...seResources/font/jetbrainsmono_medium.ttf b/...n/resources/font/jetbrainsmono_medium.ttf → ...seResources/font/jetbrainsmono_medium.ttf
diff --git a/...rces/font/jetbrainsmono_medium_italic.ttf → ...rces/font/jetbrainsmono_medium_italic.ttf b/...rces/font/jetbrainsmono_medium_italic.ttf → ...rces/font/jetbrainsmono_medium_italic.ttf
diff --git a/.../resources/font/jetbrainsmono_regular.ttf → ...eResources/font/jetbrainsmono_regular.ttf b/.../resources/font/jetbrainsmono_regular.ttf → ...eResources/font/jetbrainsmono_regular.ttf
diff --git a/...es/codeviewer/shared/src/commonMain/kotlin/org/jetbrains/codeviewer/platform/Resources.kt b/...es/codeviewer/shared/src/commonMain/kotlin/org/jetbrains/codeviewer/platform/Resources.kt
diff --git a/examples/codeviewer/shared/src/commonMain/kotlin/org/jetbrains/codeviewer/ui/common/Fonts.kt b/examples/codeviewer/shared/src/commonMain/kotlin/org/jetbrains/codeviewer/ui/common/Fonts.kt
@@ -4,59 +4,53 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.text.font.FontWeight
-import org.jetbrains.codeviewer.platform.font
+import codeviewer.shared.generated.resources.Res
+import codeviewer.shared.generated.resources.*
+import org.jetbrains.compose.resources.Font
 
 object Fonts {
     @Composable
     fun jetbrainsMono() = FontFamily(
-        font(
-            "JetBrains Mono",
-            "jetbrainsmono_regular",
+        Font(
+            Res.font.jetbrainsmono_regular,
             FontWeight.Normal,
             FontStyle.Normal
         ),
-        font(
-            "JetBrains Mono",
-            "jetbrainsmono_italic",
+        Font(
+            Res.font.jetbrainsmono_italic,
             FontWeight.Normal,
             FontStyle.Italic
         ),
 
-        font(
-            "JetBrains Mono",
-            "jetbrainsmono_bold",
+        Font(
+            Res.font.jetbrainsmono_bold,
             FontWeight.Bold,
             FontStyle.Normal
         ),
-        font(
-            "JetBrains Mono",
-            "jetbrainsmono_bold_italic",
+        Font(
+            Res.font.jetbrainsmono_bold_italic,
             FontWeight.Bold,
             FontStyle.Italic
         ),
 
-        font(
-            "JetBrains Mono",
-            "jetbrainsmono_extrabold",
+        Font(
+            Res.font.jetbrainsmono_extrabold,
             FontWeight.ExtraBold,
             FontStyle.Normal
         ),
-        font(
-            "JetBrains Mono",
-            "jetbrainsmono_extrabold_italic",
+        Font(
+            Res.font.jetbrainsmono_extrabold_italic,
             FontWeight.ExtraBold,
             FontStyle.Italic
         ),
 
-        font(
-            "JetBrains Mono",
-            "jetbrainsmono_medium",
+        Font(
+            Res.font.jetbrainsmono_medium,
             FontWeight.Medium,
             FontStyle.Normal
         ),
-        font(
-            "JetBrains Mono",
-            "jetbrainsmono_medium_italic",
+        Font(
+            Res.font.jetbrainsmono_medium_italic,
             FontWeight.Medium,
             FontStyle.Italic
         )

diff --git a/...s/codeviewer/shared/src/desktopMain/kotlin/org/jetbrains/codeviewer/platform/Resources.kt b/...s/codeviewer/shared/src/desktopMain/kotlin/org/jetbrains/codeviewer/platform/Resources.kt
diff --git a/...hared/src/iosMain/resources/EditorView.kt → ...rc/iosMain/composeResources/EditorView.kt b/...hared/src/iosMain/resources/EditorView.kt → ...rc/iosMain/composeResources/EditorView.kt
diff --git a/examples/codeviewer/shared/src/iosMain/kotlin/org/jetbrains/codeviewer/platform/File.kt b/examples/codeviewer/shared/src/iosMain/kotlin/org/jetbrains/codeviewer/platform/File.kt
@@ -2,12 +2,12 @@
 
 package org.jetbrains.codeviewer.platform
 
+import codeviewer.shared.generated.resources.Res
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.runBlocking
 import org.jetbrains.codeviewer.util.EmptyTextLines
 import org.jetbrains.codeviewer.util.TextLines
 import org.jetbrains.compose.resources.ExperimentalResourceApi
-import org.jetbrains.compose.resources.resource
 
 class VirtualFile(override val name: String, override val isDirectory: Boolean, val textLines: TextLines, override val children: List<File> = listOf()): File {
     override val hasChildren: Boolean
@@ -34,7 +34,7 @@ actual val HomeFolder: File get() = VirtualFile("files",
         VirtualFile("EditorView.kt",
             isDirectory = false,
             textLines = runBlocking {
-                   resource("EditorView.kt").readBytes()
+                   Res.readBytes("EditorView.kt")
                }.toTextLines()
         )
     )

diff --git a/examples/codeviewer/shared/src/iosMain/kotlin/org/jetbrains/codeviewer/platform/Resources.kt b/examples/codeviewer/shared/src/iosMain/kotlin/org/jetbrains/codeviewer/platform/Resources.kt
diff --git a/examples/graphics-2d/gradle.properties b/examples/graphics-2d/gradle.properties
@@ -2,6 +2,8 @@ kotlin.code.style=official
 xcodeproj=./iosApp
 android.useAndroidX=true
 org.gradle.jvmargs=-Xmx3g
+org.gradle.configuration-cache=true
+org.gradle.caching=true
 org.jetbrains.compose.experimental.jscanvas.enabled=true
 org.jetbrains.compose.experimental.macos.enabled=true
 kotlin.native.useEmbeddableCompilerJar=true

diff --git a/examples/graphics-2d/gradle/wrapper/gradle-wrapper.properties b/examples/graphics-2d/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists