@momo-kits/native-kits 0.89.7 → 0.89.8-beta.1

package/android/build.gradle

@@ -28,20 +28,20 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.8"
+        kotlinCompilerExtensionVersion = "1.5.11"
     }
 }
 
 dependencies {
-    def composeBom = platform('androidx.compose:compose-bom:2023.10.01')
+    def composeBom = platform('androidx.compose:compose-bom:2024.05.00')
     implementation composeBom
     androidTestImplementation composeBom
     implementation "androidx.compose.material3:material3"
-    implementation "androidx.compose.material:material:$rootProject.materialComposeVersion"
-    implementation "androidx.compose.foundation:foundation:$rootProject.composeVersion"
-    implementation "androidx.compose.ui:ui:$rootProject.composeVersion"
-    implementation "androidx.compose.ui:ui-tooling-preview:$rootProject.composeVersion"
-    debugImplementation "androidx.compose.ui:ui-tooling:$rootProject.composeVersion"
+    implementation "androidx.compose.material:material"
+    implementation "androidx.compose.foundation:foundation"
+    implementation "androidx.compose.ui:ui"
+    implementation "androidx.compose.ui:ui-tooling-preview"
+    debugImplementation "androidx.compose.ui:ui-tooling"
     implementation("io.coil-kt:coil-compose:2.5.0")
     implementation 'com.google.code.gson:gson:2.8.6'
 

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

@@ -88,7 +88,6 @@ fun Header(
     headerType: HeaderType = HeaderType.DEFAULT,
     titlePosition: TitlePosition,
     title: String,
-    backgroundColor: Color,
     isBack: Boolean,
     headerRight: @Composable (() -> Unit)? = null,
     goBack: (() -> Unit) = { },
@@ -108,7 +107,6 @@ fun Header(
     if (headerType != HeaderType.NONE) {
         BoxWithConstraints(
             Modifier.height(statusBarHeight + 52.dp)
-                .background(backgroundColor)
                 .fillMaxWidth()
                 .bottomBorder(
                     strokeWidth = if (headerType == HeaderType.SURFACE) 2.dp else 0.dp,

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

@@ -21,6 +21,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
+import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.min
 import vn.momo.kits.const.AppTheme
@@ -37,7 +38,7 @@ enum class HeaderType {
 
 @Composable
 fun Screen(
-    backgroundColor: Color = Color.Unspecified,
+    backgroundColor: Color? = null,
     headerBackground: String? = null,
     isBack: Boolean = true,
     headerType: HeaderType = HeaderType.DEFAULT,
@@ -47,20 +48,22 @@ fun Screen(
     titlePosition: TitlePosition = TitlePosition.LEFT,
     goBack: (() -> Unit) = { },
     scrollable: Boolean = true,
+    useAvoidKeyboard: Boolean = true,
     footer: @Composable (() -> Unit)? = null,
     headerRight: @Composable (() -> Unit)? = null,
     content: @Composable () -> Unit,
 ) {
     val keyboardController = LocalSoftwareKeyboardController.current
     val keyboardHeight = WindowInsets.ime.asPaddingValues().calculateBottomPadding()
-    val avoidKeyboard = when {
+    val keyboardSize = when {
+        !useAvoidKeyboard -> 0.dp
         keyboardHeight > 100.dp && footer == null -> keyboardHeight
         keyboardHeight > 100.dp && footer != null -> keyboardHeight - 21.dp
         else -> 0.dp
     }
 
     Box(
-        Modifier.fillMaxSize().background(AppTheme.current.colors.background.default)
+        Modifier.fillMaxSize().background(backgroundColor ?: AppTheme.current.colors.background.default)
     ) {
         HeaderImage(headerType, headerBackground ?: AppTheme.current.assets.headerBackground)
         Column(
@@ -74,16 +77,15 @@ fun Screen(
                 headerType = headerType,
                 title = title,
                 titlePosition = titlePosition,
-                backgroundColor = backgroundColor,
                 headerRight = headerRight,
                 isBack = isBack,
                 goBack = goBack,
             )
 
             Column(
-                modifier = if (scrollable) Modifier.weight(1f).padding(bottom = avoidKeyboard)
+                modifier = if (scrollable) Modifier.weight(1f).padding(bottom = keyboardSize)
                     .verticalScroll(rememberScrollState()) else
-                    Modifier.padding(bottom = avoidKeyboard),
+                    Modifier.padding(bottom = keyboardSize),
                 verticalArrangement = verticalArrangement,
                 horizontalAlignment = horizontalAlignment
             ) {
@@ -91,19 +93,18 @@ fun Screen(
             }
 
             footer?.let {
-                Footer(footer)
+                Footer(footer, keyboardSize)
             }
         }
     }
 }
 
 @Composable
-fun Footer(footer: @Composable (() -> Unit)? = null) {
+fun Footer(footer: @Composable (() -> Unit)? = null, keyboardSize: Dp = 0.dp) {
     val indicator = WindowInsets.systemBars.asPaddingValues().calculateBottomPadding()
-    val keyboardHeight = WindowInsets.ime.asPaddingValues().calculateBottomPadding()
     Box(
         Modifier
-            .offset(y = if (keyboardHeight > 150.dp) -keyboardHeight + 21.dp else 0.dp)
+            .offset(y = - keyboardSize)
             .padding(bottom = min(indicator, 21.dp))
             .shadow(
                 Colors.black_20.copy(alpha = 0.1f),

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

@@ -22,6 +22,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import vn.momo.kits.modifier.noFeedbackClickable
 
 val defaultBanner = TrustBannerData(
     content = mapOf(
@@ -50,7 +51,7 @@ data class TrustBannerClass(
     val trustBanner: TrustBannerData
 )
 
-data class TrustBannerData (
+data class TrustBannerData(
     val content: Map<String, String>,
     val pciImage: String,
     val sslImage: String,
@@ -58,6 +59,7 @@ data class TrustBannerData (
     val momoImage: String,
     val urlConfig: String
 )
+
 @Composable
 fun Avatar(iconURL: String) {
     Image(
@@ -76,31 +78,45 @@ fun TrustBanner(
     serviceName: String = "",
     screenName: String = "",
     onPress: ((Map<String, String>) -> Unit)? = null,
-    trackEvent: ((String,Map<String, String>) -> Unit)? = null,
+    trackEvent: ((String, Map<String, String>) -> Unit)? = null,
     language: String = "vi"
 ) {
+    val trackParams = mapOf(
+        "service_name" to serviceName,
+        "screen_name" to screenName,
+        "component_name" to "logo_trust",
+        "url_config" to trustBanner.urlConfig
+    )
+
     Row(
         modifier = Modifier
             .clip(RoundedCornerShape(12.dp))
             .background(color = Color(backgroundBlue))
             .padding(12.dp)
-            .clickable {
-                if (trackEvent != null) {
-                    trackEvent("service_component_clicked",mapOf(
-                        "service_name" to serviceName,
-                        "screen_name" to screenName,
-                        "component_name" to "logo_trust",
-                        "url_config" to trustBanner.urlConfig
-                    ))
-                }
+            .then(
                 if (onPress != null) {
-                    onPress(mapOf(
-                        "service_name" to serviceName,
-                        "screen_name" to screenName,
-                        "url_config" to trustBanner.urlConfig,
-                    ))
+                    Modifier.clickable {
+                        trackEvent?.invoke(
+                            "service_component_clicked", trackParams
+                        )
+
+                        onPress(
+                            mapOf(
+                                "service_name" to serviceName,
+                                "screen_name" to screenName,
+                                "url_config" to trustBanner.urlConfig,
+                            )
+                        )
+
+                    }
+                } else {
+                    Modifier.noFeedbackClickable {
+                        trackEvent?.invoke(
+                            "service_component_clicked", trackParams
+                        )
+                    }
                 }
-            }
+            )
     ) {
         Image(
             source = trustBanner.momoImage,

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

@@ -0,0 +1,21 @@
+package vn.momo.kits.modifier
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.composed
+import androidx.compose.ui.semantics.Role
+
+fun Modifier.noFeedbackClickable(
+    enabled: Boolean = true, onClickLabel: String? = null, role: Role? = null, onClick: () -> Unit
+): Modifier = composed {
+    clickable(
+        interactionSource = remember { MutableInteractionSource() },
+        indication = null,
+        enabled,
+        onClickLabel,
+        role,
+        onClick
+    )
+}

package/local.properties

@@ -0,0 +1,8 @@
+## This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+#
+# Location of the SDK. This is only used by Gradle.
+# For customization when using a Version Control System, please read the
+# header note.
+#Tue Apr 23 16:40:15 ICT 2024
+sdk.dir=/Users/hung.dao1/Library/Android/sdk

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.89.7",
+  "version": "0.89.8-beta.1",
   "private": false,
   "dependencies": {},
   "devDependencies": {},