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

package/ios/Typography/Text.swift

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

package/ios/Typography/Typography.swift

@@ -2,7 +2,28 @@ import SwiftUI
 
 public extension Font {
     static func appFont(size: CGFloat) -> Font {
-        return Font.system(size: scaleSize(size))
+        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
+
+        var fontSize = size
+
+        if deviceScale > 1 {
+            fontSize = min(fontSize * deviceScale, fontSize + maxDeviceScale)
+        }
+
+        if fontScale > 1 {
+            fontSize = min(fontSize * fontScale, fontSize * maxFontScale)
+        }
+
+        return Font.system(size: fontSize)
     }
     
     // New supported typography styles

package/ios/native-kits.podspec

@@ -10,7 +10,8 @@ Pod::Spec.new do |s|
   s.ios.deployment_target = '15.0'
   s.swift_version         = '5.0'
 
-  s.source_files       = "**/*.swift"
+  s.source_files       = "**/*.{swift,m,h}"
+  s.public_header_files = "StatusBarTap/*.h"
   s.framework             = 'SwiftUI', 'Combine'
   s.dependency  'SDWebImageSwiftUI'
   s.dependency       'lottie-ios'

package/package.json

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

package/settings.gradle.kts

@@ -19,7 +19,11 @@ pluginManagement {
             credentials {username = "download_packages"; password = "gldt-bjDqLpU_sPcHDuXau2ws" }
         }
         maven {
-            url = uri("http://nexus.mservice.com.vn:8081/repository/maven-public/")
+            url = uri("https://artifacts.mservice.com.vn/repository/maven-momo-app/")
+            credentials {
+                username = "viewer"
+                password = "viewer"
+            }
             isAllowInsecureProtocol = true
         }
     }
@@ -35,12 +39,20 @@ dependencyResolutionManagement {
             }
         }
         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" }
+            credentials {
+                username = "download_packages";
+                password = "gldt-bjDqLpU_sPcHDuXau2ws"
+            }
         }
         maven {
-            url = uri("http://nexus.mservice.com.vn:8081/repository/maven-public/")
+            url = uri("https://artifacts.mservice.com.vn/repository/maven-momo-app/")
+            credentials {
+                username = "viewer"
+                password = "viewer"
+            }
             isAllowInsecureProtocol = true
         }
     }