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

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/local.properties

@@ -0,0 +1,8 @@
+## This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+#
+# Location of the SDK. This is only used by Gradle.
+# For customization when using a Version Control System, please read the
+# header note.
+#Wed Aug 21 14:20:12 ICT 2024
+sdk.dir=/Users/huynhdung/Library/Android/sdk

package/package.json

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

package/settings.gradle.kts

@@ -0,0 +1,64 @@
+import org.gradle.kotlin.dsl.maven
+
+rootProject.name = "momo-native-kits"
+enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
+
+pluginManagement {
+    repositories {
+        google {
+            mavenContent {
+                includeGroupAndSubgroups("androidx")
+                includeGroupAndSubgroups("com.android")
+                includeGroupAndSubgroups("com.google")
+            }
+        }
+        mavenCentral()
+        gradlePluginPortal()
+        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
+        }
+    }
+}
+
+dependencyResolutionManagement {
+    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
+        }
+    }
+}
+
+include(":compose")
+
+include(":sample:androidApp")
+include(":sample:shared")