@momo-kits/native-kits 0.160.7-debug → 0.161.1-beta.15-debug

package/example/ios/Pods/Pods.xcodeproj/xcuserdata/huynhdung.xcuserdatad/xcschemes/SDWebImage.xcscheme

@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1600"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "3847153A6E5EEFB86565BA840768F429"
+               BuildableName = "SDWebImage.framework"
+               BlueprintName = "SDWebImage"
+               ReferencedContainer = "container:Pods.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

package/example/ios/Pods/Pods.xcodeproj/xcuserdata/huynhdung.xcuserdatad/xcschemes/SDWebImageSwiftUI.xcscheme

@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1600"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "92EBFA3E7005B4C18A9C0B44324EB80F"
+               BuildableName = "SDWebImageSwiftUI.framework"
+               BlueprintName = "SDWebImageSwiftUI"
+               ReferencedContainer = "container:Pods.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

package/example/ios/Pods/Pods.xcodeproj/xcuserdata/huynhdung.xcuserdatad/xcschemes/SkeletonUI.xcscheme

@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1600"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "6510766A9670BFA3B251E2A62446FC5D"
+               BuildableName = "SkeletonUI.framework"
+               BlueprintName = "SkeletonUI"
+               ReferencedContainer = "container:Pods.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

package/example/ios/Pods/Pods.xcodeproj/xcuserdata/huynhdung.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>MoMoUIKits.xcscheme</key>
+		<dict>
+			<key>isShown</key>
+			<false />
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+		<key>Pods-Example.xcscheme</key>
+		<dict>
+			<key>isShown</key>
+			<false />
+			<key>orderHint</key>
+			<integer>1</integer>
+		</dict>
+		<key>SDWebImage.xcscheme</key>
+		<dict>
+			<key>isShown</key>
+			<false />
+			<key>orderHint</key>
+			<integer>2</integer>
+		</dict>
+		<key>SDWebImageSwiftUI.xcscheme</key>
+		<dict>
+			<key>isShown</key>
+			<false />
+			<key>orderHint</key>
+			<integer>3</integer>
+		</dict>
+		<key>SkeletonUI.xcscheme</key>
+		<dict>
+			<key>isShown</key>
+			<false />
+			<key>orderHint</key>
+			<integer>4</integer>
+		</dict>
+	</dict>
+	<key>SuppressBuildableAutocreation</key>
+	<dict />
+</dict>
+</plist>

package/gradle/libs.versions.toml

@@ -18,7 +18,7 @@ androidx-appcompat = "1.7.0"
 material = "1.10.0"
 maxapi = "0.1.1"
 vanniktechMavenPublish = "0.34.0"
-kits = "0.159.1-beta.7"
+kits = "0.160.1-beta.6"
 nativemaxapi = "0.0.6"
 
 [libraries]

package/gradle.properties

@@ -18,7 +18,7 @@ kotlin.apple.xcodeCompatibility.nowarn=true
 name="ComposeKits"
 group=vn.momo.kits
 artifact.id=kits
-version=0.160.7
+version=0.161.1-beta.15
 
 repo=GitLab
 url=https://gitlab.mservice.com.vn/api/v4/projects/5400/packages/maven

package/ios/Application/ApplicationEnvironment.swift

@@ -17,7 +17,7 @@ public class MiniAppContext {
     public var toolkitConfig: [String: Any] = [:]
     public var providerId: String = "momo"
     public var permissions: [[String: Any]] = []
-    
+
     public init(appId: String, appCode: String, appName: Any? = nil, appIcon: String, description: Any? = nil, support: [String: Any] = [:], toolkitConfig: [String: Any] = [:], providerId: String = "momo", permissions: [[String: Any]] = []) {
         self.appId = appId
         self.appCode = appCode
@@ -37,11 +37,15 @@ public class KitConfig {
     public var headerGradient: String? = nil
 }
 
+public var IsShowBaseLineDebug = false
+
+public var UseFontScaleSystem = true
+
 public class ApplicationEnvironment: ObservableObject {
     let applicationContext: MiniAppContext?
     let composeApi: KitComposeApi?
     let config: KitConfig?
-    
+
     public init(applicationContext: MiniAppContext? = nil, composeApi: KitComposeApi? = nil, config: KitConfig? = nil) {
         self.applicationContext = applicationContext
         self.composeApi = composeApi

package/ios/Input/Input.swift

@@ -4,7 +4,7 @@ import Combine
 
 public struct Input: View {
     @Binding public var text: String
-    
+
     public var placeholder: String
     public var floatingValue: String
     public var floatingIcon: String
@@ -22,7 +22,6 @@ public struct Input: View {
     public var leadingIconColor: Color
     public var loading: Bool
     public var required: Bool
-    public var maxLength: Int?
     public var fontWeight: InputFontWeight
     public var keyboardType: UIKeyboardType
     public var autofocus: Bool
@@ -30,10 +29,10 @@ public struct Input: View {
     public var onFocus: (() -> Void)?
     public var onBlur: (() -> Void)?
     public var onRightIconPressed: (() -> Void)?
-    
+
     @State private var isFocused: Bool = false
     @State private var isPasswordHidden: Bool = true
-    
+
     public init(
         text: Binding<String>,
         placeholder: String = "",
@@ -53,7 +52,6 @@ public struct Input: View {
         leadingIconColor: Color = Colors.black12,
         loading: Bool = false,
         required: Bool = false,
-        maxLength: Int? = nil,
         fontWeight: InputFontWeight = .regular,
         keyboardType: UIKeyboardType = .default,
         autofocus: Bool = false,
@@ -80,7 +78,6 @@ public struct Input: View {
         self.leadingIconColor = leadingIconColor
         self.loading = loading
         self.required = required
-        self.maxLength = maxLength
         self.fontWeight = fontWeight
         self.keyboardType = keyboardType
         self.autofocus = autofocus
@@ -96,7 +93,7 @@ public struct Input: View {
             get: { self.text },
             set: { newValue in
                 self.text = newValue
-                self.onChangeText?(limitText(newValue))
+                self.onChangeText?(newValue)
             }
         )
 
@@ -118,7 +115,7 @@ public struct Input: View {
                     .offset(x: Spacing.S, y: -8)
                     .zIndex(10)
                 }
-                
+
                 // Input container
                 HStack(alignment: .center, spacing: 0) {
                     // Leading icon
@@ -126,7 +123,7 @@ public struct Input: View {
                         Icon(source: leadingIcon, size: size == .small ? 24 : 32, color: leadingIconColor)
                             .padding(.trailing, Spacing.M)
                     }
-                    
+
                     // Text input field
                     ZStack(alignment: .leading) {
                         if text.isEmpty {
@@ -136,7 +133,7 @@ public struct Input: View {
                                 color: getPlaceholderColor()
                             )
                         }
-                        
+
                         if secureTextEntry && isPasswordHidden {
                             SecureInputField(
                                 text: $text,
@@ -145,7 +142,6 @@ public struct Input: View {
                                 fontWeight: fontWeight == .bold ? .bold : .regular,
                                 textColor: UIColor(getTextColor()),
                                 isDisabled: disabled || readOnly,
-                                maxLength: maxLength,
                                 onFocusChange: { focused in
                                     handleFocusChange(focused)
                                 },
@@ -160,15 +156,9 @@ public struct Input: View {
                             .foregroundColor(getTextColor())
                             .disabled(disabled || readOnly)
                             .applyPrimaryCursorColor()
-                            .onChange(of: text) { newValue in
-                                let limited = limitText(newValue)
-                                if limited != newValue {
-                                    text = limited
-                                }
-                            }
                         }
                     }
-                    
+
                     // Clear button (only show when focused and has text)
                     if isFocused && !text.isEmpty {
                         SwiftUI.Button(action: {
@@ -179,14 +169,14 @@ public struct Input: View {
                                 .padding(.leading, Spacing.S).accessibility(identifier: "ic_clear")
                         }
                     }
-                    
+
                     // Loading indicator
                     if loading {
                         ActivityIndicator(isAnimating: .constant(true), style: .medium)
                             .frame(width: 16, height: 16)
                             .padding(.leading, Spacing.S)
                     }
-                    
+
                     // Right icon (password toggle or custom icon)
                     if secureTextEntry {
                         if !text.isEmpty {
@@ -207,7 +197,7 @@ public struct Input: View {
                     }
                 }
                 .padding(.horizontal, Spacing.M)
-                .frame(height: scaleSize(size == .small ? 48 : 56, 1.1))
+                .frame(height: scaleSize(size == .small ? 48 : 56))
                 .background(
                     RoundedRectangle(cornerRadius: Radius.S)
                         .fill(Colors.black01)
@@ -217,7 +207,7 @@ public struct Input: View {
                         .stroke(borderColor(), lineWidth: 1)
                 )
             }
-            
+
             // Error or hint
             ErrorView(
                 errorMessage: error,
@@ -233,9 +223,9 @@ public struct Input: View {
             }
         }
     }
-    
+
     // MARK: - Helpers
-    
+
     private func handleFocusChange(_ focused: Bool) {
         isFocused = focused
         if focused {
@@ -244,19 +234,12 @@ public struct Input: View {
             onBlur?()
         }
     }
-    
+
     private func togglePasswordVisibility() {
         isPasswordHidden.toggle()
         onRightIconPressed?()
     }
 
-    private func limitText(_ value: String) -> String {
-        guard let maxLength = maxLength else {
-            return value
-        }
-        return String(value.prefix(maxLength))
-    }
-    
     private func borderColor() -> Color {
         if disabled {
             return Colors.black04 // border.disable
@@ -269,19 +252,19 @@ public struct Input: View {
         }
         return Colors.black04 // border.default
     }
-    
+
     private func getTextColor() -> Color {
         return disabled ? Colors.black09 : Colors.black17
     }
-    
+
     private func getPlaceholderColor() -> Color {
         return disabled ? Colors.black09 : Colors.black12
     }
-    
+
     private func getFloatingColor() -> Color {
         return disabled ? Colors.black09 : Colors.black12
     }
-    
+
     private func getFloatingIconColor() -> Color {
         return disabled ? Colors.black09 : floatingIconColor
     }
@@ -296,7 +279,6 @@ private struct SecureInputField: UIViewRepresentable {
     var fontWeight: UIFont.Weight
     var textColor: UIColor
     var isDisabled: Bool
-    var maxLength: Int?
     var onFocusChange: (Bool) -> Void
     var onChangeText: ((String) -> Void)?
 
@@ -325,7 +307,6 @@ private struct SecureInputField: UIViewRepresentable {
     }
 
     func updateUIView(_ textField: UITextField, context: Context) {
-        context.coordinator.parent = self
         if textField.text != text {
             textField.text = text
         }
@@ -361,7 +342,7 @@ private struct SecureInputField: UIViewRepresentable {
         }
 
         func textFieldDidEndEditing(_ textField: UITextField) {
-            parent.text = limitText(textField.text ?? "")
+            parent.text = textField.text ?? ""
             parent.onFocusChange(false)
         }
 
@@ -376,10 +357,7 @@ private struct SecureInputField: UIViewRepresentable {
 
         @objc func textFieldDidChange(_ textField: UITextField) {
             if isResettingText { return }
-            let newText = limitText(textField.text ?? "")
-            if textField.text != newText {
-                textField.text = newText
-            }
+            let newText = textField.text ?? ""
             parent.text = newText
             parent.onChangeText?(newText)
         }
@@ -388,13 +366,6 @@ private struct SecureInputField: UIViewRepresentable {
             textField.resignFirstResponder()
             return true
         }
-
-        private func limitText(_ value: String) -> String {
-            guard let maxLength = parent.maxLength else {
-                return value
-            }
-            return String(value.prefix(maxLength))
-        }
     }
 }
 

package/ios/Input/InputPhoneNumber.swift

@@ -8,7 +8,7 @@
 import SwiftUI
 public struct InputPhoneNumber: View {
     @Binding public var text: String
-    
+
     public var placeholder: String
     public var size: InputSize
     public var hintText: String
@@ -22,9 +22,9 @@ public struct InputPhoneNumber: View {
     public var onBlur: (() -> Void)?
     public var onRightIconPressed: (() -> Void)?
     public var accessibilityLabel: String?
-    
+
     @State private var isFocused: Bool = false
-    
+
     public init(
         text: Binding<String>,
         placeholder: String = "0123456789",
@@ -57,7 +57,7 @@ public struct InputPhoneNumber: View {
         self.onRightIconPressed = onRightIconPressed
         self.accessibilityLabel = accessibilityLabel
     }
-    
+
     // MARK: - Body
     public var body: some View {
         let textBinding = Binding<String>(
@@ -67,28 +67,28 @@ public struct InputPhoneNumber: View {
                 self.onChangeText?(newValue)
             }
         )
-        
+
         VStack(alignment: .leading, spacing: 4) {
             HStack(spacing: 0) {
                 // 🇻🇳 Flag
                 ImageView("https://static.momocdn.net/app/img/icon/ic-qrcode-package/ic_vn_flag.png")
                     .frame(width: 24, height: 24)
                     .padding(.trailing, Spacing.XS)
-                
+
                 MomoText("+84", typography: size == .small ? .headerSSemibold : .headerMBold)
                     .foregroundColor(Colors.black17)
-                
+
                 Rectangle()
                     .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: Colors.black12)
                     }
-                    
+
                     TextField("", text: textBinding, onEditingChanged: { focused in
                         handleFocusChange(focused)
                     })
@@ -100,7 +100,7 @@ public struct InputPhoneNumber: View {
                     .accessibility(identifier: accessibilityLabel ?? "")
                     .accessibilityValue(textBinding.wrappedValue.isEmpty ? placeholder : textBinding.wrappedValue)
                 }
-                
+
                 // Clear button
                 if isFocused && !text.isEmpty {
                     SwiftUI.Button(action: {
@@ -111,13 +111,13 @@ public struct InputPhoneNumber: View {
                             .padding(.leading, Spacing.S).accessibility(identifier: "ic_clear")
                     }
                 }
-                
+
                 // Loading indicator
                 if loading {
                     ActivityIndicator(isAnimating: .constant(true), style: .medium)
                         .frame(width: 16, height: 16)
                 }
-                
+
                 // ✅ Right icon
                 if !rightIcon.isEmpty {
                     SwiftUI.Button(action: { onRightIconPressed?() }) {
@@ -127,7 +127,7 @@ public struct InputPhoneNumber: View {
                 }
             }
             .padding(.horizontal, Spacing.M)
-            .frame(height: scaleSize(size == .small ? 48 : 56, 1.1))
+            .frame(height: scaleSize(size == .small ? 48 : 56))
             .background(
                 RoundedRectangle(cornerRadius: Radius.S)
                     .fill(Colors.black01)
@@ -136,7 +136,7 @@ public struct InputPhoneNumber: View {
                 RoundedRectangle(cornerRadius: Radius.S)
                     .stroke(borderColor(), lineWidth: isFocused ? 1.5 : 1)
             )
-            
+
             // Error or hint
             ErrorView(
                 errorMessage: error,
@@ -145,9 +145,9 @@ public struct InputPhoneNumber: View {
             )
         }
     }
-    
+
     // MARK: - Helpers
-    
+
     private func handleFocusChange(_ focused: Bool) {
         isFocused = focused
         if focused {
@@ -156,7 +156,7 @@ public struct InputPhoneNumber: View {
             onBlur?()
         }
     }
-    
+
     private func borderColor() -> Color {
         if !error.isEmpty { return Colors.red03 }
         if isFocused { return Colors.primary }

package/ios/Typography/Text.swift

@@ -1,30 +1,25 @@
 import SwiftUI
 
-public func scaleSize(_ size: CGFloat, _ scaleRate: CGFloat? = nil) -> CGFloat {
-    let defaultScreenSize: CGFloat = 375
-    let maxFontScale: CGFloat = scaleRate ?? 1.5
-    let maxDeviceScale: CGFloat = 5
+private let DEFAULT_SCREEN_SIZE: CGFloat = 375
+private let MAX_FONT_SCALE: CGFloat = 1.2
 
-    let deviceWidth = UIScreen.main.bounds.width
-    let deviceScale = deviceWidth / defaultScreenSize
+public func scaleSize(_ size: CGFloat) -> CGFloat {
+    if UseFontScaleSystem {
+        let deviceWidth = UIScreen.main.bounds.width
+        let deviceScale = deviceWidth / DEFAULT_SCREEN_SIZE
 
-    let defaultFont = UIFont.systemFont(ofSize: UIFont.labelFontSize)
-    let scaledFont = UIFontMetrics.default.scaledFont(for: defaultFont)
-    let fontScale = scaledFont.pointSize / defaultFont.pointSize
+        let defaultFont = UIFont.systemFont(ofSize: UIFont.labelFontSize)
+        let scaledFont = UIFontMetrics.default.scaledFont(for: defaultFont)
+        let fontScale = scaledFont.pointSize / defaultFont.pointSize
 
-    var fontSizeDeviceScale = size
-    var fontSizeOSScale = size
+        let maxSize = size * MAX_FONT_SCALE
+        let fontSizeScaleDevice = deviceScale > 1 ? deviceScale * size : size
+        let fontSizeScaleOS = fontScale > 1 ? fontScale * size : size
 
-
-    if deviceScale > 1 {
-        fontSizeDeviceScale = min(fontSizeDeviceScale * deviceScale, fontSizeDeviceScale + maxDeviceScale)
-    }
-
-    if fontScale > 1 {
-        fontSizeOSScale = min(fontSizeOSScale * fontScale, fontSizeOSScale * maxFontScale)
+        return min(max(fontSizeScaleDevice, fontSizeScaleOS), maxSize)
     }
 
-    return max(fontSizeDeviceScale, fontSizeOSScale)
+    return size
 }
 
 public enum TypographyStyle {