@momo-kits/native-kits 0.162.2-sp.7-debug → 0.162.2-sp.8-debug

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/OsFontScale.kt

@@ -0,0 +1,9 @@
+package vn.momo.kits.platform
+
+import androidx.compose.runtime.Composable
+
+// Overrides LocalDensity.fontScale with the live OS Dynamic Type scale so text re-scales while a
+// screen is visible. Wrapped inside the containers so every screen is covered, not just callers of
+// the app-level wrappers.
+@Composable
+expect fun ProvideOsFontScale(content: @Composable () -> Unit)

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/OsFontScale.ios.kt

@@ -0,0 +1,66 @@
+package vn.momo.kits.platform
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.unit.Density
+import kotlinx.cinterop.ExperimentalForeignApi
+import kotlinx.cinterop.ObjCAction
+import platform.Foundation.NSNotification
+import platform.Foundation.NSNotificationCenter
+import platform.Foundation.NSSelectorFromString
+import platform.UIKit.UIContentSizeCategoryDidChangeNotification
+import platform.UIKit.UIFont
+import platform.UIKit.UIFontTextStyleBody
+import platform.darwin.NSObject
+
+// Compose MP iOS reads LocalDensity.fontScale once at ComposeUIViewController creation and does not
+// recompose it when UIContentSizeCategory changes (Android tracks Configuration.fontScale live). We
+// observe the notification and override LocalDensity.fontScale so scaleSize() recomposes live. The
+// formula matches the SwiftUI kit (UIFont body point size / 17) so both iOS surfaces scale alike.
+private const val DEFAULT_BODY_POINT_SIZE = 17.0
+
+private fun currentOsFontScale(): Float =
+    (UIFont.preferredFontForTextStyle(UIFontTextStyleBody).pointSize / DEFAULT_BODY_POINT_SIZE).toFloat()
+
+@OptIn(ExperimentalForeignApi::class)
+@Composable
+actual fun ProvideOsFontScale(content: @Composable () -> Unit) {
+    val osFontScale = remember { mutableStateOf(currentOsFontScale()) }
+
+    val listener = remember {
+        object : NSObject() {
+            @Suppress("unused")
+            @ObjCAction
+            fun contentSizeChanged(arg: NSNotification) {
+                osFontScale.value = currentOsFontScale()
+            }
+        }
+    }
+
+    DisposableEffect(Unit) {
+        NSNotificationCenter.defaultCenter.addObserver(
+            observer = listener,
+            selector = NSSelectorFromString(listener::contentSizeChanged.name + ":"),
+            name = UIContentSizeCategoryDidChangeNotification,
+            `object` = null,
+        )
+        onDispose {
+            NSNotificationCenter.defaultCenter.removeObserver(
+                observer = listener,
+                name = UIContentSizeCategoryDidChangeNotification,
+                `object` = null,
+            )
+        }
+    }
+
+    val density = LocalDensity.current
+    CompositionLocalProvider(
+        LocalDensity provides Density(density.density, osFontScale.value),
+    ) {
+        content()
+    }
+}

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/libs.versions.toml

@@ -21,6 +21,7 @@ maxapi = "0.1.1"
 vanniktechMavenPublish = "0.34.0"
 kits = "0.159.1-beta.7"
 nativemaxapi = "0.0.6"
+gif-image = "0.1.2"
 
 [libraries]
 ktor-client-core = { group = "io.ktor", name = "ktor-client-core", version.ref = "ktor-version" }
@@ -53,6 +54,7 @@ androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "a
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity" }
 material = { module = "com.google.android.material:material", version.ref = "material" }
 
+gif-image = { module = "vn.momo.kits:gif-image", version.ref = "gif-image" }
 [plugins]
 jetbrains-kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }

package/gradle.properties

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

package/ios/Application/ApplicationEnvironment.swift

@@ -41,11 +41,13 @@ public class ApplicationEnvironment: ObservableObject {
     let applicationContext: MiniAppContext?
     let composeApi: KitComposeApi?
     let config: KitConfig?
-    
-    public init(applicationContext: MiniAppContext? = nil, composeApi: KitComposeApi? = nil, config: KitConfig? = nil) {
+    let maxApi: MaxApi?
+
+    public init(applicationContext: MiniAppContext? = nil, composeApi: KitComposeApi? = nil, config: KitConfig? = nil, maxApi: MaxApi? = nil) {
         self.applicationContext = applicationContext
         self.composeApi = composeApi
         self.config = config
+        self.maxApi = maxApi
     }
 }
 

package/ios/Application/Components.swift

@@ -143,6 +143,22 @@ public struct HeaderRightWidthKey: PreferenceKey {
     }
 }
 
+// MARK: - Bottom-tab root preference
+
+/// Set by `BottomTab` on appear so its enclosing `StackScreen` can detect that
+/// it's hosting a self-contained bottom-tab surface and skip its own bottom
+/// safe-area reservation — mirrors Compose's `Navigation.markAsBottomTabRoot()`
+/// (`navigation.isBottomTabRoot`, read by `StackScreen.kt`'s `MainContent`).
+/// Without this, `BottomTab`'s own internal safe-area handling gets an extra,
+/// unwanted inset stacked on top of it by the outer `StackScreen`, pushing the
+/// tab bar up higher than the true bottom inset.
+public struct IsBottomTabRootKey: PreferenceKey {
+    public static var defaultValue: Bool = false
+    public static func reduce(value: inout Bool, nextValue: () -> Bool) {
+        value = value || nextValue()
+    }
+}
+
 // MARK: - Header View
 
 public struct Header: View {