Migrate theme-contract to KMP

Author: florentmaitre

app/src/main/java/com/orange/ouds/app/ui/ChangeThemeSettingsDialog.kt

@@ -51,7 +51,7 @@ fun ChangeThemeSettingsDialog(themeState: ThemeState, onThemeSettingsChange: (Ou
 
 @Composable
 private fun ChangeThemeSettingsDialogContent(themeState: ThemeState, onThemeSettingsChange: (OudsThemeSettings) -> Unit) {
-    var themeSettings by rememberSaveable { mutableStateOf(themeState.settings) }
+    var themeSettings by rememberSaveable(stateSaver = OudsThemeSettings.Saver) { mutableStateOf(themeState.settings) }
     DialogContent(
         title = stringResource(R.string.app_themeSettingsDialog_label)
     ) {

app/src/main/java/com/orange/ouds/app/ui/ThemeState.kt

@@ -64,17 +64,18 @@ class ThemeState(
             save = { state ->
                 with(state) {
                     listOf(
-                        settings,
+                        with(OudsThemeSettings.Saver) { save(settings) },
                         themeNames,
                         currentThemeName,
                         areDownloadableOrangeFontFamilyPreloaded
                     )
                 }
             },
-            restore = { list ->
+            restore = { list: List<Any?> ->
+                val settings = list[0]?.let { OudsThemeSettings.Saver.restore(it) }
                 @Suppress("UNCHECKED_CAST")
                 ThemeState(
-                    list[0] as OudsThemeSettings,
+                    settings as OudsThemeSettings,
                     list[1] as List<String>,
                     list[2] as String,
                     list[3] as Boolean

buildSrc/src/main/kotlin/com/orange/ouds/theme/OudsVersion.kt

@@ -1 +1 @@
-../../../../../../../../theme-contract/src/main/java/com/orange/ouds/theme/OudsVersion.kt
+../../../../../../../../theme-contract/src/commonMain/kotlin/com/orange/ouds/theme/OudsVersion.kt

core/src/main/java/com/orange/ouds/core/theme/OudsBorders.kt

@@ -37,7 +37,6 @@ import androidx.compose.ui.unit.isSpecified
 import com.orange.ouds.foundation.InternalOudsApi
 import com.orange.ouds.theme.tokens.OudsBorderKeyToken
 import com.orange.ouds.theme.tokens.semantic.OudsBorderSemanticTokens
-import java.util.Locale
 
 /**
  * Holds all the border-related properties defined in the OUDS theme.
@@ -217,7 +216,7 @@ enum class OudsBorderStyle {
          */
         fun fromString(string: String): OudsBorderStyle {
             return try {
-                OudsBorderStyle.valueOf(string.lowercase().replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString() })
+                OudsBorderStyle.valueOf(string.lowercase().replaceFirstChar { it.uppercase() })
             } catch (exception: IllegalArgumentException) {
                 // If the provided border style value is unknown, return the default border style
                 None

theme-contract/build.gradle.kts

@@ -11,37 +11,119 @@
  */
 
 plugins {
-    id("dokka")
-    id("library")
+    //id("dokka")
     alias(libs.plugins.compose.compiler)
-    id(libs.plugins.kotlin.parcelize.get().pluginId) // https://github.com/gradle/gradle/issues/20084#issuecomment-1060822638
+    alias(libs.plugins.compose.multiplatform)
+    id(libs.plugins.kotlin.multiplatform.get().pluginId)
+    id(libs.plugins.android.kotlin.multiplatform.library.get().pluginId)
 }
 
 // Temporary workaround for https://issuetracker.google.com/issues/476936389
-val dokkaKotlinAdapter = objects.newInstance(org.jetbrains.dokka.gradle.adapters.KotlinAdapter::class)
-dokkaKotlinAdapter.apply(project)
+//val dokkaKotlinAdapter = objects.newInstance(org.jetbrains.dokka.gradle.adapters.KotlinAdapter::class)
+//dokkaKotlinAdapter.apply(project)
 
-android {
-    namespace = "com.orange.ouds.theme"
+kotlin {
+    jvmToolchain(17)
 
-    buildFeatures {
-        compose = true
+    compilerOptions {
+        freeCompilerArgs.addAll(
+            "-opt-in=com.orange.ouds.foundation.RestrictedOudsApi",
+            "-opt-in=com.orange.ouds.foundation.ExperimentalOudsApi",
+            "-opt-in=com.orange.ouds.foundation.InternalOudsApi"
+        )
     }
 
-    kotlin {
-        compilerOptions {
-            freeCompilerArgs.addAll(
-                "-opt-in=com.orange.ouds.foundation.RestrictedOudsApi",
-                "-opt-in=com.orange.ouds.foundation.ExperimentalOudsApi",
-                "-opt-in=com.orange.ouds.foundation.InternalOudsApi"
-            )
+    // Target declarations - add or remove as needed below. These define
+    // which platforms this KMP module supports.
+    // See: https://kotlinlang.org/docs/multiplatform-discover-project.html#targets
+    android {
+        namespace = "com.orange.ouds.theme"
+        compileSdk = libs.versions.androidCompileSdk.get().toInt()
+        minSdk = libs.versions.androidMinSdk.get().toInt()
+
+        withHostTestBuilder {
+        }
+
+        withDeviceTestBuilder {
+            sourceSetTreeName = "test"
+        }.configure {
+            instrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         }
     }
-}
 
-dependencies {
-    implementation(project(":foundation"))
-    implementation(project(":global-raw-tokens"))
-    api(platform(libs.androidx.compose.bom))
-    api(libs.androidx.compose.material3)
-}
+    // For iOS targets, this is also where you should
+    // configure native binary output. For more information, see:
+    // https://kotlinlang.org/docs/multiplatform-build-native-binaries.html#build-xcframeworks
+
+    // A step-by-step guide on how to include this library in an XCode
+    // project can be found here:
+    // https://developer.android.com/kotlin/multiplatform/migrate
+    val xcfName = "oudsThemeContract"
+
+//    iosX64 {
+//        binaries.framework {
+//            baseName = xcfName
+//        }
+//    }
+
+    iosArm64 {
+        binaries.framework {
+            baseName = xcfName
+        }
+    }
+
+    iosSimulatorArm64 {
+        binaries.framework {
+            baseName = xcfName
+        }
+    }
+
+    // Source set declarations.
+    // Declaring a target automatically creates a source set with the same name. By default, the
+    // Kotlin Gradle Plugin creates additional source sets that depend on each other, since it is
+    // common to share sources between related targets.
+    // See: https://kotlinlang.org/docs/multiplatform-hierarchy.html
+    sourceSets {
+        commonMain {
+            dependencies {
+                implementation(libs.kotlin.stdlib)
+                // Add KMP dependencies here
+                implementation(project(":foundation"))
+                implementation(project(":global-raw-tokens"))
+                api(libs.compose.material3)
+            }
+        }
+
+        commonTest {
+            dependencies {
+                implementation(libs.kotlin.test)
+            }
+        }
+
+        androidMain {
+            dependencies {
+                // Add Android-specific dependencies here. Note that this source set depends on
+                // commonMain by default and will correctly pull the Android artifacts of any KMP
+                // dependencies declared in commonMain.
+            }
+        }
+
+        getByName("androidDeviceTest") {
+            dependencies {
+                implementation(libs.androidx.junit)
+                implementation(libs.androidx.runner)
+                implementation(libs.core)
+            }
+        }
+
+        iosMain {
+            dependencies {
+                // Add iOS-specific dependencies here. This a source set created by Kotlin Gradle
+                // Plugin (KGP) that each specific iOS target (e.g., iosX64) depends on as
+                // part of KMP’s default source set hierarchy. Note that this source set depends
+                // on common by default and will correctly pull the iOS artifacts of any
+                // KMP dependencies declared in commonMain.
+            }
+        }
+    }
+}

…me-contract/src/main/AndroidManifest.xml …ract/src/androidMain/AndroidManifest.xmltheme-contract/src/main/AndroidManifest.xml renamed to theme-contract/src/androidMain/AndroidManifest.xml theme-contract/src/main/AndroidManifest.xml renamed to theme-contract/src/androidMain/AndroidManifest.xml

@@ -12,8 +12,9 @@
 
 package com.orange.ouds.theme
 
-import android.os.Parcelable
-import kotlinx.parcelize.Parcelize
+import androidx.compose.runtime.saveable.listSaver
+import com.orange.ouds.theme.OudsThemeSettings.Companion.Saver
+import kotlin.jvm.JvmOverloads
 
 /**
  * Theme settings.
@@ -45,10 +46,36 @@ import kotlinx.parcelize.Parcelize
  *
  * @constructor Creates an instance of [OudsThemeSettings].
  */
-@Parcelize
 data class OudsThemeSettings @JvmOverloads constructor(
     val roundedCornerButtons: Boolean? = null,
     val roundedCornerTextInputs: Boolean? = null,
     val roundedCornerAlertMessages: Boolean? = null,
     val roundedCornerProgressIndicators: Boolean? = null
-) : Parcelable
+) {
+    companion object {
+
+        /**
+         * [Saver] implementation for [OudsThemeSettings] to support saving/restoring state in Compose.
+         */
+        val Saver = listSaver(
+            save = { settings ->
+                with(settings) {
+                    listOf(
+                        roundedCornerButtons,
+                        roundedCornerTextInputs,
+                        roundedCornerAlertMessages,
+                        roundedCornerProgressIndicators
+                    )
+                }
+            },
+            restore = { list ->
+                OudsThemeSettings(
+                    roundedCornerButtons = list[0] as Boolean,
+                    roundedCornerTextInputs = list[1] as Boolean,
+                    roundedCornerAlertMessages = list[2] as Boolean,
+                    roundedCornerProgressIndicators = list[3] as Boolean
+                )
+            }
+        )
+    }
+}