@momo-kits/native-kits 0.114.2-beta.2 → 0.114.2-beta.4

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 (24) hide show
  1. package/compose/src/commonMain/kotlin/vn/momo/kits/application/AnimationSearchInput.kt +0 -1
  2. package/compose/src/commonMain/kotlin/vn/momo/kits/application/FloatingButton.kt +1 -1
  3. package/compose/src/commonMain/kotlin/vn/momo/kits/application/Header.kt +0 -1
  4. package/compose/src/commonMain/kotlin/vn/momo/kits/application/HeaderTitle.kt +1 -1
  5. package/compose/src/commonMain/kotlin/vn/momo/kits/components/Badge.kt +1 -1
  6. package/compose/src/commonMain/kotlin/vn/momo/kits/components/Button.kt +4 -4
  7. package/compose/src/commonMain/kotlin/vn/momo/kits/components/CheckBox.kt +1 -1
  8. package/compose/src/commonMain/kotlin/vn/momo/kits/components/Information.kt +3 -3
  9. package/compose/src/commonMain/kotlin/vn/momo/kits/components/Input.kt +3 -3
  10. package/compose/src/commonMain/kotlin/vn/momo/kits/components/InputDropDown.kt +5 -5
  11. package/compose/src/commonMain/kotlin/vn/momo/kits/components/InputMoney.kt +7 -7
  12. package/compose/src/commonMain/kotlin/vn/momo/kits/components/InputOTP.kt +4 -4
  13. package/compose/src/commonMain/kotlin/vn/momo/kits/components/InputSearch.kt +7 -7
  14. package/compose/src/commonMain/kotlin/vn/momo/kits/components/InputTextArea.kt +9 -9
  15. package/compose/src/commonMain/kotlin/vn/momo/kits/components/PaginationNumber.kt +1 -1
  16. package/compose/src/commonMain/kotlin/vn/momo/kits/components/PopupNotify.kt +4 -4
  17. package/compose/src/commonMain/kotlin/vn/momo/kits/components/Radio.kt +1 -1
  18. package/compose/src/commonMain/kotlin/vn/momo/kits/components/Tag.kt +1 -1
  19. package/compose/src/commonMain/kotlin/vn/momo/kits/components/Text.kt +1 -1
  20. package/compose/src/commonMain/kotlin/vn/momo/kits/components/dateTimePicker/DateTimePicker.kt +1 -1
  21. package/compose/src/commonMain/kotlin/vn/momo/kits/components/dateTimePicker/DateTimePickerExample.kt +4 -4
  22. package/compose/src/commonMain/kotlin/vn/momo/kits/components/dateTimePicker/WheelPicker.kt +1 -1
  23. package/compose/src/commonMain/kotlin/vn/momo/kits/const/Typography.kt +1 -1
  24. package/package.json +1 -1
@@ -163,7 +163,7 @@ fun FloatingButton(
163
163
  Text(
164
164
  text ?: "",
165
165
  color = Color.White,
166
- style = Typography.actionDefault
166
+ style = Typography.actionDefaultBold
167
167
  )
168
168
  }
169
169
  }
@@ -161,7 +161,6 @@ fun Header(
161
161
  },
162
162
  contentAlignment = if (titlePosition == TitlePosition.LEFT) Alignment.TopStart else Alignment.Center
163
163
  ) {
164
-
165
164
  HeaderTitle(
166
165
  title = title,
167
166
  color = tintIconColor,
@@ -19,7 +19,7 @@ fun HeaderTitle(
19
19
  modifier = Modifier.then(modifier).zIndex(1f),
20
20
  text = title,
21
21
  textAlign = textAlign,
22
- style = Typography.actionS,
22
+ style = Typography.actionSBold,
23
23
  color = color,
24
24
  maxLines = 1
25
25
  )
@@ -72,7 +72,7 @@ fun Badge(label: String = "Label", backgroundColor: Color? = null) {
72
72
  Text(
73
73
  text = formatTitle(label),
74
74
  color = Colors.black_01,
75
- style = Typography.actionXxs
75
+ style = Typography.actionXxsBold
76
76
  )
77
77
  }
78
78
  }
@@ -74,10 +74,10 @@ enum class Size(val value: ButtonSpecs) {
74
74
 
75
75
  fun getStyle(size: Size): TextStyle {
76
76
  return when (size.name) {
77
- Size.LARGE.name -> Typography.actionDefault
78
- Size.MEDIUM.name -> Typography.actionS
79
- Size.SMALL.name -> Typography.actionXs
80
- else -> Typography.actionDefault
77
+ Size.LARGE.name -> Typography.actionDefaultBold
78
+ Size.MEDIUM.name -> Typography.actionSBold
79
+ Size.SMALL.name -> Typography.actionXsBold
80
+ else -> Typography.actionDefaultBold
81
81
  }
82
82
  }
83
83
 
@@ -68,7 +68,7 @@ fun CheckBox(
68
68
  if (title.isNotEmpty()) {
69
69
  Spacer(Modifier.size(Spacing.S))
70
70
  Text(
71
- style = Typography.descriptionDefault,
71
+ style = Typography.descriptionDefaultRegular,
72
72
  text = title,
73
73
  )
74
74
  }
@@ -74,9 +74,9 @@ fun Information(
74
74
  }
75
75
  Column(modifier = Modifier.weight(1f)) {
76
76
  if (title != null) {
77
- Text(title, style = Typography.labelDefault)
77
+ Text(title, style = Typography.labelDefaultMedium)
78
78
  }
79
- Text(description, style = Typography.descriptionS)
79
+ Text(description, style = Typography.descriptionDefaultRegular)
80
80
  }
81
81
  if (onPressClose != null && showIconClose) {
82
82
  Icon(source = "navigation_close", size = 16.dp, modifier = Modifier.clickable(onClick = onPressClose))
@@ -84,7 +84,7 @@ fun Information(
84
84
  }
85
85
  if (CTA != null && onPressCTA != null) {
86
86
  Row(modifier = Modifier.padding(top = Spacing.S)) {
87
- Text(CTA, modifier = Modifier.weight(1f).clickable(onClick = onPressCTA), textAlign = TextAlign.End, style = Typography.actionXs, color = color)
87
+ Text(CTA, modifier = Modifier.weight(1f).clickable(onClick = onPressCTA), textAlign = TextAlign.End, style = Typography.actionXsBold, color = color)
88
88
  }
89
89
  }
90
90
  }
@@ -144,7 +144,7 @@ fun ErrorView(errorMessage: String, errorSpacing: Boolean, hintText: String) {
144
144
  )
145
145
  Text(
146
146
  errorMessage.ifEmpty { hintTextDefault },
147
- style = Typography.descriptionS,
147
+ style = Typography.descriptionDefaultRegular,
148
148
  modifier = Modifier.padding(start = Spacing.XS),
149
149
  color = color,
150
150
  )
@@ -261,13 +261,13 @@ fun Input(
261
261
  ) {
262
262
  Text(
263
263
  floatingValue,
264
- style = Typography.labelS,
264
+ style = Typography.labelSMedium,
265
265
  color = floatingTitleColor
266
266
  )
267
267
  if (required) {
268
268
  Text(
269
269
  "*",
270
- style = Typography.labelS,
270
+ style = Typography.labelSMedium,
271
271
  color = AppTheme.current.colors.error.primary,
272
272
  )
273
273
  }
@@ -33,7 +33,7 @@ import vn.momo.kits.const.Typography
33
33
 
34
34
  @Composable
35
35
  fun InputDropDown(
36
- value: MutableState<String> = remember { mutableStateOf("") },
36
+ text: String = "",
37
37
  floatingValue: String = "",
38
38
  floatingValueColor: Color = AppTheme.current.colors.text.hint,
39
39
  floatingIcon: String = "",
@@ -94,13 +94,13 @@ fun InputDropDown(
94
94
  ) {
95
95
  Text(
96
96
  floatingValue,
97
- style = Typography.labelS,
97
+ style = Typography.labelSMedium,
98
98
  color = floatingTitleColor
99
99
  )
100
100
  if (required) {
101
101
  Text(
102
102
  "*",
103
- style = Typography.labelS,
103
+ style = Typography.labelSMedium,
104
104
  color = AppTheme.current.colors.error.primary,
105
105
  )
106
106
  }
@@ -140,12 +140,12 @@ fun InputDropDown(
140
140
  }
141
141
  Box(Modifier.weight(1f)) {
142
142
  Text(
143
- text = value.value.ifEmpty { placeholder },
143
+ text = text.ifEmpty { placeholder },
144
144
  style = TextStyle(
145
145
  fontSize = 16.sp,
146
146
  lineHeight = 24.sp
147
147
  ),
148
- color = if (value.value.isEmpty()) placeholderColor else textColor
148
+ color = if (text.isEmpty()) placeholderColor else textColor
149
149
  )
150
150
  }
151
151
  RenderRightIcon(
@@ -63,7 +63,7 @@ class CustomConverter : VisualTransformation {
63
63
 
64
64
  @Composable
65
65
  fun InputMoney(
66
- text: MutableState<String> = remember { mutableStateOf("0") },
66
+ text: String = "0",
67
67
  floatingValue: String = "",
68
68
  floatingValueColor: Color = AppTheme.current.colors.text.hint,
69
69
  floatingIcon: String = "",
@@ -115,7 +115,7 @@ fun InputMoney(
115
115
  BasicTextField(
116
116
  enabled = !disabled,
117
117
  singleLine = true,
118
- value = text.value,
118
+ value = text,
119
119
  textStyle = TextStyle(
120
120
  color = textColor,
121
121
  fontSize = 20.sp,
@@ -150,13 +150,13 @@ fun InputMoney(
150
150
  ) {
151
151
  Text(
152
152
  floatingValue,
153
- style = Typography.labelS,
153
+ style = Typography.labelSMedium,
154
154
  color = floatingTitleColor
155
155
  )
156
156
  if (required) {
157
157
  Text(
158
158
  "*",
159
- style = Typography.labelS,
159
+ style = Typography.labelSMedium,
160
160
  color = AppTheme.current.colors.error.primary,
161
161
  )
162
162
  }
@@ -195,7 +195,7 @@ fun InputMoney(
195
195
  )
196
196
  }
197
197
  Box(Modifier.weight(9f).padding(start = 0.dp)) {
198
- if (text.value.isEmpty()) {
198
+ if (text.isEmpty()) {
199
199
  Text(
200
200
  text = placeholder,
201
201
  style = TextStyle(
@@ -209,7 +209,7 @@ fun InputMoney(
209
209
  innerTextField()
210
210
  }
211
211
  }
212
- if (isFocused && text.value.isNotEmpty()) {
212
+ if (isFocused && text.isNotEmpty()) {
213
213
  Row {
214
214
  Spacer(Modifier.width(Spacing.XS))
215
215
  Icon(
@@ -217,7 +217,7 @@ fun InputMoney(
217
217
  size = 16.dp,
218
218
  color = AppTheme.current.colors.text.hint,
219
219
  modifier = Modifier.clickable(
220
- onClick = { text.value = "" },
220
+ onClick = { onChangeText("") },
221
221
  interactionSource = remember { MutableInteractionSource() },
222
222
  indication = null
223
223
  )
@@ -68,7 +68,7 @@ fun OTPCaret() {
68
68
  Text(
69
69
  text = "-",
70
70
  color = AppTheme.current.colors.text.hint,
71
- style = Typography.descriptionDefault
71
+ style = Typography.descriptionDefaultRegular
72
72
  )
73
73
  }
74
74
  }
@@ -133,7 +133,7 @@ fun InputOTP(
133
133
  ) {
134
134
  Text(
135
135
  floatingValue,
136
- style = Typography.labelS,
136
+ style = Typography.labelSMedium,
137
137
  color = AppTheme.current.colors.text.hint
138
138
  )
139
139
  }
@@ -164,7 +164,7 @@ fun InputOTP(
164
164
  val textColor =
165
165
  if (value.getOrNull(i) != null) AppTheme.current.colors.text.default else AppTheme.current.colors.text.hint
166
166
  val typo =
167
- if (value.getOrNull(i) != null) Typography.titleS else Typography.descriptionDefault
167
+ if (value.getOrNull(i) != null) Typography.headerDefaultBold else Typography.descriptionDefaultRegular
168
168
  Text(
169
169
  text = value.getOrNull(i)?.toString() ?: "-",
170
170
  color = textColor,
@@ -182,7 +182,7 @@ fun InputOTP(
182
182
  } else {
183
183
  for (i in value.indices) {
184
184
  Text(
185
- style = Typography.titleS,
185
+ style = Typography.headerDefaultBold,
186
186
  text = value[i].toString()
187
187
  )
188
188
  if (i != value.length - 1 || (isFocused && value.length != MAX_LENGTH)) {
@@ -78,7 +78,7 @@ fun RenderRightIconSearch(
78
78
  }
79
79
 
80
80
  data class InputSearchProps(
81
- val text: MutableState<String>,
81
+ val text: String = "",
82
82
  val buttonText: String = "",
83
83
  val showButtonText: Boolean = false,
84
84
  val placeholder: String = "",
@@ -106,7 +106,7 @@ data class InputSearchProps(
106
106
  @Composable
107
107
  fun InputSearch(
108
108
  inputSearchProps: InputSearchProps = InputSearchProps(
109
- text = remember { mutableStateOf("") },
109
+ text = "",
110
110
  iconColor = AppTheme.current.colors.text.default
111
111
  ),
112
112
  ) {
@@ -127,7 +127,7 @@ fun InputSearch(
127
127
  BasicTextField(
128
128
  enabled = !inputSearchProps.disabled,
129
129
  singleLine = true,
130
- value = inputSearchProps.text.value,
130
+ value = inputSearchProps.text,
131
131
  textStyle = TextStyle(
132
132
  color = textColor,
133
133
  fontSize = 14.sp,
@@ -175,7 +175,7 @@ fun InputSearch(
175
175
  color = AppTheme.current.colors.text.hint
176
176
  )
177
177
  Box(Modifier.weight(1f)) {
178
- if (inputSearchProps.text.value.isEmpty()) {
178
+ if (inputSearchProps.text.isEmpty()) {
179
179
  Text(
180
180
  text = inputSearchProps.placeholder,
181
181
  style = TextStyle(
@@ -190,7 +190,7 @@ fun InputSearch(
190
190
  }
191
191
  innerTextField()
192
192
  }
193
- if (inputSearchProps.clearCondition?.invoke() == true || (isFocused && inputSearchProps.text.value.isNotEmpty())) {
193
+ if (inputSearchProps.clearCondition?.invoke() == true || (isFocused && inputSearchProps.text.isNotEmpty())) {
194
194
  Row {
195
195
  Spacer(Modifier.width(Spacing.XS))
196
196
  Icon(
@@ -199,7 +199,7 @@ fun InputSearch(
199
199
  color = AppTheme.current.colors.text.hint,
200
200
  modifier = Modifier.clickable(
201
201
  onClick = {
202
- inputSearchProps.text.value = ""
202
+ inputSearchProps.onChangeText("")
203
203
  inputSearchProps.onClearPress.invoke()
204
204
  },
205
205
  interactionSource = remember { MutableInteractionSource() },
@@ -223,7 +223,7 @@ fun InputSearch(
223
223
  if (inputSearchProps.showButtonText) {
224
224
  Text(
225
225
  text = inputSearchProps.buttonText,
226
- style = Typography.actionDefault,
226
+ style = Typography.actionDefaultBold,
227
227
  color = AppTheme.current.colors.text.default,
228
228
  modifier = Modifier.padding(start = Spacing.L).clickable(
229
229
  interactionSource = remember { MutableInteractionSource() },
@@ -42,7 +42,7 @@ val DEFAULT_HEIGHT = 104.dp
42
42
 
43
43
  @Composable
44
44
  fun InputTextArea(
45
- text: MutableState<String> = remember { mutableStateOf("") },
45
+ text: String = "",
46
46
  maxLength: Int = MAX_LENGTH,
47
47
  height: Dp = DEFAULT_HEIGHT,
48
48
  floatingValue: String = "",
@@ -92,7 +92,7 @@ fun InputTextArea(
92
92
  BasicTextField(
93
93
  enabled = !disabled,
94
94
  singleLine = false,
95
- value = text.value,
95
+ value = text,
96
96
  textStyle = TextStyle(
97
97
  color = textColor,
98
98
  fontSize = 16.sp,
@@ -129,13 +129,13 @@ fun InputTextArea(
129
129
  ) {
130
130
  Text(
131
131
  floatingValue,
132
- style = Typography.labelS,
132
+ style = Typography.labelSMedium,
133
133
  color = floatingTitleColor
134
134
  )
135
135
  if (required) {
136
136
  Text(
137
137
  "*",
138
- style = Typography.labelS,
138
+ style = Typography.labelSMedium,
139
139
  color = AppTheme.current.colors.error.primary,
140
140
  )
141
141
  }
@@ -173,7 +173,7 @@ fun InputTextArea(
173
173
  verticalAlignment = Alignment.Top
174
174
  ) {
175
175
  Box(Modifier.weight(1f)) {
176
- if (text.value.isEmpty()) {
176
+ if (text.isEmpty()) {
177
177
  Text(
178
178
  text = placeholder,
179
179
  style = TextStyle(
@@ -186,7 +186,7 @@ fun InputTextArea(
186
186
  }
187
187
  innerTextField()
188
188
  }
189
- if (isFocused && text.value.isNotEmpty()) {
189
+ if (isFocused && text.isNotEmpty()) {
190
190
  Row {
191
191
  Spacer(Modifier.width(Spacing.XS))
192
192
  Icon(
@@ -194,7 +194,7 @@ fun InputTextArea(
194
194
  size = 16.dp,
195
195
  color = AppTheme.current.colors.text.hint,
196
196
  modifier = Modifier.clickable(
197
- onClick = { text.value = "" },
197
+ onClick = { onChangeText("") },
198
198
  interactionSource = remember { MutableInteractionSource() },
199
199
  indication = null
200
200
  )
@@ -212,8 +212,8 @@ fun InputTextArea(
212
212
  contentAlignment = Alignment.CenterEnd
213
213
  ) {
214
214
  Text(
215
- "${text.value.length}/$maxLength",
216
- style = Typography.descriptionXs,
215
+ "${text.length}/$maxLength",
216
+ style = Typography.descriptionXsRegular,
217
217
  color = AppTheme.current.colors.text.hint
218
218
  )
219
219
  }
@@ -31,7 +31,7 @@ fun PaginationNumber(
31
31
  modifier = Modifier.padding(horizontal = Spacing.S),
32
32
  text = "${1 + activeIndex}/$dataLength",
33
33
  color = Colors.black_01,
34
- style = Typography.labelDefault
34
+ style = Typography.labelDefaultMedium
35
35
  )
36
36
  }
37
37
  }
@@ -75,7 +75,7 @@ fun PopupNotify(
75
75
  Text(
76
76
  text = description,
77
77
  onTextLayout = { layoutResult.value = it },
78
- style = Typography.paragraphDefault
78
+ style = Typography.bodyDefaultRegular
79
79
  )
80
80
  }
81
81
  }
@@ -86,7 +86,7 @@ fun PopupNotify(
86
86
  Text(
87
87
  text = description,
88
88
  onTextLayout = { layoutResult.value = it },
89
- style = Typography.paragraphDefault
89
+ style = Typography.bodyDefaultRegular
90
90
  )
91
91
  }
92
92
  }
@@ -116,12 +116,12 @@ fun PopupNotify(
116
116
  )
117
117
 
118
118
  Column(modifier = Modifier.padding(Spacing.XL)) {
119
- Text(style = Typography.titleXs, maxLines = 2, text = title, modifier = Modifier.setAutomationId("title_popup_permission"))
119
+ Text(style = Typography.headerDefaultBold, maxLines = 2, text = title, modifier = Modifier.setAutomationId("title_popup_permission"))
120
120
  content(Modifier.padding(top = Spacing.S))
121
121
  if (error.isNotEmpty()) {
122
122
  Text(
123
123
  text = error,
124
- style = Typography.descriptionXs,
124
+ style = Typography.descriptionXsRegular,
125
125
  color = AppTheme.current.colors.text.hint,
126
126
  maxLines = 1,
127
127
  modifier = Modifier.padding(top = Spacing.S)
@@ -57,7 +57,7 @@ fun Radio(
57
57
  )
58
58
  if (label.isNotEmpty()) {
59
59
  Text(
60
- style = Typography.descriptionDefault,
60
+ style = Typography.descriptionDefaultRegular,
61
61
  text = label,
62
62
  )
63
63
  }
@@ -79,7 +79,7 @@ fun Tag(
79
79
  Text(
80
80
  text = label,
81
81
  color = labelColor,
82
- style = Typography.labelS
82
+ style = Typography.labelSMedium
83
83
  )
84
84
  }
85
85
  }
@@ -20,7 +20,7 @@ import vn.momo.kits.modifier.setAutomationId
20
20
  fun Text(
21
21
  text: String,
22
22
  color: Color? = null,
23
- style: TextStyle = Typography.paragraphDefault,
23
+ style: TextStyle = Typography.bodyDefaultRegular,
24
24
  textAlign: TextAlign? = TextAlign.Start,
25
25
  modifier: Modifier = Modifier,
26
26
  maxLines: Int = Int.MAX_VALUE,
@@ -140,7 +140,7 @@ fun DateTimePicker(
140
140
  if (hasLabel) {
141
141
  Text(
142
142
  text = arrayLabelTime[index],
143
- style = Typography.actionS,
143
+ style = Typography.actionSBold,
144
144
  modifier = Modifier.padding(bottom = Spacing.S)
145
145
  )
146
146
  }
@@ -34,7 +34,7 @@ fun DateTimePickerExample() {
34
34
  // Display the current selected date
35
35
  Text(
36
36
  text = "Selected Date: ${formatLocalDateTime(selectedDate)}",
37
- style = Typography.paragraphDefault
37
+ style = Typography.bodyDefaultRegular
38
38
  )
39
39
 
40
40
  Spacer(modifier = Modifier.height(Spacing.L))
@@ -42,7 +42,7 @@ fun DateTimePickerExample() {
42
42
  // Date Picker (DD-MM-YYYY)
43
43
  Text(
44
44
  text = "Date Picker",
45
- style = Typography.descriptionDefault
45
+ style = Typography.descriptionDefaultRegular
46
46
  )
47
47
 
48
48
  Spacer(modifier = Modifier.height(Spacing.S))
@@ -58,7 +58,7 @@ fun DateTimePickerExample() {
58
58
  // Date and Time Picker (DD-MM-YYYY HH:mm)
59
59
  Text(
60
60
  text = "Date and Time Picker",
61
- style = Typography.descriptionDefault
61
+ style = Typography.descriptionDefaultRegular
62
62
  )
63
63
 
64
64
  Spacer(modifier = Modifier.height(Spacing.S))
@@ -75,7 +75,7 @@ fun DateTimePickerExample() {
75
75
  // Time Picker (HH:mm)
76
76
  Text(
77
77
  text = "Time Picker",
78
- style = Typography.descriptionDefault
78
+ style = Typography.descriptionDefaultRegular
79
79
  )
80
80
 
81
81
  Spacer(modifier = Modifier.height(Spacing.S))
@@ -194,7 +194,7 @@ fun WheelPickerItem(
194
194
  ) {
195
195
  Text(
196
196
  text = text,
197
- style = Typography.actionS,
197
+ style = Typography.actionSBold,
198
198
  modifier = Modifier.scale(scale)
199
199
  )
200
200
  }
@@ -4,8 +4,8 @@ import androidx.compose.runtime.Composable
4
4
  import androidx.compose.runtime.Immutable
5
5
  import androidx.compose.ui.text.TextStyle
6
6
  import androidx.compose.ui.text.font.FontFamily
7
- import androidx.compose.ui.text.font.FontStyle
8
7
  import androidx.compose.ui.text.font.FontWeight
8
+ import androidx.compose.ui.text.style.TextDecoration
9
9
  import androidx.compose.ui.unit.sp
10
10
  import org.jetbrains.compose.resources.Font
11
11
  import org.jetbrains.compose.resources.FontResource
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@momo-kits/native-kits",
3
- "version": "0.114.2-beta.2",
3
+ "version": "0.114.2-beta.4",
4
4
  "private": false,
5
5
  "dependencies": {},
6
6
  "devDependencies": {},