@momo-kits/native-kits 0.162.2-test.2-debug → 0.162.2-test.21-debug

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
@@ -24,7 +26,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
-import vn.momo.kits.application.ApplicationContext
+import vn.momo.kits.application.LocalContext
 import vn.momo.kits.application.MiniAppContext
 import vn.momo.kits.components.BadgeDot
 import vn.momo.kits.components.DotSize
@@ -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,13 +60,13 @@ fun HeaderRight(
 }
 
 @Composable
-fun Toolkit(
+internal fun Toolkit(
     headerRight: HeaderRight.Toolkit,
     tintColor: Color? = null,
     headerColor: HeaderColor
 ) {
     val api = LocalMaxApi.current
-    val context = ApplicationContext.current
+    val context = LocalContext.current
 
     var isFavorite by remember { mutableStateOf(false) }
     val isLoading by remember { mutableStateOf(false) }
@@ -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/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-test.2
+version=0.162.2-test.21
 
 repo=GitLab
 url=https://gitlab.mservice.com.vn/api/v4/projects/5400/packages/maven

package/ios/Application/Components.swift

@@ -245,6 +245,7 @@ public struct Header: View {
                         } else {
                             Text(title)
                                 .font(.system(size: 17, weight: .bold))
+                                .ignoreBoldTextSetting()
                                 .foregroundColor(tintColor ?? Colors.black17)
                                 .frame(maxWidth: titlePosition == .center ? UIScreen.main.bounds.width - 252 : nil)
                                 .frame(maxWidth: titlePosition == .center ? .infinity : UIScreen.main.bounds.width - 172, alignment: titlePosition == .center ? .center : .leading)

package/ios/Application/FloatingButton.swift

@@ -155,6 +155,7 @@ public struct FloatingButton: View {
                     Text(label)
                         .foregroundColor(.white)
                         .font(.system(size: scaleSize(16), weight: .bold))
+                        .ignoreBoldTextSetting()
                         .lineLimit(1)
                         .background(
                             GeometryReader { geo in

package/ios/Badge/Badge.swift

@@ -54,6 +54,7 @@ public struct Badge: View {
     public var body: some View {
         Text(formatTitle(label))
             .font(.system(size: scaleSize(10), weight: .bold))
+            .ignoreBoldTextSetting()
             .foregroundColor(Colors.black01)
             .padding(.horizontal, Spacing.XS)
             .frame(minWidth: scaleSize(16), minHeight: scaleSize(16))

package/ios/Badge/BadgeRibbon.swift

@@ -138,6 +138,7 @@ public struct BadgeRibbon: View {
         HStack(spacing: 0) {
             Text(label)
                 .font(.system(size: scaleSize(12), weight: .medium))
+                .ignoreBoldTextSetting()
                 .foregroundColor(Colors.black01)
                 .lineLimit(1)
                 .rotationEffect(rotation)
@@ -159,6 +160,7 @@ public struct BadgeRibbon: View {
         HStack(spacing: 0) {
             Text(label)
                 .font(.system(size: scaleSize(12), weight: .medium))
+                .ignoreBoldTextSetting()
                 .foregroundColor(Colors.black01)
                 .lineLimit(1)
                 .rotationEffect(rotation)

package/ios/Button/Button.swift

@@ -200,7 +200,7 @@ public struct Button: View {
             .background(bg)
             .overlay(
                 RoundedRectangle(cornerRadius: size.radius)
-                    .stroke(border ?? .clear, lineWidth: border != nil ? borderWidth : 0)
+                    .strokeBorder(border ?? .clear, lineWidth: border != nil ? borderWidth : 0)
             )
             .clipShape(RoundedRectangle(cornerRadius: size.radius))
             .opacity(loading ? 0.75 : 1)

package/ios/Checkbox/Checkbox.swift

@@ -55,6 +55,7 @@ public struct Checkbox: View{
             if !title.isEmpty {
                 Text(title)
                     .font(.description1)
+                    .ignoreBoldTextSetting()
             }
         }
     }

package/ios/Information/Information.swift

@@ -0,0 +1,151 @@
+import SwiftUI
+
+public enum InformationState {
+    case `default`
+    case warning
+    case error
+}
+
+public struct Information: View {
+    private let title: String?
+    private let description: String
+    private let state: InformationState
+    private let image: String?
+    private let onPressAction: (() -> Void)?
+    private let showIcon: Bool
+    private let action: String?
+    private let showIconClose: Bool
+    private let onPressClose: (() -> Void)?
+
+    public init(
+        title: String? = nil,
+        description: String = "Description",
+        state: InformationState = .default,
+        image: String? = nil,
+        onPressAction: (() -> Void)? = nil,
+        showIcon: Bool = true,
+        action: String? = nil,
+        showIconClose: Bool = true,
+        onPressClose: (() -> Void)? = nil
+    ) {
+        self.title = title
+        self.description = description
+        self.state = state
+        self.image = image
+        self.onPressAction = onPressAction
+        self.showIcon = showIcon
+        self.action = action
+        self.showIconClose = showIconClose
+        self.onPressClose = onPressClose
+    }
+
+    private var borderColor: Color {
+        switch state {
+        case .default: return Colors.blue07
+        case .warning: return Colors.yellow06
+        case .error: return Colors.red07
+        }
+    }
+
+    private var backgroundColor: Color {
+        switch state {
+        case .default: return Colors.blue10
+        case .warning: return Colors.yellow09
+        case .error: return Colors.red10
+        }
+    }
+
+    private var accentColor: Color {
+        switch state {
+        case .default: return Colors.blue03
+        case .warning: return Colors.orange03
+        case .error: return Colors.red03
+        }
+    }
+
+    private var iconSource: String {
+        switch state {
+        case .default: return "notifications_info"
+        case .warning: return "24_notifications_alert_triangle"
+        case .error: return "24_notifications_alert_octagon"
+        }
+    }
+
+    public var body: some View {
+        VStack(alignment: .leading, spacing: 0) {
+            HStack(alignment: .top, spacing: 0) {
+                if let image {
+                    ImageView(image)
+                        .frame(width: 40, height: 40)
+                        .clipShape(RoundedRectangle(cornerRadius: Radius.S))
+                        .padding(.trailing, Spacing.S)
+                } else if showIcon {
+                    Icon(source: iconSource, size: 16, color: accentColor)
+                        .padding(.trailing, Spacing.S)
+                }
+
+                VStack(alignment: .leading, spacing: 0) {
+                    if let title {
+                        MomoText(title, typography: .labelDefaultMedium)
+                    }
+                    MomoText(description, typography: .descriptionDefaultRegular)
+                }
+                .frame(maxWidth: .infinity, alignment: .leading)
+
+                if let onPressClose, showIconClose {
+                    Icon(source: "navigation_close", size: 16, color: Colors.black17)
+                        .contentShape(Rectangle())
+                        .onTapGesture(perform: onPressClose)
+                }
+            }
+
+            if let action, let onPressAction {
+                MomoText(action, typography: .actionXsBold, color: accentColor)
+                    .frame(maxWidth: .infinity, alignment: .trailing)
+                    .contentShape(Rectangle())
+                    .onTapGesture(perform: onPressAction)
+                    .padding(.top, Spacing.S)
+            }
+        }
+        .padding(Spacing.M)
+        .background(
+            RoundedRectangle(cornerRadius: Radius.S)
+                .fill(backgroundColor)
+        )
+        .overlay(
+            RoundedRectangle(cornerRadius: Radius.S)
+                .stroke(borderColor, lineWidth: 0.5)
+        )
+    }
+}
+
+// MARK: - Preview
+#if DEBUG
+struct Information_Previews: PreviewProvider {
+    static var previews: some View {
+        VStack(spacing: 16) {
+            Information(
+                title: "Information",
+                description: "This is a default information message."
+            )
+            Information(
+                title: "Warning",
+                description: "This is a warning message.",
+                state: .warning
+            )
+            Information(
+                title: "Error",
+                description: "This is an error message.",
+                state: .error,
+                onPressAction: {}, action: "Retry"
+            )
+            Information(
+                description: "Dismissible information.",
+                onPressClose: {}
+            )
+        }
+        .padding()
+        .previewLayout(.sizeThatFits)
+    }
+}
+#endif

package/ios/Input/Input.swift

@@ -157,6 +157,7 @@ public struct Input: View {
                             })
                             .keyboardType(keyboardType)
                             .font(fontWeight == .bold ? .action_s_bold : .body_default_regular)
+                            .ignoreBoldTextSetting()
                             .foregroundColor(getTextColor())
                             .disabled(disabled || readOnly)
                             .applyPrimaryCursorColor()

package/ios/Input/InputPhoneNumber.swift

@@ -94,6 +94,7 @@ public struct InputPhoneNumber: View {
                     })
                     .keyboardType(.numberPad)
                     .font(size == .small ? .header_s_semibold : .header_m_bold)
+                    .ignoreBoldTextSetting()
                     .foregroundColor(Colors.black17)
                     .applyPrimaryCursorColor()
                     .lineLimit(1)

package/ios/Input/InputSearch.swift

@@ -168,6 +168,7 @@ public struct InputSearch: View {
                             Text(placeholder)
                                 .foregroundColor(disabled ? Colors.black08 : Colors.black12)
                                 .font(.system(size: 16, weight: fontWeight))
+                                .ignoreBoldTextSetting()
                         }
                         TextField("", text: $text, onEditingChanged: { editing in
                             isFocused = editing
@@ -183,6 +184,7 @@ public struct InputSearch: View {
                         .disabled(disabled)
                         .foregroundColor(disabled ? Colors.black08 : Colors.black17)
                         .font(.system(size: 15, weight: fontWeight))
+                        .ignoreBoldTextSetting()
                         .keyboardType(keyboardType)
                     }
                     
@@ -212,6 +214,7 @@ public struct InputSearch: View {
                         Text(buttonText)
                             .foregroundColor(Colors.black17)
                             .font(.system(size: 14, weight: .medium))
+                            .ignoreBoldTextSetting()
                     }
                     .padding(.leading, Spacing.L)
                 }

package/ios/Input/InputTextArea.swift

@@ -223,6 +223,7 @@ public struct InputTextArea: View {
                         onBlur()
                     }
                 }
+                .ignoreBoldTextSetting()
     }
     
     private var borderColor: Color {

package/ios/OTPKeyboard/KeyboardButton.swift

@@ -22,7 +22,7 @@ public struct KeyboardButton: View {
     public var body: some View {
         SwiftUI.Button(action: { self.action(key) }) {
             HStack {
-                Text(key).font(.system(size: 24, weight: .bold))
+                Text(key).font(.system(size: 24, weight: .bold)).ignoreBoldTextSetting()
             }.frame(maxWidth: CGFloat(width), minHeight: height)
                 .background(color)
                 .foregroundColor(textColor)