@momo-kits/native-kits 0.162.3-debug → 0.162.3-fontscale.1

package/ios/Badge/Badge.swift

@@ -54,6 +54,7 @@ public struct Badge: View {
     public var body: some View {
         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))

package/ios/Badge/BadgeRibbon.swift

@@ -138,6 +138,7 @@ public struct BadgeRibbon: View {
         HStack(spacing: 0) {
             Text(label)
                 .font(.system(size: scaleSize(12), weight: .medium))
+                .ignoreBoldTextSetting()
                 .foregroundColor(Colors.black01)
                 .lineLimit(1)
                 .rotationEffect(rotation)
@@ -159,6 +160,7 @@ public struct BadgeRibbon: View {
         HStack(spacing: 0) {
             Text(label)
                 .font(.system(size: scaleSize(12), weight: .medium))
+                .ignoreBoldTextSetting()
                 .foregroundColor(Colors.black01)
                 .lineLimit(1)
                 .rotationEffect(rotation)

package/ios/Button/Button.swift

@@ -200,7 +200,7 @@ public struct Button: View {
             .background(bg)
             .overlay(
                 RoundedRectangle(cornerRadius: size.radius)
-                    .stroke(border ?? .clear, lineWidth: border != nil ? borderWidth : 0)
+                    .strokeBorder(border ?? .clear, lineWidth: border != nil ? borderWidth : 0)
             )
             .clipShape(RoundedRectangle(cornerRadius: size.radius))
             .opacity(loading ? 0.75 : 1)

package/ios/Checkbox/Checkbox.swift

@@ -55,6 +55,7 @@ public struct Checkbox: View{
             if !title.isEmpty {
                 Text(title)
                     .font(.description1)
+                    .ignoreBoldTextSetting()
             }
         }
     }

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

@@ -136,5 +136,6 @@ public struct MomoText: View {
             .lineSpacing(scaleSize(typography.lineHeight) - scaleSize(typography.fontSize))
 
         return text
+            .ignoreBoldTextSetting()
     }
 }

package/ios/Typography/Typography.swift

@@ -1,14 +1,23 @@
 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 defaultScreenSize: CGFloat = 375
         let maxFontScale: CGFloat = 1.5
         let maxDeviceScale: CGFloat = 5
-        
+
         let deviceWidth = UIScreen.main.bounds.width
         let deviceScale = deviceWidth / defaultScreenSize
-        
+
         let defaultFont = UIFont.systemFont(ofSize: UIFont.labelFontSize)
         let scaledFont = UIFontMetrics.default.scaledFont(for: defaultFont)
         let fontScale = scaledFont.pointSize / defaultFont.pointSize
@@ -25,7 +34,7 @@ public extension Font {
 
         return Font.system(size: fontSize)
     }
-    
+
     // New supported typography styles
     static let headline_default_bold = appFont(size: 24).weight(.bold)
     static let header_m_bold = appFont(size: 18).weight(.bold)
@@ -43,7 +52,7 @@ public extension Font {
     static let action_s_bold = appFont(size: 14).weight(.bold)
     static let action_xs_bold = appFont(size: 12).weight(.bold)
     static let action_xxs_bold = appFont(size: 10).weight(.bold)
-    
+
     // Legacy styles
     static let headline_default = appFont(size: 28).weight(.semibold)
     static let headline_s = appFont(size: 24).weight(.semibold)
@@ -68,7 +77,7 @@ public extension Font {
     static let action_xxs = appFont(size: 10).weight(.bold)
     static let action_xs = appFont(size: 12).weight(.bold)
     static let action_s = appFont(size: 15).weight(.bold)
-    
+
     // deprecated
     static let h1 = appFont(size: 36).weight(.semibold) //headline_xl
     static let h2 = appFont(size: 32).weight(.semibold)

package/package.json

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

package/build.gradle.kts

@@ -1,11 +0,0 @@
-plugins {
-    // this is necessary to avoid the plugins to be loaded multiple times
-    // in each subproject's classloader
-    alias(libs.plugins.android.application) apply false
-    alias(libs.plugins.android.library) apply false
-    alias(libs.plugins.compose) apply false
-    alias(libs.plugins.kotlin.compose.compiler) apply false
-    alias(libs.plugins.jetbrains.kotlin.multiplatform) apply false
-    alias(libs.plugins.jetbrains.kotlin.serialization) apply false
-    alias(libs.plugins.vanniktech.mavenPublish) apply false
-}

package/compose/build.gradle.kts

@@ -1,186 +0,0 @@
-// import com.vanniktech.maven.publish.JavadocJar
-// import com.vanniktech.maven.publish.KotlinMultiplatform
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-
-plugins {
-    alias(libs.plugins.jetbrains.kotlin.multiplatform)
-    alias(libs.plugins.android.library)
-    alias(libs.plugins.compose)
-    alias(libs.plugins.kotlin.compose.compiler)
-//         alias(libs.plugins.vanniktech.mavenPublish)
-    id(libs.plugins.jetbrains.kotlin.cocoapods.get().pluginId)
-    kotlin("plugin.serialization")
-}
-
-val gitlabName: String? = findProperty("name") as String? ?: ""
-val gitlabRepo: String? = findProperty("repo") as String? ?: ""
-val gitlabUrl: String? = findProperty("url") as String? ?: ""
-val gitlabGroup: String? = findProperty("group") as String? ?: ""
-val gitlabArtifactId: String = findProperty("artifact.id") as String? ?: ""
-val gitlabVersion: String? = findProperty("version") as String? ?: ""
-val gitlabUser: String? = findProperty("gitlab.user") as String? ?: ""
-val gitlabKey: String? = findProperty("gitlab.password") as String? ?: ""
-
-kotlin {
-    androidTarget {
-        compilerOptions {
-            jvmTarget.set(JvmTarget.JVM_17)
-        }
-        publishLibraryVariants("release")
-    }
-
-    val fwName = gitlabArtifactId
-    val iosTargets = listOf(iosArm64(), iosSimulatorArm64())
-    iosTargets.forEach {
-        it.binaries.framework {
-            baseName = fwName
-            binaryOption("bundleId", "$gitlabGroup.$fwName")
-            isStatic = true
-        }
-    }
-
-    cocoapods {
-        version = "0.162.3-debug"
-        summary = "IOS Shared module"
-        homepage = "https://momo.vn"
-        ios.deploymentTarget = "15.0"
-
-        framework {
-            baseName = fwName
-            isStatic = true
-        }
-
-        pod("lottie-ios") {
-            moduleName = "Lottie"
-            version = "4.4.3"
-            extraOpts += listOf("-compiler-option", "-fmodules")
-        }
-    }
-
-    sourceSets {
-        commonMain.dependencies {
-            implementation(compose.runtime)
-            implementation(compose.material)
-            implementation(compose.material3)
-            implementation(compose.components.resources)
-            implementation(libs.compose.ui.backhandler)
-            implementation(libs.ktor.client.core)
-            implementation(libs.jetbrains.coroutines.core)
-            implementation(libs.navigation.multiplatform)
-            implementation(libs.coil.multiplatform.compose)
-            implementation(libs.coil.multiplatform.core)
-            implementation(libs.coil.multiplatform.network.ktor)
-            implementation(libs.jetbrains.serialization.json)
-            implementation(libs.kotlinx.datetime)
-            api(libs.native.max.api)
-            implementation(libs.compottie)
-        }
-        androidMain.dependencies {
-            implementation(libs.ktor.client.okhttp)
-            implementation(libs.airbnb.lottie)
-        }
-        iosMain.dependencies {
-            implementation(libs.ktor.client.darwin)
-        }
-    }
-}
-
-android {
-    namespace = "vn.momo.kits.kits"
-    compileSdk = 35
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
-    defaultConfig {
-        minSdk = 24
-    }
-}
-
-dependencies {
-}
-
-repositories {
-    google {
-        mavenContent {
-            includeGroupAndSubgroups("androidx")
-            includeGroupAndSubgroups("com.android")
-            includeGroupAndSubgroups("com.google")
-        }
-    }
-    mavenCentral()
-    maven { url = uri("https://maven.pkg.jetbrains.space/public/p/compose/dev") }
-    maven {
-        url = uri("https://gitlab.mservice.com.vn/api/v4/projects/5400/packages/maven")
-        credentials {username = "download_packages"; password = "gldt-bjDqLpU_sPcHDuXau2ws" }
-    }
-    maven {
-        url = uri("https://artifacts.mservice.com.vn/repository/maven-momo-app/")
-        credentials {
-            username = "viewer"
-            password = "viewer"
-        }
-        isAllowInsecureProtocol = true
-    }
-}
-
-compose {
-    resources {
-        publicResClass = true
-        packageOfResClass = "vn.momo.uikits.resources"
-        generateResClass = always
-    }
-}
-
-// publishing {
-//     repositories {
-//         maven {
-//             name = "${gitlabRepo}Packages"
-//             credentials {
-//                 username = gitlabUser
-//                 password = gitlabKey
-//             }
-//             url = uri("$gitlabUrl")
-//         }
-//     }
-// }
-
-// mavenPublishing {
-//     configure(
-//         KotlinMultiplatform(
-//             javadocJar = JavadocJar.Empty(),
-//             sourcesJar = true,
-//             androidVariantsToPublish = listOf("release")
-//         )
-//     )
-// 
-//     repositories {
-//         maven {
-//             name = "${gitlabRepo}Packages"
-//             credentials { username = gitlabUser; password = gitlabKey }
-//             url = uri("$gitlabUrl")
-//         }
-//     }
-// 
-//     coordinates(gitlabGroup.toString(), gitlabArtifactId, gitlabVersion.toString())
-// 
-//     pom {
-//         name = "$gitlabName Klib"
-//         description = "$gitlabName"
-//         url = "https://gitlab.mservice.com.vn"
-//         licenses {
-//             license {
-//                 name = "The Apache License, Version 2.0"
-//                 url = "https://www.apache.org/licenses/LICENSE-2.0.txt"
-//                 distribution = "https://www.apache.org/licenses/LICENSE-2.0.txt"
-//             }
-//         }
-//         developers {
-//             developer {
-//                 id = "kotlin-hands-on"
-//                 name = "Kotlin Developer Advocate"
-//                 url = "https://github.com/kotlin-hands-on/"
-//             }
-//         }
-//     }
-// }