build: Improve run configuration (2)

panpf · Jun 27, 2024 · 63e0217 · 63e0217
1 parent ada70ec
commit 63e0217
Show file tree

Hide file tree

Showing 18 changed files with 53 additions and 50 deletions.
diff --git a/...rc/androidMain/kotlin/com/github/panpf/sketch/sample/ui/test/FetcherTestScreen.android.kt b/...rc/androidMain/kotlin/com/github/panpf/sketch/sample/ui/test/FetcherTestScreen.android.kt
@@ -24,7 +24,7 @@ import okio.buffer
 import okio.source
 import okio.use
 import org.jetbrains.compose.resources.ExperimentalResourceApi
-import sketch_root.sample.generated.resources.Res
+import sketch.sample.generated.resources.Res
 
 @OptIn(ExperimentalResourceApi::class)
 actual suspend fun buildFetcherTestItems(

diff --git a/sample/src/commonMain/kotlin/com/github/panpf/sketch/sample/ui/common/list/LoadState.kt b/sample/src/commonMain/kotlin/com/github/panpf/sketch/sample/ui/common/list/LoadState.kt
@@ -20,8 +20,8 @@ import com.github.panpf.sketch.AsyncImageState
 import com.github.panpf.sketch.request.LoadState
 import org.jetbrains.compose.resources.ExperimentalResourceApi
 import org.jetbrains.compose.resources.painterResource
-import sketch_root.sample.generated.resources.Res.drawable
-import sketch_root.sample.generated.resources.ic_error_baseline
+import sketch.sample.generated.resources.Res.drawable
+import sketch.sample.generated.resources.ic_error_baseline
 
 @Composable
 fun LoadState(imageState: AsyncImageState, modifier: Modifier = Modifier) {

diff --git a/sample/src/commonMain/kotlin/com/github/panpf/sketch/sample/ui/gallery/HomeScreen.common.kt b/sample/src/commonMain/kotlin/com/github/panpf/sketch/sample/ui/gallery/HomeScreen.common.kt
@@ -33,11 +33,11 @@ import kotlinx.coroutines.launch
 import org.jetbrains.compose.resources.DrawableResource
 import org.jetbrains.compose.resources.ExperimentalResourceApi
 import org.jetbrains.compose.resources.painterResource
-import sketch_root.sample.generated.resources.Res
-import sketch_root.sample.generated.resources.ic_debug
-import sketch_root.sample.generated.resources.ic_giphy
-import sketch_root.sample.generated.resources.ic_pexels
-import sketch_root.sample.generated.resources.ic_phone
+import sketch.sample.generated.resources.Res
+import sketch.sample.generated.resources.ic_debug
+import sketch.sample.generated.resources.ic_giphy
+import sketch.sample.generated.resources.ic_pexels
+import sketch.sample.generated.resources.ic_phone
 
 expect val gridCellsMinSize: Dp
 

diff --git a/sample/src/commonMain/kotlin/com/github/panpf/sketch/sample/ui/gallery/MainMenu.kt b/sample/src/commonMain/kotlin/com/github/panpf/sketch/sample/ui/gallery/MainMenu.kt
@@ -25,12 +25,12 @@ import com.github.panpf.sketch.sample.ui.setting.AppSettingsDialog
 import com.github.panpf.sketch.sample.ui.setting.Page.LIST
 import org.jetbrains.compose.resources.ExperimentalResourceApi
 import org.jetbrains.compose.resources.painterResource
-import sketch_root.sample.generated.resources.Res.drawable
-import sketch_root.sample.generated.resources.ic_layout_grid
-import sketch_root.sample.generated.resources.ic_layout_grid_staggered
-import sketch_root.sample.generated.resources.ic_pause
-import sketch_root.sample.generated.resources.ic_play
-import sketch_root.sample.generated.resources.ic_settings
+import sketch.sample.generated.resources.Res.drawable
+import sketch.sample.generated.resources.ic_layout_grid
+import sketch.sample.generated.resources.ic_layout_grid_staggered
+import sketch.sample.generated.resources.ic_pause
+import sketch.sample.generated.resources.ic_play
+import sketch.sample.generated.resources.ic_settings
 
 @OptIn(ExperimentalResourceApi::class)
 @Composable

diff --git a/...e/src/commonMain/kotlin/com/github/panpf/sketch/sample/ui/gallery/PhotoGridItem.common.kt b/...e/src/commonMain/kotlin/com/github/panpf/sketch/sample/ui/gallery/PhotoGridItem.common.kt
@@ -41,10 +41,10 @@ import com.github.panpf.sketch.sample.util.ifLet
 import com.github.panpf.sketch.state.StateImage
 import com.github.panpf.sketch.state.rememberIconPainterStateImage
 import com.github.panpf.sketch.state.saveCellularTrafficError
-import sketch_root.sample.generated.resources.Res
-import sketch_root.sample.generated.resources.ic_image_outline
-import sketch_root.sample.generated.resources.ic_image_outline_broken
-import sketch_root.sample.generated.resources.ic_signal_cellular
+import sketch.sample.generated.resources.Res
+import sketch.sample.generated.resources.ic_image_outline
+import sketch.sample.generated.resources.ic_image_outline_broken
+import sketch.sample.generated.resources.ic_signal_cellular
 
 @Composable
 expect fun rememberAnimatedPlaceholderStateImage(context: PlatformContext): StateImage?

diff --git a/sample/src/commonMain/kotlin/com/github/panpf/sketch/sample/ui/gallery/PhotoPager.common.kt b/sample/src/commonMain/kotlin/com/github/panpf/sketch/sample/ui/gallery/PhotoPager.common.kt
@@ -65,10 +65,10 @@ import com.github.panpf.sketch.transform.BlurTransformation
 import kotlinx.coroutines.launch
 import org.jetbrains.compose.resources.ExperimentalResourceApi
 import org.jetbrains.compose.resources.painterResource
-import sketch_root.sample.generated.resources.Res.drawable
-import sketch_root.sample.generated.resources.ic_image2_baseline
-import sketch_root.sample.generated.resources.ic_image2_outline
-import sketch_root.sample.generated.resources.ic_settings
+import sketch.sample.generated.resources.Res.drawable
+import sketch.sample.generated.resources.ic_image2_baseline
+import sketch.sample.generated.resources.ic_image2_outline
+import sketch.sample.generated.resources.ic_settings
 
 @Composable
 @OptIn(ExperimentalFoundationApi::class)

diff --git a/...c/commonMain/kotlin/com/github/panpf/sketch/sample/ui/setting/AppSettingsDialog.common.kt b/...c/commonMain/kotlin/com/github/panpf/sketch/sample/ui/setting/AppSettingsDialog.common.kt
@@ -61,8 +61,8 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import org.jetbrains.compose.resources.ExperimentalResourceApi
 import org.jetbrains.compose.resources.painterResource
-import sketch_root.sample.generated.resources.Res.drawable
-import sketch_root.sample.generated.resources.ic_expand_more
+import sketch.sample.generated.resources.Res.drawable
+import sketch.sample.generated.resources.ic_expand_more
 
 @Composable
 expect fun getSettingsDialogHeight(): Dp

diff --git a/...src/commonMain/kotlin/com/github/panpf/sketch/sample/ui/test/ExifOrientationTestScreen.kt b/...src/commonMain/kotlin/com/github/panpf/sketch/sample/ui/test/ExifOrientationTestScreen.kt
@@ -32,8 +32,8 @@ import com.github.panpf.sketch.sample.ui.base.ToolbarScaffold
 import com.github.panpf.sketch.sample.ui.components.MyAsyncImage
 import com.github.panpf.sketch.state.rememberIconPainterStateImage
 import org.jetbrains.compose.resources.ExperimentalResourceApi
-import sketch_root.sample.generated.resources.Res.drawable
-import sketch_root.sample.generated.resources.ic_image_outline
+import sketch.sample.generated.resources.Res.drawable
+import sketch.sample.generated.resources.ic_image_outline
 
 class ExifOrientationTestScreen : BaseScreen() {
 

diff --git a/...c/commonMain/kotlin/com/github/panpf/sketch/sample/ui/test/ProgressIndicatorTestScreen.kt b/...c/commonMain/kotlin/com/github/panpf/sketch/sample/ui/test/ProgressIndicatorTestScreen.kt
@@ -48,8 +48,8 @@ import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import org.jetbrains.compose.resources.ExperimentalResourceApi
-import sketch_root.sample.generated.resources.Res.drawable
-import sketch_root.sample.generated.resources.ic_image_outline
+import sketch.sample.generated.resources.Res.drawable
+import sketch.sample.generated.resources.ic_image_outline
 import kotlin.random.Random
 
 

diff --git a/sample/src/commonMain/kotlin/com/github/panpf/sketch/sample/ui/test/TempTestScreen.kt b/sample/src/commonMain/kotlin/com/github/panpf/sketch/sample/ui/test/TempTestScreen.kt
@@ -15,8 +15,8 @@ import com.github.panpf.sketch.sample.ui.base.BaseScreen
 import com.github.panpf.sketch.sample.ui.base.ToolbarScaffold
 import org.jetbrains.compose.resources.ExperimentalResourceApi
 import org.jetbrains.compose.resources.painterResource
-import sketch_root.sample.generated.resources.Res
-import sketch_root.sample.generated.resources.ic_image_outline
+import sketch.sample.generated.resources.Res
+import sketch.sample.generated.resources.ic_image_outline
 
 class TempTestScreen : BaseScreen() {
 

diff --git a/sample/src/commonMain/kotlin/com/github/panpf/sketch/sample/ui/test/TestPage.common.kt b/sample/src/commonMain/kotlin/com/github/panpf/sketch/sample/ui/test/TestPage.common.kt
@@ -36,8 +36,8 @@ import cafe.adriel.voyager.navigator.LocalNavigator
 import com.github.panpf.sketch.sample.ui.components.AutoLinkText
 import org.jetbrains.compose.resources.ExperimentalResourceApi
 import org.jetbrains.compose.resources.painterResource
-import sketch_root.sample.generated.resources.Res
-import sketch_root.sample.generated.resources.ic_github
+import sketch.sample.generated.resources.Res
+import sketch.sample.generated.resources.ic_github
 
 expect val testItemGridCells: Int
 

diff --git a/sample/src/desktopMain/kotlin/com/github/panpf/sketch/sample/ui/preview/AsyncImagePreview.kt b/sample/src/desktopMain/kotlin/com/github/panpf/sketch/sample/ui/preview/AsyncImagePreview.kt
@@ -19,8 +19,8 @@ import com.github.panpf.sketch.request.ImageRequest
 import com.github.panpf.sketch.request.placeholder
 import com.github.panpf.sketch.sample.ui.util.PreviewWrapper
 import com.github.panpf.sketch.state.rememberPainterStateImage
-import sketch_root.sample.generated.resources.Res
-import sketch_root.sample.generated.resources.ic_image2_outline
+import sketch.sample.generated.resources.Res
+import sketch.sample.generated.resources.ic_image2_outline
 
 
 @Preview

diff --git a/...rc/desktopMain/kotlin/com/github/panpf/sketch/sample/ui/test/FetcherTestScreen.desktop.kt b/...rc/desktopMain/kotlin/com/github/panpf/sketch/sample/ui/test/FetcherTestScreen.desktop.kt
@@ -14,7 +14,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import net.harawata.appdirs.AppDirsFactory
 import org.jetbrains.compose.resources.ExperimentalResourceApi
-import sketch_root.sample.generated.resources.Res
+import sketch.sample.generated.resources.Res
 import java.io.File
 
 @OptIn(ExperimentalResourceApi::class)

diff --git a/sample/src/iosMain/kotlin/com/github/panpf/sketch/sample/ui/test/FetcherTestScreen.ios.kt b/sample/src/iosMain/kotlin/com/github/panpf/sketch/sample/ui/test/FetcherTestScreen.ios.kt
@@ -20,7 +20,7 @@ import platform.Foundation.NSBundle
 import platform.Foundation.NSCachesDirectory
 import platform.Foundation.NSSearchPathForDirectoriesInDomains
 import platform.Foundation.NSUserDomainMask
-import sketch_root.sample.generated.resources.Res
+import sketch.sample.generated.resources.Res
 
 @OptIn(ExperimentalResourceApi::class)
 actual suspend fun buildFetcherTestItems(context: PlatformContext, fromCompose: Boolean): List<FetcherTestItem> {

diff --git a/.../jsCommonMain/kotlin/com/github/panpf/sketch/sample/ui/test/FetcherTestScreen.jsCommon.kt b/.../jsCommonMain/kotlin/com/github/panpf/sketch/sample/ui/test/FetcherTestScreen.jsCommon.kt
@@ -4,7 +4,7 @@ import com.github.panpf.sketch.PlatformContext
 import com.github.panpf.sketch.fetch.newComposeResourceUri
 import com.github.panpf.sketch.images.MyImages
 import org.jetbrains.compose.resources.ExperimentalResourceApi
-import sketch_root.sample.generated.resources.Res
+import sketch.sample.generated.resources.Res
 
 @OptIn(ExperimentalResourceApi::class)
 actual suspend fun buildFetcherTestItems(

diff --git a/sample/src/jvmCommonMain/kotlin/com/github/panpf/sketch/sample/ui/gallery/PhotoViewer.jvm.kt b/sample/src/jvmCommonMain/kotlin/com/github/panpf/sketch/sample/ui/gallery/PhotoViewer.jvm.kt
@@ -50,13 +50,13 @@ import com.github.panpf.zoomimage.zoom.valueOf
 import kotlinx.coroutines.launch
 import org.jetbrains.compose.resources.ExperimentalResourceApi
 import org.jetbrains.compose.resources.painterResource
-import sketch_root.sample.generated.resources.Res.drawable
-import sketch_root.sample.generated.resources.ic_info_baseline
-import sketch_root.sample.generated.resources.ic_rotate_right
-import sketch_root.sample.generated.resources.ic_save
-import sketch_root.sample.generated.resources.ic_share
-import sketch_root.sample.generated.resources.ic_zoom_in
-import sketch_root.sample.generated.resources.ic_zoom_out
+import sketch.sample.generated.resources.Res.drawable
+import sketch.sample.generated.resources.ic_info_baseline
+import sketch.sample.generated.resources.ic_rotate_right
+import sketch.sample.generated.resources.ic_save
+import sketch.sample.generated.resources.ic_share
+import sketch.sample.generated.resources.ic_zoom_in
+import sketch.sample.generated.resources.ic_zoom_out
 import kotlin.math.roundToInt
 
 @Composable

diff --git a/...c/nonJvmCommonMain/kotlin/com/github/panpf/sketch/sample/ui/gallery/PhotoViewer.nonJvm.kt b/...c/nonJvmCommonMain/kotlin/com/github/panpf/sketch/sample/ui/gallery/PhotoViewer.nonJvm.kt
@@ -44,12 +44,12 @@ import com.github.panpf.sketch.state.ThumbnailMemoryCacheStateImage
 import kotlinx.coroutines.launch
 import org.jetbrains.compose.resources.ExperimentalResourceApi
 import org.jetbrains.compose.resources.painterResource
-import sketch_root.sample.generated.resources.Res.drawable
-import sketch_root.sample.generated.resources.ic_info_baseline
-import sketch_root.sample.generated.resources.ic_rotate_right
-import sketch_root.sample.generated.resources.ic_save
-import sketch_root.sample.generated.resources.ic_share
-import sketch_root.sample.generated.resources.ic_zoom_in
+import sketch.sample.generated.resources.Res.drawable
+import sketch.sample.generated.resources.ic_info_baseline
+import sketch.sample.generated.resources.ic_rotate_right
+import sketch.sample.generated.resources.ic_save
+import sketch.sample.generated.resources.ic_share
+import sketch.sample.generated.resources.ic_zoom_in
 
 @Composable
 actual fun PhotoViewer(

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,4 +1,7 @@
+// The name of the root project cannot be changed because the sample app needs to rely on
+// it when generating compose resources.
 rootProject.name = "sketch"
+
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 
 dependencyResolutionManagement {