@momo-kits/native-kits 0.167.1-duo.1-debug → 0.167.1-duo.10-debug

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

@@ -0,0 +1,98 @@
+package vn.momo.kits.navigation.bottomtab
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Stable
+import androidx.compose.runtime.compositionLocalOf
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.unit.Dp
+import vn.momo.kits.const.Spacing
+import vn.momo.kits.layout.DuoMetrics
+import vn.momo.kits.layout.ScreenLayout
+
+// iPhone Duo: which side bar bar starts compressed when the strip cannot hold both whole.
+enum class DuoBarCompressionBehavior { TOOLBAR, TAB_BAR }
+
+private enum class DuoBar { TOOLBAR, TAB_BAR }
+
+@Stable
+internal class DuoBarCompression(
+    val toolbarCompressed: Boolean = false,
+    val tabBarCompressed: Boolean = false,
+    // the open rail needs the toolbar button slot too: only Back stays
+    val toolbarHidden: Boolean = false,
+    val expandToolbar: () -> Unit = {},
+    val expandTabBar: () -> Unit = {},
+    // a rail opened from the compressed state closes once a tab is picked
+    val onTabSelected: () -> Unit = {},
+    // side bar columns report their full height so the tab bar knows what is left
+    val setToolbarHeight: (Dp) -> Unit = {},
+)
+
+internal val LocalDuoBarCompression = compositionLocalOf { DuoBarCompression() }
+
+// space kept between the top and the bottom groups (HIG Vertical controls)
+internal val DUO_GROUP_GAP = Spacing.M
+// Back, then the right toolkit: help + home capsule
+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
+// - one fits whole beside the other compressed: one is compressed, tapping it swaps them
+// - otherwise both rest compressed; tapping one opens it for a moment (the rail closes
+//   again once a tab is picked)
+@Composable
+internal fun rememberDuoBarCompression(
+    behavior: DuoBarCompressionBehavior,
+    tabCount: Int,
+    hasQr: Boolean,
+    layout: ScreenLayout,
+): DuoBarCompression {
+    var toolbarHeight by remember { mutableStateOf(DEFAULT_TOOLBAR_HEIGHT) }
+    var expanded by remember(behavior) {
+        mutableStateOf(if (behavior == DuoBarCompressionBehavior.TOOLBAR) DuoBar.TAB_BAR else DuoBar.TOOLBAR)
+    }
+    var opened by remember { mutableStateOf<DuoBar?>(null) }
+    val setToolbarHeight = remember { { height: Dp -> toolbarHeight = height } }
+    val sideBar = layout.sideBar
+
+    return remember(sideBar, layout.height, tabCount, hasQr, toolbarHeight, expanded, opened) {
+        if (sideBar == null) return@remember DuoBarCompression()
+        val room = layout.height - sideBar.bottom - sideBar.top - DUO_GROUP_GAP
+        val tabBar = duoRailHeight(tabCount, hasQr)
+        val compressedTabBar = duoRailHeight(1, hasQr, compressed = true)
+        fun fits(toolbar: Dp, tabs: Dp) = toolbar + tabs <= room
+
+        when {
+            fits(toolbarHeight, tabBar) -> DuoBarCompression(setToolbarHeight = setToolbarHeight)
+            fits(COMPRESSED_TOOLBAR_HEIGHT, tabBar) && fits(toolbarHeight, compressedTabBar) -> DuoBarCompression(
+                toolbarCompressed = expanded == DuoBar.TAB_BAR,
+                tabBarCompressed = expanded == DuoBar.TOOLBAR,
+                expandToolbar = { expanded = DuoBar.TOOLBAR },
+                expandTabBar = { expanded = DuoBar.TAB_BAR },
+                setToolbarHeight = setToolbarHeight,
+            )
+            opened == DuoBar.TAB_BAR && fits(BACK_ONLY_HEIGHT, tabBar) -> DuoBarCompression(
+                toolbarCompressed = true,
+                toolbarHidden = true,
+                expandToolbar = { opened = DuoBar.TOOLBAR },
+                expandTabBar = { opened = DuoBar.TAB_BAR },
+                onTabSelected = { opened = null },
+                setToolbarHeight = setToolbarHeight,
+            )
+            else -> DuoBarCompression(
+                toolbarCompressed = opened != DuoBar.TOOLBAR,
+                tabBarCompressed = true,
+                expandToolbar = { opened = DuoBar.TOOLBAR },
+                expandTabBar = { opened = DuoBar.TAB_BAR },
+                setToolbarHeight = setToolbarHeight,
+            )
+        }
+    }
+}

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

@@ -0,0 +1,312 @@
+package vn.momo.kits.navigation.bottomtab
+
+import androidx.compose.animation.core.Spring
+import androidx.compose.animation.core.animateDpAsState
+import androidx.compose.animation.core.spring
+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.BoxScope
+import androidx.compose.foundation.layout.BoxWithConstraints
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.RowScope
+import androidx.compose.foundation.layout.absolutePadding
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.offset
+import androidx.compose.foundation.layout.padding
+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.compositionLocalOf
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.AbsoluteAlignment
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.draw.shadow
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.Shape
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import vn.momo.kits.components.Badge
+import vn.momo.kits.components.BadgeDot
+import vn.momo.kits.components.DotSize
+import vn.momo.kits.components.Icon
+import vn.momo.kits.components.Text
+import vn.momo.kits.const.AppTheme
+import vn.momo.kits.const.Radius
+import vn.momo.kits.const.Spacing
+import vn.momo.kits.const.Typography
+import vn.momo.kits.layout.DuoMetrics
+import vn.momo.kits.layout.ScreenLayout
+import vn.momo.kits.layout.SideBarEdge
+import vn.momo.kits.modifier.noFeedbackClickable
+import vn.momo.kits.modifier.setAutomationId
+
+// Figma Fold-Design-System MT1/MT2, mirrored from RN DuoTabBar.tsx.
+private val ITEM_SIZE = DuoMetrics.controlSize
+private val ICON_SIZE = 28.dp
+private val QR_ICON_SIZE = 24.dp
+private val RAIL_PADDING = 6.dp
+private val RAIL_GAP = Spacing.XXS
+// selection bubble overflows the 48 rail cell by 5 above and below
+private val RAIL_BUBBLE_WIDTH = 44.dp
+private val RAIL_BUBBLE_HEIGHT = 58.dp
+private val FLOATING_HEIGHT = 62.dp
+private val FLOATING_PADDING = Spacing.XS
+private val FLOATING_QR_SIZE = 44.dp
+// floating bar spans 6 of the 8 portrait grid columns, like the content
+private const val GRID_COLUMNS = 8
+private const val GRID_SPAN = 6
+// RN reanimated spring { damping: 18, stiffness: 220, mass: 0.8 }
+private val BUBBLE_SPRING = spring<Dp>(dampingRatio = 0.68f, stiffness = 275f, visibilityThreshold = Dp(0.5f))
+
+// Space from the window bottom the rail stack and its gap take, so the header side bar stays above it.
+internal val LocalDuoRailReserve = compositionLocalOf { 0.dp }
+
+// Rail plus the QR button under it; compressed, the rail is a single button.
+internal fun duoRailHeight(itemCount: Int, hasQr: Boolean, compressed: Boolean = false): Dp {
+    val rail = if (compressed) ITEM_SIZE
+    else RAIL_PADDING * 2 + ITEM_SIZE * itemCount + RAIL_GAP * (itemCount - 1).coerceAtLeast(0)
+    return rail + if (hasQr) Spacing.M + ITEM_SIZE else 0.dp
+}
+
+// Space tab content leaves under the floating bar; 0 when the rail sits in the side strip or off Duo.
+internal fun duoFloatingTabBarInset(layout: ScreenLayout): Dp =
+    if (layout.isIPhoneDuo && layout.sideBar == null) FLOATING_HEIGHT + Spacing.M + layout.insetBottom else 0.dp
+
+// iPhone Duo tab bar: glass rail in the side bar, or a floating glass bar when unfolded portrait.
+@Composable
+internal fun BoxScope.DuoTabBar(
+    layout: ScreenLayout,
+    items: List<BottomTabItem>,
+    floatingButton: BottomTabFloatingButton?,
+    selectedIndex: Int,
+    onTabSelected: (Int) -> Unit,
+    compression: DuoBarCompression = DuoBarCompression(),
+) {
+    if (layout.sideBar != null) {
+        DuoRailTabBar(layout, items, floatingButton, selectedIndex, onTabSelected, compression)
+    } else {
+        DuoFloatingTabBar(layout, items, floatingButton, selectedIndex, onTabSelected)
+    }
+}
+
+// Vertical bar anchored to the bottom of the side bar, QR button below it (Figma MT1-C/E). When the
+// side bar is short it can shrink to one button showing the current tab (HIG "Tab bar compressed");
+// tapping it expands the rail and compresses the toolbar.
+@Composable
+private fun BoxScope.DuoRailTabBar(
+    layout: ScreenLayout,
+    items: List<BottomTabItem>,
+    floatingButton: BottomTabFloatingButton?,
+    selectedIndex: Int,
+    onTabSelected: (Int) -> Unit,
+    compression: DuoBarCompression,
+) {
+    val sideBar = layout.sideBar ?: return
+    val isRight = sideBar.edge == SideBarEdge.RIGHT
+
+    Column(
+        modifier = Modifier
+            .align(if (isRight) AbsoluteAlignment.BottomRight else AbsoluteAlignment.BottomLeft)
+            .width(sideBar.width)
+            .padding(bottom = sideBar.bottom)
+            .absolutePadding(left = if (isRight) Spacing.M else 0.dp, right = if (isRight) 0.dp else Spacing.M),
+        horizontalAlignment = if (isRight) AbsoluteAlignment.Left else AbsoluteAlignment.Right,
+        verticalArrangement = Arrangement.spacedBy(Spacing.M),
+    ) {
+        val current = items.getOrNull(selectedIndex)
+        if (compression.tabBarCompressed && current != null) {
+            Box(
+                modifier = Modifier
+                    .size(ITEM_SIZE)
+                    .tabBarMaterial(CircleShape)
+                    .noFeedbackClickable(onClick = compression.expandTabBar)
+                    .setAutomationId("bottom_tab_bar"),
+                contentAlignment = Alignment.Center,
+            ) {
+                DuoTabIcon(current, selected = true)
+            }
+        } else {
+            Rail(items, selectedIndex) {
+                onTabSelected(it)
+                compression.onTabSelected()
+            }
+        }
+        if (floatingButton != null) {
+            QrButton(floatingButton, size = ITEM_SIZE)
+        }
+    }
+}
+
+// Glass column of tab items with the sliding selection bubble.
+@Composable
+private fun Rail(items: List<BottomTabItem>, selectedIndex: Int, onItemClick: (Int) -> Unit) {
+    val bubbleOffset by animateDpAsState(
+        targetValue = (ITEM_SIZE + RAIL_GAP) * selectedIndex.coerceAtLeast(0),
+        animationSpec = BUBBLE_SPRING,
+        label = "DuoRailBubble",
+    )
+    Box(
+        Modifier
+            .width(ITEM_SIZE)
+            .tabBarMaterial(RoundedCornerShape(Radius.XL))
+            .setAutomationId("bottom_tab_bar")
+    ) {
+        Box(
+            Modifier
+                .offset(
+                    x = (ITEM_SIZE - RAIL_BUBBLE_WIDTH) / 2,
+                    y = RAIL_PADDING - (RAIL_BUBBLE_HEIGHT - ITEM_SIZE) / 2 + bubbleOffset,
+                )
+                .size(RAIL_BUBBLE_WIDTH, RAIL_BUBBLE_HEIGHT)
+                .background(AppTheme.current.colors.background.selected, CircleShape)
+        )
+        Column(
+            modifier = Modifier.padding(vertical = RAIL_PADDING),
+            verticalArrangement = Arrangement.spacedBy(RAIL_GAP),
+        ) {
+            items.forEachIndexed { index, item ->
+                Box(
+                    modifier = Modifier
+                        .size(ITEM_SIZE)
+                        .noFeedbackClickable { onItemClick(index) },
+                    contentAlignment = Alignment.Center,
+                ) {
+                    DuoTabIcon(item, selected = index == selectedIndex)
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun BoxScope.DuoFloatingTabBar(
+    layout: ScreenLayout,
+    items: List<BottomTabItem>,
+    floatingButton: BottomTabFloatingButton?,
+    selectedIndex: Int,
+    onTabSelected: (Int) -> Unit,
+) {
+    val columnWidth = (layout.width - Spacing.M * 2 - Spacing.M * (GRID_COLUMNS - 1)) / GRID_COLUMNS
+    val barWidth = columnWidth * GRID_SPAN + Spacing.M * (GRID_SPAN - 1)
+    val useQr = floatingButton != null && items.size % 2 == 0
+    val middle = items.size / 2
+    val cellCount = items.size + if (useQr) 1 else 0
+    val visualIndex = if (useQr && selectedIndex >= middle) selectedIndex + 1 else selectedIndex
+
+    Box(
+        modifier = Modifier
+            .align(Alignment.BottomCenter)
+            .padding(bottom = layout.insetBottom + Spacing.M)
+            .width(barWidth)
+            .height(FLOATING_HEIGHT)
+            .tabBarMaterial(RoundedCornerShape(FLOATING_HEIGHT / 2))
+            .padding(FLOATING_PADDING)
+            .setAutomationId("bottom_tab_bar")
+    ) {
+        BoxWithConstraints(Modifier.fillMaxSize()) {
+            val cellWidth = maxWidth / cellCount
+            val bubbleOffset by animateDpAsState(
+                targetValue = cellWidth * visualIndex.coerceAtLeast(0),
+                animationSpec = BUBBLE_SPRING,
+                label = "DuoFloatingBubble",
+            )
+            Box(
+                Modifier
+                    .offset(x = bubbleOffset)
+                    .width(cellWidth)
+                    .fillMaxHeight()
+                    .background(AppTheme.current.colors.background.selected, CircleShape)
+            )
+            Row(Modifier.fillMaxSize()) {
+                items.forEachIndexed { index, item ->
+                    if (useQr && index == middle) {
+                        Box(Modifier.weight(1f).fillMaxHeight(), contentAlignment = Alignment.Center) {
+                            QrButton(floatingButton, size = FLOATING_QR_SIZE)
+                        }
+                    }
+                    FloatingCell(item, selected = index == selectedIndex) { onTabSelected(index) }
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun RowScope.FloatingCell(item: BottomTabItem, selected: Boolean, onClick: () -> Unit) {
+    val colors = AppTheme.current.colors
+    Column(
+        modifier = Modifier
+            .weight(1f)
+            .fillMaxHeight()
+            .noFeedbackClickable(onClick = onClick),
+        horizontalAlignment = Alignment.CenterHorizontally,
+        verticalArrangement = Arrangement.spacedBy(Spacing.XXS, Alignment.CenterVertically),
+    ) {
+        DuoTabIcon(item, selected)
+        Text(
+            text = item.label,
+            style = Typography.labelXsMedium,
+            color = if (selected) colors.primary else colors.text.default,
+            maxLines = 1,
+            overflow = TextOverflow.Ellipsis,
+        )
+    }
+}
+
+@Composable
+private fun DuoTabIcon(item: BottomTabItem, selected: Boolean) {
+    val colors = AppTheme.current.colors
+    val badgeLabel = item.badgeLabel?.takeUnless { it.toIntOrNull() == 0 }
+    Box {
+        Icon(
+            source = item.icon,
+            size = ICON_SIZE,
+            color = if (selected) colors.primary else colors.text.default,
+        )
+        when {
+            badgeLabel == null && !item.showDot -> Unit
+            badgeLabel.isNullOrEmpty() -> BadgeDot(
+                size = DotSize.Small,
+                modifier = Modifier.align(Alignment.TopEnd),
+            )
+            else -> Badge(
+                badgeLabel,
+                modifier = Modifier.align(Alignment.TopStart).offset(x = ICON_SIZE / 2, y = -Spacing.XS),
+            )
+        }
+    }
+}
+
+@Composable
+private fun QrButton(data: BottomTabFloatingButton, size: Dp) {
+    Box(
+        modifier = Modifier
+            .size(size)
+            .clip(CircleShape)
+            .background(AppTheme.current.colors.primary)
+            .noFeedbackClickable(onClick = data.onPress)
+            .setAutomationId(data.label),
+        contentAlignment = Alignment.Center,
+    ) {
+        Icon(source = data.icon, color = Color.White, size = QR_ICON_SIZE)
+    }
+}
+
+// RN falls back to this when native glass is missing; Compose has no backdrop blur, so it always does.
+@Composable
+private fun Modifier.tabBarMaterial(shape: Shape): Modifier {
+    val colors = AppTheme.current.colors
+    return shadow(3.dp, shape)
+        .background(colors.background.surface)
+        .border(1.dp, colors.border.default, shape)
+}

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

@@ -22,6 +22,8 @@ import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clipToBounds
+import androidx.compose.ui.draw.drawBehind
+import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
@@ -33,12 +35,12 @@ import androidx.compose.ui.unit.dp
 import vn.momo.kits.components.Icon
 import vn.momo.kits.components.Image
 import vn.momo.kits.components.InputSearchProps
-import vn.momo.kits.const.AppStatusBar
 import vn.momo.kits.const.AppTheme
 import vn.momo.kits.const.Colors
 import vn.momo.kits.components.PopupNotifyProps
 import vn.momo.kits.application.IsShowBaseLineDebug
 import vn.momo.kits.const.Spacing
+import vn.momo.kits.layout.getScreenLayout
 import vn.momo.kits.modifier.activeOpacityClickable
 import vn.momo.kits.modifier.conditional
 import vn.momo.kits.modifier.setAutomationId
@@ -47,6 +49,7 @@ import vn.momo.kits.navigation.LocalNavigator
 import vn.momo.kits.navigation.LocalOptions
 import vn.momo.kits.navigation.LocalScrollState
 import vn.momo.kits.navigation.getInputSearchType
+import vn.momo.kits.navigation.usesDuoGlassHeader
 import vn.momo.kits.utils.horizontalSafeAreaPadding
 
 @InternalApi
@@ -54,27 +57,67 @@ const val HEADER_HEIGHT = 52
 internal enum class InputSearchType { None, Header, Animated }
 enum class TitlePosition { LEFT, CENTER }
 
+private val HEADER_ACTIONS_WIDTH = 172.dp
+
 @Suppress("FrequentlyChangingValue")
 @Composable
-internal fun Header(onBackHandler: (() -> Unit)? = null) {
+internal fun headerOpacity(): Float {
     val options = LocalOptions.current
-    val navigator = LocalNavigator.current
     val scrollState = LocalScrollState.current
-    val headerRightWidthPx = LocalHeaderRightWidthPx.current
-    val inputSearchType = getInputSearchType(options)
-
     val opacityHeight = when (val header = options.headerType) {
         is HeaderType.Animated -> with(LocalDensity.current) { header.layoutOffSet.roundToPx() }
         else -> HEADER_HEIGHT
     }
     val opacity by animateFloatAsState(
-        targetValue = if (options.headerType is HeaderType.Transparent) {
-            0f
-        } else {
-            (scrollState.value / opacityHeight.toFloat())
-                .coerceIn(0f, 1f)
+        targetValue = when {
+            options.headerType is HeaderType.Transparent -> 0f
+            opacityHeight <= 0 -> if (scrollState.value > 0) 1f else 0f
+            else -> (scrollState.value / opacityHeight.toFloat()).coerceIn(0f, 1f)
         }
     )
+    return opacity
+}
+
+// Back button and toolkit share the bar with the title unless the iPhone Duo side bar holds them.
+@Composable
+internal fun headerTitleMaxWidth(): Dp {
+    val layout = getScreenLayout()
+    if (layout.sideBar != null) return layout.contentWidth - Spacing.M * 2
+    return layout.width - HEADER_ACTIONS_WIDTH
+}
+
+// Scroll distance over which the Duo glass bar fades in.
+private val DUO_GLASS_FADE_DISTANCE = 16.dp
+
+// RN DuoGlassBackground fallback: translucent surface with a hairline once content scrolls under it.
+@Suppress("FrequentlyChangingValue")
+@Composable
+private fun Modifier.duoGlassBar(): Modifier {
+    val scrollState = LocalScrollState.current
+    val fadePx = with(LocalDensity.current) { DUO_GLASS_FADE_DISTANCE.toPx() }
+    val alpha by animateFloatAsState((scrollState.value / fadePx).coerceIn(0f, 1f), label = "DuoGlassAlpha")
+    val colors = AppTheme.current.colors
+    return background(colors.background.surface.copy(alpha = 0.8f * alpha))
+        .drawBehind {
+            val stroke = 0.5.dp.toPx()
+            drawLine(
+                color = colors.border.default.copy(alpha = alpha),
+                start = Offset(0f, size.height - stroke / 2),
+                end = Offset(size.width, size.height - stroke / 2),
+                strokeWidth = stroke,
+            )
+        }
+}
+
+@Composable
+internal fun Header(onBackHandler: (() -> Unit)? = null) {
+    val options = LocalOptions.current
+    val navigator = LocalNavigator.current
+    val headerRightWidthPx = LocalHeaderRightWidthPx.current
+    val inputSearchType = getInputSearchType(options)
+    val layout = getScreenLayout()
+    val useSideBar = layout.sideBar != null
+    val opacity = headerOpacity()
 
     val headerColor = getHeaderColor(options.headerType, opacity, options.tintColor, Colors.black_17)
 
@@ -93,13 +136,15 @@ internal fun Header(onBackHandler: (() -> Unit)? = null) {
     // Centered title needs a full-width overlay to stay screen-centered, not boxed between back button and header right.
     val centerTitle = titlePosition == TitlePosition.CENTER && options.headerTitle is HeaderTitle.Default
 
+    val useDuoGlass = options.usesDuoGlassHeader(layout)
     val headerImage = AppTheme.current.assets.headerBackground
-        .takeUnless { options.headerType is HeaderType.Transparent }
+        .takeUnless { options.headerType is HeaderType.Transparent || useDuoGlass }
 
     Box(
-        Modifier.height(AppStatusBar.current + HEADER_HEIGHT.dp)
+        Modifier.height(layout.headerHeight)
             .fillMaxWidth()
-            .conditional(headerImage.isNullOrEmpty()) {
+            .then(if (useDuoGlass) Modifier.duoGlassBar() else Modifier)
+            .conditional(headerImage.isNullOrEmpty() && !useDuoGlass) {
                 background(background.copy(alpha = animatedAlpha))
             }
             .conditional(IsShowBaseLineDebug) {
@@ -126,14 +171,14 @@ internal fun Header(onBackHandler: (() -> Unit)? = null) {
             }
         }
         Row(
-            modifier = Modifier.height(HEADER_HEIGHT.dp)
+            modifier = Modifier.height(layout.headerBarHeight)
                 .fillMaxWidth()
                 .horizontalSafeAreaPadding()
                 .padding(horizontal = Spacing.M),
             verticalAlignment = Alignment.CenterVertically,
             horizontalArrangement = Arrangement.SpaceBetween
         ) {
-            if(!options.hiddenBack) {
+            if (!options.hiddenBack && !useSideBar) {
                 BackButton(
                     borderColor = headerColor.borderColor,
                     backgroundButton = headerColor.backgroundButton,
@@ -158,13 +203,16 @@ internal fun Header(onBackHandler: (() -> Unit)? = null) {
             Box(Modifier.onGloballyPositioned {
                 if(headerRightWidthPx.intValue != it.size.width) headerRightWidthPx.intValue = it.size.width
             }){
-                HeaderRight(options.headerRight, options.tintColor, headerColor)
+                if (!(useSideBar && options.headerRight is HeaderRight.Toolkit)) {
+                    HeaderRight(options.headerRight, options.tintColor, headerColor)
+                }
             }
         }
         if (centerTitle) {
             Box(
-                modifier = Modifier.height(HEADER_HEIGHT.dp)
+                modifier = Modifier.height(layout.headerBarHeight)
                     .fillMaxWidth()
+                    .horizontalSafeAreaPadding()
                     .padding(horizontal = Spacing.M),
                 contentAlignment = Alignment.Center
             ) {

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

@@ -3,23 +3,26 @@ 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
 import androidx.compose.ui.unit.dp
 import vn.momo.kits.components.Image
-import vn.momo.kits.const.AppStatusBar
 import vn.momo.kits.const.AppTheme
+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.usesDuoGlassHeader
 
 enum class AnimatedHeaderRatio(val value: Float){
     RATIO_16_9(16f / 9f),
@@ -29,6 +32,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 +44,8 @@ internal fun HeaderBackground() {
     val scrollState = LocalScrollState.current
     val backgroundColor = options.backgroundColor ?: AppTheme.current.colors.background.default
 
-    val minHeight = AppStatusBar.current + HEADER_HEIGHT.dp
+    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 +64,22 @@ 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)
+    val duoModifier = if (useDuoGlass) {
+        val extra = if (options.headerType is HeaderType.Extended) DUO_GRADIENT_EXTRA else 0.dp
+        Modifier.height(minHeight + extra).graphicsLayer { translationY = -scrollState.value.toFloat() }
+    } 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 (useDuoGlass && !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

@@ -23,7 +23,6 @@ import vn.momo.kits.components.Text
 import vn.momo.kits.const.Spacing
 import vn.momo.kits.const.Typography
 import vn.momo.kits.modifier.activeOpacityClickable
-import vn.momo.kits.platform.getScreenDimensions
 
 @Composable
 internal fun HeaderJourney(
@@ -33,7 +32,7 @@ internal fun HeaderJourney(
     if (data !is HeaderTitle.Journey) return
     if (data.isLoading) return TitleJourneyShimmer()
 
-    val maxWidth = getScreenDimensions().width.dp - 172.dp
+    val maxWidth = headerTitleMaxWidth()
     val tint = parseHeaderTint(data.tintColor) ?: tintIconColor
     val iconTint = parseHeaderTint(data.iconColor) ?: tint
 
@@ -98,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