@momo-kits/native-kits 0.169.15-beta.4-debug → 0.169.15-beta.5

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 (147) hide show
  1. package/ios/Navigation/BottomTab/BottomTab.swift +12 -7
  2. package/ios/Navigation/BottomTab/{LegacyBottomTabBar.swift → Legacy/LegacyBottomTabBar.swift} +54 -85
  3. package/ios/Navigation/BottomTab/Legacy/LegacyCurvedContainer.swift +63 -0
  4. package/ios/native-kits.podspec +1 -1
  5. package/ios-demo/MoMoUIKitsDemo.podspec +1 -1
  6. package/package.json +1 -1
  7. package/build.gradle.kts +0 -11
  8. package/compose/build.gradle.kts +0 -198
  9. package/compose/compose.podspec +0 -47
  10. package/compose/src/androidMain/kotlin/vn/momo/kits/const/HostFont.android.kt +0 -19
  11. package/compose/src/androidMain/kotlin/vn/momo/kits/navigation/ScrollToTop.android.kt +0 -6
  12. package/compose/src/androidMain/kotlin/vn/momo/kits/platform/BackGesture.android.kt +0 -12
  13. package/compose/src/androidMain/kotlin/vn/momo/kits/platform/OsFontScale.android.kt +0 -7
  14. package/compose/src/androidMain/kotlin/vn/momo/kits/platform/Platform.android.kt +0 -154
  15. package/compose/src/androidMain/kotlin/vn/momo/kits/platform/ReduceMotion.android.kt +0 -17
  16. package/compose/src/androidMain/kotlin/vn/momo/kits/platform/ReservedRegions.android.kt +0 -6
  17. package/compose/src/commonMain/kotlin/vn/momo/kits/application/Context.kt +0 -110
  18. package/compose/src/commonMain/kotlin/vn/momo/kits/application/DesignSystemKits.kt +0 -61
  19. package/compose/src/commonMain/kotlin/vn/momo/kits/application/LiteScreen.kt +0 -1067
  20. package/compose/src/commonMain/kotlin/vn/momo/kits/application/Localize.kt +0 -268
  21. package/compose/src/commonMain/kotlin/vn/momo/kits/application/WidgetContainer.kt +0 -56
  22. package/compose/src/commonMain/kotlin/vn/momo/kits/components/Avatar.kt +0 -157
  23. package/compose/src/commonMain/kotlin/vn/momo/kits/components/Badge.kt +0 -81
  24. package/compose/src/commonMain/kotlin/vn/momo/kits/components/BadgeDot.kt +0 -32
  25. package/compose/src/commonMain/kotlin/vn/momo/kits/components/BadgeRibbon.kt +0 -338
  26. package/compose/src/commonMain/kotlin/vn/momo/kits/components/BaselineView.kt +0 -175
  27. package/compose/src/commonMain/kotlin/vn/momo/kits/components/Button.kt +0 -354
  28. package/compose/src/commonMain/kotlin/vn/momo/kits/components/Carousel.kt +0 -115
  29. package/compose/src/commonMain/kotlin/vn/momo/kits/components/CheckBox.kt +0 -89
  30. package/compose/src/commonMain/kotlin/vn/momo/kits/components/Chip.kt +0 -130
  31. package/compose/src/commonMain/kotlin/vn/momo/kits/components/Collapse.kt +0 -209
  32. package/compose/src/commonMain/kotlin/vn/momo/kits/components/CupertinoOverscroll.kt +0 -482
  33. package/compose/src/commonMain/kotlin/vn/momo/kits/components/Divider.kt +0 -49
  34. package/compose/src/commonMain/kotlin/vn/momo/kits/components/Icon.kt +0 -86
  35. package/compose/src/commonMain/kotlin/vn/momo/kits/components/IconButton.kt +0 -125
  36. package/compose/src/commonMain/kotlin/vn/momo/kits/components/Image.kt +0 -224
  37. package/compose/src/commonMain/kotlin/vn/momo/kits/components/Information.kt +0 -137
  38. package/compose/src/commonMain/kotlin/vn/momo/kits/components/Input.kt +0 -473
  39. package/compose/src/commonMain/kotlin/vn/momo/kits/components/InputDropDown.kt +0 -113
  40. package/compose/src/commonMain/kotlin/vn/momo/kits/components/InputMoney.kt +0 -262
  41. package/compose/src/commonMain/kotlin/vn/momo/kits/components/InputOTP.kt +0 -237
  42. package/compose/src/commonMain/kotlin/vn/momo/kits/components/InputPhoneNumber.kt +0 -228
  43. package/compose/src/commonMain/kotlin/vn/momo/kits/components/InputSearch.kt +0 -280
  44. package/compose/src/commonMain/kotlin/vn/momo/kits/components/InputTextArea.kt +0 -183
  45. package/compose/src/commonMain/kotlin/vn/momo/kits/components/LazyColumnWithBouncing.kt +0 -342
  46. package/compose/src/commonMain/kotlin/vn/momo/kits/components/Loader.kt +0 -108
  47. package/compose/src/commonMain/kotlin/vn/momo/kits/components/PaginationDot.kt +0 -56
  48. package/compose/src/commonMain/kotlin/vn/momo/kits/components/PaginationNumber.kt +0 -40
  49. package/compose/src/commonMain/kotlin/vn/momo/kits/components/PaginationScroll.kt +0 -82
  50. package/compose/src/commonMain/kotlin/vn/momo/kits/components/PaginationWhiteDot.kt +0 -39
  51. package/compose/src/commonMain/kotlin/vn/momo/kits/components/PopupNotify.kt +0 -362
  52. package/compose/src/commonMain/kotlin/vn/momo/kits/components/PopupPromotion.kt +0 -108
  53. package/compose/src/commonMain/kotlin/vn/momo/kits/components/ProgressInfo.kt +0 -304
  54. package/compose/src/commonMain/kotlin/vn/momo/kits/components/Radio.kt +0 -59
  55. package/compose/src/commonMain/kotlin/vn/momo/kits/components/Rating.kt +0 -87
  56. package/compose/src/commonMain/kotlin/vn/momo/kits/components/ScaleSizeScope.kt +0 -21
  57. package/compose/src/commonMain/kotlin/vn/momo/kits/components/Skeleton.kt +0 -88
  58. package/compose/src/commonMain/kotlin/vn/momo/kits/components/Slider.kt +0 -308
  59. package/compose/src/commonMain/kotlin/vn/momo/kits/components/Stepper.kt +0 -218
  60. package/compose/src/commonMain/kotlin/vn/momo/kits/components/Steps.kt +0 -456
  61. package/compose/src/commonMain/kotlin/vn/momo/kits/components/SuggestAction.kt +0 -122
  62. package/compose/src/commonMain/kotlin/vn/momo/kits/components/Swipe.kt +0 -205
  63. package/compose/src/commonMain/kotlin/vn/momo/kits/components/Switch.kt +0 -89
  64. package/compose/src/commonMain/kotlin/vn/momo/kits/components/TabView.kt +0 -542
  65. package/compose/src/commonMain/kotlin/vn/momo/kits/components/Tag.kt +0 -86
  66. package/compose/src/commonMain/kotlin/vn/momo/kits/components/Text.kt +0 -175
  67. package/compose/src/commonMain/kotlin/vn/momo/kits/components/Title.kt +0 -201
  68. package/compose/src/commonMain/kotlin/vn/momo/kits/components/Tooltip.kt +0 -498
  69. package/compose/src/commonMain/kotlin/vn/momo/kits/components/TrustBanner.kt +0 -176
  70. package/compose/src/commonMain/kotlin/vn/momo/kits/components/Uploader.kt +0 -182
  71. package/compose/src/commonMain/kotlin/vn/momo/kits/components/datetimepicker/DateTimePicker.kt +0 -193
  72. package/compose/src/commonMain/kotlin/vn/momo/kits/components/datetimepicker/DateTimePickerTypes.kt +0 -29
  73. package/compose/src/commonMain/kotlin/vn/momo/kits/components/datetimepicker/DateTimePickerUtils.kt +0 -208
  74. package/compose/src/commonMain/kotlin/vn/momo/kits/components/datetimepicker/WheelPicker.kt +0 -180
  75. package/compose/src/commonMain/kotlin/vn/momo/kits/const/Colors.kt +0 -325
  76. package/compose/src/commonMain/kotlin/vn/momo/kits/const/HostFont.kt +0 -12
  77. package/compose/src/commonMain/kotlin/vn/momo/kits/const/Radius.kt +0 -12
  78. package/compose/src/commonMain/kotlin/vn/momo/kits/const/Spacing.kt +0 -16
  79. package/compose/src/commonMain/kotlin/vn/momo/kits/const/Theme.kt +0 -194
  80. package/compose/src/commonMain/kotlin/vn/momo/kits/const/Typography.kt +0 -291
  81. package/compose/src/commonMain/kotlin/vn/momo/kits/layout/Card.kt +0 -54
  82. package/compose/src/commonMain/kotlin/vn/momo/kits/layout/HeaderLayout.kt +0 -71
  83. package/compose/src/commonMain/kotlin/vn/momo/kits/layout/Item.kt +0 -50
  84. package/compose/src/commonMain/kotlin/vn/momo/kits/layout/ModalLayout.kt +0 -184
  85. package/compose/src/commonMain/kotlin/vn/momo/kits/layout/ScreenLayout.kt +0 -315
  86. package/compose/src/commonMain/kotlin/vn/momo/kits/layout/Section.kt +0 -41
  87. package/compose/src/commonMain/kotlin/vn/momo/kits/modifier/AutomationId.kt +0 -54
  88. package/compose/src/commonMain/kotlin/vn/momo/kits/modifier/Clickable.kt +0 -66
  89. package/compose/src/commonMain/kotlin/vn/momo/kits/modifier/Conditional.kt +0 -11
  90. package/compose/src/commonMain/kotlin/vn/momo/kits/modifier/DeprecatedModifier.kt +0 -104
  91. package/compose/src/commonMain/kotlin/vn/momo/kits/modifier/Shadow.kt +0 -48
  92. package/compose/src/commonMain/kotlin/vn/momo/kits/modifier/Size.kt +0 -51
  93. package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/BottomSheet.kt +0 -397
  94. package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/HostBackGestureBridge.kt +0 -58
  95. package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/ModalScreen.kt +0 -153
  96. package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/Navigation.kt +0 -118
  97. package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/NavigationContainer.kt +0 -206
  98. package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/Navigator.kt +0 -421
  99. package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/ScrollToTop.kt +0 -8
  100. package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/StackScreen.kt +0 -758
  101. package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/StackTransition.kt +0 -152
  102. package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/SwipeBackHaptic.kt +0 -35
  103. package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/bottomtab/BottomTab.kt +0 -261
  104. package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/bottomtab/BottomTabBar.kt +0 -406
  105. package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/bottomtab/CurvedContainer.kt +0 -111
  106. package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/bottomtab/DuoBarCompression.kt +0 -93
  107. package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/bottomtab/DuoTabBar.kt +0 -208
  108. package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/bottomtab/LegacyBottomTabBar.kt +0 -262
  109. package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/bottomtab/LegacyCurvedContainer.kt +0 -86
  110. package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/bottomtab/TabBarMetrics.kt +0 -133
  111. package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/component/FloatingButton.kt +0 -167
  112. package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/component/Header.kt +0 -446
  113. package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/component/HeaderBackground.kt +0 -105
  114. package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/component/HeaderJourney.kt +0 -106
  115. package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/component/HeaderLocation.kt +0 -74
  116. package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/component/HeaderRight.kt +0 -400
  117. package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/component/HeaderTitle.kt +0 -39
  118. package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/component/HeaderUser.kt +0 -363
  119. package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/component/SideBar.kt +0 -197
  120. package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/component/SnackBar.kt +0 -133
  121. package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/tracking/ScreenTracker.kt +0 -127
  122. package/compose/src/commonMain/kotlin/vn/momo/kits/platform/BackGesture.kt +0 -12
  123. package/compose/src/commonMain/kotlin/vn/momo/kits/platform/ComposeLottieAnimation.kt +0 -114
  124. package/compose/src/commonMain/kotlin/vn/momo/kits/platform/OsFontScale.kt +0 -7
  125. package/compose/src/commonMain/kotlin/vn/momo/kits/platform/Platform.kt +0 -76
  126. package/compose/src/commonMain/kotlin/vn/momo/kits/platform/ReduceMotion.kt +0 -7
  127. package/compose/src/commonMain/kotlin/vn/momo/kits/platform/ReservedRegions.kt +0 -21
  128. package/compose/src/commonMain/kotlin/vn/momo/kits/utils/Icons.kt +0 -1329
  129. package/compose/src/commonMain/kotlin/vn/momo/kits/utils/Resources.kt +0 -55
  130. package/compose/src/commonMain/kotlin/vn/momo/kits/utils/Tracking.kt +0 -15
  131. package/compose/src/commonMain/kotlin/vn/momo/kits/utils/Utils.kt +0 -117
  132. package/compose/src/iosMain/kotlin/vn/momo/kits/const/HostFont.ios.kt +0 -42
  133. package/compose/src/iosMain/kotlin/vn/momo/kits/navigation/HostBackGesture.ios.kt +0 -45
  134. package/compose/src/iosMain/kotlin/vn/momo/kits/navigation/ScrollToTop.ios.kt +0 -32
  135. package/compose/src/iosMain/kotlin/vn/momo/kits/platform/BackGesture.ios.kt +0 -38
  136. package/compose/src/iosMain/kotlin/vn/momo/kits/platform/OsFontScale.ios.kt +0 -65
  137. package/compose/src/iosMain/kotlin/vn/momo/kits/platform/Platform.ios.kt +0 -217
  138. package/compose/src/iosMain/kotlin/vn/momo/kits/platform/ReduceMotion.ios.kt +0 -48
  139. package/compose/src/iosMain/kotlin/vn/momo/kits/platform/ReservedRegions.ios.kt +0 -143
  140. package/gradle/libs.versions.toml +0 -67
  141. package/gradle/wrapper/gradle-wrapper.jar +0 -0
  142. package/gradle/wrapper/gradle-wrapper.properties +0 -8
  143. package/gradle.properties +0 -24
  144. package/gradlew +0 -252
  145. package/gradlew.bat +0 -94
  146. package/ios-demo/README.md +0 -120
  147. package/settings.gradle.kts +0 -64
@@ -107,13 +107,18 @@ public struct BottomTab: View {
107
107
  compression: compression
108
108
  )
109
109
  } else if isLegacyBar {
110
- LegacyBottomTabBar(
111
- items: items,
112
- floatingButton: floatingButton,
113
- selectedIndex: selectedIndex,
114
- onTabSelected: selectTab,
115
- bottomInset: bottomInset
116
- )
110
+ // Tab bar + home-indicator filler.
111
+ VStack(spacing: 0) {
112
+ LegacyBottomTabBar(
113
+ items: items,
114
+ floatingButton: floatingButton,
115
+ selectedIndex: selectedIndex,
116
+ onTabSelected: selectTab
117
+ )
118
+ theme.colors.background.surface
119
+ .frame(height: bottomInset + Spacing.S)
120
+ .ignoresSafeArea(edges: .horizontal)
121
+ }
117
122
  } else {
118
123
  BottomTabBar(
119
124
  items: items,
@@ -1,18 +1,24 @@
1
- // The pre-redesign (DS-984) phone tab bar, kept for `BottomTab(useLegacy: true)`: a full-width surface bar with a
2
- // sliding top indicator, a top shadow, badges and the notched center floating button, over a home-indicator filler.
1
+ //
2
+ // LegacyBottomTabBar.swift
3
+ // MoMoUIKits
4
+ //
5
+ // BottomTabBar.swift from main before the DS-984 redesign (5f31e0d4), verbatim except the Legacy prefix
6
+ // on its names. Used by `BottomTab(useLegacy: true)` on phones.
7
+ //
3
8
 
4
9
  import SwiftUI
5
10
 
11
+ let legacyBottomTabFloatingButtonWidth: CGFloat = 75
6
12
  let LEGACY_BOTTOM_TAB_BAR_HEIGHT: CGFloat = 64
7
- private let legacyFloatingButtonWidth: CGFloat = 75
8
13
 
9
- /// The legacy bar plus its surface filler under it, down to the window bottom.
14
+ // MARK: - Tab bar
15
+
10
16
  struct LegacyBottomTabBar: View {
11
17
  let items: [BottomTabItem]
12
18
  let floatingButton: BottomTabFloatingButton?
13
19
  let selectedIndex: Int
14
20
  let onTabSelected: (Int) -> Void
15
- let bottomInset: CGFloat
21
+ var onTabLongPress: ((Int) -> Void)?
16
22
 
17
23
  @Environment(\.screenLayout) private var layout
18
24
  @Environment(\.appTheme) private var theme
@@ -22,25 +28,18 @@ struct LegacyBottomTabBar: View {
22
28
  private var mid: Int { items.count / 2 }
23
29
 
24
30
  private var tabWidth: CGFloat {
25
- let available = floatingButton != nil ? screenWidth - legacyFloatingButtonWidth : screenWidth
26
- return available / CGFloat(max(items.count, 1))
31
+ if floatingButton != nil {
32
+ return (screenWidth - legacyBottomTabFloatingButtonWidth) / CGFloat(items.count)
33
+ }
34
+ return screenWidth / CGFloat(items.count)
27
35
  }
28
36
 
29
37
  private var indicatorOffset: CGFloat {
30
- let adjust: CGFloat = (floatingButton != nil && selectedIndex >= mid) ? legacyFloatingButtonWidth : 0
38
+ let adjust: CGFloat = (floatingButton != nil && selectedIndex >= mid) ? legacyBottomTabFloatingButtonWidth : 0
31
39
  return tabWidth * CGFloat(selectedIndex) + tabWidth / 2 - screenWidth / 2 + adjust
32
40
  }
33
41
 
34
42
  var body: some View {
35
- VStack(spacing: 0) {
36
- bar
37
- theme.colors.background.surface
38
- .frame(height: bottomInset + Spacing.S)
39
- .ignoresSafeArea(edges: .horizontal)
40
- }
41
- }
42
-
43
- private var bar: some View {
44
43
  ZStack(alignment: .bottom) {
45
44
  HStack(spacing: 0) {
46
45
  if floatingButton == nil {
@@ -48,7 +47,7 @@ struct LegacyBottomTabBar: View {
48
47
  } else {
49
48
  tabItems(from: 0, to: mid)
50
49
  Spacer()
51
- .frame(width: legacyFloatingButtonWidth)
50
+ .frame(width: legacyBottomTabFloatingButtonWidth)
52
51
  .padding(.horizontal, Spacing.XXS)
53
52
  tabItems(from: mid, to: items.count)
54
53
  }
@@ -57,16 +56,22 @@ struct LegacyBottomTabBar: View {
57
56
  .frame(height: LEGACY_BOTTOM_TAB_BAR_HEIGHT)
58
57
  .background(theme.colors.background.surface.ignoresSafeArea(edges: .horizontal))
59
58
 
59
+ // Animated selection indicator.
60
60
  RoundedRectangle(cornerRadius: 2)
61
61
  .fill(theme.colors.primary)
62
62
  .frame(width: 44, height: 2)
63
63
  .offset(x: indicatorOffset, y: -LEGACY_BOTTOM_TAB_BAR_HEIGHT + 2)
64
64
  .animation(.easeInOut(duration: 0.25), value: selectedIndex)
65
65
 
66
- LinearGradient(colors: [Color.black.opacity(0.05), .clear], startPoint: .bottom, endPoint: .top)
67
- .frame(height: 6)
68
- .frame(maxWidth: .infinity)
69
- .offset(y: -LEGACY_BOTTOM_TAB_BAR_HEIGHT)
66
+ // Top shadow.
67
+ LinearGradient(
68
+ colors: [Color.black.opacity(0.05), .clear],
69
+ startPoint: .bottom,
70
+ endPoint: .top
71
+ )
72
+ .frame(height: 6)
73
+ .frame(maxWidth: .infinity)
74
+ .offset(y: -LEGACY_BOTTOM_TAB_BAR_HEIGHT)
70
75
 
71
76
  if let floatingButton {
72
77
  LegacyCenterFloatingButton(data: floatingButton)
@@ -82,27 +87,31 @@ struct LegacyBottomTabBar: View {
82
87
  selected: index == selectedIndex,
83
88
  // from the icon's center to the cell's end edge, inside both XXS paddings
84
89
  badgeMaxWidth: tabWidth / 2 - Spacing.XXS * 2,
85
- onClick: { onTabSelected(index) }
90
+ onClick: { onTabSelected(index) },
91
+ onLongClick: onTabLongPress.map { callback in { callback(index) } }
86
92
  )
87
93
  .frame(maxWidth: .infinity)
88
94
  }
89
95
  }
90
96
  }
91
97
 
98
+ // MARK: - Tab item
99
+
92
100
  private struct LegacyTabBarItem: View {
93
101
  let item: BottomTabItem
94
102
  let selected: Bool
95
103
  let badgeMaxWidth: CGFloat
96
104
  let onClick: () -> Void
105
+ let onLongClick: (() -> Void)?
97
106
 
98
107
  @Environment(\.appTheme) private var theme
99
108
 
100
109
  private var tintColor: Color { selected ? theme.colors.primary : theme.colors.text.hint }
101
110
 
102
- /// Compose's `formatLabel`: a badge that is the number "0" is hidden.
111
+ /// Mirrors Compose's `formatLabel`: hide a badge that is the number "0".
103
112
  private var badgeLabel: String? {
104
113
  guard let label = item.badgeLabel else { return nil }
105
- if let number = Int(label), number == 0 { return nil }
114
+ if let n = Int(label), n == 0 { return nil }
106
115
  return label
107
116
  }
108
117
 
@@ -133,15 +142,31 @@ private struct LegacyTabBarItem: View {
133
142
  .truncationMode(.tail)
134
143
  }
135
144
  .frame(maxWidth: .infinity, maxHeight: .infinity)
136
- .padding(Spacing.S)
145
+ .padding(.horizontal, Spacing.S)
146
+ .padding(.vertical, Spacing.S)
137
147
  .frame(maxWidth: .infinity, maxHeight: .infinity)
138
148
  .padding(.horizontal, Spacing.XXS)
139
149
  .contentShape(Rectangle())
140
150
  .onTapGesture { onClick() }
151
+ .modifier(LegacyTabLongPress(action: onLongClick))
141
152
  }
142
153
  }
143
154
 
144
- /// The 48 primary circle in the bar's notch; `iconContent` replaces the icon, `labelContent` overlays the label.
155
+ /// Only attached with a callback, so a held tab without one still selects on release.
156
+ private struct LegacyTabLongPress: ViewModifier {
157
+ let action: (() -> Void)?
158
+
159
+ func body(content: Content) -> some View {
160
+ if let action {
161
+ content.onLongPressGesture(minimumDuration: 0.5, perform: action)
162
+ } else {
163
+ content
164
+ }
165
+ }
166
+ }
167
+
168
+ // MARK: - Center floating button
169
+
145
170
  private struct LegacyCenterFloatingButton: View {
146
171
  let data: BottomTabFloatingButton
147
172
 
@@ -153,74 +178,18 @@ private struct LegacyCenterFloatingButton: View {
153
178
  Circle()
154
179
  .fill(theme.colors.primary)
155
180
  .frame(width: 48, height: 48)
156
- .overlay(icon)
181
+ .overlay(Icon(source: data.icon, size: 28, color: .white))
157
182
  Spacer().frame(height: 4)
158
183
  MomoText(data.label, typography: .labelXsMedium, color: Colors.black01, textAlign: .center, maxLines: 1)
159
184
  .frame(maxWidth: .infinity)
160
185
  .frame(height: 14)
161
186
  .background(theme.colors.primary)
162
187
  .clipShape(RoundedRectangle(cornerRadius: Radius.XL))
163
- .overlay(data.labelContent)
164
188
  }
165
- .frame(width: legacyFloatingButtonWidth)
189
+ .frame(width: legacyBottomTabFloatingButtonWidth)
166
190
  .padding(.horizontal, Spacing.XXS)
167
191
  .padding(.vertical, Spacing.S)
168
192
  .contentShape(Rectangle())
169
193
  .onTapGesture { data.onPress() }
170
194
  }
171
-
172
- @ViewBuilder
173
- private var icon: some View {
174
- if let iconContent = data.iconContent {
175
- iconContent
176
- } else {
177
- Icon(source: data.icon, size: 28, color: .white)
178
- }
179
- }
180
- }
181
-
182
- /// Compose's legacy `CurvedContainer`: the surface notch carved into the bar's top edge behind the center button.
183
- private struct LegacyCurvedContainer: View {
184
- private let circleSize: CGFloat = 48
185
- private let iconSize: CGFloat = 28
186
- private let circleOverSize: CGFloat = 2
187
- private let width: CGFloat = 71
188
- private let height: CGFloat = 16
189
-
190
- var body: some View {
191
- let circleOverTop = circleSize - iconSize - 10 + circleOverSize
192
- LegacyCurvedShape(circleOverTop: circleOverTop, centerX: width / 2, circleOverR: circleSize / 2 + circleOverSize)
193
- .fill(Colors.black01)
194
- .frame(width: width, height: height)
195
- .offset(y: 24)
196
- .zIndex(-1)
197
- }
198
- }
199
-
200
- /// A flat bar with a smooth circular dip in the middle, sized to cradle the floating button.
201
- private struct LegacyCurvedShape: Shape {
202
- let circleOverTop: CGFloat
203
- let centerX: CGFloat
204
- let circleOverR: CGFloat
205
-
206
- func path(in rect: CGRect) -> Path {
207
- var path = Path()
208
- path.move(to: CGPoint(x: 0, y: circleOverTop))
209
- path.addLine(to: CGPoint(x: centerX - circleOverR - 40, y: circleOverTop))
210
- path.addCurve(
211
- to: CGPoint(x: centerX, y: 0),
212
- control1: CGPoint(x: centerX - circleOverR, y: circleOverTop),
213
- control2: CGPoint(x: centerX - circleOverR, y: 0)
214
- )
215
- path.addCurve(
216
- to: CGPoint(x: centerX + circleOverR + 40, y: circleOverTop),
217
- control1: CGPoint(x: centerX + circleOverR, y: 0),
218
- control2: CGPoint(x: centerX + circleOverR, y: circleOverTop)
219
- )
220
- path.addLine(to: CGPoint(x: rect.width, y: circleOverTop))
221
- path.addLine(to: CGPoint(x: rect.width, y: 60))
222
- path.addLine(to: CGPoint(x: 0, y: 60))
223
- path.closeSubpath()
224
- return path
225
- }
226
195
  }
@@ -0,0 +1,63 @@
1
+ //
2
+ // LegacyCurvedContainer.swift
3
+ // MoMoUIKits
4
+ //
5
+ // CurvedContainer.swift from main before the DS-984 redesign (5f31e0d4), verbatim except the Legacy prefix.
6
+ //
7
+
8
+ import SwiftUI
9
+
10
+ struct LegacyCurvedContainer: View {
11
+ var circleSize: CGFloat = 48
12
+ var tabBarItemIconSize: CGFloat = 28
13
+ var circleOverSize: CGFloat = 2
14
+ var width: CGFloat = 71
15
+ var height: CGFloat = 16
16
+ var color: Color = Colors.black01
17
+
18
+ var body: some View {
19
+ let circlePositionTop = circleSize - tabBarItemIconSize - 10
20
+ let circleOverTop = circlePositionTop + circleOverSize
21
+ let circleR = circleSize / 2
22
+ let circleOverR = circleR + circleOverSize
23
+ let centerX = width / 2
24
+
25
+ LegacyCurvedShape(circleOverTop: circleOverTop, centerX: centerX, circleOverR: circleOverR, width: width)
26
+ .fill(color)
27
+ .frame(width: width, height: height)
28
+ .offset(y: 24)
29
+ .zIndex(-1)
30
+ }
31
+ }
32
+
33
+ /// Mirrors Compose's `getPath`: a flat bar with a smooth circular dip in the
34
+ /// middle, sized to cradle the floating button.
35
+ private struct LegacyCurvedShape: Shape {
36
+ let circleOverTop: CGFloat
37
+ let centerX: CGFloat
38
+ let circleOverR: CGFloat
39
+ let width: CGFloat
40
+
41
+ func path(in rect: CGRect) -> Path {
42
+ var path = Path()
43
+ path.move(to: CGPoint(x: 0, y: circleOverTop))
44
+ path.addLine(to: CGPoint(x: centerX - circleOverR - 40, y: circleOverTop))
45
+
46
+ path.addCurve(
47
+ to: CGPoint(x: centerX, y: 0),
48
+ control1: CGPoint(x: centerX - circleOverR, y: circleOverTop),
49
+ control2: CGPoint(x: centerX - circleOverR, y: 0)
50
+ )
51
+ path.addCurve(
52
+ to: CGPoint(x: centerX + circleOverR + 40, y: circleOverTop),
53
+ control1: CGPoint(x: centerX + circleOverR, y: 0),
54
+ control2: CGPoint(x: centerX + circleOverR, y: circleOverTop)
55
+ )
56
+
57
+ path.addLine(to: CGPoint(x: width, y: circleOverTop))
58
+ path.addLine(to: CGPoint(x: width, y: 60))
59
+ path.addLine(to: CGPoint(x: 0, y: 60))
60
+ path.closeSubpath()
61
+ return path
62
+ }
63
+ }
@@ -1,6 +1,6 @@
1
1
  Pod::Spec.new do |s|
2
2
  s.name = 'MoMoUIKits'
3
- s.version = '0.169.15-beta.4'
3
+ s.version = '0.169.15-beta.5'
4
4
  s.summary = 'MoMoUIKits for iOS'
5
5
  s.homepage = 'https://momo.vn'
6
6
  s.license = { :type => 'MIT' }
@@ -1,6 +1,6 @@
1
1
  Pod::Spec.new do |s|
2
2
  s.name = 'MoMoUIKitsDemo'
3
- s.version = '0.169.15-beta.4'
3
+ s.version = '0.169.15-beta.5'
4
4
  s.summary = 'Demo browser for MoMoUIKits SwiftUI components'
5
5
  s.homepage = 'https://momo.vn'
6
6
  s.license = { :type => 'MIT' }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@momo-kits/native-kits",
3
- "version": "0.169.15-beta.4-debug",
3
+ "version": "0.169.15-beta.5",
4
4
  "private": false,
5
5
  "scripts": {
6
6
  "publish:local": "bash publish.sh local"
package/build.gradle.kts DELETED
@@ -1,11 +0,0 @@
1
- plugins {
2
- // this is necessary to avoid the plugins to be loaded multiple times
3
- // in each subproject's classloader
4
- alias(libs.plugins.android.application) apply false
5
- alias(libs.plugins.android.library) apply false
6
- alias(libs.plugins.compose) apply false
7
- alias(libs.plugins.kotlin.compose.compiler) apply false
8
- alias(libs.plugins.jetbrains.kotlin.multiplatform) apply false
9
- alias(libs.plugins.jetbrains.kotlin.serialization) apply false
10
- alias(libs.plugins.vanniktech.mavenPublish) apply false
11
- }
@@ -1,198 +0,0 @@
1
- // import com.vanniktech.maven.publish.JavadocJar
2
- // import com.vanniktech.maven.publish.KotlinMultiplatform
3
- import org.jetbrains.kotlin.gradle.dsl.JvmTarget
4
-
5
- plugins {
6
- alias(libs.plugins.jetbrains.kotlin.multiplatform)
7
- alias(libs.plugins.android.library)
8
- alias(libs.plugins.compose)
9
- alias(libs.plugins.kotlin.compose.compiler)
10
- // alias(libs.plugins.vanniktech.mavenPublish)
11
- id(libs.plugins.jetbrains.kotlin.cocoapods.get().pluginId)
12
- kotlin("plugin.serialization")
13
- }
14
-
15
- val gitlabName: String = findProperty("name") as String? ?: ""
16
- val gitlabRepo: String = findProperty("repo") as String? ?: ""
17
- val gitlabUrl: String = findProperty("url") as String? ?: ""
18
- val gitlabGroup: String = findProperty("group") as String? ?: ""
19
- val gitlabArtifactId: String = findProperty("artifact.id") as String? ?: ""
20
- val gitlabVersion: String = findProperty("version") as String? ?: ""
21
- val gitlabUser: String = findProperty("gitlab.user") as String? ?: ""
22
- val gitlabKey: String = findProperty("gitlab.password") as String? ?: ""
23
-
24
- kotlin {
25
- androidTarget {
26
- compilerOptions {
27
- jvmTarget.set(JvmTarget.JVM_17)
28
- }
29
- publishLibraryVariants("release")
30
- }
31
-
32
- val fwName = gitlabArtifactId
33
- val iosTargets = listOf(iosArm64(), iosSimulatorArm64())
34
- iosTargets.forEach {
35
- it.binaries.framework {
36
- baseName = fwName
37
- binaryOption("bundleId", "$gitlabGroup.$fwName")
38
- isStatic = true
39
- }
40
- }
41
-
42
- cocoapods {
43
- version = "0.169.15-beta.4-debug"
44
- summary = "IOS Shared module"
45
- homepage = "https://momo.vn"
46
- ios.deploymentTarget = "15.0"
47
-
48
- framework {
49
- baseName = fwName
50
- isStatic = true
51
- }
52
-
53
- pod("lottie-ios") {
54
- moduleName = "Lottie"
55
- version = "4.4.3"
56
- extraOpts += listOf("-compiler-option", "-fmodules")
57
- }
58
- }
59
-
60
- sourceSets {
61
- all {
62
- languageSettings.optIn("vn.momo.kits.modifier.InternalApi")
63
- }
64
- commonMain.dependencies {
65
- implementation(compose.runtime)
66
- implementation(compose.material)
67
- implementation(compose.material3)
68
- implementation(compose.components.resources)
69
- implementation(libs.compose.ui.backhandler)
70
- implementation(libs.ktor.client.core)
71
- implementation(libs.jetbrains.coroutines.core)
72
- implementation(libs.navigation.multiplatform)
73
- implementation(libs.coil.multiplatform.compose)
74
- implementation(libs.coil.multiplatform.core)
75
- implementation(libs.coil.multiplatform.network.ktor)
76
- implementation(libs.jetbrains.serialization.json)
77
- implementation(libs.kotlinx.datetime)
78
- api(libs.native.max.api)
79
- implementation(libs.compottie)
80
- implementation(libs.gif.image)
81
- }
82
- androidMain.dependencies {
83
- implementation(libs.ktor.client.okhttp)
84
- implementation(libs.airbnb.lottie)
85
- }
86
- iosMain.dependencies {
87
- implementation(libs.ktor.client.darwin)
88
- }
89
- }
90
- }
91
-
92
- android {
93
- namespace = "vn.momo.kits.kits"
94
- compileSdk = 35
95
- compileOptions {
96
- sourceCompatibility = JavaVersion.VERSION_17
97
- targetCompatibility = JavaVersion.VERSION_17
98
- }
99
- defaultConfig {
100
- minSdk = 24
101
- }
102
- }
103
-
104
- dependencies {
105
- }
106
-
107
- repositories {
108
- google {
109
- mavenContent {
110
- includeGroupAndSubgroups("androidx")
111
- includeGroupAndSubgroups("com.android")
112
- includeGroupAndSubgroups("com.google")
113
- }
114
- }
115
- mavenCentral()
116
- maven { url = uri("https://maven.pkg.jetbrains.space/public/p/compose/dev") }
117
- maven {
118
- url = uri("https://gitlab.mservice.com.vn/api/v4/projects/5400/packages/maven")
119
- credentials {username = "download_packages"; password = "gldt-bjDqLpU_sPcHDuXau2ws" }
120
- }
121
- maven {
122
- url = uri("https://artifacts.mservice.com.vn/repository/maven-momo-app/")
123
- credentials {
124
- username = "viewer"
125
- password = "viewer"
126
- }
127
- isAllowInsecureProtocol = true
128
- }
129
- }
130
-
131
- compose {
132
- resources {
133
- publicResClass = true
134
- packageOfResClass = "vn.momo.uikits.resources"
135
- generateResClass = always
136
- }
137
- }
138
-
139
- // publishing {
140
- // repositories {
141
- // maven {
142
- // name = "${gitlabRepo}Packages"
143
- // credentials {
144
- // username = gitlabUser
145
- // password = gitlabKey
146
- // }
147
- // url = uri("$gitlabUrl")
148
- // }
149
- // }
150
- // }
151
-
152
- // mavenPublishing {
153
- // configure(
154
- // KotlinMultiplatform(
155
- // javadocJar = JavadocJar.Empty(),
156
- // sourcesJar = true,
157
- // androidVariantsToPublish = listOf("release")
158
- // )
159
- // )
160
- //
161
- // repositories {
162
- // maven {
163
- // name = "${gitlabRepo}Packages"
164
- // credentials { username = gitlabUser; password = gitlabKey }
165
- // url = uri("$gitlabUrl")
166
- // }
167
- // }
168
- //
169
- // coordinates(gitlabGroup.toString(), gitlabArtifactId, gitlabVersion.toString())
170
- //
171
- // pom {
172
- // name = "$gitlabName Klib"
173
- // description = "$gitlabName"
174
- // url = "https://gitlab.mservice.com.vn"
175
- // licenses {
176
- // license {
177
- // name = "The Apache License, Version 2.0"
178
- // url = "https://www.apache.org/licenses/LICENSE-2.0.txt"
179
- // distribution = "https://www.apache.org/licenses/LICENSE-2.0.txt"
180
- // }
181
- // }
182
- // developers {
183
- // developer {
184
- // id = "kotlin-hands-on"
185
- // name = "Kotlin Developer Advocate"
186
- // url = "https://github.com/kotlin-hands-on/"
187
- // }
188
- // }
189
- // }
190
- // }
191
-
192
- // Xcode 27 rejects iOS < 15; KGP's synthetic Podfile only raises pods to 12 (KT-57741), leaving lottie-ios at 13.
193
- tasks.named("podGenIos") {
194
- doLast {
195
- val podfile = layout.buildDirectory.file("cocoapods/synthetic/ios/Podfile").get().asFile
196
- podfile.writeText(podfile.readText().replace("major < 12 ||", "major < 15 ||").replace("#{12}", "#{15}"))
197
- }
198
- }
@@ -1,47 +0,0 @@
1
- Pod::Spec.new do |spec|
2
- spec.name = 'compose'
3
- spec.version = '0.169.15-beta.4-debug'
4
- spec.homepage = 'https://momo.vn'
5
- spec.source = { :http=> ''}
6
- spec.authors = ''
7
- spec.license = ''
8
- spec.summary = 'IOS Shared module'
9
- spec.vendored_frameworks = 'build/cocoapods/framework/kits.framework'
10
- spec.libraries = 'c++'
11
- spec.ios.deployment_target = '15.0'
12
- spec.dependency 'lottie-ios', '4.4.3'
13
- if !Dir.exist?('build/cocoapods/framework/kits.framework') || Dir.empty?('build/cocoapods/framework/kits.framework')
14
- raise "
15
- Kotlin framework 'kits' doesn't exist yet, so a proper Xcode project can't be generated.
16
- 'pod install' should be executed after running ':generateDummyFramework' Gradle task:
17
- ./gradlew :compose:generateDummyFramework
18
- Alternatively, proper pod installation is performed during Gradle sync in the IDE (if Podfile location is set)"
19
- end
20
- spec.xcconfig = {
21
- 'ENABLE_USER_SCRIPT_SANDBOXING' => 'NO',
22
- }
23
- spec.pod_target_xcconfig = {
24
- 'KOTLIN_PROJECT_PATH' => ':compose',
25
- 'PRODUCT_MODULE_NAME' => 'kits',
26
- }
27
- spec.script_phases = [
28
- {
29
- :name => 'Build compose',
30
- :execution_position => :before_compile,
31
- :shell_path => '/bin/sh',
32
- :script => <<-SCRIPT
33
- if [ "YES" = "$OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED" ]; then
34
- echo "Skipping Gradle build task invocation due to OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED environment variable set to \"YES\""
35
- exit 0
36
- fi
37
- set -ev
38
- REPO_ROOT="$PODS_TARGET_SRCROOT"
39
- "$REPO_ROOT/../gradlew" -p "$REPO_ROOT" $KOTLIN_PROJECT_PATH:syncFramework \
40
- -Pkotlin.native.cocoapods.platform=$PLATFORM_NAME \
41
- -Pkotlin.native.cocoapods.archs="$ARCHS" \
42
- -Pkotlin.native.cocoapods.configuration="$CONFIGURATION"
43
- SCRIPT
44
- }
45
- ]
46
- spec.resources = ['build/compose/cocoapods/compose-resources']
47
- end
@@ -1,19 +0,0 @@
1
- package vn.momo.kits.const
2
-
3
- import androidx.compose.runtime.Composable
4
- import androidx.compose.runtime.remember
5
- import androidx.compose.ui.platform.LocalContext
6
- import androidx.compose.ui.text.font.Font
7
- import androidx.compose.ui.text.font.FontFamily
8
- import androidx.compose.ui.text.font.FontWeight
9
-
10
- @Composable
11
- internal actual fun hostFontFamily(fileName: String, weight: FontWeight): FontFamily? {
12
- val assets = LocalContext.current.applicationContext.assets
13
- return remember(fileName, weight) {
14
- val path = "fonts/$fileName"
15
- // Font(path, assetManager) only fails later at render time, so check the asset exists first.
16
- val exists = runCatching { assets.open(path).close() }.isSuccess
17
- if (exists) FontFamily(Font(path = path, assetManager = assets, weight = weight)) else null
18
- }
19
- }
@@ -1,6 +0,0 @@
1
- package vn.momo.kits.navigation
2
-
3
- import androidx.compose.runtime.Composable
4
-
5
- @Composable
6
- internal actual fun RegisterScrollToTop(callback: (() -> Unit)?) = Unit
@@ -1,12 +0,0 @@
1
- package vn.momo.kits.platform
2
-
3
- import androidx.compose.runtime.Composable
4
- import androidx.compose.runtime.State
5
- import androidx.compose.runtime.mutableStateOf
6
- import androidx.compose.runtime.remember
7
-
8
- // No passive observer at androidx.activity 1.10.x; a second callback would steal the gesture.
9
- @Composable
10
- actual fun rememberBackGestureProgress(): State<Float?> = remember { mutableStateOf(null) }
11
-
12
- actual fun reportFloatingArrowBack(shouldUse: Boolean) = Unit
@@ -1,7 +0,0 @@
1
- package vn.momo.kits.platform
2
-
3
- import androidx.compose.runtime.Composable
4
-
5
- // Android's LocalDensity.fontScale already tracks Configuration.fontScale live.
6
- @Composable
7
- actual fun ProvideOsFontScale(content: @Composable () -> Unit) = content()