@momo-kits/native-kits 0.164.1-trustsans-11-debug → 0.164.1-trustsans-12-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/compose/build.gradle.kts
CHANGED
|
@@ -127,11 +127,18 @@ private val hostFontFiles: Map<String, String> = mapOf(
|
|
|
127
127
|
private const val NEW_DEFAULT_FONT_FAMILY = "MomoTrustSans"
|
|
128
128
|
private const val LEGACY_DEFAULT_FONT_FAMILY = "SFProText"
|
|
129
129
|
|
|
130
|
+
/**
|
|
131
|
+
* Font thuoc bo design system moi. MoMoTrustDisplay chi duoc header dung tu DS-791
|
|
132
|
+
* (commit header title 5bfde6251); truoc do header lay font theo theme, nen ngoai
|
|
133
|
+
* whitelist ca hai deu ha ve [LEGACY_DEFAULT_FONT_FAMILY].
|
|
134
|
+
*/
|
|
135
|
+
private val newFontFamilies = setOf(NEW_DEFAULT_FONT_FAMILY, "MoMoTrustDisplay")
|
|
136
|
+
|
|
130
137
|
@Composable
|
|
131
138
|
fun getFontFamily(fontFamily: String, fontWeight: FontWeight? = FontWeight.Normal): FontFamily {
|
|
132
139
|
val isWhiteList = KitDesignSystem.isWhiteList
|
|
133
140
|
val resolvedFamily =
|
|
134
|
-
if (fontFamily
|
|
141
|
+
if (fontFamily in newFontFamilies && !isWhiteList) {
|
|
135
142
|
LEGACY_DEFAULT_FONT_FAMILY
|
|
136
143
|
} else {
|
|
137
144
|
fontFamily
|
package/gradle.properties
CHANGED
|
@@ -18,7 +18,7 @@ kotlin.apple.xcodeCompatibility.nowarn=true
|
|
|
18
18
|
name="ComposeKits"
|
|
19
19
|
group=vn.momo.kits
|
|
20
20
|
artifact.id=kits
|
|
21
|
-
version=0.164.1-trustsans-
|
|
21
|
+
version=0.164.1-trustsans-12
|
|
22
22
|
|
|
23
23
|
repo=GitLab
|
|
24
24
|
url=https://gitlab.mservice.com.vn/api/v4/projects/5400/packages/maven
|