@momo-kits/native-kits 0.89.30-beta.7 → 0.89.30-nav.10

package/compose/src/commonMain/kotlin/vn/momo/kits/application/Components.kt

@@ -144,14 +144,16 @@ fun Header(
     headerType: HeaderType = HeaderType.DEFAULT,
     titlePosition: TitlePosition,
     title: String,
+    isBack: Boolean,
     headerRight: @Composable (() -> Unit)? = null,
-    goBack: (() -> Unit)? = null,
+    goBack: (() -> Unit) = { },
     opacity: Float? = null,
     animatedHeader: AnimatedHeader? = null,
     scrollState: Int = 0
 ) {
     val statusBarHeight = AppStatusBar.current ?: getStatusBarHeight()
     val tintIconColor = AppTheme.current.colors.text.default
+    val backgroundButton = Colors.black_01.copy(alpha = 0.2f)
 
     var colorFraction by remember { mutableStateOf(0f) }
 
@@ -170,7 +172,7 @@ fun Header(
         )
     )
 
-    if (headerType != HeaderType.NONE || animatedHeader !== null) {
+    if (headerType != HeaderType.NONE) {
         BoxWithConstraints(
             Modifier.height(statusBarHeight + 52.dp)
                 .fillMaxWidth()
@@ -185,19 +187,19 @@ fun Header(
                 horizontalArrangement = Arrangement.SpaceBetween
             ) {
                 Box {
-                    if (goBack !== null) {
+                    if (isBack) {
                         Box(
                             modifier = Modifier
                                 .size(28.dp)
                                 .then(
                                     Modifier.border(
-                                        0.2.dp,
-                                        Colors.black_20.copy(alpha = 0.2f),
-                                        RoundedCornerShape(14.dp)
+                                        0.5.dp,
+                                        Colors.black_20.copy(alpha = 0.4f),
+                                        RoundedCornerShape(100)
                                     )
                                 )
                                 .background(
-                                    Colors.black_01.copy(alpha = 0.6f),
+                                    backgroundButton,
                                     RoundedCornerShape(100)
                                 )
                                 .clickable(
@@ -205,13 +207,12 @@ fun Header(
                                 )
                                 .padding(Spacing.XS)
                                 .semantics {
-                                    contentDescription = "btn_navigation_back"; testTag =
-                                    "btn_navigation_back"
+                                    testTag = "btn_navigation_back"
                                 },
                             contentAlignment = Alignment.Center
                         ) {
                             Icon(
-                                source = "arrow_back",
+                                source = "ic_back_ios",
                                 color = if (animatedHeader !== null) tintIconColorAnim else tintIconColor,
                                 size = 20.dp,
                             )
@@ -232,7 +233,7 @@ fun Header(
                     .padding(horizontal = Spacing.M),
                 verticalAlignment = Alignment.CenterVertically,
             ) {
-                if (goBack !== null) {
+                if (isBack) {
                     Spacer(Modifier.width(40.dp))
                 }
                 Box(
@@ -245,12 +246,12 @@ fun Header(
                         title = title,
                         color = if (animatedHeader !== null) tintIconColorAnim else tintIconColor,
                         modifier = Modifier.semantics {
-                            contentDescription = "title_navigation_header"
+                            contentDescription = title
                             testTag = "title_navigation_header"
                         }
                     )
                 }
-                if (goBack !== null) {
+                if (isBack) {
                     Spacer(Modifier.width(40.dp))
                 }
             }

package/compose/src/commonMain/kotlin/vn/momo/kits/application/Screen.kt

@@ -1,6 +1,7 @@
 package vn.momo.kits.application
 
 import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.foundation.ScrollState
 import androidx.compose.foundation.background
 import androidx.compose.foundation.gestures.detectTapGestures
 import androidx.compose.foundation.layout.Arrangement
@@ -24,6 +25,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.layout.LayoutCoordinates
+import androidx.compose.ui.layout.onGloballyPositioned
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
@@ -33,6 +36,7 @@ import vn.momo.kits.const.AppStatusBar
 import vn.momo.kits.const.AppTheme
 import vn.momo.kits.const.Colors
 import vn.momo.kits.const.Spacing
+import vn.momo.kits.modifier.conditional
 import vn.momo.kits.modifier.shadow
 import vn.momo.kits.platform.getStatusBarHeight
 
@@ -45,13 +49,16 @@ enum class HeaderType {
 @Composable
 fun Screen(
     backgroundColor: Color? = null,
-    isBack: Boolean = true,    headerType: HeaderType = HeaderType.DEFAULT,
+    isBack: Boolean = true,
+    headerType: HeaderType = HeaderType.DEFAULT,
     verticalArrangement: Arrangement.Vertical = Arrangement.Top,
     horizontalAlignment: Alignment.Horizontal = Alignment.Start,
     title: String = "Stack",
     titlePosition: TitlePosition = TitlePosition.LEFT,
-    goBack: (() -> Unit)? = null,
+    goBack: (() -> Unit) = { },
     scrollable: Boolean = true,
+    scrollState: ScrollState = rememberScrollState(),
+    onContentLayout: ((LayoutCoordinates) -> Unit)? = null,
     useAvoidKeyboard: Boolean = true,
     footer: @Composable (() -> Unit)? = null,
     headerRight: @Composable (() -> Unit)? = null,
@@ -72,7 +79,6 @@ fun Screen(
 
     val indicator = WindowInsets.systemBars.asPaddingValues().calculateBottomPadding()
     val bottomPadding = min(indicator, 21.dp)
-    val scrollState = rememberScrollState()
 
     val opacity by animateFloatAsState(
         targetValue = ((scrollState.value / 114f)).coerceIn(0f, 1f)
@@ -94,7 +100,7 @@ fun Screen(
                     .background(Color.White.copy(alpha = opacity))
                     .graphicsLayer { alpha = opacity }
             ) {
-                HeaderBackground(HeaderType.DEFAULT)
+                HeaderBackground(headerType)
             }
         }
 
@@ -103,6 +109,7 @@ fun Screen(
             title = title,
             titlePosition = titlePosition,
             headerRight = headerRight,
+            isBack = isBack,
             goBack = goBack,
             opacity = opacity,
             animatedHeader = animatedHeader,
@@ -121,7 +128,13 @@ fun Screen(
         ) {
 
             Column(
-                modifier = if (scrollable) Modifier.weight(1f).padding(bottom = keyboardSize).verticalScroll(scrollState) else Modifier.padding(bottom = keyboardSize),
+                modifier = Modifier
+                    .conditional(scrollable) { weight(1f) }
+                    .padding(bottom = keyboardSize)
+                    .conditional(onContentLayout != null) {
+                        onGloballyPositioned(onContentLayout ?: {})
+                    }
+                    .conditional(scrollable) { verticalScroll(scrollState) },
                 verticalArrangement = verticalArrangement,
                 horizontalAlignment = horizontalAlignment
             ) {

package/compose/src/commonMain/kotlin/vn/momo/kits/components/Button.kt

@@ -260,7 +260,7 @@ fun Button(
                 minWidth = size.value.width
             ).height(size.value.height)
             .semantics {
-                contentDescription = testId; testTag = testId
+                contentDescription = title; testTag = testId
             },
         horizontalArrangement = Arrangement.Center,
         verticalAlignment = Alignment.CenterVertically,

package/compose/src/commonMain/kotlin/vn/momo/kits/components/Input.kt

@@ -204,7 +204,7 @@ fun Input(
     val testId = if (disabled) "input_${floatingValue}_disabled" else "input_$floatingValue"
 
     Column(modifier = Modifier.semantics {
-        contentDescription = testId; testTag = testId
+        contentDescription = floatingValue; testTag = testId
     }) {
         BasicTextField(
             enabled = !disabled,

package/compose/src/commonMain/kotlin/vn/momo/kits/components/InputDropDown.kt

@@ -17,7 +17,6 @@ import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -78,7 +77,7 @@ fun InputDropDown(
     val testId = if (disabled) "input_${floatingValue}_disabled" else "input_$floatingValue"
 
     Column(modifier = Modifier.clickable(enabled = !disabled, onClick = onPress).semantics {
-        contentDescription = testId; testTag = testId
+        contentDescription = floatingValue; testTag = testId
     }) {
         Box {
             if (floatingValue.isNotEmpty() || floatingIcon.isNotEmpty()) {

package/compose/src/commonMain/kotlin/vn/momo/kits/components/InputMoney.kt

@@ -110,7 +110,7 @@ fun InputMoney(
     val testId = if (disabled) "input_${floatingValue}_disabled" else "input_$floatingValue"
 
     Column(modifier =  Modifier.semantics {
-        contentDescription = testId; testTag = testId
+        contentDescription = floatingValue; testTag = testId
     }) {
         BasicTextField(
             enabled = !disabled,

package/compose/src/commonMain/kotlin/vn/momo/kits/components/PopupNotify.kt

@@ -97,7 +97,7 @@ fun PopupNotify(
     }
 
     Box(Modifier.semantics {
-        contentDescription = "popup_notify"; testTag = "popup_notify"
+        contentDescription = title; testTag = "popup_notify"
     }, contentAlignment = Alignment.TopEnd) {
         Column(
             modifier = Modifier
@@ -166,7 +166,7 @@ fun PopupNotify(
                 color = AppTheme.current.colors.background.surface,
                 size = 14.dp,
                 modifier = Modifier.semantics {
-                    contentDescription = "ic_popup_close"; testTag = "ic_popup_close"
+                    testTag = "ic_popup_close"
                 }
             )
         }
@@ -235,7 +235,7 @@ fun renderRow(
                     title = it.title,
                     type = ButtonType.TEXT,
                     modifier = Modifier.semantics {
-                        contentDescription = "btn_popup_cancel"; testTag = "btn_popup_cancel"
+                        contentDescription = it.title; testTag = "btn_popup_cancel"
                     }
                 )
             }
@@ -250,7 +250,7 @@ fun renderRow(
                 },
                 title = primary?.title ?: "",
                 modifier = Modifier.semantics {
-                    contentDescription = "btn_popup_allow"; testTag = "btn_popup_allow"
+                    contentDescription = primary?.title ?: ""; testTag = "btn_popup_allow"
                 }
             )
         }
@@ -273,7 +273,7 @@ fun renderColumn(
             },
             title = primary?.title ?: "",
             modifier = Modifier.semantics {
-                contentDescription = "btn_popup_allow"; testTag = "btn_popup_allow"
+                contentDescription = primary?.title ?: ""; testTag = "btn_popup_allow"
             }
         )
         secondary?.let {
@@ -288,7 +288,7 @@ fun renderColumn(
                     title = it.title,
                     type = ButtonType.TEXT,
                     modifier = Modifier.semantics {
-                        contentDescription = "btn_popup_cancel"; testTag = "btn_popup_cancel"
+                        contentDescription = it.title; testTag = "btn_popup_cancel"
                     }
                 )
             }

package/compose/src/commonMain/kotlin/vn/momo/kits/components/PromotionPopup.kt

@@ -17,7 +17,6 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.semantics.contentDescription
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.semantics.testTag
 import androidx.compose.ui.unit.dp
@@ -30,7 +29,7 @@ fun PromotionPopup(
     source: String = "",
     onClose: (() -> Unit) = {},
 ) {
-    Column(Modifier.semantics { contentDescription = "popup_notify"; testTag = "popup_notify" }) {
+    Column(Modifier.semantics { testTag = "popup_notify" }) {
         if (source.isNotEmpty()) {
             Image(
                 source = source,
@@ -69,7 +68,7 @@ fun PromotionPopup(
                     color = AppTheme.current.colors.background.surface,
                     size = 14.dp,
                     modifier = Modifier.semantics {
-                        contentDescription = "ic_popup_close"; testTag = "ic_popup_close"
+                        testTag = "ic_popup_close"
                     }
                 )
             }

package/compose/src/commonMain/kotlin/vn/momo/kits/const/Typography.kt

@@ -58,6 +58,16 @@ fun getFontFamily(fontFamily: String, fontWeight: FontWeight? = FontWeight.Norma
         "MoMoSignature-700" to "momosignature.otf",
         "MoMoSignature-800" to "momosignature.otf",
         "MoMoSignature-900" to "momosignature.otf",
+
+        "MoMoTrustDisplay-100" to "momotrustdisplay.otf",
+        "MoMoTrustDisplay-200" to "momotrustdisplay.otf",
+        "MoMoTrustDisplay-300" to "momotrustdisplay.otf",
+        "MoMoTrustDisplay-400" to "momotrustdisplay.otf",
+        "MoMoTrustDisplay-500" to "momotrustdisplay.otf",
+        "MoMoTrustDisplay-600" to "momotrustdisplay.otf",
+        "MoMoTrustDisplay-700" to "momotrustdisplay.otf",
+        "MoMoTrustDisplay-800" to "momotrustdisplay.otf",
+        "MoMoTrustDisplay-900" to "momotrustdisplay.otf",
     )
     val font = fontMap[key] ?: "sfprotext_regular.ttf"
     return getFont(font)

package/compose/src/commonMain/kotlin/vn/momo/kits/modifier/Conditional.kt

@@ -0,0 +1,11 @@
+package vn.momo.kits.modifier
+
+import androidx.compose.ui.Modifier
+
+fun Modifier.conditional(condition : Boolean, modifier : Modifier.() -> Modifier) : Modifier {
+    return if (condition) {
+        then(modifier(Modifier))
+    } else {
+        this
+    }
+}

package/compose/src/commonMain/kotlin/vn/momo/kits/utils/Icons.kt

@@ -1317,7 +1317,5 @@ val Icons = mapOf(
     "ic_checked" to "https://img.mservice.com.vn/app/img/kits/checked_ic.png",
     "ic_minus" to "https://img.mservice.com.vn/app/img/kits/minus.png",
     "ic_navigation" to "https://static.momocdn.net/app/img/kits/ic_navigation.png",
-    "ic_money_bag" to "https://static.momocdn.net/app/img/kits/ic_money_bag.png",
-    "help_center" to "https://static.momocdn.net/app/img/kits/ic_money_bag_2.png",
-    "arrow_back" to "https://static.momocdn.net/app/img/kits/arrow-back.png",
+    "ic_money_bag" to "https://static.momocdn.net/app/img/kits/ic_money_bag.png"
 )

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.89.30-beta.7",
+  "version": "0.89.30-nav.10",
   "private": false,
   "dependencies": {},
   "devDependencies": {},