@momo-kits/native-kits 0.162.44-debug → 0.162.45-debug

package/ios-demo/Sources/MoMoUIKitsDemo/SampleDemos/IPhoneDuoDemo.swift

@@ -0,0 +1,173 @@
+//
+//  IPhoneDuoDemo.swift
+//  Example
+//
+//  Mirrors RN `app/screens/IPhoneDuo`: the live screen layout, an extended header + search
+//  + footer screen, the Duo tab bars, the popup / bottom sheet behaviour and a grid to scroll.
+//
+
+import MoMoUIKits
+import SwiftUI
+
+private let gridRows: [[Int]] = [[12], [6, 6], [4, 4, 4], [3, 3, 3, 3]]
+
+// enough rows to scroll, so the header glass and side bar can be checked
+private let scrollRows: [[Int]] = Array(repeating: gridRows, count: 4).flatMap { $0 }
+
+struct IPhoneDuoDemo: View {
+    var body: some View {
+        if #available(iOS 16.0, *) {
+            IPhoneDuoDemoContent()
+        } else {
+            Text("Requires iOS 16+").padding()
+        }
+    }
+}
+
+@available(iOS 16.0, *)
+private struct IPhoneDuoDemoContent: View {
+    @EnvironmentObject private var navigator: Navigator
+    @Environment(\.screenLayout) private var layout
+
+    var body: some View {
+        VStack(alignment: .leading, spacing: Spacing.M) {
+            VStack(spacing: 0) {
+                ForEach(info, id: \.0) { label, value in
+                    HStack {
+                        MomoText(label, typography: .bodyDefaultRegular)
+                        Spacer()
+                        MomoText(value, typography: .headerSSemibold)
+                    }
+                    .padding(.vertical, Spacing.XS)
+                }
+            }
+            .padding(.horizontal, Spacing.M)
+
+            VStack(spacing: Spacing.S) {
+                demoButton("Extended header + footer") {
+                    navigator.push({ DuoGridScreen() }, options: extendedOptions)
+                }
+                demoButton("Glass tab bar") {
+                    navigator.push({ DuoTabDemo(useShortcut: false) }, options: tabOptions)
+                }
+                demoButton("Glass tab bar + useShortcut") {
+                    navigator.push({ DuoTabDemo(useShortcut: true) }, options: tabOptions)
+                }
+                demoButton("Glass tab bar + compress tab bar") {
+                    navigator.push({ DuoTabDemo(useShortcut: true, compressTabBar: true) }, options: tabOptions)
+                }
+                demoButton("Bottom sheet: iPhone Duo safe area") {
+                    navigator.showBottomSheet({ BottomSheetSafeArea() }, isSurface: true, header: .title("Safe area"))
+                }
+                demoButton("PopupNotify") {
+                    navigator.showModal {
+                        PopupNotify(props: PopupNotifyProps(
+                            image: "https://static.momocdn.net/app/img/popup_permission/img_permission_popup_camera.png",
+                            title: "Title",
+                            description: String(repeating: "Check lại một nhịp auto chuyển sang dạng CTA. ", count: 8),
+                            primary: PopupAction(title: "Đồng ý", onPress: { navigator.hideOverplay() }),
+                            secondary: PopupAction(title: "Đóng", onPress: { navigator.hideOverplay() }),
+                            onIconClose: { navigator.hideOverplay() }
+                        ))
+                    }
+                }
+            }
+            .padding(.horizontal, Spacing.M)
+
+            DuoGrid()
+        }
+        .padding(.vertical, Spacing.M)
+    }
+
+    private var info: [(String, String)] {
+        let insets = layout.insets
+        return [
+            ("iPhone Duo", layout.isIPhoneDuo ? "yes" : "no"),
+            ("Window", "\(Int(layout.width)) x \(Int(layout.height))"),
+            ("Safe area (T R B L)", "\(Int(insets.top)) \(Int(insets.trailing)) \(Int(insets.bottom)) \(Int(insets.leading))"),
+            ("Content inset (L R)", "\(Int(layout.insetLeft)) \(Int(layout.insetRight))"),
+            ("Content width", "\(Int(layout.contentWidth))"),
+            ("Header height", "\(Int(layout.headerHeight))"),
+            ("Side bar", layout.sideBar.map { "\($0.edge == .left ? "left" : "right"), \(Int($0.width))pt, top \(Int($0.top))" } ?? "none"),
+        ]
+    }
+
+    private var extendedOptions: NavigationOptions {
+        NavigationOptions(
+            title: "Extended",
+            headerType: .extended,
+            headerRightData: HeaderRightData(useShortcut: true),
+            footer: { AnyView(MoMoUIKits.Button(title: "Footer action", action: {}, size: .large)) }
+        )
+    }
+
+    private var tabOptions: NavigationOptions {
+        NavigationOptions(title: "Duo tabs", headerType: .none, scrollable: false)
+    }
+
+    private func demoButton(_ title: String, action: @escaping () -> Void) -> some View {
+        MoMoUIKits.Button(title: title, action: action, type: .secondary, size: .small)
+    }
+}
+
+private struct DuoGridScreen: View {
+    var body: some View {
+        DuoGrid().padding(.vertical, Spacing.M)
+    }
+}
+
+private struct DuoGrid: View {
+    var body: some View {
+        VStack(spacing: Spacing.M) {
+            ForEach(scrollRows.indices, id: \.self) { row in
+                SectionView {
+                    ForEach(scrollRows[row].indices, id: \.self) { index in
+                        let span = scrollRows[row][index]
+                        ItemView(widthSpan: span) {
+                            MomoText("span \(span)", typography: .descriptionDefaultRegular)
+                                .frame(maxWidth: .infinity)
+                                .frame(height: 48)
+                                .background(Colors.black04)
+                                .clipShape(RoundedRectangle(cornerRadius: Radius.S))
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+/// Markers on the content edges show the side safe area inside the sheet.
+private struct BottomSheetSafeArea: View {
+    @Environment(\.screenLayout) private var layout
+
+    var body: some View {
+        VStack(alignment: .leading, spacing: Spacing.XS) {
+            HStack {
+                marker("← content edge")
+                Spacer()
+                marker("content edge →")
+            }
+            .padding(.bottom, Spacing.S)
+            MomoText("Window: \(Int(layout.width)) × \(Int(layout.height))", typography: .bodyDefaultRegular)
+            MomoText(
+                "Insets: top \(Int(layout.insets.top)) · right \(Int(layout.insets.trailing)) · bottom \(Int(layout.insets.bottom)) · left \(Int(layout.insets.leading))",
+                typography: .bodyDefaultRegular
+            )
+            MomoText(
+                "On iPhone Duo: the outer display keeps a full-width sheet with content inside the side safe area; the inner display centers the sheet, still attached to the bottom edge. Other devices are unchanged.",
+                typography: .descriptionDefaultRegular,
+                color: Colors.black12
+            )
+        }
+        .padding(.vertical, Spacing.M)
+    }
+
+    private func marker(_ text: String) -> some View {
+        MomoText(text, typography: .labelSMedium, color: Colors.pink03)
+            .padding(.vertical, Spacing.XS)
+            .padding(.horizontal, Spacing.S)
+            .background(Colors.black04)
+            .clipShape(RoundedRectangle(cornerRadius: Radius.XS))
+    }
+}

package/ios-demo/Sources/MoMoUIKitsDemo/SampleDemos/NavigationDemo.swift

@@ -4,7 +4,7 @@
 //
 //  Usage demo for the navigation flow. Mirrors Compose's `NavigationUsage`:
 //  exercises push / present / replace / reset, the modal & bottom-sheet
-//  overplays, the snack bar, the user header title and the bottom-tab layout.
+//  overplays, the snack bar, the header titles, runtime options and the bottom-tab layout.
 //
 
 import MoMoUIKits
@@ -149,6 +149,52 @@ private struct NavigationDemoContent: View {
                     )
                 }
 
+                row("Header Location Title") {
+                    navigator.push(
+                        { DemoLeafScreen(title: "Location title", color: Colors.blue09) },
+                        options: NavigationOptions(
+                            headerTitle: .location(
+                                HeaderLocationData(description: "Deliver to", location: "123 Nguyen Hue, District 1", onPress: { print("location") })
+                            )
+                        )
+                    )
+                }
+
+                row("Header Journey Title") {
+                    navigator.push(
+                        { DemoLeafScreen(title: "Journey title", color: Colors.pink09) },
+                        options: NavigationOptions(
+                            headerTitle: .journey(
+                                HeaderJourneyData(start: "Ho Chi Minh", end: "Ha Noi", description: "Mon, 12/10 · 1 adult", icon: "16_arrow_chevron_right", onPress: { print("journey") })
+                            )
+                        )
+                    )
+                }
+
+                row("Update Options At Runtime") {
+                    navigator.push(
+                        { UpdateOptionsScreen() },
+                        options: NavigationOptions(title: "Before update")
+                    )
+                }
+
+                row("Bottom Sheet With Footer") {
+                    navigator.showBottomSheet({
+                        VStack(spacing: 12) {
+                            ForEach(0..<6, id: \.self) { i in
+                                MomoText("Bottom sheet row \(i + 1)")
+                                    .frame(maxWidth: .infinity, alignment: .leading)
+                            }
+                        }
+                        .padding(Spacing.L)
+                    }, header: .title("Footer"), draggable: false, footer: {
+                        AnyView(
+                            MoMoUIKits.Button(title: "Confirm", action: { navigator.hideOverplay() }, type: .primary, size: .large)
+                                .padding(.horizontal, Spacing.M)
+                        )
+                    })
+                }
+
                 row("Header Animated") {
                     navigator.push(
                         { AnimatedHeaderDemoContent() },
@@ -177,6 +223,36 @@ private struct NavigationDemoContent: View {
 
 // MARK: - Leaf / presented screens
 
+/// A screen changing its own header and footer after it is shown (Compose `LocalNavigation`).
+@available(iOS 16.0, *)
+private struct UpdateOptionsScreen: View {
+    @EnvironmentObject private var navigation: Navigation
+    @EnvironmentObject private var navigator: Navigator
+
+    var body: some View {
+        VStack(spacing: 16) {
+            MoMoUIKits.Button(title: "Change title", action: {
+                navigation.setOptions { $0.title = "Updated at \(Date().formatted(date: .omitted, time: .standard))" }
+            }, type: .primary, size: .large)
+            MoMoUIKits.Button(title: "Add footer", action: {
+                navigation.setOptions {
+                    $0.footer = { AnyView(MoMoUIKits.Button(title: "Footer action", action: {}, type: .primary, size: .large)) }
+                }
+            }, type: .secondary, size: .large)
+            MoMoUIKits.Button(title: "Show snack bar above the footer", action: {
+                navigator.showSnackBar(.custom(duration: 2.0) {
+                    MomoText("Snack bar", color: Colors.black01)
+                        .frame(maxWidth: .infinity, minHeight: 48)
+                        .background(Colors.black17)
+                        .clipShape(RoundedRectangle(cornerRadius: Radius.M))
+                        .padding(.horizontal, Spacing.M)
+                })
+            }, type: .secondary, size: .large)
+        }
+        .padding(16)
+    }
+}
+
 @available(iOS 16.0, *)
 private struct DemoLeafScreen: View {
     @EnvironmentObject private var navigator: Navigator

package/ios-demo/Sources/MoMoUIKitsDemo/SampleDemos/PopupDisplayDemo.swift

@@ -160,6 +160,7 @@ private struct PopupDisplayDemoContent: View {
                 errorCode: errorCode,
                 isShowCloseIcon: showCloseIcon
             )
+            .padding(.horizontal, Spacing.M)
         }
     }
 }

package/ios-demo/Sources/MoMoUIKitsDemo/SampleDemos/PopupNotifyDemo.swift

@@ -26,7 +26,7 @@ private struct PopupNotifyPreview: View {
     private func show() {
         navigator.showModal {
             PopupNotify(props: PopupNotifyProps(
-                image: "https://i.imgur.com/s70S9s9.png",
+                image: "https://static.momocdn.net/app/img/popup_permission/img_permission_popup_camera.png",
                 title: "Title",
                 description: "Check lại một nhịp auto chuyển sang dạng CTA.",
                 error: "9004",
@@ -50,7 +50,7 @@ private let popupDirectionList: [PlaygroundOption] = [
 @available(iOS 16.0, *)
 private struct PopupNotifyPlayground: View {
     @EnvironmentObject private var navigator: Navigator
-    @State private var image = "https://i.imgur.com/s70S9s9.png"
+    @State private var image = "https://static.momocdn.net/app/img/popup_permission/img_permission_popup_camera.png"
     @State private var title = "Title"
     @State private var description = "Check lại một nhịp auto chuyển sang dạng CTA."
     @State private var error = "9004"

package/ios-demo/Sources/MoMoUIKitsDemo/SampleDemos/PopupPromotionDemo.swift

@@ -37,6 +37,7 @@ private struct PopupPromotionPreview: View {
     private func show(_ url: String) {
         navigator.showModal {
             PopupPromotion(imageUrl: url, onIconClose: { navigator.hideOverplay() }, onAction: { navigator.hideOverplay() })
+                .padding(.horizontal, Spacing.M)
         }
     }
 }
@@ -62,6 +63,7 @@ private struct PopupPromotionPlayground: View {
     private func show() {
         navigator.showModal {
             PopupPromotion(imageUrl: imageUrl, onIconClose: { navigator.hideOverplay() }, onAction: { navigator.hideOverplay() })
+                .padding(.horizontal, Spacing.M)
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.162.44-debug",
+  "version": "0.162.45-debug",
   "private": false,
   "dependeNavigationncies": {},
   "devDependencies": {},

package/scripts/gen-ios-icons.mjs

@@ -0,0 +1,36 @@
+// Generates ios/Icon/Icons.swift from the Compose icon map so both kits ship the same
+// compiled-in icons. Run from anywhere: `node scripts/gen-ios-icons.mjs`.
+import { readFileSync, writeFileSync } from "fs";
+import { dirname, join } from "path";
+import { fileURLToPath } from "url";
+
+const root = join(dirname(fileURLToPath(import.meta.url)), "..");
+const source = join(root, "compose/src/commonMain/kotlin/vn/momo/kits/utils/Icons.kt");
+const target = join(root, "ios/Icon/Icons.swift");
+
+const kotlin = readFileSync(source, "utf8");
+const kotlinString = String.raw`"((?:[^"\\]|\\.)*)"`;
+const unescapeKotlin = (s) => s.replace(/\\(["\\$])/g, "$1");
+const swiftString = (s) => `"${s.replace(/\\/g, "\\\\").replace(/"/g, '\\"')}"`;
+
+const icons = [...kotlin.matchAll(new RegExp(`^\\s*${kotlinString} to ${kotlinString}`, "gm"))]
+  .map(([, key, url]) => [unescapeKotlin(key), unescapeKotlin(url)]);
+const noThemeBlock = kotlin.match(/val noThemeIcons = listOf\(([^)]*)\)/);
+const noTheme = noThemeBlock
+  ? [...noThemeBlock[1].matchAll(new RegExp(kotlinString, "g"))].map(([, s]) => unescapeKotlin(s))
+  : [];
+
+if (icons.length === 0) throw new Error(`No icons parsed from ${source}`);
+if (new Set(icons.map(([key]) => key)).size !== icons.length) throw new Error("Duplicate icon keys");
+
+const swift = `// Generated by scripts/gen-ios-icons.mjs from compose/.../utils/Icons.kt. Do not edit by hand.
+
+let kitIcons: [String: String] = [
+${icons.map(([key, url]) => `    ${swiftString(key)}: ${swiftString(url)},`).join("\n")}
+]
+
+let noThemeIcons: [String] = [${noTheme.map(swiftString).join(", ")}]
+`;
+
+writeFileSync(target, swift);
+console.log(`Wrote ${icons.length} icons (${noTheme.length} untinted) to ${target}`);

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

@@ -1,52 +0,0 @@
-package vn.momo.kits.application
-
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.zIndex
-import vn.momo.kits.components.InputSearch
-import vn.momo.kits.components.InputSearchProps
-import vn.momo.kits.const.Radius
-import vn.momo.kits.const.Spacing
-
-@Composable
-internal fun AnimationSearchInput(
-    animations: HeaderAnimations,
-    inputSearchProps: InputSearchProps
-) {
-    Box(
-        modifier = Modifier
-            .fillMaxWidth()
-            .offset(
-                x = animations.translateX.dp,
-                y = animations.translateY.dp
-            )
-    ) {
-        Box(
-            modifier = Modifier
-                .height(HEADER_HEIGHT.dp)
-                .padding(vertical = Spacing.S)
-                .zIndex(1f)
-        ) {
-            Box(
-                modifier = Modifier
-                    .width(animations.width.dp)
-                    .background(
-                        color = animations.backgroundSearch,
-                        shape = RoundedCornerShape(Radius.XL)
-                    )
-            ) {
-                InputSearch(
-                    inputSearchProps = inputSearchProps.copy(
-                        showButtonText = false,
-                        backgroundColor = Color.Transparent
-                    )
-                )
-            }
-        }
-    }
-}

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

@@ -1,183 +0,0 @@
-package vn.momo.kits.application
-
-import androidx.compose.animation.*
-import androidx.compose.animation.core.CubicBezierEasing
-import androidx.compose.animation.core.animateDpAsState
-import androidx.compose.animation.core.tween
-import androidx.compose.foundation.ScrollState
-import androidx.compose.foundation.background
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.layout.*
-import androidx.compose.material3.AlertDialogDefaults.shape
-import androidx.compose.material3.FloatingActionButton
-import androidx.compose.material3.FloatingActionButtonDefaults
-import androidx.compose.runtime.*
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.zIndex
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.collectLatest
-import kotlinx.coroutines.launch
-import vn.momo.kits.components.Icon
-import vn.momo.kits.components.Text
-import vn.momo.kits.const.Typography
-import kotlin.time.Duration.Companion.milliseconds
-
-enum class FABSize {
-    SMALL,
-    DEFAULT,
-}
-
-enum class FABPosition {
-    END,
-    CENTER,
-}
-
-data class FabProps(
-    val icon: String,
-    val iconColor: Color? = null,
-    val label: String? = null,
-    val onClick: () -> Unit,
-    val size: FABSize = FABSize.DEFAULT,
-    val bottom: Dp? = null,
-    val scrollState: ScrollState? = null,
-    val position: FABPosition? = FABPosition.END,
-)
-
-@Deprecated("Use vn.momo.kits.navigation.FloatingButton instead", ReplaceWith("vn.momo.kits.navigation.FloatingButton"))
-@Composable
-internal fun FloatingButton(
-    scrollPosition: Int,
-    bottom: Dp,
-    onClick: () -> Unit,
-    containerColor: Color,
-    contentColor: Color = containerColor,
-    icon: String,
-    iconColor: Color? = null,
-    text: String? = null,
-    elevation: androidx.compose.material3.FloatingActionButtonElevation = FloatingActionButtonDefaults.elevation(
-        4.dp,
-        4.dp,
-        4.dp,
-        4.dp
-    ),
-    size: FABSize = FABSize.DEFAULT,
-    position: FABPosition = FABPosition.END,
-    keyboardSize: Dp = 0.dp,
-) {
-    val scrollPositionStateFlow = remember { MutableStateFlow(scrollPosition) }
-    var lastScrollPosition by rememberSaveable { mutableStateOf(0) }
-    val coroutineScope = rememberCoroutineScope()
-    var isExpanded by rememberSaveable { mutableStateOf(false) }
-
-    val startPadding = if (isExpanded) 12.dp else 0.dp
-    val endPadding = if (isExpanded) 12.dp else 0.dp
-    val widthIn = if ((size === FABSize.SMALL)) 36.dp else 48.dp
-
-
-    val width = animateDpAsState(
-        targetValue = if (isExpanded && text != null) 80.dp else widthIn,
-        animationSpec = tween(
-            durationMillis = 200,
-            easing = CubicBezierEasing(0.2f, 0.2f, 0.2f, 0.2f),
-        )
-    )
-
-    LaunchedEffect(text) {
-        if (text != null) {
-            coroutineScope.launch {
-                scrollPositionStateFlow
-                    .collectLatest { debouncedScrollPosition ->
-                        isExpanded = debouncedScrollPosition > lastScrollPosition
-                        delay(300.milliseconds)
-                        lastScrollPosition = debouncedScrollPosition
-
-                    }
-            }
-        }
-    }
-
-    LaunchedEffect(scrollPosition) {
-        scrollPositionStateFlow.value = scrollPosition
-    }
-
-    Box(
-        Modifier
-            .fillMaxSize()
-            .padding(end = 12.dp, bottom = bottom)
-            .offset(y = -keyboardSize)
-            .background(Color.Transparent)
-            .zIndex(10f),
-        contentAlignment = if (position == FABPosition.END) Alignment.BottomEnd else Alignment.BottomCenter,
-    ) {
-        FloatingActionButton(
-            onClick = onClick,
-            shape = shape,
-            containerColor = containerColor,
-            contentColor = contentColor,
-            elevation = elevation,
-            interactionSource = remember { MutableInteractionSource() },
-            modifier = Modifier
-                .sizeIn(minWidth = width.value)
-                .height(widthIn)
-        ) {
-            Row(
-                modifier = Modifier.padding(start = startPadding, end = endPadding),
-                verticalAlignment = Alignment.CenterVertically,
-                horizontalArrangement = if (isExpanded) Arrangement.Start else Arrangement.Center
-            ) {
-                Icon(
-                    icon,
-                    size = if (size === FABSize.SMALL) 12.dp else 24.dp,
-                    color = iconColor ?: Color.White
-                )
-                AnimatedVisibility(
-                    visible = isExpanded,
-                    enter = ExtendedFabExpandAnimation,
-                    exit = ExtendedFabCollapseAnimation,
-                ) {
-                    Row {
-                        Spacer(Modifier.width(12.dp))
-                        Text(
-                            text ?: "",
-                            color = Color.White,
-                            style = Typography.actionDefaultBold
-                        )
-                    }
-                }
-            }
-        }
-    }
-}
-
-private val ExtendedFabCollapseAnimation = fadeOut(
-    animationSpec = tween(
-        durationMillis = 800,
-        easing = CubicBezierEasing(0.0f, 0.0f, 1.0f, 1.0f),
-    )
-) + shrinkHorizontally(
-    animationSpec = tween(
-        durationMillis = 500,
-        easing = CubicBezierEasing(0.2f, 0.0f, 0.0f, 1.0f),
-    ),
-    shrinkTowards = Alignment.Start,
-)
-
-private val ExtendedFabExpandAnimation = fadeIn(
-    animationSpec = tween(
-        durationMillis = 200,
-        delayMillis = 100,
-        easing = CubicBezierEasing(0.0f, 0.0f, 1.0f, 1.0f),
-    ),
-) + expandHorizontally(
-    animationSpec = tween(
-        durationMillis = 500,
-        easing = CubicBezierEasing(0.2f, 0.0f, 0.0f, 1.0f),
-    ),
-    expandFrom = Alignment.Start,
-)