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

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 {
+public struct TrustBannerData: Decodable, Equatable {
     let content: [String: String]
     let subContent: [String: String]
     let pciImage: String
@@ -50,9 +50,41 @@ 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)?
 
@@ -62,19 +94,19 @@ public struct TrustBanner: View {
 
     func onPressSecurity() {
         if (onPress != nil) {
-            onPress!(applicationEnvironment.config?.trustBanner?.urlConfig ?? defaultBanner.urlConfig)
+            onPress!(trustBanner?.urlConfig ?? defaultBanner.urlConfig)
         }
     }
     
     
     public var body: some View {
         HStack(alignment: .center, spacing: 8) {
-            WebImage(url: URL(string: applicationEnvironment.config?.trustBanner?.momoImage ?? defaultBanner.momoImage))
+            WebImage(url: URL(string: trustBanner?.momoImage ?? defaultBanner.momoImage))
                 .resizable()
                 .scaledToFit()
                 .frame(width: 64, height: 64)
             VStack(alignment: .leading){
-                Text(applicationEnvironment.config?.trustBanner?.content[localize.currentLanguage]
+                Text(trustBanner?.content[localize.currentLanguage]
                      ?? localize.translateData(defaultBanner.content))
                     .foregroundColor(Color(hex: "484848"))
                     .lineLimit(2)
@@ -84,7 +116,7 @@ public struct TrustBanner: View {
                     .padding(.bottom, 8)
                 HStack {
                     HStack(spacing: 0) {
-                        Text(applicationEnvironment.config?.trustBanner?.subContent[localize.currentLanguage]
+                        Text(trustBanner?.subContent[localize.currentLanguage]
                              ?? localize.translateData(defaultBanner.subContent))
                             .foregroundColor(Colors.pink03)
                             .font(.system(size: 13, weight: .bold))
@@ -98,11 +130,11 @@ public struct TrustBanner: View {
                     
                     Spacer()
                     HStack{
-                        WebImage(url:  URL(string: applicationEnvironment.config?.trustBanner?.pciImage ?? defaultBanner.pciImage))
+                        WebImage(url:  URL(string: trustBanner?.pciImage ?? defaultBanner.pciImage))
                             .resizable()
                             .scaledToFit()
                             .frame(width: 24, height: 20)
-                        WebImage(url:  URL(string: applicationEnvironment.config?.trustBanner?.sslImage ?? defaultBanner.sslImage))
+                        WebImage(url:  URL(string: 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 ?: KitFontScale.useOSScaleRate`.
+    /// `context?.useOSScaleRate ?: DesignSystemKits.getConfigs().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 { FontScaleStore.shared.snapshot }
+    static var defaultValue: FontScale { DesignSystemKits.shared.fontScale }
 }
 
 public extension EnvironmentValues {
@@ -77,9 +77,10 @@ public extension EnvironmentValues {
 }
 
 public extension View {
-    /// Injects a Dynamic-Type-observing font scale and re-renders this subtree on change.
+    /// Injects a Dynamic-Type-observing font scale plus `\.designSystemKitsConfigs` (whitelist, remote config)
+    /// and re-renders this subtree on change.
     /// Use at every `UIHostingController` root that is not inside a `NavigationContainer`.
-    func momoFontScale(_ store: FontScaleStore = .shared, context: MiniAppContext? = nil) -> some View {
+    func momoFontScale(_ store: DesignSystemKits = .shared, context: MiniAppContext? = nil) -> some View {
         modifier(MomoFontScaleModifier(store: store, context: context))
     }
 }
@@ -87,17 +88,19 @@ 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: FontScaleStore
+    @ObservedObject var store: DesignSystemKits
     let context: MiniAppContext?
 
     func body(content: Content) -> some View {
-        content.environment(
-            \.momoFontScale,
-            store.snapshot.overriding(
-                userScaleRate: context?.userScaleRate,
-                useOSScaleRate: context?.useOSScaleRate
+        content
+            .environment(
+                \.momoFontScale,
+                store.fontScale.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/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 {
-    FontScaleStore.shared.snapshot(size)
+    DesignSystemKits.shared.fontScale(size)
 }
 
 @available(*, deprecated, message: "Max font scale is fixed at 1.5; this override is no longer applied. Drop the second argument.")
@@ -99,7 +99,9 @@ public extension TypographyStyle {
     }
 }
 
-private func momoFontName(family: String, weight: Font.Weight) -> String? {
+private func momoFontName(family: String, weight: Font.Weight, isWhiteList: Bool) -> String? {
+    // Ngoai whitelist thi tra nil de momoFont() roi ve .system(...), dung nhu truoc DS-791.
+    guard isWhiteList else { return nil }
     guard family == "MomoTrustSans" else { return nil }
     switch weight {
     case .ultraLight, .thin: return "MomoTrustSans-ExtraLight"
@@ -113,8 +115,8 @@ private func momoFontName(family: String, weight: Font.Weight) -> String? {
     }
 }
 
-private func momoFont(size: CGFloat, weight: Font.Weight, family: String) -> Font {
-    guard let name = momoFontName(family: family, weight: weight),
+private func momoFont(size: CGFloat, weight: Font.Weight, family: String, isWhiteList: Bool) -> Font {
+    guard let name = momoFontName(family: family, weight: weight, isWhiteList: isWhiteList),
           UIFont(name: name, size: size) != nil else {
         return .system(size: size, weight: weight)
     }
@@ -124,6 +126,8 @@ private func momoFont(size: CGFloat, weight: Font.Weight, family: String) -> Fon
 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?
@@ -184,7 +188,12 @@ 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)
+        let highlightFont = momoFont(
+            size: fontScale(typography.fontSize),
+            weight: TypographyStyle.headerXsSemibold.fontWeight,
+            family: theme.font,
+            isWhiteList: designSystemKitsConfigs.isWhiteList
+        )
         func isWordChar(_ character: Character?) -> Bool {
             guard let character else { return false }
             return character.isLetter || character.isNumber || character == "_"
@@ -221,7 +230,12 @@ public struct MomoText: View {
         let isStrikethrough = strikethrough || typography.isStrikethrough
 
         var text = baseText
-            .font(momoFont(size: fontScale(typography.fontSize), weight: typography.fontWeight, family: theme.font))
+            .font(momoFont(
+                size: fontScale(typography.fontSize),
+                weight: typography.fontWeight,
+                family: theme.font,
+                isWhiteList: designSystemKitsConfigs.isWhiteList
+            ))
             .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 `FontScaleStore` snapshot at each access. The
+    /// Non-reactive: resolves against the current `DesignSystemKits` font scale 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 {
-        FontScaleStore.shared.snapshot.font(size: size)
+        DesignSystemKits.shared.fontScale.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.4'
+  s.version          = '0.167.1-beta.9'
   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.4'
+  s.version          = '0.167.1-beta.9'
   s.summary          = 'Demo browser for MoMoUIKits SwiftUI components'
   s.homepage         = 'https://momo.vn'
   s.license          = { :type => 'MIT' }

package/ios-demo/README.md

@@ -0,0 +1,120 @@
+# MoMoUIKitsDemo
+
+SwiftUI demo browser for `MoMoUIKits`.
+
+The package can optionally host a Compose UIKits screen by receiving a
+`UIViewController` factory from the host app. It does not import the KMP
+`shared` module directly.
+
+SwiftUI mode reuses the full demo screen set from
+`sample/iosApp/iosApp/Demo`, including the sample `HomeView` registry and demo
+screens for all currently available components.
+
+## CocoaPods
+
+In the host app `Podfile`, include both local pods:
+
+```ruby
+pod 'MoMoUIKits', :path => '../momo-native-kits/ios/native-kits.podspec'
+pod 'MoMoUIKitsDemo', :path => '../momo-native-kits/ios-demo'
+```
+
+Adjust the relative paths to match the host app checkout.
+
+## Host App Usage
+
+```swift
+import MoMoUIKitsDemo
+import shared
+
+class UIKitsViewController: BaseComposeAppViewController {
+  override func getViewController() -> UIViewController? {
+    let params = self.application.data as? [String: Any]
+
+    return MoMoUIKitsDemoViewControllerFactory.make(
+      context: MoMoUIKitsDemoContext(
+        appId: params?["appId"] as? String ?? "",
+        appCode: params?["code"] as? String ?? "",
+        appName: params?["name"] as? String,
+        appIcon: params?["icon"] as? String ?? ""
+      ),
+      composeViewController: {
+        UIKitsScreenComposeViewControllerKt.UIKitsScreenComposeViewController(
+          params: params
+        )
+      }
+    )
+  }
+
+  override func viewDidDisappear(_ animated: Bool) {
+    super.viewDidDisappear(animated)
+    composeViewController = nil
+  }
+}
+```
+
+If the host does not pass `composeViewController`, the demo opens directly in
+SwiftUI mode.
+
+## Included SwiftUI Demos
+
+The pod includes the sample demo screens for:
+
+- Animated Header
+- Avatar
+- Badge
+- Baseline View
+- Bottom Tab
+- Button
+- Carousel
+- Checkbox
+- Chip
+- Collapse
+- DateTimePicker
+- Divider
+- Header User
+- Icon Button
+- Image
+- Information
+- Input
+- Input DropDown
+- Input Money
+- Input OTP
+- Input Phone Number
+- Input Search
+- Input TextArea
+- Loader
+- Navigation
+- Pagination
+- Popup Display
+- Popup Notify
+- Popup Promotion
+- Progress Info
+- Radio
+- Rating
+- Skeleton
+- Slider
+- SnackBar
+- Stepper
+- Steps
+- Suggest Action
+- Swipe
+- Switch
+- TabView
+- Tag
+- Theme
+- Title
+- Tooltip
+- Typography
+- Uploader
+
+## Validation Notes
+
+Validated locally with:
+
+```sh
+pod ipc spec ios/MoMoUIKits.podspec
+pod ipc spec ios-demo/MoMoUIKitsDemo.podspec
+pod lib lint ios/MoMoUIKits.podspec --allow-warnings --skip-import-validation
+pod lib lint ios-demo/MoMoUIKitsDemo.podspec --allow-warnings --skip-import-validation --include-podspecs=ios/MoMoUIKits.podspec
+```

package/package.json

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

package/settings.gradle.kts

@@ -0,0 +1,64 @@
+import org.gradle.kotlin.dsl.maven
+
+rootProject.name = "momo-native-kits"
+enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
+
+pluginManagement {
+    repositories {
+        google {
+            mavenContent {
+                includeGroupAndSubgroups("androidx")
+                includeGroupAndSubgroups("com.android")
+                includeGroupAndSubgroups("com.google")
+            }
+        }
+        mavenCentral()
+        gradlePluginPortal()
+        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
+        }
+    }
+}
+
+dependencyResolutionManagement {
+    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
+        }
+    }
+}
+
+include(":compose")
+
+include(":sample:androidApp")
+include(":sample:shared")

package/ios/Typography/FontScaleStore.swift

@@ -1,58 +0,0 @@
-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

@@ -1,17 +0,0 @@
-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
-    }
-}