@momo-kits/native-kits 0.117.1-beta.12 → 0.117.1-beta.20

package/compose/src/commonMain/kotlin/vn/momo/kits/components/PopupNotify.kt

@@ -110,8 +110,7 @@ fun PopupNotify(
             image.ifNotNull(
                 Image(
                     source = image,
-                    modifier = Modifier.fillMaxWidth().aspectRatio(1.777f),
-                    options = Options(alignment =  Alignment.Center)
+                    modifier = Modifier.fillMaxWidth().aspectRatio(1.777f)
                 ), null
             )
 

package/compose/src/commonMain/kotlin/vn/momo/kits/components/PopupPromotion.kt

@@ -42,7 +42,7 @@ fun PopupPromotion(
                         indication = null,
                         onClick = onPress
                     ),
-                options = Options(alignment =  Alignment.Center, contentScale = ContentScale.Crop)
+                options = Options(alignment =  Alignment.Center, contentScale = ContentScale.Fit)
             )
         }
         Box(

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.5f
+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)

package/ios/Popup/PopupDisplay.swift

@@ -6,7 +6,6 @@ import SwiftUI
 public enum PopupButtonDirection {
     case row
     case column
-    case auto
 }
 
 // MARK: - PopupButtonType
@@ -39,10 +38,6 @@ public struct PopupDisplay: View {
     // MARK: Public
 
     public var body: some View {
-        var shouldUseColumn: Bool {
-            buttonDirection == .column || (buttonDirection == .auto && (closeButtonTitle.count > 12 || actionButtonTitle.count > 12))
-        }
-
         VStack(spacing: 12) {
             ZStack(alignment: .topTrailing) {
                 SwiftUI.Button(action: onClose) {
@@ -99,17 +94,17 @@ public struct PopupDisplay: View {
                     .padding(.horizontal, 24)
                     .padding(.bottom, 16)
 
-                    if shouldUseColumn {
+                    if buttonDirection == .row {
                         if buttonType == .text {
-                            ColumnTextButtons
+                            RowTextButtons
                         } else {
-                            ColumnButtons
+                            RowButtons
                         }
                     } else {
                         if buttonType == .text {
-                            RowTextButtons
+                            ColumnTextButtons
                         } else {
-                            RowButtons
+                            ColumnButtons
                         }
                     }
 

package/ios/Popup/PopupPromotion.swift

@@ -27,9 +27,8 @@ public struct PopupPromotion: View {
                         .frame(maxWidth: UIScreen.main.bounds.width - Spacing.XL * 2)
                         .clipped()
                 }
-                .scaledToFill()
                 .aspectRatio(0.72, contentMode: .fit)
-                .frame(maxWidth: UIScreen.main.bounds.width - Spacing.XL * 2, alignment: .center)
+                .frame(maxWidth: UIScreen.main.bounds.width - Spacing.XL * 2)
                 .clipped()
                 .onTapGesture {
                     onAction?()

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 = 10
+        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.
-#Thu Jan 09 10:43:10 ICT 2025
-sdk.dir=/Users/sophia/Library/Android/sdk
+#Tue Apr 08 11:13:31 ICT 2025
+sdk.dir=/Users/sonnguyen/Library/Android/sdk

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.117.1-beta.12",
+  "version": "0.117.1-beta.20",
   "private": false,
   "dependencies": {},
   "devDependencies": {},