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

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
-        }
     }
 }

package/ios/Colors+Radius+Spacing/Colors.swift

@@ -3,18 +3,18 @@ import Foundation
 import SwiftUI
 
 public enum Colors {
-    public static let primary = Color.momoAsset("Primary")
-    public static let primaryDark = Color.momoAsset("PrimaryDark")
-    public static let primaryLight = Color.momoAsset("PrimaryLight")
-    public static let secondary = Color.momoAsset("Secondary")
-    public static let background = Color.momoAsset("Background")
-    public static let border = Color.momoAsset("Border")
-    public static let text = Color.momoAsset("ThemeColors/text-default")
-    public static let textSecondary = Color.momoAsset("TextSecondary")
-    public static let card = Color.momoAsset("Card")
-    public static let error = Color.momoAsset("Error")
-    public static let info = Color(hex: "007aff")
-    public static let success = Color.momoAsset("Success")
+    public static let primary = Color("Primary")
+    public static let primaryDark = Color("PrimaryDark")
+    public static let primaryLight = Color("PrimaryLight")
+    public static let secondary = Color("Secondary")
+    public static let background = Color("Background")
+    public static let border = Color("Border")
+    public static let text = Color("Text")
+    public static let textSecondary = Color("TextSecondary")
+    public static let card = Color("Card")
+    public static let error = Color("Error")
+    public static let info = Color("Info")
+    public static let success = Color("Success")
 
     public static let black20 = Color(hex: "000000")
     public static let black19 = Color(hex: "18191a")

package/ios/Extensions/Color++.swift

@@ -1,38 +1,6 @@
 import SwiftUI
-import Foundation
-
-private final class MoMoUIKitsBundleToken {}
-
-enum MoMoUIKitsResources {
-    static let bundle: Bundle = {
-        let bundleName = "MoMoUIKitsResources"
-        let tokenBundle = Bundle(for: MoMoUIKitsBundleToken.self)
-        let frameworkBundle = Bundle(identifier: "org.cocoapods.MoMoUIKits")
-        let candidates = [
-            Bundle.main.resourceURL,
-            tokenBundle.resourceURL,
-            tokenBundle.bundleURL,
-            frameworkBundle?.resourceURL,
-            frameworkBundle?.bundleURL
-        ]
-
-        for candidate in candidates {
-            guard let bundleURL = candidate?.appendingPathComponent("\(bundleName).bundle"),
-                  let bundle = Bundle(url: bundleURL) else {
-                continue
-            }
-            return bundle
-        }
-
-        return Bundle.main
-    }()
-}
 
 public extension Color {
-    static func momoAsset(_ name: String) -> Color {
-        Color(name, bundle: MoMoUIKitsResources.bundle)
-    }
-
     init(hex: UInt, alpha: Double = 1) {
         self.init(
             .sRGB,

package/ios/Icon/Icon.swift

@@ -23,9 +23,6 @@ func loadIconSources() -> [String: IconSource] {
 // Load the JSON data into a global variable
 let iconSources: [String: IconSource] = loadIconSources()
 
-// Icons that must never be tinted (mirror Compose `noThemeIcons`)
-let noThemeIcons: [String] = ["ic_round_momo_tiny"]
-
 // Icon ViewModel
 public struct Icon: View {
     var source: String
@@ -47,9 +44,7 @@ public struct Icon: View {
 
     public var body: some View {
         if let uri = iconSources[source]?.uri {
-            // Mirror Compose: certain icons (e.g. branded glyphs) are never tinted
-            let resolvedColor = noThemeIcons.contains(source) ? nil : color
-            ImageView(uri, color: resolvedColor).frame(width: size, height: size)
+            ImageView(uri, color: color).frame(width: size, height: size)
         }
     }
 }

package/ios/Input/Input.swift

@@ -3,14 +3,12 @@ import SwiftUI
 import Combine
 
 public struct Input: View {
-    @Environment(\.appTheme) private var theme
     @Binding public var text: String
     
     public var placeholder: String
     public var floatingValue: String
-    public var floatingValueColor: Color?
     public var floatingIcon: String
-    public var floatingIconColor: Color?
+    public var floatingIconColor: Color
     public var size: InputSize
     public var hintText: String
     public var error: String
@@ -19,9 +17,9 @@ public struct Input: View {
     public var readOnly: Bool
     public var secureTextEntry: Bool
     public var rightIcon: String
-    public var rightIconColor: Color?
+    public var rightIconColor: Color
     public var leadingIcon: String
-    public var leadingIconColor: Color?
+    public var leadingIconColor: Color
     public var loading: Bool
     public var required: Bool
     public var maxLength: Int?
@@ -40,9 +38,8 @@ public struct Input: View {
         text: Binding<String>,
         placeholder: String = "",
         floatingValue: String = "",
-        floatingValueColor: Color? = nil,
         floatingIcon: String = "",
-        floatingIconColor: Color? = nil,
+        floatingIconColor: Color = Colors.primary,
         size: InputSize = .small,
         hintText: String = "",
         error: String = "",
@@ -51,9 +48,9 @@ public struct Input: View {
         readOnly: Bool = false,
         secureTextEntry: Bool = false,
         rightIcon: String = "",
-        rightIconColor: Color? = nil,
+        rightIconColor: Color = Colors.black17,
         leadingIcon: String = "",
-        leadingIconColor: Color? = nil,
+        leadingIconColor: Color = Colors.black12,
         loading: Bool = false,
         required: Bool = false,
         maxLength: Int? = nil,
@@ -68,7 +65,6 @@ public struct Input: View {
         self._text = text
         self.placeholder = placeholder
         self.floatingValue = floatingValue
-        self.floatingValueColor = floatingValueColor
         self.floatingIcon = floatingIcon
         self.floatingIconColor = floatingIconColor
         self.size = size
@@ -111,14 +107,14 @@ public struct Input: View {
                     HStack(spacing: Spacing.XS) {
                         MomoText(floatingValue, typography: .labelSMedium, color: getFloatingColor())
                         if required {
-                            MomoText("*", typography: .labelSMedium, color: theme.colors.error.primary)
+                            MomoText("*", typography: .labelSMedium, color: Colors.red03)
                         }
                         if !floatingIcon.isEmpty {
                             Icon(source: floatingIcon, size: 16, color: getFloatingIconColor())
                         }
                     }
                     .padding(.horizontal, Spacing.S)
-                    .background(theme.colors.background.surface)
+                    .background(Colors.black01)
                     .offset(x: Spacing.S, y: -8)
                     .zIndex(10)
                 }
@@ -127,7 +123,7 @@ public struct Input: View {
                 HStack(alignment: .center, spacing: 0) {
                     // Leading icon
                     if !leadingIcon.isEmpty {
-                        Icon(source: leadingIcon, size: size == .small ? 24 : 32, color: getLeadingIconColor())
+                        Icon(source: leadingIcon, size: size == .small ? 24 : 32, color: leadingIconColor)
                             .padding(.trailing, Spacing.M)
                     }
                     
@@ -148,7 +144,6 @@ public struct Input: View {
                                 fontSize: scaleSize(14),
                                 fontWeight: fontWeight == .bold ? .bold : .regular,
                                 textColor: UIColor(getTextColor()),
-                                cursorColor: UIColor(theme.colors.primary),
                                 isDisabled: disabled || readOnly,
                                 maxLength: maxLength,
                                 onFocusChange: { focused in
@@ -165,7 +160,7 @@ public struct Input: View {
                             .ignoreBoldTextSetting()
                             .foregroundColor(getTextColor())
                             .disabled(disabled || readOnly)
-                            .applyCursorColor(theme.colors.primary)
+                            .applyPrimaryCursorColor()
                             .onChange(of: text) { newValue in
                                 let limited = limitText(newValue)
                                 if limited != newValue {
@@ -181,7 +176,7 @@ public struct Input: View {
                             text = ""
                             onChangeText?("")
                         }) {
-                            Icon(source: "24_navigation_close_circle_full", size: 16, color: theme.colors.text.hint)
+                            Icon(source: "24_navigation_close_circle_full", size: 16, color: Colors.black12)
                                 .padding(.leading, Spacing.S).accessibility(identifier: "ic_clear")
                         }
                     }
@@ -200,14 +195,14 @@ public struct Input: View {
                                 Icon(
                                     source: isPasswordHidden ? "24_security_eye_off" : "24_security_eye_open",
                                     size: 24,
-                                    color: getRightIconColor()
+                                    color: rightIconColor
                                 )
                                 .padding(.leading, Spacing.S).accessibility(identifier: "ic_show_hide")
                             }
                         }
                     } else if !rightIcon.isEmpty {
                         SwiftUI.Button(action: { onRightIconPressed?() }) {
-                            Icon(source: rightIcon, size: 24, color: getRightIconColor())
+                            Icon(source: rightIcon, size: 24, color: rightIconColor)
                                 .padding(.leading, Spacing.S)
                         }
                     }
@@ -216,7 +211,7 @@ public struct Input: View {
                 .frame(height: scaleSize(size == .small ? 48 : 56, 1.1))
                 .background(
                     RoundedRectangle(cornerRadius: Radius.S)
-                        .fill(theme.colors.background.surface)
+                        .fill(Colors.black01)
                 )
                 .overlay(
                     RoundedRectangle(cornerRadius: Radius.S)
@@ -265,39 +260,31 @@ public struct Input: View {
     
     private func borderColor() -> Color {
         if disabled {
-            return theme.colors.border.disable
+            return Colors.black04 // border.disable
         }
         if !error.isEmpty {
-            return theme.colors.error.primary
+            return Colors.red03 // error.primary
         }
         if isFocused {
-            return theme.colors.primary
+            return Colors.primary
         }
-        return theme.colors.border.default
+        return Colors.black04 // border.default
     }
     
     private func getTextColor() -> Color {
-        return disabled ? theme.colors.text.disable : theme.colors.text.default
+        return disabled ? Colors.black09 : Colors.black17
     }
     
     private func getPlaceholderColor() -> Color {
-        return disabled ? theme.colors.text.disable : theme.colors.text.hint
+        return disabled ? Colors.black09 : Colors.black12
     }
     
     private func getFloatingColor() -> Color {
-        return disabled ? theme.colors.text.disable : (floatingValueColor ?? theme.colors.text.hint)
+        return disabled ? Colors.black09 : Colors.black12
     }
     
     private func getFloatingIconColor() -> Color {
-        return disabled ? theme.colors.text.disable : (floatingIconColor ?? theme.colors.text.default)
-    }
-
-    private func getLeadingIconColor() -> Color {
-        return disabled ? theme.colors.text.disable : (leadingIconColor ?? theme.colors.text.hint)
-    }
-
-    private func getRightIconColor() -> Color {
-        return disabled ? theme.colors.text.disable : (rightIconColor ?? theme.colors.text.default)
+        return disabled ? Colors.black09 : floatingIconColor
     }
 }
 
@@ -309,7 +296,6 @@ private struct SecureInputField: UIViewRepresentable {
     var fontSize: CGFloat
     var fontWeight: UIFont.Weight
     var textColor: UIColor
-    var cursorColor: UIColor
     var isDisabled: Bool
     var maxLength: Int?
     var onFocusChange: (Bool) -> Void
@@ -330,7 +316,7 @@ private struct SecureInputField: UIViewRepresentable {
         textField.setContentHuggingPriority(.defaultLow, for: .horizontal)
         textField.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
         textField.text = text
-        textField.tintColor = cursorColor
+        textField.tintColor = UIColor(Colors.primary)
         textField.addTarget(
             context.coordinator,
             action: #selector(Coordinator.textFieldDidChange(_:)),
@@ -345,8 +331,6 @@ private struct SecureInputField: UIViewRepresentable {
             textField.text = text
         }
         textField.isEnabled = !isDisabled
-        textField.textColor = textColor
-        textField.tintColor = cursorColor
         if textField.keyboardType != keyboardType {
             textField.keyboardType = keyboardType
             textField.reloadInputViews()
@@ -417,9 +401,9 @@ private struct SecureInputField: UIViewRepresentable {
 
 // MARK: - Helper Extension
 private extension View {
-    func applyCursorColor(_ color: Color) -> some View {
+    func applyPrimaryCursorColor() -> some View {
         if #available(iOS 15.0, *) {
-            return self.tint(color)
+            return self.tint(Colors.primary)
         } else {
             return self
         }