@momo-kits/native-kits 0.167.1-beta.13-debug → 0.167.1-beta.14

package/ios/Template/TrustBanner/TrustBanner.swift

@@ -11,7 +11,7 @@ import SDWebImageSwiftUI
 
 let jsonUrl = "https://static.momocdn.net/app/json/component-kits/design_system.json"
 
-public struct TrustBannerData: Decodable, Equatable {
+public struct TrustBannerData: Decodable {
     let content: [String: String]
     let subContent: [String: String]
     let pciImage: String
@@ -50,41 +50,9 @@ let defaultBanner = TrustBannerData(
     momoImage: "https://static.momocdn.net/app/img/kits/trustBanner/ic_secu.png"
 )
 
-// AI-GENERATED START: public init so the host can push its remote trust banner config
-public extension TrustBannerData {
-    /// Missing images / url fall back to the kit's default banner, like the view does per field.
-    init(
-        content: [String: String],
-        subContent: [String: String],
-        pciImage: String?,
-        sslImage: String?,
-        urlConfig: String?,
-        icons: [String]?,
-        momoImage: String?
-    ) {
-        self.init(
-            content: content,
-            subContent: subContent,
-            pciImage: pciImage ?? defaultBanner.pciImage,
-            sslImage: sslImage ?? defaultBanner.sslImage,
-            urlConfig: urlConfig ?? defaultBanner.urlConfig,
-            icons: icons ?? defaultBanner.icons,
-            momoImage: momoImage ?? defaultBanner.momoImage
-        )
-    }
-}
-// AI-GENERATED END: public init so the host can push its remote trust banner config
-
 public struct TrustBanner: View {
     @Environment(\.applicationEnvironment) var applicationEnvironment
     @Environment(\.localize) private var localize
-    // AI-GENERATED START: container config wins, else the host-pushed DesignSystemKits config (Compose parity)
-    @Environment(\.designSystemKitsConfigs) private var designSystemKitsConfigs
-
-    private var trustBanner: TrustBannerData? {
-        (applicationEnvironment.config ?? designSystemKitsConfigs.designSystemConfig)?.trustBanner
-    }
-    // AI-GENERATED END: container config wins, else the host-pushed DesignSystemKits config (Compose parity)
 
     var onPress: ((String)->Void)?
 
@@ -94,19 +62,19 @@ public struct TrustBanner: View {
 
     func onPressSecurity() {
         if (onPress != nil) {
-            onPress!(trustBanner?.urlConfig ?? defaultBanner.urlConfig)
+            onPress!(applicationEnvironment.config?.trustBanner?.urlConfig ?? defaultBanner.urlConfig)
         }
     }
     
     
     public var body: some View {
         HStack(alignment: .center, spacing: 8) {
-            WebImage(url: URL(string: trustBanner?.momoImage ?? defaultBanner.momoImage))
+            WebImage(url: URL(string: applicationEnvironment.config?.trustBanner?.momoImage ?? defaultBanner.momoImage))
                 .resizable()
                 .scaledToFit()
                 .frame(width: 64, height: 64)
             VStack(alignment: .leading){
-                Text(trustBanner?.content[localize.currentLanguage]
+                Text(applicationEnvironment.config?.trustBanner?.content[localize.currentLanguage]
                      ?? localize.translateData(defaultBanner.content))
                     .foregroundColor(Color(hex: "484848"))
                     .lineLimit(2)
@@ -116,7 +84,7 @@ public struct TrustBanner: View {
                     .padding(.bottom, 8)
                 HStack {
                     HStack(spacing: 0) {
-                        Text(trustBanner?.subContent[localize.currentLanguage]
+                        Text(applicationEnvironment.config?.trustBanner?.subContent[localize.currentLanguage]
                              ?? localize.translateData(defaultBanner.subContent))
                             .foregroundColor(Colors.pink03)
                             .font(.system(size: 13, weight: .bold))
@@ -130,11 +98,11 @@ public struct TrustBanner: View {
                     
                     Spacer()
                     HStack{
-                        WebImage(url:  URL(string: trustBanner?.pciImage ?? defaultBanner.pciImage))
+                        WebImage(url:  URL(string: applicationEnvironment.config?.trustBanner?.pciImage ?? defaultBanner.pciImage))
                             .resizable()
                             .scaledToFit()
                             .frame(width: 24, height: 20)
-                        WebImage(url:  URL(string: trustBanner?.sslImage ?? defaultBanner.sslImage))
+                        WebImage(url:  URL(string: applicationEnvironment.config?.trustBanner?.sslImage ?? defaultBanner.sslImage))
                             .resizable()
                             .scaledToFit()
                             .frame(width: 52, height: 20)

package/ios/Typography/FontScale.swift

@@ -52,7 +52,7 @@ public struct FontScale: Equatable {
     }
 
     /// A host-pushed mini-app context wins per field, matching Compose's
-    /// `context?.useOSScaleRate ?: DesignSystemKits.getConfigs().useOSScaleRate`.
+    /// `context?.useOSScaleRate ?: KitFontScale.useOSScaleRate`.
     public func overriding(userScaleRate: CGFloat?, useOSScaleRate: Bool?) -> FontScale {
         guard userScaleRate != nil || useOSScaleRate != nil else { return self }
         return FontScale(
@@ -66,7 +66,7 @@ public struct FontScale: Equatable {
 private struct FontScaleKey: EnvironmentKey {
     /// Computed, never stored: a bare `UIHostingController` root that never got `.momoFontScale()`
     /// still reads the live store instead of a value frozen at first access.
-    static var defaultValue: FontScale { DesignSystemKits.shared.fontScale }
+    static var defaultValue: FontScale { FontScaleStore.shared.snapshot }
 }
 
 public extension EnvironmentValues {
@@ -77,10 +77,9 @@ public extension EnvironmentValues {
 }
 
 public extension View {
-    /// Injects a Dynamic-Type-observing font scale plus `\.designSystemKitsConfigs` (whitelist, remote config)
-    /// and re-renders this subtree on change.
+    /// Injects a Dynamic-Type-observing font scale and re-renders this subtree on change.
     /// Use at every `UIHostingController` root that is not inside a `NavigationContainer`.
-    func momoFontScale(_ store: DesignSystemKits = .shared, context: MiniAppContext? = nil) -> some View {
+    func momoFontScale(_ store: FontScaleStore = .shared, context: MiniAppContext? = nil) -> some View {
         modifier(MomoFontScaleModifier(store: store, context: context))
     }
 }
@@ -88,19 +87,17 @@ public extension View {
 /// `@ObservedObject` is load-bearing, same as `MomoLocalizeModifier`: `@Environment(\.momoFontScale)`
 /// only invalidates when the boxed snapshot changes, which requires *this* body to re-run on publish.
 private struct MomoFontScaleModifier: ViewModifier {
-    @ObservedObject var store: DesignSystemKits
+    @ObservedObject var store: FontScaleStore
     let context: MiniAppContext?
 
     func body(content: Content) -> some View {
-        content
-            .environment(
-                \.momoFontScale,
-                store.fontScale.overriding(
-                    userScaleRate: context?.userScaleRate,
-                    useOSScaleRate: context?.useOSScaleRate
-                )
+        content.environment(
+            \.momoFontScale,
+            store.snapshot.overriding(
+                userScaleRate: context?.userScaleRate,
+                useOSScaleRate: context?.useOSScaleRate
             )
-            .environment(\.designSystemKitsConfigs, store.getConfigs())
+        )
     }
 }
 // AI-GENERATED END: reactive font-scale snapshot injected through the environment

package/ios/Typography/FontScaleStore.swift

@@ -0,0 +1,58 @@
+import SwiftUI
+
+/// App-wide font-scale inputs for the SwiftUI kit, and the single place they publish from.
+/// The host writes `update(...)` at startup (from the cache-backed `FontScaleProvider`) and again
+/// whenever the in-app font-size preference changes; the OS Dynamic Type factor is tracked here.
+/// Mirrors Compose's `KitFontScale` + `ProvideOsFontScale` pair, including its live behaviour —
+/// views re-render on change as long as the subtree got `.momoFontScale()` (`NavigationContainer`
+/// applies it). When `useOSScaleRate` is false the kit applies `userScaleRate` instead of the OS factor.
+public final class FontScaleStore: ObservableObject {
+    public static let shared = FontScaleStore()
+
+    @Published public private(set) var userScaleRate: CGFloat = 1
+    @Published public private(set) var useOSScaleRate: Bool = true
+    @Published public private(set) var osFontScale: CGFloat = FontScaleStore.currentOsFontScale()
+
+    private init() {
+        NotificationCenter.default.addObserver(
+            self,
+            selector: #selector(contentSizeCategoryDidChange),
+            name: UIContentSizeCategory.didChangeNotification,
+            object: nil
+        )
+    }
+
+    public var snapshot: FontScale {
+        FontScale(
+            userScaleRate: userScaleRate,
+            useOSScaleRate: useOSScaleRate,
+            osFontScale: osFontScale
+        )
+    }
+
+    public func update(userScaleRate: CGFloat, useOSScaleRate: Bool) {
+        onMain {
+            // Re-assigning an unchanged value would still publish and invalidate every kit subtree.
+            if self.userScaleRate != userScaleRate { self.userScaleRate = userScaleRate }
+            if self.useOSScaleRate != useOSScaleRate { self.useOSScaleRate = useOSScaleRate }
+        }
+    }
+
+    @objc private func contentSizeCategoryDidChange() {
+        let next = Self.currentOsFontScale()
+        guard next != osFontScale else { return }
+        osFontScale = next
+    }
+
+    /// Same factor Compose's iOS `ProvideOsFontScale` derives from
+    /// `UIFont.preferredFont(forTextStyle: .body).pointSize / 17`, so both iOS surfaces scale alike.
+    static func currentOsFontScale() -> CGFloat {
+        let base = UIFont.systemFont(ofSize: UIFont.labelFontSize)
+        return UIFontMetrics.default.scaledFont(for: base).pointSize / base.pointSize
+    }
+
+    /// Synchronous when already on main — an async hop would defer the change by a frame.
+    private func onMain(_ work: @escaping () -> Void) {
+        if Thread.isMainThread { work() } else { DispatchQueue.main.async(execute: work) }
+    }
+}

package/ios/Typography/KitDesignSystem.swift

@@ -0,0 +1,17 @@
+import Foundation
+
+/// Design-system rollout flag for the SwiftUI kit, mirroring Compose's `KitDesignSystem`.
+/// The kit is sandboxed and can't read the host config, so the host writes `update(_:)` once at
+/// startup from `DesignSystemConfig`. Startup-only and non-reactive, like `FontScaleStore` was
+/// before it gained live updates: there is no SwiftUI navigation container to re-render from.
+public final class KitDesignSystem {
+    public static let shared = KitDesignSystem()
+
+    public private(set) var isWhiteList: Bool = false
+
+    private init() {}
+
+    public func update(isWhiteList: Bool) {
+        self.isWhiteList = isWhiteList
+    }
+}

package/ios/Typography/Text.swift

@@ -4,7 +4,7 @@ import SwiftUI
 /// free functions). Inside a SwiftUI view prefer `@Environment(\.momoFontScale)` so the view
 /// re-renders when Dynamic Type or the host preference changes.
 public func scaleSize(_ size: CGFloat) -> CGFloat {
-    DesignSystemKits.shared.fontScale(size)
+    FontScaleStore.shared.snapshot(size)
 }
 
 @available(*, deprecated, message: "Max font scale is fixed at 1.5; this override is no longer applied. Drop the second argument.")
@@ -99,9 +99,9 @@ public extension TypographyStyle {
     }
 }
 
-private func momoFontName(family: String, weight: Font.Weight, isWhiteList: Bool) -> String? {
+private func momoFontName(family: String, weight: Font.Weight) -> String? {
     // Ngoai whitelist thi tra nil de momoFont() roi ve .system(...), dung nhu truoc DS-791.
-    guard isWhiteList else { return nil }
+    guard KitDesignSystem.shared.isWhiteList else { return nil }
     guard family == "MomoTrustSans" else { return nil }
     switch weight {
     case .ultraLight, .thin: return "MomoTrustSans-ExtraLight"
@@ -115,8 +115,8 @@ private func momoFontName(family: String, weight: Font.Weight, isWhiteList: Bool
     }
 }
 
-private func momoFont(size: CGFloat, weight: Font.Weight, family: String, isWhiteList: Bool) -> Font {
-    guard let name = momoFontName(family: family, weight: weight, isWhiteList: isWhiteList),
+private func momoFont(size: CGFloat, weight: Font.Weight, family: String) -> Font {
+    guard let name = momoFontName(family: family, weight: weight),
           UIFont(name: name, size: size) != nil else {
         return .system(size: size, weight: weight)
     }
@@ -126,8 +126,6 @@ private func momoFont(size: CGFloat, weight: Font.Weight, family: String, isWhit
 public struct MomoText: View {
     @Environment(\.appTheme) private var theme
     @Environment(\.momoFontScale) private var fontScale
-    // From the environment, not DesignSystemKits.shared, so a whitelist flip re-renders the text.
-    @Environment(\.designSystemKitsConfigs) private var designSystemKitsConfigs
     private let content: String
     private let typography: TypographyStyle
     private let color: Color?
@@ -188,12 +186,7 @@ public struct MomoText: View {
     private var baseText: SwiftUI.Text {
         let keywords = highlightText.filter { !$0.isEmpty }.sorted { $0.count > $1.count }
         guard !keywords.isEmpty else { return SwiftUI.Text(content) }
-        let highlightFont = momoFont(
-            size: fontScale(typography.fontSize),
-            weight: TypographyStyle.headerXsSemibold.fontWeight,
-            family: theme.font,
-            isWhiteList: designSystemKitsConfigs.isWhiteList
-        )
+        let highlightFont = momoFont(size: fontScale(typography.fontSize), weight: TypographyStyle.headerXsSemibold.fontWeight, family: theme.font)
         func isWordChar(_ character: Character?) -> Bool {
             guard let character else { return false }
             return character.isLetter || character.isNumber || character == "_"
@@ -230,12 +223,7 @@ public struct MomoText: View {
         let isStrikethrough = strikethrough || typography.isStrikethrough
 
         var text = baseText
-            .font(momoFont(
-                size: fontScale(typography.fontSize),
-                weight: typography.fontWeight,
-                family: theme.font,
-                isWhiteList: designSystemKitsConfigs.isWhiteList
-            ))
+            .font(momoFont(size: fontScale(typography.fontSize), weight: typography.fontWeight, family: theme.font))
             .foregroundColor(textColor)
             .strikethrough(isStrikethrough, color: textColor)
             .underline(underline, color: textColor)

package/ios/Typography/Typography.swift

@@ -10,12 +10,12 @@ public extension View {
 }
 
 public extension Font {
-    /// Non-reactive: resolves against the current `DesignSystemKits` font scale at each access. The
+    /// Non-reactive: resolves against the current `FontScaleStore` snapshot at each access. The
     /// styles below are computed properties for that reason — as stored `static let`s they would
     /// freeze the scale at first access and never pick up a Dynamic Type change.
     /// Inside a view, `@Environment(\.momoFontScale)` + `fontScale.font(size:weight:)` also re-renders.
     static func appFont(size: CGFloat) -> Font {
-        DesignSystemKits.shared.fontScale.font(size: size)
+        FontScaleStore.shared.snapshot.font(size: size)
     }
 
     // New supported typography styles

package/ios/native-kits.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'MoMoUIKits'
-  s.version          = '0.167.1-beta.9'
+  s.version          = '0.167.1-beta.14'
   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.9'
+  s.version          = '0.167.1-beta.14'
   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.167.1-beta.13-debug",
+  "version": "0.167.1-beta.14",
   "private": false,
   "dependeNavigationncies": {},
   "devDependencies": {},

package/build.gradle.kts

@@ -1,11 +0,0 @@
-plugins {
-    // this is necessary to avoid the plugins to be loaded multiple times
-    // in each subproject's classloader
-    alias(libs.plugins.android.application) apply false
-    alias(libs.plugins.android.library) apply false
-    alias(libs.plugins.compose) apply false
-    alias(libs.plugins.kotlin.compose.compiler) apply false
-    alias(libs.plugins.jetbrains.kotlin.multiplatform) apply false
-    alias(libs.plugins.jetbrains.kotlin.serialization) apply false
-    alias(libs.plugins.vanniktech.mavenPublish) apply false
-}

package/compose/build.gradle.kts

@@ -1,190 +0,0 @@
-// import com.vanniktech.maven.publish.JavadocJar
-// import com.vanniktech.maven.publish.KotlinMultiplatform
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-
-plugins {
-    alias(libs.plugins.jetbrains.kotlin.multiplatform)
-    alias(libs.plugins.android.library)
-    alias(libs.plugins.compose)
-    alias(libs.plugins.kotlin.compose.compiler)
-//         alias(libs.plugins.vanniktech.mavenPublish)
-    id(libs.plugins.jetbrains.kotlin.cocoapods.get().pluginId)
-    kotlin("plugin.serialization")
-}
-
-val gitlabName: String = findProperty("name") as String? ?: ""
-val gitlabRepo: String = findProperty("repo") as String? ?: ""
-val gitlabUrl: String = findProperty("url") as String? ?: ""
-val gitlabGroup: String = findProperty("group") as String? ?: ""
-val gitlabArtifactId: String = findProperty("artifact.id") as String? ?: ""
-val gitlabVersion: String = findProperty("version") as String? ?: ""
-val gitlabUser: String = findProperty("gitlab.user") as String? ?: ""
-val gitlabKey: String = findProperty("gitlab.password") as String? ?: ""
-
-kotlin {
-    androidTarget {
-        compilerOptions {
-            jvmTarget.set(JvmTarget.JVM_17)
-        }
-        publishLibraryVariants("release")
-    }
-
-    val fwName = gitlabArtifactId
-    val iosTargets = listOf(iosArm64(), iosSimulatorArm64())
-    iosTargets.forEach {
-        it.binaries.framework {
-            baseName = fwName
-            binaryOption("bundleId", "$gitlabGroup.$fwName")
-            isStatic = true
-        }
-    }
-
-    cocoapods {
-        version = "0.167.1-beta.13-debug"
-        summary = "IOS Shared module"
-        homepage = "https://momo.vn"
-        ios.deploymentTarget = "15.0"
-
-        framework {
-            baseName = fwName
-            isStatic = true
-        }
-
-        pod("lottie-ios") {
-            moduleName = "Lottie"
-            version = "4.4.3"
-            extraOpts += listOf("-compiler-option", "-fmodules")
-        }
-    }
-
-    sourceSets {
-        all {
-            languageSettings.optIn("vn.momo.kits.modifier.InternalApi")
-        }
-        commonMain.dependencies {
-            implementation(compose.runtime)
-            implementation(compose.material)
-            implementation(compose.material3)
-            implementation(compose.components.resources)
-            implementation(libs.compose.ui.backhandler)
-            implementation(libs.ktor.client.core)
-            implementation(libs.jetbrains.coroutines.core)
-            implementation(libs.navigation.multiplatform)
-            implementation(libs.coil.multiplatform.compose)
-            implementation(libs.coil.multiplatform.core)
-            implementation(libs.coil.multiplatform.network.ktor)
-            implementation(libs.jetbrains.serialization.json)
-            implementation(libs.kotlinx.datetime)
-            api(libs.native.max.api)
-            implementation(libs.compottie)
-            implementation(libs.gif.image)
-        }
-        androidMain.dependencies {
-            implementation(libs.ktor.client.okhttp)
-            implementation(libs.airbnb.lottie)
-        }
-        iosMain.dependencies {
-            implementation(libs.ktor.client.darwin)
-        }
-    }
-}
-
-android {
-    namespace = "vn.momo.kits.kits"
-    compileSdk = 35
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
-    defaultConfig {
-        minSdk = 24
-    }
-}
-
-dependencies {
-}
-
-repositories {
-    google {
-        mavenContent {
-            includeGroupAndSubgroups("androidx")
-            includeGroupAndSubgroups("com.android")
-            includeGroupAndSubgroups("com.google")
-        }
-    }
-    mavenCentral()
-    maven { url = uri("https://maven.pkg.jetbrains.space/public/p/compose/dev") }
-    maven {
-        url = uri("https://gitlab.mservice.com.vn/api/v4/projects/5400/packages/maven")
-        credentials {username = "download_packages"; password = "gldt-bjDqLpU_sPcHDuXau2ws" }
-    }
-    maven {
-        url = uri("https://artifacts.mservice.com.vn/repository/maven-momo-app/")
-        credentials {
-            username = "viewer"
-            password = "viewer"
-        }
-        isAllowInsecureProtocol = true
-    }
-}
-
-compose {
-    resources {
-        publicResClass = true
-        packageOfResClass = "vn.momo.uikits.resources"
-        generateResClass = always
-    }
-}
-
-// publishing {
-//     repositories {
-//         maven {
-//             name = "${gitlabRepo}Packages"
-//             credentials {
-//                 username = gitlabUser
-//                 password = gitlabKey
-//             }
-//             url = uri("$gitlabUrl")
-//         }
-//     }
-// }
-
-// mavenPublishing {
-//     configure(
-//         KotlinMultiplatform(
-//             javadocJar = JavadocJar.Empty(),
-//             sourcesJar = true,
-//             androidVariantsToPublish = listOf("release")
-//         )
-//     )
-// 
-//     repositories {
-//         maven {
-//             name = "${gitlabRepo}Packages"
-//             credentials { username = gitlabUser; password = gitlabKey }
-//             url = uri("$gitlabUrl")
-//         }
-//     }
-// 
-//     coordinates(gitlabGroup.toString(), gitlabArtifactId, gitlabVersion.toString())
-// 
-//     pom {
-//         name = "$gitlabName Klib"
-//         description = "$gitlabName"
-//         url = "https://gitlab.mservice.com.vn"
-//         licenses {
-//             license {
-//                 name = "The Apache License, Version 2.0"
-//                 url = "https://www.apache.org/licenses/LICENSE-2.0.txt"
-//                 distribution = "https://www.apache.org/licenses/LICENSE-2.0.txt"
-//             }
-//         }
-//         developers {
-//             developer {
-//                 id = "kotlin-hands-on"
-//                 name = "Kotlin Developer Advocate"
-//                 url = "https://github.com/kotlin-hands-on/"
-//             }
-//         }
-//     }
-// }