@momo-kits/native-kits 0.160.1-beta.5-debug → 0.160.1-beta.6-debug

package/compose/build.gradle.kts

@@ -40,7 +40,7 @@ kotlin {
     }
 
     cocoapods {
-        version = "0.160.1-beta.5-debug"
+        version = "0.160.1-beta.6-debug"
         summary = "IOS Shared module"
         homepage = "https://momo.vn"
         ios.deploymentTarget = "15.0"

package/compose/src/commonMain/kotlin/vn/momo/kits/application/Context.kt

@@ -94,6 +94,7 @@ val ApplicationContext = staticCompositionLocalOf<MiniAppContext?> {
 
 var IsShowBaseLineDebug = false
 
+var UseFontScaleSystem = true
 val AppConfig = staticCompositionLocalOf<KitConfig?> {
     null
 }

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

@@ -11,7 +11,7 @@ import androidx.compose.ui.unit.*
 import org.jetbrains.compose.resources.Font
 import org.jetbrains.compose.resources.FontResource
 import org.jetbrains.compose.resources.InternalResourceApi
-import vn.momo.kits.application.IsShowBaseLineDebug
+import vn.momo.kits.application.UseFontScaleSystem
 import vn.momo.kits.platform.getScreenDimensions
 import vn.momo.uikits.resources.Res
 import vn.momo.uikits.resources.momosignature
@@ -33,17 +33,19 @@ const val MAX_FONT_SCALE = 1.2f
 
 @Composable
 fun scaleSize(size: Float): Float {
-    if (!IsShowBaseLineDebug) return size
+    if (UseFontScaleSystem) {
+        val deviceWidth = getScreenDimensions().width
+        val deviceScale = deviceWidth / DEFAULT_SCREEN_SIZE
+        val fontScale = LocalDensity.current.fontScale
 
-    val deviceWidth = getScreenDimensions().width
-    val deviceScale = deviceWidth / DEFAULT_SCREEN_SIZE
-    val fontScale = LocalDensity.current.fontScale
+        val maxSize = size * MAX_FONT_SCALE
+        val fontSizeScaleDevice = if (deviceScale > 1) deviceScale * size else size
+        val fontSizeScaleOS = if (fontScale > 1) fontScale * size else size
 
-    val maxSize = size * MAX_FONT_SCALE
-    val fontSizeScaleDevice = if (deviceScale > 1) deviceScale * size else size
-    val fontSizeScaleOS = if (fontScale > 1) fontScale * size else size
+        return min(max(fontSizeScaleDevice, fontSizeScaleOS), maxSize)
+    }
 
-    return min(max(fontSizeScaleDevice, fontSizeScaleOS), maxSize)
+    return size
 }
 
 @Composable

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.160.1-beta.5"
+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.1-beta.5
+version=0.160.1-beta.6
 
 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
@@ -39,11 +39,13 @@ public class KitConfig {
 
 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/Typography/Text.swift

@@ -4,20 +4,22 @@ private let DEFAULT_SCREEN_SIZE: CGFloat = 375
 private let MAX_FONT_SCALE: CGFloat = 1.2
 
 public func scaleSize(_ size: CGFloat) -> CGFloat {
-    if IsShowBaseLineDebug { return size }
+    if UseFontScaleSystem {
+        let deviceWidth = UIScreen.main.bounds.width
+        let deviceScale = deviceWidth / DEFAULT_SCREEN_SIZE
 
-    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
+        let maxSize = size * MAX_FONT_SCALE
+        let fontSizeScaleDevice = deviceScale > 1 ? deviceScale * size : size
+        let fontSizeScaleOS = fontScale > 1 ? fontScale * size : size
 
-    let maxSize = size * MAX_FONT_SCALE
-    let fontSizeScaleDevice = deviceScale > 1 ? deviceScale * size : size
-    let fontSizeScaleOS = fontScale > 1 ? fontScale * size : size
+        return min(max(fontSizeScaleDevice, fontSizeScaleOS), maxSize)
+    }
 
-    return min(max(fontSizeScaleDevice, fontSizeScaleOS), maxSize)
+    return size
 }
 
 public enum TypographyStyle {

package/package.json

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