@momo-kits/native-kits 0.162.32-debug → 0.162.33-debug

package/compose/build.gradle.kts

@@ -40,7 +40,7 @@ kotlin {
     }
 
     cocoapods {
-        version = "0.162.32-debug"
+        version = "0.162.33-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.164.1-beta.1'
+    spec.version                  = '0.164.1-beta.2-debug'
     spec.homepage                 = 'https://momo.vn'
     spec.source                   = { :http=> ''}
     spec.authors                  = ''

package/compose/src/androidMain/kotlin/vn/momo/kits/const/HostFont.android.kt

@@ -0,0 +1,19 @@
+package vn.momo.kits.const
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.text.font.Font
+import androidx.compose.ui.text.font.FontFamily
+
+@Composable
+internal actual fun hostFontFamily(fileName: String): FontFamily? {
+    val assets = LocalContext.current.applicationContext.assets
+    return remember(fileName) {
+        val path = "fonts/$fileName"
+        // AssetManager.open ném IOException nếu thiếu file; Font(path, assetManager) thì lỗi
+        // muộn lúc render nên phải kiểm tra tồn tại trước.
+        val exists = runCatching { assets.open(path).close() }.isSuccess
+        if (exists) FontFamily(Font(path = path, assetManager = assets)) else null
+    }
+}

package/compose/src/commonMain/kotlin/vn/momo/kits/components/Input.kt

@@ -35,8 +35,6 @@ import vn.momo.kits.application.IsShowBaseLineDebug
 import vn.momo.kits.const.*
 import vn.momo.kits.modifier.conditional
 import vn.momo.kits.modifier.setAutomationId
-import vn.momo.uikits.resources.Res
-import vn.momo.uikits.resources.sfprotext_regular
 
 data class InputSizeDetail(
     val borderWidth: Dp,
@@ -268,7 +266,7 @@ fun Input(
         )
     }
 
-    val passwordFontFamily = getFont(Res.font.sfprotext_regular)
+    val passwordFontFamily = getFontFamily("SFProText", FontWeight.Normal)
     val passwordFontSize = scaleSize(24.sp)
     val visualTransformation = remember(secureTextEntry, inputState.passHidden, passwordFontFamily) {
         if (secureTextEntry && !inputState.passHidden)

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

@@ -0,0 +1,16 @@
+package vn.momo.kits.const
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.text.font.FontFamily
+
+/**
+ * Nạp font từ tài nguyên native của app host thay vì đóng gói bản copy riêng trong SDK.
+ *
+ * App host (MoMo Platform) đã bundle sẵn toàn bộ font từ `font-source`:
+ *  - Android: `assets/fonts/<fileName>` (gradle task `syncMomoFonts`)
+ *  - iOS: file rời ở bundle root (pbxproj fileRef được `post_install.rb` trỏ về font-source)
+ *
+ * Trả về `null` nếu host không có font đó — caller tự fallback [FontFamily.Default].
+ */
+@Composable
+internal expect fun hostFontFamily(fileName: String): FontFamily?

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

@@ -8,12 +8,8 @@ import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.unit.*
-import org.jetbrains.compose.resources.Font
-import org.jetbrains.compose.resources.FontResource
-import org.jetbrains.compose.resources.InternalResourceApi
 import vn.momo.kits.application.LocalContext
 import vn.momo.kits.platform.getScreenDimensions
-import vn.momo.uikits.resources.*
 import kotlin.math.max
 import kotlin.math.min
 
@@ -87,48 +83,39 @@ fun scaleSize(textStyle: TextStyle): TextStyle {
 }
 
 
-@OptIn(InternalResourceApi::class)
-@Composable
-internal fun getFont(font: FontResource): FontFamily {
-    return FontFamily(Font(font))
+/**
+ * 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 DEFAULT_FONT_FILE = "SFProText-Regular.ttf"
+
+private val hostFontFiles: Map<String, String> = mapOf(
+    "SFProText-100" to "SFProText-Thin.ttf",
+    "SFProText-200" to "SFProText-Ultralight.ttf",
+    "SFProText-300" to "SFProText-Light.ttf",
+    "SFProText-400" to DEFAULT_FONT_FILE,
+    "SFProText-500" to "SFProText-Medium.ttf",
+    "SFProText-600" to "SFProText-Semibold.ttf",
+    "SFProText-700" to "SFProText-Bold.ttf",
+    "SFProText-800" to "SFProText-Heavy.ttf",
+    "SFProText-900" to "SFProText-Black.ttf",
+) + (1..9).flatMap { step ->
+    val weight = step * 100
+    listOf(
+        "MoMoSignature-$weight" to "MoMoSignature.otf",
+        "MoMoTrustDisplay-$weight" to "MoMoTrustDisplay.otf",
+    )
 }
 
 @Composable
 fun getFontFamily(fontFamily: String, fontWeight: FontWeight? = FontWeight.Normal): FontFamily {
     val key = "$fontFamily-${fontWeight?.weight}"
-    val fontMap = mapOf(
-        "SFProText-100" to Res.font.sfprotext_thin,
-        "SFProText-200" to Res.font.sfprotext_ultralight,
-        "SFProText-300" to Res.font.sfprotext_light,
-        "SFProText-400" to Res.font.sfprotext_regular,
-        "SFProText-500" to Res.font.sfprotext_medium,
-        "SFProText-600" to Res.font.sfprotext_semibold,
-        "SFProText-700" to Res.font.sfprotext_bold,
-        "SFProText-800" to Res.font.sfprotext_heavy,
-        "SFProText-900" to Res.font.sfprotext_black,
-
-        "MoMoSignature-100" to Res.font.momosignature,
-        "MoMoSignature-200" to Res.font.momosignature,
-        "MoMoSignature-300" to Res.font.momosignature,
-        "MoMoSignature-400" to Res.font.momosignature,
-        "MoMoSignature-500" to Res.font.momosignature,
-        "MoMoSignature-600" to Res.font.momosignature,
-        "MoMoSignature-700" to Res.font.momosignature,
-        "MoMoSignature-800" to Res.font.momosignature,
-        "MoMoSignature-900" to Res.font.momosignature,
-
-        "MoMoTrustDisplay-100" to Res.font.momotrustdisplay,
-        "MoMoTrustDisplay-200" to Res.font.momotrustdisplay,
-        "MoMoTrustDisplay-300" to Res.font.momotrustdisplay,
-        "MoMoTrustDisplay-400" to Res.font.momotrustdisplay,
-        "MoMoTrustDisplay-500" to Res.font.momotrustdisplay,
-        "MoMoTrustDisplay-600" to Res.font.momotrustdisplay,
-        "MoMoTrustDisplay-700" to Res.font.momotrustdisplay,
-        "MoMoTrustDisplay-800" to Res.font.momotrustdisplay,
-        "MoMoTrustDisplay-900" to Res.font.momotrustdisplay,
-    )
-    val font = fontMap[key] ?: Res.font.sfprotext_regular
-    return getFont(font)
+    val fileName = hostFontFiles[key] ?: DEFAULT_FONT_FILE
+    return hostFontFamily(fileName)
+        ?: hostFontFamily(DEFAULT_FONT_FILE)
+        ?: FontFamily.Default
 }
 
 @Immutable

package/compose/src/iosMain/kotlin/vn/momo/kits/const/HostFont.ios.kt

@@ -0,0 +1,40 @@
+@file:OptIn(kotlinx.cinterop.ExperimentalForeignApi::class)
+
+package vn.momo.kits.const
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.platform.Font
+import kotlinx.cinterop.ExperimentalForeignApi
+import kotlinx.cinterop.addressOf
+import kotlinx.cinterop.usePinned
+import platform.Foundation.NSBundle
+import platform.Foundation.NSData
+import platform.Foundation.dataWithContentsOfFile
+import platform.posix.memcpy
+
+@Composable
+internal actual fun hostFontFamily(fileName: String): FontFamily? = remember(fileName) {
+    val name = fileName.substringBeforeLast('.')
+    val ext = fileName.substringAfterLast('.', "")
+    // Font từ font-source nằm rời ở bundle root, không nằm trong compose-resources.
+    val path = NSBundle.mainBundle.pathForResource(name, ext) ?: return@remember null
+    FontFamily(
+        Font(
+            identity = fileName,
+            getData = {
+                NSData.dataWithContentsOfFile(path)?.toByteArray() ?: ByteArray(0)
+            },
+        ),
+    )
+}
+
+@OptIn(ExperimentalForeignApi::class)
+private fun NSData.toByteArray(): ByteArray {
+    val size = length.toInt()
+    if (size == 0) return ByteArray(0)
+    return ByteArray(size).apply {
+        usePinned { pinned -> memcpy(pinned.addressOf(0), bytes, length) }
+    }
+}

package/gradle.properties

@@ -18,7 +18,7 @@ kotlin.apple.xcodeCompatibility.nowarn=true
 name="ComposeKits"
 group=vn.momo.kits
 artifact.id=kits
-version=0.162.32
+version=0.162.33
 
 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.164.1-beta.1'
+  s.version          = '0.164.1-beta.2'
   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.164.1-beta.1'
+  s.version          = '0.164.1-beta.2'
   s.summary          = 'Demo browser for MoMoUIKits SwiftUI components'
   s.homepage         = 'https://momo.vn'
   s.license          = { :type => 'MIT' }

package/package.json

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