@momo-kits/native-kits 0.164.1-trustsans-test.1-debug → 0.164.1-trustsans-test.2-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.
Files changed (13) hide show
  1. package/compose/build.gradle.kts +1 -1
  2. package/compose/compose.podspec +1 -1
  3. package/compose/src/commonMain/kotlin/vn/momo/kits/application/LiteScreen.kt +4 -1
  4. package/compose/src/commonMain/kotlin/vn/momo/kits/components/InputMoney.kt +3 -1
  5. package/compose/src/commonMain/kotlin/vn/momo/kits/components/InputPhoneNumber.kt +8 -1
  6. package/compose/src/commonMain/kotlin/vn/momo/kits/components/InputSearch.kt +9 -4
  7. package/compose/src/commonMain/kotlin/vn/momo/kits/components/InputTextArea.kt +4 -1
  8. package/compose/src/commonMain/kotlin/vn/momo/kits/components/Stepper.kt +3 -0
  9. package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/component/HeaderUser.kt +4 -1
  10. package/gradle.properties +1 -1
  11. package/ios/native-kits.podspec +1 -1
  12. package/ios-demo/MoMoUIKitsDemo.podspec +1 -1
  13. package/package.json +1 -1
package/compose/build.gradle.kts CHANGED
@@ -40,7 +40,7 @@ kotlin {
40
40
  }
41
41
 
42
42
  cocoapods {
43
- version = "0.164.1-trustsans-test.1-debug"
43
+ version = "0.164.1-trustsans-test.2-debug"
44
44
  summary = "IOS Shared module"
45
45
  homepage = "https://momo.vn"
46
46
  ios.deploymentTarget = "15.0"
package/compose/compose.podspec CHANGED
@@ -1,6 +1,6 @@
1
1
  Pod::Spec.new do |spec|
2
2
  spec.name = 'compose'
3
- spec.version = '0.164.1-trustsans-test.1-debug'
3
+ spec.version = '0.164.1-trustsans-test.2-debug'
4
4
  spec.homepage = 'https://momo.vn'
5
5
  spec.source = { :http=> ''}
6
6
  spec.authors = ''
package/compose/src/commonMain/kotlin/vn/momo/kits/application/LiteScreen.kt CHANGED
@@ -40,6 +40,7 @@ import vn.momo.kits.const.AppTheme
40
40
  import vn.momo.kits.const.Colors
41
41
  import vn.momo.kits.const.Spacing
42
42
  import vn.momo.kits.const.Typography
43
+ import vn.momo.kits.const.getFontFamily
43
44
  import vn.momo.kits.modifier.kitsAutomationId
44
45
  import vn.momo.kits.modifier.noFeedbackClickable
45
46
  import vn.momo.kits.modifier.setAutomationId
@@ -688,9 +689,11 @@ private fun LiteInputSearch(
688
689
  inputSearchProps.isShowBtnText && !inputSearchProps.btnText.isNullOrEmpty()
689
690
  }
690
691
  }
691
- val inputFieldStyle = remember(theme) {
692
+ val inputFieldFontFamily = getFontFamily(theme.font, Typography.bodyDefaultRegular.fontWeight)
693
+ val inputFieldStyle = remember(theme, inputFieldFontFamily) {
692
694
  Typography.bodyDefaultRegular.copy(
693
695
  color = theme.colors.text.default,
696
+ fontFamily = inputFieldFontFamily,
694
697
  )
695
698
  }
696
699
 
package/compose/src/commonMain/kotlin/vn/momo/kits/components/InputMoney.kt CHANGED
@@ -44,6 +44,7 @@ import vn.momo.kits.const.Spacing
44
44
  import vn.momo.kits.application.IsShowBaseLineDebug
45
45
  import vn.momo.kits.const.Colors
46
46
  import vn.momo.kits.const.Typography
47
+ import vn.momo.kits.const.getFontFamily
47
48
  import vn.momo.kits.modifier.conditional
48
49
  import vn.momo.kits.utils.formatNumberToMoney
49
50
 
@@ -122,7 +123,8 @@ fun InputMoney(
122
123
  color = textColor,
123
124
  fontSize = 20.sp,
124
125
  lineHeight = 24.sp,
125
- fontWeight = fontWeight.value
126
+ fontWeight = fontWeight.value,
127
+ fontFamily = getFontFamily(AppTheme.current.font, fontWeight.value)
126
128
  ),
127
129
  visualTransformation = CustomConverter(),
128
130
  keyboardOptions = KeyboardOptions.Default.copy(keyboardType = keyboardType),
package/compose/src/commonMain/kotlin/vn/momo/kits/components/InputPhoneNumber.kt CHANGED
@@ -21,6 +21,7 @@ import androidx.compose.ui.unit.Dp
21
21
  import androidx.compose.ui.unit.dp
22
22
  import vn.momo.kits.application.IsShowBaseLineDebug
23
23
  import vn.momo.kits.const.*
24
+ import vn.momo.kits.const.getFontFamily
24
25
  import vn.momo.kits.modifier.conditional
25
26
  import vn.momo.kits.modifier.setAutomationId
26
27
 
@@ -97,7 +98,13 @@ fun InputPhoneNumber(
97
98
  }
98
99
 
99
100
  val (textColor, placeholderColor, iconTintColor) = colors
100
- val textStyle = scaleSize(size.values.textStyle.copy(color = textColor))
101
+ val baseTextStyle = size.values.textStyle
102
+ val textStyle = scaleSize(
103
+ baseTextStyle.copy(
104
+ color = textColor,
105
+ fontFamily = getFontFamily(AppTheme.current.font, baseTextStyle.fontWeight)
106
+ )
107
+ )
101
108
 
102
109
 
103
110
  Column(modifier = modifier
package/compose/src/commonMain/kotlin/vn/momo/kits/components/InputSearch.kt CHANGED
@@ -42,6 +42,7 @@ import vn.momo.kits.const.Radius
42
42
  import vn.momo.kits.const.Spacing
43
43
  import vn.momo.kits.application.IsShowBaseLineDebug
44
44
  import vn.momo.kits.const.Typography
45
+ import vn.momo.kits.const.getFontFamily
45
46
  import vn.momo.kits.const.scaleSize
46
47
  import vn.momo.kits.modifier.conditional
47
48
  import vn.momo.kits.utils.ifTrue
@@ -131,19 +132,23 @@ fun InputSearch(
131
132
  val fontSize = 14.sp
132
133
  val scaleFontSize = scaleSize(fontSize)
133
134
 
134
- val textStyle = remember(textColor, inputSearchProps.fontWeight.value) {
135
+ val fontFamily = getFontFamily(AppTheme.current.font, inputSearchProps.fontWeight.value)
136
+
137
+ val textStyle = remember(textColor, inputSearchProps.fontWeight.value, fontFamily) {
135
138
  TextStyle(
136
139
  color = textColor,
137
140
  fontSize = scaleFontSize,
138
- fontWeight = inputSearchProps.fontWeight.value
141
+ fontWeight = inputSearchProps.fontWeight.value,
142
+ fontFamily = fontFamily
139
143
  )
140
144
  }
141
145
 
142
- val placeHolderStyle = remember(textColor, inputSearchProps.fontWeight.value) {
146
+ val placeHolderStyle = remember(textColor, inputSearchProps.fontWeight.value, fontFamily) {
143
147
  TextStyle(
144
148
  color = textColor,
145
149
  fontSize = fontSize,
146
- fontWeight = inputSearchProps.fontWeight.value
150
+ fontWeight = inputSearchProps.fontWeight.value,
151
+ fontFamily = fontFamily
147
152
  )
148
153
  }
149
154
 
package/compose/src/commonMain/kotlin/vn/momo/kits/components/InputTextArea.kt CHANGED
@@ -21,6 +21,8 @@ import androidx.compose.ui.unit.sp
21
21
  import androidx.compose.ui.zIndex
22
22
  import vn.momo.kits.application.IsShowBaseLineDebug
23
23
  import vn.momo.kits.const.*
24
+ import vn.momo.kits.const.AppTheme
25
+ import vn.momo.kits.const.getFontFamily
24
26
  import vn.momo.kits.modifier.InternalApi
25
27
  import vn.momo.kits.modifier.conditional
26
28
 
@@ -75,7 +77,8 @@ fun InputTextArea(
75
77
  color = textColor,
76
78
  fontSize = scaleFontSize,
77
79
  lineHeight = scaleLineHeight,
78
- fontWeight = fontWeight.value
80
+ fontWeight = fontWeight.value,
81
+ fontFamily = getFontFamily(AppTheme.current.font, fontWeight.value)
79
82
  ),
80
83
  keyboardOptions = KeyboardOptions.Default.copy(keyboardType = keyboardType),
81
84
  modifier = Modifier.height(scaleHeight).onFocusChanged {
package/compose/src/commonMain/kotlin/vn/momo/kits/components/Stepper.kt CHANGED
@@ -12,6 +12,7 @@ import androidx.compose.ui.Alignment
12
12
  import androidx.compose.ui.Modifier
13
13
  import androidx.compose.ui.graphics.Color
14
14
  import androidx.compose.ui.text.TextStyle
15
+ import androidx.compose.ui.text.font.FontWeight
15
16
  import androidx.compose.ui.text.input.KeyboardType
16
17
  import androidx.compose.ui.text.style.TextAlign
17
18
  import androidx.compose.ui.unit.Dp
@@ -19,6 +20,7 @@ import androidx.compose.ui.unit.dp
19
20
  import androidx.compose.ui.unit.sp
20
21
  import vn.momo.kits.application.IsShowBaseLineDebug
21
22
  import vn.momo.kits.const.*
23
+ import vn.momo.kits.const.getFontFamily
22
24
  import vn.momo.kits.modifier.activeOpacityClickable
23
25
  import vn.momo.kits.modifier.conditional
24
26
 
@@ -108,6 +110,7 @@ private fun StepperNumberView(
108
110
  color = textColor,
109
111
  fontSize = scaledFontSize,
110
112
  textAlign = TextAlign.Center,
113
+ fontFamily = getFontFamily(theme.font, FontWeight.Normal),
111
114
  )
112
115
 
113
116
  Box(
package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/component/HeaderUser.kt CHANGED
@@ -16,6 +16,7 @@ import androidx.compose.ui.draw.clip
16
16
  import androidx.compose.ui.draw.clipToBounds
17
17
  import androidx.compose.ui.layout.ContentScale
18
18
  import androidx.compose.ui.text.TextStyle
19
+ import androidx.compose.ui.text.font.FontWeight
19
20
  import androidx.compose.ui.text.style.TextOverflow
20
21
  import androidx.compose.ui.unit.Dp
21
22
  import androidx.compose.ui.unit.dp
@@ -28,6 +29,7 @@ import vn.momo.kits.const.AppTheme
28
29
  import vn.momo.kits.const.Colors
29
30
  import vn.momo.kits.const.Spacing
30
31
  import vn.momo.kits.const.Typography
32
+ import vn.momo.kits.const.getFontFamily
31
33
  import vn.momo.kits.modifier.activeOpacityClickable
32
34
  import vn.momo.kits.navigation.component.HeaderTitle.User
33
35
  import vn.momo.kits.platform.getScreenDimensions
@@ -303,7 +305,8 @@ private fun ManyAvatar(options: Options, modifier: Modifier = Modifier, urls: Av
303
305
  BasicText(
304
306
  text = "+$more",
305
307
  style = TextStyle(
306
- color = Colors.pink_03
308
+ color = Colors.pink_03,
309
+ fontFamily = getFontFamily(AppTheme.current.font, FontWeight.Normal)
307
310
  ),
308
311
  maxLines = 1,
309
312
  autoSize = TextAutoSize.StepBased(
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-test.1
21
+ version=0.164.1-trustsans-test.2
22
22
 
23
23
  repo=GitLab
24
24
  url=https://gitlab.mservice.com.vn/api/v4/projects/5400/packages/maven
package/ios/native-kits.podspec CHANGED
@@ -1,6 +1,6 @@
1
1
  Pod::Spec.new do |s|
2
2
  s.name = 'MoMoUIKits'
3
- s.version = '0.164.1-trustsans-test.1'
3
+ s.version = '0.164.1-trustsans-test.2'
4
4
  s.summary = 'MoMoUIKits for iOS'
5
5
  s.homepage = 'https://momo.vn'
6
6
  s.license = { :type => 'MIT' }
package/ios-demo/MoMoUIKitsDemo.podspec CHANGED
@@ -1,6 +1,6 @@
1
1
  Pod::Spec.new do |s|
2
2
  s.name = 'MoMoUIKitsDemo'
3
- s.version = '0.164.1-trustsans-test.1'
3
+ s.version = '0.164.1-trustsans-test.2'
4
4
  s.summary = 'Demo browser for MoMoUIKits SwiftUI components'
5
5
  s.homepage = 'https://momo.vn'
6
6
  s.license = { :type => 'MIT' }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@momo-kits/native-kits",
3
- "version": "0.164.1-trustsans-test.1-debug",
3
+ "version": "0.164.1-trustsans-test.2-debug",
4
4
  "private": false,
5
5
  "dependeNavigationncies": {},
6
6
  "devDependencies": {},