@momo-kits/native-kits 0.162.13 → 0.162.14

package/ios/Application/ApplicationEnvironment.swift

@@ -46,6 +46,5 @@ public class ApplicationEnvironment: ObservableObject {
         self.applicationContext = applicationContext
         self.composeApi = composeApi
         self.config = config
-        FontScaleStore.shared.bind(composeApi)
     }
 }

package/ios/Typography/Text.swift

@@ -1,30 +1,27 @@
 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
 
-    if !config.useOSFontScale {
-        let customRate = config.userScaleRate ?? 1
-        return customRate > 1 ? size * customRate : size
-    }
-
-    let deviceScale = UIScreen.main.bounds.width / defaultScreenSize
+    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 osFontScale = scaledFont.pointSize / defaultFont.pointSize
+    let fontScale = scaledFont.pointSize / defaultFont.pointSize
 
     var fontSizeDeviceScale = size
     var fontSizeOSScale = size
 
+
     if deviceScale > 1 {
         fontSizeDeviceScale = min(fontSizeDeviceScale * deviceScale, fontSizeDeviceScale + maxDeviceScale)
     }
-    if osFontScale > 1 {
-        fontSizeOSScale = min(fontSizeOSScale * osFontScale, fontSizeOSScale * maxFontScale)
+
+    if fontScale > 1 {
+        fontSizeOSScale = min(fontSizeOSScale * fontScale, fontSizeOSScale * maxFontScale)
     }
 
     return max(fontSizeDeviceScale, fontSizeOSScale)
@@ -121,7 +118,6 @@ 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,
@@ -134,7 +130,6 @@ 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)

package/ios/Typography/Typography.swift

@@ -11,35 +11,30 @@ public extension View {
 
 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
 
-        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 deviceWidth = UIScreen.main.bounds.width
+        let deviceScale = deviceWidth / defaultScreenSize
 
         let defaultFont = UIFont.systemFont(ofSize: UIFont.labelFontSize)
         let scaledFont = UIFontMetrics.default.scaledFont(for: defaultFont)
-        let osFontScale = scaledFont.pointSize / defaultFont.pointSize
+        let fontScale = scaledFont.pointSize / defaultFont.pointSize
 
         var fontSize = size
 
         if deviceScale > 1 {
             fontSize = min(fontSize * deviceScale, fontSize + maxDeviceScale)
         }
-        if osFontScale > 1 {
-            fontSize = min(fontSize * osFontScale, fontSize * maxFontScale)
+
+        if fontScale > 1 {
+            fontSize = min(fontSize * fontScale, fontSize * maxFontScale)
         }
 
         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)
@@ -57,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)
@@ -82,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.13",
+  "version": "0.162.14",
   "private": false,
   "dependencies": {},
   "devDependencies": {},

package/ios/Application/FontScaleStore.swift

@@ -1,59 +0,0 @@
-import SwiftUI
-
-public struct FontScaleConfig {
-    public var useOSFontScale: Bool
-    public var userScaleRate: CGFloat?
-
-    public init(useOSFontScale: Bool = true, userScaleRate: CGFloat? = nil) {
-        self.useOSFontScale = useOSFontScale
-        self.userScaleRate = userScaleRate
-    }
-}
-
-public final class FontScaleStore: ObservableObject {
-    public static let shared = FontScaleStore()
-
-    @Published public private(set) var config = FontScaleConfig()
-
-    private var didBind = false
-    private var observerId: String?
-
-    private init() {}
-
-    public func update(_ newConfig: FontScaleConfig) {
-        if Thread.isMainThread {
-            config = newConfig
-        } else {
-            DispatchQueue.main.async { [weak self] in self?.config = newConfig }
-        }
-    }
-
-    public func bind(_ api: KitComposeApi?) {
-        guard let api = api, !didBind else { return }
-        didBind = true
-
-        apply(api.request(funcName: "getFontScaleConfig", params: nil))
-        observerId = api.request(funcName: "observer", params: ["font_scale_config"]) { [weak self] response in
-            self?.apply(response)
-        }
-    }
-
-    private func apply(_ response: String) {
-        guard let parsed = FontScaleStore.parse(response) else { return }
-        update(parsed)
-    }
-
-    static func parse(_ response: String) -> FontScaleConfig? {
-        guard
-            let data = response.data(using: .utf8),
-            let json = (try? JSONSerialization.jsonObject(with: data)) as? [String: Any]
-        else { return nil }
-
-        let obj = (json["response"] as? [String: Any]) ?? (json["data"] as? [String: Any]) ?? json
-        guard obj["useOSFontScale"] != nil || obj["userScaleRate"] != nil else { return nil }
-
-        let useOS = (obj["useOSFontScale"] as? Bool) ?? true
-        let rate = (obj["userScaleRate"] as? NSNumber).map { CGFloat($0.doubleValue) }
-        return FontScaleConfig(useOSFontScale: useOS, userScaleRate: rate)
-    }
-}