@momo-kits/native-kits 0.162.2-sp.7-debug → 0.162.2-sp.8-debug

package/ios/Checkbox/Checkbox.swift

@@ -28,29 +28,23 @@ public struct Checkbox: View{
     public var body: some View {
         HStack(spacing: Spacing.S) {
             // Checkbox
-            ZStack {
-                RoundedRectangle(cornerRadius: Radius.XS)
-                    .fill(backgroundColor)
-                    .frame(width: 20, height: 20)
-                    .overlay(
-                        RoundedRectangle(cornerRadius: Radius.XS)
-                            .stroke(borderColor, lineWidth: Spacing.XXS)
-                    )
+            SwiftUI.Button(action: onCheck) {
+                ZStack {
+                    RoundedRectangle(cornerRadius: Radius.XS)
+                        .fill(backgroundColor)
+                        .frame(width: 20, height: 20)
+                        .overlay(
+                            RoundedRectangle(cornerRadius: Radius.XS)
+                                .stroke(borderColor, lineWidth: Spacing.XXS)
+                        )
 
-                if checked {
-                    Image(systemName: indeterminate ? "minus" : "checkmark")
-                        .resizable()
-                        .scaledToFit()
-                        .foregroundColor(Colors.black01)
-                        .frame(width: 12, height: 12)
-                }
-            }
-
-            .onTapGesture {
-                if !disabled {
-                    onCheck()
+                    if checked {
+                        Icon(source: indeterminate ? "navigation_minus" : "ic_checked", size: 20, color: Colors.black01)
+                    }
                 }
             }
+            .buttonStyle(ActiveOpacityButtonStyle(activeOpacity: 0.8))
+            .disabled(disabled)
 
             // Title
             if !title.isEmpty {

package/ios/Chip/Chip.swift

@@ -52,6 +52,13 @@ public struct Chip: View {
 
     public var body: some View {
         let dims = (size == .small) ? Self.Small : Self.Large
+        // Mirrors Compose's `scaleSize(...)` on every chip dimension so it responds
+        // to Dynamic Type scaling the same way the rest of the kit does.
+        let height = scaleSize(dims.height)
+        let horizontal = scaleSize(dims.horizontal)
+        let iconSize = scaleSize(dims.iconSize)
+        let iconSpacing = scaleSize(dims.iconSpacing)
+        let radius = scaleSize(Radius.L)
 
         let bg: Color = {
             if selected { return theme.colors.background.selected }
@@ -63,36 +70,38 @@ public struct Chip: View {
         let leftTint: Color = selected ? theme.colors.primary : iconLeftTint ?? theme.colors.text.default
         let rightTint: Color = selected ? theme.colors.primary : iconRightTint ?? theme.colors.text.default
 
-        HStack(spacing: dims.iconSpacing) {
-            if let iconLeft {
-                Icon(source: iconLeft, size: dims.iconSize, color: leftTint)
-            }
+        SwiftUI.Button(action: onClick) {
+            HStack(spacing: iconSpacing) {
+                if let iconLeft {
+                    Icon(source: iconLeft, size: iconSize, color: leftTint)
+                }
 
-            if let text = label, !text.isEmpty {
-                MomoText(text, typography: (size == .large) ? .labelDefaultMedium : .labelSMedium, color: textColor)
-                    .lineLimit(1)
-            }
+                if let text = label, !text.isEmpty {
+                    MomoText(text, typography: (size == .large) ? .labelDefaultMedium : .labelSMedium, color: textColor)
+                        .lineLimit(1)
+                }
 
-            if let iconRight {
-                Icon(source: iconRight, size: dims.iconSize, color: rightTint)
-            }
-        }
-        .padding(.horizontal, dims.horizontal)
-        .frame(height: dims.height)
-        .background(
-            RoundedRectangle(cornerRadius: Radius.L, style: .continuous)
-                .fill(bg)
-        )
-        .overlay(
-            Group {
-                if selected {
-                    RoundedRectangle(cornerRadius: Radius.L, style: .continuous)
-                        .stroke(theme.colors.secondary, lineWidth: 2)
+                if let iconRight {
+                    Icon(source: iconRight, size: iconSize, color: rightTint)
                 }
             }
-        )
-        .contentShape(RoundedRectangle(cornerRadius: Radius.L, style: .continuous))
-        .onTapGesture(perform: onClick)
+            .padding(.horizontal, horizontal)
+            .frame(height: height)
+            .background(
+                RoundedRectangle(cornerRadius: radius, style: .continuous)
+                    .fill(bg)
+            )
+            .overlay(
+                Group {
+                    if selected {
+                        RoundedRectangle(cornerRadius: radius, style: .continuous)
+                            .stroke(theme.colors.secondary, lineWidth: 2)
+                    }
+                }
+            )
+            .contentShape(RoundedRectangle(cornerRadius: radius, style: .continuous))
+        }
+        .buttonStyle(ActiveOpacityButtonStyle())
         .modifier(ChipAccessibilityModifier(accessibilityLabel: accessibilityLabel))
     }
 }

package/ios/Collapse/Collapse.swift

@@ -30,6 +30,7 @@ public struct Collapse<Content: View>: View {
     private let useBackgroundCollapseButton: Bool
     private let backgroundColor: Color?
     private let titleColor: Color?
+    private let accessibilityId: String?
     private let onPress: ((Bool) -> Void)?
     private let content: (() -> Content)?
 
@@ -49,6 +50,7 @@ public struct Collapse<Content: View>: View {
         useBackgroundCollapseButton: Bool = false,
         backgroundColor: Color? = nil,
         titleColor: Color? = nil,
+        accessibilityId: String? = nil,
         onPress: ((Bool) -> Void)? = nil,
         @ViewBuilder content: @escaping () -> Content
     ) {
@@ -65,11 +67,17 @@ public struct Collapse<Content: View>: View {
         self.useBackgroundCollapseButton = useBackgroundCollapseButton
         self.backgroundColor = backgroundColor
         self.titleColor = titleColor
+        self.accessibilityId = accessibilityId
         self.onPress = onPress
         self.content = content
         _expanded = State(initialValue: expandDefault)
     }
 
+    // Mirrors Kotlin's `accessibilityId ?: "Collapse/$title"`.
+    private var automationId: String {
+        accessibilityId ?? "Collapse/\(title)"
+    }
+
     private var resolvedBackgroundColor: Color {
         backgroundColor ?? theme.colors.background.surface
     }
@@ -97,6 +105,7 @@ public struct Collapse<Content: View>: View {
         .frame(maxWidth: .infinity)
         .background(resolvedBackgroundColor)
         .clipShape(RoundedRectangle(cornerRadius: Radius.S, style: .continuous))
+        .accessibilityIdentifier(automationId)
         .overlay(
             showBorder
                 ? RoundedRectangle(cornerRadius: Radius.S, style: .continuous)
@@ -159,7 +168,8 @@ public struct Collapse<Content: View>: View {
             .frame(maxWidth: .infinity)
             .contentShape(Rectangle())
         }
-        .buttonStyle(.plain)
+        .buttonStyle(ActiveOpacityButtonStyle())
+        .accessibilityIdentifier("\(automationId)|touch")
     }
 
     private var chevron: some View {

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

@@ -13,7 +13,7 @@ public enum Colors {
     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 info = blue03
     public static let success = Color.momoAsset("Success")
 
     public static let black20 = Color(hex: "000000")
@@ -49,15 +49,18 @@ public enum Colors {
     public static let pink03 = Color(hex: "eb2f96")
     public static let pink02 = Color(hex: "d42a87")
     public static let pink01 = Color(hex: "bc2678")
+    public static let pinkMoMoBranding = Color(hex: "a50064")
 
 
-    public static let violet10 = Color(hex: "fcf8fe")
-    public static let violet09 = Color(hex: "faf4fe")
+    public static let violet11 = Color(hex: "fcf8fe")
+    public static let violet11Stroke = Color(hex: "dfe1e5")
+    public static let violet10 = Color(hex: "faf4fe")
+    public static let violet09 = Color(hex: "f4e9fd")
     public static let violet08 = Color(hex: "ead4fc")
     public static let violet07 = Color(hex: "d5aaf9")
-    public static let violet06 = Color(hex: "f4e9fd")
-    public static let violet05 = Color(hex: "c07ff6")
-    public static let violet04 = Color(hex: "ab55f3")
+    public static let violet06 = Color(hex: "c07ff6")
+    public static let violet05 = Color(hex: "ab55f3")
+    public static let violet04 = Color(hex: "a03ff1")
     public static let violet03 = Color(hex: "962af0")
     public static let violet02 = Color(hex: "8726d8")
     public static let violet01 = Color(hex: "7822c0")

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

@@ -8,5 +8,7 @@ public enum Spacing {
     public static let L: CGFloat = 16
     public static let XL: CGFloat = 24
     public static let XXL: CGFloat = 32
-    public static let XXXL: CGFloat = 48
+    public static let Size3XL: CGFloat = 48
+    public static let Size4XL: CGFloat = 56
+    public static let Size5XL: CGFloat = 64
 }

package/ios/DateTimePicker/DateTimePicker.swift

@@ -14,6 +14,8 @@ private let datePickerWithLabelsHeight: CGFloat = 238
 /// - `"HH:mm"` shows hour + minute; a lone `"HH"` switches the hour wheel to a
 ///   12-hour clock with an AM/PM column.
 public struct DateTimePicker: View {
+    @Environment(\.appTheme) private var theme
+
     // MARK: Lifecycle
 
     public init(
@@ -84,7 +86,7 @@ public struct DateTimePicker: View {
 
                 VStack(spacing: 0) {
                     if hasLabel {
-                        MomoText(arrayLabelTime[index], typography: .actionSBold, color: Colors.text)
+                        MomoText(arrayLabelTime[index], typography: .actionSBold, color: theme.colors.text.default)
                             .padding(.bottom, Spacing.S)
                     }
 
@@ -100,7 +102,7 @@ public struct DateTimePicker: View {
         }
         .frame(maxWidth: .infinity)
         .frame(height: pickerHeight)
-        .background(Colors.background)
+        .background(theme.colors.background.surface)
         .padding(.horizontal, Spacing.M)
         .onAppear { emitIfValid() }
     }

package/ios/DateTimePicker/WheelPicker.swift

@@ -14,6 +14,8 @@ private let wheelPickerBorderWidth: CGFloat = 1
 /// real value can be centered. The currently centered row is reported back via
 /// `onChange(name, value)`.
 public struct WheelPicker: View {
+    @Environment(\.appTheme) private var theme
+
     // MARK: Lifecycle
 
     public init(
@@ -76,9 +78,9 @@ public struct WheelPicker: View {
         .frame(height: wheelItemHeight * CGFloat(wheelVisibleCount))
         .overlay(
             RoundedRectangle(cornerRadius: Radius.S)
-                .stroke(Colors.border, lineWidth: wheelPickerBorderWidth)
+                .stroke(theme.colors.border.default, lineWidth: wheelPickerBorderWidth)
         )
-        .background(Colors.background.clipShape(RoundedRectangle(cornerRadius: Radius.S)))
+        .background(theme.colors.background.surface.clipShape(RoundedRectangle(cornerRadius: Radius.S)))
         .overlay(
             // Centered translucent selection band.
             Rectangle()
@@ -121,6 +123,8 @@ public struct WheelPicker: View {
 // MARK: - WheelPickerItem
 
 private struct WheelPickerItem: View {
+    @Environment(\.appTheme) private var theme
+
     let text: String
     let isSelected: Bool
     let index: Int
@@ -142,7 +146,7 @@ private struct WheelPickerItem: View {
         let scale: CGFloat = isSelected ? 1.0 : 0.87
 
         return ZStack {
-            MomoText(text, typography: .actionSBold, color: Colors.text)
+            MomoText(text, typography: .actionSBold, color: theme.colors.text.default)
                 .scaleEffect(scale)
         }
         .frame(maxWidth: .infinity)

package/ios/Extensions/ActiveOpacityButtonStyle.swift

@@ -0,0 +1,14 @@
+import SwiftUI
+
+/// Mirrors Compose's `Modifier.activeOpacityClickable(activeOpacity:)` (modifier/Clickable.kt):
+/// fades the whole tappable subtree to `activeOpacity` while pressed, animated, instead of
+/// relying on a platform-default press indication.
+struct ActiveOpacityButtonStyle: ButtonStyle {
+    var activeOpacity: Double = 0.2
+
+    func makeBody(configuration: Configuration) -> some View {
+        configuration.label
+            .opacity(configuration.isPressed ? activeOpacity : 1)
+            .animation(.default, value: configuration.isPressed)
+    }
+}

package/ios/Extensions/Color++.swift

@@ -7,10 +7,13 @@ 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
+            tokenBundle.bundleURL,
+            frameworkBundle?.resourceURL,
+            frameworkBundle?.bundleURL
         ]
 
         for candidate in candidates {
@@ -21,7 +24,7 @@ enum MoMoUIKitsResources {
             return bundle
         }
 
-        return tokenBundle
+        return Bundle.main
     }()
 }
 

package/ios/Icon/Icon.swift

@@ -49,7 +49,11 @@ public struct Icon: 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: resolvedColor)
+                .frame(width: size, height: size)
+                // Mirrors Compose's auto-generated `contentDescription = "img|$iconUrl"`
+                // when no explicit label is provided.
+                .accessibilityLabel(accessibilityLabel ?? "img|\(uri)")
         }
     }
 }

package/ios/IconButton/IconButton.swift

@@ -5,13 +5,15 @@ import SwiftUI
 
 public enum IconSize {
     case large
+    case medium
     case small
 
     /// Container width/height of the button.
     var containerSize: CGFloat {
         switch self {
         case .large: return 48
-        case .small: return 40
+        case .medium: return 36
+        case .small: return 28
         }
     }
 
@@ -19,13 +21,16 @@ public enum IconSize {
     var iconSize: CGFloat {
         switch self {
         case .large: return 24
-        case .small: return 16
+        case .medium, .small: return 16
         }
     }
+}
 
-    var radius: CGFloat {
-        Radius.XL
-    }
+// MARK: - IconShape
+
+public enum IconShape {
+    case circle
+    case square
 }
 
 // MARK: - IconButton
@@ -37,6 +42,7 @@ public struct IconButton: View {
     var onClick: () -> Void
     var type: ButtonType
     var size: IconSize
+    var shape: IconShape
     var color: Color?
 
     public init(
@@ -44,12 +50,14 @@ public struct IconButton: View {
         onClick: @escaping () -> Void,
         type: ButtonType = .primary,
         size: IconSize = .small,
+        shape: IconShape = .circle,
         color: Color? = nil
     ) {
         self.icon = icon
         self.onClick = onClick
         self.type = type
         self.size = size
+        self.shape = shape
         self.color = color
     }
 
@@ -72,9 +80,9 @@ public struct IconButton: View {
             Icon(source: icon, size: size.iconSize, color: fg)
                 .frame(width: size.containerSize, height: size.containerSize)
                 .background(bg)
-                .clipShape(RoundedRectangle(cornerRadius: size.radius))
+                .clipShape(IconButtonShape(shape))
                 .overlay(
-                    RoundedRectangle(cornerRadius: size.radius)
+                    IconButtonShape(shape)
                         .stroke(border ?? .clear, lineWidth: border != nil ? borderWidth : 0)
                 )
         }
@@ -110,3 +118,23 @@ public struct IconButton: View {
         }
     }
 }
+
+/// Type-erased shape switch (`Circle` vs a fixed `Radius.S` rounded rect) — mirrors
+/// Compose's `IconShape.toShape()`. `AnyShape` needs iOS 17+, so this hand-rolls the same
+/// erasure at the deployment target's iOS 15 floor.
+private struct IconButtonShape: Shape {
+    let shape: IconShape
+
+    init(_ shape: IconShape) {
+        self.shape = shape
+    }
+
+    func path(in rect: CGRect) -> Path {
+        switch shape {
+        case .circle:
+            return Circle().path(in: rect)
+        case .square:
+            return RoundedRectangle(cornerRadius: Radius.S).path(in: rect)
+        }
+    }
+}

package/ios/Image/Image.swift

@@ -5,15 +5,23 @@ import SDWebImageSwiftUI
 import SkeletonUI
 import SwiftUI
 
+public enum ImageState {
+    case loading, success, error
+}
+
 public struct ImageView: View {
+    @Environment(\.appTheme) private var theme
+
     // MARK: Lifecycle
 
-    public init(_ url: String, aspectRatio: CGFloat? = nil, contentMode: ContentMode = ContentMode.fit, placeholder: AnyView? = nil, color: Color? = nil) {
+    public init(_ url: String, aspectRatio: CGFloat? = nil, contentMode: ContentMode = ContentMode.fit, placeholder: AnyView? = nil, color: Color? = nil, loading: Bool = true, onStateChanged: ((ImageState) -> Void)? = nil) {
         self.url = url
         self.aspectRatio = aspectRatio
         self.contentMode = contentMode
         self.placeholder = placeholder
         self.color = color
+        self.loading = loading
+        self.onStateChanged = onStateChanged
     }
 
     // MARK: Public
@@ -22,9 +30,11 @@ public struct ImageView: View {
         return WebImage(url: URL(string: url), isAnimating: .constant(true))
             .onFailure { _ in
                 error = true
+                onStateChanged?(.error)
             }
             .onSuccess { _, _, _ in
                 error = false
+                onStateChanged?(.success)
             }
             .resizable()
             .renderingMode(color != nil ? .template : .original)
@@ -34,20 +44,21 @@ public struct ImageView: View {
                         Image("media_fail")
                             .resizable()
                             .renderingMode(.template)
-                            .foregroundColor(Colors.black08)
+                            .foregroundColor(theme.colors.text.disable)
                             .frame(width: 24, height: 24)
                     } else if placeholder != nil {
                         placeholder
                     }
                 })
                 .frame(maxWidth: .infinity, maxHeight: .infinity)
-                .skeleton(with: !error && placeholder == nil)
+                .skeleton(with: loading && !error && placeholder == nil)
                 .shape(type: .rectangle)
             }
             .scaledToFit()
             .transition(.fade)
             .aspectRatio(aspectRatio, contentMode: contentMode)
             .foregroundColor(color)
+            .onAppear { onStateChanged?(.loading) }
     }
 
     // MARK: Internal
@@ -56,6 +67,8 @@ public struct ImageView: View {
     var contentMode: ContentMode
     var placeholder: AnyView?
     var color: Color?
+    var loading: Bool
+    var onStateChanged: ((ImageState) -> Void)?
 
     @State var error: Bool = false
     var url: String

package/ios/Information/Information.swift

@@ -7,6 +7,8 @@ public enum InformationState {
 }
 
 public struct Information: View {
+    @Environment(\.appTheme) private var theme
+
     private let title: String?
     private let description: String
     private let state: InformationState
@@ -93,7 +95,7 @@ public struct Information: View {
                 .frame(maxWidth: .infinity, alignment: .leading)
 
                 if let onPressClose, showIconClose {
-                    Icon(source: "navigation_close", size: 16, color: Colors.black17)
+                    Icon(source: "navigation_close", size: 16, color: theme.colors.text.default)
                         .contentShape(Rectangle())
                         .onTapGesture(perform: onPressClose)
                 }

package/ios/Input/ErrorView.swift

@@ -8,6 +8,8 @@
 import SwiftUI
 
 public struct ErrorView: View {
+    @Environment(\.appTheme) private var theme
+
     public var errorMessage: String
     public var errorSpacing: Bool
     public var hintText: String
@@ -43,7 +45,7 @@ public struct ErrorView: View {
     // MARK: - Helpers
     
     private func displayColor() -> Color {
-        !errorMessage.isEmpty ? Colors.red03 : Colors.black12
+        !errorMessage.isEmpty ? theme.colors.error.primary : theme.colors.text.hint
     }
     
     private func displayText() -> String {

package/ios/Input/Input.swift

@@ -35,6 +35,8 @@ public struct Input: View {
     
     @State private var isFocused: Bool = false
     @State private var isPasswordHidden: Bool = true
+    @FocusState private var isFieldFocused: Bool
+    @State private var floatingLabelHeight: CGFloat = 16
     
     public init(
         text: Binding<String>,
@@ -99,8 +101,13 @@ public struct Input: View {
         let textBinding = Binding<String>(
             get: { self.text },
             set: { newValue in
-                self.text = newValue
-                self.onChangeText?(limitText(newValue))
+                // Trim atomically before publishing, mirroring Kotlin's `onValueChange`
+                // (`newText.take(maxLength)` before the state ever updates) — avoids a
+                // render with the untrimmed value that a separate `.onChange` correction
+                // would otherwise briefly show.
+                let limited = limitText(newValue)
+                self.text = limited
+                self.onChangeText?(limited)
             }
         )
 
@@ -118,8 +125,19 @@ public struct Input: View {
                         }
                     }
                     .padding(.horizontal, Spacing.S)
+                    .background(
+                        GeometryReader { geo in
+                            Color.clear.onAppear { floatingLabelHeight = geo.size.height }
+                        }
+                    )
                     .background(theme.colors.background.surface)
-                    .offset(x: Spacing.S, y: -8)
+                    // Kotlin centers the label within the (box-height-tall) decorationBox
+                    // by default, then applies `offsetY = -size.values.height / 2` — net
+                    // effect: the label ends up centered exactly on the box's top border
+                    // (spanning -labelHeight/2 ... +labelHeight/2 around y=0). Our ZStack
+                    // anchors top-leading instead, so reproducing that requires offsetting
+                    // by half the label's OWN measured height, not half the box height.
+                    .offset(x: Spacing.S, y: -floatingLabelHeight / 2)
                     .zIndex(10)
                 }
                 
@@ -151,6 +169,7 @@ public struct Input: View {
                                 cursorColor: UIColor(theme.colors.primary),
                                 isDisabled: disabled || readOnly,
                                 maxLength: maxLength,
+                                autofocus: autofocus,
                                 onFocusChange: { focused in
                                     handleFocusChange(focused)
                                 },
@@ -166,11 +185,9 @@ public struct Input: View {
                             .foregroundColor(getTextColor())
                             .disabled(disabled || readOnly)
                             .applyCursorColor(theme.colors.primary)
-                            .onChange(of: text) { newValue in
-                                let limited = limitText(newValue)
-                                if limited != newValue {
-                                    text = limited
-                                }
+                            .focused($isFieldFocused)
+                            .onAppear {
+                                if autofocus { isFieldFocused = true }
                             }
                         }
                     }
@@ -312,6 +329,7 @@ private struct SecureInputField: UIViewRepresentable {
     var cursorColor: UIColor
     var isDisabled: Bool
     var maxLength: Int?
+    var autofocus: Bool = false
     var onFocusChange: (Bool) -> Void
     var onChangeText: ((String) -> Void)?
 
@@ -336,6 +354,11 @@ private struct SecureInputField: UIViewRepresentable {
             action: #selector(Coordinator.textFieldDidChange(_:)),
             for: .editingChanged
         )
+        if autofocus {
+            DispatchQueue.main.async {
+                textField.becomeFirstResponder()
+            }
+        }
         return textField
     }