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

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
+

package/ios/Button/Button.swift

@@ -31,45 +31,33 @@ public struct ButtonStyleData {
 
 public extension ButtonType {
     func backgroundColor(loading: Bool) -> Color {
-        backgroundColor(loading: loading, theme: defaultTheme)
-    }
-
-    func backgroundColor(loading: Bool, theme: Theme) -> Color {
         switch self {
-        case .disabled: return theme.colors.background.disable.opacity(loading ? 0.75 : 1)
-        case .primary: return theme.colors.primary.opacity(loading ? 0.75 : 1)
-        case .secondary: return theme.colors.background.surface.opacity(loading ? 0.75 : 1)
-        case .outline: return theme.colors.background.surface.opacity(loading ? 0.75 : 1)
-        case .tonal: return theme.colors.background.tonal.opacity(loading ? 0.75 : 1)
-        case .danger: return theme.colors.error.primary.opacity(loading ? 0.75 : 1)
+        case .disabled: return Colors.black05.opacity(loading ? 0.75 : 1)
+        case .primary: return Colors.primary.opacity(loading ? 0.75 : 1)
+        case .secondary: return Colors.card.opacity(loading ? 0.75 : 1)
+        case .outline: return Colors.card.opacity(loading ? 0.75 : 1)
+        case .tonal: return Colors.primaryLight.opacity(loading ? 0.75 : 1)
+        case .danger: return Colors.error.opacity(loading ? 0.75 : 1)
         case .text: return .clear
         }
     }
 
     func contentColor(loading: Bool) -> Color {
-        contentColor(loading: loading, theme: defaultTheme)
-    }
-
-    func contentColor(loading: Bool, theme: Theme) -> Color {
         switch self {
-        case .disabled: return theme.colors.text.disable.opacity(loading ? 0.75 : 1)
+        case .disabled: return Colors.black06.opacity(loading ? 0.75 : 1)
         case .primary: return Colors.black01
-        case .secondary: return theme.colors.text.default
-        case .outline: return theme.colors.primary
-        case .tonal: return theme.colors.primary
+        case .secondary: return Colors.black17
+        case .outline: return Colors.primary
+        case .tonal: return Colors.primary
         case .danger: return Colors.black01
-        case .text: return theme.colors.primary
+        case .text: return Colors.primary
         }
     }
 
     var borderColor: Color? {
-        borderColor(theme: defaultTheme)
-    }
-
-    func borderColor(theme: Theme) -> Color? {
         switch self {
-        case .outline: return theme.colors.primary
-        case .secondary: return theme.colors.border.default
+        case .outline: return Colors.primary
+        case .secondary: return Colors.black04
         default: return nil
         }
     }
@@ -129,7 +117,6 @@ extension ButtonSize {
 }
 
 public struct Button: View {
-    @Environment(\.appTheme) private var theme
     var title: String
     var action: () -> Void
     var type: ButtonType
@@ -138,7 +125,6 @@ public struct Button: View {
     var iconRight: AnyView?
     var isFull: Bool
     var loading: Bool
-    var useTintColor: Bool
 
     public init(
         title: String = "",
@@ -148,8 +134,7 @@ public struct Button: View {
         iconLeft: AnyView? = nil,
         iconRight: AnyView? = nil,
         isFull: Bool = true,
-        loading: Bool = false,
-        useTintColor: Bool = true
+        loading: Bool = false
     ) {
         self.title = title
         self.action = action
@@ -159,7 +144,6 @@ public struct Button: View {
         self.iconRight = iconRight
         self.isFull = isFull
         self.loading = loading
-        self.useTintColor = useTintColor
     }
 
     private func shouldLoadingOnLeft(_ left: AnyView?, _ right: AnyView?) -> Bool {
@@ -176,15 +160,14 @@ public struct Button: View {
 
     public var body: some View {
         let loadingOnLeft = shouldLoadingOnLeft(iconLeft, iconRight)
-        let isEnabled = type != .disabled && !loading
 
-        let bg = type.backgroundColor(loading: loading, theme: theme)
-        let fg = type.contentColor(loading: loading, theme: theme)
-        let border = type.borderColor(theme: theme)
+        let bg = type.backgroundColor(loading: loading)
+        let fg = type.contentColor(loading: loading)
+        let border = type.borderColor
         let borderWidth = type.borderWidth
 
         SwiftUI.Button(action: {
-            if isEnabled {
+            if !loading, type != .disabled {
                 action()
             }
         }) {
@@ -195,7 +178,7 @@ public struct Button: View {
                         .colorMultiply(fg)
 
                 } else if let iconLeft = iconLeft {
-                    tintedIcon(iconLeft, color: fg)
+                    iconLeft.frame(width: size.iconSize, height: size.iconSize)
                 }
 
                 MomoText(title, typography: size.typographyStyle, color: fg)
@@ -208,7 +191,7 @@ public struct Button: View {
                         .colorMultiply(fg)
 
                 } else if let iconRight = iconRight {
-                    tintedIcon(iconRight, color: fg)
+                    iconRight.frame(width: size.iconSize, height: size.iconSize)
                 }
             }
             .frame(maxWidth: isFull ? .infinity : nil)
@@ -220,30 +203,8 @@ public struct Button: View {
                     .strokeBorder(border ?? .clear, lineWidth: border != nil ? borderWidth : 0)
             )
             .clipShape(RoundedRectangle(cornerRadius: size.radius))
+            .opacity(loading ? 0.75 : 1)
         }
-        .buttonStyle(ButtonPressFeedbackStyle(isEnabled: isEnabled))
-        .disabled(!isEnabled)
-    }
-
-    @ViewBuilder
-    private func tintedIcon(_ icon: AnyView, color: Color) -> some View {
-        if useTintColor {
-            icon
-                .frame(width: size.iconSize, height: size.iconSize)
-                .colorMultiply(color)
-        } else {
-            icon
-                .frame(width: size.iconSize, height: size.iconSize)
-        }
-    }
-}
-
-private struct ButtonPressFeedbackStyle: ButtonStyle {
-    let isEnabled: Bool
-
-    func makeBody(configuration: Configuration) -> some View {
-        configuration.label
-            .opacity(configuration.isPressed && isEnabled ? 0.5 : 1)
-            .animation(.easeInOut(duration: 0.1), value: configuration.isPressed)
+        .disabled(type == .disabled || loading)
     }
 }

package/ios/Checkbox/Checkbox.swift

@@ -2,7 +2,6 @@ import Foundation
 import SwiftUI
 
 public struct Checkbox: View{
-    @Environment(\.appTheme) private var theme
     @Binding var checked: Bool
     var disabled: Bool
     var onChange: ((Bool)->Void)?
@@ -38,11 +37,11 @@ public struct Checkbox: View{
                     )
 
                 if checked {
-                    Image(systemName: indeterminate ? "minus" : "checkmark")
+                    Image(systemName: indeterminate ? "minus.square.fill" : "checkmark.square.fill")
                         .resizable()
-                        .scaledToFit()
-                        .foregroundColor(Colors.black01)
-                        .frame(width: 12, height: 12)
+                        .foregroundColor(backgroundColor)
+                        .background(Colors.black01)
+                        .frame(width: 20, height: 20)
                 }
             }
 
@@ -54,28 +53,28 @@ public struct Checkbox: View{
 
             // Title
             if !title.isEmpty {
-                MomoText(title, typography: .descriptionDefaultRegular)
+                Text(title)
+                    .font(.description1)
+                    .ignoreBoldTextSetting()
             }
         }
     }
 
     private var borderColor: Color {
-        if disabled && checked {
-            return theme.colors.background.tonal
-        } else if disabled {
-            return theme.colors.border.disable
+        if disabled {
+            return Colors.black03
         } else if checked {
-            return theme.colors.primary
+            return Colors.primary
         } else {
-            return theme.colors.text.default
+            return Colors.text
         }
     }
 
     private var backgroundColor: Color {
         if disabled && checked {
-            return theme.colors.background.tonal
+            return Colors.pink08
         } else if checked {
-            return theme.colors.primary
+            return Colors.primary
         } else {
             return Color.clear
         }

package/ios/Chip/Chip.swift

@@ -2,18 +2,17 @@ import SwiftUI
 import Foundation
 
 public struct Chip: View {
-    @Environment(\.appTheme) private var theme
     public enum ChipSize { case small, large }
 
     public struct Dimensions {
-        let height: CGFloat
         let horizontal: CGFloat
+        let vertical: CGFloat
         let iconSize: CGFloat
         let iconSpacing: CGFloat
     }
 
-    public static let Large = Dimensions(height: 32, horizontal: 12, iconSize: 20, iconSpacing: 4)
-    public static let Small = Dimensions(height: 24, horizontal: 10, iconSize: 16, iconSpacing: 4)
+    public static let Large = Dimensions(horizontal: 12, vertical: 8, iconSize: 20, iconSpacing: 8)
+    public static let Small = Dimensions(horizontal: 10, vertical: 6, iconSize: 16, iconSpacing: 6)
 
     private let label: String?
     private let iconLeft: String?
@@ -54,14 +53,14 @@ public struct Chip: View {
         let dims = (size == .small) ? Self.Small : Self.Large
 
         let bg: Color = {
-            if selected { return theme.colors.background.selected }
+            if selected { return Colors.pink10 }
             if let explicit = backgroundColor { return explicit }
             return Colors.black03
         }()
 
-        let textColor: Color = selected ? theme.colors.primary : theme.colors.text.default
-        let leftTint: Color = selected ? theme.colors.primary : iconLeftTint ?? theme.colors.text.default
-        let rightTint: Color = selected ? theme.colors.primary : iconRightTint ?? theme.colors.text.default
+        let textColor: Color = selected ? Colors.primary : Colors.text
+        let leftTint: Color = selected ? Colors.primary : iconLeftTint ?? Colors.text
+        let rightTint: Color = selected ? Colors.primary : iconRightTint ?? Colors.text
 
         HStack(spacing: dims.iconSpacing) {
             if let iconLeft {
@@ -78,7 +77,7 @@ public struct Chip: View {
             }
         }
         .padding(.horizontal, dims.horizontal)
-        .frame(height: dims.height)
+        .padding(.vertical, dims.vertical)
         .background(
             RoundedRectangle(cornerRadius: Radius.L, style: .continuous)
                 .fill(bg)
@@ -87,24 +86,11 @@ public struct Chip: View {
             Group {
                 if selected {
                     RoundedRectangle(cornerRadius: Radius.L, style: .continuous)
-                        .stroke(theme.colors.secondary, lineWidth: 2)
+                        .stroke(Colors.primary, lineWidth: 2)
                 }
             }
         )
         .contentShape(RoundedRectangle(cornerRadius: Radius.L, style: .continuous))
         .onTapGesture(perform: onClick)
-        .modifier(ChipAccessibilityModifier(accessibilityLabel: accessibilityLabel))
-    }
-}
-
-private struct ChipAccessibilityModifier: ViewModifier {
-    let accessibilityLabel: String?
-
-    func body(content: Content) -> some View {
-        if let id = accessibilityLabel {
-            content.accessibilityIdentifier(id)
-        } else {
-            content
-        }
     }
 }