@momo-kits/native-kits 0.118.0-rc.5 → 0.118.1-beta.2

package/compose/src/commonMain/kotlin/vn/momo/kits/const/Typography.kt

@@ -2,6 +2,7 @@ package vn.momo.kits.const
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
+import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
@@ -12,17 +13,31 @@ import org.jetbrains.compose.resources.FontResource
 import org.jetbrains.compose.resources.InternalResourceApi
 import org.jetbrains.compose.resources.ResourceItem
 import vn.momo.kits.platform.getScreenDimensions
+import kotlin.math.min
 
 const val DEFAULT_SCREEN_SIZE = 375f
+const val MAX_FONT_SCALE = 1.2f
+const val MAX_DEVICE_SCALE = 5
 
 @Composable
 fun scaleSize(size: Float): Float {
     val deviceWidth = getScreenDimensions().width
-    val scaleRate = deviceWidth / DEFAULT_SCREEN_SIZE
-    if (scaleRate > 1) {
-        return if ((scaleRate * size) > (size + 5)) size + 5 else scaleRate * size
+    val deviceScale = deviceWidth / DEFAULT_SCREEN_SIZE
+
+    val density = LocalDensity.current
+    val fontScale = density.fontScale
+
+    var fontSize = size / fontScale //To ignore OS scale
+
+    if (deviceScale > 1) {
+        fontSize = min(deviceScale * fontSize, fontSize + MAX_DEVICE_SCALE)
     }
-    return size
+
+    if (fontScale > 1) {
+        fontSize = min(fontScale * fontSize, fontSize * MAX_FONT_SCALE)
+    }
+
+    return fontSize
 }
 
 @OptIn(InternalResourceApi::class)
@@ -46,15 +61,15 @@ fun getFont(font: String): FontFamily {
 fun getFontFamily(fontFamily: String, fontWeight: FontWeight? = FontWeight.Normal): FontFamily {
     val key = "$fontFamily-${fontWeight?.weight}"
     val fontMap = mapOf(
-        "SFProText-100" to "sfprotext_thin.ttf",
-        "SFProText-200" to "sfprotext_ultralight.ttf",
+        "SFProText-100" to "sfprotext_thin.otf",
+        "SFProText-200" to "sfprotext_ultralight.otf",
         "SFProText-300" to "sfprotext_light.ttf",
         "SFProText-400" to "sfprotext_regular.ttf",
         "SFProText-500" to "sfprotext_medium.ttf",
         "SFProText-600" to "sfprotext_semibold.ttf",
         "SFProText-700" to "sfprotext_bold.ttf",
         "SFProText-800" to "sfprotext_heavy.ttf",
-        "SFProText-900" to "sfprotext_black.ttf",
+        "SFProText-900" to "sfprotext_black.otf",
 
         "MoMoSignature-100" to "momosignature.otf",
         "MoMoSignature-200" to "momosignature.otf",

package/ios/Typography/Typography.swift

@@ -2,7 +2,28 @@ import SwiftUI
 
 public extension Font {
     static func appFont(size: CGFloat) -> Font {
-        return Font.system(size: size)
+        let defaultScreenSize: CGFloat = 375
+        let maxFontScale: CGFloat = 1.2
+        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/local.properties

@@ -4,5 +4,5 @@
 # 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
+#Tue Apr 08 11:13:31 ICT 2025
+sdk.dir=/Users/sonnguyen/Library/Android/sdk

package/package.json

@@ -1,8 +1,7 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.118.0-rc.5",
+  "version": "0.118.1-beta.2",
   "private": false,
   "dependencies": {},
-  "devDependencies": {},
   "license": "MoMo"
 }