@momo-kits/native-kits 0.167.1-duo.2-debug → 0.167.1-duo.20-debug

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

@@ -3,13 +3,15 @@ package vn.momo.kits.navigation.component
 import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.draw.clipToBounds
+import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalDensity
@@ -20,6 +22,8 @@ import vn.momo.kits.layout.getScreenLayout
 import vn.momo.kits.modifier.conditional
 import vn.momo.kits.navigation.LocalOptions
 import vn.momo.kits.navigation.LocalScrollState
+import vn.momo.kits.navigation.getInputSearchType
+import vn.momo.kits.navigation.usesDuoGlassHeader
 
 enum class AnimatedHeaderRatio(val value: Float){
     RATIO_16_9(16f / 9f),
@@ -29,6 +33,9 @@ enum class AnimatedHeaderRatio(val value: Float){
 
 internal val HEADER_BACKGROUND_HEIGHT = 154.dp
 
+// RN DuoScrollGradient: extended gradient runs this far below the header
+private val DUO_GRADIENT_EXTRA = 52.dp
+
 @Suppress("FrequentlyChangingValue")
 @Composable
 internal fun HeaderBackground() {
@@ -38,7 +45,8 @@ internal fun HeaderBackground() {
     val scrollState = LocalScrollState.current
     val backgroundColor = options.backgroundColor ?: AppTheme.current.colors.background.default
 
-    val minHeight = getScreenLayout().headerHeight
+    val layout = getScreenLayout()
+    val minHeight = layout.headerHeight
     val maxHeight = HEADER_BACKGROUND_HEIGHT
     val opacity by animateFloatAsState(
         targetValue = (1 - (scrollState.value * 1f / HEADER_HEIGHT * 1f)).coerceIn(0f, 1f),
@@ -57,20 +65,32 @@ internal fun HeaderBackground() {
         else -> 0.dp
     }
 
-    Box(Modifier.fillMaxWidth().height(height).background(backgroundColor)) {
+    // iPhone Duo glass header: the gradient leaves with the content, as the quick return header does
+    val useDuoGlass = options.usesDuoGlassHeader(layout)
+    // RN HeaderExtendHeader with search on the side bar layout: the gradient fills the header box,
+    // which for extended shrinks from 52pt below the header over the first 100pt of scroll
+    val duoSearch = layout.sideBar != null && getInputSearchType(options) != InputSearchType.None
+    val fillsBox = useDuoGlass || duoSearch
+    val duoModifier = when {
+        useDuoGlass -> {
+            val extra = if (options.headerType is HeaderType.Extended) DUO_GRADIENT_EXTRA else 0.dp
+            Modifier.height(minHeight + extra).graphicsLayer { translationY = -scrollState.value.toFloat() }
+        }
+        duoSearch && options.headerType is HeaderType.Extended -> {
+            val progress = (with(density) { scrollState.value.toDp() } / 100.dp).coerceIn(0f, 1f)
+            Modifier.height(minHeight + DUO_GRADIENT_EXTRA * (1 - progress))
+        }
+        duoSearch -> Modifier.height(minHeight)
+        else -> Modifier.height(height)
+    }
+
+    Box(Modifier.fillMaxWidth().then(duoModifier).clipToBounds().background(backgroundColor)) {
+        // on Duo the fade spans the gradient box; a banner image keeps its 375:154 shape, clipped
         Box(Modifier
-            .height(maxHeight)
             .fillMaxWidth()
+            .then(if (fillsBox && !theme.isHeaderImage()) Modifier.fillMaxHeight() else Modifier.height(maxHeight))
             .conditional(!theme.isHeaderImage()) {
-                background(Brush.linearGradient(
-                    colors = listOf(
-                        color,
-                        backgroundColor
-                    ),
-                    start = Offset(0f, 0f),
-                    end = Offset(0f, with(density) { maxHeight.toPx() })
-                    )
-                )
+                background(Brush.verticalGradient(colors = listOf(color, backgroundColor)))
             }
         ){
             if (!theme.isHeaderImage()) return@Box

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

@@ -97,7 +97,8 @@ internal fun parseHeaderTint(value: String?): Color? {
     val hex = when (raw.length) {
         3 -> "FF" + raw.map { "$it$it" }.joinToString("")
         6 -> "FF$raw"
-        8 -> raw
+        // CSS #RRGGBBAA, as RN passes it; Compose wants AARRGGBB
+        8 -> raw.substring(6) + raw.substring(0, 6)
         else -> return null
     }
     val v = hex.toLongOrNull(16) ?: return null

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

@@ -26,7 +26,9 @@ 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.unit.Dp
 import androidx.compose.ui.unit.dp
+import vn.momo.kits.layout.DuoMetrics
 import vn.momo.kits.application.LocalContext
 import vn.momo.kits.application.MiniAppContext
 import vn.momo.kits.components.BadgeDot
@@ -60,12 +62,32 @@ fun HeaderRight(
     }
 }
 
+private const val HELP_CENTER_APP_ID = "vn.momo.helpcenter"
+
+private fun usesHelpCenter(context: MiniAppContext?): Boolean =
+    context != null && context.appId != HELP_CENTER_APP_ID
+
+private fun showsShortcut(headerRight: HeaderRight.Toolkit, context: MiniAppContext?): Boolean =
+    headerRight.useShortcut && !(headerRight.useMore && context == null)
+
+// Height of the vertical toolkit: the optional shortcut, then the help/home capsule.
+@Composable
+internal fun toolkitColumnHeight(headerRight: HeaderRight.Toolkit): Dp {
+    val context = LocalContext.current
+    val shortcut = if (showsShortcut(headerRight, context)) DuoMetrics.controlSize + Spacing.M else 0.dp
+    val groupCount = if (usesHelpCenter(context)) 2 else 1
+    return shortcut + if (groupCount > 1) DuoMetrics.itemPitch * groupCount else DuoMetrics.controlSize
+}
+
+// SideBarColumn: the iPhone Duo side bar; SideBarRow: the Duo header row on the status bar, same 48pt controls.
+internal enum class ToolkitLayout { Bar, SideBarColumn, SideBarRow }
+
 @Composable
 internal fun Toolkit(
     headerRight: HeaderRight.Toolkit,
     tintColor: Color? = null,
     headerColor: HeaderColor,
-    vertical: Boolean = false,
+    layout: ToolkitLayout = ToolkitLayout.Bar,
 ) {
     val api = LocalMaxApi.current
     val context = LocalContext.current
@@ -118,10 +140,13 @@ internal fun Toolkit(
         ) {}
     }
 
-    fun onPressHome() {
-        api?.dismissAll {  }
+    fun onPressClose() {
+        if (headerRight.useCloseIcon) api?.dismiss { } else api?.dismissAll { }
     }
 
+    val useHelpCenter = usesHelpCenter(context)
+    val closeIcon = if (headerRight.useCloseIcon) "16_navigation_close_circle" else "16_basic_home"
+
     val navButtonConfig = getNavigationButtonConfig(
         headerRight,
         ::onPressShortcut,
@@ -132,12 +157,7 @@ internal fun Toolkit(
         group.items.any { it.showBadge }
     }
 
-    val isShowShortcut by remember(headerRight.useShortcut, headerRight.useMore, context) {
-        derivedStateOf {
-            (headerRight.useShortcut == true) &&
-                    !(headerRight.useMore == true && context == null)
-        }
-    }
+    val isShowShortcut = showsShortcut(headerRight, context)
 
     val icon by remember(navButtonConfig.icon, isFavorite) {
         derivedStateOf {
@@ -146,8 +166,9 @@ internal fun Toolkit(
         }
     }
 
-    if (vertical) {
-        Column(verticalArrangement = Arrangement.spacedBy(Spacing.M)) {
+    if (layout != ToolkitLayout.Bar) {
+        val horizontal = layout == ToolkitLayout.SideBarRow
+        val controls = @Composable {
             if (isShowShortcut) {
                 SideBarButton(
                     icon = icon,
@@ -157,23 +178,32 @@ internal fun Toolkit(
                     onClick = navButtonConfig.onPress,
                 )
             }
-            SideBarGroup(headerColor = headerColor, itemCount = if (context != null) 2 else 1) {
-                if (context != null) {
+            SideBarGroup(headerColor = headerColor, itemCount = if (useHelpCenter) 2 else 1, horizontal = horizontal) { item ->
+                if (useHelpCenter) {
                     SideBarGroupItem(
                         icon = "help_center",
                         headerColor = headerColor,
                         automationId = "btn_navigation_help_center",
                         onClick = ::onPressHelpCenter,
+                        modifier = item,
                     )
                 }
                 SideBarGroupItem(
-                    icon = "16_basic_home",
+                    icon = closeIcon,
                     headerColor = headerColor,
                     automationId = "btn_navigation_close",
-                    onClick = ::onPressHome,
+                    onClick = ::onPressClose,
+                    modifier = item,
                 )
             }
         }
+        if (horizontal) {
+            Row(horizontalArrangement = Arrangement.spacedBy(Spacing.M), verticalAlignment = Alignment.CenterVertically) {
+                controls()
+            }
+        } else {
+            Column(verticalArrangement = Arrangement.spacedBy(Spacing.M)) { controls() }
+        }
         return
     }
 
@@ -200,7 +230,7 @@ internal fun Toolkit(
                 .clip(shape = RoundedCornerShape(14.dp))
                 .background(headerColor.backgroundButton)
         ) {
-            if (context != null) {
+            if (useHelpCenter) {
                 Icon(
                     source = "help_center",
                     size = 20.dp,
@@ -215,10 +245,10 @@ internal fun Toolkit(
                 )
             }
             Icon(
-                source = "16_basic_home",
+                source = closeIcon,
                 size = 20.dp,
                 color = headerColor.tintIconColor,
-                modifier = Modifier.padding(4.dp).activeOpacityClickable(onClick = ::onPressHome)
+                modifier = Modifier.padding(4.dp).activeOpacityClickable(onClick = ::onPressClose)
             )
         }
     }
@@ -308,7 +338,9 @@ sealed interface HeaderRight {
         val useMore: Boolean = false,
         val useSystemTools: Boolean = true,
         val tools: List<ToolGroup> = emptyList(),
-        val toolCallback: ((String) -> Unit)? = { _ -> }
+        val toolCallback: ((String) -> Unit)? = { _ -> },
+        // Close dismisses only this mini app instead of returning home.
+        val useCloseIcon: Boolean = false,
     ) : HeaderRight
 }
 

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

@@ -9,10 +9,12 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.sp
 import androidx.compose.ui.zIndex
 import vn.momo.kits.components.Text
+import vn.momo.kits.const.KitDesignSystem
 import vn.momo.kits.const.Typography
 import vn.momo.kits.modifier.setAutomationId
 
-internal const val HEADER_FONT_FAMILY = "MoMoTrustDisplay"
+internal val headerFontFamily: String?
+    get() = if (KitDesignSystem.isWhiteList) "MoMoTrustDisplay" else null
 
 @Composable
 internal fun HeaderTitle(
@@ -29,7 +31,7 @@ internal fun HeaderTitle(
             fontSize = 15.sp,
             lineHeight = 22.sp,
         ),
-        fontFamily = HEADER_FONT_FAMILY,
+        fontFamily = headerFontFamily,
         color = color,
         maxLines = 1,
         overflow = TextOverflow.Ellipsis

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

@@ -78,7 +78,7 @@ internal fun HeaderUser(
                         text = data.title,
                         color = data.tintColor,
                         style = Typography.actionXsBold,
-                        fontFamily = HEADER_FONT_FAMILY,
+                        fontFamily = headerFontFamily,
                         maxLines = 1,
                         overflow = TextOverflow.Ellipsis
                     )

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

@@ -6,17 +6,16 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.BoxScope
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.ColumnScope
+import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.absolutePadding
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.AbsoluteAlignment
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -41,18 +40,24 @@ import vn.momo.kits.modifier.conditional
 import vn.momo.kits.modifier.setAutomationId
 import vn.momo.kits.navigation.LocalNavigator
 import vn.momo.kits.navigation.LocalOptions
+import vn.momo.kits.navigation.bottomtab.LocalDuoBarCompression
 
 private val SIDE_BAR_ICON_SIZE = 24.dp
 
 // iPhone Duo: back and toolkit leave the bar for a column in the side safe area, as the system bars do.
-// bottomInset is what footer / tab bar / home indicator take from the bottom; the column stays above it.
+// bottomInset is what footer / tab bar / home indicator take from the bottom, gap included; the column stays above it.
 @Composable
 internal fun BoxScope.HeaderSideBar(bottomInset: Dp, modifier: Modifier = Modifier) {
     val options = LocalOptions.current
     val navigator = LocalNavigator.current
-    val sideBar = getScreenLayout().sideBar ?: return
+    val screenLayout = getScreenLayout()
+    val sideBar = screenLayout.sideBar ?: return
     val toolkit = options.headerRight as? HeaderRight.Toolkit
-    if (options.headerType == HeaderType.None || (options.hiddenBack && toolkit == null)) return
+    val empty = options.headerType == HeaderType.None || (options.hiddenBack && toolkit == null)
+    val compression = LocalDuoBarCompression.current
+    val fullHeight = if (empty) 0.dp else DuoMetrics.controlSize + (toolkit?.let { Spacing.M + toolkitColumnHeight(it) } ?: 0.dp)
+    LaunchedEffect(fullHeight, compression.setToolbarHeight) { compression.setToolbarHeight(fullHeight) }
+    if (empty) return
 
     val headerColor = getHeaderColor(options.headerType, headerOpacity(), options.tintColor, Colors.black_17)
     val isRight = sideBar.edge == SideBarEdge.RIGHT
@@ -63,7 +68,7 @@ internal fun BoxScope.HeaderSideBar(bottomInset: Dp, modifier: Modifier = Modifi
             .width(sideBar.width)
             .layout { measurable, constraints ->
                 val placeable = measurable.measure(constraints.copy(minHeight = 0))
-                val maxY = constraints.maxHeight - (bottomInset + Spacing.XL).roundToPx() - placeable.height
+                val maxY = screenLayout.height.roundToPx() - bottomInset.roundToPx() - placeable.height
                 val y = minOf(sideBar.top.roundToPx(), maxY).coerceAtLeast(0)
                 layout(placeable.width, constraints.constrainHeight(y + placeable.height)) {
                     placeable.place(0, y)
@@ -84,8 +89,22 @@ internal fun BoxScope.HeaderSideBar(bottomInset: Dp, modifier: Modifier = Modifi
                 onClick = { navigator.onBackSafe { } },
             )
         }
-        if (toolkit != null) {
-            Toolkit(headerRight = toolkit, tintColor = options.tintColor, headerColor = headerColor, vertical = true)
+        when {
+            toolkit == null || compression.toolbarHidden -> Unit
+            // HIG "Toolbar compressed": tools fold into one button, distinct from the useMore icon
+            compression.toolbarCompressed -> SideBarButton(
+                icon = "navigation_menu",
+                headerColor = headerColor,
+                showBadge = toolkit.tools.any { group -> group.items.any { it.showBadge } },
+                automationId = "btn_navigation_toolbar",
+                onClick = compression.expandToolbar,
+            )
+            else -> Toolkit(
+                headerRight = toolkit,
+                tintColor = options.tintColor,
+                headerColor = headerColor,
+                layout = ToolkitLayout.SideBarColumn,
+            )
         }
     }
 }
@@ -119,34 +138,38 @@ internal fun SideBarButton(
     }
 }
 
-// Capsule grouping related controls, one item per 50pt.
+// Capsule grouping related controls, one item per 50pt: vertical in the side bar, horizontal on a header row.
 @Composable
 internal fun SideBarGroup(
     headerColor: HeaderColor,
     itemCount: Int,
-    content: @Composable ColumnScope.() -> Unit,
+    horizontal: Boolean = false,
+    content: @Composable (itemModifier: Modifier) -> Unit,
 ) {
-    val height = if (itemCount > 1) DuoMetrics.itemPitch * itemCount else DuoMetrics.controlSize
-    Column(
-        modifier = Modifier
-            .width(DuoMetrics.controlSize)
-            .height(height)
-            .sideBarGlass(headerColor, RoundedCornerShape(Radius.XL)),
-        content = content,
-    )
+    val length = if (itemCount > 1) DuoMetrics.itemPitch * itemCount else DuoMetrics.controlSize
+    val item = length / itemCount.coerceAtLeast(1)
+    val glass = Modifier.sideBarGlass(headerColor, RoundedCornerShape(Radius.XL))
+    if (horizontal) {
+        Row(Modifier.size(width = length, height = DuoMetrics.controlSize).then(glass)) {
+            content(Modifier.size(width = item, height = DuoMetrics.controlSize))
+        }
+    } else {
+        Column(Modifier.size(width = DuoMetrics.controlSize, height = length).then(glass)) {
+            content(Modifier.size(width = DuoMetrics.controlSize, height = item))
+        }
+    }
 }
 
 @Composable
-internal fun ColumnScope.SideBarGroupItem(
+internal fun SideBarGroupItem(
     icon: String,
     headerColor: HeaderColor,
     automationId: String,
     onClick: () -> Unit,
+    modifier: Modifier = Modifier,
 ) {
     Box(
-        modifier = Modifier
-            .weight(1f)
-            .fillMaxWidth()
+        modifier = modifier
             .activeOpacityClickable(onClick = onClick)
             .setAutomationId(automationId),
         contentAlignment = Alignment.Center,

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

@@ -83,7 +83,8 @@ internal fun SnackBar(
                     durationMillis = 200,
                 )
             )
-            navigator.hideSnackBar()
+            // hideSnackBar() would call clear() -> this close again while still bound
+            OverplayComponentRegistry.hardClearAfterDismiss()
         }
     }
 

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

@@ -14,6 +14,9 @@ data class ScreenDimension(
 
 expect fun getPlatformName(): String
 
+// iPhone idiom only; iPad windows and Android never get the iPhone / iPhone Duo layout.
+expect fun isPhoneIdiom(): Boolean
+
 @Composable
 expect fun getScreenDimensions(): ScreenDimension
 

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

@@ -0,0 +1,13 @@
+package vn.momo.kits.platform
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Immutable
+import androidx.compose.ui.unit.Dp
+
+@Immutable
+internal data class ReservedRegion(val x: Dp, val y: Dp, val width: Dp, val height: Dp)
+
+// Regions the system occludes (iOS 27.1+), in the coordinates of the Compose root view: the
+// iPhone Duo camera, and the status bar cluster as it grows for a call or a Live Activity.
+@Composable
+internal expect fun rememberReservedRegions(): List<ReservedRegion>

package/compose/src/iosMain/kotlin/vn/momo/kits/const/HostFont.ios.kt

@@ -4,6 +4,12 @@ package vn.momo.kits.const
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
+// AI-GENERATED START: imports for the SF Pro -> iOS system font mapping (ITMS-91182)
+import androidx.compose.ui.text.ExperimentalTextApi
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.platform.SystemFont
+import platform.UIKit.UIFont
+// AI-GENERATED END: imports for the SF Pro -> iOS system font mapping (ITMS-91182)
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.platform.Font
 import kotlinx.cinterop.ExperimentalForeignApi
@@ -14,8 +20,40 @@ import platform.Foundation.NSData
 import platform.Foundation.dataWithContentsOfFile
 import platform.posix.memcpy
 
+// AI-GENERATED START: SF Pro -> iOS system font mapping (ITMS-91182)
+/**
+ * Apple cấm app nhúng font của Apple (ITMS-91182) và font hệ thống iOS chính là SF Pro, nên file SF Pro
+ * được thay bằng system font cùng weight thay vì đọc từ bundle — host không cần (và không được) ship nó.
+ *
+ * Weight đi theo tên face của Apple (Ultralight nhẹ hơn Thin), khớp thang weight CoreText mà Skia dùng
+ * (100 = UltraLight, 200 = Thin), để ra đúng face mà tên file chỉ định.
+ * Phải mang weight trong Font vì `Text` bỏ `fontWeight` khỏi style (weight nằm sẵn trong font).
+ */
+private val systemFontWeights: Map<String, FontWeight> = mapOf(
+    "SFProText-Ultralight.ttf" to FontWeight.Thin,
+    "SFProText-Thin.ttf" to FontWeight.ExtraLight,
+    "SFProText-Light.ttf" to FontWeight.Light,
+    "SFProText-Regular.ttf" to FontWeight.Normal,
+    "SFProText-Medium.ttf" to FontWeight.Medium,
+    "SFProText-Semibold.ttf" to FontWeight.SemiBold,
+    "SFProText-Bold.ttf" to FontWeight.Bold,
+    "SFProText-Heavy.ttf" to FontWeight.ExtraBold,
+    "SFProText-Black.ttf" to FontWeight.Black,
+)
+
+/** Family của system font (`.AppleSystemUIFont`), lấy qua API chính thức thay vì hard-code tên ẩn. */
+private val systemFontFamilyName: String by lazy { UIFont.systemFontOfSize(14.0).familyName }
+
+@OptIn(ExperimentalTextApi::class)
+private fun systemFontFamily(weight: FontWeight): FontFamily =
+    FontFamily(SystemFont(identity = systemFontFamilyName, weight = weight))
+// AI-GENERATED END: SF Pro -> iOS system font mapping (ITMS-91182)
+
 @Composable
 internal actual fun hostFontFamily(fileName: String): FontFamily? = remember(fileName) {
+    // AI-GENERATED START: SF Pro -> iOS system font mapping (ITMS-91182)
+    systemFontWeights[fileName]?.let { weight -> return@remember systemFontFamily(weight) }
+    // AI-GENERATED END: SF Pro -> iOS system font mapping (ITMS-91182)
     val name = fileName.substringBeforeLast('.')
     val ext = fileName.substringAfterLast('.', "")
     // Font từ font-source nằm rời ở bundle root, không nằm trong compose-resources.

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

@@ -39,11 +39,15 @@ import platform.Foundation.NSBundle
 import platform.UIKit.UIColor
 import platform.UIKit.UIDevice
 import platform.UIKit.UIScreen
+import platform.UIKit.UIUserInterfaceIdiomPhone
 import vn.momo.kits.navigation.AttachHostBackGesture
 import vn.momo.kits.navigation.Navigator
 
 actual fun getPlatformName(): String = "iOS"
 
+actual fun isPhoneIdiom(): Boolean =
+    UIDevice.currentDevice.userInterfaceIdiom == UIUserInterfaceIdiomPhone
+
 @OptIn(ExperimentalForeignApi::class)
 @Composable
 actual fun getScreenDimensions(): ScreenDimension = memScoped {

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

@@ -0,0 +1,94 @@
+package vn.momo.kits.platform
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.uikit.LocalUIViewController
+import androidx.compose.ui.unit.dp
+import kotlinx.cinterop.BetaInteropApi
+import kotlinx.cinterop.ExperimentalForeignApi
+import kotlinx.cinterop.interpretObjCPointer
+import kotlinx.cinterop.objcPtr
+import kotlinx.cinterop.readValue
+import kotlinx.cinterop.useContents
+import platform.CoreGraphics.CGRectZero
+import platform.Foundation.NSArray
+import platform.Foundation.NSSelectorFromString
+import platform.Foundation.NSValue
+import platform.Foundation.valueForKey
+import platform.UIKit.CGRectValue
+import platform.UIKit.UIView
+import platform.UIKit.UIViewAutoresizingFlexibleHeight
+import platform.UIKit.UIViewAutoresizingFlexibleWidth
+import platform.darwin.NSObject
+import platform.Foundation.NSClassFromString
+
+// The API is newer than the SDK Kotlin/Native binds, so it is reached through the runtime.
+@OptIn(ExperimentalForeignApi::class)
+private val regionsOfKind = NSSelectorFromString("reservedRegionsOfKind:")
+
+@OptIn(ExperimentalForeignApi::class, BetaInteropApi::class)
+private fun UIView.occlusionRegions(target: UIView): List<ReservedRegion> {
+    if (window == null || !respondsToSelector(regionsOfKind)) return emptyList()
+    // a class object fails `as? NSObjectProtocol` (K/N checks it as an instance), so it is reinterpreted
+    val kindClass = NSClassFromString("UIViewReservedRegionKind")
+        ?.let { interpretObjCPointer<NSObject>(it.objcPtr()) } ?: return emptyList()
+    val kind = kindClass.performSelector(NSSelectorFromString("occlusionRegionKind")) ?: return emptyList()
+    val regions = when (val result = performSelector(regionsOfKind, withObject = kind)) {
+        is List<*> -> result
+        is NSArray -> List(result.count.toInt()) { result.objectAtIndex(it.toULong()) }
+        else -> return emptyList()
+    }
+    return regions.mapNotNull { region ->
+        val frame = ((region as? NSObject)?.valueForKey("frame") as? NSValue)?.CGRectValue ?: return@mapNotNull null
+        convertRect(frame, toView = target).useContents {
+            ReservedRegion(origin.x.dp, origin.y.dp, size.width.dp, size.height.dp)
+        }
+    }
+}
+
+// Invisible full-size probe: reading the regions in layoutSubviews makes UIKit run it again
+// when they change, so nothing polls.
+@OptIn(ExperimentalForeignApi::class)
+private class ReservedRegionsProbe(
+    private val onChange: (List<ReservedRegion>) -> Unit,
+) : UIView(frame = CGRectZero.readValue()) {
+    private var last: List<ReservedRegion>? = null
+
+    init {
+        userInteractionEnabled = false
+        autoresizingMask = UIViewAutoresizingFlexibleWidth or UIViewAutoresizingFlexibleHeight
+    }
+
+    override fun layoutSubviews() {
+        super.layoutSubviews()
+        val regions = superview?.let { occlusionRegions(it) } ?: emptyList()
+        if (regions != last) {
+            last = regions
+            onChange(regions)
+        }
+    }
+
+    override fun didMoveToWindow() {
+        super.didMoveToWindow()
+        setNeedsLayout()
+    }
+}
+
+@OptIn(ExperimentalForeignApi::class)
+@Composable
+internal actual fun rememberReservedRegions(): List<ReservedRegion> {
+    if (!isPhoneIdiom()) return emptyList()
+    val host = LocalUIViewController.current.view
+    var regions by remember { mutableStateOf(emptyList<ReservedRegion>()) }
+    DisposableEffect(host) {
+        val probe = ReservedRegionsProbe { regions = it }
+        probe.setFrame(host.bounds)
+        host.insertSubview(probe, atIndex = 0)
+        onDispose { probe.removeFromSuperview() }
+    }
+    return regions
+}

package/gradle.properties

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

package/ios/Application/ApplicationEnvironment.swift

@@ -41,6 +41,12 @@ public class KitConfig {
     public var trustBanner: TrustBannerData? = nil
     public var headerBar: String? = nil
     public var headerGradient: String? = nil
+
+    public init(trustBanner: TrustBannerData? = nil, headerBar: String? = nil, headerGradient: String? = nil) {
+        self.trustBanner = trustBanner
+        self.headerBar = headerBar
+        self.headerGradient = headerGradient
+    }
 }
 
 public class ApplicationEnvironment: ObservableObject {
@@ -59,6 +65,17 @@ public class ApplicationEnvironment: ObservableObject {
     }
 }
 
+extension ApplicationEnvironment {
+    /// Closes the mini app: through `composeApi` as before, else `maxApi` (Compose `maxApi.dismiss`).
+    func requestDismiss() {
+        if let composeApi {
+            composeApi.requestCallback(funcName: "dismiss", params: nil, onResponse: nil)
+        } else {
+            maxApi?.dismiss(completion: nil)
+        }
+    }
+}
+
 private struct ApplicationEnvironmentKey: EnvironmentKey {
     static let defaultValue = ApplicationEnvironment()
 }