Add WatchOS support

resources-build-logic/src/main/kotlin/apple-main-convention.gradle.kts

@@ -16,6 +16,15 @@ kotlin {
         val iosMain by getting {
             dependsOn(appleMain)
         }
+        val watchosMain by getting {
+            dependsOn(appleMain)
+        }
+        val watchos64Main by getting {
+            dependsOn(watchosMain)
+        }
+        val watchos32Main by getting {
+            dependsOn(watchosMain)
+        }
         val macosMain by getting {
             dependsOn(appleMain)
         }

resources-build-logic/src/main/kotlin/multiplatform-library-convention.gradle.kts

@@ -46,6 +46,18 @@ kotlin {
             iosSimulatorArm64Test.dependsOn(this)
         }
 
+        val watchosMain by creating
+        val watchos64Main by creating
+        val watchos32Main by creating
+        val watchosX64Main by creating
+        val watchosArm64Main by creating
+        val watchosSimulatorArm64Main by creating
+        watchos64Main.dependsOn(watchosMain)
+        watchos32Main.dependsOn(watchosMain)
+        watchosX64Main.dependsOn(watchos64Main)
+        watchosArm64Main.dependsOn(watchos32Main)
+        watchosSimulatorArm64Main.dependsOn(watchos64Main)
+
         val commonMain by getting
         val macosArm64Main by getting
         val macosX64Main by getting

resources-test/build.gradle.kts

@@ -11,6 +11,12 @@ plugins {
     id("publication-convention")
 }
 
+kotlin {
+    watchosX64()
+    watchosArm64()
+    watchosSimulatorArm64()
+}
+
 android {
     namespace = "dev.icerock.moko.resources.test"
 }

resources-test/src/watchosMain/kotlin/dev/icerock/moko/resources/test/MockResourcesFactory.kt

@@ -0,0 +1,11 @@
+/*
+ * Copyright 2021 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package dev.icerock.moko.resources.test
+
+import dev.icerock.moko.resources.FontResource
+import dev.icerock.moko.resources.ImageResource
+
+actual fun createImageResourceMock(): ImageResource = ImageResource("")
+actual fun createFontResourceMock(): FontResource = FontResource("")

resources/build.gradle.kts

@@ -13,6 +13,10 @@ plugins {
 }
 
 kotlin {
+    watchosX64()
+    watchosArm64()
+    watchosSimulatorArm64()
+
     sourceSets {
         getByName("jsMain") {
             dependencies {

resources/src/appleMain/kotlin/dev/icerock/moko/resources/FontResource.kt

@@ -5,9 +5,12 @@
 package dev.icerock.moko.resources
 
 import cnames.structs.__CFData
+import kotlinx.cinterop.BetaInteropApi
 import kotlinx.cinterop.CPointer
 import kotlinx.cinterop.ExperimentalForeignApi
+import kotlinx.cinterop.UnsafeNumber
 import kotlinx.cinterop.alloc
+import kotlinx.cinterop.convert
 import kotlinx.cinterop.memScoped
 import kotlinx.cinterop.ptr
 import kotlinx.cinterop.value
@@ -35,15 +38,15 @@ import platform.darwin.UInt8Var
 
 actual class FontResource(
     val fontName: String,
-    val bundle: NSBundle = NSBundle.mainBundle
+    val bundle: NSBundle = NSBundle.mainBundle,
 ) {
-    @OptIn(ExperimentalForeignApi::class)
+    @OptIn(ExperimentalForeignApi::class, UnsafeNumber::class)
     internal val fontRef: CGFontRef by lazy {
         val fontData: NSData = this.data
         val cfDataRef: CPointer<__CFData>? = CFDataCreate(
             kCFAllocatorDefault,
             fontData.bytes() as CPointer<UInt8Var>,
-            fontData.length.toLong()
+            fontData.length.toLong().convert()
         )
         val dataProvider = CGDataProviderCreateWithCFData(cfDataRef)
         val cgFont = CGFontCreateWithDataProvider(dataProvider)!!
@@ -62,14 +65,15 @@ actual class FontResource(
             ) ?: error("file $fontName not found in $bundle")
         }
 
+    @OptIn(BetaInteropApi::class)
     val data: NSData
         get() {
             val filePath: String = this.filePath
             return NSData.create(contentsOfFile = filePath)
                 ?: error("can't read $filePath file")
         }
 
-    @OptIn(ExperimentalForeignApi::class)
+    @OptIn(ExperimentalForeignApi::class, UnsafeNumber::class)
     @Throws(NSErrorException::class)
     @Suppress("unused")
     fun registerFont() {
@@ -78,13 +82,23 @@ actual class FontResource(
         // UNCHECKED_CAST - NSString and CFStringRef are toll-free bridged
         @Suppress("CAST_NEVER_SUCCEEDS", "UNCHECKED_CAST")
         val cfStringFilePath = CFBridgingRetain(filePath as NSString) as CFStringRef
-        val cfFontUrlRef = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, cfStringFilePath, kCFURLPOSIXPathStyle, false)
+        val cfFontUrlRef = CFURLCreateWithFileSystemPath(
+            kCFAllocatorDefault,
+            cfStringFilePath,
+            kCFURLPOSIXPathStyle,
+            false
+        )
 
         var nsError: NSError? = null
 
         memScoped {
             val error = alloc<CFErrorRefVar>()
-            if (!CTFontManagerRegisterFontsForURL(cfFontUrlRef, kCTFontManagerScopeProcess, error.ptr)) {
+            if (!CTFontManagerRegisterFontsForURL(
+                    cfFontUrlRef,
+                    kCTFontManagerScopeProcess,
+                    error.ptr
+                )
+            ) {
                 error.value?.let {
                     nsError = CFBridgingRelease(it) as NSError
                 }

resources/src/watchosMain/kotlin/dev/icerock/moko/resources/ColorResourceExt.kt

@@ -0,0 +1,15 @@
+/*
+ * Copyright 2020 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package dev.icerock.moko.resources
+
+import platform.UIKit.UIColor
+import platform.UIKit.colorNamed
+
+fun ColorResource.getUIColor(): UIColor {
+    val color: UIColor? = UIColor.colorNamed(name = this.name)
+    return requireNotNull(color) {
+        "Can't read color $name, please check moko-resources gradle configuration"
+    }
+}

resources/src/watchosMain/kotlin/dev/icerock/moko/resources/FontResourceExt.kt

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2024 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package dev.icerock.moko.resources
+
+import cnames.structs.__CTFont
+import kotlinx.cinterop.CPointer
+import kotlinx.cinterop.ExperimentalForeignApi
+import kotlinx.cinterop.UnsafeNumber
+import platform.CoreGraphics.CGFloat
+import platform.CoreText.CTFontCreateWithGraphicsFont
+import platform.Foundation.CFBridgingRelease
+import platform.UIKit.UIFont
+
+@OptIn(ExperimentalForeignApi::class, UnsafeNumber::class)
+fun FontResource.uiFont(withSize: Double): UIFont {
+    val ctFont: CPointer<__CTFont>? = CTFontCreateWithGraphicsFont(
+        graphicsFont = fontRef,
+        size = withSize.toFloat() as CGFloat,
+        matrix = null,
+        attributes = null
+    )
+
+    return CFBridgingRelease(ctFont) as UIFont
+}

resources/src/watchosMain/kotlin/dev/icerock/moko/resources/ImageResource.kt

@@ -0,0 +1,13 @@
+/*
+ * Copyright 2019 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package dev.icerock.moko.resources
+
+import platform.UIKit.UIImage
+
+actual class ImageResource(val assetImageName: String) {
+    fun toUIImage(): UIImage? {
+        return UIImage.imageNamed(name = assetImageName)
+    }
+}

resources/src/watchosMain/kotlin/dev/icerock/moko/resources/ResourceContainerExt.kt

@@ -0,0 +1,11 @@
+/*
+ * Copyright 2020 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package dev.icerock.moko.resources
+
+actual fun ResourceContainer<ImageResource>.getImageByFileName(fileName: String): ImageResource? {
+    return ImageResource(fileName).let { imgRes ->
+        if (imgRes.toUIImage() != null) imgRes else null
+    }
+}

resources/src/watchosMain/kotlin/dev/icerock/moko/resources/desc/color/ColorDescExt.kt

@@ -0,0 +1,33 @@
+/*
+ * Copyright 2023 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package dev.icerock.moko.resources.desc.color
+
+import dev.icerock.moko.graphics.Color
+import dev.icerock.moko.resources.getUIColor
+import kotlinx.cinterop.UnsafeNumber
+import platform.CoreGraphics.CGFloat
+import platform.UIKit.UIColor
+
+fun ColorDesc.getUIColor(): UIColor {
+    return when (this) {
+        is ColorDescResource -> resource.getUIColor()
+        is ColorDescSingle -> color.toUIColor()
+        // light / dark mode seems unsupported on watchos, fallback to lightColor
+        is ColorDescThemed -> lightColor.toUIColor()
+        else -> throw IllegalArgumentException("unknown class ${this::class}")
+    }
+}
+
+// TODO: Replace after update moko-graphics with support of WatchOS
+@OptIn(UnsafeNumber::class)
+private fun Color.toUIColor(): UIColor {
+    val maxColorValue = 0xFF
+    return UIColor(
+        red = red.toFloat() as CGFloat / maxColorValue,
+        green = green.toFloat() as CGFloat / maxColorValue,
+        blue = blue.toFloat() as CGFloat / maxColorValue,
+        alpha = alpha.toFloat() as CGFloat / maxColorValue
+    )
+}

samples/kotlin-ios-app/gradle.properties

@@ -1,7 +1,7 @@
 org.gradle.jvmargs=-Xmx12g
 org.gradle.parallel=true
 org.gradle.caching=true
-org.gradle.configuration-cache=true
+org.gradle.configuration-cache=false
 
 kotlin.code.style=official
 

samples/kotlin-ios-app/mpp-library/build.gradle.kts

@@ -10,16 +10,44 @@ plugins {
 kotlin {
     ios()
     iosSimulatorArm64()
-
+    val watchosX64 = watchosX64()
+    val watchosArm64 = watchosArm64()
+    val watchosSimulatorArm64 = watchosSimulatorArm64()
+    configure(listOf(watchosX64, watchosArm64, watchosSimulatorArm64)) {
+        binaries {
+            framework {
+                baseName = "MppLibrary"
+            }
+        }
+    }
+
+
     sourceSets {
-        val iosMain by getting {
+        val commonMain by getting
+
+        val appleMain by creating {
+            dependsOn(commonMain)
             dependencies {
                 api(moko.resources)
             }
         }
+
+        val iosMain by getting {
+            dependsOn(appleMain)
+        }
         val iosSimulatorArm64Main by getting {
             dependsOn(iosMain)
         }
+
+        val watchosMain by creating {
+            dependsOn(appleMain)
+        }
+        val watchosX64Main by getting
+        val watchosArm64Main by getting
+        val watchosSimulatorArm64Main by getting
+        watchosX64Main.dependsOn(watchosMain)
+        watchosArm64Main.dependsOn(watchosMain)
+        watchosSimulatorArm64Main.dependsOn(watchosMain)
     }
 }
 

samples/kotlin-ios-app/xcode-project/TestKotlinWatchApp/Assets.xcassets/AccentColor.colorset/Contents.json

@@ -0,0 +1,11 @@
+{
+  "colors" : [
+    {
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

samples/kotlin-ios-app/xcode-project/TestKotlinWatchApp/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -0,0 +1,13 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "platform" : "watchos",
+      "size" : "1024x1024"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

samples/kotlin-ios-app/xcode-project/TestKotlinWatchApp/Assets.xcassets/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

samples/kotlin-ios-app/xcode-project/TestKotlinWatchApp/ContentView.swift

@@ -0,0 +1,26 @@
+//
+//  ContentView.swift
+//  TestKotlinWatchApp
+//
+//  Created by Cornelli Fabio on 28/02/24.
+//  Copyright © 2024 IceRock Development. All rights reserved.
+//
+
+import SwiftUI
+import MppLibrary
+
+struct ContentView: View {
+    var body: some View {
+        VStack {
+            Image(systemName: "globe")
+                .imageScale(.large)
+                .foregroundStyle(.tint)
+            Text(Testing.shared.getHelloWorld().localized())
+        }
+        .padding()
+    }
+}
+
+#Preview {
+    ContentView()
+}

samples/kotlin-ios-app/xcode-project/TestKotlinWatchApp/TestKotlinWatchApp.swift

@@ -0,0 +1,18 @@
+//
+//  TestKotlinWatchApp.swift
+//  TestKotlinWatchApp
+//
+//  Created by Cornelli Fabio on 28/02/24.
+//  Copyright © 2024 IceRock Development. All rights reserved.
+//
+
+import SwiftUI
+
+@main
+struct TestKotlinWatchApp: App {
+    var body: some Scene {
+        WindowGroup {
+            ContentView()
+        }
+    }
+}