Move all samples to shared (#484)

chrisbanes · Jan 22, 2025 · fbb09b5 · fbb09b5
1 parent 9279253
commit fbb09b5
Show file tree

Hide file tree

Showing 12 changed files with 50 additions and 12 deletions.
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/sample/android/build.gradle.kts b/sample/android/build.gradle.kts
@@ -58,8 +58,5 @@ dependencies {
   debugImplementation(libs.androidx.compose.ui.tooling)
   implementation(libs.androidx.compose.ui.preview)
 
-  implementation(libs.androidx.media3.exoplayer)
-  implementation(libs.androidx.media3.ui)
-
   baselineProfile(projects.internal.benchmark)
 }
diff --git a/sample/android/src/main/kotlin/dev/chrisbanes/haze/sample/android/MainActivity.kt b/sample/android/src/main/kotlin/dev/chrisbanes/haze/sample/android/MainActivity.kt
@@ -10,7 +10,6 @@ import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.compose.runtime.remember
 import dev.chrisbanes.haze.sample.Navigator
-import dev.chrisbanes.haze.sample.Sample
 import dev.chrisbanes.haze.sample.Samples
 
 class MainActivity : ComponentActivity() {
@@ -26,12 +25,7 @@ class MainActivity : ComponentActivity() {
       Samples(
         appTitle = title.toString(),
         navigator = navigator,
-        samples = Samples + AndroidSamples,
       )
     }
   }
 }
-
-private val AndroidSamples = listOf(
-  Sample("ExoPlayer") { ExoPlayerSample(it) },
-)
diff --git a/sample/shared/build.gradle.kts b/sample/shared/build.gradle.kts
@@ -30,6 +30,9 @@ kotlin {
     androidMain {
       dependencies {
         implementation(libs.ktor.cio)
+
+        implementation(libs.androidx.media3.exoplayer)
+        implementation(libs.androidx.media3.ui)
       }
     }
 

diff --git a/...es/haze/sample/android/ExoPlayerSample.kt → ...chrisbanes/haze/sample/ExoPlayerSample.kt b/...es/haze/sample/android/ExoPlayerSample.kt → ...chrisbanes/haze/sample/ExoPlayerSample.kt
@@ -1,7 +1,7 @@
 // Copyright 2024, Christopher Banes and the Haze project contributors
 // SPDX-License-Identifier: Apache-2.0
 
-package dev.chrisbanes.haze.sample.android
+package dev.chrisbanes.haze.sample
 
 import android.view.LayoutInflater
 import androidx.compose.foundation.layout.Box
@@ -26,7 +26,7 @@ import dev.chrisbanes.haze.hazeEffect
 import dev.chrisbanes.haze.hazeSource
 import dev.chrisbanes.haze.materials.ExperimentalHazeMaterialsApi
 import dev.chrisbanes.haze.materials.HazeMaterials
-import dev.chrisbanes.haze.sample.Navigator
+import dev.chrisbanes.haze.sample.shared.R
 
 @OptIn(ExperimentalHazeMaterialsApi::class)
 @Composable

diff --git a/sample/shared/src/androidMain/kotlin/dev/chrisbanes/haze/sample/Samples.android.kt b/sample/shared/src/androidMain/kotlin/dev/chrisbanes/haze/sample/Samples.android.kt
@@ -0,0 +1,9 @@
+// Copyright 2025, Christopher Banes and the Haze project contributors
+// SPDX-License-Identifier: Apache-2.0
+
+package dev.chrisbanes.haze.sample
+
+actual val Samples: List<Sample> = buildList {
+  addAll(CommonSamples)
+  add(Sample("ExoPlayer") { ExoPlayerSample(it) })
+}
diff --git a/...android/src/main/res/layout/exoplayer.xml → .../src/androidMain/res/layout/exoplayer.xml b/...android/src/main/res/layout/exoplayer.xml → .../src/androidMain/res/layout/exoplayer.xml
diff --git a/sample/shared/src/commonMain/kotlin/dev/chrisbanes/haze/sample/Samples.kt b/sample/shared/src/commonMain/kotlin/dev/chrisbanes/haze/sample/Samples.kt
@@ -33,8 +33,10 @@ import coil3.request.ImageRequest
 import dev.chrisbanes.haze.ExperimentalHazeApi
 import dev.chrisbanes.haze.HazeInputScale
 
+expect val Samples: List<Sample>
+
 @OptIn(ExperimentalHazeApi::class)
-val Samples = listOf(
+val CommonSamples = listOf(
   Sample("Scaffold") { ScaffoldSample(it) },
   Sample("Scaffold (input scaled)") { ScaffoldSample(it, inputScale = HazeInputScale.Auto) },
   Sample("Scaffold (progressive blur)") { ScaffoldSample(it, ScaffoldSampleMode.Progressive) },

diff --git a/sample/shared/src/iosMain/kotlin/dev/chrisbanes/haze/sample/Samples.ios.kt b/sample/shared/src/iosMain/kotlin/dev/chrisbanes/haze/sample/Samples.ios.kt
@@ -0,0 +1,7 @@
+// Copyright 2025, Christopher Banes and the Haze project contributors
+// SPDX-License-Identifier: Apache-2.0
+
+package dev.chrisbanes.haze.sample
+
+actual val Samples: List<Sample>
+  get() = CommonSamples
diff --git a/sample/shared/src/jsMain/kotlin/dev/chrisbanes/haze/sample/Samples.js.kt b/sample/shared/src/jsMain/kotlin/dev/chrisbanes/haze/sample/Samples.js.kt
@@ -0,0 +1,7 @@
+// Copyright 2025, Christopher Banes and the Haze project contributors
+// SPDX-License-Identifier: Apache-2.0
+
+package dev.chrisbanes.haze.sample
+
+actual val Samples: List<Sample>
+  get() = CommonSamples
diff --git a/sample/shared/src/jvmMain/kotlin/dev/chrisbanes/haze/sample/Samples.jvm.kt b/sample/shared/src/jvmMain/kotlin/dev/chrisbanes/haze/sample/Samples.jvm.kt
@@ -0,0 +1,7 @@
+// Copyright 2025, Christopher Banes and the Haze project contributors
+// SPDX-License-Identifier: Apache-2.0
+
+package dev.chrisbanes.haze.sample
+
+actual val Samples: List<Sample>
+  get() = CommonSamples
diff --git a/sample/shared/src/wasmJsMain/kotlin/dev/chrisbanes/haze/sample/Samples.wasmJs.kt b/sample/shared/src/wasmJsMain/kotlin/dev/chrisbanes/haze/sample/Samples.wasmJs.kt
@@ -0,0 +1,7 @@
+// Copyright 2025, Christopher Banes and the Haze project contributors
+// SPDX-License-Identifier: Apache-2.0
+
+package dev.chrisbanes.haze.sample
+
+actual val Samples: List<Sample>
+  get() = CommonSamples