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

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
         }

package/ios/Input/InputPhoneNumber.swift

@@ -7,17 +7,15 @@
 
 import SwiftUI
 public struct InputPhoneNumber: View {
-    @Environment(\.appTheme) private var theme
     @Binding public var text: String
     
     public var placeholder: String
     public var size: InputSize
     public var hintText: String
     public var error: String
-    public var errorSpacing: Bool
     public var loading: Bool
     public var rightIcon: String
-    public var rightIconColor: Color?
+    public var rightIconColor: Color
     public var autofocus: Bool
     public var onChangeText: ((String) -> Void)?
     public var onFocus: (() -> Void)?
@@ -33,11 +31,10 @@ public struct InputPhoneNumber: View {
         size: InputSize = .small,
         hintText: String = "",
         error: String = "",
-        errorSpacing: Bool = false,
         loading: Bool = false,
         required: Bool = false,
         rightIcon: String = "",
-        rightIconColor: Color? = nil,
+        rightIconColor: Color = Colors.black12,
         autofocus: Bool = false,
         onChangeText: ((String) -> Void)? = nil,
         onFocus: (() -> Void)? = nil,
@@ -50,7 +47,6 @@ public struct InputPhoneNumber: View {
         self.size = size
         self.hintText = hintText
         self.error = error
-        self.errorSpacing = errorSpacing
         self.loading = loading
         self.rightIcon = rightIcon
         self.rightIconColor = rightIconColor
@@ -80,17 +76,17 @@ public struct InputPhoneNumber: View {
                     .padding(.trailing, Spacing.XS)
                 
                 MomoText("+84", typography: size == .small ? .headerSSemibold : .headerMBold)
-                    .foregroundColor(theme.colors.text.default)
+                    .foregroundColor(Colors.black17)
                 
                 Rectangle()
-                    .fill(theme.colors.border.default)
+                    .fill(Colors.black04)
                     .frame(width: 1, height: size == .small ? 24 : 32)
                     .padding(.horizontal, Spacing.M)
                 
                 // Text input
                 ZStack(alignment: .leading) {
                     if text.isEmpty {
-                        MomoText(placeholder, typography: size == .small ? .headerSSemibold : .headerMBold, color: theme.colors.text.hint)
+                        MomoText(placeholder, typography: size == .small ? .headerSSemibold : .headerMBold, color: Colors.black12)
                     }
                     
                     TextField("", text: textBinding, onEditingChanged: { focused in
@@ -99,8 +95,8 @@ public struct InputPhoneNumber: View {
                     .keyboardType(.numberPad)
                     .font(size == .small ? .header_s_semibold : .header_m_bold)
                     .ignoreBoldTextSetting()
-                    .foregroundColor(theme.colors.text.default)
-                    .applyCursorColor(theme.colors.primary)
+                    .foregroundColor(Colors.black17)
+                    .applyPrimaryCursorColor()
                     .lineLimit(1)
                     .accessibility(identifier: accessibilityLabel ?? "")
                     .accessibilityValue(textBinding.wrappedValue.isEmpty ? placeholder : textBinding.wrappedValue)
@@ -112,7 +108,7 @@ public struct InputPhoneNumber: 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")
                     }
                 }
@@ -126,7 +122,7 @@ public struct InputPhoneNumber: View {
                 // ✅ Right icon
                 if !rightIcon.isEmpty {
                     SwiftUI.Button(action: { onRightIconPressed?() }) {
-                        Icon(source: rightIcon, size: 24, color: rightIconColor ?? theme.colors.text.default)
+                        Icon(source: rightIcon, size: 24, color: rightIconColor)
                             .padding(.leading, Spacing.S)
                     }
                 }
@@ -135,7 +131,7 @@ public struct InputPhoneNumber: 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)
@@ -145,7 +141,7 @@ public struct InputPhoneNumber: View {
             // Error or hint
             ErrorView(
                 errorMessage: error,
-                errorSpacing: errorSpacing,
+                errorSpacing: false,
                 hintText: hintText
             )
         }
@@ -163,18 +159,21 @@ public struct InputPhoneNumber: View {
     }
     
     private func borderColor() -> Color {
-        if !error.isEmpty { return theme.colors.error.primary }
-        if isFocused { return theme.colors.primary }
-        return theme.colors.border.default
+        if !error.isEmpty { return Colors.red03 }
+        if isFocused { return Colors.primary }
+        return Colors.black04
     }
 }
 
 private extension View {
-    func applyCursorColor(_ color: Color) -> some View {
+    func applyPrimaryCursorColor() -> some View {
         if #available(iOS 15.0, *) {
-            return self.tint(color)
+            // Modern SwiftUI: use .tint() for cursor
+            return self.tint(Colors.primary)
         } else {
+            // iOS 13–14: return unchanged (no tint support)
             return self
         }
     }
 }
+