@momo-kits/native-kits 0.162.2-sp.1 → 0.162.2-sp.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 (239) hide show
  1. package/.claude/settings.local.json +15 -1
  2. package/CLAUDE.md +78 -0
  3. package/build.gradle.kts +11 -0
  4. package/compose/build.gradle.kts +190 -0
  5. package/compose/build.gradle.kts.backup +190 -0
  6. package/compose/compose.podspec +47 -0
  7. package/compose/src/androidMain/kotlin/vn/momo/kits/navigation/ScrollToTop.android.kt +6 -0
  8. package/compose/src/androidMain/kotlin/vn/momo/kits/platform/OsFontScale.android.kt +7 -0
  9. package/compose/src/androidMain/kotlin/vn/momo/kits/platform/Platform.android.kt +123 -0
  10. package/compose/src/commonMain/composeResources/font/momosignature.otf +0 -0
  11. package/compose/src/commonMain/composeResources/font/momotrustdisplay.otf +0 -0
  12. package/compose/src/commonMain/composeResources/font/sfprotext_black.otf +0 -0
  13. package/compose/src/commonMain/composeResources/font/sfprotext_black.ttf +0 -0
  14. package/compose/src/commonMain/composeResources/font/sfprotext_bold.ttf +0 -0
  15. package/compose/src/commonMain/composeResources/font/sfprotext_heavy.ttf +0 -0
  16. package/compose/src/commonMain/composeResources/font/sfprotext_light.ttf +0 -0
  17. package/compose/src/commonMain/composeResources/font/sfprotext_medium.ttf +0 -0
  18. package/compose/src/commonMain/composeResources/font/sfprotext_regular.ttf +0 -0
  19. package/compose/src/commonMain/composeResources/font/sfprotext_semibold.ttf +0 -0
  20. package/compose/src/commonMain/composeResources/font/sfprotext_thin.otf +0 -0
  21. package/compose/src/commonMain/composeResources/font/sfprotext_thin.ttf +0 -0
  22. package/compose/src/commonMain/composeResources/font/sfprotext_ultralight.otf +0 -0
  23. package/compose/src/commonMain/composeResources/font/sfprotext_ultralight.ttf +0 -0
  24. package/compose/src/commonMain/kotlin/vn/momo/kits/application/AnimationSearchInput.kt +52 -0
  25. package/compose/src/commonMain/kotlin/vn/momo/kits/application/Context.kt +106 -0
  26. package/compose/src/commonMain/kotlin/vn/momo/kits/application/FloatingButton.kt +183 -0
  27. package/compose/src/commonMain/kotlin/vn/momo/kits/application/Header.kt +207 -0
  28. package/compose/src/commonMain/kotlin/vn/momo/kits/application/HeaderAnimated.kt +39 -0
  29. package/compose/src/commonMain/kotlin/vn/momo/kits/application/HeaderBackground.kt +86 -0
  30. package/compose/src/commonMain/kotlin/vn/momo/kits/application/HeaderDefault.kt +76 -0
  31. package/compose/src/commonMain/kotlin/vn/momo/kits/application/HeaderExtended.kt +76 -0
  32. package/compose/src/commonMain/kotlin/vn/momo/kits/application/HeaderRight.kt +294 -0
  33. package/compose/src/commonMain/kotlin/vn/momo/kits/application/HeaderTitle.kt +33 -0
  34. package/compose/src/commonMain/kotlin/vn/momo/kits/application/LiteScreen.kt +826 -0
  35. package/compose/src/commonMain/kotlin/vn/momo/kits/application/Localize.kt +269 -0
  36. package/compose/src/commonMain/kotlin/vn/momo/kits/application/NavigationContainer.kt +110 -0
  37. package/compose/src/commonMain/kotlin/vn/momo/kits/application/Screen.kt +378 -0
  38. package/compose/src/commonMain/kotlin/vn/momo/kits/application/WidgetContainer.kt +56 -0
  39. package/compose/src/commonMain/kotlin/vn/momo/kits/application/useHeaderSearchAnimation.kt +69 -0
  40. package/compose/src/commonMain/kotlin/vn/momo/kits/components/Avatar.kt +157 -0
  41. package/compose/src/commonMain/kotlin/vn/momo/kits/components/Badge.kt +82 -0
  42. package/compose/src/commonMain/kotlin/vn/momo/kits/components/BadgeDot.kt +32 -0
  43. package/compose/src/commonMain/kotlin/vn/momo/kits/components/BadgeRibbon.kt +338 -0
  44. package/compose/src/commonMain/kotlin/vn/momo/kits/components/BaselineView.kt +175 -0
  45. package/compose/src/commonMain/kotlin/vn/momo/kits/components/Button.kt +356 -0
  46. package/compose/src/commonMain/kotlin/vn/momo/kits/components/Carousel.kt +113 -0
  47. package/compose/src/commonMain/kotlin/vn/momo/kits/components/CheckBox.kt +89 -0
  48. package/compose/src/commonMain/kotlin/vn/momo/kits/components/Chip.kt +128 -0
  49. package/compose/src/commonMain/kotlin/vn/momo/kits/components/Collapse.kt +209 -0
  50. package/compose/src/commonMain/kotlin/vn/momo/kits/components/CupertinoOverscroll.kt +543 -0
  51. package/compose/src/commonMain/kotlin/vn/momo/kits/components/Divider.kt +23 -0
  52. package/compose/src/commonMain/kotlin/vn/momo/kits/components/Icon.kt +76 -0
  53. package/compose/src/commonMain/kotlin/vn/momo/kits/components/IconButton.kt +125 -0
  54. package/compose/src/commonMain/kotlin/vn/momo/kits/components/Image.kt +231 -0
  55. package/compose/src/commonMain/kotlin/vn/momo/kits/components/Information.kt +112 -0
  56. package/compose/src/commonMain/kotlin/vn/momo/kits/components/Input.kt +477 -0
  57. package/compose/src/commonMain/kotlin/vn/momo/kits/components/InputDropDown.kt +114 -0
  58. package/compose/src/commonMain/kotlin/vn/momo/kits/components/InputMoney.kt +214 -0
  59. package/compose/src/commonMain/kotlin/vn/momo/kits/components/InputOTP.kt +240 -0
  60. package/compose/src/commonMain/kotlin/vn/momo/kits/components/InputPhoneNumber.kt +216 -0
  61. package/compose/src/commonMain/kotlin/vn/momo/kits/components/InputSearch.kt +259 -0
  62. package/compose/src/commonMain/kotlin/vn/momo/kits/components/InputTextArea.kt +182 -0
  63. package/compose/src/commonMain/kotlin/vn/momo/kits/components/LazyColumnWithBouncing.kt +343 -0
  64. package/compose/src/commonMain/kotlin/vn/momo/kits/components/Loader.kt +108 -0
  65. package/compose/src/commonMain/kotlin/vn/momo/kits/components/PaginationDot.kt +56 -0
  66. package/compose/src/commonMain/kotlin/vn/momo/kits/components/PaginationNumber.kt +41 -0
  67. package/compose/src/commonMain/kotlin/vn/momo/kits/components/PaginationScroll.kt +84 -0
  68. package/compose/src/commonMain/kotlin/vn/momo/kits/components/PaginationWhiteDot.kt +40 -0
  69. package/compose/src/commonMain/kotlin/vn/momo/kits/components/PopupNotify.kt +328 -0
  70. package/compose/src/commonMain/kotlin/vn/momo/kits/components/PopupPromotion.kt +97 -0
  71. package/compose/src/commonMain/kotlin/vn/momo/kits/components/ProgressInfo.kt +310 -0
  72. package/compose/src/commonMain/kotlin/vn/momo/kits/components/Radio.kt +59 -0
  73. package/compose/src/commonMain/kotlin/vn/momo/kits/components/Rating.kt +87 -0
  74. package/compose/src/commonMain/kotlin/vn/momo/kits/components/ScaleSizeScope.kt +21 -0
  75. package/compose/src/commonMain/kotlin/vn/momo/kits/components/Skeleton.kt +90 -0
  76. package/compose/src/commonMain/kotlin/vn/momo/kits/components/Slider.kt +323 -0
  77. package/compose/src/commonMain/kotlin/vn/momo/kits/components/Stepper.kt +217 -0
  78. package/compose/src/commonMain/kotlin/vn/momo/kits/components/Steps.kt +473 -0
  79. package/compose/src/commonMain/kotlin/vn/momo/kits/components/SuggestAction.kt +122 -0
  80. package/compose/src/commonMain/kotlin/vn/momo/kits/components/Swipe.kt +199 -0
  81. package/compose/src/commonMain/kotlin/vn/momo/kits/components/Switch.kt +91 -0
  82. package/compose/src/commonMain/kotlin/vn/momo/kits/components/TabView.kt +470 -0
  83. package/compose/src/commonMain/kotlin/vn/momo/kits/components/Tag.kt +88 -0
  84. package/compose/src/commonMain/kotlin/vn/momo/kits/components/Text.kt +131 -0
  85. package/compose/src/commonMain/kotlin/vn/momo/kits/components/Title.kt +203 -0
  86. package/compose/src/commonMain/kotlin/vn/momo/kits/components/Tooltip.kt +498 -0
  87. package/compose/src/commonMain/kotlin/vn/momo/kits/components/TrustBanner.kt +175 -0
  88. package/compose/src/commonMain/kotlin/vn/momo/kits/components/Uploader.kt +182 -0
  89. package/compose/src/commonMain/kotlin/vn/momo/kits/components/datetimepicker/DateTimePicker.kt +193 -0
  90. package/compose/src/commonMain/kotlin/vn/momo/kits/components/datetimepicker/DateTimePickerTypes.kt +29 -0
  91. package/compose/src/commonMain/kotlin/vn/momo/kits/components/datetimepicker/DateTimePickerUtils.kt +234 -0
  92. package/compose/src/commonMain/kotlin/vn/momo/kits/components/datetimepicker/WheelPicker.kt +188 -0
  93. package/compose/src/commonMain/kotlin/vn/momo/kits/const/Colors.kt +306 -0
  94. package/compose/src/commonMain/kotlin/vn/momo/kits/const/KitFontScale.kt +22 -0
  95. package/compose/src/commonMain/kotlin/vn/momo/kits/const/Radius.kt +12 -0
  96. package/compose/src/commonMain/kotlin/vn/momo/kits/const/Spacing.kt +16 -0
  97. package/compose/src/commonMain/kotlin/vn/momo/kits/const/Theme.kt +188 -0
  98. package/compose/src/commonMain/kotlin/vn/momo/kits/const/Typography.kt +276 -0
  99. package/compose/src/commonMain/kotlin/vn/momo/kits/layout/Card.kt +2 -0
  100. package/compose/src/commonMain/kotlin/vn/momo/kits/layout/Item.kt +35 -0
  101. package/compose/src/commonMain/kotlin/vn/momo/kits/layout/Section.kt +2 -0
  102. package/compose/src/commonMain/kotlin/vn/momo/kits/modifier/AutomationId.kt +52 -0
  103. package/compose/src/commonMain/kotlin/vn/momo/kits/modifier/Clickable.kt +66 -0
  104. package/compose/src/commonMain/kotlin/vn/momo/kits/modifier/Conditional.kt +11 -0
  105. package/compose/src/commonMain/kotlin/vn/momo/kits/modifier/DeprecatedModifier.kt +104 -0
  106. package/compose/src/commonMain/kotlin/vn/momo/kits/modifier/Shadow.kt +48 -0
  107. package/compose/src/commonMain/kotlin/vn/momo/kits/modifier/Size.kt +51 -0
  108. package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/BottomSheet.kt +253 -0
  109. package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/ModalScreen.kt +129 -0
  110. package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/Navigation.kt +100 -0
  111. package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/NavigationContainer.kt +172 -0
  112. package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/Navigator.kt +360 -0
  113. package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/ScrollToTop.kt +8 -0
  114. package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/StackScreen.kt +581 -0
  115. package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/bottomtab/BottomTab.kt +156 -0
  116. package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/bottomtab/BottomTabBar.kt +225 -0
  117. package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/bottomtab/CurvedContainer.kt +86 -0
  118. package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/component/FloatingButton.kt +169 -0
  119. package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/component/Header.kt +320 -0
  120. package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/component/HeaderBackground.kt +81 -0
  121. package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/component/HeaderRight.kt +309 -0
  122. package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/component/HeaderTitle.kt +34 -0
  123. package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/component/HeaderUser.kt +360 -0
  124. package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/component/SnackBar.kt +132 -0
  125. package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/tracking/ScreenTracker.kt +128 -0
  126. package/compose/src/commonMain/kotlin/vn/momo/kits/platform/ComposeLottieAnimation.kt +70 -0
  127. package/compose/src/commonMain/kotlin/vn/momo/kits/platform/OsFontScale.kt +9 -0
  128. package/compose/src/commonMain/kotlin/vn/momo/kits/platform/Platform.kt +58 -0
  129. package/compose/src/commonMain/kotlin/vn/momo/kits/utils/Icons.kt +1329 -0
  130. package/compose/src/commonMain/kotlin/vn/momo/kits/utils/Resources.kt +55 -0
  131. package/compose/src/commonMain/kotlin/vn/momo/kits/utils/Tracking.kt +15 -0
  132. package/compose/src/commonMain/kotlin/vn/momo/kits/utils/Utils.kt +105 -0
  133. package/compose/src/iosMain/kotlin/vn/momo/kits/navigation/ScrollToTop.ios.kt +32 -0
  134. package/compose/src/iosMain/kotlin/vn/momo/kits/platform/OsFontScale.ios.kt +66 -0
  135. package/compose/src/iosMain/kotlin/vn/momo/kits/platform/Platform.ios.kt +184 -0
  136. package/gradle/libs.versions.toml +69 -0
  137. package/gradle/wrapper/gradle-wrapper.jar +0 -0
  138. package/gradle/wrapper/gradle-wrapper.properties +8 -0
  139. package/gradle.properties +26 -0
  140. package/gradlew +252 -0
  141. package/gradlew.bat +94 -0
  142. package/ios/Application/ApplicationEnvironment.swift +15 -2
  143. package/ios/Application/Components.swift +16 -0
  144. package/ios/Application/HeaderRight.swift +79 -45
  145. package/ios/Application/Localize.swift +277 -0
  146. package/ios/Application/MaxApi.swift +18 -0
  147. package/ios/Application/Navigation/BottomTab/BottomTab.swift +3 -1
  148. package/ios/Application/Navigation/NavigationContainer.swift +53 -4
  149. package/ios/Application/Navigation/Navigator.swift +54 -29
  150. package/ios/Application/Navigation/Overplay/BottomSheet.swift +98 -18
  151. package/ios/Application/Navigation/Overplay/ModalScreen.swift +6 -0
  152. package/ios/Application/Navigation/Tracking/ScreenTracker.swift +117 -0
  153. package/ios/Application/Screen.swift +2 -1
  154. package/ios/Application/StackScreen.swift +55 -3
  155. package/ios/Badge/BadgeRibbon.swift +80 -0
  156. package/ios/Button/Button.swift +67 -11
  157. package/ios/Carousel/Carousel.swift +16 -1
  158. package/ios/Checkbox/Checkbox.swift +14 -20
  159. package/ios/Chip/Chip.swift +35 -26
  160. package/ios/Collapse/Collapse.swift +11 -1
  161. package/ios/Colors+Radius+Spacing/Colors.swift +20 -17
  162. package/ios/Colors+Radius+Spacing/Spacing.swift +3 -1
  163. package/ios/Colors+Radius+Spacing/Theme.swift +15 -15
  164. package/ios/DateTimePicker/DateTimePicker.swift +4 -2
  165. package/ios/DateTimePicker/WheelPicker.swift +7 -3
  166. package/ios/Extensions/ActiveOpacityButtonStyle.swift +14 -0
  167. package/ios/Extensions/Color++.swift +32 -0
  168. package/ios/Icon/Icon.swift +5 -1
  169. package/ios/IconButton/IconButton.swift +35 -7
  170. package/ios/Image/Image.swift +16 -3
  171. package/ios/Information/Information.swift +3 -1
  172. package/ios/Input/ErrorView.swift +3 -1
  173. package/ios/Input/Input.swift +31 -8
  174. package/ios/Input/InputPhoneNumber.swift +14 -3
  175. package/ios/Input/InputSearch.swift +7 -1
  176. package/ios/Input/InputTextArea.swift +78 -34
  177. package/ios/InputDropDown/InputDropDown.swift +4 -1
  178. package/ios/InputMoney/InputMoney.swift +16 -4
  179. package/ios/Popup/PopupDisplay.swift +3 -4
  180. package/ios/Popup/PopupNotify.swift +3 -4
  181. package/ios/ProgressInfo/ProgressInfo.swift +4 -2
  182. package/ios/Radio/Radio.swift +12 -13
  183. package/ios/Rating/Rating.swift +1 -1
  184. package/ios/Resources/MoMoUIKitsColors.xcassets/AccentColor.colorset/Contents.json +11 -0
  185. package/ios/Resources/MoMoUIKitsColors.xcassets/Background.colorset/Contents.json +38 -0
  186. package/ios/Resources/MoMoUIKitsColors.xcassets/Border.colorset/Contents.json +38 -0
  187. package/ios/Resources/MoMoUIKitsColors.xcassets/Card.colorset/Contents.json +38 -0
  188. package/ios/Resources/MoMoUIKitsColors.xcassets/Contents.json +6 -0
  189. package/ios/Resources/MoMoUIKitsColors.xcassets/Error.colorset/Contents.json +38 -0
  190. package/ios/Resources/MoMoUIKitsColors.xcassets/Primary.colorset/Contents.json +38 -0
  191. package/ios/Resources/MoMoUIKitsColors.xcassets/PrimaryDark.colorset/Contents.json +38 -0
  192. package/ios/Resources/MoMoUIKitsColors.xcassets/PrimaryLight.colorset/Contents.json +38 -0
  193. package/ios/Resources/MoMoUIKitsColors.xcassets/Secondary.colorset/Contents.json +38 -0
  194. package/ios/Resources/MoMoUIKitsColors.xcassets/Success.colorset/Contents.json +38 -0
  195. package/ios/Resources/MoMoUIKitsColors.xcassets/Text.colorset/Contents.json +38 -0
  196. package/ios/Resources/MoMoUIKitsColors.xcassets/TextSecondary.colorset/Contents.json +38 -0
  197. package/ios/Resources/MoMoUIKitsColors.xcassets/ThemeColors/Contents.json +9 -0
  198. package/ios/Resources/MoMoUIKitsColors.xcassets/ThemeColors/background-default.colorset/Contents.json +38 -0
  199. package/ios/Resources/MoMoUIKitsColors.xcassets/ThemeColors/background-disable.colorset/Contents.json +38 -0
  200. package/ios/Resources/MoMoUIKitsColors.xcassets/ThemeColors/background-pressed.colorset/Contents.json +38 -0
  201. package/ios/Resources/MoMoUIKitsColors.xcassets/ThemeColors/background-selected.colorset/Contents.json +38 -0
  202. package/ios/Resources/MoMoUIKitsColors.xcassets/ThemeColors/background-surface.colorset/Contents.json +38 -0
  203. package/ios/Resources/MoMoUIKitsColors.xcassets/ThemeColors/background-tonal.colorset/Contents.json +38 -0
  204. package/ios/Resources/MoMoUIKitsColors.xcassets/ThemeColors/border-default.colorset/Contents.json +38 -0
  205. package/ios/Resources/MoMoUIKitsColors.xcassets/ThemeColors/border-disable.colorset/Contents.json +38 -0
  206. package/ios/Resources/MoMoUIKitsColors.xcassets/ThemeColors/gradient.colorset/Contents.json +38 -0
  207. package/ios/Resources/MoMoUIKitsColors.xcassets/ThemeColors/primary.colorset/Contents.json +38 -0
  208. package/ios/Resources/MoMoUIKitsColors.xcassets/ThemeColors/secondary.colorset/Contents.json +38 -0
  209. package/ios/Resources/MoMoUIKitsColors.xcassets/ThemeColors/success-container.colorset/Contents.json +38 -0
  210. package/ios/Resources/MoMoUIKitsColors.xcassets/ThemeColors/success-primary.colorset/Contents.json +38 -0
  211. package/ios/Resources/MoMoUIKitsColors.xcassets/ThemeColors/success-secondary.colorset/Contents.json +38 -0
  212. package/ios/Resources/MoMoUIKitsColors.xcassets/ThemeColors/text-default.colorset/Contents.json +38 -0
  213. package/ios/Resources/MoMoUIKitsColors.xcassets/ThemeColors/text-disable.colorset/Contents.json +38 -0
  214. package/ios/Resources/MoMoUIKitsColors.xcassets/ThemeColors/text-hint.colorset/Contents.json +38 -0
  215. package/ios/Resources/MoMoUIKitsColors.xcassets/ThemeColors/text-secondary.colorset/Contents.json +38 -0
  216. package/ios/Resources/MoMoUIKitsColors.xcassets/Warning.colorset/Contents.json +38 -0
  217. package/ios/Stepper/Stepper.swift +2 -2
  218. package/ios/Steps/Steps.swift +22 -6
  219. package/ios/SuggestAction/SuggestAction.swift +5 -3
  220. package/ios/Swipeable/SwipeCell.swift +5 -3
  221. package/ios/Switch/Switch.swift +53 -28
  222. package/ios/TabView/TabView.swift +18 -14
  223. package/ios/Template/TrustBanner/TrustBanner.swift +6 -7
  224. package/ios/Tooltip/Tooltip.swift +3 -0
  225. package/ios/Typography/FontScaleStore.swift +19 -0
  226. package/ios/Typography/Text.swift +3 -0
  227. package/ios/Typography/Typography.swift +8 -5
  228. package/ios/Uploader/Uploader.swift +0 -9
  229. package/ios/native-kits.podspec +6 -3
  230. package/ios-demo/MoMoUIKitsDemo.podspec +5 -3
  231. package/ios-demo/README.md +120 -0
  232. package/ios-demo/Sources/MoMoUIKitsDemo/MoMoUIKitsDemoFactory.swift +9 -57
  233. package/ios-demo/Sources/MoMoUIKitsDemo/SampleDemos/Home.swift +21 -3
  234. package/ios-demo/Sources/MoMoUIKitsDemo/SampleDemos/LocalizeDemo.swift +188 -0
  235. package/ios-demo/Sources/MoMoUIKitsDemo/SampleDemos/NavigationDemo.swift +2 -0
  236. package/ios-demo/Sources/MoMoUIKitsDemo/SwiftUIDemoBrowserView.swift +5 -4
  237. package/local.properties +8 -0
  238. package/package.json +1 -1
  239. package/settings.gradle.kts +64 -0
@@ -0,0 +1,277 @@
1
+ //
2
+ // Localize.swift
3
+ // MoMoUIKits
4
+ //
5
+ // SwiftUI mirror of Compose's `application/Localize.kt`, itself a port of
6
+ // momo-kits React Native's `Application/Localize.ts`. Holds the merged
7
+ // dictionary (kit defaults + host overrides) and the active language,
8
+ // switched at runtime via `changeLanguage`. `Localize` is an `ObservableObject`
9
+ // so a language switch republishes to consumers of `translate`/`translateData`,
10
+ // mirroring Compose's snapshot-state-backed `language`.
11
+ //
12
+
13
+ import Foundation
14
+
15
+ /// Translation dictionary keyed by language; both `vi` and `en` are required.
16
+ public struct LocalizationObject {
17
+ public var vi: [String: String]
18
+ public var en: [String: String]
19
+
20
+ public init(vi: [String: String] = [:], en: [String: String] = [:]) {
21
+ self.vi = vi
22
+ self.en = en
23
+ }
24
+ }
25
+
26
+ public final class Localize: ObservableObject {
27
+ public static let VI = "vi"
28
+ public static let EN = "en"
29
+
30
+ private var assets: LocalizationObject
31
+ @Published public private(set) var currentLanguage: String = Localize.VI
32
+
33
+ public init(_ translations: LocalizationObject = LocalizationObject()) {
34
+ self.assets = Localize.merge(base: Localize.defaultLanguage, override: translations)
35
+ }
36
+
37
+ public func changeLanguage(_ language: String?) {
38
+ currentLanguage = (language == Localize.EN) ? Localize.EN : Localize.VI
39
+ }
40
+
41
+ public func translate(_ key: String) -> String {
42
+ let dictionary = currentLanguage == Localize.EN ? assets.en : assets.vi
43
+ if let value = dictionary[key], !value.isEmpty { return value }
44
+ return key
45
+ }
46
+
47
+ public func translateData(_ data: [String: String]) -> String {
48
+ if let value = data[currentLanguage] { return value }
49
+ let body = data.map { "\"\($0.key)\":\"\($0.value)\"" }.joined(separator: ",")
50
+ return "{\(body)}"
51
+ }
52
+
53
+ public func translateData(vi: String, en: String) -> String {
54
+ currentLanguage == Localize.EN ? en : vi
55
+ }
56
+
57
+ /// Existing keys win (mirrors Compose: `merge(translations, assets)`).
58
+ public func addTranslations(_ translations: LocalizationObject) {
59
+ assets = Localize.merge(base: translations, override: assets)
60
+ }
61
+
62
+ private static func merge(base: LocalizationObject, override: LocalizationObject) -> LocalizationObject {
63
+ LocalizationObject(
64
+ vi: base.vi.merging(override.vi) { _, new in new },
65
+ en: base.en.merging(override.en) { _, new in new }
66
+ )
67
+ }
68
+
69
+ private static let defaultLanguage = LocalizationObject(
70
+ vi: [
71
+ "errorCode": "Mã lỗi: ",
72
+ "seeMore": "Xem thêm",
73
+ "cancel": "Huỷ",
74
+ "done": "Xong",
75
+ "confirm": "Xác nhận",
76
+ "month": "tháng",
77
+ "day": "ngày",
78
+ "choose": "Chọn",
79
+ "sent": "Đã gửi",
80
+ "received": "Đã tiếp nhận",
81
+ "processing": "Đang xử lý",
82
+ "processed": "Đã xử lý",
83
+ "addImg": "Thêm hình",
84
+ "chooseBtn": "Chọn button",
85
+ "imgEg": "Hình ảnh tham khảo",
86
+ "filter": "Sắp xếp",
87
+ "shipping": "Đang giao hàng",
88
+ "men": "Nam",
89
+ "women": "Nữ",
90
+ "more": "Khác",
91
+ "expDate": "Ngày hết hạn",
92
+ "exp": "HSD",
93
+ "inActive": "Chưa kích hoạt",
94
+ "voucherRemindHour": "Hết hạn sau {hours} giờ",
95
+ "voucherRemindMinute": "Hết hạn sau {minutes} phút",
96
+ "voucherRemindSecond": "Hết hạn sau {seconds} giây",
97
+ "voucherRemindDay": "Hết hạn sau {days} ngày",
98
+ "chooseRoundtrip": "Chọn vé khứ hồi",
99
+ "depart": "Ngày đi",
100
+ "return": "Ngày về",
101
+ "departing": "Đi",
102
+ "returning": "Về",
103
+ "jan": "Tháng 1",
104
+ "feb": "Tháng 2",
105
+ "mar": "Tháng 3",
106
+ "apr": "Tháng 4",
107
+ "may": "Tháng 5",
108
+ "jun": "Tháng 6",
109
+ "jul": "Tháng 7",
110
+ "aug": "Tháng 8",
111
+ "sep": "Tháng 9",
112
+ "oct": "Tháng 10",
113
+ "nov": "Tháng 11",
114
+ "dec": "Tháng 12",
115
+ "mon": "T2",
116
+ "tue": "T3",
117
+ "wed": "T4",
118
+ "thu": "T5",
119
+ "fri": "T6",
120
+ "sat": "T7",
121
+ "sun": "CN",
122
+ "showLunar": "Hiển thị lịch âm",
123
+ "newYear": "Tết Dương lịch",
124
+ "valentine": "Ngày Lễ Tình nhân",
125
+ "womenDay": "Ngày Quốc tế Phụ nữ",
126
+ "liberationDay": "Ngày giải phóng Miền Nam thống nhất đất nước",
127
+ "laborDay": "Ngày Quốc tế Lao động",
128
+ "childrenDay": "Ngày Quốc tế Thiếu nhi",
129
+ "nationalDay": "Quốc khánh nước CHXHCN Việt Nam",
130
+ "womenDayVN": "Ngày Phụ nữ Việt Nam",
131
+ "teacherDay": "Ngày Nhà giáo Việt Nam",
132
+ "christmasEve": "Ngày Lễ Giáng Sinh",
133
+ "christmas": "Ngày Lễ Giáng Sinh",
134
+ "lunarNewYear": "Tết Nguyên Đán",
135
+ "hungKingDay": "Giỗ Tổ Hùng Vương",
136
+ "balance": "Số dư trong ví",
137
+ "chooseDate": "Chọn ngày tháng năm",
138
+ "year": "năm",
139
+ "hour": "giờ",
140
+ "minute": "phút",
141
+ "from": "Từ",
142
+ "to": "Đến",
143
+ "connected": "Đã kết nối",
144
+ "disconnected": "Mất kết nối",
145
+ "hide": "Ẩn",
146
+ "viewAllTitle": "Xem tất cả",
147
+ "headerTitle": "Lịch sử thanh toán",
148
+ "SHORTEN": "THU GỌN",
149
+ "viewMoreBank": "XEM THÊM (${otherItemCount} ngân hàng)",
150
+ "transaction_success": "Thành công",
151
+ "transaction_fail": "Thất bại",
152
+ "transaction_processing": "Đang xử lý",
153
+ "viewMore": "Xem thêm",
154
+ "shorten": "Thu gọn",
155
+ "Payment": "Thanh toán ${serviceName}",
156
+ "currencyUnit": "đ",
157
+ "Month": "Tháng",
158
+ "save": "Lưu",
159
+ "favoriteIn": "Thêm dịch vụ yêu thích",
160
+ "favoriteOut": "Xóa dịch vụ yêu thích",
161
+ "deviceIn": "Thêm vào thiết bị",
162
+ "setting": "Cài đặt",
163
+ "transaction": "Lịch sử giao dịch",
164
+ "share": "Chia sẽ dịch vụ",
165
+ "information": "Thông tin chung",
166
+ "tutorial": "Hướng dẫn sử dụng",
167
+ "question": "Câu hỏi thường gặp",
168
+ "support": "Trung tâm hỗ trợ",
169
+ "skip": "Bỏ qua",
170
+ "enterPhoneNumber": "Vui lòng nhập số điện thoại",
171
+ "invalidPhoneNumber": "Số điện thoại không đúng",
172
+ ],
173
+ en: [
174
+ "seeMore": "See more",
175
+ "cancel": "Cancel",
176
+ "done": "Done",
177
+ "confirm": "Confirm",
178
+ "month": "month",
179
+ "day": "day",
180
+ "choose": "Choose",
181
+ "sent": "Sent",
182
+ "received": "Received",
183
+ "processing": "Processing",
184
+ "processed": "Done",
185
+ "addImg": "Add image",
186
+ "chooseBtn": "Choose button",
187
+ "imgEg": "Example images",
188
+ "filter": "Filter",
189
+ "shipping": "Shipping",
190
+ "men": "Men",
191
+ "women": "Women",
192
+ "more": "More",
193
+ "expDate": "Expiration date",
194
+ "exp": "EXP",
195
+ "inActive": "Not Activated",
196
+ "voucherRemindHour": "Revoke after {hours} hours",
197
+ "voucherRemindMinute": "Revoke after {minutes} minutes",
198
+ "voucherRemindSecond": "Revoke after {seconds} seconds",
199
+ "voucherRemindDay": "Revoke after {days} days",
200
+ "chooseRoundtrip": "Choose roundtrip ticket",
201
+ "depart": "Departing",
202
+ "return": "Returning",
203
+ "departing": "De",
204
+ "returning": "Re",
205
+ "jan": "January",
206
+ "feb": "February",
207
+ "mar": "March",
208
+ "apr": "April",
209
+ "may": "May",
210
+ "jun": "June",
211
+ "jul": "July",
212
+ "aug": "August",
213
+ "sep": "September",
214
+ "oct": "October",
215
+ "nov": "November",
216
+ "dec": "December",
217
+ "mon": "Mon",
218
+ "tue": "Tue",
219
+ "wed": "Wed",
220
+ "thu": "Thu",
221
+ "fri": "Fri",
222
+ "sat": "Sat",
223
+ "sun": "Sun",
224
+ "showLunar": "Show Lunar Calendar",
225
+ "newYear": "New Year's Day",
226
+ "valentine": "Valentine's Day",
227
+ "womenDay": "International Women's Day",
228
+ "liberationDay": "Liberation Day",
229
+ "laborDay": "Internation Labor's Day",
230
+ "childrenDay": "International Labor's Day",
231
+ "nationalDay": "National Day",
232
+ "womenDayVN": "Vietnamese Women's Day",
233
+ "teacherDay": "Teacher's Day",
234
+ "christmasEve": "Christmas Eve",
235
+ "christmas": "Christmas Day",
236
+ "lunarNewYear": "Lunar New Year",
237
+ "hungKingDay": "Hung Kings' Festival",
238
+ "balance": "Wallet Balance",
239
+ "chooseDate": "Choose date",
240
+ "year": "year",
241
+ "hour": "hour",
242
+ "minute": "minute",
243
+ "from": "From",
244
+ "to": "To",
245
+ "connected": "Connected",
246
+ "disconnected": "Disconnected",
247
+ "hide": "Hide",
248
+ "viewAllTitle": "View all",
249
+ "headerTitle": "Transaction history",
250
+ "SHORTEN": "SHORTEN",
251
+ "viewMoreBank": "VIEW MORE (${otherItemCount} banks)",
252
+ "transaction_success": "Success",
253
+ "transaction_fail": "Fail",
254
+ "transaction_processing": "Processing",
255
+ "viewMore": "View more",
256
+ "shorten": "Shorten",
257
+ "Payment": "${serviceName} payment",
258
+ "currencyUnit": "VND",
259
+ "Month": "Month",
260
+ "save": "Save",
261
+ "favoriteIn": "Add to favorite services",
262
+ "favoriteOut": "Remove to favorite services",
263
+ "deviceIn": "Add to device",
264
+ "setting": "Settings",
265
+ "transaction": "Transaction History",
266
+ "share": "Share",
267
+ "information": "Information",
268
+ "tutorial": "Instruction",
269
+ "question": "FAQ",
270
+ "support": "Support center",
271
+ "errorCode": "Error code: ",
272
+ "skip": "Skip",
273
+ "enterPhoneNumber": "Please enter your phone number",
274
+ "invalidPhoneNumber": "Invalid phone number",
275
+ ]
276
+ )
277
+ }
@@ -0,0 +1,18 @@
1
+ //
2
+ // MaxApi.swift
3
+ // MoMoUIKits
4
+ //
5
+ // Swift mirror of the host-app bridge exposed on Kotlin as `vn.momo.maxapi.IMaxApi`
6
+ // (`LocalMaxApi`). `IMaxApi` itself is an external compiled dependency with no
7
+ // source in this repo, so this protocol intentionally exposes only the methods
8
+ // this kit's Kotlin source actually calls (`track`, `dismiss`, `getLanguage`) —
9
+ // not a full guess at IMaxApi's real surface.
10
+ //
11
+
12
+ import Foundation
13
+
14
+ public protocol MaxApi {
15
+ func track(eventName: String, params: [String: Any?])
16
+ func dismiss(completion: (() -> Void)?)
17
+ func getLanguage(callback: @escaping ([String: Any?]?) -> Void)
18
+ }
@@ -56,6 +56,7 @@ public struct BottomTab: View {
56
56
  }
57
57
  .frame(maxWidth: .infinity, maxHeight: .infinity)
58
58
  .ignoresSafeArea(edges: .bottom)
59
+ .preference(key: IsBottomTabRootKey.self, value: true)
59
60
  }
60
61
 
61
62
  @ViewBuilder
@@ -96,7 +97,8 @@ public struct BottomTab: View {
96
97
  /// Bottom safe-area inset (home indicator).
97
98
  @available(iOS 16.0, *)
98
99
  private func safeAreaBottomInset() -> CGFloat {
99
- UIApplication.shared.connectedScenes
100
+ let bottomInset = UIApplication.shared.connectedScenes
100
101
  .compactMap { ($0 as? UIWindowScene)?.keyWindow?.safeAreaInsets.bottom }
101
102
  .first ?? 0
103
+ return min(bottomInset, 21)
102
104
  }
@@ -13,21 +13,42 @@ import SwiftUI
13
13
  @available(iOS 16.0, *)
14
14
  public struct NavigationContainer<Initial: View>: View {
15
15
  @StateObject private var navigator: Navigator
16
+ @StateObject private var applicationEnvironment: ApplicationEnvironment
17
+ @StateObject private var localize: Localize
16
18
 
17
19
  private let setNavigator: ((Navigator) -> Void)?
20
+ private let composeApi: KitComposeApi?
21
+ private let maxApi: MaxApi?
18
22
 
19
23
  public init(
20
24
  initialScreenName: String = "",
21
25
  @ViewBuilder initialScreen: @escaping () -> Initial,
22
26
  options: NavigationOptions? = nil,
27
+ applicationContext: MiniAppContext? = nil,
28
+ composeApi: KitComposeApi? = nil,
29
+ config: KitConfig? = nil,
30
+ maxApi: MaxApi? = nil,
31
+ localize: Localize? = nil,
23
32
  setNavigator: ((Navigator) -> Void)? = nil
24
33
  ) {
25
34
  let nav = Navigator(
26
35
  initialScreenName: initialScreenName.isEmpty ? (options?.screenName ?? "") : initialScreenName,
27
36
  initialContent: { AnyView(initialScreen()) },
28
- options: options
37
+ options: options,
38
+ composeApi: composeApi
29
39
  )
30
40
  _navigator = StateObject(wrappedValue: nav)
41
+ _applicationEnvironment = StateObject(
42
+ wrappedValue: ApplicationEnvironment(
43
+ applicationContext: applicationContext,
44
+ composeApi: composeApi,
45
+ config: config,
46
+ maxApi: maxApi
47
+ )
48
+ )
49
+ _localize = StateObject(wrappedValue: localize ?? Localize())
50
+ self.composeApi = composeApi
51
+ self.maxApi = maxApi
31
52
  self.setNavigator = setNavigator
32
53
  }
33
54
 
@@ -39,22 +60,43 @@ public struct NavigationContainer<Initial: View>: View {
39
60
  }
40
61
  }
41
62
  .environmentObject(navigator)
63
+ .environmentObject(applicationEnvironment)
64
+ .environment(\.applicationEnvironment, applicationEnvironment)
65
+ .environmentObject(localize)
42
66
  .fullScreenCover(item: $navigator.presented) { route in
43
67
  screenView(forDialog: route)
44
68
  .environmentObject(navigator)
69
+ .environmentObject(applicationEnvironment)
70
+ .environment(\.applicationEnvironment, applicationEnvironment)
71
+ .environmentObject(localize)
45
72
  }
46
73
  .overlay {
47
74
  if let item = navigator.overplay {
48
75
  OverplayHost(item: item)
49
76
  .environmentObject(navigator)
77
+ .environmentObject(applicationEnvironment)
78
+ .environment(\.applicationEnvironment, applicationEnvironment)
79
+ .environmentObject(localize)
80
+ }
81
+ }
82
+ .onAppear {
83
+ if navigator.composeApi == nil {
84
+ navigator.composeApi = composeApi
85
+ }
86
+ setNavigator?(navigator)
87
+ // Mirrors Compose's LaunchedEffect(maxApi, resolvedLocalize): host-reported
88
+ // language wins over the default "vi" only when it resolves to English.
89
+ maxApi?.getLanguage { data in
90
+ if parseLanguage(data) == Localize.EN {
91
+ localize.changeLanguage(Localize.EN)
92
+ }
50
93
  }
51
94
  }
52
- .onAppear { setNavigator?(navigator) }
53
95
  }
54
96
 
55
97
  @ViewBuilder
56
98
  private func screenView(for route: DynamicScreenRoute) -> some View {
57
- if let screen = DynamicScreenRegistry.shared.getScreen(id: route.id) {
99
+ if let screen = navigator.registry.getScreen(id: route.id) {
58
100
  ScreenHost(screen: screen, navigator: navigator)
59
101
  .navigationBarBackButtonHidden(true)
60
102
  } else {
@@ -64,7 +106,7 @@ public struct NavigationContainer<Initial: View>: View {
64
106
 
65
107
  @ViewBuilder
66
108
  private func screenView(forDialog route: DynamicDialogRoute) -> some View {
67
- if let screen = DynamicScreenRegistry.shared.getScreen(id: route.id) {
109
+ if let screen = navigator.registry.getScreen(id: route.id) {
68
110
  ScreenHost(screen: screen, navigator: navigator)
69
111
  } else {
70
112
  EmptyView()
@@ -103,6 +145,7 @@ private struct ScreenHost: View {
103
145
  layoutOffset: options.layoutOffset,
104
146
  inputSearchProps: options.inputSearchProps,
105
147
  fabProps: options.fabProps,
148
+ screenName: screen.name,
106
149
  content: { screen.content() }
107
150
  )
108
151
  }
@@ -149,3 +192,9 @@ private func safeAreaBottomInset() -> CGFloat {
149
192
  .compactMap { ($0 as? UIWindowScene)?.keyWindow?.safeAreaInsets.bottom }
150
193
  .first ?? 0
151
194
  }
195
+
196
+ private func parseLanguage(_ raw: [String: Any?]?) -> String? {
197
+ guard let response = (raw?["response"] as? String)?.trimmingCharacters(in: .whitespaces).lowercased(),
198
+ !response.isEmpty else { return nil }
199
+ return response.hasPrefix(Localize.EN) ? Localize.EN : Localize.VI
200
+ }
@@ -30,12 +30,10 @@ public struct DynamicScreen {
30
30
  }
31
31
 
32
32
  public final class DynamicScreenRegistry {
33
- public static let shared = DynamicScreenRegistry()
34
-
35
33
  private var screens: [Int: DynamicScreen] = [:]
36
34
  private var idCounter: Int = 1
37
35
 
38
- private init() {}
36
+ public init() {}
39
37
 
40
38
  @discardableResult
41
39
  public func register(
@@ -95,6 +93,11 @@ public final class Navigator: ObservableObject {
95
93
  @Published public var presented: DynamicDialogRoute?
96
94
  @Published public var overplay: OverplayItem?
97
95
 
96
+ /// Owned per-Navigator (mirrors Compose's `remember { DynamicScreenRegistry() }` +
97
+ /// disposal): screens registered by this navigator are released via ARC when the
98
+ /// navigator itself deallocates, instead of accumulating in a process-wide singleton.
99
+ public let registry = DynamicScreenRegistry()
100
+
98
101
  /// Animated-close handler registered by the active overplay component
99
102
  /// (mirrors Compose's `OverplayComponentRegistry.bindClose`). When set, a
100
103
  /// dismiss request runs the component's exit animation before the item is
@@ -102,13 +105,16 @@ public final class Navigator: ObservableObject {
102
105
  private var overplayDismissHandler: (() -> Void)?
103
106
 
104
107
  public private(set) var rootRoute: DynamicScreenRoute
108
+ public var composeApi: KitComposeApi?
105
109
 
106
110
  public init(
107
111
  initialScreenName: String = "",
108
112
  initialContent: @escaping () -> AnyView,
109
- options: NavigationOptions? = nil
113
+ options: NavigationOptions? = nil,
114
+ composeApi: KitComposeApi? = nil
110
115
  ) {
111
- self.rootRoute = DynamicScreenRegistry.shared.register(
116
+ self.composeApi = composeApi
117
+ self.rootRoute = registry.register(
112
118
  screenName: initialScreenName,
113
119
  content: initialContent,
114
120
  options: options
@@ -118,7 +124,7 @@ public final class Navigator: ObservableObject {
118
124
  // MARK: Stack
119
125
 
120
126
  public func push<V: View>(@ViewBuilder _ content: @escaping () -> V, options: NavigationOptions? = nil) {
121
- let route = DynamicScreenRegistry.shared.register(
127
+ let route = registry.register(
122
128
  screenName: options?.screenName ?? "",
123
129
  content: { AnyView(content()) },
124
130
  options: options
@@ -131,7 +137,7 @@ public final class Navigator: ObservableObject {
131
137
  @ViewBuilder _ content: @escaping () -> V,
132
138
  options: NavigationOptions? = nil
133
139
  ) {
134
- let route = DynamicScreenRegistry.shared.register(
140
+ let route = registry.register(
135
141
  screenName: screenName,
136
142
  content: { AnyView(content()) },
137
143
  options: options
@@ -142,7 +148,7 @@ public final class Navigator: ObservableObject {
142
148
  public func replace<V: View>(@ViewBuilder _ content: @escaping () -> V, options: NavigationOptions? = nil) {
143
149
  guard !path.isEmpty else { return }
144
150
  let removed = path.removeLast()
145
- DynamicScreenRegistry.shared.unregister(id: removed.id)
151
+ registry.unregister(id: removed.id)
146
152
  push(content, options: options)
147
153
  }
148
154
 
@@ -153,15 +159,15 @@ public final class Navigator: ObservableObject {
153
159
  ) {
154
160
  guard !path.isEmpty else { return }
155
161
  let removed = path.removeLast()
156
- DynamicScreenRegistry.shared.unregister(id: removed.id)
162
+ registry.unregister(id: removed.id)
157
163
  push(screenName: screenName, content, options: options)
158
164
  }
159
165
 
160
166
  public func reset<V: View>(@ViewBuilder _ content: @escaping () -> V, options: NavigationOptions? = nil) {
161
- for route in path { DynamicScreenRegistry.shared.unregister(id: route.id) }
162
- DynamicScreenRegistry.shared.unregister(id: rootRoute.id)
167
+ for route in path { registry.unregister(id: route.id) }
168
+ registry.unregister(id: rootRoute.id)
163
169
  path.removeAll()
164
- let route = DynamicScreenRegistry.shared.register(
170
+ let route = registry.register(
165
171
  screenName: options?.screenName ?? "",
166
172
  content: { AnyView(content()) },
167
173
  options: options
@@ -174,10 +180,10 @@ public final class Navigator: ObservableObject {
174
180
  @ViewBuilder _ content: @escaping () -> V,
175
181
  options: NavigationOptions? = nil
176
182
  ) {
177
- for route in path { DynamicScreenRegistry.shared.unregister(id: route.id) }
178
- DynamicScreenRegistry.shared.unregister(id: rootRoute.id)
183
+ for route in path { registry.unregister(id: route.id) }
184
+ registry.unregister(id: rootRoute.id)
179
185
  path.removeAll()
180
- let route = DynamicScreenRegistry.shared.register(
186
+ let route = registry.register(
181
187
  screenName: screenName,
182
188
  content: { AnyView(content()) },
183
189
  options: options
@@ -188,16 +194,16 @@ public final class Navigator: ObservableObject {
188
194
  public func pop(_ count: Int = 1, callback: (() -> Void)? = nil) {
189
195
  var remaining = count
190
196
  while remaining > 0 {
191
- if overplay != nil {
197
+ if overplay?.type == .snackBar {
198
+ // Mirrors Kotlin: a snackbar doesn't block back-navigation, so popping
199
+ // while one is showing pops the screen underneath and clears the
200
+ // snackbar immediately, without playing its dismiss animation.
201
+ overplayDismissHandler = nil
202
+ overplay = nil
203
+ if !popScreen() { break }
204
+ } else if overplay != nil {
192
205
  hideOverplay()
193
- } else if presented != nil {
194
- let dismissedId = presented?.id
195
- presented = nil
196
- if let id = dismissedId { DynamicScreenRegistry.shared.unregister(id: id) }
197
- } else if !path.isEmpty {
198
- let removed = path.removeLast()
199
- DynamicScreenRegistry.shared.unregister(id: removed.id)
200
- } else {
206
+ } else if !popScreen() {
201
207
  break
202
208
  }
203
209
  remaining -= 1
@@ -205,13 +211,32 @@ public final class Navigator: ObservableObject {
205
211
  callback?()
206
212
  }
207
213
 
214
+ /// Pops the topmost presented screen or stack entry. Returns `false` (and requests
215
+ /// a host dismiss) when there is nothing left to pop.
216
+ @discardableResult
217
+ private func popScreen() -> Bool {
218
+ if presented != nil {
219
+ let dismissedId = presented?.id
220
+ presented = nil
221
+ if let id = dismissedId { registry.unregister(id: id) }
222
+ return true
223
+ } else if !path.isEmpty {
224
+ let removed = path.removeLast()
225
+ registry.unregister(id: removed.id)
226
+ return true
227
+ } else {
228
+ composeApi?.requestCallback(funcName: "dismiss", params: nil, onResponse: nil)
229
+ return false
230
+ }
231
+ }
232
+
208
233
  public func popToRoot() {
209
- for route in path { DynamicScreenRegistry.shared.unregister(id: route.id) }
234
+ for route in path { registry.unregister(id: route.id) }
210
235
  path.removeAll()
211
236
  }
212
237
 
213
238
  public func onBackSafe(callback: (() -> Void)? = nil) {
214
- let latest = DynamicScreenRegistry.shared.latest()
239
+ let latest = registry.latest()
215
240
  if let onBack = latest?.options?.onBackHandler {
216
241
  onBack()
217
242
  return
@@ -252,7 +277,7 @@ public final class Navigator: ObservableObject {
252
277
  // MARK: Modal-style screen (vertical slide)
253
278
 
254
279
  public func present<V: View>(@ViewBuilder _ content: @escaping () -> V, options: NavigationOptions? = nil) {
255
- let route = DynamicScreenRegistry.shared.register(
280
+ let route = registry.register(
256
281
  screenName: options?.screenName ?? "",
257
282
  content: { AnyView(content()) },
258
283
  options: options
@@ -265,7 +290,7 @@ public final class Navigator: ObservableObject {
265
290
  @ViewBuilder _ content: @escaping () -> V,
266
291
  options: NavigationOptions? = nil
267
292
  ) {
268
- let route = DynamicScreenRegistry.shared.register(
293
+ let route = registry.register(
269
294
  screenName: screenName,
270
295
  content: { AnyView(content()) },
271
296
  options: options
@@ -275,7 +300,7 @@ public final class Navigator: ObservableObject {
275
300
 
276
301
  public func dismiss() {
277
302
  if let id = presented?.id {
278
- DynamicScreenRegistry.shared.unregister(id: id)
303
+ registry.unregister(id: id)
279
304
  }
280
305
  presented = nil
281
306
  }