@momo-kits/native-kits 0.167.1-beta.10-debug → 0.167.1-beta.11-debug

package/compose/build.gradle.kts

@@ -40,7 +40,7 @@ kotlin {
     }
 
     cocoapods {
-        version = "0.167.1-beta.10-debug"
+        version = "0.167.1-beta.11-debug"
         summary = "IOS Shared module"
         homepage = "https://momo.vn"
         ios.deploymentTarget = "15.0"

package/compose/src/commonMain/kotlin/vn/momo/kits/application/Context.kt

@@ -6,6 +6,8 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.compose.runtime.staticCompositionLocalOf
 import vn.momo.kits.components.TrustBannerData
+import vn.momo.kits.const.KitDesignSystem
+import vn.momo.kits.const.Theme
 
 @Immutable
 data class FeatureFlags(
@@ -30,6 +32,9 @@ object KitDesignSystemConfig {
     }
 }
 
+internal fun Theme.withDesignSystemFont(): Theme =
+    copy(font = if (KitDesignSystem.isWhiteList) "MomoTrustSans" else "SFProText")
+
 @Immutable
 data class MiniAppContext(
     val appIcon: String = "",

package/compose/src/commonMain/kotlin/vn/momo/kits/application/NavigationContainer.kt

@@ -96,7 +96,7 @@ fun ApplicationContainer(
 
     ProvideOsFontScale {
     CompositionLocalProvider(
-        AppTheme provides appTheme,
+        AppTheme provides appTheme.withDesignSystemFont(),
         PlatformApi provides composeApi,
         AppStatusBar provides appStatusBarHeight,
         LocalContext provides applicationContext,

package/compose/src/commonMain/kotlin/vn/momo/kits/application/WidgetContainer.kt

@@ -23,7 +23,7 @@ fun WidgetContainer(
     val mergedContext = remember(parentContext, miniAppContext) {
         MiniAppContext.merge(parentContext, miniAppContext)
     }
-    val resolvedTheme = theme ?: AppTheme.current
+    val resolvedTheme = (theme ?: AppTheme.current).withDesignSystemFont()
     val resolvedLocalize = localize ?: LocalLocalize.current
     val resolvedMaxApi = maxApi ?: LocalMaxApi.current
 

package/compose/src/commonMain/kotlin/vn/momo/kits/const/Typography.kt

@@ -121,8 +121,7 @@ private val hostFontFiles: Map<String, String> = mapOf(
 
 @Composable
 fun getFontFamily(fontFamily: String, fontWeight: FontWeight? = FontWeight.Normal): FontFamily {
-    val family = if (KitDesignSystem.isWhiteList && fontFamily == "SFProText") "MomoTrustSans" else fontFamily
-    val key = "$family-${fontWeight?.weight}"
+    val key = "$fontFamily-${fontWeight?.weight}"
     val fileName = hostFontFiles[key] ?: DEFAULT_FONT_FILE
     return hostFontFamily(fileName)
         ?: hostFontFamily(DEFAULT_FONT_FILE)

package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/NavigationContainer.kt

@@ -26,6 +26,7 @@ import vn.momo.kits.application.LocalDesignSystemConfig
 import vn.momo.kits.application.LocalLocalize
 import vn.momo.kits.application.Localize
 import vn.momo.kits.application.MiniAppContext
+import vn.momo.kits.application.withDesignSystemFont
 import vn.momo.kits.const.AppNavigationBar
 import vn.momo.kits.const.AppStatusBar
 import vn.momo.kits.const.AppTheme
@@ -98,7 +99,7 @@ fun NavigationContainer(
                 LocalNavigator provides navigator,
                 LocalDynamicScreenRegistry provides registry,
                 LocalMaxApi provides maxApi,
-                AppTheme provides resolvedTheme,
+                AppTheme provides resolvedTheme.withDesignSystemFont(),
                 AppStatusBar provides statusBarHeight,
                 AppNavigationBar provides navigationBarHeight,
                 LocalContext provides mergedContext,

package/ios/Application/ApplicationEnvironment.swift

@@ -43,6 +43,12 @@ public class KitConfig {
     public var headerGradient: String? = nil
 }
 
+extension Theme {
+    func withDesignSystemFont() -> Theme {
+        copy(font: KitDesignSystem.shared.isWhiteList ? "MomoTrustSans" : "SFProText")
+    }
+}
+
 public class ApplicationEnvironment: ObservableObject {
     // AI-GENERATED START: expose the host bridge to modules outside MoMoUIKits (e.g. the demo pod)
     public let applicationContext: MiniAppContext?

package/ios/Application/Navigation/NavigationContainer.swift

@@ -15,6 +15,7 @@ public struct NavigationContainer<Initial: View>: View {
     @StateObject private var navigator: Navigator
     @StateObject private var applicationEnvironment: ApplicationEnvironment
     @StateObject private var localize: Localize
+    @Environment(\.appTheme) private var theme
 
     private let setNavigator: ((Navigator) -> Void)?
     private let composeApi: KitComposeApi?
@@ -64,6 +65,7 @@ public struct NavigationContainer<Initial: View>: View {
         .environmentObject(navigator)
         .environmentObject(applicationEnvironment)
         .environment(\.applicationEnvironment, applicationEnvironment)
+        .environment(\.appTheme, theme.withDesignSystemFont())
         // AI-GENERATED START: route Localize + font-scale injection through the observing modifiers
         .momoLocalize(localize)
         .momoFontScale(context: applicationEnvironment.applicationContext)
@@ -73,6 +75,7 @@ public struct NavigationContainer<Initial: View>: View {
                 .environmentObject(navigator)
                 .environmentObject(applicationEnvironment)
                 .environment(\.applicationEnvironment, applicationEnvironment)
+                .environment(\.appTheme, theme.withDesignSystemFont())
                 // AI-GENERATED START: route Localize + font-scale injection through the observing modifiers
                 .momoLocalize(localize)
                 .momoFontScale(context: applicationEnvironment.applicationContext)
@@ -84,6 +87,7 @@ public struct NavigationContainer<Initial: View>: View {
                     .environmentObject(navigator)
                     .environmentObject(applicationEnvironment)
                     .environment(\.applicationEnvironment, applicationEnvironment)
+                    .environment(\.appTheme, theme.withDesignSystemFont())
                     // AI-GENERATED START: route Localize + font-scale injection through the observing modifiers
                     .momoLocalize(localize)
                     .momoFontScale(context: applicationEnvironment.applicationContext)

package/ios/Colors+Radius+Spacing/Theme.swift

@@ -221,7 +221,7 @@ public let defaultTheme = Theme(
             container: Colors.blue08
         )
     ),
-    font: "MomoTrustSans",
+    font: "SFProText",
     assets: ThemeAssets(headerBackground: nil)
 )
 
@@ -277,7 +277,7 @@ public let darkTheme = Theme(
             container: Colors.blue08
         )
     ),
-    font: "MomoTrustSans",
+    font: "SFProText",
     assets: ThemeAssets(headerBackground: nil)
 )
 

package/ios/Typography/Text.swift

@@ -100,8 +100,6 @@ public extension TypographyStyle {
 }
 
 private func momoFontName(family: String, weight: Font.Weight) -> String? {
-    // Ngoai whitelist thi tra nil de momoFont() roi ve .system(...), dung nhu truoc DS-791.
-    guard KitDesignSystem.shared.isWhiteList else { return nil }
     guard family == "MomoTrustSans" else { return nil }
     switch weight {
     case .ultraLight, .thin: return "MomoTrustSans-ExtraLight"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.167.1-beta.10-debug",
+  "version": "0.167.1-beta.11-debug",
   "private": false,
   "dependeNavigationncies": {},
   "devDependencies": {},