compose-multiplatform to v1.6.0-beta01

qdsfdhvh · Jan 26, 2024 · 081965d · 081965d
1 parent 06a96eb
commit 081965d
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 5 deletions.
diff --git a/...sources/composeRes/drawable/car_black.svg → ...n/composeResources/drawable/car_black.svg b/...sources/composeRes/drawable/car_black.svg → ...n/composeResources/drawable/car_black.svg
diff --git a/...ain/resources/composeRes/drawable/cat.jpg → ...monMain/composeResources/drawable/cat.jpg b/...ain/resources/composeRes/drawable/cat.jpg → ...monMain/composeResources/drawable/cat.jpg
diff --git a/...oseRes/drawable/chat_from_bg_normal_9.png → ...ources/drawable/chat_from_bg_normal_9.png b/...oseRes/drawable/chat_from_bg_normal_9.png → ...ources/drawable/chat_from_bg_normal_9.png
diff --git a/...s/composeRes/drawable/collection_logo.gif → ...oseResources/drawable/collection_logo.gif b/...s/composeRes/drawable/collection_logo.gif → ...oseResources/drawable/collection_logo.gif
diff --git a/app/common/src/commonMain/kotlin/com/seiko/imageloader/demo/MR.kt b/app/common/src/commonMain/kotlin/com/seiko/imageloader/demo/MR.kt
@@ -1,6 +1,6 @@
 package com.seiko.imageloader.demo
 
-import io.github.qdsfdhvh.generated.resources.Res
+import io.github.qdsfdhvh.common.generated.resources.Res
 
 internal object MR {
     val images get() = Res.drawable

diff --git a/app/common/src/commonMain/kotlin/com/seiko/imageloader/demo/scene/Common.kt b/app/common/src/commonMain/kotlin/com/seiko/imageloader/demo/scene/Common.kt
@@ -12,7 +12,7 @@ import androidx.compose.material.Scaffold
 import androidx.compose.material.Text
 import androidx.compose.material.TopAppBar
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ArrowBack
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.State
 import androidx.compose.runtime.derivedStateOf
@@ -38,7 +38,7 @@ import kotlinx.coroutines.withContext
 @Composable
 fun BackButton(onBack: () -> Unit) {
     IconButton(onBack) {
-        Icon(Icons.Default.ArrowBack, "back")
+        Icon(Icons.AutoMirrored.Filled.ArrowBack, "back")
     }
 }
 

diff --git a/app/common/src/commonMain/kotlin/com/seiko/imageloader/demo/scene/OtherImagesScene.kt b/app/common/src/commonMain/kotlin/com/seiko/imageloader/demo/scene/OtherImagesScene.kt
@@ -29,9 +29,10 @@ import co.touchlab.kermit.Logger
 import com.seiko.imageloader.demo.data.imageJsonData
 import com.seiko.imageloader.rememberImagePainter
 import org.jetbrains.compose.resources.ExperimentalResourceApi
+import org.jetbrains.compose.resources.InternalResourceApi
 import org.jetbrains.compose.resources.readResourceBytes
 
-@OptIn(ExperimentalResourceApi::class)
+@OptIn(ExperimentalResourceApi::class, InternalResourceApi::class)
 @Composable
 fun OtherImagesScene(
     onBack: () -> Unit,

diff --git a/...in/resources/composeRes/colors/colors.xml → ...rc/commonMain/resources/colors/colors.xml b/...in/resources/composeRes/colors/colors.xml → ...rc/commonMain/resources/colors/colors.xml
diff --git a/...s/src/commonMain/kotlin/com/seiko/imageloader/component/fetcher/ComposeResourceFetcher.kt b/...s/src/commonMain/kotlin/com/seiko/imageloader/component/fetcher/ComposeResourceFetcher.kt
@@ -6,6 +6,7 @@ import com.seiko.imageloader.option.Options
 import okio.Buffer
 import org.jetbrains.compose.resources.DrawableResource
 import org.jetbrains.compose.resources.ExperimentalResourceApi
+import org.jetbrains.compose.resources.InternalResourceApi
 import org.jetbrains.compose.resources.getPathByEnvironment
 import org.jetbrains.compose.resources.getSystemEnvironment
 import org.jetbrains.compose.resources.readResourceBytes
@@ -24,6 +25,7 @@ class ComposeResourceFetcher {
     private class DrawableResourceFetcher(
         private val resource: DrawableResource,
     ) : Fetcher {
+        @OptIn(InternalResourceApi::class)
         override suspend fun fetch(): FetchResult {
             val path = resource.getPathByEnvironment(getSystemEnvironment())
             return FetchResult.OfSource(

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 agp = "8.2.2"
-compose-multiplatform = "1.6.0-dev1354"
+compose-multiplatform = "1.6.0-beta01"
 kotlin = "1.9.22"
 kotlinx-coroutines = "1.8.0-RC2"
 kotlinx-serialization = "1.6.2"