@momo-kits/native-kits 0.162.40-debug → 0.162.41-debug

package/compose/build.gradle.kts

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

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

@@ -44,7 +44,7 @@ import vn.momo.kits.const.getFontFamily
 import vn.momo.kits.modifier.kitsAutomationId
 import vn.momo.kits.modifier.noFeedbackClickable
 import vn.momo.kits.modifier.setAutomationId
-import vn.momo.kits.navigation.component.HEADER_FONT_FAMILY
+import vn.momo.kits.navigation.component.headerFontFamily
 import vn.momo.kits.navigation.component.HEADER_HEIGHT
 import vn.momo.kits.utils.getAppStatusBarHeight
 import kotlin.math.max
@@ -362,7 +362,7 @@ private fun LiteScreenLayout(
                     text = title,
                     color = headerColor.tintIconColor,
                     style = titleStyle,
-                    fontFamily = HEADER_FONT_FAMILY,
+                    fontFamily = headerFontFamily,
                     modifier = titleModifier,
                     maxLines = 1,
                     overflow = TextOverflow.Ellipsis

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

@@ -67,7 +67,7 @@ data class Theme(
         return !assets.headerBackground.isNullOrEmpty()
     }
 }
-val defaultTheme = Theme(
+private val lightBaseTheme = Theme(
     dark = false,
     colors = ColorScheme(
         primary = Colors.pink_03,
@@ -117,14 +117,14 @@ val defaultTheme = Theme(
             container = Colors.blue_08
         )
     ),
-    font = "MomoTrustSans",
+    font = "SFProText",
     assets = ThemeAssets(
         headerBackground = null
     )
 )
 
 
-val darkTheme = Theme(
+private val darkBaseTheme = Theme(
     dark = true,
     colors = ColorScheme(
         primary = Colors.pink_04,
@@ -174,13 +174,19 @@ val darkTheme = Theme(
             container = Colors.blue_08
         )
     ),
-    font = "MomoTrustSans",
+    font = "SFProText",
     assets = ThemeAssets(
         headerBackground = null
     )
 )
 
 
+val defaultTheme: Theme
+    get() = lightBaseTheme.copy(font = defaultFontFamily)
+
+val darkTheme: Theme
+    get() = darkBaseTheme.copy(font = defaultFontFamily)
+
 val AppTheme = staticCompositionLocalOf { defaultTheme }
 
 val AppStatusBar = staticCompositionLocalOf { 0.dp }

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

@@ -120,31 +120,17 @@ private val hostFontFiles: Map<String, String> = mapOf(
     )
 }
 
-/**
- * Font mặc định mới, chỉ áp cho user nằm trong whitelist design system ([KitDesignSystem]).
- * Ngoài whitelist thì quay về [LEGACY_DEFAULT_FONT_FAMILY] như trước.
- */
 private const val NEW_DEFAULT_FONT_FAMILY = "MomoTrustSans"
 private const val LEGACY_DEFAULT_FONT_FAMILY = "SFProText"
 
-/**
- * Font thuoc bo design system moi. MoMoTrustDisplay chi duoc header dung tu DS-791
- * (commit header title 5bfde6251); truoc do header lay font theo theme, nen ngoai
- * whitelist ca hai deu ha ve [LEGACY_DEFAULT_FONT_FAMILY].
- */
-private val newFontFamilies = setOf(NEW_DEFAULT_FONT_FAMILY, "MoMoTrustDisplay")
+internal val defaultFontFamily: String
+    get() = if (KitDesignSystem.isWhiteList) NEW_DEFAULT_FONT_FAMILY else LEGACY_DEFAULT_FONT_FAMILY
 
 @Composable
 fun getFontFamily(fontFamily: String, fontWeight: FontWeight? = FontWeight.Normal): FontFamily {
     val isWhiteList = KitDesignSystem.isWhiteList
-    val resolvedFamily =
-        if (fontFamily in newFontFamilies && !isWhiteList) {
-            LEGACY_DEFAULT_FONT_FAMILY
-        } else {
-            fontFamily
-        }
     val defaultFile = if (isWhiteList) NEW_DEFAULT_FONT_FILE else LEGACY_DEFAULT_FONT_FILE
-    val key = "$resolvedFamily-${fontWeight?.weight}"
+    val key = "$fontFamily-${fontWeight?.weight}"
     val fileName = hostFontFiles[key] ?: defaultFile
     return hostFontFamily(fileName)
         ?: hostFontFamily(defaultFile)

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

@@ -9,10 +9,12 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.sp
 import androidx.compose.ui.zIndex
 import vn.momo.kits.components.Text
+import vn.momo.kits.const.KitDesignSystem
 import vn.momo.kits.const.Typography
 import vn.momo.kits.modifier.setAutomationId
 
-internal const val HEADER_FONT_FAMILY = "MoMoTrustDisplay"
+internal val headerFontFamily: String?
+    get() = if (KitDesignSystem.isWhiteList) "MoMoTrustDisplay" else null
 
 @Composable
 internal fun HeaderTitle(
@@ -29,7 +31,7 @@ internal fun HeaderTitle(
             fontSize = 15.sp,
             lineHeight = 22.sp,
         ),
-        fontFamily = HEADER_FONT_FAMILY,
+        fontFamily = headerFontFamily,
         color = color,
         maxLines = 1,
         overflow = TextOverflow.Ellipsis

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

@@ -79,7 +79,7 @@ internal fun HeaderUser(
                         text = data.title,
                         color = data.tintColor,
                         style = Typography.actionXsBold,
-                        fontFamily = HEADER_FONT_FAMILY,
+                        fontFamily = headerFontFamily,
                         maxLines = 1,
                         overflow = TextOverflow.Ellipsis
                     )

package/gradle.properties

@@ -18,7 +18,7 @@ kotlin.apple.xcodeCompatibility.nowarn=true
 name="ComposeKits"
 group=vn.momo.kits
 artifact.id=kits
-version=0.162.40
+version=0.162.41
 
 repo=GitLab
 url=https://gitlab.mservice.com.vn/api/v4/projects/5400/packages/maven

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.162.40-debug",
+  "version": "0.162.41-debug",
   "private": false,
   "dependeNavigationncies": {},
   "devDependencies": {},