@momo-kits/native-kits 0.168.1-beta.1-debug → 0.168.1-beta.10-debug

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (49) hide show
  1. package/CLAUDE.md +7 -5
  2. package/compose/build.gradle.kts +1 -1
  3. package/compose/compose.podspec +1 -1
  4. package/compose/src/androidMain/kotlin/vn/momo/kits/const/HostFont.android.kt +4 -3
  5. package/compose/src/androidMain/kotlin/vn/momo/kits/platform/ReservedRegions.android.kt +1 -1
  6. package/compose/src/commonMain/kotlin/vn/momo/kits/application/Context.kt +0 -14
  7. package/compose/src/commonMain/kotlin/vn/momo/kits/application/DesignSystemKits.kt +62 -0
  8. package/compose/src/commonMain/kotlin/vn/momo/kits/const/HostFont.kt +2 -1
  9. package/compose/src/commonMain/kotlin/vn/momo/kits/const/Typography.kt +18 -14
  10. package/compose/src/commonMain/kotlin/vn/momo/kits/layout/ScreenLayout.kt +9 -12
  11. package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/NavigationContainer.kt +2 -2
  12. package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/bottomtab/DuoBarCompression.kt +2 -3
  13. package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/bottomtab/DuoTabBar.kt +124 -59
  14. package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/component/Header.kt +1 -1
  15. package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/component/HeaderBackground.kt +3 -1
  16. package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/component/HeaderTitle.kt +2 -2
  17. package/compose/src/commonMain/kotlin/vn/momo/kits/platform/ReservedRegions.kt +10 -3
  18. package/compose/src/iosMain/kotlin/vn/momo/kits/const/HostFont.ios.kt +3 -1
  19. package/compose/src/iosMain/kotlin/vn/momo/kits/platform/ReservedRegions.ios.kt +54 -10
  20. package/gradle.properties +1 -1
  21. package/ios/Application/ApplicationEnvironment.swift +7 -6
  22. package/ios/Application/DesignSystemKits.swift +100 -0
  23. package/ios/Application/DesignSystemKitsPayload.swift +68 -0
  24. package/ios/Badge/BadgeRibbon.swift +8 -1
  25. package/ios/Extensions/Color++.swift +2 -4
  26. package/ios/Input/Input.swift +13 -3
  27. package/ios/Input/InputPhoneNumber.swift +1 -3
  28. package/ios/Input/InputSearch.swift +1 -2
  29. package/ios/Input/InputTextArea.swift +5 -3
  30. package/ios/InputMoney/InputMoney.swift +6 -7
  31. package/ios/Layout/ScreenLayout.swift +46 -11
  32. package/ios/Navigation/BottomTab/DuoBarCompression.swift +2 -3
  33. package/ios/Navigation/BottomTab/DuoTabBar.swift +94 -69
  34. package/ios/Navigation/Component/HeaderBackground.swift +22 -1
  35. package/ios/Navigation/StackScreen.swift +3 -7
  36. package/ios/Popup/PopupLayout.swift +0 -2
  37. package/ios/Stepper/Stepper.swift +1 -2
  38. package/ios/Template/TrustBanner/TrustBanner.swift +4 -2
  39. package/ios/Typography/FontScale.swift +14 -11
  40. package/ios/Typography/Text.swift +86 -12
  41. package/ios/Typography/Typography.swift +2 -2
  42. package/ios/native-kits.podspec +1 -1
  43. package/ios-demo/MoMoUIKitsDemo.podspec +1 -1
  44. package/package.json +1 -1
  45. package/compose/src/commonMain/kotlin/vn/momo/kits/const/KitDesignSystem.kt +0 -18
  46. package/compose/src/commonMain/kotlin/vn/momo/kits/const/KitFontScale.kt +0 -22
  47. package/ios/Typography/FontScaleStore.swift +0 -58
  48. package/ios/Typography/KitDesignSystem.swift +0 -17
  49. package/local.properties +0 -8
@@ -0,0 +1,68 @@
1
+ // File: ios/Application/DesignSystemKitsPayload.swift
2
+ // Created At: 2026-10-02 15:40:00 +07:00
3
+ // Created By: AI
4
+ // AI Agent: Claude Code
5
+ // Model: claude-opus-5-5
6
+
7
+ // AI-GENERATED START: JSON entry point for hosts that can't share Swift types with the kit
8
+ import Foundation
9
+
10
+ public extension DesignSystemKits {
11
+ /// Applies configs pushed as JSON by a host that can't share Swift types with the kit (e.g. the KMP bridge).
12
+ /// Invalid JSON is ignored and the current configs are kept.
13
+ func setConfigs(json: String) {
14
+ guard let data = json.data(using: .utf8),
15
+ let payload = try? JSONDecoder().decode(DesignSystemKitsPayload.self, from: data) else { return }
16
+ setConfigs(payload.configs)
17
+ }
18
+ }
19
+
20
+ // Wire format; field names match the host's serializer (momo-app HostDesignSystemKits / DesignSystemData.kt).
21
+ private struct DesignSystemKitsPayload: Decodable {
22
+ let userScaleRate: CGFloat
23
+ let useOSScaleRate: Bool
24
+ let isWhiteList: Bool
25
+ let designSystemConfig: KitConfigPayload?
26
+
27
+ var configs: DesignSystemKitsConfigs {
28
+ DesignSystemKitsConfigs(
29
+ userScaleRate: userScaleRate,
30
+ useOSScaleRate: useOSScaleRate,
31
+ isWhiteList: isWhiteList,
32
+ designSystemConfig: designSystemConfig?.kitConfig
33
+ )
34
+ }
35
+ }
36
+
37
+ private struct KitConfigPayload: Decodable {
38
+ let trustBanner: TrustBannerPayload?
39
+ let headerBar: String?
40
+ let headerGradient: String?
41
+
42
+ var kitConfig: KitConfig {
43
+ KitConfig(trustBanner: trustBanner?.trustBannerData, headerBar: headerBar, headerGradient: headerGradient)
44
+ }
45
+ }
46
+
47
+ private struct TrustBannerPayload: Decodable {
48
+ let content: [String: String]
49
+ let subContent: [String: String]
50
+ let pciImage: String?
51
+ let sslImage: String?
52
+ let urlConfig: String?
53
+ let icons: [String]?
54
+ let momoImage: String?
55
+
56
+ var trustBannerData: TrustBannerData {
57
+ TrustBannerData(
58
+ content: content,
59
+ subContent: subContent,
60
+ pciImage: pciImage,
61
+ momoImage: momoImage,
62
+ sslImage: sslImage,
63
+ icons: icons,
64
+ urlConfig: urlConfig ?? ""
65
+ )
66
+ }
67
+ }
68
+ // AI-GENERATED END: JSON entry point for hosts that can't share Swift types with the kit
@@ -203,7 +203,9 @@ public struct BadgeRibbon: View {
203
203
  /// rotation) — the label gets the same scale applied a second time so it stays right-reading
204
204
  /// while only the ribbon shape flips.
205
205
  public struct RoundedBadgeRibbon: View {
206
+ @Environment(\.appTheme) private var theme
206
207
  @Environment(\.momoFontScale) private var fontScale
208
+ @Environment(\.designSystemKitsConfigs) private var designSystemKitsConfigs
207
209
  let text: String
208
210
  let position: RibbonPosition
209
211
 
@@ -223,7 +225,12 @@ public struct RoundedBadgeRibbon: View {
223
225
 
224
226
  private var measuredTextSize: CGSize {
225
227
  let fontSize = fontScale(TypographyStyle.labelXsMedium.fontSize)
226
- let font = UIFont.systemFont(ofSize: fontSize, weight: .medium)
228
+ let font = momoUIFont(
229
+ size: fontSize,
230
+ weight: .medium,
231
+ family: theme.font,
232
+ isWhiteList: designSystemKitsConfigs.isWhiteList
233
+ )
227
234
  return text.size(withAttributes: [.font: font])
228
235
  }
229
236
 
@@ -4,16 +4,14 @@ import Foundation
4
4
  private final class MoMoUIKitsBundleToken {}
5
5
 
6
6
  enum MoMoUIKitsResources {
7
+
7
8
  static let bundle: Bundle = {
8
9
  let bundleName = "MoMoUIKitsResources"
9
10
  let tokenBundle = Bundle(for: MoMoUIKitsBundleToken.self)
10
- let frameworkBundle = Bundle(identifier: "org.cocoapods.MoMoUIKits")
11
11
  let candidates = [
12
12
  Bundle.main.resourceURL,
13
13
  tokenBundle.resourceURL,
14
- tokenBundle.bundleURL,
15
- frameworkBundle?.resourceURL,
16
- frameworkBundle?.bundleURL
14
+ tokenBundle.bundleURL
17
15
  ]
18
16
 
19
17
  for candidate in candidates {
@@ -153,7 +153,7 @@ public struct Input: View {
153
153
  handleFocusChange(focused)
154
154
  })
155
155
  .keyboardType(keyboardType)
156
- .font(fontScale.font(size: 14, weight: fontWeight == .bold ? .bold : .regular))
156
+ .kitFont(fontWeight == .bold ? .actionSBold : .bodyDefaultRegular)
157
157
  .ignoreBoldTextSetting()
158
158
  .foregroundColor(getTextColor())
159
159
  .disabled(disabled || readOnly)
@@ -345,7 +345,12 @@ private struct SecureInputField: UIViewRepresentable {
345
345
  textField.spellCheckingType = .no
346
346
  textField.delegate = context.coordinator
347
347
  textField.keyboardType = keyboardType
348
- textField.font = UIFont.systemFont(ofSize: fontSize, weight: fontWeight)
348
+ textField.font = momoUIFont(
349
+ size: fontSize,
350
+ weight: fontWeight,
351
+ family: context.environment.appTheme.font,
352
+ isWhiteList: context.environment.designSystemKitsConfigs.isWhiteList
353
+ )
349
354
  textField.textColor = textColor
350
355
  textField.isEnabled = !isDisabled
351
356
  textField.setContentHuggingPriority(.defaultLow, for: .horizontal)
@@ -370,7 +375,12 @@ private struct SecureInputField: UIViewRepresentable {
370
375
  if textField.text != text {
371
376
  textField.text = text
372
377
  }
373
- let font = UIFont.systemFont(ofSize: fontSize, weight: fontWeight)
378
+ let font = momoUIFont(
379
+ size: fontSize,
380
+ weight: fontWeight,
381
+ family: context.environment.appTheme.font,
382
+ isWhiteList: context.environment.designSystemKitsConfigs.isWhiteList
383
+ )
374
384
  if textField.font != font {
375
385
  textField.font = font
376
386
  }
@@ -104,9 +104,7 @@ public struct InputPhoneNumber: View {
104
104
  handleFocusChange(focused)
105
105
  })
106
106
  .keyboardType(.numberPad)
107
- .font(size == .small
108
- ? fontScale.font(size: 14, weight: .semibold)
109
- : fontScale.font(size: 18, weight: .bold))
107
+ .kitFont(size == .small ? .headerSSemibold : .headerMBold)
110
108
  .ignoreBoldTextSetting()
111
109
  .foregroundColor(theme.colors.text.default)
112
110
  .applyCursorColor(theme.colors.primary)
@@ -120,7 +120,6 @@ public struct InputSearchProps {
120
120
 
121
121
  public struct InputSearch: View {
122
122
  @Environment(\.appTheme) private var theme
123
- @Environment(\.momoFontScale) private var fontScale
124
123
  @Binding var text: String
125
124
  var buttonText: String = ""
126
125
  var showButtonText: Bool = false
@@ -263,7 +262,7 @@ public struct InputSearch: View {
263
262
  }, onCommit: onSubmit)
264
263
  .disabled(disabled)
265
264
  .foregroundColor(disabled ? theme.colors.text.disable : theme.colors.text.default)
266
- .font(.system(size: fontScale(14), weight: fontWeight))
265
+ .kitFont(size: 14, weight: fontWeight)
267
266
  .ignoreBoldTextSetting()
268
267
  .keyboardType(keyboardType)
269
268
  .applyCursorColor(theme.colors.primary)
@@ -41,9 +41,11 @@ struct UITextViewWrapper: UIViewRepresentable {
41
41
  uiView.tintColor = UIColor(cursorColor)
42
42
  // Read through `context.environment` rather than the global `scaleSize`: that is what makes
43
43
  // SwiftUI re-run updateUIView when the font scale changes.
44
- uiView.font = UIFont.systemFont(
45
- ofSize: context.environment.momoFontScale(16),
46
- weight: fontWeight == .bold ? .bold : .regular
44
+ uiView.font = momoUIFont(
45
+ size: context.environment.momoFontScale(16),
46
+ weight: fontWeight == .bold ? .bold : .regular,
47
+ family: context.environment.appTheme.font,
48
+ isWhiteList: context.environment.designSystemKitsConfigs.isWhiteList
47
49
  )
48
50
  uiView.isEditable = !disabled
49
51
  if uiView.keyboardType != keyboardType {
@@ -356,14 +356,13 @@ private struct MoneyTextField: UIViewRepresentable {
356
356
  return numeric.isEmpty ? "" : formatNumberToMoney(numeric)
357
357
  }
358
358
 
359
- // Theme family as Compose `getFontFamily`: Momo Trust Sans only for whitelisted hosts, else system.
360
359
  private func font(_ context: Context) -> UIFont {
361
- let size = context.environment.momoFontScale(20)
362
- if KitDesignSystem.shared.isWhiteList, fontFamily == "MomoTrustSans",
363
- let font = UIFont(name: fontWeight == .bold ? "MomoTrustSans-Bold" : "MomoTrustSans-Regular", size: size) {
364
- return font
365
- }
366
- return .systemFont(ofSize: size, weight: fontWeight)
360
+ momoUIFont(
361
+ size: context.environment.momoFontScale(20),
362
+ weight: fontWeight,
363
+ family: fontFamily,
364
+ isWhiteList: context.environment.designSystemKitsConfigs.isWhiteList
365
+ )
367
366
  }
368
367
 
369
368
  final class Coordinator: NSObject, UITextFieldDelegate {
@@ -32,6 +32,8 @@ public struct ScreenLayout: Equatable {
32
32
  public let width: CGFloat
33
33
  public let height: CGFloat
34
34
  public let isIPhoneDuo: Bool
35
+ /// The device has a hinge, folded or not, whatever the window size; drives popups, modal and bottom sheet.
36
+ public let isDuoDevice: Bool
35
37
  public let insets: EdgeInsets
36
38
  public let insetLeft: CGFloat
37
39
  public let insetRight: CGFloat
@@ -68,8 +70,11 @@ enum DuoMetrics {
68
70
  // (x 550–643 of 669, clock digits centered on y 47); its reserved region is taller than the glyphs.
69
71
  static let innerStatusBarCenterY: CGFloat = 47
70
72
  static let innerStatusBarWidth: CGFloat = 120
71
- // Widest short side of any single-display iPhone.
72
- static let iPhoneMaxShortSide: CGFloat = 440
73
+ // Host app's iOS 26 tab bar on the inner display in portrait: a 62pt glass pill sized to its tabs,
74
+ // QR as a 62pt platter beside it, ≥ 20pt from the sides, 13pt into the home indicator inset.
75
+ static let floatingTabBarHeight: CGFloat = 62
76
+ static let floatingTabBarMargin: CGFloat = 20
77
+ static let floatingTabBarInsetOverlap: CGFloat = 13
73
78
  }
74
79
 
75
80
  enum HeaderMetrics {
@@ -104,15 +109,17 @@ extension ScreenLayout {
104
109
  size: CGSize,
105
110
  insets: EdgeInsets,
106
111
  reservedRegions: [CGRect] = ReservedRegions.current,
107
- isPhone: Bool = isPhoneIdiom
112
+ isPhone: Bool = isPhoneIdiom,
113
+ isFoldable: Bool = FoldableDevice.isFoldable(measuredIn: keyWindow)
108
114
  ) -> ScreenLayout {
109
115
  let width = size.width
110
116
  let height = size.height
117
+ let isDuoDevice = isPhone && isFoldable
111
118
  var (headerHeight, headerStatusBarHeight) = headerGeometry(topInset: insets.top, isPhone: isPhone)
112
119
  let isDuo = isPhone && isIPhoneDuoWindow(width: width, height: height, insets: insets)
113
120
  guard isDuo else {
114
121
  return ScreenLayout(
115
- width: width, height: height, isIPhoneDuo: false, insets: insets,
122
+ width: width, height: height, isIPhoneDuo: false, isDuoDevice: isDuoDevice, insets: insets,
116
123
  insetLeft: 0, insetRight: 0, contentWidth: width,
117
124
  headerHeight: headerHeight, headerStatusBarHeight: headerStatusBarHeight, sideBar: nil,
118
125
  statusBarClearance: nil
@@ -172,7 +179,7 @@ extension ScreenLayout {
172
179
  }
173
180
 
174
181
  return ScreenLayout(
175
- width: width, height: height, isIPhoneDuo: true, insets: insets,
182
+ width: width, height: height, isIPhoneDuo: true, isDuoDevice: isDuoDevice, insets: insets,
176
183
  insetLeft: insets.leading, insetRight: insets.trailing,
177
184
  contentWidth: width - insets.leading - insets.trailing,
178
185
  headerHeight: headerHeight, headerStatusBarHeight: headerStatusBarHeight, sideBar: sideBar,
@@ -251,13 +258,40 @@ extension ScreenLayout {
251
258
  }
252
259
  }
253
260
 
254
- /// Port of RN `device.ts` `isIPhoneDuo()`: UIScreen stays on the outer display, so this
255
- /// still matches when Split View narrows the window. Used by popups and overlays.
261
+ /// Snapshot for call sites without `\.screenLayout`; not reactive. `windowSize` is ignored,
262
+ /// kept for host call sites.
256
263
  public func isIPhoneDuoDevice(windowSize: CGSize? = nil) -> Bool {
257
- guard isPhoneIdiom else { return false }
258
- let screen = UIScreen.main.bounds.size
259
- let window = windowSize ?? keyWindow?.bounds.size ?? screen
260
- return max(min(screen.width, screen.height), min(window.width, window.height)) > DuoMetrics.iPhoneMaxShortSide
264
+ isPhoneIdiom && FoldableDevice.isFoldable(measuredIn: keyWindow)
265
+ }
266
+
267
+ /// Apple's foldable check (as the host's `SideTabRailView.isFoldableDevice`): only a device with a
268
+ /// hinge reports a `.division` region, inactive while flat but still there. Screen size cannot tell
269
+ /// it apart from a large iPhone in landscape or a narrowed window.
270
+ enum FoldableDevice {
271
+ // a hinge never goes away, so a positive answer is kept
272
+ private static var isKnownFoldable = false
273
+
274
+ static func isFoldable(measuredIn view: UIView?) -> Bool {
275
+ if isKnownFoldable { return true }
276
+ // compiled out on SDKs older than iOS 27.1 (UIKit 9127.0.85.28)
277
+ #if canImport(UIKit, _version: 9127.0.85.28)
278
+ guard #available(iOS 27.1, *), let view, view.window != nil || view is UIWindow else { return false }
279
+ isKnownFoldable = !view.reservedRegions(kind: .division, options: .includeInactive).isEmpty
280
+ #endif
281
+ return isKnownFoldable
282
+ }
283
+
284
+ /// Catches the hinge when the regions were read too early (before the window had them).
285
+ static func observe(in view: UIView) {
286
+ #if canImport(UIKit, _version: 9127.0.85.28)
287
+ guard #available(iOS 27.1, *) else { return }
288
+ view.addInteraction(UIHingeInteraction { _, update in
289
+ guard update.hinge != nil, !isKnownFoldable else { return }
290
+ isKnownFoldable = true
291
+ NotificationCenter.default.post(name: ReservedRegions.didChange, object: nil)
292
+ })
293
+ #endif
294
+ }
261
295
  }
262
296
 
263
297
  // MARK: - Reserved regions
@@ -282,6 +316,7 @@ private final class ReservedRegionsProbe: UIView {
282
316
  override init(frame: CGRect) {
283
317
  super.init(frame: frame)
284
318
  isUserInteractionEnabled = false
319
+ FoldableDevice.observe(in: self)
285
320
  }
286
321
 
287
322
  required init?(coder: NSCoder) { nil }
@@ -35,8 +35,6 @@ struct DuoBarCompression {
35
35
  static let defaultToolbarHeight = DuoMetrics.controlSize + Spacing.M + 2 * DuoMetrics.itemPitch
36
36
  /// Back, then the single button the toolbar folds into.
37
37
  private static let compressedToolbarHeight = 2 * DuoMetrics.controlSize + Spacing.M
38
- /// Back alone, while a rail opened from the compressed state takes the toolbar slot.
39
- private static let backOnlyHeight = DuoMetrics.controlSize
40
38
 
41
39
  /// - both fit: both stay whole
42
40
  /// - one fits whole beside the other compressed: one is compressed, tapping it swaps them
@@ -72,7 +70,8 @@ struct DuoBarCompression {
72
70
 
73
71
  let expandToolbar = { opened.wrappedValue = .toolbar }
74
72
  let expandTabBar = { opened.wrappedValue = .tabBar }
75
- if opened.wrappedValue == .tabBar && fits(backOnlyHeight, tabBar) {
73
+ // an opened rail always shows, even when only the group gap is short: it closes once a tab is picked
74
+ if opened.wrappedValue == .tabBar {
76
75
  return DuoBarCompression(
77
76
  toolbarCompressed: true,
78
77
  tabBarCompressed: false,
@@ -3,7 +3,7 @@
3
3
  // MoMoUIKits
4
4
  //
5
5
  // iPhone Duo tab bar, port of RN `BottomTab/DuoTabBar.tsx` (Figma Fold-Design-System MT1/MT2):
6
- // a glass rail in the side bar, or a floating glass bar when unfolded portrait.
6
+ // a rail in the side bar, or a floating bar when unfolded portrait.
7
7
  //
8
8
 
9
9
  import SwiftUI
@@ -16,12 +16,15 @@ private let railGap = Spacing.XXS
16
16
  // selection bubble overflows the 48 rail cell by 5 above and below (Figma MT2)
17
17
  private let railBubbleWidth: CGFloat = 44
18
18
  private let railBubbleHeight: CGFloat = 58
19
- let duoFloatingTabBarHeight: CGFloat = 62
19
+ private let floatingHeight = DuoMetrics.floatingTabBarHeight
20
20
  private let floatingPadding = Spacing.XS
21
- private let floatingQrSize: CGFloat = 44
22
- // floating bar spans 6 of the 8 portrait grid columns, like the content
23
- private let gridColumns: CGFloat = 8
24
- private let gridSpan: CGFloat = 6
21
+ // the system bar sizes its pill to the tabs instead of stretching it across the display
22
+ private let floatingItemWidth: CGFloat = 80
23
+ // while pressed the selection bubble grows into a lens past the pill's edges
24
+ private let lensScaleX: CGFloat = 1.2
25
+ private let lensScaleY: CGFloat = 1.3
26
+ // Figma Home-2026 tab bar "Selection": brand pink at 8%
27
+ private let selectionTintOpacity: Double = 0x14 / 255
25
28
  private let tabSpring = Animation.interpolatingSpring(mass: 0.8, stiffness: 220, damping: 18)
26
29
 
27
30
  /// Room tab screens leave for the Duo tab bar, provided by BottomTab to its tab StackScreens.
@@ -51,47 +54,34 @@ func duoRailHeight(itemCount: Int, hasQr: Bool, compressed: Bool = false) -> CGF
51
54
  }
52
55
 
53
56
  extension ScreenLayout {
57
+ /// Overlaps the home indicator inset like the system tab bar (21pt above the bottom with a 34pt inset).
58
+ var duoFloatingTabBarBottom: CGFloat {
59
+ max(insets.bottom - DuoMetrics.floatingTabBarInsetOverlap, Spacing.S)
60
+ }
61
+
54
62
  func duoTabBarInsets(itemCount: Int, hasFloatingButton: Bool, tabBarCompressed: Bool = false) -> DuoTabBarInsets {
55
63
  guard isIPhoneDuo else { return DuoTabBarInsets() }
56
64
  guard let sideBar else {
57
- return DuoTabBarInsets(overlay: duoFloatingTabBarHeight + Spacing.M)
65
+ // overlay is measured from the bottom safe area, the bar reaches into it
66
+ return DuoTabBarInsets(overlay: floatingHeight + duoFloatingTabBarBottom - insets.bottom)
58
67
  }
59
68
  let rail = duoRailHeight(itemCount: itemCount, hasQr: hasFloatingButton, compressed: tabBarCompressed)
60
69
  return DuoTabBarInsets(sideBarReserve: sideBar.bottom + rail + DuoBarCompression.groupGap)
61
70
  }
62
71
  }
63
72
 
64
- /// Glass on iOS 26, a system blur before it (RN GlassView's fallback).
65
- struct DuoBarMaterial<S: Shape>: ViewModifier {
73
+ /// RN `BarMaterial`: surface with a 1pt border.
74
+ struct DuoBarMaterial<S: InsettableShape>: ViewModifier {
66
75
  let shape: S
67
- var visible: Bool = true
68
-
69
- func body(content: Content) -> some View {
70
- content.background(material.allowsHitTesting(false))
71
- }
72
76
 
73
- @ViewBuilder
74
- private var material: some View {
75
- #if compiler(>=6.2)
76
- if #available(iOS 26.0, *) {
77
- // glass materializes by toggling its effect, it does not fade with opacity
78
- Color.clear
79
- .glassEffect(visible ? .regular : .identity, in: shape)
80
- .shadow(color: Color.black.opacity(visible ? 0.16 : 0), radius: 16, x: 0, y: 6)
81
- .animation(.easeInOut(duration: 0.25), value: visible)
82
- } else {
83
- blur
84
- }
85
- #else
86
- blur
87
- #endif
88
- }
77
+ @Environment(\.appTheme) private var theme
89
78
 
90
- private var blur: some View {
91
- shape.fill(.regularMaterial)
92
- .shadow(color: Color.black.opacity(0.16), radius: 16, x: 0, y: 6)
93
- .opacity(visible ? 1 : 0)
94
- .animation(.easeInOut(duration: 0.25), value: visible)
79
+ func body(content: Content) -> some View {
80
+ content.background(
81
+ shape.fill(theme.colors.background.surface)
82
+ .overlay(shape.strokeBorder(theme.colors.border.default, lineWidth: 1))
83
+ .allowsHitTesting(false)
84
+ )
95
85
  }
96
86
  }
97
87
 
@@ -126,7 +116,7 @@ private struct DuoRailTabBar: View {
126
116
  let onTabSelected: (Int) -> Void
127
117
  let compression: DuoBarCompression
128
118
 
129
- @Environment(\.appTheme) private var theme
119
+ @State private var pressedIndex: Int?
130
120
 
131
121
  private var isRight: Bool { sideBar.edge == .right }
132
122
 
@@ -157,15 +147,15 @@ private struct DuoRailTabBar: View {
157
147
  .ignoresSafeArea()
158
148
  }
159
149
 
160
- /// Glass column of tab items with the sliding selection bubble.
150
+ /// Column of icon-only tab items with the sliding selection bubble.
161
151
  private var rail: some View {
162
152
  ZStack(alignment: .top) {
163
- Capsule()
164
- .fill(theme.colors.background.selected)
153
+ DuoSelectionMaterial(lens: pressedIndex != nil)
165
154
  .frame(width: railBubbleWidth, height: railBubbleHeight)
166
155
  .offset(y: railPadding - (railBubbleHeight - itemSize) / 2
167
- + CGFloat(selectedIndex) * (itemSize + railGap))
156
+ + CGFloat(pressedIndex ?? selectedIndex) * (itemSize + railGap))
168
157
  .animation(tabSpring, value: selectedIndex)
158
+ .animation(tabSpring, value: pressedIndex)
169
159
 
170
160
  VStack(spacing: railGap) {
171
161
  ForEach(items.indices, id: \.self) { index in
@@ -177,19 +167,19 @@ private struct DuoRailTabBar: View {
177
167
  .frame(width: itemSize, height: itemSize)
178
168
  .contentShape(Rectangle())
179
169
  }
180
- .buttonStyle(.plain)
170
+ .buttonStyle(DuoLensPressStyle(index: index, pressedIndex: $pressedIndex))
181
171
  .accessibilityLabel(items[index].label)
182
172
  }
183
173
  }
184
174
  .padding(.vertical, railPadding)
185
175
  }
186
176
  .frame(width: itemSize)
187
- .modifier(DuoBarMaterial(shape: RoundedRectangle(cornerRadius: Radius.XL)))
177
+ .modifier(DuoBarMaterial(shape: Capsule()))
188
178
  .accessibilityIdentifier("bottom_tab_bar")
189
179
  }
190
180
  }
191
181
 
192
- /// Floating labelled bar for the unfolded portrait display, QR in the middle cell (Figma MT1-M).
182
+ /// Floating labelled bar for the unfolded portrait display, QR pinned in its own platter beside it.
193
183
  private struct DuoFloatingTabBar: View {
194
184
  let items: [BottomTabItem]
195
185
  let floatingButton: BottomTabFloatingButton?
@@ -198,45 +188,48 @@ private struct DuoFloatingTabBar: View {
198
188
 
199
189
  @Environment(\.screenLayout) private var layout
200
190
  @Environment(\.appTheme) private var theme
191
+ @State private var pressedIndex: Int?
201
192
 
202
193
  private var barWidth: CGFloat {
203
- let columnWidth = (layout.width - 2 * Spacing.M - (gridColumns - 1) * Spacing.M) / gridColumns
204
- return columnWidth * gridSpan + (gridSpan - 1) * Spacing.M
194
+ let margins = layout.insets.leading + layout.insets.trailing + 2 * DuoMetrics.floatingTabBarMargin
195
+ let qr = floatingButton == nil ? 0 : floatingHeight + Spacing.S
196
+ let preferred = CGFloat(items.count) * floatingItemWidth + 2 * floatingPadding
197
+ return max(min(preferred, layout.width - margins - qr), 0)
205
198
  }
206
199
 
207
- private var useQr: Bool { floatingButton != nil && items.count % 2 == 0 }
208
- private var middle: Int { items.count / 2 }
209
- private var cellCount: Int { items.count + (useQr ? 1 : 0) }
210
- private var cellWidth: CGFloat { (barWidth - floatingPadding * 2) / CGFloat(max(cellCount, 1)) }
211
- private var visualIndex: Int { useQr && selectedIndex >= middle ? selectedIndex + 1 : selectedIndex }
200
+ private var cellWidth: CGFloat { (barWidth - floatingPadding * 2) / CGFloat(max(items.count, 1)) }
212
201
 
213
202
  var body: some View {
203
+ HStack(spacing: Spacing.S) {
204
+ bar
205
+ if let floatingButton {
206
+ DuoQrButton(data: floatingButton, size: floatingHeight)
207
+ .shadow(color: Color.black.opacity(0.16), radius: 16, x: 0, y: 6)
208
+ }
209
+ }
210
+ .padding(.bottom, layout.duoFloatingTabBarBottom)
211
+ .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .bottom)
212
+ .ignoresSafeArea()
213
+ }
214
+
215
+ private var bar: some View {
214
216
  ZStack(alignment: .leading) {
215
- Capsule()
216
- .fill(theme.colors.background.selected)
217
+ DuoSelectionMaterial(lens: pressedIndex != nil)
217
218
  .frame(width: cellWidth)
218
- .offset(x: CGFloat(visualIndex) * cellWidth)
219
- .animation(tabSpring, value: visualIndex)
219
+ .offset(x: CGFloat(pressedIndex ?? selectedIndex) * cellWidth)
220
+ .animation(tabSpring, value: selectedIndex)
221
+ .animation(tabSpring, value: pressedIndex)
220
222
 
221
223
  HStack(spacing: 0) {
222
- ForEach(0..<cellCount, id: \.self) { cell in
223
- if useQr && cell == middle, let floatingButton {
224
- DuoQrButton(data: floatingButton, size: floatingQrSize)
225
- .frame(width: cellWidth)
226
- } else {
227
- let index = useQr && cell > middle ? cell - 1 : cell
228
- tabCell(index)
229
- }
224
+ ForEach(items.indices, id: \.self) { index in
225
+ tabCell(index)
230
226
  }
231
227
  }
232
228
  }
233
229
  .padding(floatingPadding)
234
- .frame(width: barWidth, height: duoFloatingTabBarHeight)
230
+ .frame(width: barWidth, height: floatingHeight)
235
231
  .modifier(DuoBarMaterial(shape: Capsule()))
236
232
  .accessibilityIdentifier("bottom_tab_bar")
237
- .padding(.bottom, layout.insets.bottom + Spacing.M)
238
- .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .bottom)
239
- .ignoresSafeArea()
240
233
  }
241
234
 
242
235
  private func tabCell(_ index: Int) -> some View {
@@ -247,20 +240,52 @@ private struct DuoFloatingTabBar: View {
247
240
  MomoText(
248
241
  items[index].label,
249
242
  typography: .labelXsMedium,
250
- color: selected ? theme.colors.primary : theme.colors.text.default,
243
+ color: selected ? theme.colors.primary : theme.colors.text.hint,
251
244
  textAlign: .center,
252
245
  maxLines: 1
253
246
  )
247
+ // like the system tab bar the label keeps its design size; a constant snapshot, nothing to observe
248
+ .environment(\.momoFontScale, FontScale(userScaleRate: 1, useOSScaleRate: false))
254
249
  }
255
250
  .frame(width: cellWidth)
256
251
  .frame(maxHeight: .infinity)
257
252
  .contentShape(Rectangle())
258
253
  }
259
- .buttonStyle(.plain)
254
+ .buttonStyle(DuoLensPressStyle(index: index, pressedIndex: $pressedIndex))
260
255
  .accessibilityLabel(items[index].label)
261
256
  }
262
257
  }
263
258
 
259
+ /// Pink tinted capsule under the selected tab; while pressed it grows into a lens (80x54 to about 96x70).
260
+ private struct DuoSelectionMaterial: View {
261
+ let lens: Bool
262
+
263
+ @Environment(\.appTheme) private var theme
264
+
265
+ var body: some View {
266
+ Capsule()
267
+ .fill(theme.colors.primary.opacity(selectionTintOpacity))
268
+ .scaleEffect(x: lens ? lensScaleX : 1, y: lens ? lensScaleY : 1)
269
+ .allowsHitTesting(false)
270
+ }
271
+ }
272
+
273
+ /// Tracks the finger so the selection lens jumps to the pressed tab before it is selected.
274
+ private struct DuoLensPressStyle: ButtonStyle {
275
+ let index: Int
276
+ @Binding var pressedIndex: Int?
277
+
278
+ func makeBody(configuration: Configuration) -> some View {
279
+ configuration.label.onChange(of: configuration.isPressed) { pressed in
280
+ if pressed {
281
+ pressedIndex = index
282
+ } else if pressedIndex == index {
283
+ pressedIndex = nil
284
+ }
285
+ }
286
+ }
287
+ }
288
+
264
289
  private struct DuoTabIcon: View {
265
290
  let item: BottomTabItem
266
291
  let selected: Bool
@@ -274,7 +299,7 @@ private struct DuoTabIcon: View {
274
299
  }
275
300
 
276
301
  var body: some View {
277
- Icon(source: item.icon, size: iconSize, color: selected ? theme.colors.primary : theme.colors.text.default)
302
+ Icon(source: item.icon, size: iconSize, color: selected ? theme.colors.primary : theme.colors.text.hint)
278
303
  .overlay(alignment: .topTrailing) {
279
304
  if let badgeLabel, !badgeLabel.isEmpty {
280
305
  Badge(label: badgeLabel).offset(x: Spacing.S, y: -Spacing.XS)
@@ -90,6 +90,27 @@ private let duoGradientExtra: CGFloat = 52
90
90
  // scroll distance over which the extended gradient collapses to the header
91
91
  private let duoExtendedCollapseDistance: CGFloat = 100
92
92
 
93
+ // scroll distance over which the bar fades in
94
+ private let duoBarFadeDistance: CGFloat = 16
95
+
96
+ /// Port of RN `DuoGlassBackground`: translucent surface with a hairline, shown once the content
97
+ /// scrolls `fadeStart` under the header.
98
+ struct DuoHeaderBar: View {
99
+ let scrollOffset: CGFloat
100
+ var fadeStart: CGFloat = 0
101
+
102
+ @Environment(\.appTheme) private var theme
103
+
104
+ var body: some View {
105
+ theme.colors.background.surface.opacity(0.8)
106
+ .overlay(alignment: .bottom) {
107
+ theme.colors.border.default.frame(height: 0.5)
108
+ }
109
+ .opacity(min(max((scrollOffset - fadeStart) / duoBarFadeDistance, 0), 1))
110
+ .allowsHitTesting(false)
111
+ }
112
+ }
113
+
93
114
  /// Port of RN `DuoScrollGradient`: with the glass header the content scrolls under the bar, so the
94
115
  /// header gradient is drawn under it. Compose draws this inside `HeaderBackground`.
95
116
  struct DuoScrollGradient: View {
@@ -114,7 +135,7 @@ struct DuoScrollGradient: View {
114
135
  let progress = min(scroll / duoExtendedCollapseDistance, 1)
115
136
  gradient
116
137
  .frame(height: headerHeight + (extended ? duoGradientExtra * (1 - progress) : 0))
117
- .opacity(1 - min(scroll / duoGradientExtra, 1))
138
+ .opacity(Double(1 - min(scroll / duoGradientExtra, 1)))
118
139
  }
119
140
  }
120
141
  .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)