@momo-kits/native-kits 0.162.4-debug → 0.162.5-debug

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

@@ -1,5 +1,7 @@
 package vn.momo.kits.navigation.component
 
+import vn.momo.kits.modifier.InternalApi
+
 import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
@@ -42,12 +44,13 @@ import vn.momo.kits.navigation.LocalOptions
 import vn.momo.kits.navigation.LocalScrollState
 import vn.momo.kits.navigation.getInputSearchType
 
-const val HEADER_HEIGHT = 52
-enum class InputSearchType { None, Header, Animated }
+internal const val HEADER_HEIGHT = 52
+internal enum class InputSearchType { None, Header, Animated }
 enum class TitlePosition { LEFT, CENTER }
 
+@Suppress("FrequentlyChangingValue")
 @Composable
-fun Header(onBackHandler: (() -> Unit)? = null) {
+internal fun Header(onBackHandler: (() -> Unit)? = null) {
     val options = LocalOptions.current
     val navigator = LocalNavigator.current
     val scrollState = LocalScrollState.current
@@ -106,7 +109,7 @@ fun Header(onBackHandler: (() -> Unit)? = null) {
                     backgroundButton = headerColor.backgroundButton,
                     tintIconColor = headerColor.tintIconColor,
                     onBackHandler = {
-                        onBackHandler?.invoke() ?: navigator.onBackSafe {  }
+                        navigator.onBackSafe {  }
                     }
                 )
                 Spacer(Modifier.width(Spacing.S))
@@ -168,7 +171,7 @@ private fun BackButton(borderColor: Color, backgroundButton: Color, tintIconColo
 }
 
 @Composable
-fun HeaderContent(
+internal fun HeaderContent(
     headerTitle: HeaderTitle,
     tintIconColor: Color,
     titlePosition: TitlePosition = TitlePosition.LEFT,
@@ -199,7 +202,7 @@ fun HeaderContent(
 }
 
 @Composable
-fun VerticalShadow(opacity: Float){
+internal fun VerticalShadow(opacity: Float){
     if(opacity == 1f){
         Box(modifier = Modifier
             .fillMaxWidth()
@@ -282,8 +285,9 @@ data class HeaderBackProps(
     val preventBack: PopupNotifyProps? = null,
 )
 
+@InternalApi
 data class HeaderColor(val tintIconColor: Color, val backgroundButton: Color, val borderColor: Color)
-fun getHeaderColor(headerType: HeaderType, opacity: Float, tintColor: Color?, defaultColor: Color): HeaderColor{
+internal fun getHeaderColor(headerType: HeaderType, opacity: Float, tintColor: Color?, defaultColor: Color): HeaderColor{
     return if(headerType is HeaderType.Animated) {
         if (opacity == 1f || !headerType.isSurface)
             HeaderColor(

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

@@ -27,8 +27,9 @@ enum class AnimatedHeaderRatio(val value: Float){
     RATIO_3_2(3f / 2f)
 }
 
+@Suppress("FrequentlyChangingValue")
 @Composable
-fun HeaderBackground() {
+internal fun HeaderBackground() {
     val density = LocalDensity.current
     val theme = AppTheme.current
     val options = LocalOptions.current

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

@@ -1,5 +1,7 @@
 package vn.momo.kits.navigation.component
 
+import vn.momo.kits.modifier.InternalApi
+
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.Arrangement
@@ -35,6 +37,7 @@ import vn.momo.kits.modifier.activeOpacityClickable
 import vn.momo.kits.navigation.LocalMaxApi
 
 @Composable
+@InternalApi
 fun HeaderRight(
     headerRight: HeaderRight,
     tintColor: Color? = null,
@@ -57,7 +60,7 @@ fun HeaderRight(
 }
 
 @Composable
-fun Toolkit(
+internal fun Toolkit(
     headerRight: HeaderRight.Toolkit,
     tintColor: Color? = null,
     headerColor: HeaderColor
@@ -186,7 +189,7 @@ fun Toolkit(
 
 
 @Composable
-fun NavigationButton(
+internal fun NavigationButton(
     disabled: Boolean,
     icon: String,
     showBadge: Boolean? = false,
@@ -300,7 +303,7 @@ data class Tool(
     }
 }
 
-data class NavigationButtonConfig(
+private data class NavigationButtonConfig(
     val icon: String,
     val onPress: () -> Unit
 )

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

@@ -13,7 +13,7 @@ import vn.momo.kits.const.Typography
 import vn.momo.kits.modifier.setAutomationId
 
 @Composable
-fun HeaderTitle(
+internal fun HeaderTitle(
     title: String = "",
     color: Color? = null,
     modifier: Modifier = Modifier.fillMaxWidth(),

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

@@ -2,17 +2,7 @@ package vn.momo.kits.navigation.component
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.BasicText
@@ -43,7 +33,7 @@ import vn.momo.kits.navigation.component.HeaderTitle.User
 import vn.momo.kits.platform.getScreenDimensions
 
 @Composable
-fun HeaderUser(
+internal fun HeaderUser(
     data: HeaderTitle
 ) {
     if (data !is User) return
@@ -367,4 +357,4 @@ private fun RemoteIcon16(url: String) {
 }
 
 @Immutable
-data class AvatarUrls(val items: List<String>)
+private data class AvatarUrls(val items: List<String>)

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

@@ -29,6 +29,7 @@ import vn.momo.kits.navigation.LocalFooterHeightPx
 import vn.momo.kits.navigation.LocalNavigator
 import vn.momo.kits.navigation.LocalOptions
 import vn.momo.kits.navigation.OverplayComponentRegistry
+import kotlin.time.Duration.Companion.milliseconds
 
 sealed class SnackBar(open val duration: Long? = null) {
     data class Custom(
@@ -42,7 +43,7 @@ sealed class SnackBar(open val duration: Long? = null) {
 }
 
 @Composable
-fun SnackBar(
+internal fun SnackBar(
     data: SnackBar,
     onDismiss: (() -> Unit)?
 ) {
@@ -95,7 +96,7 @@ fun SnackBar(
     LaunchedEffect(data.duration) {
         val duration = data.duration
         if (duration != null) {
-            delay(duration)
+            delay(duration.milliseconds)
             navigator.hideSnackBar()
         }
     }

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

@@ -5,13 +5,9 @@ import vn.momo.maxapi.IMaxApi
 import kotlin.time.Clock
 import kotlin.time.ExperimentalTime
 
-/**
- * Screen tracking state holder
- */
 class ScreenTrackingState {
     @OptIn(ExperimentalTime::class)
-    var startTime: Long = Clock.System.now().toEpochMilliseconds()
-    var endTime: Long = startTime
+    var time: Long = Clock.System.now().toEpochMilliseconds()
     var releaseNavigated: Boolean = false
     var releaseLoad: Boolean = false
     var releaseInteraction: Boolean = false
@@ -19,22 +15,10 @@ class ScreenTrackingState {
     var action: String = "push"
 }
 
-/**
- * Screen tracker for auto tracking events
- *
- * Tracks 3 main events:
- * - auto_screen_navigated: When screen is focused
- * - auto_screen_displayed: When screen finished loading
- * - auto_screen_interacted: When screen is ready for interaction
- */
 object ScreenTracker {
 
     private var lastScreenName: String? = null
 
-    /**
-     * Track screen navigation event
-     * Called when screen is focused
-     */
     fun trackScreenNavigated(
         maxApi: IMaxApi?,
         context: MiniAppContext?,
@@ -61,10 +45,6 @@ object ScreenTracker {
         state.previousScreenName = previousScreen
     }
 
-    /**
-     * Track screen displayed event
-     * Called when screen finished loading all elements
-     */
     fun trackScreenDisplayed(
         maxApi: IMaxApi?,
         context: MiniAppContext?,
@@ -85,10 +65,6 @@ object ScreenTracker {
         state.releaseLoad = true
     }
 
-    /**
-     * Track screen interacted event
-     * Called when screen is ready for user interaction
-     */
     fun trackScreenInteracted(
         maxApi: IMaxApi?,
         context: MiniAppContext?,
@@ -111,9 +87,6 @@ object ScreenTracker {
         state.releaseInteraction = true
     }
 
-    /**
-     * Build base tracking params from MiniAppContext
-     */
     private fun buildBaseParams(
         context: MiniAppContext?,
         screenName: String,
@@ -128,12 +101,6 @@ object ScreenTracker {
         )
     }
 
-    /**
-     * Track popup/modal displayed event
-     *
-     * @param popupName name of the popup/modal
-     * @param parentScreenName the screen that shows the popup
-     */
     fun trackPopupDisplayed(
         maxApi: IMaxApi?,
         context: MiniAppContext?,
@@ -152,14 +119,8 @@ object ScreenTracker {
         )
     }
 
-    /**
-     * Get previous screen name for back navigation detection
-     */
     fun getLastScreenName(): String? = lastScreenName
 
-    /**
-     * Reset tracker (for testing or cleanup)
-     */
     @Suppress("UNUSED")
     fun reset() {
         lastScreenName = null

package/compose/src/commonMain/kotlin/vn/momo/kits/platform/ComposeLottieAnimation.kt

@@ -36,8 +36,6 @@ internal fun ComposeLottieAnimation(
         LottieCompositionSpec.JsonString(json)
     }
 
-    // Recolor only the fill/stroke color slots (matching the native lottie-ios per-keypath tint)
-    // instead of a global ColorFilter.tint, which would flatten a multicolor animation to a silhouette.
     val dynamicProperties = if (tintColor != null) {
         rememberLottieDynamicProperties(tintColor) {
             shapeLayer("**") {

package/compose/src/commonMain/kotlin/vn/momo/kits/platform/Platform.kt

@@ -43,14 +43,6 @@ fun supportsImePadding(): Boolean = when (val v = getOSVersion()) {
     is OSVersion.Android -> v.sdk > 29
     is OSVersion.IOS -> true
 }
-
-/**
- * @param useCompose when `true`, renders via the pure-Compose Compottie engine instead of the
- * platform-native engine (airbnb-lottie on Android, lottie-ios on iOS). Defaults to `false` for
- * backward compatibility. Note: when `useCompose = true`, `tintColor` recolors only the fill/stroke
- * color slots (matching the native lottie-ios per-keypath tint), so gradient and text-layer colors
- * are left untinted; `placedAsOverlay` is a no-op.
- */
 @Composable
 expect fun LottieAnimation(
     path: String,

package/compose/src/commonMain/kotlin/vn/momo/kits/utils/Resources.kt

@@ -1,28 +1,13 @@
 package vn.momo.kits.utils
 
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.MutableState
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
+import androidx.compose.runtime.*
 import org.jetbrains.compose.resources.DrawableResource
 import org.jetbrains.compose.resources.InternalResourceApi
 import org.jetbrains.compose.resources.ResourceItem
 import org.jetbrains.compose.resources.readResourceBytes
-
-@OptIn(InternalResourceApi::class)
-@Composable
-fun getResource(name: String): DrawableResource {
-    return DrawableResource(
-        "drawable:$name",
-        setOf(ResourceItem(setOf(), "drawable/$name", -1, -1))
-    )
-}
-
 @OptIn(InternalResourceApi::class)
 @Composable
-fun readJson(name: String): String {
+internal fun readJson(name: String): String {
     val path = name.plus(".json")
     val candidatePaths = listOf(
         path,

package/compose/src/commonMain/kotlin/vn/momo/kits/utils/Tracking.kt

@@ -4,7 +4,7 @@ import androidx.compose.runtime.Composable
 import vn.momo.kits.application.LocalComponentInformation
 
 @Composable
-fun getComponentId(
+internal fun getComponentId(
     componentName: String? = null,
     accessibilityLabel: String? = null,
 ): String {

package/compose/src/commonMain/kotlin/vn/momo/kits/utils/Utils.kt

@@ -41,8 +41,8 @@ internal fun Modifier.bottomBorder(strokeWidth: Dp, color: Color) = composed(
     }
 )
 
-inline fun <T> Boolean.ifTrue(trueCase: T, falseCase: T): T = if (this) trueCase else falseCase
-inline fun <T> String.ifNotNull(trueCase: T, falseCase: T): T =
+fun <T> Boolean.ifTrue(trueCase: T, falseCase: T): T = if (this) trueCase else falseCase
+fun <T> String.ifNotNull(trueCase: T, falseCase: T): T =
     if (this.isBlank()) falseCase else trueCase
 
 fun formatNumberToMoney(number: Long, currency: String = "đ"): String {
@@ -91,7 +91,7 @@ fun getAppStatusBarHeight(): Dp {
 }
 
 @Composable
-fun getNavigationBarHeight(): Dp {
+internal fun getNavigationBarHeight(): Dp {
     return if (AppNavigationBar.current == 0.dp) {
         val systemBottomPadding = WindowInsets.systemBars.asPaddingValues().calculateBottomPadding()
         if (getPlatformName() == "iOS") {

package/compose/src/iosMain/kotlin/vn/momo/kits/navigation/ScrollToTop.ios.kt

@@ -13,14 +13,13 @@ private const val STATUS_BAR_TAPPED_NOTIFICATION = "statusBarSelected"
 internal actual fun RegisterScrollToTop(callback: (() -> Unit)?) {
     val maxApi = LocalMaxApi.current
     DisposableEffect(callback) {
-        val cb = callback
-        val token: NSObjectProtocol? = if (cb != null) {
+        val token: NSObjectProtocol? = if (callback != null) {
             NSNotificationCenter.defaultCenter.addObserverForName(
                 name = STATUS_BAR_TAPPED_NOTIFICATION,
                 `object` = null,
                 queue = NSOperationQueue.mainQueue,
             ) { _: NSNotification? ->
-                runCatching { cb() }.onFailure {
+                runCatching { callback() }.onFailure {
                     maxApi?.logFile("[ScrollToTop] callback threw: ${it.message}") {}
 
                 }

package/compose/src/iosMain/kotlin/vn/momo/kits/platform/Platform.ios.kt

@@ -19,8 +19,6 @@ import androidx.compose.ui.backhandler.LocalCompatNavigationEventDispatcherOwner
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.NativePaint
 import androidx.compose.ui.graphics.toArgb
-import androidx.compose.ui.semantics.SemanticsPropertyKey
-import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.viewinterop.UIKitInteropProperties

package/gradle.properties

@@ -18,7 +18,7 @@ kotlin.apple.xcodeCompatibility.nowarn=true
 name="ComposeKits"
 group=vn.momo.kits
 artifact.id=kits
-version=0.162.4
+version=0.162.5
 
 repo=GitLab
 url=https://gitlab.mservice.com.vn/api/v4/projects/5400/packages/maven

package/ios/Application/ApplicationEnvironment.swift

@@ -46,5 +46,6 @@ public class ApplicationEnvironment: ObservableObject {
         self.applicationContext = applicationContext
         self.composeApi = composeApi
         self.config = config
+        FontScaleStore.shared.bind(composeApi)
     }
 }

package/ios/Application/FontScaleStore.swift

@@ -0,0 +1,59 @@
+import SwiftUI
+
+public struct FontScaleConfig {
+    public var useOSFontScale: Bool
+    public var userScaleRate: CGFloat?
+
+    public init(useOSFontScale: Bool = true, userScaleRate: CGFloat? = nil) {
+        self.useOSFontScale = useOSFontScale
+        self.userScaleRate = userScaleRate
+    }
+}
+
+public final class FontScaleStore: ObservableObject {
+    public static let shared = FontScaleStore()
+
+    @Published public private(set) var config = FontScaleConfig()
+
+    private var didBind = false
+    private var observerId: String?
+
+    private init() {}
+
+    public func update(_ newConfig: FontScaleConfig) {
+        if Thread.isMainThread {
+            config = newConfig
+        } else {
+            DispatchQueue.main.async { [weak self] in self?.config = newConfig }
+        }
+    }
+
+    public func bind(_ api: KitComposeApi?) {
+        guard let api = api, !didBind else { return }
+        didBind = true
+
+        apply(api.request(funcName: "getFontScaleConfig", params: nil))
+        observerId = api.request(funcName: "observer", params: ["font_scale_config"]) { [weak self] response in
+            self?.apply(response)
+        }
+    }
+
+    private func apply(_ response: String) {
+        guard let parsed = FontScaleStore.parse(response) else { return }
+        update(parsed)
+    }
+
+    static func parse(_ response: String) -> FontScaleConfig? {
+        guard
+            let data = response.data(using: .utf8),
+            let json = (try? JSONSerialization.jsonObject(with: data)) as? [String: Any]
+        else { return nil }
+
+        let obj = (json["response"] as? [String: Any]) ?? (json["data"] as? [String: Any]) ?? json
+        guard obj["useOSFontScale"] != nil || obj["userScaleRate"] != nil else { return nil }
+
+        let useOS = (obj["useOSFontScale"] as? Bool) ?? true
+        let rate = (obj["userScaleRate"] as? NSNumber).map { CGFloat($0.doubleValue) }
+        return FontScaleConfig(useOSFontScale: useOS, userScaleRate: rate)
+    }
+}

package/ios/Typography/Text.swift

@@ -1,27 +1,30 @@
 import SwiftUI
 
 public func scaleSize(_ size: CGFloat, _ scaleRate: CGFloat? = nil) -> CGFloat {
+    let config = FontScaleStore.shared.config
     let defaultScreenSize: CGFloat = 375
     let maxFontScale: CGFloat = scaleRate ?? 1.5
     let maxDeviceScale: CGFloat = 5
 
-    let deviceWidth = UIScreen.main.bounds.width
-    let deviceScale = deviceWidth / defaultScreenSize
+    if !config.useOSFontScale {
+        let customRate = config.userScaleRate ?? 1
+        return customRate > 1 ? size * customRate : size
+    }
+
+    let deviceScale = UIScreen.main.bounds.width / defaultScreenSize
 
     let defaultFont = UIFont.systemFont(ofSize: UIFont.labelFontSize)
     let scaledFont = UIFontMetrics.default.scaledFont(for: defaultFont)
-    let fontScale = scaledFont.pointSize / defaultFont.pointSize
+    let osFontScale = scaledFont.pointSize / defaultFont.pointSize
 
     var fontSizeDeviceScale = size
     var fontSizeOSScale = size
 
-
     if deviceScale > 1 {
         fontSizeDeviceScale = min(fontSizeDeviceScale * deviceScale, fontSizeDeviceScale + maxDeviceScale)
     }
-
-    if fontScale > 1 {
-        fontSizeOSScale = min(fontSizeOSScale * fontScale, fontSizeOSScale * maxFontScale)
+    if osFontScale > 1 {
+        fontSizeOSScale = min(fontSizeOSScale * osFontScale, fontSizeOSScale * maxFontScale)
     }
 
     return max(fontSizeDeviceScale, fontSizeOSScale)
@@ -118,6 +121,7 @@ public struct MomoText: View {
     private let content: String
     private let typography: TypographyStyle
     private let color: Color
+    @ObservedObject private var fontScale = FontScaleStore.shared
 
     public init(
         _ content: String,
@@ -130,6 +134,7 @@ public struct MomoText: View {
     }
 
     public var body: some View {
+        _ = fontScale.config
         let text = SwiftUI.Text(content)
             .font(.system(size: scaleSize(typography.fontSize), weight: typography.fontWeight))
             .foregroundColor(color)

package/ios/Typography/Typography.swift

@@ -11,25 +11,30 @@ public extension View {
 
 public extension Font {
     static func appFont(size: CGFloat) -> Font {
+        let config = FontScaleStore.shared.config
         let defaultScreenSize: CGFloat = 375
         let maxFontScale: CGFloat = 1.5
         let maxDeviceScale: CGFloat = 5
-        
-        let deviceWidth = UIScreen.main.bounds.width
-        let deviceScale = deviceWidth / defaultScreenSize
-        
+
+        if !config.useOSFontScale {
+            let customRate = config.userScaleRate ?? 1
+            let scaled = customRate > 1 ? size * customRate : size
+            return Font.system(size: scaled)
+        }
+
+        let deviceScale = UIScreen.main.bounds.width / defaultScreenSize
+
         let defaultFont = UIFont.systemFont(ofSize: UIFont.labelFontSize)
         let scaledFont = UIFontMetrics.default.scaledFont(for: defaultFont)
-        let fontScale = scaledFont.pointSize / defaultFont.pointSize
+        let osFontScale = 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)
+        if osFontScale > 1 {
+            fontSize = min(fontSize * osFontScale, fontSize * maxFontScale)
         }
 
         return Font.system(size: fontSize)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.162.4-debug",
+  "version": "0.162.5-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()
-    }
-}