@momo-kits/native-kits 0.167.1-duo.7 → 0.167.1-duo.8-debug

package/ios/Application/StackScreen.swift

@@ -102,6 +102,9 @@ public struct StackScreen<Content: View>: View {
     @State private var keyboardHeight: CGFloat = 0
     @State private var headerRightWidth: CGFloat = 0
     @State private var isBottomTabRoot: Bool = false
+    @State private var headerHide: CGFloat = 0
+    @State private var lastScrollOffset: CGFloat = 0
+    @State private var headerSettle: Task<Void, Never>?
 
     @Environment(\.applicationEnvironment) private var appEnv
     @Environment(\.screenLayout) private var layout
@@ -140,11 +143,44 @@ public struct StackScreen<Content: View>: View {
             && inputSearchProps == nil && !headerTransparent && !fullScreenContent
     }
 
-    /// Height the footer, tab bar or home indicator takes from the bottom of the window.
+    /// iPhone Duo: the header leaves with the content and slides back in on a reverse scroll
+    /// (RN DuoQuickReturnHeader). The side bar is drawn apart from the header, so it stays put.
+    private var useQuickReturn: Bool {
+        layout.sideBar != nil && scrollable && (useDuoGlass || animatedHeader != nil)
+    }
+
+    private func updateHeaderHide(_ offset: CGFloat) {
+        let delta = offset - lastScrollOffset
+        lastScrollOffset = offset
+        guard useQuickReturn, offset > 0 else {
+            if headerHide != 0 { headerHide = 0 }
+            return
+        }
+        headerHide = min(max(headerHide + delta, 0), layout.headerHeight)
+        settleHeaderWhenScrollStops()
+    }
+
+    /// A half-shown header settles fully in or out. SwiftUI before iOS 18 reports no scroll
+    /// phase, so the scroll counts as ended once the offset stops changing.
+    private func settleHeaderWhenScrollStops() {
+        headerSettle?.cancel()
+        headerSettle = Task { @MainActor in
+            try? await Task.sleep(nanoseconds: 150_000_000)
+            guard !Task.isCancelled else { return }
+            let height = layout.headerHeight
+            // within the first header height the header still sits on the content
+            guard scrollOffset >= height, headerHide > 0, headerHide < height else { return }
+            withAnimation(.easeOut(duration: 0.2)) {
+                headerHide = headerHide > height / 2 ? height : 0
+            }
+        }
+    }
+
+    /// What the footer, tab bar or home indicator takes from the bottom of the window, gap included.
     private var bottomBarsHeight: CGFloat {
-        if footer != nil { return footerHeight + NavigationFooter.safeAreaBottom }
-        if duoTabBarInsets.sideBarReserve > 0 { return duoTabBarInsets.sideBarReserve - Spacing.XL }
-        return NavigationFooter.navigationBarInset
+        if footer != nil { return footerHeight + NavigationFooter.safeAreaBottom + Spacing.XL }
+        if duoTabBarInsets.sideBarReserve > 0 { return duoTabBarInsets.sideBarReserve }
+        return NavigationFooter.navigationBarInset + Spacing.XL
     }
 
     /// Keyboard frames are in screen coordinates; UIScreen stays on the outer display on iPhone Duo.
@@ -234,6 +270,7 @@ public struct StackScreen<Content: View>: View {
                 }
             }
             .ignoresSafeArea(.keyboard, edges: .bottom)
+            .onChange(of: scrollOffset) { updateHeaderHide($0) }
             .onPreferenceChange(HeaderRightWidthKey.self) { width in
                 if headerRightWidth != width { headerRightWidth = width }
             }
@@ -319,6 +356,7 @@ public struct StackScreen<Content: View>: View {
                         }
                         .edgesIgnoringSafeArea([.top, .horizontal])
                     )
+                    .offset(y: -headerHide)
                     .zIndex(100)
             }
         } else if headerTransparent && fullScreenContent {
@@ -342,7 +380,8 @@ public struct StackScreen<Content: View>: View {
                 DuoScrollGradient(
                     scrollOffset: scrollOffset,
                     headerHeight: layout.headerHeight,
-                    extended: headerType == .extended
+                    extended: headerType == .extended,
+                    followScroll: useQuickReturn
                 )
 
                 StackScreenContent(
@@ -360,6 +399,7 @@ public struct StackScreen<Content: View>: View {
                             .modifier(DuoBarMaterial(shape: Rectangle(), visible: scrollOffset > 0))
                             .edgesIgnoringSafeArea([.top, .horizontal])
                     )
+                    .offset(y: -headerHide)
                     .zIndex(100)
             }
         } else {
@@ -526,7 +566,7 @@ private struct SearchAnimatedHeader: View {
         let scroll = max(scrollOffset, 0)
 
         // Insets are measured from the safe-area top; collapsed, the search is centered in the bar row.
-        let rowTop = min(layout.headerStatusBarHeight - layout.insets.top, 0)
+        let rowTop = layout.headerStatusBarHeight - layout.insets.top
         let minTop = rowTop + (layout.headerBarHeight - headerHeight) / 2
         let maxTop = layout.headerHeight - layout.insets.top
         let minSide = Spacing.M

package/ios-demo/README.md

@@ -0,0 +1,120 @@
+# MoMoUIKitsDemo
+
+SwiftUI demo browser for `MoMoUIKits`.
+
+The package can optionally host a Compose UIKits screen by receiving a
+`UIViewController` factory from the host app. It does not import the KMP
+`shared` module directly.
+
+SwiftUI mode reuses the full demo screen set from
+`sample/iosApp/iosApp/Demo`, including the sample `HomeView` registry and demo
+screens for all currently available components.
+
+## CocoaPods
+
+In the host app `Podfile`, include both local pods:
+
+```ruby
+pod 'MoMoUIKits', :path => '../momo-native-kits/ios/native-kits.podspec'
+pod 'MoMoUIKitsDemo', :path => '../momo-native-kits/ios-demo'
+```
+
+Adjust the relative paths to match the host app checkout.
+
+## Host App Usage
+
+```swift
+import MoMoUIKitsDemo
+import shared
+
+class UIKitsViewController: BaseComposeAppViewController {
+  override func getViewController() -> UIViewController? {
+    let params = self.application.data as? [String: Any]
+
+    return MoMoUIKitsDemoViewControllerFactory.make(
+      context: MoMoUIKitsDemoContext(
+        appId: params?["appId"] as? String ?? "",
+        appCode: params?["code"] as? String ?? "",
+        appName: params?["name"] as? String,
+        appIcon: params?["icon"] as? String ?? ""
+      ),
+      composeViewController: {
+        UIKitsScreenComposeViewControllerKt.UIKitsScreenComposeViewController(
+          params: params
+        )
+      }
+    )
+  }
+
+  override func viewDidDisappear(_ animated: Bool) {
+    super.viewDidDisappear(animated)
+    composeViewController = nil
+  }
+}
+```
+
+If the host does not pass `composeViewController`, the demo opens directly in
+SwiftUI mode.
+
+## Included SwiftUI Demos
+
+The pod includes the sample demo screens for:
+
+- Animated Header
+- Avatar
+- Badge
+- Baseline View
+- Bottom Tab
+- Button
+- Carousel
+- Checkbox
+- Chip
+- Collapse
+- DateTimePicker
+- Divider
+- Header User
+- Icon Button
+- Image
+- Information
+- Input
+- Input DropDown
+- Input Money
+- Input OTP
+- Input Phone Number
+- Input Search
+- Input TextArea
+- Loader
+- Navigation
+- Pagination
+- Popup Display
+- Popup Notify
+- Popup Promotion
+- Progress Info
+- Radio
+- Rating
+- Skeleton
+- Slider
+- SnackBar
+- Stepper
+- Steps
+- Suggest Action
+- Swipe
+- Switch
+- TabView
+- Tag
+- Theme
+- Title
+- Tooltip
+- Typography
+- Uploader
+
+## Validation Notes
+
+Validated locally with:
+
+```sh
+pod ipc spec ios/MoMoUIKits.podspec
+pod ipc spec ios-demo/MoMoUIKitsDemo.podspec
+pod lib lint ios/MoMoUIKits.podspec --allow-warnings --skip-import-validation
+pod lib lint ios-demo/MoMoUIKitsDemo.podspec --allow-warnings --skip-import-validation --include-podspecs=ios/MoMoUIKits.podspec
+```

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

@@ -4,7 +4,8 @@
 //
 //  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.
+//  overlap review; `compressTabBar` folds the tab bar instead of the toolbar when the side bar
+//  is short (HIG "Tab bar compressed").
 //
 
 import MoMoUIKits
@@ -15,10 +16,11 @@ 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)
+            DuoTabDemoContent(useShortcut: useShortcut, compressTabBar: compressTabBar)
         } else {
             Text("Requires iOS 16+").padding()
         }
@@ -28,6 +30,7 @@ struct DuoTabDemo: View {
 @available(iOS 16.0, *)
 private struct DuoTabDemoContent: View {
     let useShortcut: Bool
+    let compressTabBar: Bool
 
     var body: some View {
         BottomTab(
@@ -37,7 +40,8 @@ private struct DuoTabDemoContent: View {
                 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: {})
+            floatingButton: BottomTabFloatingButton(icon: "navigation_full_screen", label: "Quét mọi QR", onPress: {}),
+            compressionBehavior: compressTabBar ? .tabBar : .toolbar
         )
     }
 

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

@@ -53,6 +53,9 @@ private struct IPhoneDuoDemoContent: View {
                 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"))
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.167.1-duo.7",
+  "version": "0.167.1-duo.8-debug",
   "private": false,
   "dependeNavigationncies": {},
   "devDependencies": {},

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")