@momo-kits/native-kits 0.163.1-footer.2-debug → 0.163.1-information.1-debug

package/compose/build.gradle.kts

@@ -40,7 +40,7 @@ kotlin {
     }
 
     cocoapods {
-        version = "0.163.1-footer.2-debug"
+        version = "0.163.1-information.1-debug"
         summary = "IOS Shared module"
         homepage = "https://momo.vn"
         ios.deploymentTarget = "15.0"

package/compose/compose.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
     spec.name                     = 'compose'
-    spec.version                  = '0.163.1-footer.2-debug'
+    spec.version                  = '0.163.1-information.1-debug'
     spec.homepage                 = 'https://momo.vn'
     spec.source                   = { :http=> ''}
     spec.authors                  = ''

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

@@ -6,6 +6,7 @@ import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.text.style.TextAlign
@@ -16,6 +17,7 @@ import vn.momo.kits.const.Radius
 import vn.momo.kits.const.Spacing
 import vn.momo.kits.const.Typography
 import vn.momo.kits.modifier.conditional
+import vn.momo.kits.modifier.setAutomationId
 
 enum class InformationState {
     DEFAULT,
@@ -34,7 +36,12 @@ fun Information(
     action: String? = null,
     showIconClose: Boolean = true,
     onPressClose: (() -> Unit)? = null,
+    accessibilityLabel: String? = null,
 ) {
+    val automationId = remember(accessibilityLabel, title) {
+        accessibilityLabel ?: "Information${if (title != null) "/$title" else ""}"
+    }
+
     var borderColor = Colors.blue_07
     var backgroundColor = Colors.blue_10
     var color = Colors.blue_03
@@ -64,6 +71,7 @@ fun Information(
                 border(1.dp, Colors.blue_03)
             }
             .padding(Spacing.M)
+            .setAutomationId(automationId)
     ) {
         Row {
             if (image != null) {
@@ -71,7 +79,7 @@ fun Information(
                     source = image,
                     modifier = Modifier.padding(end = Spacing.S).width(40.dp).height(40.dp).clip(
                         RoundedCornerShape(Radius.S)
-                    )
+                    ).setAutomationId("$automationId|img")
                 )
             }
             if (image == null && showIcon) {
@@ -80,30 +88,44 @@ fun Information(
                     size = 16.dp,
                     color = color,
                     modifier = Modifier.padding(end = Spacing.S)
+                        .setAutomationId("$automationId|icon")
                 )
             }
             Column(modifier = Modifier.weight(1f)) {
                 if (title != null) {
-                    Text(title, style = Typography.labelDefaultMedium)
+                    Text(
+                        title,
+                        style = Typography.labelDefaultMedium,
+                        accessibilityId = "$automationId|title-text"
+                    )
                 }
-                Text(description, style = Typography.descriptionDefaultRegular)
+                Text(
+                    description,
+                    style = Typography.descriptionDefaultRegular,
+                    accessibilityId = "$automationId|description-text"
+                )
             }
             if (onPressClose != null && showIconClose) {
                 Icon(
                     source = "navigation_close",
                     size = 16.dp,
                     modifier = Modifier.clickable(onClick = onPressClose)
+                        .setAutomationId("$automationId|close-icon-touch")
                 )
             }
         }
         if (action != null && onPressAction != null) {
-            Row(modifier = Modifier.padding(top = Spacing.S)) {
+            Row(
+                modifier = Modifier.padding(top = Spacing.S)
+                    .setAutomationId("$automationId|cta-touch")
+            ) {
                 Text(
                     action,
                     modifier = Modifier.weight(1f).clickable(onClick = onPressAction),
                     textAlign = TextAlign.End,
                     style = Typography.actionXsBold,
-                    color = color
+                    color = color,
+                    accessibilityId = "$automationId|cta-text"
                 )
             }
         }

package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/Navigation.kt

@@ -32,7 +32,6 @@ class Navigation(
         backgroundColor: Color? = null,
         tintColor: Color? = null,
         footerComponent: (@Composable () -> Unit)? = null,
-        footerTransparent: Boolean? = null,
         floatingButtonProps: FloatingButtonProps? = null,
         keyboardOptions: KeyboardOptions? = null
     ) {
@@ -49,7 +48,6 @@ class Navigation(
                 backgroundColor = backgroundColor ?: options.backgroundColor,
                 tintColor = tintColor ?: options.tintColor,
                 footerComponent = footerComponent ?: options.footerComponent,
-                footerTransparent = footerTransparent ?: options.footerTransparent,
                 floatingButtonProps = floatingButtonProps ?: options.floatingButtonProps,
                 keyboardOptions = keyboardOptions ?: options.keyboardOptions,
             )
@@ -85,9 +83,6 @@ data class NavigationOptions(
     val backgroundColor: Color? = null,
     val tintColor: Color? = null,
     val footerComponent: @Composable (() -> Unit)? = null,
-    // Transparent footer keeps its layout slot but drops the surface background + shadow,
-    // so the screen background shows through.
-    val footerTransparent: Boolean = false,
     val floatingButtonProps: FloatingButtonProps? = null,
     val keyboardOptions: KeyboardOptions = KeyboardOptions()
 ) {

package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/StackScreen.kt

@@ -316,11 +316,7 @@ internal fun FooterContent() {
     if (options.hasFooter()) {
         val keyboardSize = keyboardSizeState()
         val bottomPadding = (AppNavigationBar.current - keyboardSize.value).coerceAtLeast(0.dp)
-        Footer(
-            footerComponent = options.footerComponent,
-            bottomPadding = bottomPadding,
-            transparent = options.footerTransparent
-        )
+        Footer(footerComponent = options.footerComponent, bottomPadding = bottomPadding)
     }
 }
 
@@ -344,7 +340,7 @@ internal fun OverplayView(isBottomTabChild: Boolean, id: Int) {
 }
 
 @Composable
-fun Footer(footerComponent: @Composable (() -> Unit)?, bottomPadding: Dp, transparent: Boolean = false) {
+fun Footer(footerComponent: @Composable (() -> Unit)?, bottomPadding: Dp) {
     if (footerComponent == null) return
 
     val footerHeightPx = LocalFooterHeightPx.current
@@ -355,15 +351,13 @@ fun Footer(footerComponent: @Composable (() -> Unit)?, bottomPadding: Dp, transp
         )
     }
 
-    val backgroundColor = if (transparent) Color.Transparent else AppTheme.current.colors.background.surface
-
     Box(Modifier.onGloballyPositioned {
         if (footerHeightPx.intValue != it.size.height) footerHeightPx.intValue = it.size.height
     }) {
         Box(
             Modifier
                 .fillMaxWidth()
-                .background(backgroundColor)
+                .background(AppTheme.current.colors.background.surface)
                 .conditional(IsShowBaseLineDebug) {
                     border(1.dp, Colors.blue_03)
                 }
@@ -372,15 +366,13 @@ fun Footer(footerComponent: @Composable (() -> Unit)?, bottomPadding: Dp, transp
             footerComponent.invoke()
         }
 
-        if (!transparent) {
-            Box(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .height(6.dp)
-                    .offset(x = 0.dp, y = (-6).dp)
-                    .background(shadowBrush)
-            )
-        }
+        Box(
+            modifier = Modifier
+                .fillMaxWidth()
+                .height(6.dp)
+                .offset(x = 0.dp, y = (-6).dp)
+                .background(shadowBrush)
+        )
     }
 }
 

package/gradle.properties

@@ -18,7 +18,7 @@ kotlin.apple.xcodeCompatibility.nowarn=true
 name="ComposeKits"
 group=vn.momo.kits
 artifact.id=kits
-version=0.163.1-footer.2
+version=0.163.1-information.1
 
 repo=GitLab
 url=https://gitlab.mservice.com.vn/api/v4/projects/5400/packages/maven

package/ios/native-kits.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'MoMoUIKits'
-  s.version          = '0.163.1-footer.2'
+  s.version          = '0.163.1-information.1'
   s.summary          = 'MoMoUIKits for iOS'
   s.homepage         = 'https://momo.vn'
   s.license          = { :type => 'MIT' }

package/ios-demo/MoMoUIKitsDemo.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'MoMoUIKitsDemo'
-  s.version          = '0.163.1-footer.2'
+  s.version          = '0.163.1-information.1'
   s.summary          = 'Demo browser for MoMoUIKits SwiftUI components'
   s.homepage         = 'https://momo.vn'
   s.license          = { :type => 'MIT' }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.163.1-footer.2-debug",
+  "version": "0.163.1-information.1-debug",
   "private": false,
   "dependencies": {},
   "devDependencies": {},