Make session module Compose Multiplatform

app-ios-shared/build.gradle.kts

@@ -38,6 +38,7 @@ kotlin {
                 api(projects.core.data)
                 api(projects.core.ui)
                 api(projects.feature.contributors)
+                api(projects.feature.sessions)
                 implementation(libs.kotlinxCoroutinesCore)
             }
         }

build-logic/build.gradle.kts

@@ -79,6 +79,10 @@ gradlePlugin {
             id = "droidkaigi.primitive.kmp.compose"
             implementationClass = "io.github.droidkaigi.confsched.primitive.KmpComposePlugin"
         }
+        register("kotlinMppRoborazzi") {
+            id = "droidkaigi.primitive.kmp.roborazzi"
+            implementationClass = "io.github.droidkaigi.confsched.primitive.KmpRoborazziPlugin"
+        }
         register("kotlinMppKtorfit") {
             id = "droidkaigi.primitive.kmp.ktorfit"
             implementationClass = "io.github.droidkaigi.confsched.primitive.KmpKtorfitPlugin"
@@ -122,5 +126,9 @@ gradlePlugin {
             id = "droidkaigi.convention.androidfeature"
             implementationClass = "io.github.droidkaigi.confsched.convention.AndroidFeaturePlugin"
         }
+        register("kmpFeature") {
+            id = "droidkaigi.convention.kmpfeature"
+            implementationClass = "io.github.droidkaigi.confsched.convention.KmpFeaturePlugin"
+        }
     }
 }

build-logic/src/main/kotlin/io/github/droidkaigi/confsched/convention/AndroidFeaturePlugin.kt

@@ -28,7 +28,7 @@ class AndroidFeaturePlugin : Plugin<Project> {
     }
 }
 
-private fun Project.buildComposeMetricsParameters(): List<String> {
+fun Project.buildComposeMetricsParameters(): List<String> {
     val metricParameters = mutableListOf<String>()
     val enableMetricsProvider = project.providers.gradleProperty("enableComposeCompilerMetrics")
     val relativePath = projectDir.relativeTo(rootDir)

build-logic/src/main/kotlin/io/github/droidkaigi/confsched/convention/KmpFeaturePlugin.kt

@@ -0,0 +1,28 @@
+package io.github.droidkaigi.confsched.convention
+
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.withType
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+class KmpFeaturePlugin : Plugin<Project> {
+    override fun apply(target: Project) {
+        with(target) {
+            with(pluginManager) {
+                apply("droidkaigi.primitive.kmp")
+                apply("droidkaigi.primitive.kmp.android")
+                apply("droidkaigi.primitive.kmp.ios")
+                apply("droidkaigi.primitive.kmp.compose")
+                apply("droidkaigi.primitive.kmp.android.hilt")
+                apply("droidkaigi.primitive.kmp.roborazzi")
+                apply("droidkaigi.primitive.detekt")
+            }
+
+            tasks.withType<KotlinCompile>().configureEach {
+                kotlinOptions {
+                    freeCompilerArgs = freeCompilerArgs + buildComposeMetricsParameters()
+                }
+            }
+        }
+    }
+}

build-logic/src/main/kotlin/io/github/droidkaigi/confsched/primitive/KmpAndroidHiltPlugin.kt

@@ -31,6 +31,21 @@ class KmpAndroidHiltPlugin : Plugin<Project> {
                         implementation(libs.library("androidxFragment"))
                     }
                 }
+                sourceSets.getByName("androidUnitTest") {
+                    val kspConfiguration = configurations["kspAndroidTest"] // not AndroidAndroidTest
+                    kspConfiguration.dependencies.add(
+                        libs.library("daggerHiltAndroidCompiler").let {
+                            DefaultExternalModuleDependency(
+                                it.module.group,
+                                it.module.name,
+                                it.versionConstraint.requiredVersion
+                            )
+                        }
+                    )
+                    dependencies {
+                        implementation(libs.library("daggerHiltAndroidTesting"))
+                    }
+                }
             }
         }
     }

build-logic/src/main/kotlin/io/github/droidkaigi/confsched/primitive/KmpPlugin.kt

@@ -12,6 +12,7 @@ class KmpPlugin : Plugin<Project> {
         with(target) {
             with(pluginManager) {
                 apply("org.jetbrains.kotlin.multiplatform")
+
             }
             tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class.java) {
                 kotlinOptions.jvmTarget = "11"

build-logic/src/main/kotlin/io/github/droidkaigi/confsched/primitive/KmpRoborazziPlugin.kt

@@ -0,0 +1,58 @@
+package io.github.droidkaigi.confsched.primitive
+
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.api.internal.artifacts.dependencies.DefaultExternalModuleDependency
+import org.gradle.kotlin.dsl.get
+
+@Suppress("unused")
+class KmpRoborazziPlugin : Plugin<Project> {
+    override fun apply(project: Project) {
+        with(project) {
+            with(pluginManager) {
+                apply("io.github.takahirom.roborazzi")
+                apply("com.google.devtools.ksp")
+            }
+            android {
+                testOptions {
+                    unitTests {
+                        all {
+                            it.jvmArgs("-noverify")
+                            it.maxParallelForks = Runtime.getRuntime().availableProcessors()
+                            // -Pscreenshot to filter screenshot tests
+                            it.useJUnit {
+                                if (project.hasProperty("screenshot")) {
+                                    project.logger.lifecycle("Screenshot tests are included")
+                                    includeCategories("io.github.droidkaigi.confsched.testing.category.ScreenshotTests")
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            kotlin {
+                sourceSets.getByName("androidUnitTest") {
+                    val kspConfiguration = configurations["kspAndroid"]
+                    kspConfiguration.dependencies.add(
+                        libs.library("showkaseProcessor").let {
+                            DefaultExternalModuleDependency(
+                                it.module.group,
+                                it.module.name,
+                                it.versionConstraint.requiredVersion
+                            )
+                        }
+                    )
+                    dependencies {
+                        implementation(libs.library("showkaseRuntime"))
+                        implementation(libs.library("androidxTestEspressoEspressoCore"))
+                        implementation(libs.library("junit"))
+                        implementation(libs.library("robolectric"))
+                        implementation(libs.library("androidxTestExtJunit"))
+                        implementation(libs.library("roborazzi"))
+                        implementation(libs.library("roborazziCompose"))
+                    }
+                }
+            }
+        }
+    }
+}

core/designsystem/build.gradle.kts

@@ -10,6 +10,14 @@ plugins {
 
 android.namespace = "io.github.droidkaigi.confsched.core.designsystem"
 
+kotlin {
+    sourceSets {
+        commonMain {
+            dependencies {}
+        }
+    }
+}
+
 android {
     sourceSets {
         named("main") {

core/designsystem/src/commonMain/kotlin/androidx/compose/ui/tooling/preview/Preview.kt

@@ -0,0 +1,23 @@
+package androidx.compose.ui.tooling.preview
+
+@Retention(AnnotationRetention.BINARY)
+@Target(
+    AnnotationTarget.ANNOTATION_CLASS,
+    AnnotationTarget.FUNCTION
+)
+@Repeatable
+annotation class Preview(
+    val name: String = "",
+    val group: String = "",
+    val apiLevel: Int = -1,
+    val widthDp: Int = -1,
+    val heightDp: Int = -1,
+    val locale: String = "",
+    val fontScale: Float = 1f,
+    val showSystemUi: Boolean = false,
+    val showBackground: Boolean = false,
+    val backgroundColor: Long = 0,
+    val uiMode: Int = 0,
+    val device: String = "",
+    val wallpaper: Int = -1,
+)

core/designsystem/src/androidMain/kotlin/io/github/droidkaigi/confsched/designsystem/preview/Annotations.kt → core/designsystem/src/commonMain/kotlin/io/github/droidkaigi/confsched/designsystem/preview/Annotations.kt

@@ -1,6 +1,5 @@
 package io.github.droidkaigi.confsched.designsystem.preview
 
-import android.content.res.Configuration
 import androidx.annotation.VisibleForTesting
 import androidx.compose.ui.tooling.preview.Preview
 import kotlin.annotation.AnnotationRetention.SOURCE
@@ -25,12 +24,13 @@ object MultiThemePreviewDefinition {
 
     object DarkMode {
         const val Name = "DarkMode"
-        const val UiMode = Configuration.UI_MODE_NIGHT_YES
+        // FIXME: We can't use this in KMP
+//        const val UiMode = Configuration.UI_MODE_NIGHT_YES
     }
 
     object LightMode {
         const val Name = "LightMode"
-        const val UiMode = Configuration.UI_MODE_NIGHT_NO
+//        const val UiMode = Configuration.UI_MODE_NIGHT_NO
     }
 }
 
@@ -40,12 +40,12 @@ object MultiThemePreviewDefinition {
 @Preview(
     name = MultiThemePreviewDefinition.LightMode.Name,
     group = MultiThemePreviewDefinition.Group,
-    uiMode = MultiThemePreviewDefinition.LightMode.UiMode,
+//    uiMode = MultiThemePreviewDefinition.LightMode.UiMode,
 )
 @Preview(
     name = MultiThemePreviewDefinition.DarkMode.Name,
     group = MultiThemePreviewDefinition.Group,
-    uiMode = MultiThemePreviewDefinition.DarkMode.UiMode,
+//    uiMode = MultiThemePreviewDefinition.DarkMode.UiMode,
 )
 annotation class MultiThemePreviews
 

core/ui/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/ScreenInfo.android.kt

@@ -0,0 +1,16 @@
+package io.github.droidkaigi.confsched.ui
+
+import android.content.res.Configuration
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalConfiguration
+
+@Composable
+actual fun getScreenSizeInfo(): ScreenInfo {
+//    val density = LocalDensity.current
+//    val config = LocalConfiguration.current
+//    val hDp = config.screenHeightDp.dp
+//    val wDp = config.screenWidthDp.dp
+    return ScreenInfo(
+        isPort = LocalConfiguration.current.orientation == Configuration.ORIENTATION_PORTRAIT
+    )
+}

core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/ScreenInfo.kt

@@ -0,0 +1,8 @@
+package io.github.droidkaigi.confsched.ui
+
+import androidx.compose.runtime.Composable
+
+data class ScreenInfo(val isPort: Boolean)
+
+@Composable
+expect fun getScreenSizeInfo(): ScreenInfo

core/ui/src/iosMain/kotlin/io/github/droidkaigi/confsched/ui/ScreenInfo.ios.kt

@@ -0,0 +1,16 @@
+package io.github.droidkaigi.confsched.ui
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.ExperimentalComposeUiApi
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.LocalWindowInfo
+
+@OptIn(ExperimentalComposeUiApi::class)
+@Composable
+actual fun getScreenSizeInfo(): ScreenInfo {
+    val density = LocalDensity.current
+    val config = LocalWindowInfo.current.containerSize
+    return ScreenInfo(
+        isPort = config.height > config.width
+    )
+}

feature/sessions/build.gradle.kts

@@ -1,17 +1,29 @@
 plugins {
-    id("droidkaigi.convention.androidfeature")
+    id("droidkaigi.convention.kmpfeature")
 }
 
 android.namespace = "io.github.droidkaigi.confsched.feature.sessions"
+kotlin {
+    sourceSets {
+        commonMain {
+            dependencies {
+                implementation(projects.core.designsystem)
+                implementation(projects.core.ui)
+                implementation(projects.core.model)
 
-dependencies {
-    implementation(projects.core.designsystem)
-    implementation(projects.core.ui)
-    implementation(projects.core.model)
-    implementation(libs.animation.graphics.android)
-    testImplementation(projects.core.testing)
-
-    implementation(libs.composeHiltNavigtation)
-    implementation(libs.composeMaterialIcon)
-    implementation(libs.composeShimmer)
+                implementation(libs.composeNavigation)
+                implementation(compose.materialIconsExtended)
+            }
+        }
+        androidTarget {
+            dependencies {
+                implementation(libs.composeMaterialWindowSize)
+            }
+        }
+        androidUnitTest {
+            dependencies {
+                implementation(projects.core.testing)
+            }
+        }
+    }
 }

feature/sessions/src/main/java/io/github/droidkaigi/confsched/sessions/TimetableScreen.kt → feature/sessions/src/commonMain/kotlin/io/github/droidkaigi/confsched/sessions/TimetableScreen.kt

@@ -1,6 +1,5 @@
 package io.github.droidkaigi.confsched.sessions
 
-import android.content.res.Configuration
 import androidx.compose.foundation.background
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.Box
@@ -12,11 +11,11 @@ import androidx.compose.foundation.layout.calculateStartPadding
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.statusBarsPadding
-import androidx.compose.material.Text
 import androidx.compose.material3.Button
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.SnackbarHost
 import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.ReadOnlyComposable
@@ -26,7 +25,6 @@ import androidx.compose.ui.draw.drawWithCache
 import androidx.compose.ui.geometry.Size
 import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.LocalLayoutDirection
 import androidx.compose.ui.platform.testTag
@@ -50,6 +48,7 @@ import io.github.droidkaigi.confsched.ui.UserMessageStateHolder
 import io.github.droidkaigi.confsched.ui.UserMessageStateHolderImpl
 import io.github.droidkaigi.confsched.ui.compositionlocal.FakeClock
 import io.github.droidkaigi.confsched.ui.compositionlocal.LocalClock
+import io.github.droidkaigi.confsched.ui.getScreenSizeInfo
 import kotlinx.collections.immutable.toPersistentMap
 
 const val timetableScreenRoute = "timetable"
@@ -72,7 +71,7 @@ fun NavGraphBuilder.nestedSessionScreens(
 
 fun NavController.navigateTimetableScreen() {
     navigate(timetableScreenRoute) {
-        popUpTo(id = graph.findStartDestination().id) {
+        popUpTo(route = checkNotNull(graph.findStartDestination().route)) {
             saveState = true
         }
         launchSingleTop = true
@@ -156,7 +155,7 @@ private fun TimetableScreen(
     val density = LocalDensity.current
     val layoutDirection = LocalLayoutDirection.current
     val gradientEndRatio =
-        if (LocalConfiguration.current.orientation == Configuration.ORIENTATION_PORTRAIT) {
+        if (getScreenSizeInfo().isPort) {
             0.2f
         } else {
             0.5f