@momo-kits/native-kits 0.114.2-beta.2 → 0.114.2-beta.3
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/src/commonMain/kotlin/vn/momo/kits/application/FloatingButton.kt +1 -1
- package/compose/src/commonMain/kotlin/vn/momo/kits/application/HeaderTitle.kt +1 -1
- package/compose/src/commonMain/kotlin/vn/momo/kits/components/Badge.kt +1 -1
- package/compose/src/commonMain/kotlin/vn/momo/kits/components/Button.kt +4 -4
- package/compose/src/commonMain/kotlin/vn/momo/kits/components/CheckBox.kt +1 -1
- package/compose/src/commonMain/kotlin/vn/momo/kits/components/Information.kt +3 -3
- package/compose/src/commonMain/kotlin/vn/momo/kits/components/Input.kt +3 -3
- package/compose/src/commonMain/kotlin/vn/momo/kits/components/InputOTP.kt +3 -3
- package/compose/src/commonMain/kotlin/vn/momo/kits/components/InputSearch.kt +1 -1
- package/compose/src/commonMain/kotlin/vn/momo/kits/components/InputTextArea.kt +3 -3
- package/compose/src/commonMain/kotlin/vn/momo/kits/components/PaginationNumber.kt +1 -1
- package/compose/src/commonMain/kotlin/vn/momo/kits/components/PopupNotify.kt +4 -4
- package/compose/src/commonMain/kotlin/vn/momo/kits/components/Radio.kt +1 -1
- package/compose/src/commonMain/kotlin/vn/momo/kits/components/Text.kt +1 -1
- package/compose/src/commonMain/kotlin/vn/momo/kits/components/dateTimePicker/DateTimePickerExample.kt +4 -4
- package/compose/src/commonMain/kotlin/vn/momo/kits/const/Typography.kt +1 -1
- package/package.json +1 -1
|
@@ -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.
|
|
78
|
-
Size.MEDIUM.name -> Typography.
|
|
79
|
-
Size.SMALL.name -> Typography.
|
|
80
|
-
else -> Typography.
|
|
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
|
|
|
@@ -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.
|
|
77
|
+
Text(title, style = Typography.labelDefaultMedium)
|
|
78
78
|
}
|
|
79
|
-
Text(description, style = Typography.
|
|
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.
|
|
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.
|
|
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.
|
|
264
|
+
style = Typography.labelSMedium,
|
|
265
265
|
color = floatingTitleColor
|
|
266
266
|
)
|
|
267
267
|
if (required) {
|
|
268
268
|
Text(
|
|
269
269
|
"*",
|
|
270
|
-
style = Typography.
|
|
270
|
+
style = Typography.labelSMedium,
|
|
271
271
|
color = AppTheme.current.colors.error.primary,
|
|
272
272
|
)
|
|
273
273
|
}
|
|
@@ -133,7 +133,7 @@ fun InputOTP(
|
|
|
133
133
|
) {
|
|
134
134
|
Text(
|
|
135
135
|
floatingValue,
|
|
136
|
-
style = Typography.
|
|
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.
|
|
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.
|
|
185
|
+
style = Typography.headerDefaultBold,
|
|
186
186
|
text = value[i].toString()
|
|
187
187
|
)
|
|
188
188
|
if (i != value.length - 1 || (isFocused && value.length != MAX_LENGTH)) {
|
|
@@ -223,7 +223,7 @@ fun InputSearch(
|
|
|
223
223
|
if (inputSearchProps.showButtonText) {
|
|
224
224
|
Text(
|
|
225
225
|
text = inputSearchProps.buttonText,
|
|
226
|
-
style = Typography.
|
|
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() },
|
|
@@ -129,13 +129,13 @@ fun InputTextArea(
|
|
|
129
129
|
) {
|
|
130
130
|
Text(
|
|
131
131
|
floatingValue,
|
|
132
|
-
style = Typography.
|
|
132
|
+
style = Typography.labelSMedium,
|
|
133
133
|
color = floatingTitleColor
|
|
134
134
|
)
|
|
135
135
|
if (required) {
|
|
136
136
|
Text(
|
|
137
137
|
"*",
|
|
138
|
-
style = Typography.
|
|
138
|
+
style = Typography.labelSMedium,
|
|
139
139
|
color = AppTheme.current.colors.error.primary,
|
|
140
140
|
)
|
|
141
141
|
}
|
|
@@ -213,7 +213,7 @@ fun InputTextArea(
|
|
|
213
213
|
) {
|
|
214
214
|
Text(
|
|
215
215
|
"${text.value.length}/$maxLength",
|
|
216
|
-
style = Typography.
|
|
216
|
+
style = Typography.descriptionXsRegular,
|
|
217
217
|
color = AppTheme.current.colors.text.hint
|
|
218
218
|
)
|
|
219
219
|
}
|
|
@@ -75,7 +75,7 @@ fun PopupNotify(
|
|
|
75
75
|
Text(
|
|
76
76
|
text = description,
|
|
77
77
|
onTextLayout = { layoutResult.value = it },
|
|
78
|
-
style = Typography.
|
|
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.
|
|
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.
|
|
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.
|
|
124
|
+
style = Typography.descriptionXsRegular,
|
|
125
125
|
color = AppTheme.current.colors.text.hint,
|
|
126
126
|
maxLines = 1,
|
|
127
127
|
modifier = Modifier.padding(top = Spacing.S)
|
|
@@ -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.
|
|
23
|
+
style: TextStyle = Typography.bodyDefaultRegular,
|
|
24
24
|
textAlign: TextAlign? = TextAlign.Start,
|
|
25
25
|
modifier: Modifier = Modifier,
|
|
26
26
|
maxLines: Int = Int.MAX_VALUE,
|
|
@@ -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.
|
|
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.
|
|
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.
|
|
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.
|
|
78
|
+
style = Typography.descriptionDefaultRegular
|
|
79
79
|
)
|
|
80
80
|
|
|
81
81
|
Spacer(modifier = Modifier.height(Spacing.S))
|
|
@@ -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
|