@momo-kits/native-kits 0.167.1-beta.7-debug → 0.167.1-beta.8-debug

package/compose/build.gradle.kts

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

package/compose/compose.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
     spec.name                     = 'compose'
-    spec.version                  = '0.167.1-beta.4-debug'
+    spec.version                  = '0.167.1-beta.8-debug'
     spec.homepage                 = 'https://momo.vn'
     spec.source                   = { :http=> ''}
     spec.authors                  = ''

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/KitDesignSystem.kt

@@ -4,10 +4,6 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 
-// Design-system rollout holder, same shape as KitFontScale: the kit is sandboxed and can't read the
-// host config, so the host seeds this once at startup from DesignSystemConfig. getFontFamily() reads
-// it to decide whether the new default font applies, so every screen follows the flag with no prop
-// threading. Backed by snapshot state: writes recompose text automatically.
 object KitDesignSystem {
     var isWhiteList by mutableStateOf(false)
         private set

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

@@ -56,16 +56,48 @@ data class ThemeAssets(
     val headerBackground: String? = null
 )
 
+internal const val LEGACY_DEFAULT_FONT_FAMILY = "SFProText"
+
 @Stable
-data class Theme(
+class Theme(
     val dark: Boolean,
     val colors: ColorScheme,
-    val font: String,
+    font: String,
     val assets: ThemeAssets
 ) {
+    private val designSystemFont = font
+
+    val font: String
+        get() = if (KitDesignSystem.isWhiteList) designSystemFont else LEGACY_DEFAULT_FONT_FAMILY
+
     fun isHeaderImage(): Boolean {
         return !assets.headerBackground.isNullOrEmpty()
     }
+
+    fun copy(
+        dark: Boolean = this.dark,
+        colors: ColorScheme = this.colors,
+        font: String = designSystemFont,
+        assets: ThemeAssets = this.assets
+    ): Theme = Theme(dark, colors, font, assets)
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (other !is Theme) return false
+        return dark == other.dark && colors == other.colors &&
+            designSystemFont == other.designSystemFont && assets == other.assets
+    }
+
+    override fun hashCode(): Int {
+        var result = dark.hashCode()
+        result = 31 * result + colors.hashCode()
+        result = 31 * result + designSystemFont.hashCode()
+        result = 31 * result + assets.hashCode()
+        return result
+    }
+
+    override fun toString(): String =
+        "Theme(dark=$dark, colors=$colors, font=$designSystemFont, assets=$assets)"
 }
 val defaultTheme = Theme(
     dark = false,

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

@@ -83,12 +83,6 @@ fun scaleSize(textStyle: TextStyle): TextStyle {
 }
 
 
-/**
- * Tên file font trong tài nguyên native của app host (xem [hostFontFamily]).
- *
- * SDK không đóng gói font riêng nữa: app host đã bundle sẵn toàn bộ font từ `font-source`
- * cho cả React Native lẫn native, nên bản copy trong `composeResources` chỉ làm phình app.
- */
 private const val LEGACY_DEFAULT_FONT_FILE = "SFProText-Regular.ttf"
 private const val NEW_DEFAULT_FONT_FILE = "MomoTrustSans-Regular.ttf"
 
@@ -120,31 +114,11 @@ 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")
-
 @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/Header.kt

@@ -67,10 +67,11 @@ internal fun Header(onBackHandler: (() -> Unit)? = null) {
         else -> HEADER_HEIGHT
     }
     val opacity by animateFloatAsState(
-        targetValue = when {
-            options.headerType is HeaderType.Transparent -> 0f
-            opacityHeight <= 0 -> if (scrollState.value > 0) 1f else 0f
-            else -> (scrollState.value / opacityHeight.toFloat()).coerceIn(0f, 1f)
+        targetValue = if (options.headerType is HeaderType.Transparent) {
+            0f
+        } else {
+            (scrollState.value / opacityHeight.toFloat())
+                .coerceIn(0f, 1f)
         }
     )
 

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

@@ -9,10 +9,13 @@ 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.LEGACY_DEFAULT_FONT_FAMILY
 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 LEGACY_DEFAULT_FONT_FAMILY
 
 @Composable
 internal fun HeaderTitle(
@@ -29,7 +32,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.167.1-beta.4
+version=0.167.1-beta.8
 
 repo=GitLab
 url=https://gitlab.mservice.com.vn/api/v4/projects/5400/packages/maven

package/ios/native-kits.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'MoMoUIKits'
-  s.version          = '0.167.1-beta.4'
+  s.version          = '0.167.1-beta.8'
   s.summary          = 'MoMoUIKits for iOS'
   s.homepage         = 'https://momo.vn'
   s.license          = { :type => 'MIT' }

package/ios-demo/MoMoUIKitsDemo.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'MoMoUIKitsDemo'
-  s.version          = '0.167.1-beta.4'
+  s.version          = '0.167.1-beta.8'
   s.summary          = 'Demo browser for MoMoUIKits SwiftUI components'
   s.homepage         = 'https://momo.vn'
   s.license          = { :type => 'MIT' }

package/local.properties

@@ -0,0 +1,8 @@
+## This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+#
+# Location of the SDK. This is only used by Gradle.
+# For customization when using a Version Control System, please read the
+# header note.
+#Tue Apr 08 11:13:31 ICT 2025
+sdk.dir=/Users/sonnguyen/Library/Android/sdk

package/package.json

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