@momo-kits/native-kits 0.89.31-beta.22 → 0.89.32-nav.1

package/compose/src/androidMain/kotlin/vn/momo/kits/platform/Platform.android.kt

@@ -3,12 +3,9 @@ package vn.momo.kits.platform
 import android.annotation.SuppressLint
 import android.content.res.Resources
 import android.graphics.BlurMaskFilter
-import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.foundation.layout.navigationBars
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.NativePaint
 import androidx.compose.ui.platform.LocalConfiguration
-import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 
@@ -37,11 +34,4 @@ actual fun getStatusBarHeight(): Dp {
         "android"
     )
     return if(resourceId > 0) Resources.getSystem().getDimensionPixelSize(resourceId).dp else 0.dp
-}
-
-@Composable
-actual fun getNavigationBarHeight(): Dp {
-    val density = LocalDensity.current
-    val navigationBarHeight = WindowInsets.navigationBars.getBottom(density)
-    return navigationBarHeight.dp
 }

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

@@ -1,7 +1,6 @@
 package vn.momo.kits.components
 
 import androidx.compose.foundation.background
-import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -9,9 +8,7 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
@@ -29,7 +26,11 @@ val defaultBanner = TrustBannerData(
         "vi" to "Bảo mật thông tin & An toàn tài sản của bạn là ưu tiên hàng đầu của MoMo.",
         "en" to "Your data security and money safety are MoMo's top priorities."
     ),
-    pciImage = "https://static.momocdn.net/app/img/kits/trustBanner/pci.png",
+    subContent = mapOf(
+        "vi" to "Tìm hiểu thêm",
+        "en" to "Learn more"
+    ),
+    pciImage = "https://static.momocdn.net/app/img/kits/trustBanner/pci_dss.png",
     sslImage = "https://static.momocdn.net/app/img/kits/trustBanner/ssl.png",
     urlConfig = "login_and_security",
     icons = listOf(
@@ -38,40 +39,23 @@ val defaultBanner = TrustBannerData(
         "https://static.momocdn.net/app/img/kits/trustBanner/ic_vietcombank.png",
         "https://static.momocdn.net/app/img/kits/trustBanner/ic_bidv.png"
     ),
-    momoImage = "https://static.momocdn.net/app/img/kits/trustBanner/ic_momo_secu.png"
+    momoImage = "https://static.momocdn.net/app/img/kits/trustBanner/ic_secu.png"
 )
 
-const val borderColor = 0xFFE8E8E8
-const val tonalColor = 0xFFFDEAF4
 const val backgroundBlue = 0xFFF2F8FF
 const val contentColor = 0xFF484848
-const val primaryColor = 0xFFEB2F96
-
-data class TrustBannerClass(
-    val trustBanner: TrustBannerData
-)
+const val subContentColor = 0xFFEB2F96
 
 data class TrustBannerData(
     val content: Map<String, String>,
+    val subContent: Map<String, String>,
     val pciImage: String,
+    val momoImage: String,
     val sslImage: String,
     val icons: List<String>,
-    val momoImage: String,
     val urlConfig: String
 )
 
-@Composable
-fun Avatar(iconURL: String) {
-    Image(
-        source = iconURL,
-        modifier = Modifier
-            .size(24.dp)
-            .background(Color.White, CircleShape)
-            .border(width = 1.dp, color = Color(borderColor), CircleShape),
-        options = Options(contentScale = ContentScale.Fit)
-    )
-}
-
 @Composable
 fun TrustBanner(
     trustBanner: TrustBannerData = defaultBanner,
@@ -80,6 +64,7 @@ fun TrustBanner(
     onPress: ((Map<String, String>) -> Unit)? = null,
     trackEvent: ((String, Map<String, String>) -> Unit)? = null,
     language: String = "vi"
+
 ) {
     val trackParams = mapOf(
         "service_name" to serviceName,
@@ -123,12 +108,11 @@ fun TrustBanner(
             modifier = Modifier
                 .width(64.dp)
                 .height(64.dp)
-                .padding(end = 8.dp),
-            options = Options(
-                contentScale = ContentScale.Fit,
-            )
         )
-        Column {
+        Column (
+          modifier = Modifier
+              .padding(start = 10.dp)
+        ) {
             Text(
                 text = trustBanner.content[language] ?: "",
                 modifier = Modifier.padding(bottom = 8.dp),
@@ -138,11 +122,26 @@ fun TrustBanner(
                 maxLines = 2
             )
             Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
+                Row (
+                    verticalAlignment = Alignment.CenterVertically,
+                )  {
+                    Text(
+                        text = trustBanner.subContent[language] ?: "",
+                        lineHeight = 16.sp,
+                        fontSize = 12.sp,
+                        color = Color(subContentColor),
+                        maxLines = 2
+                    )
+                    Icon(
+                        source = "https://img.mservice.io/momo_app_v2/new_version/img/appx_icon/16_arrow_chevron_right_small.png",
+                        color = Color(subContentColor),
+                    )
+                }
                 Row {
                     Image(
                         source = trustBanner.pciImage, modifier = Modifier
                             .padding(end = 4.dp)
-                            .width(52.dp)
+                            .width(27.dp)
                             .height(20.dp)
                         ,options = Options(
                             contentScale = ContentScale.Fit,
@@ -157,31 +156,6 @@ fun TrustBanner(
                         )
                     )
                 }
-                Row(
-                    modifier = Modifier
-                        .width(96.dp)
-                        .height(24.dp),
-                    horizontalArrangement = Arrangement.spacedBy((-6).dp)
-                ) {
-                    trustBanner.icons.forEach { iconURL ->
-                        Avatar(iconURL = iconURL)
-                    }
-                    Row(
-                        modifier = Modifier
-                            .size(24.dp)
-                            .background(color = Color(tonalColor), CircleShape)
-                            .border(width = 1.dp, color = Color(borderColor), CircleShape),
-                        verticalAlignment = Alignment.CenterVertically,
-                        horizontalArrangement = Arrangement.Center
-                    ) {
-                        Text(
-                            text = "36+",
-                            color = Color(primaryColor),
-                            lineHeight = 14.sp,
-                            fontSize = 10.sp
-                        )
-                    }
-                }
             }
         }
     }

package/compose/src/commonMain/kotlin/vn/momo/kits/platform/Platform.kt

@@ -19,7 +19,4 @@ expect fun getScreenDimensions(): ScreenDimension
 expect fun NativePaint.setMaskFilter(blurRadius: Float)
 
 @Composable
-expect fun getStatusBarHeight(): Dp
-
-@Composable
-expect fun getNavigationBarHeight(): Dp
+expect fun getStatusBarHeight(): Dp

package/compose/src/iosMain/kotlin/vn/momo/kits/platform/Platform.ios.kt

@@ -4,7 +4,6 @@ import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.gestures.optOutOfCupertinoOverscroll
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.asPaddingValues
-import androidx.compose.foundation.layout.navigationBars
 import androidx.compose.foundation.layout.systemBars
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.NativePaint
@@ -43,9 +42,4 @@ actual fun NativePaint.setMaskFilter(blurRadius: Float) {
 @Composable
 actual fun getStatusBarHeight(): Dp {
     return WindowInsets.systemBars.asPaddingValues().calculateTopPadding()
-}
-
-@Composable
-actual fun getNavigationBarHeight(): Dp {
-    return WindowInsets.navigationBars.asPaddingValues().calculateTopPadding()
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.89.31-beta.22",
+  "version": "0.89.32-nav.1",
   "private": false,
   "dependencies": {},
   "devDependencies": {},