@momo-kits/native-kits 0.117.1-beta.9 → 0.118.0-beta.1

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

@@ -29,10 +29,10 @@ fun HeaderDefault(
     val height = statusBarHeight + HEADER_HEIGHT.dp
     Box(
         modifier = Modifier.fillMaxWidth().height(height)
-            .background(backgroundColor ?: AppTheme.current.colors.background.surface)
+            .background(if(headerTransparent && backgroundColor != null) backgroundColor else AppTheme.current.colors.background.surface)
             .bottomBorder(
                 strokeWidth = 1.dp,
-                color = backgroundColor?: AppTheme.current.colors.border.default
+                color = if(headerTransparent && backgroundColor != null) backgroundColor else AppTheme.current.colors.border.default
             )
     ) {
         Box(

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

@@ -110,7 +110,8 @@ fun PopupNotify(
             image.ifNotNull(
                 Image(
                     source = image,
-                    modifier = Modifier.fillMaxWidth().aspectRatio(1.777f)
+                    modifier = Modifier.fillMaxWidth().aspectRatio(1.777f),
+                    options = Options(alignment =  Alignment.Center)
                 ), 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.Fit)
+                options = Options(alignment =  Alignment.Center, contentScale = ContentScale.Crop)
             )
         }
         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.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.otf",
-        "SFProText-200" to "sfprotext_ultralight.otf",
+        "SFProText-100" to "sfprotext_thin.ttf",
+        "SFProText-200" to "sfprotext_ultralight.ttf",
         "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.otf",
+        "SFProText-900" to "sfprotext_black.ttf",
 
         "MoMoSignature-100" to "momosignature.otf",
         "MoMoSignature-200" to "momosignature.otf",

package/ios/Application/HeaderRight.swift

@@ -179,14 +179,14 @@ struct ToolkitHeaderRight: View {
     }
     
     var body: some View {
-        let backgroundButtonColor: Color = tintColor == Colors.black01 ? Color.black.opacity(0.6) : Colors.black01.opacity(0.6)
-        let borderColor: Color = tintColor == Colors.black01 ? Color.white.opacity(0.2) : Color.black.opacity(0.2)
+        let backgroundButtonColor: Color = tintColor == Colors.black01 ? Colors.black20.opacity(0.6) : Colors.black01.opacity(0.6)
+        let borderColor: Color = tintColor == Colors.black01 ? Colors.black01.opacity(0.2) : Colors.black20.opacity(0.2)
         let navButtonConfig = getNavigationButtonConfig()
         let showBadge = headerRight?.tools.contains { group in
             group.items.contains { $0.showBadge }
         } ?? false
         
-        HStack(alignment: .center) {
+        HStack(alignment: .center, spacing: 0) {
             if headerRight?.useShortcut == true {
                 NavigationButton(
                     disabled: isLoading,
@@ -234,8 +234,8 @@ struct NavigationButton: View {
     var tintColor: Color?
     
     var body: some View {
-        let backgroundButtonColor: Color = tintColor == Colors.black01 ? Color.black.opacity(0.6) : Colors.black01.opacity(0.6)
-        let borderColor: Color = tintColor == Colors.black01 ? Color.white.opacity(0.2) : Color.black.opacity(0.2)
+        let backgroundButtonColor: Color = tintColor == Colors.black01 ? Colors.black20.opacity(0.6) : Colors.black01.opacity(0.6)
+        let borderColor: Color = tintColor == Colors.black01 ? Colors.black01.opacity(0.2) : Colors.black20.opacity(0.2)
         
         ZStack {
             Circle()

package/ios/Popup/PopupDisplay.swift

@@ -6,6 +6,7 @@ import SwiftUI
 public enum PopupButtonDirection {
     case row
     case column
+    case auto
 }
 
 // MARK: - PopupButtonType
@@ -37,7 +38,14 @@ public struct PopupDisplay: View {
 
     // MARK: Public
 
+    @State private var textHeight: CGFloat = .zero
+    @State private var isScrollable = false
+    
     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) {
@@ -75,12 +83,37 @@ public struct PopupDisplay: View {
                             .lineLimit(2)
                             .accessibility(identifier: "title_popup_permission")
 
-                        Text(description)
-                            .foregroundColor(.black)
-                            .font(.paragraph)
-                            .opacity(0.6)
-                            .multilineTextAlignment(.leading)
-                            .padding(.bottom, 8)
+                        Group {
+                            if isScrollable {
+                                ScrollView(showsIndicators: false) {
+                                    Text(description)
+                                        .font(.paragraph)
+                                        .foregroundColor(.black)
+                                        .opacity(0.6)
+                                        .multilineTextAlignment(.leading)
+                                        .background(GeometryReader { geo in
+                                            Color.clear
+                                                .onAppear {
+                                                    textHeight = geo.size.height
+                                                }
+                                        })
+                                }
+                                .frame(height: 60)
+                            } else {
+                                Text(description)
+                                    .font(.paragraph)
+                                    .foregroundColor(.black)
+                                    .opacity(0.6)
+                                    .multilineTextAlignment(.leading)
+                                    .background(GeometryReader { geo in
+                                        Color.clear
+                                            .onAppear {
+                                                textHeight = geo.size.height
+                                                isScrollable = textHeight > 60 // adjust threshold to ~3 lines
+                                            }
+                                    })
+                            }
+                        }.padding(.bottom, 8)
 
                         if(!errorCode.isEmpty) {
                             Text(errorCode)
@@ -94,17 +127,17 @@ public struct PopupDisplay: View {
                     .padding(.horizontal, 24)
                     .padding(.bottom, 16)
 
-                    if buttonDirection == .row {
+                    if shouldUseColumn {
                         if buttonType == .text {
-                            RowTextButtons
+                            ColumnTextButtons
                         } else {
-                            RowButtons
+                            ColumnButtons
                         }
                     } else {
                         if buttonType == .text {
-                            ColumnTextButtons
+                            RowTextButtons
                         } else {
-                            ColumnButtons
+                            RowButtons
                         }
                     }
 

package/ios/Popup/PopupPromotion.swift

@@ -27,8 +27,9 @@ 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)
+                .frame(maxWidth: UIScreen.main.bounds.width - Spacing.XL * 2, alignment: .center)
                 .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 = 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.
-#Thu Jan 09 10:43:10 ICT 2025
-sdk.dir=/Users/sophia/Library/Android/sdk
+#Wed Aug 21 14:20:12 ICT 2024
+sdk.dir=/Users/huynhdung/Library/Android/sdk

package/package.json

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