@momo-kits/native-kits 0.163.1-beta.1-debug → 0.163.1-beta.2-debug

package/ios/Information/Information.swift

@@ -0,0 +1,151 @@
+import SwiftUI
+
+public enum InformationState {
+    case `default`
+    case warning
+    case error
+}
+
+public struct Information: View {
+    private let title: String?
+    private let description: String
+    private let state: InformationState
+    private let image: String?
+    private let onPressAction: (() -> Void)?
+    private let showIcon: Bool
+    private let action: String?
+    private let showIconClose: Bool
+    private let onPressClose: (() -> Void)?
+
+    public init(
+        title: String? = nil,
+        description: String = "Description",
+        state: InformationState = .default,
+        image: String? = nil,
+        onPressAction: (() -> Void)? = nil,
+        showIcon: Bool = true,
+        action: String? = nil,
+        showIconClose: Bool = true,
+        onPressClose: (() -> Void)? = nil
+    ) {
+        self.title = title
+        self.description = description
+        self.state = state
+        self.image = image
+        self.onPressAction = onPressAction
+        self.showIcon = showIcon
+        self.action = action
+        self.showIconClose = showIconClose
+        self.onPressClose = onPressClose
+    }
+
+    private var borderColor: Color {
+        switch state {
+        case .default: return Colors.blue07
+        case .warning: return Colors.yellow06
+        case .error: return Colors.red07
+        }
+    }
+
+    private var backgroundColor: Color {
+        switch state {
+        case .default: return Colors.blue10
+        case .warning: return Colors.yellow09
+        case .error: return Colors.red10
+        }
+    }
+
+    private var accentColor: Color {
+        switch state {
+        case .default: return Colors.blue03
+        case .warning: return Colors.orange03
+        case .error: return Colors.red03
+        }
+    }
+
+    private var iconSource: String {
+        switch state {
+        case .default: return "notifications_info"
+        case .warning: return "24_notifications_alert_triangle"
+        case .error: return "24_notifications_alert_octagon"
+        }
+    }
+
+    public var body: some View {
+        VStack(alignment: .leading, spacing: 0) {
+            HStack(alignment: .top, spacing: 0) {
+                if let image {
+                    ImageView(image)
+                        .frame(width: 40, height: 40)
+                        .clipShape(RoundedRectangle(cornerRadius: Radius.S))
+                        .padding(.trailing, Spacing.S)
+                } else if showIcon {
+                    Icon(source: iconSource, size: 16, color: accentColor)
+                        .padding(.trailing, Spacing.S)
+                }
+
+                VStack(alignment: .leading, spacing: 0) {
+                    if let title {
+                        MomoText(title, typography: .labelDefaultMedium)
+                    }
+                    MomoText(description, typography: .descriptionDefaultRegular)
+                }
+                .frame(maxWidth: .infinity, alignment: .leading)
+
+                if let onPressClose, showIconClose {
+                    Icon(source: "navigation_close", size: 16, color: Colors.black17)
+                        .contentShape(Rectangle())
+                        .onTapGesture(perform: onPressClose)
+                }
+            }
+
+            if let action, let onPressAction {
+                MomoText(action, typography: .actionXsBold, color: accentColor)
+                    .frame(maxWidth: .infinity, alignment: .trailing)
+                    .contentShape(Rectangle())
+                    .onTapGesture(perform: onPressAction)
+                    .padding(.top, Spacing.S)
+            }
+        }
+        .padding(Spacing.M)
+        .background(
+            RoundedRectangle(cornerRadius: Radius.S)
+                .fill(backgroundColor)
+        )
+        .overlay(
+            RoundedRectangle(cornerRadius: Radius.S)
+                .stroke(borderColor, lineWidth: 0.5)
+        )
+    }
+}
+
+// MARK: - Preview
+#if DEBUG
+struct Information_Previews: PreviewProvider {
+    static var previews: some View {
+        VStack(spacing: 16) {
+            Information(
+                title: "Information",
+                description: "This is a default information message."
+            )
+            Information(
+                title: "Warning",
+                description: "This is a warning message.",
+                state: .warning
+            )
+            Information(
+                title: "Error",
+                description: "This is an error message.",
+                state: .error,
+                onPressAction: {}, action: "Retry"
+            )
+            Information(
+                description: "Dismissible information.",
+                onPressClose: {}
+            )
+        }
+        .padding()
+        .previewLayout(.sizeThatFits)
+    }
+}
+#endif

package/ios/Input/Input.swift

@@ -157,6 +157,7 @@ public struct Input: View {
                             })
                             .keyboardType(keyboardType)
                             .font(fontWeight == .bold ? .action_s_bold : .body_default_regular)
+                            .ignoreBoldTextSetting()
                             .foregroundColor(getTextColor())
                             .disabled(disabled || readOnly)
                             .applyPrimaryCursorColor()

package/ios/Input/InputPhoneNumber.swift

@@ -94,6 +94,7 @@ public struct InputPhoneNumber: View {
                     })
                     .keyboardType(.numberPad)
                     .font(size == .small ? .header_s_semibold : .header_m_bold)
+                    .ignoreBoldTextSetting()
                     .foregroundColor(Colors.black17)
                     .applyPrimaryCursorColor()
                     .lineLimit(1)

package/ios/Input/InputSearch.swift

@@ -168,6 +168,7 @@ public struct InputSearch: View {
                             Text(placeholder)
                                 .foregroundColor(disabled ? Colors.black08 : Colors.black12)
                                 .font(.system(size: 16, weight: fontWeight))
+                                .ignoreBoldTextSetting()
                         }
                         TextField("", text: $text, onEditingChanged: { editing in
                             isFocused = editing
@@ -183,6 +184,7 @@ public struct InputSearch: View {
                         .disabled(disabled)
                         .foregroundColor(disabled ? Colors.black08 : Colors.black17)
                         .font(.system(size: 15, weight: fontWeight))
+                        .ignoreBoldTextSetting()
                         .keyboardType(keyboardType)
                     }
                     
@@ -212,6 +214,7 @@ public struct InputSearch: View {
                         Text(buttonText)
                             .foregroundColor(Colors.black17)
                             .font(.system(size: 14, weight: .medium))
+                            .ignoreBoldTextSetting()
                     }
                     .padding(.leading, Spacing.L)
                 }

package/ios/Input/InputTextArea.swift

@@ -223,6 +223,7 @@ public struct InputTextArea: View {
                         onBlur()
                     }
                 }
+                .ignoreBoldTextSetting()
     }
     
     private var borderColor: Color {

package/ios/OTPKeyboard/KeyboardButton.swift

@@ -22,7 +22,7 @@ public struct KeyboardButton: View {
     public var body: some View {
         SwiftUI.Button(action: { self.action(key) }) {
             HStack {
-                Text(key).font(.system(size: 24, weight: .bold))
+                Text(key).font(.system(size: 24, weight: .bold)).ignoreBoldTextSetting()
             }.frame(maxWidth: CGFloat(width), minHeight: height)
                 .background(color)
                 .foregroundColor(textColor)

package/ios/Popup/PopupDisplay.swift

@@ -24,6 +24,7 @@ extension View {
             VStack(spacing: 0) {
                 Text("A")
                     .font(font)
+                    .ignoreBoldTextSetting()
                     .lineLimit(1)
                     .fixedSize()
                     .background(
@@ -35,6 +36,7 @@ extension View {
 
                 Text("A\nA")
                     .font(font)
+                    .ignoreBoldTextSetting()
                     .lineLimit(2)
                     .fixedSize(horizontal: false, vertical: true)
                     .background(
@@ -221,12 +223,14 @@ public struct PopupDisplay: View {
             SwiftUI.Button(action: onPressCloseButton) {
                 Text(closeButtonTitle)
                     .font(.action2)
+                    .ignoreBoldTextSetting()
             }.foregroundColor(Colors.black09)
                 .padding(.trailing, 12)
 
             SwiftUI.Button(action: onPressAction) {
                 Text(actionButtonTitle)
                     .font(.action2)
+                    .ignoreBoldTextSetting()
             }.foregroundColor(Colors.primary)
         }
         .frame(maxWidth: .infinity, alignment: .trailing)
@@ -238,12 +242,14 @@ public struct PopupDisplay: View {
             SwiftUI.Button(action: onPressAction) {
                 Text(actionButtonTitle)
                     .font(.action2)
+                    .ignoreBoldTextSetting()
             }.foregroundColor(Colors.primary)
                 .padding(.bottom, 6)
 
             SwiftUI.Button(action: onPressCloseButton) {
                 Text(closeButtonTitle)
                     .font(.action2)
+                    .ignoreBoldTextSetting()
             }.foregroundColor(Colors.black09)
         }
         .frame(maxWidth: .infinity, alignment: .trailing)

package/ios/Popup/PopupInput.swift

@@ -38,12 +38,14 @@ public struct PopupInput: View {
                         Text(title)
                             .foregroundColor(.black)
                             .font(.headerText1)
+                            .ignoreBoldTextSetting()
                             .padding(.top, 12)
                             .padding(.bottom, 24)
 
                         Text(description)
                             .foregroundColor(.black)
                             .font(.paragraph)
+                            .ignoreBoldTextSetting()
                             .opacity(0.6)
                             .multilineTextAlignment(.leading)
                             .padding(.bottom, 20)

package/ios/Template/TrustBanner/TrustBanner.swift

@@ -79,6 +79,7 @@ public struct TrustBanner: View {
                     .foregroundColor(Color(hex: "484848"))
                     .lineLimit(2)
                     .font(.system(size: 13, weight: Font.Weight.regular))
+                    .ignoreBoldTextSetting()
                     .lineSpacing(3)
                     .padding(.bottom, 8)
                 HStack {
@@ -86,6 +87,7 @@ public struct TrustBanner: View {
                         Text(applicationEnvironment.config?.trustBanner?.subContent[language ?? "vi"] as? String ?? defaultBanner.subContent[language ?? "vi"])
                             .foregroundColor(Colors.pink03)
                             .font(.system(size: 13, weight: .bold))
+                            .ignoreBoldTextSetting()
                             .padding(.trailing, 4)
                         
                         Icon(source: "arrow_chevron_right_small", color: Colors.pink03)

package/ios/Typography/Text.swift

@@ -1,27 +1,30 @@
 import SwiftUI
 
 public func scaleSize(_ size: CGFloat, _ scaleRate: CGFloat? = nil) -> CGFloat {
+    let config = FontScaleStore.shared.config
     let defaultScreenSize: CGFloat = 375
     let maxFontScale: CGFloat = scaleRate ?? 1.5
     let maxDeviceScale: CGFloat = 5
 
-    let deviceWidth = UIScreen.main.bounds.width
-    let deviceScale = deviceWidth / defaultScreenSize
+    if !config.useOSFontScale {
+        let customRate = config.userScaleRate ?? 1
+        return customRate > 1 ? size * customRate : size
+    }
+
+    let deviceScale = UIScreen.main.bounds.width / defaultScreenSize
 
     let defaultFont = UIFont.systemFont(ofSize: UIFont.labelFontSize)
     let scaledFont = UIFontMetrics.default.scaledFont(for: defaultFont)
-    let fontScale = scaledFont.pointSize / defaultFont.pointSize
+    let osFontScale = scaledFont.pointSize / defaultFont.pointSize
 
     var fontSizeDeviceScale = size
     var fontSizeOSScale = size
 
-
     if deviceScale > 1 {
         fontSizeDeviceScale = min(fontSizeDeviceScale * deviceScale, fontSizeDeviceScale + maxDeviceScale)
     }
-
-    if fontScale > 1 {
-        fontSizeOSScale = min(fontSizeOSScale * fontScale, fontSizeOSScale * maxFontScale)
+    if osFontScale > 1 {
+        fontSizeOSScale = min(fontSizeOSScale * osFontScale, fontSizeOSScale * maxFontScale)
     }
 
     return max(fontSizeDeviceScale, fontSizeOSScale)
@@ -118,6 +121,7 @@ public struct MomoText: View {
     private let content: String
     private let typography: TypographyStyle
     private let color: Color
+    @ObservedObject private var fontScale = FontScaleStore.shared
 
     public init(
         _ content: String,
@@ -130,11 +134,13 @@ public struct MomoText: View {
     }
 
     public var body: some View {
+        _ = fontScale.config
         let text = SwiftUI.Text(content)
             .font(.system(size: scaleSize(typography.fontSize), weight: typography.fontWeight))
             .foregroundColor(color)
             .lineSpacing(scaleSize(typography.lineHeight) - scaleSize(typography.fontSize))
 
         return text
+            .ignoreBoldTextSetting()
     }
 }

package/ios/Typography/Typography.swift

@@ -1,26 +1,40 @@
 import SwiftUI
 
+public extension View {
+    /// Forces SwiftUI to ignore the OS "Bold Text" accessibility setting so the
+    /// kit's typography weight stays fixed and matches the Compose implementation
+    /// (which does not honor that OS setting). Apply it wherever a `.font(...)` is set.
+    func ignoreBoldTextSetting() -> some View {
+        environment(\.legibilityWeight, .regular)
+    }
+}
+
 public extension Font {
     static func appFont(size: CGFloat) -> Font {
+        let config = FontScaleStore.shared.config
         let defaultScreenSize: CGFloat = 375
         let maxFontScale: CGFloat = 1.5
         let maxDeviceScale: CGFloat = 5
-        
-        let deviceWidth = UIScreen.main.bounds.width
-        let deviceScale = deviceWidth / defaultScreenSize
-        
+
+        if !config.useOSFontScale {
+            let customRate = config.userScaleRate ?? 1
+            let scaled = customRate > 1 ? size * customRate : size
+            return Font.system(size: scaled)
+        }
+
+        let deviceScale = UIScreen.main.bounds.width / defaultScreenSize
+
         let defaultFont = UIFont.systemFont(ofSize: UIFont.labelFontSize)
         let scaledFont = UIFontMetrics.default.scaledFont(for: defaultFont)
-        let fontScale = scaledFont.pointSize / defaultFont.pointSize
+        let osFontScale = scaledFont.pointSize / defaultFont.pointSize
 
         var fontSize = size
 
         if deviceScale > 1 {
             fontSize = min(fontSize * deviceScale, fontSize + maxDeviceScale)
         }
-
-        if fontScale > 1 {
-            fontSize = min(fontSize * fontScale, fontSize * maxFontScale)
+        if osFontScale > 1 {
+            fontSize = min(fontSize * osFontScale, fontSize * maxFontScale)
         }
 
         return Font.system(size: fontSize)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.163.1-beta.1-debug",
+  "version": "0.163.1-beta.2-debug",
   "private": false,
   "dependencies": {},
   "devDependencies": {},

package/compose/src/commonMain/kotlin/vn/momo/kits/components/ScaleSizeScope.kt

@@ -1,17 +0,0 @@
-package vn.momo.kits.components
-
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.CompositionLocalProvider
-import vn.momo.kits.application.ScaleSizeMaxRate
-
-@Composable
-fun ScaleSizeScope(
-    scaleSizeMaxRate: Float? = null,
-    content: @Composable () -> Unit
-) {
-    CompositionLocalProvider(
-        ScaleSizeMaxRate provides scaleSizeMaxRate,
-    ) {
-        content()
-    }
-}