@momo-kits/native-kits 0.161.2-search-header.1-debug → 0.161.3-beta.1-debug

package/compose/build.gradle.kts

@@ -40,7 +40,7 @@ kotlin {
     }
 
     cocoapods {
-        version = "0.161.2-search-header.1-debug"
+        version = "0.161.3-beta.1-debug"
         summary = "IOS Shared module"
         homepage = "https://momo.vn"
         ios.deploymentTarget = "15.0"

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

@@ -1,12 +1,15 @@
 package vn.momo.kits.application
 
 import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.staticCompositionLocalOf
 import vn.momo.kits.components.TrustBannerData
 
 @Immutable
 data class FeatureFlags(
-    val showBaseLineDebug: Boolean? = false,
+    val isBaselineEnabled: Boolean? = false,
+    val isWhiteList: Boolean? = false,
+    val allowFontScale: Boolean? = true,
 )
 
 @Immutable
@@ -28,7 +31,6 @@ data class MiniAppContext(
     val providerId: String = "",
     val permissions: List<Map<String, Any>>? = emptyList(),
     val features: FeatureFlags? = null,
-    val scaleSizeMaxRate: Float? = null,
 ) {
     companion object {
 
@@ -60,7 +62,6 @@ data class MiniAppContext(
                 providerId = parent.providerId.ifBlank { child.providerId },
                 permissions = if (!parent.permissions.isNullOrEmpty()) parent.permissions else child.permissions,
                 features = mergeFeatureFlags(parent.features, child.features),
-                scaleSizeMaxRate = parent.scaleSizeMaxRate ?: child.scaleSizeMaxRate,
             )
         }
 
@@ -74,7 +75,7 @@ data class MiniAppContext(
             if (child == null) return parent
 
             return FeatureFlags(
-                showBaseLineDebug = parent.showBaseLineDebug ?: child.showBaseLineDebug
+                isBaselineEnabled = parent.isBaselineEnabled ?: child.isBaselineEnabled
             )
         }
     }
@@ -88,12 +89,19 @@ data class ComponentInformation(
     val action: String? = null
 )
 
-var IsShowBaseLineDebug = false
-
 val ApplicationContext = staticCompositionLocalOf<MiniAppContext?> {
     null
 }
 
+var IsShowBaseLineDebug = false
+
+private val UseFontScaleSystemState = mutableStateOf(true)
+var UseFontScaleSystem: Boolean
+    get() = UseFontScaleSystemState.value
+    set(value) {
+        UseFontScaleSystemState.value = value
+    }
+
 val AppConfig = staticCompositionLocalOf<KitConfig?> {
     null
 }
@@ -105,5 +113,3 @@ val AppLanguage = staticCompositionLocalOf<String?> {
 val LocalComponentInformation = staticCompositionLocalOf<ComponentInformation?> {
     null
 }
-
-val ScaleSizeMaxRate = staticCompositionLocalOf<Float?> { null }

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

@@ -69,9 +69,10 @@ import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.compose.runtime.staticCompositionLocalOf
-import androidx.compose.ui.draw.drawWithCache
+import androidx.compose.ui.graphics.Color.Companion
 import androidx.compose.ui.graphics.SolidColor
 import androidx.compose.ui.unit.lerp
+import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.mapNotNull
 import vn.momo.kits.components.Icon
@@ -80,11 +81,11 @@ import vn.momo.kits.const.AppTheme
 import vn.momo.kits.const.Colors
 import vn.momo.kits.const.Spacing
 import vn.momo.kits.const.Typography
+import vn.momo.kits.modifier.conditional
 import vn.momo.kits.modifier.kitsAutomationId
 import vn.momo.kits.modifier.noFeedbackClickable
 import vn.momo.kits.modifier.setAutomationId
 import vn.momo.kits.modifier.shadow
-import vn.momo.kits.navigation.component.HEADER_HEIGHT
 import vn.momo.kits.utils.getAppStatusBarHeight
 import kotlin.math.max
 import kotlin.math.roundToInt
@@ -440,7 +441,6 @@ private class LiteScreenLayoutPolicy(
         val spacing12 = Spacing.M.roundToPx()
         val spaceBetween = headerSpaceBetween?.roundToPx() ?: spacing12
         val statusBarPx = statusBarHeight.roundToPx()
-        val headerRowDefault = HEADER_HEIGHT.dp.roundToPx()
         val scrollPercent = scrollPercentage.value
 
         val contentMeasurable = measurables.find { it.layoutId == HeaderId.CONTENT_ID }
@@ -484,20 +484,26 @@ private class LiteScreenLayoutPolicy(
             )
         )
 
-        /**
-         * replicate logic from [vn.momo.kits.navigation.component.HeaderBackground]
-         * */
-        var defaultHeight = statusBarPx + headerRowDefault
+        val firstRowMaxHeight = buildList {
+            add(backIconPlaceable.safeHeight)
+            add(headerRightPlaceable.safeHeight)
+            if (!isHeaderExtend) {
+                add(inputSearchPlaceable.safeHeight)
+            }
+            add(HEADER_HEIGHT.dp.roundToPx())
+            if (isHeaderExtend) {
+                add(titlePlaceable.safeHeight)
+            }
+        }.max()
+
+        var defaultHeight = statusBarPx + spacing12 + firstRowMaxHeight + spacing12
         if (isHeaderExtend) {
-            defaultHeight = 154.dp.roundToPx()
+            defaultHeight += inputSearchPlaceable.safeHeight + spacing12
         }
         val headerHeight = when {
             isHeaderNone -> statusBarPx
             !useAnimationSearch && !isHeaderExtend -> defaultHeight
-            else -> {
-                val collapsableSpace = defaultHeight - statusBarPx - headerRowDefault
-                (defaultHeight - scrollPercent * collapsableSpace).toInt()
-            }
+            else -> (defaultHeight - scrollPercent * (defaultHeight - statusBarPx - HEADER_HEIGHT.dp.roundToPx())).toInt()
         }
 
         val layoutWidth = constraints.maxWidth
@@ -560,14 +566,14 @@ private class LiteScreenLayoutPolicy(
             if (backIconPlaceable != null) {
                 backIconPlaceable.place(
                     x = startX,
-                    y = startY + backIconPlaceable.verticalCenterOffset(headerRowDefault),
+                    y = startY + backIconPlaceable.verticalCenterOffset(firstRowMaxHeight),
                 )
                 curX += backIconPlaceable.safeWidth + spaceBetween
             }
 
             headerRightPlaceable?.place(
                 x = layoutWidth - spacing12 - headerRightPlaceable.safeWidth,
-                y = startY + headerRightPlaceable.verticalCenterOffset(headerRowDefault),
+                y = startY + headerRightPlaceable.verticalCenterOffset(firstRowMaxHeight),
             )
 
             val titleOffset = IntOffset(
@@ -576,19 +582,19 @@ private class LiteScreenLayoutPolicy(
                     space = layoutWidth,
                     layoutDirection = layoutDirection,
                 ),
-                y = startY + titlePlaceable.verticalCenterOffset(headerRowDefault),
+                y = startY + titlePlaceable.verticalCenterOffset(firstRowMaxHeight),
             )
 
             titlePlaceable?.place(titleOffset)
 
             if (backIconPlaceable != null || headerRightPlaceable != null || titlePlaceable != null) {
-                curY += headerRowDefault
+                curY += firstRowMaxHeight
             }
 
             val inputSearchOffset = if (isHeaderExtend) {
-                val baseY = curY + inputSearchPlaceable.verticalCenterOffset(headerRowDefault)
+                val baseY = curY + inputSearchPlaceable.verticalCenterOffset(firstRowMaxHeight)
                 val y = (baseY * (1 - scrollPercent)).toInt().coerceAtLeast(
-                    startY + inputSearchPlaceable.verticalCenterOffset(headerRowDefault)
+                    startY + inputSearchPlaceable.verticalCenterOffset(firstRowMaxHeight)
                 )
                 IntOffset(
                     x = startX + ((backIconPlaceable.safeWidth + spaceBetween) * (scrollPercent * 2f).coerceIn(
@@ -599,7 +605,7 @@ private class LiteScreenLayoutPolicy(
             } else {
                 IntOffset(
                     x = curX,
-                    y = startY + inputSearchPlaceable.verticalCenterOffset(headerRowDefault),
+                    y = startY + inputSearchPlaceable.verticalCenterOffset(firstRowMaxHeight),
                 )
             }
             val finalPosition = lerp(
@@ -817,8 +823,7 @@ private fun LiteInputSearch(
                         if (!placeHolder.isNullOrEmpty()) {
                             inputSearchProps.customPlaceHolder?.invoke() ?: Text(
                                 text = placeHolder ?: "",
-                                style = inputSearchProps.customTextStyle
-                                    ?: Typography.bodyDefaultRegular,
+                                style = inputSearchProps.customTextStyle ?: Typography.bodyDefaultRegular,
                                 maxLines = 1,
                                 color = theme.colors.text.hint,
                                 overflow = TextOverflow.Ellipsis

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

@@ -21,10 +21,6 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.PathEffect
 import androidx.compose.ui.graphics.StrokeCap
 import androidx.compose.ui.unit.dp
-import io.ktor.util.Platform
-import vn.momo.kits.application.IsShowBaseLineDebug
-import vn.momo.kits.const.Colors
-import vn.momo.kits.modifier.conditional
 import vn.momo.kits.platform.getPlatformName
 import vn.momo.kits.platform.getStatusBarHeight
 

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

@@ -7,15 +7,11 @@ import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextDecoration
-import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.TextUnit
-import androidx.compose.ui.unit.TextUnitType
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
+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.ScaleSizeMaxRate
+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,34 +29,23 @@ import kotlin.math.max
 import kotlin.math.min
 
 const val DEFAULT_SCREEN_SIZE = 375f
-const val MAX_FONT_SCALE = 1.5f
-const val MAX_DEVICE_SCALE = 5
+const val MAX_FONT_SCALE = 1.2f
 
 @Composable
 fun scaleSize(size: Float): Float {
-    val scaleSizeMaxRate: Float = ScaleSizeMaxRate.current ?: MAX_FONT_SCALE
-    val deviceWidth = getScreenDimensions().width
-    val deviceScale = deviceWidth / DEFAULT_SCREEN_SIZE
+    if (UseFontScaleSystem) {
+        val deviceWidth = getScreenDimensions().width
+        val deviceScale = deviceWidth / DEFAULT_SCREEN_SIZE
+        val fontScale = LocalDensity.current.fontScale
 
-    val density = LocalDensity.current
-    val fontScale = density.fontScale
-
-    var fontSizeScaleDevice = size
-    var fontSizeScaleOS = 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
 
-    if (deviceScale > 1) {
-        fontSizeScaleDevice =
-            min(deviceScale * fontSizeScaleDevice, fontSizeScaleDevice + MAX_DEVICE_SCALE)
+        return min(max(fontSizeScaleDevice, fontSizeScaleOS), maxSize)
     }
 
-    if (fontScale > 1) {
-        fontSizeScaleOS = min(fontScale * fontSizeScaleOS, fontSizeScaleOS * scaleSizeMaxRate)
-    }
-
-    return max(
-        fontSizeScaleDevice,
-        fontSizeScaleOS
-    )
+    return size
 }
 
 @Composable

package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/NavigationContainer.kt

@@ -9,6 +9,9 @@ import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
 import androidx.navigation.toRoute
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.map
 import vn.momo.kits.application.*
 import vn.momo.kits.const.*
 import vn.momo.kits.platform.ProvideNavigationEventDispatcherOwner
@@ -54,6 +57,19 @@ fun NavigationContainer(
     DynamicScreenRegistry.bind(screenId, initialScreenName, initialScreen, options)
     val startDestination = remember(screenId) { DynamicScreenRoute(screenId) }
 
+    LaunchedEffect(maxApi) {
+        val api = maxApi ?: return@LaunchedEffect
+        runCatching {
+            api.observer("use_font_scale")
+                .map { parseUseFontScale(it) }
+                .distinctUntilChanged()
+                .catch { /* ignore observer errors, keep current value */ }
+                .collect { enabled ->
+                    UseFontScaleSystem = enabled
+                }
+        }
+    }
+
     ProvideNavigationEventDispatcherOwner {
         CompositionLocalProvider(
             LocalNavigator provides navigator,
@@ -64,7 +80,6 @@ fun NavigationContainer(
             ApplicationContext provides mergedContext,
             AppConfig provides config,
             AppLanguage provides language,
-            ScaleSizeMaxRate provides mergedContext?.scaleSizeMaxRate,
         ) {
             LaunchedEffect(Unit) {
                 setNavigator?.invoke(navigator)
@@ -143,3 +158,15 @@ fun NavigationContainer(
 val LocalMaxApi = staticCompositionLocalOf<IMaxApi?> {
     error("No MaxApi provided")
 }
+
+private fun parseUseFontScale(raw: Any?): Boolean = when (raw) {
+    null -> true
+    is Boolean -> raw
+    is String -> raw.isBlank() || !raw.equals("false", ignoreCase = true)
+    is Number -> raw.toInt() != 0
+    is Map<*, *> -> {
+        val nested = raw["response"] ?: raw["value"] ?: raw["data"]
+        if (nested === raw) true else parseUseFontScale(nested)
+    }
+    else -> true
+}

package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/StackScreen.kt

@@ -274,7 +274,7 @@ fun ScreenContent(content: @Composable () -> Unit) {
             Box(Modifier.fillMaxWidth().aspectRatio(animatedHeader.aspectRatio.value)) {
                 animatedHeader.composable.invoke(scrollState.value)
             }
-            Box(Modifier.offset(x = 0.dp, y = AppStatusBar.current + HEADER_HEIGHT.dp + animatedHeader.layoutOffSet)) {
+            Box(Modifier.padding(top = AppStatusBar.current + HEADER_HEIGHT.dp + animatedHeader.layoutOffSet)) {
                 content()
             }
         }

package/example/ios/Example.xcodeproj/xcuserdata/{vunh.xcuserdatad → huynhdung.xcuserdatad}/xcschemes/xcschememanagement.plist

@@ -4,7 +4,7 @@
 <dict>
 	<key>SchemeUserState</key>
 	<dict>
-		<key>ios.xcscheme</key>
+		<key>Example.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
 			<integer>0</integer>

package/example/ios/Pods/Pods.xcodeproj/xcuserdata/{vunh.xcuserdatad → huynhdung.xcuserdatad}/xcschemes/xcschememanagement.plist

@@ -9,35 +9,35 @@
 			<key>isShown</key>
 			<false />
 			<key>orderHint</key>
-			<integer>1</integer>
+			<integer>0</integer>
 		</dict>
 		<key>Pods-Example.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false />
 			<key>orderHint</key>
-			<integer>2</integer>
+			<integer>1</integer>
 		</dict>
 		<key>SDWebImage.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false />
 			<key>orderHint</key>
-			<integer>3</integer>
+			<integer>2</integer>
 		</dict>
 		<key>SDWebImageSwiftUI.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false />
 			<key>orderHint</key>
-			<integer>4</integer>
+			<integer>3</integer>
 		</dict>
 		<key>SkeletonUI.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false />
 			<key>orderHint</key>
-			<integer>5</integer>
+			<integer>4</integer>
 		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>

package/gradle/libs.versions.toml

@@ -19,7 +19,7 @@ androidx-appcompat = "1.7.0"
 material = "1.10.0"
 maxapi = "0.1.1"
 vanniktechMavenPublish = "0.34.0"
-kits = "0.159.1-beta.7"
+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.161.2-search-header.1
+version=0.161.3-beta.1
 
 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
@@ -37,11 +37,15 @@ public class KitConfig {
     public var headerGradient: String? = nil
 }
 
+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/Input/Input.swift

@@ -4,7 +4,7 @@ import Combine
 
 public struct Input: View {
     @Binding public var text: String
-    
+
     public var placeholder: String
     public var floatingValue: String
     public var floatingIcon: String
@@ -30,10 +30,10 @@ public struct Input: View {
     public var onFocus: (() -> Void)?
     public var onBlur: (() -> Void)?
     public var onRightIconPressed: (() -> Void)?
-    
+
     @State private var isFocused: Bool = false
     @State private var isPasswordHidden: Bool = true
-    
+
     public init(
         text: Binding<String>,
         placeholder: String = "",
@@ -118,7 +118,7 @@ public struct Input: View {
                     .offset(x: Spacing.S, y: -8)
                     .zIndex(10)
                 }
-                
+
                 // Input container
                 HStack(alignment: .center, spacing: 0) {
                     // Leading icon
@@ -126,7 +126,7 @@ public struct Input: View {
                         Icon(source: leadingIcon, size: size == .small ? 24 : 32, color: leadingIconColor)
                             .padding(.trailing, Spacing.M)
                     }
-                    
+
                     // Text input field
                     ZStack(alignment: .leading) {
                         if text.isEmpty {
@@ -136,7 +136,7 @@ public struct Input: View {
                                 color: getPlaceholderColor()
                             )
                         }
-                        
+
                         if secureTextEntry && isPasswordHidden {
                             SecureInputField(
                                 text: $text,
@@ -168,7 +168,7 @@ public struct Input: View {
                             }
                         }
                     }
-                    
+
                     // Clear button (only show when focused and has text)
                     if isFocused && !text.isEmpty {
                         SwiftUI.Button(action: {
@@ -179,14 +179,14 @@ public struct Input: View {
                                 .padding(.leading, Spacing.S).accessibility(identifier: "ic_clear")
                         }
                     }
-                    
+
                     // Loading indicator
                     if loading {
                         ActivityIndicator(isAnimating: .constant(true), style: .medium)
                             .frame(width: 16, height: 16)
                             .padding(.leading, Spacing.S)
                     }
-                    
+
                     // Right icon (password toggle or custom icon)
                     if secureTextEntry {
                         if !text.isEmpty {
@@ -207,7 +207,7 @@ public struct Input: View {
                     }
                 }
                 .padding(.horizontal, Spacing.M)
-                .frame(height: scaleSize(size == .small ? 48 : 56, 1.1))
+                .frame(height: scaleSize(size == .small ? 48 : 56))
                 .background(
                     RoundedRectangle(cornerRadius: Radius.S)
                         .fill(Colors.black01)
@@ -217,7 +217,7 @@ public struct Input: View {
                         .stroke(borderColor(), lineWidth: 1)
                 )
             }
-            
+
             // Error or hint
             ErrorView(
                 errorMessage: error,
@@ -233,9 +233,9 @@ public struct Input: View {
             }
         }
     }
-    
+
     // MARK: - Helpers
-    
+
     private func handleFocusChange(_ focused: Bool) {
         isFocused = focused
         if focused {
@@ -244,7 +244,7 @@ public struct Input: View {
             onBlur?()
         }
     }
-    
+
     private func togglePasswordVisibility() {
         isPasswordHidden.toggle()
         onRightIconPressed?()
@@ -256,7 +256,7 @@ public struct Input: View {
         }
         return String(value.prefix(maxLength))
     }
-    
+
     private func borderColor() -> Color {
         if disabled {
             return Colors.black04 // border.disable
@@ -269,19 +269,19 @@ public struct Input: View {
         }
         return Colors.black04 // border.default
     }
-    
+
     private func getTextColor() -> Color {
         return disabled ? Colors.black09 : Colors.black17
     }
-    
+
     private func getPlaceholderColor() -> Color {
         return disabled ? Colors.black09 : Colors.black12
     }
-    
+
     private func getFloatingColor() -> Color {
         return disabled ? Colors.black09 : Colors.black12
     }
-    
+
     private func getFloatingIconColor() -> Color {
         return disabled ? Colors.black09 : floatingIconColor
     }

package/ios/Input/InputPhoneNumber.swift

@@ -8,7 +8,7 @@
 import SwiftUI
 public struct InputPhoneNumber: View {
     @Binding public var text: String
-    
+
     public var placeholder: String
     public var size: InputSize
     public var hintText: String
@@ -22,9 +22,9 @@ public struct InputPhoneNumber: View {
     public var onBlur: (() -> Void)?
     public var onRightIconPressed: (() -> Void)?
     public var accessibilityLabel: String?
-    
+
     @State private var isFocused: Bool = false
-    
+
     public init(
         text: Binding<String>,
         placeholder: String = "0123456789",
@@ -57,7 +57,7 @@ public struct InputPhoneNumber: View {
         self.onRightIconPressed = onRightIconPressed
         self.accessibilityLabel = accessibilityLabel
     }
-    
+
     // MARK: - Body
     public var body: some View {
         let textBinding = Binding<String>(
@@ -67,28 +67,28 @@ public struct InputPhoneNumber: View {
                 self.onChangeText?(newValue)
             }
         )
-        
+
         VStack(alignment: .leading, spacing: 4) {
             HStack(spacing: 0) {
                 // 🇻🇳 Flag
                 ImageView("https://static.momocdn.net/app/img/icon/ic-qrcode-package/ic_vn_flag.png")
                     .frame(width: 24, height: 24)
                     .padding(.trailing, Spacing.XS)
-                
+
                 MomoText("+84", typography: size == .small ? .headerSSemibold : .headerMBold)
                     .foregroundColor(Colors.black17)
-                
+
                 Rectangle()
                     .fill(Colors.black04)
                     .frame(width: 1, height: size == .small ? 24 : 32)
                     .padding(.horizontal, Spacing.M)
-                
+
                 // Text input
                 ZStack(alignment: .leading) {
                     if text.isEmpty {
                         MomoText(placeholder, typography: size == .small ? .headerSSemibold : .headerMBold, color: Colors.black12)
                     }
-                    
+
                     TextField("", text: textBinding, onEditingChanged: { focused in
                         handleFocusChange(focused)
                     })
@@ -100,7 +100,7 @@ public struct InputPhoneNumber: View {
                     .accessibility(identifier: accessibilityLabel ?? "")
                     .accessibilityValue(textBinding.wrappedValue.isEmpty ? placeholder : textBinding.wrappedValue)
                 }
-                
+
                 // Clear button
                 if isFocused && !text.isEmpty {
                     SwiftUI.Button(action: {
@@ -111,13 +111,13 @@ public struct InputPhoneNumber: View {
                             .padding(.leading, Spacing.S).accessibility(identifier: "ic_clear")
                     }
                 }
-                
+
                 // Loading indicator
                 if loading {
                     ActivityIndicator(isAnimating: .constant(true), style: .medium)
                         .frame(width: 16, height: 16)
                 }
-                
+
                 // ✅ Right icon
                 if !rightIcon.isEmpty {
                     SwiftUI.Button(action: { onRightIconPressed?() }) {
@@ -127,7 +127,7 @@ public struct InputPhoneNumber: View {
                 }
             }
             .padding(.horizontal, Spacing.M)
-            .frame(height: scaleSize(size == .small ? 48 : 56, 1.1))
+            .frame(height: scaleSize(size == .small ? 48 : 56))
             .background(
                 RoundedRectangle(cornerRadius: Radius.S)
                     .fill(Colors.black01)
@@ -136,7 +136,7 @@ public struct InputPhoneNumber: View {
                 RoundedRectangle(cornerRadius: Radius.S)
                     .stroke(borderColor(), lineWidth: isFocused ? 1.5 : 1)
             )
-            
+
             // Error or hint
             ErrorView(
                 errorMessage: error,
@@ -145,9 +145,9 @@ public struct InputPhoneNumber: View {
             )
         }
     }
-    
+
     // MARK: - Helpers
-    
+
     private func handleFocusChange(_ focused: Bool) {
         isFocused = focused
         if focused {
@@ -156,7 +156,7 @@ public struct InputPhoneNumber: View {
             onBlur?()
         }
     }
-    
+
     private func borderColor() -> Color {
         if !error.isEmpty { return Colors.red03 }
         if isFocused { return Colors.primary }

package/ios/Typography/Text.swift

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

package/ios/Typography/Typography.swift

@@ -2,28 +2,7 @@ import SwiftUI
 
 public extension Font {
     static func appFont(size: CGFloat) -> Font {
-        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)
+        return Font.system(size: scaleSize(size))
     }
     
     // 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.
-#Fri Mar 07 10:22:24 ICT 2025
-sdk.dir=/Users/vunh/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.161.2-search-header.1-debug",
+  "version": "0.161.3-beta.1-debug",
   "private": false,
   "dependencies": {},
   "devDependencies": {},

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

@@ -1,17 +0,0 @@
-package vn.momo.kits.components
-
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.CompositionLocalProvider
-import vn.momo.kits.application.ScaleSizeMaxRate
-
-@Composable
-fun ScaleSizeScope(
-    scaleSizeMaxRate: Float? = null,
-    content: @Composable () -> Unit
-) {
-    CompositionLocalProvider(
-        ScaleSizeMaxRate provides scaleSizeMaxRate,
-    ) {
-        content()
-    }
-}

package/example/ios/Example.xcodeproj/xcuserdata/vunh.xcuserdatad/xcschemes/ios.xcscheme

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   version = "1.3">
-   <BuildAction>
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForRunning = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "A6A920D22B2ADD1E00C1A11F"
-               BuildableName = "Example"
-               BlueprintName = "Example"
-               ReferencedContainer = "container:Example.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <LaunchAction
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
-      allowLocationSimulation = "YES">
-      <BuildableProductRunnable>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "A6A920D22B2ADD1E00C1A11F"
-            BuildableName = "Example"
-            BlueprintName = "Example"
-            ReferencedContainer = "container:Example.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-      <LocationScenarioReference
-         identifier = "com.apple.dt.IDEFoundation.CurrentLocationScenarioIdentifier"
-         referenceType = "1">
-      </LocationScenarioReference>
-   </LaunchAction>
-</Scheme>