@momo-kits/native-kits 0.168.1-beta.4-debug → 0.168.1-beta.40-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.
- package/CLAUDE.md +15 -10
- package/README.md +2 -10
- package/build.gradle.kts +1 -3
- package/compose/build.gradle.kts +20 -19
- package/compose/build.gradle.kts.backup +19 -18
- package/compose/compose.podspec +1 -1
- package/compose/src/androidMain/kotlin/vn/momo/kits/const/HostFont.android.kt +4 -3
- package/compose/src/androidMain/kotlin/vn/momo/kits/platform/Platform.android.kt +3 -2
- package/compose/src/androidMain/kotlin/vn/momo/kits/platform/ReduceMotion.android.kt +17 -0
- package/compose/src/androidMain/kotlin/vn/momo/kits/platform/ReservedRegions.android.kt +1 -1
- package/compose/src/commonMain/kotlin/vn/momo/kits/application/Context.kt +0 -14
- package/compose/src/commonMain/kotlin/vn/momo/kits/application/DesignSystemKits.kt +62 -0
- package/compose/src/commonMain/kotlin/vn/momo/kits/application/WidgetContainer.kt +14 -23
- package/compose/src/commonMain/kotlin/vn/momo/kits/components/Information.kt +21 -15
- package/compose/src/commonMain/kotlin/vn/momo/kits/components/PopupNotify.kt +84 -82
- package/compose/src/commonMain/kotlin/vn/momo/kits/components/PopupPromotion.kt +3 -3
- package/compose/src/commonMain/kotlin/vn/momo/kits/const/HostFont.kt +2 -1
- package/compose/src/commonMain/kotlin/vn/momo/kits/const/Typography.kt +18 -14
- package/compose/src/commonMain/kotlin/vn/momo/kits/layout/ModalLayout.kt +187 -0
- package/compose/src/commonMain/kotlin/vn/momo/kits/layout/ScreenLayout.kt +20 -13
- package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/BottomSheet.kt +117 -62
- package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/ModalScreen.kt +22 -6
- package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/Navigation.kt +4 -7
- package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/NavigationContainer.kt +16 -26
- package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/Navigator.kt +54 -36
- package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/StackScreen.kt +18 -11
- package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/SwipeBackHaptic.kt +1 -6
- package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/bottomtab/BottomTab.kt +35 -29
- package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/bottomtab/BottomTabBar.kt +321 -149
- package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/bottomtab/CurvedContainer.kt +79 -71
- package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/bottomtab/DuoBarCompression.kt +2 -3
- package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/bottomtab/DuoTabBar.kt +89 -198
- package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/bottomtab/TabBarMetrics.kt +104 -0
- package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/component/Header.kt +1 -1
- package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/component/HeaderBackground.kt +3 -1
- package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/component/HeaderRight.kt +30 -44
- package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/component/HeaderTitle.kt +2 -2
- package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/tracking/ScreenTracker.kt +32 -40
- package/compose/src/commonMain/kotlin/vn/momo/kits/platform/ComposeLottieAnimation.kt +3 -2
- package/compose/src/commonMain/kotlin/vn/momo/kits/platform/Platform.kt +3 -1
- package/compose/src/commonMain/kotlin/vn/momo/kits/platform/ReduceMotion.kt +7 -0
- package/compose/src/commonMain/kotlin/vn/momo/kits/platform/ReservedRegions.kt +12 -3
- package/compose/src/iosMain/kotlin/vn/momo/kits/const/HostFont.ios.kt +3 -1
- package/compose/src/iosMain/kotlin/vn/momo/kits/navigation/ScrollToTop.ios.kt +2 -6
- package/compose/src/iosMain/kotlin/vn/momo/kits/platform/Platform.ios.kt +12 -10
- package/compose/src/iosMain/kotlin/vn/momo/kits/platform/ReduceMotion.ios.kt +48 -0
- package/compose/src/iosMain/kotlin/vn/momo/kits/platform/ReservedRegions.ios.kt +60 -10
- package/gradle/libs.versions.toml +4 -11
- package/gradle/wrapper/gradle-wrapper.properties +1 -3
- package/gradle.properties +3 -3
- package/ios/Application/ApplicationEnvironment.swift +7 -6
- package/ios/Application/DesignSystemKits.swift +163 -0
- package/ios/Application/DesignSystemKitsPayload.swift +68 -0
- package/ios/Badge/BadgeRibbon.swift +8 -1
- package/ios/Extensions/Color++.swift +2 -4
- package/ios/Input/Input.swift +16 -4
- package/ios/Input/InputPhoneNumber.swift +1 -3
- package/ios/Input/InputSearch.swift +1 -2
- package/ios/Input/InputTextArea.swift +8 -4
- package/ios/InputMoney/InputMoney.swift +6 -7
- package/ios/Layout/ModalLayout.swift +152 -0
- package/ios/Layout/ScreenLayout.swift +77 -18
- package/ios/Navigation/BottomSheet.swift +56 -53
- package/ios/Navigation/BottomTab/BottomTab.swift +46 -52
- package/ios/Navigation/BottomTab/BottomTabBar.swift +281 -115
- package/ios/Navigation/BottomTab/CurvedContainer.swift +51 -47
- package/ios/Navigation/BottomTab/DuoBarCompression.swift +2 -3
- package/ios/Navigation/BottomTab/DuoTabBar.swift +64 -172
- package/ios/Navigation/BottomTab/TabBarMetrics.swift +84 -0
- package/ios/Navigation/Component/HeaderBackground.swift +22 -1
- package/ios/Navigation/Component/HeaderRight.swift +1 -1
- package/ios/Navigation/Component/SnackBar.swift +4 -0
- package/ios/Navigation/ModalScreen.swift +20 -5
- package/ios/Navigation/StackScreen.swift +6 -8
- package/ios/Popup/PopupDisplay.swift +6 -4
- package/ios/Popup/PopupInput.swift +6 -4
- package/ios/Popup/PopupLayout.swift +17 -11
- package/ios/Popup/PopupNotify.swift +32 -25
- package/ios/Stepper/Stepper.swift +1 -2
- package/ios/Template/TrustBanner/TrustBanner.swift +4 -2
- package/ios/Typography/FontScale.swift +29 -15
- package/ios/Typography/Text.swift +88 -14
- package/ios/Typography/Typography.swift +2 -2
- package/ios/native-kits.podspec +1 -1
- package/ios-demo/MoMoUIKitsDemo.podspec +1 -1
- package/ios-demo/Resources/tabbar_scan_qr_button.json +1 -0
- package/ios-demo/Resources/tabbar_scan_qr_label.json +1 -0
- package/ios-demo/Sources/MoMoUIKitsDemo/SampleDemos/BottomTabDemo.swift +272 -59
- package/ios-demo/Sources/MoMoUIKitsDemo/SampleDemos/NavigationDemo.swift +103 -0
- package/ios-demo/Sources/MoMoUIKitsDemo/SampleDemos/PopupNotifyDemo.swift +29 -1
- package/package.json +1 -1
- package/publish.sh +2 -33
- package/compose/src/commonMain/kotlin/vn/momo/kits/const/KitDesignSystem.kt +0 -18
- package/compose/src/commonMain/kotlin/vn/momo/kits/const/KitFontScale.kt +0 -22
- package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/component/HelpCenterRequest.kt +0 -37
- package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/component/ToolkitRequests.kt +0 -41
- package/compose/src/commonTest/kotlin/vn/momo/kits/navigation/component/HelpCenterRequestTest.kt +0 -44
- package/compose/src/commonTest/kotlin/vn/momo/kits/navigation/component/ToolkitRequestsTest.kt +0 -62
- package/ios/Typography/FontScaleStore.swift +0 -58
- package/ios/Typography/KitDesignSystem.swift +0 -17
package/CLAUDE.md
CHANGED
|
@@ -7,7 +7,7 @@ Guidance for working in this repo. Keep it accurate — update it when structure
|
|
|
7
7
|
`momo-native-kits` — MoMo's design-system / UI-kit as a **Kotlin Multiplatform + Compose Multiplatform** library, published for Android (AAR/Maven) and iOS (static framework + CocoaPods). It is the Compose port of the React Native `momo-kits`. Consumed by mini-apps embedded in the host MoMo app.
|
|
8
8
|
|
|
9
9
|
- Artifact: `vn.momo.kits:kits` (version in `gradle.properties`). NPM mirror: `@momo-kits/native-kits`.
|
|
10
|
-
- Targets:
|
|
10
|
+
- Targets: `androidTarget` (JVM 17, compile/min/target SDK 36/24/36), `iosArm64`, `iosSimulatorArm64` (framework `baseName = "kits"`, `isStatic = true`).
|
|
11
11
|
- Kotlin 2.3.10, Compose MP 1.10.3.
|
|
12
12
|
|
|
13
13
|
## Modules
|
|
@@ -26,11 +26,11 @@ Guidance for working in this repo. Keep it accurate — update it when structure
|
|
|
26
26
|
|
|
27
27
|
## Build & verify
|
|
28
28
|
|
|
29
|
-
|
|
29
|
+
No unit-test suite is configured. Validate changes by compiling the relevant target(s); use the sample app for visual checks.
|
|
30
30
|
|
|
31
31
|
```bash
|
|
32
32
|
./gradlew :compose:compileCommonMainKotlinMetadata # validate commonMain (fast, do this first)
|
|
33
|
-
./gradlew :compose:
|
|
33
|
+
./gradlew :compose:compileDebugKotlinAndroid # Android target
|
|
34
34
|
./gradlew :compose:linkDebugFrameworkIosSimulatorArm64 # iOS framework (slow)
|
|
35
35
|
./gradlew :sample:androidApp:installDebug # run demo on device/emulator
|
|
36
36
|
```
|
|
@@ -48,9 +48,11 @@ Publishing is automated (`publish.sh` + GitLab CI on `[ci build]` / `main`). Do
|
|
|
48
48
|
|
|
49
49
|
- **Entry point:** wrap content in `NavigationContainer(...)` from `navigation/`. It builds the `Navigator`, takes a host-supplied `Localize` (falls back to an empty one), and provides the CompositionLocals below. The legacy `Screen` / `ApplicationContainer` / `ComposeApi` stack has been removed on both sides — don't reintroduce it.
|
|
50
50
|
- **Configuration flows via CompositionLocals**, not params. Public ones: `AppTheme`, `AppStatusBar`, `AppNavigationBar` (`const/Theme.kt`); `ApplicationContext`, `AppConfig`, `AppLanguage`, `LocalLocalize` (`application/`); `LocalNavigator`, `LocalMaxApi` (`navigation/`). Read with `X.current`.
|
|
51
|
-
-
|
|
51
|
+
- **`DesignSystemKits`** (`application/DesignSystemKits.kt`) is the single app-wide holder for the host-owned design-system inputs: font scale (`userScaleRate` / `useOSScaleRate`), whitelist (`isWhiteList`) and the remote `DesignSystemConfig`, bundled as `DesignSystemKitsConfigs`. The host calls `DesignSystemKits.init(source)` once at startup with its `DesignSystemKitsSource` (sync `getConfigs()` seed + `configsFlow`); `init` is idempotent. Without a source, call `setConfigs(...)` directly. Read with `getConfigs()` (snapshot state, recomposes); non-Compose observers use `configsFlow`.
|
|
52
|
+
- **SwiftUI twin:** `ios/Application/DesignSystemKits.swift` mirrors it field for field (`DesignSystemKitsConfigs` with `designSystemConfig: KitConfig?`, `setConfigs` / `getConfigs`), plus the OS Dynamic Type factor (`osFontScale`). There is no `init(source:)` (Swift reserves `init`): the host observes its own bridge and pushes. A host that can't share Swift types (the KMP bridge) calls `DesignSystemKits.shared.setConfigs(json:)` (`ios/Application/DesignSystemKitsPayload.swift`); the JSON field names are a contract with momo-app's serializer (`HostDesignSystemKits.observeConfigsJson`, payload classes in `DesignSystemData.kt`) — change both together. Invalid JSON is ignored. The SwiftUI kit can't link the Kotlin `kits` framework (a second Kotlin/Native runtime would hold a second, never-initialized singleton), so the render-time logic — `FontScale` formula, Dynamic Type observation — is intentionally duplicated in Swift; only values flow across.
|
|
53
|
+
- **Design-system config** (`trustBanner`, `headerBar`, `headerGradient`): `NavigationContainer` provides it as `LocalDesignSystemConfig` (param `designSystemConfig` → parent → `DesignSystemKits`) and applies `headerBar` as the header image when the theme has none.
|
|
52
54
|
- **Platform code** goes through `expect`/`actual` in `platform/` — never reference Android/iOS APIs from `commonMain` directly.
|
|
53
|
-
- **Native bridge:**
|
|
55
|
+
- **Native bridge:** `IMaxApi` (`vn.momo.maxapi`, exposed as `LocalMaxApi`) is the host-app bridge (dismiss, tracking, device info, language).
|
|
54
56
|
- Navigation uses a runtime `DynamicScreenRegistry`; overlays (modal/bottom-sheet/snackbar) go through `Navigator` + `OverplayComponentRegistry`.
|
|
55
57
|
- **iOS swipe-back:** the host owns the only edge-pan recogniser and replays it through `HostBackGestureBridge` (`navigation/HostBackGestureBridge.kt`; the kit framework is never exported, so the host reaches it through its own Koin-provided facade): `checkCanPop` / `canPopInner` / `pop` route the back into the kit stack, `started` / `progressed` / `completed` / `cancelled` seek the NavHost transition, `shouldUseFloatingArrowBack` is set by bottom tabs. `NavigationContainer` attaches itself automatically (`AttachHostBackGesture`, iOS only, detached by identity on dispose) — hosts need no wrapper and no `setNavigator`. `maxApi` is a required parameter of `NavigationContainer` — every container, nested or root, is handed its host bridge explicitly.
|
|
56
58
|
|
|
@@ -69,17 +71,20 @@ Publishing is automated (`publish.sh` + GitLab CI on `[ci build]` / `main`). Do
|
|
|
69
71
|
## Screen layout / iPhone Duo (port of RN `useScreenLayout`, momo-kits !664)
|
|
70
72
|
|
|
71
73
|
- `layout/ScreenLayout.kt`: `getScreenLayout()` returns window size, raw top/bottom + side insets, `contentWidth`, header geometry, the iPhone Duo `sideBar` and `duoTopInset`. `NavigationContainer` computes it once and provides `LocalScreenLayout`; reactive to fold/unfold and rotation (window size + `WindowInsets`). Metrics (`DuoMetrics`, 72pt iPhone header floor, 20pt status-bar threshold) mirror RN `Layout/utils.ts` — change both together.
|
|
72
|
-
- iPhone-only: everything gates on `isPhoneIdiom()` (`platform/`), never on "iOS", so iPad windows keep the regular layout. Two detectors, as in RN: `isIPhoneDuo` (window aspect < 1.6 or asymmetric side insets) drives layout; `isIPhoneDuoDevice` (
|
|
74
|
+
- iPhone-only: everything gates on `isPhoneIdiom()` (`platform/`), never on "iOS", so iPad windows keep the regular layout. Two detectors, as in RN: `isIPhoneDuo` (window aspect < 1.6 or asymmetric side insets) drives layout; `isIPhoneDuoDevice` (Apple's foldable check: a `.division` reserved region, queried with include-inactive; Swift also latches on `UIHingeInteraction`; or asymmetric side insets, since the outer display reports no hinge) drives popups, modal and bottom sheet.
|
|
73
75
|
- Header height is `headerHeight` (not `AppStatusBar + HEADER_HEIGHT`); the bar row is `headerBarHeight` and starts `headerStatusBarHeight` below the window top. When the status bar is off the top edge (iPhone landscape, iPhone Duo) `headerStatusBarHeight` is 0 so the title stays centered — except on the Duo outer display: in portrait the header is 76pt and the row starts at 14pt so the title centers on the camera punchout; in landscape the row centers on the camera when it sits at the top end of the strip (else on the back button) and the header reaches 8pt below the back button.
|
|
74
76
|
- iPhone Duo inner display in portrait (status bar on top): the header row shares the status bar band — `headerHeight` 94pt (2 × the clock digits' y 47), `headerStatusBarHeight` 0 — and `ScreenLayout.statusBarClearance` keeps it between the clock / battery clusters (from reserved regions, else 128pt on the right). Back and toolkit use the 48pt side bar controls laid out horizontally (`ToolkitLayout.SideBarRow`); the collapsed search and a centered title stay clear of the clusters. Port of momo-kits `90af33ba2`.
|
|
75
77
|
- iPhone Duo with a side strip ≥ 60pt: back + toolkit leave the bar for `HeaderSideBar` (`navigation/component/SideBar.kt`, 48pt glass controls); custom header-right stays in the bar. `sideBar.top` is 170pt in portrait, 120pt on the inner display in landscape (height ≥ 600), 24pt on the outer display in landscape, or below the header when the status bar is on top; UIKit's `statusBarFrame` is useless on Duo. Unlike RN the column is clamped above footer (24pt gap) / rail (12pt gap).
|
|
76
78
|
- Reserved regions (iOS 27.1 `reservedRegionsOfKind:`, reached through the ObjC runtime so older SDKs still build): a probe `UIView` (`platform/ReservedRegions.ios.kt` on the Compose root view; `ReservedRegionsProbe` inside SwiftUI `momoScreenLayout()`) re-reads them in `layoutSubviews`, which UIKit re-runs when they change. They push `sideBar.top` below the status cluster as it grows for calls / Live Activities, and `sideBar.bottom` (≥ 24pt) above a camera at the bottom end of the strip.
|
|
77
79
|
- Tab bar on Duo is `bottomtab/DuoTabBar.kt`: a rail in the side strip (`sideBar.bottom` above the window bottom, QR below it) or, without a side bar, a floating bar spanning 6/8 grid columns. Both overlay the content; `duoFloatingTabBarInset` pads tab content, footer and FAB.
|
|
80
|
+
- Duo tab selection motion (`bottomtab/DuoLiquidSelection.kt` / `ios/Navigation/BottomTab/DuoLiquidSelection.swift`, port of RN `useLiquidSelection.ts`, momo-kits !682): press lifts the lens, a drag past 10pt takes over (Compose: the bar's `pointerInput` consumes and so cancels the tab's clickable; SwiftUI: one `DragGesture` over the bar, tabs are not `Button`s), long press calls `BottomTab(onTabLongPress)` and release still selects, Reduce Motion (`platform/ReduceMotion`) falls back to a plain slide. SwiftUI integrates the lens spring on a display link because the stretch and the tabs' active tint read it every frame. Constants mirror RN — change both together.
|
|
78
81
|
- Bar compression (`bottomtab/DuoBarCompression.kt`, HIG "Vertical controls"): when toolbar + rail don't fit in the strip, one is compressed — the toolkit into a `navigation_menu` button, the rail into one button showing the current tab — and tapping it swaps them; `BottomTab(compressionBehavior)` picks which starts compressed. If neither fits beside the other compressed, both rest compressed and a tap opens one for a moment. Side bar columns report their full height (0 when the screen puts nothing there) so the decision follows each screen's toolkit.
|
|
79
82
|
- Glass header: on Duo with a side bar, Default/Extended headers without search and with a `ScrollState` let content scroll under the bar (`usesDuoGlassHeader`); the bar fades in a translucent surface + hairline over 16pt (Compose has no backdrop blur — RN's fallback look), the gradient leaves with the content.
|
|
80
83
|
- Quick return header: glass headers and Animated headers (with a `ScrollState`) on the Duo side bar layout slide out with the content and back in on a reverse scroll; a half-shown header settles in or out once the scroll stops. The side bar is drawn apart from the header, so it stays put.
|
|
81
|
-
- Overlays on
|
|
84
|
+
- Overlays on foldables (`layout/ModalLayout.kt` / `ios/Layout/ModalLayout.swift`, Figma "Modal - Foldable Guideline", constants shared with RN): foldable = `isIPhoneDuoDevice` or a window short side ≥ 600, so phones (landscape too) keep their look. The resolver returns the placement (safe area, so left of the Duo control column; right of an active vertical division when a Duo is half folded — Swift also needs `UIHingeInteraction` `.partiallyOpen`; Android half fold stays flat), popup geometry (width clamp(placement − 2·margin, 280, 450), margin 24 or 12 on the Duo outer display / half fold, max height min(600, placement − 48), radius 24; only the PopupNotify description scrolls) and sheet geometry (width min(placement − 24, 653) ≥ 296, bottom anchored, max height window − top inset − 12, min height 230, radius 24 top). Scrim is black 20% over the whole window on foldables (0.6 on phones). Snackbars keep clear of the strip. On every device (RN parity) popup close and sheet header back / close are `ModalIconButton`: 32pt circle on `background.surface` with a 1pt `border.default` stroke, 20pt `text.default` icon; the popup close sits inside the card 12pt from the top right (`PopupPromotion` keeps its close under the image), the default sheet header is 56 tall, 12 padding, 8 gap.
|
|
85
|
+
- Bottom sheet on Duo: stays in the placement, never on or under the side strip; back / close stay in the header row (no side column). `BottomHeader.Title(onBack)` / `.title(onBack:)` closes the sheet, then runs (RN `leftOptions.onPressIconLeft`).
|
|
82
86
|
- Font scale deliberately uses the short side (`min(w, h)`), unlike RN which reads the window width — landscape must not inflate every font.
|
|
87
|
+
- Font scale measures the **window**, never `UIScreen.main`: on iPhone Duo the main screen stays on one display while the window follows the one in use. Compose iOS `getScreenDimensions()` reads `LocalWindowInfo.containerSize` (recomposes on fold/unfold); SwiftUI `DesignSystemKits` KVO-observes each `UIWindowScene.effectiveGeometry` and republishes `windowShortSide`.
|
|
83
88
|
- `StackScreen` pads content/footer/search/FAB by the side insets and provides an inset-consumed layout to its content; a bottom-tab root stays full width (tab bar + each tab's StackScreen handle insets). Grid columns use `contentWidth`.
|
|
84
89
|
|
|
85
90
|
## i18n / Localize (port of RN `Localize`)
|
|
@@ -104,9 +109,9 @@ The SwiftUI port differs from Compose in one important way: **it follows the hos
|
|
|
104
109
|
|
|
105
110
|
One formula, both platforms: the device-width scale (`width / 375`, capped at `+5pt`) and the OS Dynamic Type scale (capped at `1.5×`) are computed independently and the **larger wins**. When `useOSScaleRate` is false neither applies — the size is just multiplied by `userScaleRate`. Max font scale is fixed at 1.5; the old per-call/per-scope override is deprecated and ignored on both sides.
|
|
106
111
|
|
|
107
|
-
- **Compose** — `const/Typography.kt` (`scaleSize` overloads for `Float`/`Dp`/`TextUnit`/`TextStyle`). The `TextUnit` overload divides by `density.fontScale` so Compose's own `sp` scaling isn't applied twice. Inputs: `LocalContext.current` (`MiniAppContext.userScaleRate` / `useOSScaleRate`, per-field) falling back to
|
|
108
|
-
- **SwiftUI** — `ios/Typography/FontScale.swift`. `FontScale` is an immutable snapshot with `callAsFunction`, so a view reads `@Environment(\.momoFontScale) private var fontScale` and calls `fontScale(16)`. `
|
|
109
|
-
- **Never set `\.momoFontScale` directly** — same trap as `\.localize`. Inject via `.momoFontScale(_:context:)`, which holds
|
|
112
|
+
- **Compose** — `const/Typography.kt` (`scaleSize` overloads for `Float`/`Dp`/`TextUnit`/`TextStyle`). The `TextUnit` overload divides by `density.fontScale` so Compose's own `sp` scaling isn't applied twice. Inputs: `LocalContext.current` (`MiniAppContext.userScaleRate` / `useOSScaleRate`, per-field) falling back to `DesignSystemKits.getConfigs()`. On iOS, `platform/OsFontScale.ios.kt` observes `UIContentSizeCategoryDidChangeNotification` and overrides `LocalDensity` — Compose MP otherwise reads `fontScale` once at `ComposeUIViewController` creation. Wired at `NavigationContainer`.
|
|
113
|
+
- **SwiftUI** — `ios/Typography/FontScale.swift`. `FontScale` is an immutable snapshot with `callAsFunction`, so a view reads `@Environment(\.momoFontScale) private var fontScale` and calls `fontScale(16)`. `DesignSystemKits.shared` is the `ObservableObject` holding the host inputs and the OS factor (it observes `UIContentSizeCategory.didChangeNotification`); the host pushes them with `setConfigs(_:)`.
|
|
114
|
+
- **Never set `\.momoFontScale` directly** — same trap as `\.localize`. Inject via `.momoFontScale(_:context:)`, which holds `DesignSystemKits` as `@ObservedObject`; that is what re-publishes the snapshot. It also injects `\.designSystemKitsConfigs`, which `MomoText` (whitelist font) and `TrustBanner` (fallback after `ApplicationEnvironment.config`) read so a host push re-renders them. `NavigationContainer` does it (passing `MiniAppContext` so the per-mini-app override applies); a bare `UIHostingController` root must too. The environment default reads the live store, so an un-injected subtree still gets correct values — just not live ones.
|
|
110
115
|
- The global `scaleSize(_:)` and `Font.appFont(size:)` remain for call sites that can't read the environment (UIKit bridges, free functions). They are **not** reactive. `Font.header_default_bold` & friends are computed `static var`s for the same reason — as stored `static let`s they froze the scale at first access. `UIViewRepresentable`s should read `context.environment.momoFontScale` instead, and re-apply the font in `updateUIView`, not only in `makeUIView`.
|
|
111
116
|
|
|
112
117
|
## Code conventions
|
package/README.md
CHANGED
|
@@ -53,7 +53,7 @@ ComposeKit là bộ UI Kit đa nền tảng phục vụ Mini App/SDK của MoMo.
|
|
|
53
53
|
---
|
|
54
54
|
|
|
55
55
|
### Yêu cầu môi trường
|
|
56
|
-
- JDK 17+
|
|
56
|
+
- JDK 17+, Gradle 8, Android Studio Hedgehog+ với Android SDK (compileSdk xem `libs.versions.toml`).
|
|
57
57
|
- Kotlin Multiplatform plugin + Compose Multiplatform (JetBrains 1.6.1+).
|
|
58
58
|
- Xcode 15, CocoaPods 1.12+ để build `iosApp` hoặc publish Pod.
|
|
59
59
|
- Truy cập mạng nội bộ GitLab Packages nếu cần publish/consume Maven repo `https://gitlab.mservice.com.vn/api/v4/projects/5400/packages/maven`.
|
|
@@ -174,12 +174,4 @@ fun SuccessState() {
|
|
|
174
174
|
```
|
|
175
175
|
|
|
176
176
|
- `shared/build.gradle.kts` đã bật `coreLibraryDesugaringEnabled` để tương thích `compottie-dot`/`compottie-network` với `minSdk = 24`.
|
|
177
|
-
- Nếu animation dùng asset/font nội bộ, kết hợp `compottie-resources` (`rememberResourcesAssetsManager`, `rememberResourcesFontManager`) để trỏ về `composeResources`.
|
|
178
|
-
### NativeMaxApi 0.3.1
|
|
179
|
-
|
|
180
|
-
Compose dùng typed `vn.momo.maxapi.IMaxApi` do host truyền vào `NavigationContainer`.
|
|
181
|
-
Toolkit dùng overload `showToolkit(ToolkitOptions, callback)` để giữ nhóm tool tùy chỉnh,
|
|
182
|
-
nhãn đa ngôn ngữ, icon, badge và `useSystemTools`. Callback trả `actionKey`; request đang chờ
|
|
183
|
-
được hủy khi composition bị gỡ. Kits không đóng client do host sở hữu.
|
|
184
|
-
|
|
185
|
-
Chạy `./gradlew :compose:testAndroidHostTest` để kiểm tra hủy request và callback đến muộn.
|
|
177
|
+
- Nếu animation dùng asset/font nội bộ, kết hợp `compottie-resources` (`rememberResourcesAssetsManager`, `rememberResourcesFontManager`) để trỏ về `composeResources`.
|
package/build.gradle.kts
CHANGED
|
@@ -2,9 +2,7 @@ plugins {
|
|
|
2
2
|
// this is necessary to avoid the plugins to be loaded multiple times
|
|
3
3
|
// in each subproject's classloader
|
|
4
4
|
alias(libs.plugins.android.application) apply false
|
|
5
|
-
|
|
6
|
-
alias(libs.plugins.android.kotlin.multiplatform.library) apply false
|
|
7
|
-
// AI-GENERATED END: use the AGP 9 Kotlin Multiplatform Android library target
|
|
5
|
+
alias(libs.plugins.android.library) apply false
|
|
8
6
|
alias(libs.plugins.compose) apply false
|
|
9
7
|
alias(libs.plugins.kotlin.compose.compiler) apply false
|
|
10
8
|
alias(libs.plugins.jetbrains.kotlin.multiplatform) apply false
|
package/compose/build.gradle.kts
CHANGED
|
@@ -4,9 +4,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
|
|
|
4
4
|
|
|
5
5
|
plugins {
|
|
6
6
|
alias(libs.plugins.jetbrains.kotlin.multiplatform)
|
|
7
|
-
|
|
8
|
-
alias(libs.plugins.android.kotlin.multiplatform.library)
|
|
9
|
-
// AI-GENERATED END: use the AGP 9 Kotlin Multiplatform Android library target
|
|
7
|
+
alias(libs.plugins.android.library)
|
|
10
8
|
alias(libs.plugins.compose)
|
|
11
9
|
alias(libs.plugins.kotlin.compose.compiler)
|
|
12
10
|
// alias(libs.plugins.vanniktech.mavenPublish)
|
|
@@ -24,18 +22,12 @@ val gitlabUser: String = findProperty("gitlab.user") as String? ?: ""
|
|
|
24
22
|
val gitlabKey: String = findProperty("gitlab.password") as String? ?: ""
|
|
25
23
|
|
|
26
24
|
kotlin {
|
|
27
|
-
|
|
28
|
-
android {
|
|
29
|
-
namespace = "vn.momo.kits.kits"
|
|
30
|
-
compileSdk = 36
|
|
31
|
-
minSdk = 24
|
|
32
|
-
androidResources.enable = true
|
|
33
|
-
withHostTest {}
|
|
25
|
+
androidTarget {
|
|
34
26
|
compilerOptions {
|
|
35
27
|
jvmTarget.set(JvmTarget.JVM_17)
|
|
36
28
|
}
|
|
29
|
+
publishLibraryVariants("release")
|
|
37
30
|
}
|
|
38
|
-
// AI-GENERATED END: configure the AGP 9 Android target and host tests
|
|
39
31
|
|
|
40
32
|
val fwName = gitlabArtifactId
|
|
41
33
|
val iosTargets = listOf(iosArm64(), iosSimulatorArm64())
|
|
@@ -48,7 +40,7 @@ kotlin {
|
|
|
48
40
|
}
|
|
49
41
|
|
|
50
42
|
cocoapods {
|
|
51
|
-
version = "0.168.1-beta.
|
|
43
|
+
version = "0.168.1-beta.40-debug"
|
|
52
44
|
summary = "IOS Shared module"
|
|
53
45
|
homepage = "https://momo.vn"
|
|
54
46
|
ios.deploymentTarget = "15.0"
|
|
@@ -94,14 +86,24 @@ kotlin {
|
|
|
94
86
|
iosMain.dependencies {
|
|
95
87
|
implementation(libs.ktor.client.darwin)
|
|
96
88
|
}
|
|
97
|
-
// AI-GENERATED START: verify toolkit request ownership
|
|
98
|
-
commonTest.dependencies {
|
|
99
|
-
implementation(kotlin("test"))
|
|
100
|
-
}
|
|
101
|
-
// AI-GENERATED END: verify toolkit request ownership
|
|
102
89
|
}
|
|
103
90
|
}
|
|
104
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
|
+
|
|
105
107
|
repositories {
|
|
106
108
|
google {
|
|
107
109
|
mavenContent {
|
|
@@ -151,9 +153,8 @@ compose {
|
|
|
151
153
|
// configure(
|
|
152
154
|
// KotlinMultiplatform(
|
|
153
155
|
// javadocJar = JavadocJar.Empty(),
|
|
154
|
-
// // AI-GENERATED START: the AGP KMP target publishes a single Android variant
|
|
155
156
|
// sourcesJar = true,
|
|
156
|
-
//
|
|
157
|
+
// androidVariantsToPublish = listOf("release")
|
|
157
158
|
// )
|
|
158
159
|
// )
|
|
159
160
|
//
|
|
@@ -4,9 +4,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
|
|
|
4
4
|
|
|
5
5
|
plugins {
|
|
6
6
|
alias(libs.plugins.jetbrains.kotlin.multiplatform)
|
|
7
|
-
|
|
8
|
-
alias(libs.plugins.android.kotlin.multiplatform.library)
|
|
9
|
-
// AI-GENERATED END: use the AGP 9 Kotlin Multiplatform Android library target
|
|
7
|
+
alias(libs.plugins.android.library)
|
|
10
8
|
alias(libs.plugins.compose)
|
|
11
9
|
alias(libs.plugins.kotlin.compose.compiler)
|
|
12
10
|
alias(libs.plugins.vanniktech.mavenPublish)
|
|
@@ -24,18 +22,12 @@ val gitlabUser: String = findProperty("gitlab.user") as String? ?: ""
|
|
|
24
22
|
val gitlabKey: String = findProperty("gitlab.password") as String? ?: ""
|
|
25
23
|
|
|
26
24
|
kotlin {
|
|
27
|
-
|
|
28
|
-
android {
|
|
29
|
-
namespace = "$gitlabGroup.$gitlabArtifactId"
|
|
30
|
-
compileSdk = libs.versions.android.compileSdk.get().toInt()
|
|
31
|
-
minSdk = libs.versions.android.minSdk.get().toInt()
|
|
32
|
-
androidResources.enable = true
|
|
33
|
-
withHostTest {}
|
|
25
|
+
androidTarget {
|
|
34
26
|
compilerOptions {
|
|
35
27
|
jvmTarget.set(JvmTarget.JVM_17)
|
|
36
28
|
}
|
|
29
|
+
publishLibraryVariants("release")
|
|
37
30
|
}
|
|
38
|
-
// AI-GENERATED END: configure the AGP 9 Android target and host tests
|
|
39
31
|
|
|
40
32
|
val fwName = gitlabArtifactId
|
|
41
33
|
val iosTargets = listOf(iosArm64(), iosSimulatorArm64())
|
|
@@ -94,14 +86,24 @@ kotlin {
|
|
|
94
86
|
iosMain.dependencies {
|
|
95
87
|
implementation(libs.ktor.client.darwin)
|
|
96
88
|
}
|
|
97
|
-
// AI-GENERATED START: verify toolkit request ownership
|
|
98
|
-
commonTest.dependencies {
|
|
99
|
-
implementation(kotlin("test"))
|
|
100
|
-
}
|
|
101
|
-
// AI-GENERATED END: verify toolkit request ownership
|
|
102
89
|
}
|
|
103
90
|
}
|
|
104
91
|
|
|
92
|
+
android {
|
|
93
|
+
namespace = "$gitlabGroup.$gitlabArtifactId"
|
|
94
|
+
compileSdk = libs.versions.android.compileSdk.get().toInt()
|
|
95
|
+
compileOptions {
|
|
96
|
+
sourceCompatibility = JavaVersion.VERSION_17
|
|
97
|
+
targetCompatibility = JavaVersion.VERSION_17
|
|
98
|
+
}
|
|
99
|
+
defaultConfig {
|
|
100
|
+
minSdk = libs.versions.android.minSdk.get().toInt()
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
|
|
104
|
+
dependencies {
|
|
105
|
+
}
|
|
106
|
+
|
|
105
107
|
repositories {
|
|
106
108
|
google {
|
|
107
109
|
mavenContent {
|
|
@@ -151,9 +153,8 @@ mavenPublishing {
|
|
|
151
153
|
configure(
|
|
152
154
|
KotlinMultiplatform(
|
|
153
155
|
javadocJar = JavadocJar.Empty(),
|
|
154
|
-
// AI-GENERATED START: the AGP KMP target publishes a single Android variant
|
|
155
156
|
sourcesJar = true,
|
|
156
|
-
|
|
157
|
+
androidVariantsToPublish = listOf("release")
|
|
157
158
|
)
|
|
158
159
|
)
|
|
159
160
|
|
package/compose/compose.podspec
CHANGED
|
@@ -5,15 +5,16 @@ import androidx.compose.runtime.remember
|
|
|
5
5
|
import androidx.compose.ui.platform.LocalContext
|
|
6
6
|
import androidx.compose.ui.text.font.Font
|
|
7
7
|
import androidx.compose.ui.text.font.FontFamily
|
|
8
|
+
import androidx.compose.ui.text.font.FontWeight
|
|
8
9
|
|
|
9
10
|
@Composable
|
|
10
|
-
internal actual fun hostFontFamily(fileName: String): FontFamily? {
|
|
11
|
+
internal actual fun hostFontFamily(fileName: String, weight: FontWeight): FontFamily? {
|
|
11
12
|
val assets = LocalContext.current.applicationContext.assets
|
|
12
|
-
return remember(fileName) {
|
|
13
|
+
return remember(fileName, weight) {
|
|
13
14
|
val path = "fonts/$fileName"
|
|
14
15
|
// AssetManager.open ném IOException nếu thiếu file; Font(path, assetManager) thì lỗi
|
|
15
16
|
// muộn lúc render nên phải kiểm tra tồn tại trước.
|
|
16
17
|
val exists = runCatching { assets.open(path).close() }.isSuccess
|
|
17
|
-
if (exists) FontFamily(Font(path = path, assetManager = assets)) else null
|
|
18
|
+
if (exists) FontFamily(Font(path = path, assetManager = assets, weight = weight)) else null
|
|
18
19
|
}
|
|
19
20
|
}
|
|
@@ -88,10 +88,11 @@ actual fun LottieAnimation(
|
|
|
88
88
|
isPlaying: Boolean,
|
|
89
89
|
onEvent: ((String) -> Unit)?,
|
|
90
90
|
modifier: Modifier,
|
|
91
|
-
useCompose: Boolean
|
|
91
|
+
useCompose: Boolean,
|
|
92
|
+
progress: (() -> Float)?,
|
|
92
93
|
) {
|
|
93
94
|
if (useCompose) {
|
|
94
|
-
ComposeLottieAnimation(path, tintColor, bgColor, iterations, isPlaying, onEvent, modifier)
|
|
95
|
+
ComposeLottieAnimation(path, tintColor, bgColor, iterations, isPlaying, onEvent, modifier, progress)
|
|
95
96
|
return
|
|
96
97
|
}
|
|
97
98
|
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
package vn.momo.kits.platform
|
|
2
|
+
|
|
3
|
+
import android.provider.Settings
|
|
4
|
+
import androidx.compose.runtime.Composable
|
|
5
|
+
import androidx.compose.runtime.remember
|
|
6
|
+
import androidx.compose.ui.platform.LocalConfiguration
|
|
7
|
+
import androidx.compose.ui.platform.LocalContext
|
|
8
|
+
|
|
9
|
+
@Composable
|
|
10
|
+
actual fun rememberReduceMotion(): Boolean {
|
|
11
|
+
val context = LocalContext.current
|
|
12
|
+
// re-read on configuration changes; the setting has no observer of its own
|
|
13
|
+
val configuration = LocalConfiguration.current
|
|
14
|
+
return remember(context, configuration) {
|
|
15
|
+
Settings.Global.getFloat(context.contentResolver, Settings.Global.ANIMATOR_DURATION_SCALE, 1f) == 0f
|
|
16
|
+
}
|
|
17
|
+
}
|
|
@@ -1,9 +1,6 @@
|
|
|
1
1
|
package vn.momo.kits.application
|
|
2
2
|
|
|
3
3
|
import androidx.compose.runtime.Immutable
|
|
4
|
-
import androidx.compose.runtime.getValue
|
|
5
|
-
import androidx.compose.runtime.mutableStateOf
|
|
6
|
-
import androidx.compose.runtime.setValue
|
|
7
4
|
import androidx.compose.runtime.staticCompositionLocalOf
|
|
8
5
|
import vn.momo.kits.components.TrustBannerData
|
|
9
6
|
|
|
@@ -19,17 +16,6 @@ data class DesignSystemConfig(
|
|
|
19
16
|
val headerGradient: String? = null,
|
|
20
17
|
)
|
|
21
18
|
|
|
22
|
-
// App-wide holder seeded by the host (same pattern as KitFontScale), so direct NavigationContainer
|
|
23
|
-
// callers get the config without passing it. Snapshot state: a config fetched after first frame recomposes.
|
|
24
|
-
object KitDesignSystemConfig {
|
|
25
|
-
var config by mutableStateOf<DesignSystemConfig?>(null)
|
|
26
|
-
private set
|
|
27
|
-
|
|
28
|
-
fun update(config: DesignSystemConfig?) {
|
|
29
|
-
this.config = config
|
|
30
|
-
}
|
|
31
|
-
}
|
|
32
|
-
|
|
33
19
|
@Immutable
|
|
34
20
|
data class MiniAppContext(
|
|
35
21
|
val appIcon: String = "",
|
|
@@ -0,0 +1,62 @@
|
|
|
1
|
+
package vn.momo.kits.application
|
|
2
|
+
|
|
3
|
+
import androidx.compose.runtime.Immutable
|
|
4
|
+
import androidx.compose.runtime.getValue
|
|
5
|
+
import androidx.compose.runtime.mutableStateOf
|
|
6
|
+
import androidx.compose.runtime.setValue
|
|
7
|
+
import kotlinx.coroutines.CoroutineScope
|
|
8
|
+
import kotlinx.coroutines.Dispatchers
|
|
9
|
+
import kotlinx.coroutines.Job
|
|
10
|
+
import kotlinx.coroutines.SupervisorJob
|
|
11
|
+
import kotlinx.coroutines.flow.Flow
|
|
12
|
+
import kotlinx.coroutines.flow.MutableStateFlow
|
|
13
|
+
import kotlinx.coroutines.flow.StateFlow
|
|
14
|
+
import kotlinx.coroutines.flow.asStateFlow
|
|
15
|
+
import kotlinx.coroutines.launch
|
|
16
|
+
|
|
17
|
+
@Immutable
|
|
18
|
+
data class DesignSystemKitsConfigs(
|
|
19
|
+
val userScaleRate: Float = 1f,
|
|
20
|
+
val useOSScaleRate: Boolean = true,
|
|
21
|
+
val isWhiteList: Boolean = false,
|
|
22
|
+
val designSystemConfig: DesignSystemConfig? = null,
|
|
23
|
+
)
|
|
24
|
+
|
|
25
|
+
// The kit is sandboxed from the host's storage/config, so the host implements this and hands it to init().
|
|
26
|
+
interface DesignSystemKitsSource {
|
|
27
|
+
// Sync read: seeds the kit before the first frame, so there is no default-then-real flicker.
|
|
28
|
+
fun getConfigs(): DesignSystemKitsConfigs
|
|
29
|
+
|
|
30
|
+
val configsFlow: Flow<DesignSystemKitsConfigs>
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
// App-wide design-system inputs (font scale, whitelist, remote config). scaleSize(), defaultTheme and
|
|
34
|
+
// NavigationContainer fall back to these when no MiniAppContext / LocalDesignSystemConfig is provided.
|
|
35
|
+
object DesignSystemKits {
|
|
36
|
+
private val scope = CoroutineScope(SupervisorJob() + Dispatchers.Main)
|
|
37
|
+
private var observeJob: Job? = null
|
|
38
|
+
|
|
39
|
+
// Snapshot state so Compose readers recompose (including non-composable getters like defaultTheme);
|
|
40
|
+
// the StateFlow is for non-Compose observers, e.g. the host's SwiftUI bridge, where Compose's
|
|
41
|
+
// global snapshot apply loop may never have started.
|
|
42
|
+
private var currentConfigs by mutableStateOf(DesignSystemKitsConfigs())
|
|
43
|
+
private val mutableConfigsFlow = MutableStateFlow(currentConfigs)
|
|
44
|
+
val configsFlow: StateFlow<DesignSystemKitsConfigs> = mutableConfigsFlow.asStateFlow()
|
|
45
|
+
|
|
46
|
+
// Idempotent: a repeated call (e.g. Activity re-creation) replaces the previous observer.
|
|
47
|
+
fun init(source: DesignSystemKitsSource) {
|
|
48
|
+
observeJob?.cancel()
|
|
49
|
+
setConfigs(source.getConfigs())
|
|
50
|
+
observeJob = scope.launch {
|
|
51
|
+
source.configsFlow.collect { setConfigs(it) }
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
// While init() is observing a source, its next emission overrides a value set here.
|
|
56
|
+
fun setConfigs(configs: DesignSystemKitsConfigs) {
|
|
57
|
+
currentConfigs = configs
|
|
58
|
+
mutableConfigsFlow.value = configs
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
fun getConfigs(): DesignSystemKitsConfigs = currentConfigs
|
|
62
|
+
}
|
|
@@ -2,18 +2,13 @@ package vn.momo.kits.application
|
|
|
2
2
|
|
|
3
3
|
import androidx.compose.runtime.Composable
|
|
4
4
|
import androidx.compose.runtime.CompositionLocalProvider
|
|
5
|
-
|
|
6
|
-
import androidx.compose.runtime.DisposableEffect
|
|
7
|
-
// AI-GENERATED END: own the typed language request
|
|
5
|
+
import androidx.compose.runtime.LaunchedEffect
|
|
8
6
|
import androidx.compose.runtime.remember
|
|
9
7
|
import vn.momo.kits.const.AppTheme
|
|
10
8
|
import vn.momo.kits.const.Theme
|
|
11
9
|
import vn.momo.kits.navigation.LocalMaxApi
|
|
12
10
|
import vn.momo.kits.platform.ProvideOsFontScale
|
|
13
|
-
// AI-GENERATED START: consume typed NativeMaxApi results
|
|
14
11
|
import vn.momo.maxapi.IMaxApi
|
|
15
|
-
import vn.momo.maxapi.runtime.ApiResult
|
|
16
|
-
// AI-GENERATED END: consume typed NativeMaxApi results
|
|
17
12
|
|
|
18
13
|
|
|
19
14
|
@Composable
|
|
@@ -32,25 +27,15 @@ fun WidgetContainer(
|
|
|
32
27
|
val resolvedLocalize = localize ?: LocalLocalize.current
|
|
33
28
|
val resolvedMaxApi = maxApi ?: LocalMaxApi.current
|
|
34
29
|
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
val
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
if (active && target != null && result is ApiResult.Success &&
|
|
43
|
-
result.value.trim().lowercase().startsWith(Localize.EN)) {
|
|
44
|
-
target.changeLanguage(Localize.EN)
|
|
45
|
-
}
|
|
46
|
-
}
|
|
47
|
-
}.getOrNull()
|
|
48
|
-
onDispose {
|
|
49
|
-
active = false
|
|
50
|
-
handle?.cancel()
|
|
30
|
+
LaunchedEffect(resolvedMaxApi, localize) {
|
|
31
|
+
val api = resolvedMaxApi ?: return@LaunchedEffect
|
|
32
|
+
val target = localize ?: return@LaunchedEffect
|
|
33
|
+
runCatching {
|
|
34
|
+
api.getLanguage(callback = { data ->
|
|
35
|
+
if (parseLanguage(data) == Localize.EN) target.changeLanguage(Localize.EN)
|
|
36
|
+
})
|
|
51
37
|
}
|
|
52
38
|
}
|
|
53
|
-
// AI-GENERATED END: cancel language delivery when its composition owner changes
|
|
54
39
|
|
|
55
40
|
ProvideOsFontScale {
|
|
56
41
|
CompositionLocalProvider(
|
|
@@ -63,3 +48,9 @@ fun WidgetContainer(
|
|
|
63
48
|
}
|
|
64
49
|
}
|
|
65
50
|
}
|
|
51
|
+
|
|
52
|
+
private fun parseLanguage(raw: Map<String, Any?>?): String? {
|
|
53
|
+
val code = (raw?.get("response") as? String)?.trim()?.lowercase()
|
|
54
|
+
if (code.isNullOrEmpty()) return null
|
|
55
|
+
return if (code.startsWith(Localize.EN)) Localize.EN else Localize.VI
|
|
56
|
+
}
|
|
@@ -69,21 +69,7 @@ fun Information(
|
|
|
69
69
|
iconSource = "24_notifications_alert_octagon"
|
|
70
70
|
}
|
|
71
71
|
|
|
72
|
-
|
|
73
|
-
// faux-bolded again; fontWeight still applies when no host font is bundled and the system font is used.
|
|
74
|
-
val highlightWeight = Typography.headerXsSemibold.fontWeight
|
|
75
|
-
val highlightFontFamily = getFontFamily(AppTheme.current.font, highlightWeight)
|
|
76
|
-
val annotatedDescription = remember(description, highlightText, highlightFontFamily) {
|
|
77
|
-
highlightDescription(
|
|
78
|
-
description,
|
|
79
|
-
highlightText,
|
|
80
|
-
SpanStyle(
|
|
81
|
-
fontFamily = highlightFontFamily,
|
|
82
|
-
fontWeight = highlightWeight,
|
|
83
|
-
fontSynthesis = FontSynthesis.None,
|
|
84
|
-
),
|
|
85
|
-
)
|
|
86
|
-
}
|
|
72
|
+
val annotatedDescription = rememberHighlightDescription(description, highlightText)
|
|
87
73
|
|
|
88
74
|
Column(
|
|
89
75
|
modifier = Modifier.border(
|
|
@@ -157,6 +143,26 @@ fun Information(
|
|
|
157
143
|
|
|
158
144
|
}
|
|
159
145
|
|
|
146
|
+
// Highlighted keywords keep the caller's text size; only the weight changes.
|
|
147
|
+
@Composable
|
|
148
|
+
internal fun rememberHighlightDescription(description: String, highlightText: List<String>): AnnotatedString {
|
|
149
|
+
// Host fonts are one file per weight: swap fontFamily and disable synthesis so the SemiBold file isn't
|
|
150
|
+
// faux-bolded again; fontWeight still applies when no host font is bundled and the system font is used.
|
|
151
|
+
val highlightWeight = Typography.headerXsSemibold.fontWeight
|
|
152
|
+
val highlightFontFamily = getFontFamily(AppTheme.current.font, highlightWeight)
|
|
153
|
+
return remember(description, highlightText, highlightFontFamily) {
|
|
154
|
+
highlightDescription(
|
|
155
|
+
description,
|
|
156
|
+
highlightText,
|
|
157
|
+
SpanStyle(
|
|
158
|
+
fontFamily = highlightFontFamily,
|
|
159
|
+
fontWeight = highlightWeight,
|
|
160
|
+
fontSynthesis = FontSynthesis.None,
|
|
161
|
+
),
|
|
162
|
+
)
|
|
163
|
+
}
|
|
164
|
+
}
|
|
165
|
+
|
|
160
166
|
// Whole-word matches only; the longest keyword wins when keywords overlap (RN parity).
|
|
161
167
|
private fun highlightDescription(
|
|
162
168
|
description: String,
|