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

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

@@ -25,7 +25,7 @@ struct ContentView: View {
 
 struct ScreenDemo: View {
     var body: some View {
-        Screen (
+        StackScreen(
 //            backgroundColor: Colors.blue01,
             headerTransparent: true,
             isBack: true,

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

@@ -0,0 +1,80 @@
+//
+//  DuoTabDemo.swift
+//  Example
+//
+//  Mirrors RN `app/screens/IPhoneDuo/DuoTabUsage`: glass rail in the Duo side bar, floating
+//  glass bar when unfolded portrait. `useShortcut` gives the tallest side bar header, for the
+//  overlap review; `compressTabBar` folds the tab bar instead of the toolbar when the side bar
+//  is short (HIG "Tab bar compressed").
+//
+
+import MoMoUIKits
+import SwiftUI
+
+private let swatches = [Colors.pink03, Colors.orange03, Colors.green03]
+private let history = (1...18).map { "Giao dịch #\($0)" }
+
+struct DuoTabDemo: View {
+    let useShortcut: Bool
+    var compressTabBar = false
+
+    var body: some View {
+        if #available(iOS 16.0, *) {
+            DuoTabDemoContent(useShortcut: useShortcut, compressTabBar: compressTabBar)
+        } else {
+            Text("Requires iOS 16+").padding()
+        }
+    }
+}
+
+@available(iOS 16.0, *)
+private struct DuoTabDemoContent: View {
+    let useShortcut: Bool
+    let compressTabBar: Bool
+
+    var body: some View {
+        BottomTab(
+            items: [
+                tab("DuoMoMo", label: "MoMo", icon: "basic_home", title: "MoMo"),
+                tab("DuoPromotion", label: "Ưu đãi", icon: "shopping_coupon", title: "Ưu đãi", badge: ""),
+                tab("DuoHistory", label: "Lịch sử GD", icon: "time_clock_reset", title: "Lịch sử giao dịch", badge: "3"),
+                tab("DuoMe", label: "Tôi", icon: "basic_person", title: "Tôi"),
+            ],
+            floatingButton: BottomTabFloatingButton(icon: "navigation_full_screen", label: "Quét mọi QR", onPress: {}),
+            compressionBehavior: compressTabBar ? .tabBar : .toolbar
+        )
+    }
+
+    private func tab(_ name: String, label: String, icon: String, title: String, badge: String? = nil) -> BottomTabItem {
+        BottomTabItem(
+            name: name,
+            label: label,
+            icon: icon,
+            badgeLabel: badge,
+            options: NavigationOptions(title: title, headerRightData: HeaderRightData(useShortcut: useShortcut)),
+            screen: { DuoTabList() }
+        )
+    }
+}
+
+private struct DuoTabList: View {
+    var body: some View {
+        VStack(spacing: 0) {
+            ForEach(history.indices, id: \.self) { index in
+                if index > 0 { MomoDivider() }
+                HStack(spacing: Spacing.M) {
+                    RoundedRectangle(cornerRadius: Radius.S)
+                        .fill(swatches[index % swatches.count])
+                        .frame(width: Spacing.XL, height: Spacing.XL)
+                    MomoText(history[index], typography: .bodyDefaultRegular)
+                    Spacer()
+                }
+                .padding(.vertical, Spacing.M)
+            }
+        }
+        .padding(.horizontal, Spacing.M)
+        .background(Colors.black01)
+        .clipShape(RoundedRectangle(cornerRadius: Radius.M))
+        .padding(Spacing.M)
+    }
+}

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

@@ -51,6 +51,7 @@ public let ScreenUsages: [ScreenUsage] = [
     ScreenUsage(title: "InputTextArea", destination: AnyView(InputTextAreaDemo()), icon: getIcon(icon: "FormInput"), hostsOwnChrome: true),
     ScreenUsage(title: "InputSearch", destination: AnyView(InputSearchDemo()), icon: getIcon(icon: "FormInput"), hostsOwnChrome: true),
     ScreenUsage(title: "PopupNotify", destination: AnyView(PopupNotifyDemo()), icon: getIcon(icon: "Popup"), hostsOwnChrome: true),
+    ScreenUsage(title: "PopupDisplay", destination: AnyView(PopupDisplayDemo()), icon: getIcon(icon: "Popup"), hostsOwnChrome: true),
     ScreenUsage(title: "PopupPromotion", destination: AnyView(PopupPromotionDemo()), icon: getIcon(icon: "Popup"), hostsOwnChrome: true),
     ScreenUsage(title: "SnackBar", destination: AnyView(SnackBarDemo()), icon: getIcon(icon: "Popup"), hostsOwnChrome: true),
     ScreenUsage(title: "Switch", destination: AnyView(SwitchDemo()), icon: getIcon(icon: "Toggle"), hostsOwnChrome: true),
@@ -84,6 +85,7 @@ public let ScreenUsages: [ScreenUsage] = [
     ScreenUsage(title: "DateTimePicker", destination: AnyView(DateTimePickerDemo()), icon: getIcon(icon: "Layout"), hostsOwnChrome: true),
     ScreenUsage(title: "Navigation", destination: AnyView(NavigationDemo()), icon: getIcon(icon: "Layout")),
     ScreenUsage(title: "Bottom Tab", destination: AnyView(BottomTabDemo()), icon: getIcon(icon: "Layout"), hostsOwnChrome: true),
+    ScreenUsage(title: "iPhone Duo", destination: AnyView(IPhoneDuoDemo()), icon: getIcon(icon: "Layout")),
     ScreenUsage(title: "Animated Header", destination: AnyView(AnimatedHeaderDemo()), icon: getIcon(icon: "Layout")),
     ScreenUsage(title: "Theme", destination: AnyView(ThemeDemo()), icon: getIcon(icon: "Typography")),
     ScreenUsage(title: "Localize", destination: AnyView(LocalizeDemo()), icon: getIcon(icon: "Typography")),

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",
+  "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/settings.gradle.kts

@@ -0,0 +1,64 @@
+import org.gradle.kotlin.dsl.maven
+
+rootProject.name = "momo-native-kits"
+enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
+
+pluginManagement {
+    repositories {
+        google {
+            mavenContent {
+                includeGroupAndSubgroups("androidx")
+                includeGroupAndSubgroups("com.android")
+                includeGroupAndSubgroups("com.google")
+            }
+        }
+        mavenCentral()
+        gradlePluginPortal()
+        maven {
+            url = uri("https://gitlab.mservice.com.vn/api/v4/projects/5400/packages/maven")
+            credentials {username = "download_packages"; password = "gldt-bjDqLpU_sPcHDuXau2ws" }
+        }
+        maven {
+            url = uri("https://artifacts.mservice.com.vn/repository/maven-momo-app/")
+            credentials {
+                username = "viewer"
+                password = "viewer"
+            }
+            isAllowInsecureProtocol = true
+        }
+    }
+}
+
+dependencyResolutionManagement {
+    repositories {
+        google {
+            mavenContent {
+                includeGroupAndSubgroups("androidx")
+                includeGroupAndSubgroups("com.android")
+                includeGroupAndSubgroups("com.google")
+            }
+        }
+        mavenCentral()
+        maven { url = uri("https://maven.pkg.jetbrains.space/public/p/compose/dev") }
+        maven {
+            url = uri("https://gitlab.mservice.com.vn/api/v4/projects/5400/packages/maven")
+            credentials {
+                username = "download_packages";
+                password = "gldt-bjDqLpU_sPcHDuXau2ws"
+            }
+        }
+        maven {
+            url = uri("https://artifacts.mservice.com.vn/repository/maven-momo-app/")
+            credentials {
+                username = "viewer"
+                password = "viewer"
+            }
+            isAllowInsecureProtocol = true
+        }
+    }
+}
+
+include(":compose")
+
+include(":sample:androidApp")
+include(":sample:shared")