@momo-kits/native-kits 0.168.1-beta.4-debug → 0.168.1-beta.5-debug

package/CLAUDE.md

@@ -7,7 +7,7 @@ Guidance for working in this repo. Keep it accurate — update it when structure
 `momo-native-kits` — MoMo's design-system / UI-kit as a **Kotlin Multiplatform + Compose Multiplatform** library, published for Android (AAR/Maven) and iOS (static framework + CocoaPods). It is the Compose port of the React Native `momo-kits`. Consumed by mini-apps embedded in the host MoMo app.
 
 - Artifact: `vn.momo.kits:kits` (version in `gradle.properties`). NPM mirror: `@momo-kits/native-kits`.
-- Targets: AGP KMP `android` target (JVM 17, compile/min SDK 36/24; AGP 9.2.1, Gradle 9.5.0), `iosArm64`, `iosSimulatorArm64` (framework `baseName = "kits"`, `isStatic = true`).
+- Targets: `androidTarget` (JVM 17, compile/min/target SDK 36/24/36), `iosArm64`, `iosSimulatorArm64` (framework `baseName = "kits"`, `isStatic = true`).
 - Kotlin 2.3.10, Compose MP 1.10.3.
 
 ## Modules
@@ -26,11 +26,11 @@ Guidance for working in this repo. Keep it accurate — update it when structure
 
 ## Build & verify
 
-Run `./gradlew :compose:testAndroidHostTest` for the request ownership tests in `commonTest`. Compile the relevant Android/iOS targets and use the sample app for visual checks.
+No unit-test suite is configured. Validate changes by compiling the relevant target(s); use the sample app for visual checks.
 
 ```bash
 ./gradlew :compose:compileCommonMainKotlinMetadata        # validate commonMain (fast, do this first)
-./gradlew :compose:compileAndroidMain              # Android target
+./gradlew :compose:compileDebugKotlinAndroid              # Android target
 ./gradlew :compose:linkDebugFrameworkIosSimulatorArm64    # iOS framework (slow)
 ./gradlew :sample:androidApp:installDebug                 # run demo on device/emulator
 ```
@@ -50,7 +50,7 @@ Publishing is automated (`publish.sh` + GitLab CI on `[ci build]` / `main`). Do
 - **Configuration flows via CompositionLocals**, not params. Public ones: `AppTheme`, `AppStatusBar`, `AppNavigationBar` (`const/Theme.kt`); `ApplicationContext`, `AppConfig`, `AppLanguage`, `LocalLocalize` (`application/`); `LocalNavigator`, `LocalMaxApi` (`navigation/`). Read with `X.current`.
 - **Design-system config** (`trustBanner`, `headerBar`, `headerGradient`): the host seeds `KitDesignSystemConfig.update(...)` once (same pattern as `KitFontScale`); `NavigationContainer` provides it as `LocalDesignSystemConfig` (param `designSystemConfig` → parent → global) and applies `headerBar` as the header image when the theme has none.
 - **Platform code** goes through `expect`/`actual` in `platform/` — never reference Android/iOS APIs from `commonMain` directly.
-- **Native bridge:** typed `IMaxApi` from NativeMaxApi `0.3.1` (`vn.momo.maxapi`, exposed as `LocalMaxApi`) is the host-app bridge. Toolkit uses `ToolkitOptions` to preserve custom groups and system-tool policy; pending callbacks are cancelled when their composition is disposed. Containers borrow the host client and must not close it.
+- **Native bridge:** `IMaxApi` (`vn.momo.maxapi`, exposed as `LocalMaxApi`) is the host-app bridge (dismiss, tracking, device info, language).
 - Navigation uses a runtime `DynamicScreenRegistry`; overlays (modal/bottom-sheet/snackbar) go through `Navigator` + `OverplayComponentRegistry`.
 - **iOS swipe-back:** the host owns the only edge-pan recogniser and replays it through `HostBackGestureBridge` (`navigation/HostBackGestureBridge.kt`; the kit framework is never exported, so the host reaches it through its own Koin-provided facade): `checkCanPop` / `canPopInner` / `pop` route the back into the kit stack, `started` / `progressed` / `completed` / `cancelled` seek the NavHost transition, `shouldUseFloatingArrowBack` is set by bottom tabs. `NavigationContainer` attaches itself automatically (`AttachHostBackGesture`, iOS only, detached by identity on dispose) — hosts need no wrapper and no `setNavigator`. `maxApi` is a required parameter of `NavigationContainer` — every container, nested or root, is handed its host bridge explicitly.
 

package/README.md

@@ -53,7 +53,7 @@ ComposeKit là bộ UI Kit đa nền tảng phục vụ Mini App/SDK của MoMo.
 ---
 
 ### Yêu cầu môi trường
-- JDK 17+ và Android SDK (compileSdk xem `libs.versions.toml`); wrapper Gradle `9.5.0`, AGP `9.2.1`.
+- JDK 17+, Gradle 8, Android Studio Hedgehog+ với Android SDK (compileSdk xem `libs.versions.toml`).
 - Kotlin Multiplatform plugin + Compose Multiplatform (JetBrains 1.6.1+).
 - Xcode 15, CocoaPods 1.12+ để build `iosApp` hoặc publish Pod.
 - Truy cập mạng nội bộ GitLab Packages nếu cần publish/consume Maven repo `https://gitlab.mservice.com.vn/api/v4/projects/5400/packages/maven`.
@@ -174,12 +174,4 @@ fun SuccessState() {
 ```
 
 - `shared/build.gradle.kts` đã bật `coreLibraryDesugaringEnabled` để tương thích `compottie-dot`/`compottie-network` với `minSdk = 24`.
-- Nếu animation dùng asset/font nội bộ, kết hợp `compottie-resources` (`rememberResourcesAssetsManager`, `rememberResourcesFontManager`) để trỏ về `composeResources`.
-### NativeMaxApi 0.3.1
-
-Compose dùng typed `vn.momo.maxapi.IMaxApi` do host truyền vào `NavigationContainer`.
-Toolkit dùng overload `showToolkit(ToolkitOptions, callback)` để giữ nhóm tool tùy chỉnh,
-nhãn đa ngôn ngữ, icon, badge và `useSystemTools`. Callback trả `actionKey`; request đang chờ
-được hủy khi composition bị gỡ. Kits không đóng client do host sở hữu.
-
-Chạy `./gradlew :compose:testAndroidHostTest` để kiểm tra hủy request và callback đến muộn.
+- Nếu animation dùng asset/font nội bộ, kết hợp `compottie-resources` (`rememberResourcesAssetsManager`, `rememberResourcesFontManager`) để trỏ về `composeResources`.

package/build.gradle.kts

@@ -2,9 +2,7 @@ plugins {
     // this is necessary to avoid the plugins to be loaded multiple times
     // in each subproject's classloader
     alias(libs.plugins.android.application) apply false
-    // AI-GENERATED START: use the AGP 9 Kotlin Multiplatform Android library target
-    alias(libs.plugins.android.kotlin.multiplatform.library) apply false
-    // AI-GENERATED END: use the AGP 9 Kotlin Multiplatform Android library target
+    alias(libs.plugins.android.library) apply false
     alias(libs.plugins.compose) apply false
     alias(libs.plugins.kotlin.compose.compiler) apply false
     alias(libs.plugins.jetbrains.kotlin.multiplatform) apply false

package/compose/build.gradle.kts

@@ -4,9 +4,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.jetbrains.kotlin.multiplatform)
-    // AI-GENERATED START: use the AGP 9 Kotlin Multiplatform Android library target
-    alias(libs.plugins.android.kotlin.multiplatform.library)
-    // AI-GENERATED END: use the AGP 9 Kotlin Multiplatform Android library target
+    alias(libs.plugins.android.library)
     alias(libs.plugins.compose)
     alias(libs.plugins.kotlin.compose.compiler)
 //         alias(libs.plugins.vanniktech.mavenPublish)
@@ -24,18 +22,12 @@ val gitlabUser: String = findProperty("gitlab.user") as String? ?: ""
 val gitlabKey: String = findProperty("gitlab.password") as String? ?: ""
 
 kotlin {
-    // AI-GENERATED START: configure the AGP 9 Android target and host tests
-    android {
-        namespace = "vn.momo.kits.kits"
-        compileSdk = 36
-        minSdk = 24
-        androidResources.enable = true
-        withHostTest {}
+    androidTarget {
         compilerOptions {
             jvmTarget.set(JvmTarget.JVM_17)
         }
+        publishLibraryVariants("release")
     }
-    // AI-GENERATED END: configure the AGP 9 Android target and host tests
 
     val fwName = gitlabArtifactId
     val iosTargets = listOf(iosArm64(), iosSimulatorArm64())
@@ -48,7 +40,7 @@ kotlin {
     }
 
     cocoapods {
-        version = "0.168.1-beta.4-debug"
+        version = "0.168.1-beta.5-debug"
         summary = "IOS Shared module"
         homepage = "https://momo.vn"
         ios.deploymentTarget = "15.0"
@@ -94,14 +86,24 @@ kotlin {
         iosMain.dependencies {
             implementation(libs.ktor.client.darwin)
         }
-        // AI-GENERATED START: verify toolkit request ownership
-        commonTest.dependencies {
-            implementation(kotlin("test"))
-        }
-        // AI-GENERATED END: verify toolkit request ownership
     }
 }
 
+android {
+    namespace = "vn.momo.kits.kits"
+    compileSdk = 35
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+    defaultConfig {
+        minSdk = 24
+    }
+}
+
+dependencies {
+}
+
 repositories {
     google {
         mavenContent {
@@ -151,9 +153,8 @@ compose {
 //     configure(
 //         KotlinMultiplatform(
 //             javadocJar = JavadocJar.Empty(),
-//             // AI-GENERATED START: the AGP KMP target publishes a single Android variant
 //             sourcesJar = true,
-//             // AI-GENERATED END: the AGP KMP target publishes a single Android variant
+//             androidVariantsToPublish = listOf("release")
 //         )
 //     )
 // 

package/compose/build.gradle.kts.backup

@@ -4,9 +4,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.jetbrains.kotlin.multiplatform)
-    // AI-GENERATED START: use the AGP 9 Kotlin Multiplatform Android library target
-    alias(libs.plugins.android.kotlin.multiplatform.library)
-    // AI-GENERATED END: use the AGP 9 Kotlin Multiplatform Android library target
+    alias(libs.plugins.android.library)
     alias(libs.plugins.compose)
     alias(libs.plugins.kotlin.compose.compiler)
     alias(libs.plugins.vanniktech.mavenPublish)
@@ -24,18 +22,12 @@ val gitlabUser: String = findProperty("gitlab.user") as String? ?: ""
 val gitlabKey: String = findProperty("gitlab.password") as String? ?: ""
 
 kotlin {
-    // AI-GENERATED START: configure the AGP 9 Android target and host tests
-    android {
-        namespace = "$gitlabGroup.$gitlabArtifactId"
-        compileSdk = libs.versions.android.compileSdk.get().toInt()
-        minSdk = libs.versions.android.minSdk.get().toInt()
-        androidResources.enable = true
-        withHostTest {}
+    androidTarget {
         compilerOptions {
             jvmTarget.set(JvmTarget.JVM_17)
         }
+        publishLibraryVariants("release")
     }
-    // AI-GENERATED END: configure the AGP 9 Android target and host tests
 
     val fwName = gitlabArtifactId
     val iosTargets = listOf(iosArm64(), iosSimulatorArm64())
@@ -94,14 +86,24 @@ kotlin {
         iosMain.dependencies {
             implementation(libs.ktor.client.darwin)
         }
-        // AI-GENERATED START: verify toolkit request ownership
-        commonTest.dependencies {
-            implementation(kotlin("test"))
-        }
-        // AI-GENERATED END: verify toolkit request ownership
     }
 }
 
+android {
+    namespace = "$gitlabGroup.$gitlabArtifactId"
+    compileSdk = libs.versions.android.compileSdk.get().toInt()
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+    defaultConfig {
+        minSdk = libs.versions.android.minSdk.get().toInt()
+    }
+}
+
+dependencies {
+}
+
 repositories {
     google {
         mavenContent {
@@ -151,9 +153,8 @@ mavenPublishing {
     configure(
         KotlinMultiplatform(
             javadocJar = JavadocJar.Empty(),
-            // AI-GENERATED START: the AGP KMP target publishes a single Android variant
             sourcesJar = true,
-            // AI-GENERATED END: the AGP KMP target publishes a single Android variant
+            androidVariantsToPublish = listOf("release")
         )
     )
 

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

@@ -2,18 +2,13 @@ package vn.momo.kits.application
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
-// AI-GENERATED START: own the typed language request
-import androidx.compose.runtime.DisposableEffect
-// AI-GENERATED END: own the typed language request
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.remember
 import vn.momo.kits.const.AppTheme
 import vn.momo.kits.const.Theme
 import vn.momo.kits.navigation.LocalMaxApi
 import vn.momo.kits.platform.ProvideOsFontScale
-// AI-GENERATED START: consume typed NativeMaxApi results
 import vn.momo.maxapi.IMaxApi
-import vn.momo.maxapi.runtime.ApiResult
-// AI-GENERATED END: consume typed NativeMaxApi results
 
 
 @Composable
@@ -32,25 +27,15 @@ fun WidgetContainer(
     val resolvedLocalize = localize ?: LocalLocalize.current
     val resolvedMaxApi = maxApi ?: LocalMaxApi.current
 
-    // AI-GENERATED START: cancel language delivery when its composition owner changes
-    DisposableEffect(resolvedMaxApi, localize) {
-        val api = resolvedMaxApi
-        val target = localize
-        var active = true
-        val handle = runCatching {
-            api?.getLanguage { result ->
-                if (active && target != null && result is ApiResult.Success &&
-                    result.value.trim().lowercase().startsWith(Localize.EN)) {
-                    target.changeLanguage(Localize.EN)
-                }
-            }
-        }.getOrNull()
-        onDispose {
-            active = false
-            handle?.cancel()
+    LaunchedEffect(resolvedMaxApi, localize) {
+        val api = resolvedMaxApi ?: return@LaunchedEffect
+        val target = localize ?: return@LaunchedEffect
+        runCatching {
+            api.getLanguage(callback = { data ->
+                if (parseLanguage(data) == Localize.EN) target.changeLanguage(Localize.EN)
+            })
         }
     }
-    // AI-GENERATED END: cancel language delivery when its composition owner changes
 
     ProvideOsFontScale {
         CompositionLocalProvider(
@@ -63,3 +48,9 @@ fun WidgetContainer(
         }
     }
 }
+
+private fun parseLanguage(raw: Map<String, Any?>?): String? {
+    val code = (raw?.get("response") as? String)?.trim()?.lowercase()
+    if (code.isNullOrEmpty()) return null
+    return if (code.startsWith(Localize.EN)) Localize.EN else Localize.VI
+}

package/compose/src/commonMain/kotlin/vn/momo/kits/layout/ScreenLayout.kt

@@ -86,6 +86,11 @@ internal object DuoMetrics {
     // (x 550–643 of 669, clock digits centered on y 47); its reserved region is taller than the glyphs.
     val innerStatusBarCenterY = 47.dp
     val innerStatusBarWidth = 120.dp
+    // Host app's iOS 26 tab bar on the inner display in portrait: a 62pt glass pill sized to its tabs,
+    // QR as a 62pt platter beside it, ≥ 20pt from the sides, 13pt into the home indicator inset.
+    val floatingTabBarHeight = 62.dp
+    val floatingTabBarMargin = 20.dp
+    val floatingTabBarInsetOverlap = 13.dp
 }
 
 // Widest short side of any single-display iPhone.

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

@@ -37,10 +37,7 @@ import vn.momo.kits.platform.ProvideNavigationEventDispatcherOwner
 import vn.momo.kits.platform.ProvideOsFontScale
 import vn.momo.kits.utils.getAppStatusBarHeight
 import vn.momo.kits.utils.getNavigationBarHeight
-// AI-GENERATED START: consume typed NativeMaxApi results
 import vn.momo.maxapi.IMaxApi
-import vn.momo.maxapi.runtime.ApiResult
-// AI-GENERATED END: consume typed NativeMaxApi results
 import kotlin.time.Duration.Companion.milliseconds
 
 @Composable
@@ -58,11 +55,7 @@ fun NavigationContainer(
 ) {
     val navController = rememberNavController()
     val registry = remember { DynamicScreenRegistry() }
-    // AI-GENERATED START: retain the current host client after recomposition
-    val navigator = remember(navController, maxApi, registry) {
-        Navigator(navController = navController, maxApi = maxApi, registry = registry)
-    }
-    // AI-GENERATED END: retain the current host client after recomposition
+    val navigator = remember { Navigator(navController = navController, maxApi = maxApi, registry = registry) }
     val statusBarHeight = statusBarHeight ?: getAppStatusBarHeight()
     val navigationBarHeight = getNavigationBarHeight()
     val screenLayout = calculateScreenLayout(statusBarHeight, parent = LocalScreenLayout.current)
@@ -87,25 +80,16 @@ fun NavigationContainer(
 
     val resolvedLocalize = localize ?: fallbackLocalize
 
-    // AI-GENERATED START: cancel language delivery when its composition owner changes
-    DisposableEffect(maxApi, resolvedLocalize) {
-        val api = maxApi
-        val target = resolvedLocalize
-        var active = true
-        val handle = runCatching {
-            api.getLanguage { result ->
-                if (active && result is ApiResult.Success &&
-                    result.value.trim().lowercase().startsWith(Localize.EN)) {
-                    target.changeLanguage(Localize.EN)
+    LaunchedEffect(maxApi, resolvedLocalize) {
+        val api = maxApi ?: return@LaunchedEffect
+        runCatching {
+            api.getLanguage(callback = { data ->
+                if (parseLanguage(data) == Localize.EN) {
+                    resolvedLocalize.changeLanguage(Localize.EN)
                 }
-            }
-        }.getOrNull()
-        onDispose {
-            active = false
-            handle?.cancel()
+            })
         }
     }
-    // AI-GENERATED END: cancel language delivery when its composition owner changes
 
     val screenId = rememberSaveable { registry.nextId() }
     registry.bind(screenId, initialScreenName, initialScreen, options)
@@ -213,3 +197,9 @@ fun NavigationContainer(
 
 val LocalMaxApi = staticCompositionLocalOf<IMaxApi?> { null }
 
+private fun parseLanguage(raw: Map<String, Any?>?): String? {
+    val code = (raw?.get("response") as? String)?.trim()?.lowercase()
+    if (code.isNullOrEmpty()) return null
+    return if (code.startsWith(Localize.EN)) Localize.EN else Localize.VI
+}
+

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

@@ -22,9 +22,6 @@ import vn.momo.kits.components.PopupNotify
 import vn.momo.kits.navigation.BottomHeader.*
 import vn.momo.kits.navigation.component.SnackBar
 import vn.momo.maxapi.IMaxApi
-// AI-GENERATED START: dismiss through the typed navigator target
-import vn.momo.maxapi.contract.navigation.model.DismissTarget
-// AI-GENERATED END: dismiss through the typed navigator target
 import kotlin.time.Duration.Companion.milliseconds
 
 class Navigator(
@@ -128,9 +125,7 @@ class Navigator(
             delay(STACK_TRANSITION_DURATION.milliseconds)
             dismissing?.let { registry.unregisterScreen(it.id) }
         } else {
-            // AI-GENERATED START: preserve root-screen dismissal
-            maxApi?.dismiss(DismissTarget.Current()) {}
-            // AI-GENERATED END: preserve root-screen dismissal
+            maxApi?.dismiss {  }
         }
     }
 

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

@@ -6,9 +6,6 @@ import androidx.compose.runtime.snapshotFlow
 import vn.momo.kits.platform.getScreenDimensions
 import vn.momo.kits.platform.rememberBackGestureProgress
 import vn.momo.maxapi.IMaxApi
-// AI-GENERATED START: use the typed light vibration pattern
-import vn.momo.maxapi.contract.device.vibration.model.VibrateStyle
-// AI-GENERATED END: use the typed light vibration pattern
 
 // Unscaled, so the tick lands at the same physical distance on every device.
 private const val SWIPE_BACK_HAPTIC_THRESHOLD_DP = 50f
@@ -28,9 +25,7 @@ internal fun SwipeBackHaptic(maxApi: IMaxApi?) {
         snapshotFlow { progress.value }.collect { fraction ->
             val travelled = fraction ?: 0f
             if (travelled >= threshold && !isSendHaptic) {
-                // AI-GENERATED START: keep one light tick per threshold crossing
-                runCatching { maxApi.vibrate(VibrateStyle.LIGHT) }
-                // AI-GENERATED END: keep one light tick per threshold crossing
+                runCatching { maxApi.triggerEventVibration("light", callback = null) }
                 isSendHaptic = true
             } else if (travelled < threshold && isSendHaptic) {
                 isSendHaptic = false

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

@@ -39,9 +39,6 @@ import vn.momo.kits.platform.BackHandler
 import vn.momo.kits.platform.reportFloatingArrowBack
 import vn.momo.kits.layout.getScreenLayout
 import kotlinx.coroutines.launch
-// AI-GENERATED START: use the typed tab haptic pattern
-import vn.momo.maxapi.contract.device.vibration.model.VibrateStyle
-// AI-GENERATED END: use the typed tab haptic pattern
 
 private val inOutQuad = Easing { t -> if (t < 0.5f) 2 * t * t else 1 - 2 * (1 - t) * (1 - t) }
 internal val tabTimingSpec = tween<Float>(durationMillis = 200, easing = inOutQuad)
@@ -135,9 +132,7 @@ fun BottomTab(
         it.bottom + duoRailHeight(items.size, hasQr, compressed = compression.tabBarCompressed) + DUO_GROUP_GAP
     } ?: 0.dp
     val onTabSelected: (Int) -> Unit = { index ->
-        // AI-GENERATED START: preserve the light haptic on tab selection
-        runCatching { maxApi?.vibrate(VibrateStyle.LIGHT) }
-        // AI-GENERATED END: preserve the light haptic on tab selection
+        runCatching { maxApi?.triggerEventVibration("light", callback = null) }
         val switchTab = {
             if (index != selectedIndex) selectTab(index)
         }

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

@@ -39,8 +39,6 @@ internal val DUO_GROUP_GAP = Spacing.M
 private val DEFAULT_TOOLBAR_HEIGHT = DuoMetrics.controlSize + Spacing.M + DuoMetrics.itemPitch * 2
 // Back, then the single button the toolbar folds into
 private val COMPRESSED_TOOLBAR_HEIGHT = DuoMetrics.controlSize * 2 + Spacing.M
-// Back alone, while a rail opened from the compressed state takes the toolbar slot
-private val BACK_ONLY_HEIGHT = DuoMetrics.controlSize
 
 // Port of RN DuoBarCompression (HIG, Designing for iPhone Duo: Vertical controls):
 // - both fit: both stay whole
@@ -78,7 +76,8 @@ internal fun rememberDuoBarCompression(
                 expandTabBar = { expanded = DuoBar.TAB_BAR },
                 setToolbarHeight = setToolbarHeight,
             )
-            opened == DuoBar.TAB_BAR && fits(BACK_ONLY_HEIGHT, tabBar) -> DuoBarCompression(
+            // an opened rail always shows, even when only the group gap is short: it closes once a tab is picked
+            opened == DuoBar.TAB_BAR -> DuoBarCompression(
                 toolbarCompressed = true,
                 toolbarHidden = true,
                 expandToolbar = { opened = DuoBar.TOOLBAR },