@momo-kits/native-kits 0.162.2-beta.26 → 0.162.2-beta.27

package/CLAUDE.md

@@ -40,7 +40,7 @@ Publishing is automated (`publish.sh` + GitLab CI on `[ci build]` / `main`). Do
 ## Architecture essentials
 
 - **Entry point:** wrap content in `NavigationContainer(...)` from `navigation/`. It builds the `Navigator`, takes a host-supplied `Localize` (falls back to an empty one), and provides the CompositionLocals below. **Do not use** `ApplicationContainer` (`application/NavigationContainer.kt`) — deprecated and does **not** wire `LocalLocalize` / `LocalNavigator` / `LocalMaxApi`.
-- **Configuration flows via CompositionLocals**, not params. Public ones: `AppTheme`, `AppStatusBar`, `AppNavigationBar` (`const/Theme.kt`); `ApplicationContext`, `AppConfig`, `AppLanguage`, `LocalLocalize` (`application/`); `LocalNavigator`, `LocalMaxApi` (`navigation/`). Read with `X.current`.
+- **Configuration flows via CompositionLocals**, not params. Public ones: `AppTheme`, `AppStatusBar`, `AppNavigationBar` (`const/Theme.kt`); `ApplicationContext`, `AppConfig`, `AppLanguage`, `LocalLocalize`, `ScaleSizeMaxRate` (`application/`); `LocalNavigator`, `LocalMaxApi` (`navigation/`). Read with `X.current`.
 - **Platform code** goes through `expect`/`actual` in `platform/` — never reference Android/iOS APIs from `commonMain` directly.
 - **Native bridge:** `IMaxApi` (`vn.momo.maxapi`, exposed as `LocalMaxApi`) is the host-app bridge (dismiss, tracking, device info, language).
 - Navigation uses a runtime `DynamicScreenRegistry`; overlays (modal/bottom-sheet/snackbar) go through `Navigator` + `OverplayComponentRegistry`.

package/ios/Application/ApplicationEnvironment.swift

@@ -48,14 +48,3 @@ public class ApplicationEnvironment: ObservableObject {
         self.config = config
     }
 }
-
-private struct ApplicationEnvironmentKey: EnvironmentKey {
-    static let defaultValue = ApplicationEnvironment()
-}
-
-public extension EnvironmentValues {
-    var applicationEnvironment: ApplicationEnvironment {
-        get { self[ApplicationEnvironmentKey.self] }
-        set { self[ApplicationEnvironmentKey.self] = newValue }
-    }
-}

package/ios/Application/Components.swift

@@ -83,8 +83,9 @@ public struct HeaderBackground: View {
         self.headerTransparent = headerTransparent
         self.fullScreenContent = fullScreenContent
     }
-
+    
     public var body: some View {
+        
         let statusBarHeight = safeAreaTopInset()
         let opacity = max(0, 1 - scrollState / 200)
         let height = fullScreenContent ? 0 :  statusBarHeight + 52
@@ -100,6 +101,21 @@ public struct HeaderBackground: View {
                         .frame(height: height)
                         .shadow(color: Colors.black20.opacity(0.2), radius: 10, x: 0, y: -2)
                         .background(backgroundColor)
+                        .overlay(
+                            headerTransparent ? AnyView(EmptyView()) :
+                            AnyView(
+                                Rectangle()
+                                    .fill(LinearGradient(
+                                        gradient: Gradient(colors: [
+                                            Color(red: 1, green: 0.8, blue: 0.87),
+                                            Color(red: 1, green: 0.8, blue: 0.87).opacity(0.5)
+                                        ]),
+                                        startPoint: .top,
+                                        endPoint: .bottom))
+                                    .opacity(opacity)
+                                    .frame(height: height))
+                        )
+
                     if !headerTransparent {
                         Rectangle()
                             .fill(Color.black.opacity(0.1))
@@ -132,26 +148,12 @@ public struct HeaderBackground: View {
     }
 }
 
-// MARK: - Header right width preference
-
-/// Reports the measured width of the header-right area so the animated search
-/// header can compute its trailing inset (mirrors Compose's headerRightWidthPx).
-public struct HeaderRightWidthKey: PreferenceKey {
-    public static var defaultValue: CGFloat = 0
-    public static func reduce(value: inout CGFloat, nextValue: () -> CGFloat) {
-        value = max(value, nextValue())
-    }
-}
-
 // MARK: - Header View
 
 public struct Header: View {
     var headerType: HeaderType = .default
     var titlePosition: TitlePosition
     var title: String
-    /// Optional rich title (mirrors Compose's `HeaderTitle`); `.user` renders an
-    /// avatar group instead of `title`. Defaults to nil → plain `title` text.
-    var headerTitle: HeaderTitle?
     var headerRight:  (()->any View)? = {HeaderRight()}
     var goBack: (() -> Void)?
     var opacity: CGFloat = 1
@@ -159,27 +161,22 @@ public struct Header: View {
     var scrollState: CGFloat = 0
     var inputSearchProps: InputSearchProps?
     var tintColor: Color?
-    /// Title opacity; used by the animated search header to fade the title out on scroll.
-    var titleOpacity: CGFloat = 1
 
     public init(
         headerType: HeaderType = .default,
         titlePosition: TitlePosition,
         title: String,
-        headerTitle: HeaderTitle? = nil,
         headerRight:  (()->any View)? = {HeaderRight()},
         goBack: (() -> Void)? = nil,
         opacity: CGFloat = 1,
         animatedHeader: AnimatedHeader? = nil,
         scrollState: CGFloat = 0,
         inputSearchProps: InputSearchProps? = nil,
-        tintColor: Color? = nil,
-        titleOpacity: CGFloat = 1
+        tintColor: Color? = nil
     ) {
         self.headerType = headerType
         self.titlePosition = titlePosition
         self.title = title
-        self.headerTitle = headerTitle
         self.headerRight = headerRight
         self.goBack = goBack
         self.opacity = opacity
@@ -187,11 +184,10 @@ public struct Header: View {
         self.scrollState = scrollState
         self.inputSearchProps = inputSearchProps
         self.tintColor = tintColor
-        self.titleOpacity = titleOpacity
     }
-
+    
     public var body: some View {
-
+        
         let backgroundButtonColor: Color = tintColor == Colors.black01 ? Colors.black20.opacity(0.6) : Colors.black01.opacity(0.6)
         let borderColor: Color = tintColor == Colors.black01 ? Colors.black01.opacity(0.2) : Colors.black20.opacity(0.2)
 
@@ -216,9 +212,6 @@ public struct Header: View {
 
                         if let headerRight = headerRight {
                             AnyView(headerRight())
-                                .background(GeometryReader { geo in
-                                    Color.clear.preference(key: HeaderRightWidthKey.self, value: geo.size.width)
-                                })
                         }
                     }
                     .padding(.horizontal, 12)
@@ -230,16 +223,33 @@ public struct Header: View {
                         }
 
                         if let inputProps = inputSearchProps {
-                            InputSearch(props: inputProps)
-                        } else if case let .user(userData)? = headerTitle {
-                            if #available(iOS 16.0, *) {
-                                HeaderUserView(userData)
-                            }
+                            InputSearch(
+                                text: inputProps.$text,
+                                buttonText: inputProps.buttonText,
+                                showButtonText: inputProps.showButtonText,
+                                showBorder: inputProps.showBorder,
+                                placeholder: inputProps.placeholder,
+                                onChangeText: inputProps.onChangeText,
+                                onPressButtonText: inputProps.onPressButtonText,
+                                error: inputProps.error,
+                                disabled: inputProps.disabled,
+                                icon: inputProps.icon,
+                                iconColor: inputProps.iconColor,
+                                onRightIconPressed: inputProps.onRightIconPressed,
+                                onFocus: inputProps.onFocus,
+                                onBlur: inputProps.onBlur,
+                                loading: inputProps.loading,
+                                fontWeight: inputProps.fontWeight,
+                                keyboardType: inputProps.keyboardType
+                            )
                         } else {
-                            MomoText(headerTitle?.defaultTitle ?? title, typography: .headerDefaultBold, color: tintColor ?? Colors.black17, maxLines: 1)
-                                .opacity(titleOpacity)
+                            Text(title)
+                                .font(.system(size: 17, weight: .bold))
+                                .ignoreBoldTextSetting()
+                                .foregroundColor(tintColor ?? Colors.black17)
                                 .frame(maxWidth: titlePosition == .center ? UIScreen.main.bounds.width - 252 : nil)
                                 .frame(maxWidth: titlePosition == .center ? .infinity : UIScreen.main.bounds.width - 172, alignment: titlePosition == .center ? .center : .leading)
+                                .lineLimit(1)
                         }
 
                         Spacer()

package/ios/Application/FloatingButton.swift

@@ -3,16 +3,11 @@ import Combine
 
 public enum FABSize {
     case small
-    case `default`
-    /// Backward-compatible alias for older iOS call sites. Compose names this
-    /// size `DEFAULT`.
     case large
+    
 }
 
 public enum FABPosition {
-    case end
-    /// Backward-compatible alias for older iOS call sites. Compose names this
-    /// position `END`.
     case right
     case center
 }
@@ -36,10 +31,10 @@ public struct FabProps {
         label: String? = nil,
         onClick: (() -> Void)? = nil,
         containerColor: Color? = Colors.primary,
-        size: FABSize? = .default,
+        size: FABSize? = .small,
         iconSize: CGFloat? = nil,
         scrollOffset: CGFloat? = nil,
-        position: FABPosition? = .end,
+        position: FABPosition? = .right,
         bottomPadding: CGFloat? = nil,
         renderComponent: (() -> AnyView)? = nil
     ) {
@@ -70,7 +65,7 @@ public struct FloatingButton: View {
     private var keyboardOffset: CGFloat
     private var scrollOffset: CGFloat
     private var bottomPadding: CGFloat { props.bottomPadding ?? 12 + keyboardOffset}
-    private var position: FABPosition? { props.position ?? .end }
+    private var position: FABPosition? { props.position ?? .right }
     private var containerColor: Color? { props.containerColor ?? Colors.primary }
     private var iconColor: Color? { props.iconColor ?? .white }
     private var label: String? { props.label }
@@ -157,7 +152,11 @@ public struct FloatingButton: View {
             if let label = label {
                 if showText {
                     Spacer().frame(width: 8)
-                    MomoText(label, typography: .actionDefaultBold, color: .white, maxLines: 1)
+                    Text(label)
+                        .foregroundColor(.white)
+                        .font(.system(size: scaleSize(16), weight: .bold))
+                        .ignoreBoldTextSetting()
+                        .lineLimit(1)
                         .background(
                             GeometryReader { geo in
                                 Color.clear.onAppear {

package/ios/Application/HeaderRight.swift

@@ -101,98 +101,69 @@ struct ToolkitHeaderRight: View {
     var tintColor: Color?
     @State private var isFavorite: Bool = false
     @State private var isLoading: Bool = false
-    @Environment(\.applicationEnvironment) private var environment
-
-    private func apiValue(_ value: Any?) -> Any {
-        value ?? NSNull()
-    }
-
-    private var contextMap: [String: Any] {
-        let context = environment.applicationContext
-        return [
-            "appId": apiValue(context?.appId),
-            "code": apiValue(context?.appCode),
-            "name": apiValue(context?.appName),
-            "icon": apiValue(context?.appIcon),
-            "description": apiValue(context?.description),
-            "support": apiValue(context?.support),
-            "toolkitConfig": apiValue(context?.toolkitConfig),
-            "providerId": apiValue(context?.providerId),
-            "permissions": apiValue(context?.permissions)
-        ]
-    }
-
-    private var shouldShowShortcut: Bool {
-        headerRight?.useShortcut == true && !(headerRight?.useMore == true && environment.applicationContext == nil)
-    }
-
-    private func parseResponse(_ response: String) -> Any? {
-        guard let jsonData = response.data(using: .utf8),
-              let json = try? JSONSerialization.jsonObject(with: jsonData) as? [String: Any] else {
-            return nil
-        }
-        return json["response"]
-    }
+    @EnvironmentObject private var environment: ApplicationEnvironment
     
     // MARK: - Actions
-    private func loadFavoriteState() {
-        environment.composeApi?.request(
-            funcName: "isFavoriteApp",
-            params: ["code": apiValue(environment.applicationContext?.appCode)]
-        ) { response in
-            if let isFavorite = parseResponse(response) as? Bool {
-                self.isFavorite = isFavorite
-            }
-        }
-    }
-
     private func onPressShortcut() {
         environment.composeApi?.request(
             funcName: "onToolAction",
-            params: [
-                "item": ["key": "onFavorite"],
-                "context": contextMap
-            ]
-        ) { response in
-            if let result = parseResponse(response) as? [String: Any],
-               result["success"] as? Bool == true {
-                isFavorite.toggle()
-            }
+            params: ["item": ["key": "onFavorite"]]
+        ) { _ in
+            isFavorite.toggle()
         }
     }
     
     private func onPressHelpCenter() {
+        let context = environment.applicationContext
+        let paramMap: [String: Any] = [
+            "appId": context?.appId,
+            "code": context?.appCode,
+            "name": context?.appName,
+            "icon": context?.appIcon,
+            "description": context?.description
+        ]
         environment.composeApi?.request(
             funcName: "showHelpCenter",
-            params: [
-                "appId": apiValue(environment.applicationContext?.appId),
-                "code": apiValue(environment.applicationContext?.appCode),
-                "name": apiValue(environment.applicationContext?.appName),
-                "icon": apiValue(environment.applicationContext?.appIcon),
-                "description": apiValue(environment.applicationContext?.description)
-            ]
+            params: paramMap
         ) { _ in }
     }
     
     private func onPressClose() {
         environment.composeApi?.request(
             funcName: "dismissAll",
-            params: nil
+            params: ""
         ) { _ in }
     }
     
     private func onPressMore() {
+        let context = environment.applicationContext
         let params: [String: Any] = [
-            "useSystemTools": headerRight?.useSystemTools ?? true,
+            "useSystemTools": headerRight?.useSystemTools,
             "tools": headerRight?.tools.map { $0.toMap() } ?? [],
-            "context": contextMap
+            "context": [
+                "appId": context?.appId,
+                "code": context?.appCode,
+                "name": context?.appName,
+                "icon": context?.appIcon,
+                "description": context?.description,
+                "support": context?.support,
+                "toolkitConfig": context?.toolkitConfig,
+                "providerId": context?.providerId,
+                "permissions": context?.permissions
+            ]
         ]
         environment.composeApi?.request(
             funcName: "showTools",
             params: params
         ) { response in
-            if let toolResponse = parseResponse(response) as? String {
-                headerRight?.toolCallback?(toolResponse)
+            do {
+                if let jsonData = response.data(using: .utf8),
+                   let json = try JSONSerialization.jsonObject(with: jsonData) as? [String: Any],
+                   let toolResponse = json["response"] as? String {
+                    headerRight?.toolCallback?(toolResponse)
+                }
+            } catch {
+                print("Error parsing response:", error)
             }
         }
     }
@@ -224,7 +195,7 @@ struct ToolkitHeaderRight: View {
         } ?? false
         
         HStack(alignment: .center, spacing: 0) {
-            if shouldShowShortcut {
+            if headerRight?.useShortcut == true {
                 NavigationButton(
                     disabled: isLoading,
                     icon: navButtonConfig.icon,
@@ -235,17 +206,15 @@ struct ToolkitHeaderRight: View {
             }
             
             HStack(alignment: .center, spacing: 0) {
-                if environment.applicationContext != nil {
-                    Icon(source: "help_center", size: 20, color: tintColor ?? Colors.black17)
-                        .padding(4)
-                        .onTapGesture {
-                            onPressHelpCenter()
-                        }
-                    
-                    Rectangle()
-                        .fill(tintColor ?? Colors.black20)
-                        .frame(width: 0.5, height: 12)
-                }
+                Icon(source: "help_center", size: 20, color: tintColor ?? Colors.black17)
+                    .padding(4)
+                    .onTapGesture {
+                        onPressHelpCenter()
+                    }
+                
+                Rectangle()
+                    .fill(tintColor ?? Colors.black20)
+                    .frame(width: 0.5, height: 12)
                 
                 Icon(source: "16_basic_home", size: 20, color: tintColor ?? Colors.black17)
                     .padding(4)
@@ -262,9 +231,6 @@ struct ToolkitHeaderRight: View {
             )
             .padding(.leading, Spacing.S)
         }
-        .onAppear {
-            loadFavoriteState()
-        }
     }
 }
 

package/ios/Application/Screen.swift

@@ -229,7 +229,6 @@ public struct Screen<Content: View>: View {
 struct Footer: View {
     var footerView: AnyView
     var keyboardSize: CGFloat
-    var bottomInset: CGFloat = 0
 
     var body: some View {
         VStack {
@@ -237,7 +236,7 @@ struct Footer: View {
         }
         .padding(.vertical, Spacing.S)
         .padding(.horizontal, Spacing.M)
-        .padding(.bottom, keyboardSize - bottomInset)
+        .padding(.bottom, keyboardSize)
         .background(Colors.black01)
         .overlay(
             Rectangle()

package/ios/Badge/Badge.swift

@@ -1,7 +1,6 @@
 import SwiftUI
 
 public struct Badge: View {
-    @Environment(\.appTheme) private var theme
     let label: String
     let backgroundColor: Color?
     
@@ -39,21 +38,24 @@ public struct Badge: View {
     }
     
     private var badgeColor: Color {
-        // Default colors based on label type
-        let defaultColor: Color = isNumber(label)
-            ? theme.colors.error.primary
-            : theme.colors.warning.primary
-
-        // Mirror Compose: only apply backgroundColor when it is one of the
-        // allowed primaryColors; otherwise fall back to the label-based default.
-        if let bgColor = backgroundColor, primaryColors.contains(bgColor) {
+        // If a custom background color is provided, use it
+        if let bgColor = backgroundColor {
             return bgColor
         }
-        return defaultColor
+        
+        // Otherwise, use default colors based on label type
+        if isNumber(label) {
+            return Colors.red03 // error.primary
+        } else {
+            return Colors.orange03 // warning.primary
+        }
     }
     
     public var body: some View {
-        MomoText(formatTitle(label), typography: .actionXxsBold, color: Colors.black01)
+        Text(formatTitle(label))
+            .font(.system(size: scaleSize(10), weight: .bold))
+            .ignoreBoldTextSetting()
+            .foregroundColor(Colors.black01)
             .padding(.horizontal, Spacing.XS)
             .frame(minWidth: scaleSize(16), minHeight: scaleSize(16))
             .background(badgeColor)
@@ -81,3 +83,4 @@ struct Badge_Previews: PreviewProvider {
     }
 }
 #endif
+

package/ios/Badge/BadgeRibbon.swift

@@ -77,11 +77,10 @@ public enum RibbonPosition {
 }
 
 public struct BadgeRibbon: View {
-    @Environment(\.appTheme) private var theme
     let position: RibbonPosition
     let label: String
     let isRound: Bool
-    let backgroundColor: Color?
+    let backgroundColor: Color
     
     public init(
         position: RibbonPosition = .topRight,
@@ -92,7 +91,7 @@ public struct BadgeRibbon: View {
         self.position = position
         self.label = label
         self.isRound = isRound
-        self.backgroundColor = backgroundColor
+        self.backgroundColor = backgroundColor ?? Colors.orange03
     }
     
     private var rotation: Angle {
@@ -118,8 +117,6 @@ public struct BadgeRibbon: View {
     }
     
     public var body: some View {
-        let bgColor = backgroundColor ?? theme.colors.warning.primary
-
         HStack(alignment: verticalAlignment, spacing: 0) {
             if useUpTail {
                 upTail
@@ -128,18 +125,22 @@ public struct BadgeRibbon: View {
             }
             
             if isRound {
-                roundContent(backgroundColor: bgColor)
+                roundContent
             } else {
-                skewContent(backgroundColor: bgColor)
+                skewContent
             }
         }
         .frame(height: RibbonConstants.ribbonHeight)
         .rotationEffect(rotation)
     }
     
-    private func roundContent(backgroundColor: Color) -> some View {
+    private var roundContent: some View {
         HStack(spacing: 0) {
-            MomoText(label, typography: .labelXsMedium, color: Colors.black01, maxLines: 1)
+            Text(label)
+                .font(.system(size: scaleSize(12), weight: .medium))
+                .ignoreBoldTextSetting()
+                .foregroundColor(Colors.black01)
+                .lineLimit(1)
                 .rotationEffect(rotation)
         }
         .frame(height: RibbonConstants.roundHeight)
@@ -155,9 +156,13 @@ public struct BadgeRibbon: View {
         )
     }
     
-    private func skewContent(backgroundColor: Color) -> some View {
+    private var skewContent: some View {
         HStack(spacing: 0) {
-            MomoText(label, typography: .labelXsMedium, color: Colors.black01, maxLines: 1)
+            Text(label)
+                .font(.system(size: scaleSize(12), weight: .medium))
+                .ignoreBoldTextSetting()
+                .foregroundColor(Colors.black01)
+                .lineLimit(1)
                 .rotationEffect(rotation)
                 .frame(height: RibbonConstants.skewBodyHeight)
                 .padding(.horizontal, 8)
@@ -174,6 +179,7 @@ public struct BadgeRibbon: View {
         )
         .frame(width: RibbonConstants.headTailWidth, height: RibbonConstants.headTailHeight)
         .rotationEffect(.degrees(180))
+        .offset(x: 1)
         .clipped()
     }
     
@@ -183,6 +189,7 @@ public struct BadgeRibbon: View {
             placeholder: AnyView(Color.clear)
         )
         .frame(width: RibbonConstants.headTailWidth, height: RibbonConstants.headTailHeight)
+        .offset(x: 1)
         .clipped()
     }
     
@@ -192,6 +199,7 @@ public struct BadgeRibbon: View {
             placeholder: AnyView(Color.clear)
         )
         .frame(width: RibbonConstants.skewTailWidth, height: RibbonConstants.skewTailHeight)
+        .offset(x: -2)
         .clipped()
     }
 }
@@ -201,7 +209,7 @@ private struct RibbonConstants {
     static let ribbonHeight: CGFloat = 20
     static let roundHeight: CGFloat = 16
     static let skewBodyHeight: CGFloat = 16
-    static let roundRightRadius: CGFloat = 12
+    static let roundRightRadius: CGFloat = 8
     static let roundPaddingEnd: CGFloat = 6
     static let skewTailWidth: CGFloat = 8
     static let skewTailHeight: CGFloat = 16
@@ -233,3 +241,4 @@ struct BadgeRibbon_Previews: PreviewProvider {
     }
 }
 #endif
+