@momo-kits/native-kits 0.168.1-beta.10-debug → 0.168.1-beta.11-debug

package/CLAUDE.md

@@ -82,6 +82,7 @@ Publishing is automated (`publish.sh` + GitLab CI on `[ci build]` / `main`). Do
 - Quick return header: glass headers and Animated headers (with a `ScrollState`) on the Duo side bar layout slide out with the content and back in on a reverse scroll; a half-shown header settles in or out once the scroll stops. The side bar is drawn apart from the header, so it stays put.
 - Overlays on Duo: popups cap at 440pt wide and the room between `duoTopInset` and the bottom inset (body scrolls, actions stay); modal centers inside that room; bottom sheet uses the window height, centers at width ≥ 600 and pads by side insets in landscape.
 - Font scale deliberately uses the short side (`min(w, h)`), unlike RN which reads the window width — landscape must not inflate every font.
+- Font scale measures the **window**, never `UIScreen.main`: on iPhone Duo the main screen stays on one display while the window follows the one in use. Compose iOS `getScreenDimensions()` reads `LocalWindowInfo.containerSize` (recomposes on fold/unfold); SwiftUI `DesignSystemKits` KVO-observes each `UIWindowScene.effectiveGeometry` and republishes `windowShortSide`.
 - `StackScreen` pads content/footer/search/FAB by the side insets and provides an inset-consumed layout to its content; a bottom-tab root stays full width (tab bar + each tab's StackScreen handle insets). Grid columns use `contentWidth`.
 
 ## i18n / Localize (port of RN `Localize`)

package/compose/build.gradle.kts

@@ -40,7 +40,7 @@ kotlin {
     }
 
     cocoapods {
-        version = "0.168.1-beta.10-debug"
+        version = "0.168.1-beta.11-debug"
         summary = "IOS Shared module"
         homepage = "https://momo.vn"
         ios.deploymentTarget = "15.0"

package/compose/compose.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
     spec.name                     = 'compose'
-    spec.version                  = '0.167.1-beta.22-debug'
+    spec.version                  = '0.168.1-beta.11-debug'
     spec.homepage                 = 'https://momo.vn'
     spec.source                   = { :http=> ''}
     spec.authors                  = ''

package/compose/src/iosMain/kotlin/vn/momo/kits/platform/Platform.ios.kt

@@ -21,6 +21,8 @@ import androidx.compose.ui.backhandler.BackHandler as ComposeBackHandler
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.NativePaint
 import androidx.compose.ui.graphics.toArgb
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.LocalWindowInfo
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.viewinterop.UIKitInteropProperties
@@ -29,8 +31,6 @@ import cocoapods.lottie_ios.CompatibleAnimation
 import cocoapods.lottie_ios.CompatibleAnimationKeypath
 import cocoapods.lottie_ios.CompatibleAnimationView
 import kotlinx.cinterop.ExperimentalForeignApi
-import kotlinx.cinterop.get
-import kotlinx.cinterop.memScoped
 import androidx.navigationevent.NavigationEventDispatcher
 import androidx.navigationevent.NavigationEventDispatcherOwner
 import org.jetbrains.skia.FilterBlurMode
@@ -38,7 +38,6 @@ import org.jetbrains.skia.MaskFilter
 import platform.Foundation.NSBundle
 import platform.UIKit.UIColor
 import platform.UIKit.UIDevice
-import platform.UIKit.UIScreen
 import platform.UIKit.UIUserInterfaceIdiomPhone
 import vn.momo.kits.navigation.AttachHostBackGesture
 import vn.momo.kits.navigation.Navigator
@@ -48,15 +47,17 @@ actual fun getPlatformName(): String = "iOS"
 actual fun isPhoneIdiom(): Boolean =
     UIDevice.currentDevice.userInterfaceIdiom == UIUserInterfaceIdiomPhone
 
-@OptIn(ExperimentalForeignApi::class)
+// AI-GENERATED START: window size, not UIScreen.main (stays on one display on iPhone Duo); recomposes on fold/unfold
 @Composable
-actual fun getScreenDimensions(): ScreenDimension = memScoped {
-    val config = UIScreen.mainScreen.bounds.ptr[0]
+actual fun getScreenDimensions(): ScreenDimension {
+    val density = LocalDensity.current
+    val size = LocalWindowInfo.current.containerSize
     return ScreenDimension(
-        config.size.width.toInt(),
-        config.size.height.toInt()
+        (size.width / density.density).toInt(),
+        (size.height / density.density).toInt()
     )
 }
+// AI-GENERATED END: window size, not UIScreen.main (stays on one display on iPhone Duo); recomposes on fold/unfold
 
 actual fun NativePaint.setMaskFilter(blurRadius: Float) {
     this.maskFilter = MaskFilter.makeBlur(FilterBlurMode.NORMAL, blurRadius / 2, true)

package/gradle.properties

@@ -18,7 +18,7 @@ kotlin.apple.xcodeCompatibility.nowarn=true
 name="ComposeKits"
 group=vn.momo.kits
 artifact.id=kits
-version=0.167.1-beta.22
+version=0.168.1-beta.11
 
 repo=GitLab
 url=https://gitlab.mservice.com.vn/api/v4/projects/5400/packages/maven

package/ios/Application/DesignSystemKits.swift

@@ -36,6 +36,10 @@ public final class DesignSystemKits: ObservableObject {
 
     @Published private var configs = DesignSystemKitsConfigs()
     @Published public private(set) var osFontScale: CGFloat = DesignSystemKits.currentOsFontScale()
+    // AI-GENERATED START: republish the font scale when the window scene is resized (iPhone Duo fold/unfold)
+    @Published public private(set) var windowShortSide: CGFloat = DesignSystemKits.currentWindowShortSide()
+    private var geometryObservations: [ObjectIdentifier: NSKeyValueObservation] = [:]
+    // AI-GENERATED END: republish the font scale when the window scene is resized (iPhone Duo fold/unfold)
 
     private init() {
         NotificationCenter.default.addObserver(
@@ -44,6 +48,19 @@ public final class DesignSystemKits: ObservableObject {
             name: UIContentSizeCategory.didChangeNotification,
             object: nil
         )
+        // AI-GENERATED START: republish the font scale when the window scene is resized (iPhone Duo fold/unfold)
+        NotificationCenter.default.addObserver(
+            self,
+            selector: #selector(sceneDidActivate(_:)),
+            name: UIScene.didActivateNotification,
+            object: nil
+        )
+        onMain {
+            UIApplication.shared.connectedScenes
+                .compactMap { $0 as? UIWindowScene }
+                .forEach(self.observeGeometry(of:))
+        }
+        // AI-GENERATED END: republish the font scale when the window scene is resized (iPhone Duo fold/unfold)
     }
 
     public func setConfigs(_ configs: DesignSystemKitsConfigs) {
@@ -62,7 +79,10 @@ public final class DesignSystemKits: ObservableObject {
         FontScale(
             userScaleRate: configs.userScaleRate,
             useOSScaleRate: configs.useOSScaleRate,
-            osFontScale: osFontScale
+            osFontScale: osFontScale,
+            // AI-GENERATED START: republish the font scale when the window scene is resized (iPhone Duo fold/unfold)
+            windowShortSide: windowShortSide
+            // AI-GENERATED END: republish the font scale when the window scene is resized (iPhone Duo fold/unfold)
         )
     }
 
@@ -72,6 +92,49 @@ public final class DesignSystemKits: ObservableObject {
         osFontScale = next
     }
 
+    // AI-GENERATED START: republish the font scale when the window scene is resized (iPhone Duo fold/unfold)
+    @objc private func sceneDidActivate(_ notification: Notification) {
+        guard let scene = notification.object as? UIWindowScene else { return }
+        observeGeometry(of: scene)
+        refreshWindowShortSide()
+    }
+
+    private func observeGeometry(of scene: UIWindowScene) {
+        guard #available(iOS 16.0, *) else { return }
+        let key = ObjectIdentifier(scene)
+        guard geometryObservations[key] == nil else { return }
+        geometryObservations[key] = scene.observe(\.effectiveGeometry, options: [.new]) { [weak self] _, _ in
+            // The window is resized after the scene geometry, so read it on the next turn.
+            DispatchQueue.main.async { self?.refreshWindowShortSide() }
+        }
+    }
+
+    private func refreshWindowShortSide() {
+        let next = Self.currentWindowShortSide()
+        guard next > 0, next != windowShortSide else { return }
+        windowShortSide = next
+    }
+
+    /// UIScreen.main stays on one display on iPhone Duo, so measure the foreground window instead.
+    static func currentWindowShortSide() -> CGFloat {
+        guard Thread.isMainThread else {
+            return min(UIScreen.main.bounds.width, UIScreen.main.bounds.height)
+        }
+        let scenes = UIApplication.shared.connectedScenes.compactMap { $0 as? UIWindowScene }
+        let scene = scenes.first { $0.activationState == .foregroundActive } ?? scenes.first
+        let window = scene?.windows.first { $0.isKeyWindow } ?? scene?.windows.first
+        let size: CGSize
+        if let window, window.bounds.width > 0 {
+            size = window.bounds.size
+        } else if let scene {
+            size = scene.coordinateSpace.bounds.size
+        } else {
+            size = UIScreen.main.bounds.size
+        }
+        return min(size.width, size.height)
+    }
+    // AI-GENERATED END: republish the font scale when the window scene is resized (iPhone Duo fold/unfold)
+
     /// Same factor Compose's iOS `ProvideOsFontScale` derives from
     /// `UIFont.preferredFont(forTextStyle: .body).pointSize / 17`, so both iOS surfaces scale alike.
     static func currentOsFontScale() -> CGFloat {

package/ios/Typography/FontScale.swift

@@ -19,11 +19,19 @@ public struct FontScale: Equatable {
     public let useOSScaleRate: Bool
     /// OS Dynamic Type factor at the time the snapshot was taken.
     public let osFontScale: CGFloat
+    // AI-GENERATED START: device scale from the app window, not UIScreen.main (fixed to one display on iPhone Duo)
+    public let windowShortSide: CGFloat
 
-    public init(userScaleRate: CGFloat = 1, useOSScaleRate: Bool = true, osFontScale: CGFloat = 1) {
+    public init(
+        userScaleRate: CGFloat = 1,
+        useOSScaleRate: Bool = true,
+        osFontScale: CGFloat = 1,
+        windowShortSide: CGFloat? = nil
+    ) {
         self.userScaleRate = userScaleRate
         self.useOSScaleRate = useOSScaleRate
         self.osFontScale = osFontScale
+        self.windowShortSide = windowShortSide ?? DesignSystemKits.currentWindowShortSide()
     }
 
     /// `callAsFunction` so call sites keep reading like Compose's `scaleSize(16)`.
@@ -31,8 +39,8 @@ public struct FontScale: Equatable {
         guard useOSScaleRate else { return size * userScaleRate }
 
         // Short side, not width: landscape must not inflate every font (and so every popup's height).
-        let bounds = UIScreen.main.bounds.size
-        let deviceScale = min(bounds.width, bounds.height) / Self.defaultScreenSize
+        let deviceScale = windowShortSide / Self.defaultScreenSize
+    // AI-GENERATED END: device scale from the app window, not UIScreen.main (fixed to one display on iPhone Duo)
 
         var deviceScaled = size
         var osScaled = size
@@ -58,7 +66,10 @@ public struct FontScale: Equatable {
         return FontScale(
             userScaleRate: userScaleRate ?? self.userScaleRate,
             useOSScaleRate: useOSScaleRate ?? self.useOSScaleRate,
-            osFontScale: osFontScale
+            osFontScale: osFontScale,
+            // AI-GENERATED START: keep the window size through context overrides
+            windowShortSide: windowShortSide
+            // AI-GENERATED END: keep the window size through context overrides
         )
     }
 }

package/ios/native-kits.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'MoMoUIKits'
-  s.version          = '0.167.1-beta.22'
+  s.version          = '0.168.1-beta.11'
   s.summary          = 'MoMoUIKits for iOS'
   s.homepage         = 'https://momo.vn'
   s.license          = { :type => 'MIT' }

package/ios-demo/MoMoUIKitsDemo.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'MoMoUIKitsDemo'
-  s.version          = '0.167.1-beta.22'
+  s.version          = '0.168.1-beta.11'
   s.summary          = 'Demo browser for MoMoUIKits SwiftUI components'
   s.homepage         = 'https://momo.vn'
   s.license          = { :type => 'MIT' }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.168.1-beta.10-debug",
+  "version": "0.168.1-beta.11-debug",
   "private": false,
   "dependeNavigationncies": {},
   "devDependencies": {},