@momo-kits/native-kits 0.89.32-nav.3 → 0.89.33-rc.1
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 +0 -2
- package/compose/src/commonMain/kotlin/vn/momo/kits/application/Components.kt +3 -6
- package/compose/src/commonMain/kotlin/vn/momo/kits/application/Screen.kt +1 -2
- package/compose/src/commonMain/kotlin/vn/momo/kits/components/Button.kt +1 -8
- package/compose/src/commonMain/kotlin/vn/momo/kits/components/Image.kt +2 -3
- package/compose/src/commonMain/kotlin/vn/momo/kits/components/PopupNotify.kt +5 -6
- package/compose/src/commonMain/kotlin/vn/momo/kits/components/Text.kt +3 -1
- package/local.properties +2 -2
- package/package.json +1 -1
- package/publish.sh +1 -1
package/compose/build.gradle.kts
CHANGED
|
@@ -32,7 +32,6 @@ import androidx.compose.ui.graphics.Color
|
|
|
32
32
|
import androidx.compose.ui.graphics.graphicsLayer
|
|
33
33
|
import androidx.compose.ui.layout.ContentScale
|
|
34
34
|
import androidx.compose.ui.platform.LocalDensity
|
|
35
|
-
import androidx.compose.ui.semantics.contentDescription
|
|
36
35
|
import androidx.compose.ui.semantics.semantics
|
|
37
36
|
import androidx.compose.ui.semantics.testTag
|
|
38
37
|
import androidx.compose.ui.text.style.TextAlign
|
|
@@ -163,9 +162,8 @@ fun Header(
|
|
|
163
162
|
headerType: HeaderType = HeaderType.DEFAULT,
|
|
164
163
|
titlePosition: TitlePosition,
|
|
165
164
|
title: String,
|
|
166
|
-
isBack: Boolean,
|
|
167
165
|
headerRight: @Composable (() -> Unit)? = null,
|
|
168
|
-
goBack: (() -> Unit)
|
|
166
|
+
goBack: (() -> Unit)?,
|
|
169
167
|
opacity: Float? = null,
|
|
170
168
|
animatedHeader: AnimatedHeader? = null,
|
|
171
169
|
useSearchInput: Boolean? = false,
|
|
@@ -208,7 +206,7 @@ fun Header(
|
|
|
208
206
|
horizontalArrangement = Arrangement.SpaceBetween
|
|
209
207
|
) {
|
|
210
208
|
Box {
|
|
211
|
-
if (
|
|
209
|
+
if (goBack !== null) {
|
|
212
210
|
Box(
|
|
213
211
|
modifier = Modifier
|
|
214
212
|
.size(28.dp)
|
|
@@ -256,7 +254,7 @@ fun Header(
|
|
|
256
254
|
.padding(horizontal = Spacing.M),
|
|
257
255
|
verticalAlignment = Alignment.CenterVertically,
|
|
258
256
|
) {
|
|
259
|
-
if (
|
|
257
|
+
if (goBack !== null) {
|
|
260
258
|
Spacer(Modifier.width(40.dp))
|
|
261
259
|
}
|
|
262
260
|
if (useSearchInput == true && inputSearchProps != null) {
|
|
@@ -273,7 +271,6 @@ fun Header(
|
|
|
273
271
|
title = title,
|
|
274
272
|
color = tintIconColor,
|
|
275
273
|
modifier = Modifier.semantics {
|
|
276
|
-
contentDescription = title
|
|
277
274
|
testTag = "title_navigation_header"
|
|
278
275
|
}
|
|
279
276
|
)
|
|
@@ -56,7 +56,7 @@ fun Screen(
|
|
|
56
56
|
horizontalAlignment: Alignment.Horizontal = Alignment.Start,
|
|
57
57
|
title: String = "Stack",
|
|
58
58
|
titlePosition: TitlePosition = TitlePosition.LEFT,
|
|
59
|
-
goBack: (() -> Unit)
|
|
59
|
+
goBack: (() -> Unit)?,
|
|
60
60
|
scrollable: Boolean = true,
|
|
61
61
|
scrollState: ScrollState = rememberScrollState(),
|
|
62
62
|
onContentLayout: ((LayoutCoordinates) -> Unit)? = null,
|
|
@@ -117,7 +117,6 @@ fun Screen(
|
|
|
117
117
|
title = title,
|
|
118
118
|
titlePosition = titlePosition,
|
|
119
119
|
headerRight = headerRight,
|
|
120
|
-
isBack = isBack,
|
|
121
120
|
goBack = goBack,
|
|
122
121
|
opacity = opacity,
|
|
123
122
|
animatedHeader = animatedHeader,
|
|
@@ -18,9 +18,6 @@ import androidx.compose.ui.Alignment
|
|
|
18
18
|
import androidx.compose.ui.Modifier
|
|
19
19
|
import androidx.compose.ui.draw.clip
|
|
20
20
|
import androidx.compose.ui.graphics.Color
|
|
21
|
-
import androidx.compose.ui.semantics.contentDescription
|
|
22
|
-
import androidx.compose.ui.semantics.semantics
|
|
23
|
-
import androidx.compose.ui.semantics.testTag
|
|
24
21
|
import androidx.compose.ui.text.TextStyle
|
|
25
22
|
import androidx.compose.ui.text.style.TextOverflow
|
|
26
23
|
import androidx.compose.ui.unit.Dp
|
|
@@ -236,7 +233,6 @@ fun Button(
|
|
|
236
233
|
isFull: Boolean = true,
|
|
237
234
|
modifier: Modifier = Modifier,
|
|
238
235
|
) {
|
|
239
|
-
val testId = "btn_${type.toString().lowercase()}_$title"
|
|
240
236
|
val customModifier = if (isFull) {
|
|
241
237
|
modifier
|
|
242
238
|
.fillMaxWidth()
|
|
@@ -258,10 +254,7 @@ fun Button(
|
|
|
258
254
|
.padding(horizontal = size.value.padding)
|
|
259
255
|
.defaultMinSize(
|
|
260
256
|
minWidth = size.value.width
|
|
261
|
-
).height(size.value.height)
|
|
262
|
-
.semantics {
|
|
263
|
-
contentDescription = title; testTag = testId
|
|
264
|
-
},
|
|
257
|
+
).height(size.value.height),
|
|
265
258
|
horizontalArrangement = Arrangement.Center,
|
|
266
259
|
verticalAlignment = Alignment.CenterVertically,
|
|
267
260
|
) {
|
|
@@ -14,7 +14,6 @@ import androidx.compose.ui.graphics.painter.Painter
|
|
|
14
14
|
import androidx.compose.ui.layout.ContentScale
|
|
15
15
|
import androidx.compose.ui.semantics.contentDescription
|
|
16
16
|
import androidx.compose.ui.semantics.semantics
|
|
17
|
-
import androidx.compose.ui.semantics.testTag
|
|
18
17
|
import coil3.compose.AsyncImage
|
|
19
18
|
import vn.momo.kits.const.AppTheme
|
|
20
19
|
|
|
@@ -48,9 +47,9 @@ fun Image(
|
|
|
48
47
|
)
|
|
49
48
|
}
|
|
50
49
|
|
|
51
|
-
Box(modifier = modifier) {
|
|
50
|
+
Box(modifier = modifier.semantics {contentDescription = "img|$source"}) {
|
|
52
51
|
AsyncImage(
|
|
53
|
-
modifier = Modifier.matchParentSize()
|
|
52
|
+
modifier = Modifier.matchParentSize(),
|
|
54
53
|
model = source,
|
|
55
54
|
contentDescription = null,
|
|
56
55
|
contentScale = imageOptions.contentScale,
|
|
@@ -27,7 +27,6 @@ import androidx.compose.runtime.setValue
|
|
|
27
27
|
import androidx.compose.ui.Alignment
|
|
28
28
|
import androidx.compose.ui.Modifier
|
|
29
29
|
import androidx.compose.ui.draw.clip
|
|
30
|
-
import androidx.compose.ui.semantics.contentDescription
|
|
31
30
|
import androidx.compose.ui.semantics.semantics
|
|
32
31
|
import androidx.compose.ui.semantics.testTag
|
|
33
32
|
import androidx.compose.ui.text.TextLayoutResult
|
|
@@ -97,7 +96,7 @@ fun PopupNotify(
|
|
|
97
96
|
}
|
|
98
97
|
|
|
99
98
|
Box(Modifier.semantics {
|
|
100
|
-
|
|
99
|
+
testTag = "popup_notify"
|
|
101
100
|
}, contentAlignment = Alignment.TopEnd) {
|
|
102
101
|
Column(
|
|
103
102
|
modifier = Modifier
|
|
@@ -235,7 +234,7 @@ fun renderRow(
|
|
|
235
234
|
title = it.title,
|
|
236
235
|
type = ButtonType.TEXT,
|
|
237
236
|
modifier = Modifier.semantics {
|
|
238
|
-
|
|
237
|
+
testTag = "btn_popup_cancel"
|
|
239
238
|
}
|
|
240
239
|
)
|
|
241
240
|
}
|
|
@@ -250,7 +249,7 @@ fun renderRow(
|
|
|
250
249
|
},
|
|
251
250
|
title = primary?.title ?: "",
|
|
252
251
|
modifier = Modifier.semantics {
|
|
253
|
-
|
|
252
|
+
testTag = "btn_popup_allow"
|
|
254
253
|
}
|
|
255
254
|
)
|
|
256
255
|
}
|
|
@@ -273,7 +272,7 @@ fun renderColumn(
|
|
|
273
272
|
},
|
|
274
273
|
title = primary?.title ?: "",
|
|
275
274
|
modifier = Modifier.semantics {
|
|
276
|
-
|
|
275
|
+
testTag = "btn_popup_allow"
|
|
277
276
|
}
|
|
278
277
|
)
|
|
279
278
|
secondary?.let {
|
|
@@ -288,7 +287,7 @@ fun renderColumn(
|
|
|
288
287
|
title = it.title,
|
|
289
288
|
type = ButtonType.TEXT,
|
|
290
289
|
modifier = Modifier.semantics {
|
|
291
|
-
|
|
290
|
+
testTag = "btn_popup_cancel"
|
|
292
291
|
}
|
|
293
292
|
)
|
|
294
293
|
}
|
|
@@ -3,6 +3,8 @@ package vn.momo.kits.components
|
|
|
3
3
|
import androidx.compose.runtime.Composable
|
|
4
4
|
import androidx.compose.ui.Modifier
|
|
5
5
|
import androidx.compose.ui.graphics.Color
|
|
6
|
+
import androidx.compose.ui.semantics.contentDescription
|
|
7
|
+
import androidx.compose.ui.semantics.semantics
|
|
6
8
|
import androidx.compose.ui.text.TextLayoutResult
|
|
7
9
|
import androidx.compose.ui.text.TextStyle
|
|
8
10
|
import androidx.compose.ui.text.style.TextAlign
|
|
@@ -31,7 +33,7 @@ fun Text(
|
|
|
31
33
|
val font = getFontFamily(fontFamily, style.fontWeight)
|
|
32
34
|
|
|
33
35
|
androidx.compose.material3.Text(
|
|
34
|
-
modifier = modifier,
|
|
36
|
+
modifier = modifier.semantics { contentDescription = text },
|
|
35
37
|
text = text,
|
|
36
38
|
color = color ?: AppTheme.current.colors.text.default,
|
|
37
39
|
style = style,
|
package/local.properties
CHANGED
|
@@ -4,5 +4,5 @@
|
|
|
4
4
|
# Location of the SDK. This is only used by Gradle.
|
|
5
5
|
# For customization when using a Version Control System, please read the
|
|
6
6
|
# header note.
|
|
7
|
-
#
|
|
8
|
-
sdk.dir=/Users/
|
|
7
|
+
#Wed Aug 21 14:20:12 ICT 2024
|
|
8
|
+
sdk.dir=/Users/huynhdung/Library/Android/sdk
|
package/package.json
CHANGED