@momo-kits/native-kits 0.163.1-beta.7-debug → 0.163.1-beta.8-debug

package/.claude/settings.local.json

@@ -0,0 +1,62 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(curl -s -o /dev/null -w \"%{http_code}\" \"https://repo.maven.apache.org/maven2/org/jetbrains/skiko/skiko-android/0.144.6/skiko-android-0.144.6.pom\")",
+      "Bash(curl -s \"https://repo.maven.apache.org/maven2/org/jetbrains/skiko/skiko-android/maven-metadata.xml\")",
+      "Bash(curl -s \"https://repo.maven.apache.org/maven2/org/jetbrains/skiko/skiko/maven-metadata.xml\")",
+      "Bash(curl -s \"https://repo.maven.apache.org/maven2/org/jetbrains/skiko/skiko/0.144.6/skiko-0.144.6.module\")",
+      "Bash(curl -s -o /dev/null -w '%{http_code}' https://repo.maven.apache.org/maven2/org/jetbrains/skiko/skiko-android/0.144.6/skiko-android-0.144.6.__TRACKED_VAR__)",
+      "Bash(curl -s \"https://repo.maven.apache.org/maven2/org/jetbrains/skiko/skiko-android/0.144.6/\")",
+      "Bash(curl -s \"https://repo.maven.apache.org/maven2/org/jetbrains/skiko/skiko-android/\")",
+      "Bash(curl -s -o /dev/null -w \"%{http_code}\\\\n\" \"https://repo.maven.apache.org/maven2/org/jetbrains/skiko/skiko-android/0.148.1/skiko-android-0.148.1.pom\")",
+      "Bash(curl -s -o /dev/null -w \"%{http_code}\\\\n\" \"https://repo.maven.apache.org/maven2/org/jetbrains/skiko/skiko-android/0.144.5/skiko-android-0.144.5.pom\")",
+      "Bash(curl -s -o /dev/null -w \"%{http_code}\\\\n\" \"https://dl.google.com/dl/android/maven2/org/jetbrains/skiko/skiko-android/0.144.6/skiko-android-0.144.6.pom\")",
+      "Bash(curl -s \"https://search.maven.org/solrsearch/select?q=a:skiko-android&rows=5&wt=json\")",
+      "Bash(curl -sL -o /dev/null -w \"%{http_code} %{url_effective}\\\\n\" \"https://repo1.maven.org/maven2/org/jetbrains/skiko/skiko-android/0.144.6/skiko-android-0.144.6.pom\")",
+      "Bash(curl *)",
+      "Bash(./gradlew :sample:androidApp:dependencies --configuration debugRuntimeClasspath)",
+      "Bash(./gradlew :sample:shared:compileDebugKotlinAndroid)",
+      "Bash(./gradlew :sample:androidApp:compileDebugKotlin)",
+      "Bash(ls -d *.xcodeproj)",
+      "Bash(grep -c ChipDemo.swift __TRACKED_VAR__/project.pbxproj)",
+      "Bash(grep -c PBXFileSystemSynchronizedRootGroup __TRACKED_VAR__/project.pbxproj)",
+      "Bash(grep -c InformationDemo.swift __TRACKED_VAR__/project.pbxproj)",
+      "Bash(plutil -lint project.pbxproj)",
+      "Bash(xcode-select -p)",
+      "Bash(/usr/bin/xcrun xcodebuild *)",
+      "Bash(echo \"exit: $?\")",
+      "Bash(/Applications/Xcode26.app/Contents/Developer/usr/bin/xcodebuild -version)",
+      "Bash(./gradlew :compose:tasks --all)",
+      "Bash(grep -n \"vanniktech\\\\|mavenPublishing\\\\|^publishing\\\\|version = gitlabVersion\\\\|namespace =\\\\|compileSdk =\\\\|minSdk =\\\\|GitLabPackages\\\\|name = \\\\\"\\\\${gitlabRepo}Packages\\\\\"\")",
+      "Bash(git checkout *)",
+      "Bash(./gradlew :compose:publishAllPublicationsToGitLabPackagesRepository --dry-run)",
+      "Bash(git fetch *)",
+      "Bash(git pull *)",
+      "Bash(git push *)",
+      "Bash(git branch *)",
+      "Bash(xcodebuild -workspace iosApp.xcworkspace -list)",
+      "Bash(xcrun simctl *)",
+      "Bash(xcodebuild -workspace iosApp.xcworkspace -scheme iosApp -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14 Pro' -configuration Debug build CODE_SIGNING_ALLOWED=NO)",
+      "Bash(pod install *)",
+      "Bash(xcodebuild -workspace iosApp.xcworkspace -scheme iosApp -sdk iphonesimulator -destination 'id=1E6F9A79-5E64-4590-BEA2-828D75D99393' -configuration Debug build CODE_SIGNING_ALLOWED=NO)",
+      "Bash(xcrun swiftc *)",
+      "Bash(echo \"=== exit: $? \\(1=none found\\) ===\")",
+      "Bash(cat Radius.swift)",
+      "Bash(cat Spacing.swift)",
+      "Bash(echo \"exit=$?\")",
+      "Bash(ruby *)",
+      "Bash(xcodebuild -list -workspace iosApp.xcworkspace)",
+      "Bash(xcodebuild -workspace iosApp.xcworkspace -scheme MoMoUIKits -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14 Pro' build)",
+      "Bash(xcodebuild -workspace iosApp.xcworkspace -scheme MoMoUIKits -sdk iphonesimulator -destination 'platform=iOS Simulator,id=E6A899C0-098E-473A-95B8-A2BBD2D42A92' build)",
+      "Bash(xcodebuild -workspace iosApp.xcworkspace -scheme iosApp -sdk iphonesimulator -destination 'platform=iOS Simulator,id=E6A899C0-098E-473A-95B8-A2BBD2D42A92' build)",
+      "Bash(xcodebuild build *)",
+      "Bash(git stash *)",
+      "Bash(plutil -lint sample/iosApp/iosApp.xcodeproj/project.pbxproj)",
+      "Bash(git add *)",
+      "Bash(git commit -m 'feat: DS-646 [ci build] *)",
+      "Bash(git commit -q -m 'fix:  DS-656 [ci build] *)",
+      "Bash(xargs git log --oneline -1)",
+      "Bash(git rev-list *)"
+    ]
+  }
+}

package/compose/build.gradle.kts

@@ -40,7 +40,7 @@ kotlin {
     }
 
     cocoapods {
-        version = "0.163.1-beta.7-debug"
+        version = "0.163.1-beta.8-debug"
         summary = "IOS Shared module"
         homepage = "https://momo.vn"
         ios.deploymentTarget = "15.0"
@@ -77,6 +77,7 @@ kotlin {
             implementation(libs.kotlinx.datetime)
             api(libs.native.max.api)
             implementation(libs.compottie)
+            implementation(libs.gif.image)
         }
         androidMain.dependencies {
             implementation(libs.ktor.client.okhttp)

package/compose/build.gradle.kts.backup

@@ -77,6 +77,7 @@ kotlin {
             implementation(libs.kotlinx.datetime)
             api(libs.native.max.api)
             implementation(libs.compottie)
+            implementation(libs.gif.image)
         }
         androidMain.dependencies {
             implementation(libs.ktor.client.okhttp)

package/compose/compose.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
     spec.name                     = 'compose'
-    spec.version                  = '0.163.1-beta.1'
+    spec.version                  = '0.162.2-beta.19'
     spec.homepage                 = 'https://momo.vn'
     spec.source                   = { :http=> ''}
     spec.authors                  = ''

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

@@ -28,7 +28,7 @@ data class MiniAppContext(
     val providerId: String = "",
     val permissions: List<Map<String, Any>>? = emptyList(),
     val features: FeatureFlags? = null,
-    val fontScaleConfig: FontScaleConfig? = null,
+    val scaleSizeMaxRate: Float? = null,
 ) {
     companion object {
 
@@ -60,7 +60,7 @@ 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),
-                fontScaleConfig = parent.fontScaleConfig ?: child.fontScaleConfig,
+                scaleSizeMaxRate = parent.scaleSizeMaxRate ?: child.scaleSizeMaxRate,
             )
         }
 
@@ -98,11 +98,4 @@ val LocalComponentInformation = staticCompositionLocalOf<ComponentInformation?>
     null
 }
 
-@Immutable
-data class FontScaleConfig(
-    val useOSFontScale: Boolean = true,
-    val userScaleRate: Float? = null,
-    val osFontScale: Float? = null,
-)
-
-val LocalFontScaleConfig = staticCompositionLocalOf { FontScaleConfig() }
+val ScaleSizeMaxRate = staticCompositionLocalOf<Float?> { null }

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

@@ -95,11 +95,13 @@ private fun getStyle(size: Size): TextStyle {
     return styleCache[size] ?: Typography.actionDefaultBold
 }
 
-private fun getIconSize(size: Size): Dp = iconSizeCache[size] ?: 24.dp
+@InternalApi
+fun getIconSize(size: Size): Dp = iconSizeCache[size] ?: 24.dp
 private fun getIconSpace(size: Size): Dp = iconSpaceCache[size] ?: Spacing.S
 
+@InternalApi
 @Composable
-internal fun getTextColor(loading: Boolean, type: ButtonType): Color {
+fun getTextColor(loading: Boolean, type: ButtonType): Color {
     val theme = AppTheme.current
 
     return remember(type, theme, loading) {
@@ -140,7 +142,6 @@ fun RenderIcon(
     useTintColor: Boolean = true,
     icon: String = "",
     forceLoading: Boolean = false,
-    bgColor: Color? = null,
     textColor: Color? = null,
 ) {
     val iconSize = remember(size) { getIconSize(size) }
@@ -156,9 +157,10 @@ fun RenderIcon(
         Box(modifier) {
             LottieAnimation(
                 modifier = Modifier.size(iconSize),
-                bgColor = bgColor,
+                bgColor = null,
                 tintColor = color,
-                path = "files/lottie_circle_loader"
+                path = "files/lottie_circle_loader",
+                useCompose = true
             )
         }
     } else if (icon.isNotEmpty()) {
@@ -183,8 +185,9 @@ private fun shouldLoadingOnLeft(iconLeft: String, iconRight: String): Boolean {
     }
 }
 
+@InternalApi
 @Composable
-internal fun getTypeStyle(
+fun getTypeStyle(
     type: ButtonType,
     color: Color? = AppTheme.current.colors.primary,
     size: Size,
@@ -219,8 +222,9 @@ internal fun getTypeStyle(
     }
 }
 
+@InternalApi
 @Composable
-internal fun getButtonBackgroundColor(
+fun getButtonBackgroundColor(
     loading: Boolean,
     type: ButtonType
 ): Color {
@@ -336,7 +340,6 @@ fun Button(
                 useTintColor = useTintColor,
                 icon = iconLeft,
                 forceLoading = loading && loadingOnLeft,
-                bgColor = bgColor,
                 textColor = textColor
             )
             RenderTitle(size, title, textColor = textColor)
@@ -346,7 +349,6 @@ fun Button(
                 useTintColor = useTintColor,
                 icon = iconRight,
                 forceLoading = loading && !loadingOnLeft,
-                bgColor = bgColor,
                 textColor = textColor
             )
         }

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

@@ -5,6 +5,7 @@ import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
@@ -12,6 +13,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import vn.momo.kits.application.IsShowBaseLineDebug
@@ -21,69 +23,58 @@ import vn.momo.kits.const.Radius
 import vn.momo.kits.modifier.conditional
 
 data class IconSpecs(
-    val width: Dp,
-    val height: Dp,
-    val radius: Dp,
-    val size: Dp
+    val box: Dp,
+    val icon: Dp,
 )
 
 enum class IconSize(val value: IconSpecs) {
-    LARGE(
-        IconSpecs(
-            height = 48.dp,
-            radius = Radius.XL,
-            width = 48.dp,
-            size = 48.dp
-        )
-    ),
-    SMALL(
-        IconSpecs(
-            height = 40.dp,
-            radius = Radius.XL,
-            width = 40.dp,
-            size = 40.dp
-        )
-    )
+    LARGE(IconSpecs(box = 48.dp, icon = 24.dp)),
+    MEDIUM(IconSpecs(box = 36.dp, icon = 16.dp)),
+    SMALL(IconSpecs(box = 28.dp, icon = 16.dp)),
 }
 
-// Pre-computed shape to avoid repeated creation
-private val iconButtonShape = RoundedCornerShape(Radius.XL)
+enum class IconShape {
+    CIRCLE,
+    SQUARE,
+}
 
-// Cache for icon sizes to avoid repeated calculations
-private val iconSizeMap = mapOf(
-    IconSize.SMALL to 16.dp,
-    IconSize.LARGE to 24.dp
-)
+// Square keeps an 8dp rounded corner; circle is fully rounded regardless of size.
+private val squareShape = RoundedCornerShape(Radius.S)
+
+private fun IconShape.toShape(): Shape = when (this) {
+    IconShape.CIRCLE -> CircleShape
+    IconShape.SQUARE -> squareShape
+}
 
 @Composable
-internal fun getIconStyle(type: ButtonType, color: Color? = null): Modifier {
+internal fun getIconStyle(type: ButtonType, shape: Shape, color: Color? = null): Modifier {
     val theme = AppTheme.current
 
-    return remember(type, color, theme) {
+    return remember(type, shape, color, theme) {
         when (type) {
             ButtonType.DISABLED -> Modifier
-                .background(theme.colors.background.disable, iconButtonShape)
-                .border(0.dp, Color.Unspecified, iconButtonShape)
+                .background(theme.colors.background.disable, shape)
+                .border(0.dp, Color.Unspecified, shape)
 
             ButtonType.PRIMARY -> Modifier
-                .background(theme.colors.primary, iconButtonShape)
-                .border(0.dp, Color.Unspecified, iconButtonShape)
+                .background(theme.colors.primary, shape)
+                .border(0.dp, Color.Unspecified, shape)
 
             ButtonType.SECONDARY -> Modifier
-                .background(theme.colors.background.surface, iconButtonShape)
-                .border(1.dp, theme.colors.border.default, iconButtonShape)
+                .background(theme.colors.background.surface, shape)
+                .border(1.dp, theme.colors.border.default, shape)
 
             ButtonType.OUTLINE -> Modifier
-                .background(theme.colors.background.surface, iconButtonShape)
-                .border(1.dp, color ?: theme.colors.primary, iconButtonShape)
+                .background(theme.colors.background.surface, shape)
+                .border(1.dp, color ?: theme.colors.primary, shape)
 
             ButtonType.TONAL -> Modifier
-                .background(theme.colors.background.tonal, iconButtonShape)
-                .border(0.dp, Color.Unspecified, iconButtonShape)
+                .background(theme.colors.background.tonal, shape)
+                .border(0.dp, Color.Unspecified, shape)
 
             ButtonType.DANGER -> Modifier
-                .background(theme.colors.error.primary, iconButtonShape)
-                .border(0.dp, Color.Unspecified, iconButtonShape)
+                .background(theme.colors.error.primary, shape)
+                .border(0.dp, Color.Unspecified, shape)
 
             ButtonType.TEXT -> Modifier
         }
@@ -103,38 +94,32 @@ fun IconButton(
     onClick: () -> Unit,
     type: ButtonType = ButtonType.PRIMARY,
     size: IconSize = IconSize.SMALL,
+    shape: IconShape = IconShape.CIRCLE,
     icon: String = "",
 ) {
-    // Memoize icon size calculation
-    val iconSize = remember(size) {
-        iconSizeMap[size] ?: 16.dp
-    }
+    val specs = size.value
 
-    // Memoize enabled state
     val isEnabled = remember(type) {
         type != ButtonType.DISABLED
     }
 
-    // Memoize radius for clipping
-    val radius = remember(size) {
-        size.value.radius
-    }
+    val boxShape = remember(shape) { shape.toShape() }
 
     Box(
         modifier = Modifier
-            .size(size.value.size)
-            .then(getIconStyle(type))
+            .size(specs.box)
+            .then(getIconStyle(type, boxShape))
             .conditional(IsShowBaseLineDebug) {
                 border(1.dp, Colors.blue_03)
             }
-            .clip(RoundedCornerShape(radius))
+            .clip(boxShape)
             .clickable(enabled = isEnabled, onClick = onClick),
         contentAlignment = Alignment.Center
     ) {
         Icon(
             source = icon,
             color = getIconColor(type),
-            size = iconSize,
+            size = specs.icon,
         )
     }
-}
+}

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

@@ -1,7 +1,9 @@
 package vn.momo.kits.components
 
 import androidx.compose.foundation.border
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.BoxWithConstraints
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -17,10 +19,12 @@ import androidx.compose.ui.semantics.contentDescription
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.dp
-import coil3.compose.AsyncImage
+import coil3.compose.AsyncImage as CoilAsyncImage
 import vn.momo.kits.application.IsShowBaseLineDebug
 import vn.momo.kits.const.AppTheme
 import vn.momo.kits.const.Colors
+import vn.momo.kits.gifimage.GifImage
+import vn.momo.kits.gifimage.GifImageState
 import vn.momo.kits.modifier.conditional
 
 data class Options(
@@ -73,6 +77,19 @@ private fun getHostFromUrl(url: String): String? {
     }
 }
 
+private fun isGifUrl(url: String): Boolean {
+    val path = url.substringBefore('#').substringBefore('?')
+    return path.endsWith(".gif", ignoreCase = true)
+}
+
+private fun GifImageState.toImageState(): ImageState {
+    return when (this) {
+        GifImageState.Success -> ImageState.Success
+        GifImageState.Error -> ImageState.Error
+        GifImageState.Loading -> ImageState.Loading
+    }
+}
+
 // Optimized query parameter appending
 private fun appendSizeQueryParam(url: String, value: String): String {
     val fragmentIndex = url.indexOf('#')
@@ -95,12 +112,12 @@ fun Image(
     modifier: Modifier = Modifier,
     options: Options? = null,
     loading: Boolean = true,
+    onStateChanged: (ImageState) -> Unit = {},
 ) {
     val imageOptions = remember(options) {
         options ?: Options()
     }
 
-    var imageState by remember { mutableStateOf(ImageState.Loading) }
     val density = LocalDensity.current
 
     BoxWithConstraints(
@@ -121,34 +138,46 @@ fun Image(
                         processedUrl
                     }
                 }
-                else -> source
+                else -> source.toString()
             }
         }
 
-        AsyncImage(
-            modifier = Modifier.matchParentSize(),
-            model = urlToLoad,
-            contentDescription = null,
-            contentScale = imageOptions.contentScale,
-            alignment = imageOptions.alignment,
-            colorFilter = imageOptions.colorFilter,
-            alpha = imageOptions.alpha,
-            onLoading = { imageState = ImageState.Loading },
-            onSuccess = { imageState = ImageState.Success },
-            onError = { imageState = ImageState.Error },
-        )
+        var imageState by remember(urlToLoad) { mutableStateOf(ImageState.Loading) }
+        fun updateImageState(state: ImageState) {
+            imageState = state
+            onStateChanged(state)
+        }
+
+        if (isGifUrl(urlToLoad)) {
+            GifImage(
+                modifier = Modifier.matchParentSize(),
+                url = urlToLoad,
+                contentDescription = null,
+                contentScale = imageOptions.contentScale,
+                alignment = imageOptions.alignment,
+                colorFilter = imageOptions.colorFilter,
+                alpha = imageOptions.alpha,
+                onStateChanged = { updateImageState(it.toImageState()) },
+            )
+        } else {
+            CoilAsyncImage(
+                modifier = Modifier.matchParentSize(),
+                model = urlToLoad,
+                contentDescription = null,
+                contentScale = imageOptions.contentScale,
+                alignment = imageOptions.alignment,
+                colorFilter = imageOptions.colorFilter,
+                alpha = imageOptions.alpha,
+                onLoading = { updateImageState(ImageState.Loading) },
+                onSuccess = { updateImageState(ImageState.Success) },
+                onError = { updateImageState(ImageState.Error) },
+            )
+        }
 
         when (imageState) {
-            ImageState.Loading -> if (loading) Skeleton()
-            ImageState.Error -> {
-                val theme = AppTheme.current
-                Icon(
-                    source = "media_fail",
-                    color = theme.colors.text.disable,
-                    modifier = Modifier.align(Alignment.Center)
-                )
-            }
             ImageState.Success -> {}
+            ImageState.Error -> ImageError()
+            ImageState.Loading -> if (loading) Skeleton()
         }
     }
 }
@@ -156,7 +185,7 @@ fun Image(
 // Extracted URL processing logic for better performance
 private fun processImageUrl(url: String, maxWidth: androidx.compose.ui.unit.Dp, density: androidx.compose.ui.unit.Density): String {
     val host = getHostFromUrl(url)
-    return if (host != null && supportedDomains.contains(host)) {
+    return if (!isGifUrl(url) && host != null && supportedDomains.contains(host)) {
         val widthPx = with(density) { maxWidth.roundToPx() }
         val pixelRatio = density.density
         val pixelFitForWidth = widthPx * pixelRatio
@@ -167,6 +196,20 @@ private fun processImageUrl(url: String, maxWidth: androidx.compose.ui.unit.Dp,
     }
 }
 
+@Composable
+private fun ImageError() {
+    val theme = AppTheme.current
+    Box(
+        modifier = Modifier.fillMaxSize(),
+        contentAlignment = Alignment.Center
+    ) {
+        Icon(
+            source = "media_fail",
+            color = theme.colors.text.disable,
+        )
+    }
+}
+
 @Composable
 fun Image(
     source: Painter,
@@ -185,4 +228,4 @@ fun Image(
         colorFilter = colorFilter,
         alpha = alpha,
     )
-}
+}

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

@@ -0,0 +1,17 @@
+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/compose/src/commonMain/kotlin/vn/momo/kits/components/Text.kt

@@ -36,7 +36,6 @@ fun Text(
     softWrap: Boolean = true,
     accessibilityId: String? = null,
     inlineContent: Map<String, InlineTextContent> = mapOf(),
-    userScaleRate: Float? = null,
     ) {
     Text(
         text = AnnotatedString(text),
@@ -53,8 +52,7 @@ fun Text(
         letterSpacing = letterSpacing,
         softWrap = softWrap,
         accessibilityId = accessibilityId,
-        inlineContent = inlineContent,
-        userScaleRate = userScaleRate
+        inlineContent = inlineContent
     )
 }
 
@@ -76,14 +74,13 @@ fun Text(
     softWrap: Boolean = true,
     accessibilityId: String? = null,
     inlineContent: Map<String, InlineTextContent> = mapOf(),
-    userScaleRate: Float? = null,
 ) {
     // Cache theme access to avoid repeated lookups
     val theme = AppTheme.current
 
     // Call @Composable functions directly in composable context
-    val scaledFontSize = scaleSize(style.fontSize, userScaleRate)
-    val scaledLineHeight = scaleSize(style.lineHeight, userScaleRate)
+    val scaledFontSize = scaleSize(style.fontSize)
+    val scaledLineHeight = scaleSize(style.lineHeight)
     val fontFamilyResult = getFontFamily(fontFamily ?: theme.font, style.fontWeight)
 
     // Now memoize the results

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.LocalFontScaleConfig
+import vn.momo.kits.application.ScaleSizeMaxRate
 import vn.momo.kits.platform.getScreenDimensions
 import vn.momo.uikits.resources.*
 import kotlin.math.max
@@ -22,58 +22,59 @@ const val MAX_FONT_SCALE = 1.5f
 const val MAX_DEVICE_SCALE = 5
 
 @Composable
-fun scaleSize(size: Float, userScaleRate: Float? = null): Float {
-    val fontScaleConfig = LocalFontScaleConfig.current
-    val useOSFontScale = fontScaleConfig.useOSFontScale
-    val customRate = userScaleRate ?: fontScaleConfig.userScaleRate ?: 1f
+fun scaleSize(size: Float): Float {
+    val scaleSizeMaxRate: Float = ScaleSizeMaxRate.current ?: MAX_FONT_SCALE
+    val deviceWidth = getScreenDimensions().width
+    val deviceScale = deviceWidth / DEFAULT_SCREEN_SIZE
 
-    val deviceScale = getScreenDimensions().width / DEFAULT_SCREEN_SIZE
-    val fontScale = fontScaleConfig.osFontScale ?: LocalDensity.current.fontScale
-
-    if (!useOSFontScale) {
-        return if (customRate > 1f) customRate * size else size
-    }
+    val density = LocalDensity.current
+    val fontScale = density.fontScale
 
     var fontSizeScaleDevice = size
     var fontSizeScaleOS = size
+
     if (deviceScale > 1) {
         fontSizeScaleDevice =
             min(deviceScale * fontSizeScaleDevice, fontSizeScaleDevice + MAX_DEVICE_SCALE)
     }
-    if (fontScale > 1f) {
-        fontSizeScaleOS = min(fontScale * fontSizeScaleOS, fontSizeScaleOS * MAX_FONT_SCALE)
+
+    if (fontScale > 1) {
+        fontSizeScaleOS = min(fontScale * fontSizeScaleOS, fontSizeScaleOS * scaleSizeMaxRate)
     }
 
-    return max(fontSizeScaleDevice, fontSizeScaleOS)
+    return max(
+        fontSizeScaleDevice,
+        fontSizeScaleOS
+    )
 }
 
 @Composable
-fun scaleSize(size: TextUnit, userScaleRate: Float? = null): TextUnit {
+fun scaleSize(size: TextUnit): TextUnit {
     if (!size.isSp) return size
 
     val density = LocalDensity.current
 
-    val scaled = scaleSize(size.value, userScaleRate)
+    val scaled = scaleSize(size.value)
     val spValue = scaled / density.fontScale
 
     return TextUnit(value = spValue, type = TextUnitType.Sp)
 }
 
 @Composable
-fun scaleSize(size: Dp, userScaleRate: Float? = null): Dp {
-    return scaleSize(size.value, userScaleRate).dp
+fun scaleSize(size: Dp): Dp {
+    return scaleSize(size.value).dp
 }
 
 @Composable
-fun scaleSize(textStyle: TextStyle, userScaleRate: Float? = null): TextStyle {
+fun scaleSize(textStyle: TextStyle): TextStyle {
     return textStyle.copy(
         fontSize = if (textStyle.fontSize != TextUnit.Unspecified)
-            scaleSize(textStyle.fontSize, userScaleRate)
+            scaleSize(textStyle.fontSize)
         else
             TextUnit.Unspecified,
 
         lineHeight = if (textStyle.lineHeight != TextUnit.Unspecified)
-            scaleSize(textStyle.lineHeight, userScaleRate)
+            scaleSize(textStyle.lineHeight)
         else
             TextUnit.Unspecified,
     )