@momo-kits/native-kits 0.156.6-beta.1-debug → 0.156.6-beta.10-debug

package/compose/build.gradle.kts

@@ -40,7 +40,7 @@ kotlin {
     }
 
     cocoapods {
-        version = "0.156.6-beta.1-debug"
+        version = "0.156.6-beta.10-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.156.1-beta.2'
+    spec.version                  = '0.156.1-test.6'
     spec.homepage                 = 'https://momo.vn'
     spec.source                   = { :http=> ''}
     spec.authors                  = ''

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

@@ -78,6 +78,14 @@ data class MiniAppContext(
     }
 }
 
+@Immutable
+data class ComponentInformation(
+    val componentName: String? = null,
+    val componentId: String? = null,
+    val params: Map<String,Any?>? = null,
+    val action: String? = null
+)
+
 var IsShowBaseLineDebug = false
 
 val ApplicationContext = staticCompositionLocalOf<MiniAppContext?> {
@@ -92,4 +100,8 @@ val AppLanguage = staticCompositionLocalOf<String?> {
     null
 }
 
+val LocalComponentInformation = staticCompositionLocalOf<ComponentInformation?> {
+    null
+}
+
 internal val ScaleSizeMaxRate  = staticCompositionLocalOf<Float?> { null }

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

@@ -370,9 +370,14 @@ private class LiteScreenHeaderPolicy(
                 maxWidth = (realConstraints.maxWidth * (1 - scrollPercent)).toInt()
                     .coerceAtLeast(minWidth)
             )
-        } else realConstraints.copy(
-            maxWidth = realConstraints.maxWidth - backIconPlaceable.safeWidth - headerRightPlaceable.safeWidth - spacing12 * 2
-        )
+        } else {
+            var spaceConsumed = 0
+            if (backIconPlaceable.safeWidth != 0) spaceConsumed += backIconPlaceable.safeWidth + spacing12
+            if (headerRightPlaceable.safeWidth != 0) spaceConsumed += headerRightPlaceable.safeWidth + spacing12
+            realConstraints.copy(
+                maxWidth = realConstraints.maxWidth - spaceConsumed
+            )
+        }
         val inputSearchPlaceable = measurables.find { it.layoutId == HeaderId.INPUT_SEARCH_ID }
             ?.measure(inputSearchConstraints)
         val titlePlaceable = measurables.find { it.layoutId == HeaderId.TITLE_ID }?.measure(
@@ -516,7 +521,7 @@ private fun LiteInputSearch(
 
     val isShowBtnText by remember(inputSearchProps.isShowBtnText, inputSearchProps.btnText) {
         derivedStateOf {
-            inputSearchProps.isShowBtnText && inputSearchProps.btnText.isNullOrEmpty()
+            inputSearchProps.isShowBtnText && !inputSearchProps.btnText.isNullOrEmpty()
         }
     }
     val inputFieldStyle = remember(theme) {

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

@@ -11,17 +11,14 @@ import androidx.compose.foundation.interaction.collectIsPressedAsState
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.defaultMinSize
 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.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
@@ -127,13 +124,12 @@ fun getTextColor(loading: Boolean, type: ButtonType): Color {
 }
 
 @Composable
-fun RenderTitle(size: Size, title: String = "", type: ButtonType) {
+fun RenderTitle(size: Size, title: String = "", textColor: Color) {
     val style = remember(size) { getStyle(size) }
-    val color = TextColor.current
     Text(
         style = style,
         text = title,
-        color = color,
+        color = textColor,
         overflow = TextOverflow.Ellipsis,
         maxLines = 1
     )
@@ -145,21 +141,20 @@ fun RenderIcon(
     isIconLeft: Boolean,
     useTintColor: Boolean = true,
     icon: String = "",
-    forceLoading: Boolean = false
+    forceLoading: Boolean = false,
+    bgColor: Color,
+    textColor: Color,
 ) {
-    val bgColor = BackgroundColor.current
     val iconSize = remember(size) { getIconSize(size) }
     val margin = remember(size) { getIconSpace(size) }
-    val color = if (useTintColor) TextColor.current else Color.Unspecified
-
-    val showLoading = forceLoading
+    val color = if (useTintColor) textColor else Color.Unspecified
 
     val modifier = Modifier.padding(
         start = if (isIconLeft) 0.dp else margin,
         end = if (isIconLeft) margin else 0.dp
     )
 
-    if (showLoading) {
+    if (forceLoading) {
         Box(modifier) {
             LottieAnimation(
                 modifier = Modifier.size(iconSize),
@@ -195,9 +190,9 @@ fun getTypeStyle(
     type: ButtonType,
     color: Color? = AppTheme.current.colors.primary,
     size: Size,
+    bgColor: Color,
 ): Modifier {
     val theme = AppTheme.current
-    val bgColor = BackgroundColor.current
     val radius = remember(size) { size.value.radius }
     val modifier = Modifier.background(bgColor)
 
@@ -304,45 +299,41 @@ fun Button(
                 .clip(RoundedCornerShape(radius))
         }
 
-    CompositionLocalProvider(
-        IsLoading provides loading,
-        BackgroundColor provides getButtonBackgroundColor(loading, type),
-        TextColor provides getTextColor(loading, type)
+    val bgColor = getButtonBackgroundColor(loading, type)
+    val textColor = getTextColor(loading, type)
+
+    Row(
+        modifier = clickableModifier
+            .padding(horizontal = animatedPadding)
+            .clip(RoundedCornerShape(radius))
+            .then(getTypeStyle(type, size = size, bgColor = bgColor))
+            .conditional(IsShowBaseLineDebug) {
+                border(1.dp, Colors.blue_03)
+            }
+            .padding(horizontal = sizeSpecs.padding)
+            .height(sizeSpecs.height),
+        horizontalArrangement = Arrangement.Center,
+        verticalAlignment = Alignment.CenterVertically,
     ) {
-        Row(
-            modifier = clickableModifier
-                .padding(horizontal = animatedPadding)
-                .clip(RoundedCornerShape(radius))
-                .then(getTypeStyle(type, size = size))
-                .conditional(IsShowBaseLineDebug) {
-                    border(1.dp, Colors.blue_03)
-                }
-                .padding(horizontal = sizeSpecs.padding)
-                .height(sizeSpecs.height),
-            horizontalArrangement = Arrangement.Center,
-            verticalAlignment = Alignment.CenterVertically,
-        ) {
-            RenderIcon(
-                size = size,
-                isIconLeft = true,
-                useTintColor = useTintColor,
-                icon = iconLeft,
-                forceLoading = loading && loadingOnLeft
-            )
-            RenderTitle(size, title, type = type)
-            RenderIcon(
-                size = size,
-                isIconLeft = false,
-                useTintColor = useTintColor,
-                icon = iconRight,
-                forceLoading = loading && !loadingOnLeft
-            )
-        }
+        RenderIcon(
+            size = size,
+            isIconLeft = true,
+            useTintColor = useTintColor,
+            icon = iconLeft,
+            forceLoading = loading && loadingOnLeft,
+            bgColor = bgColor,
+            textColor = textColor
+        )
+        RenderTitle(size, title, textColor = textColor)
+        RenderIcon(
+            size = size,
+            isIconLeft = false,
+            useTintColor = useTintColor,
+            icon = iconRight,
+            forceLoading = loading && !loadingOnLeft,
+            bgColor = bgColor,
+            textColor = textColor
+        )
     }
 }
 
-
-private val IsLoading = staticCompositionLocalOf<Boolean> { false }
-private val BackgroundColor = staticCompositionLocalOf<Color> { Color.Transparent }
-private val TextColor = staticCompositionLocalOf<Color> { Color.Transparent }
-

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

@@ -40,6 +40,7 @@ import vn.momo.kits.const.Typography
 import vn.momo.kits.const.scaleSize
 import vn.momo.kits.modifier.conditional
 import vn.momo.kits.modifier.setAutomationId
+import vn.momo.kits.utils.getComponentId
 
 data class InputPhoneNumberSizeDetail(
     val borderWidth: Dp,
@@ -98,6 +99,7 @@ fun InputPhoneNumber(
     onBlur: () -> Unit = {},
     loading: Boolean = false,
     modifier: Modifier = Modifier,
+    accessibilityLabel: String?,
 ) {
     // Consolidated state management
     var inputState by remember { mutableStateOf(InputState()) }
@@ -113,16 +115,16 @@ fun InputPhoneNumber(
     }
 
     val (textColor, placeholderColor, iconTintColor) = colors
+    val textStyle = scaleSize(size.values.textStyle.copy(color = textColor))
 
-    val testId = "input_phone_number"
 
-    val textStyle = scaleSize(size.values.textStyle.copy(color = textColor))
+    val componentName = "InputPhoneNumber"
+    val componentId = getComponentId(componentName, accessibilityLabel)
 
     Column(modifier = modifier
         .conditional(IsShowBaseLineDebug) {
             border(1.dp, Colors.blue_03)
-        }
-        .setAutomationId(testId)) {
+        }) {
         BasicTextField(
             singleLine = true,
             value = text.value,
@@ -143,7 +145,8 @@ fun InputPhoneNumber(
                     } else if (inputState.hasBeenBlurred) {
                         onBlur()
                     }
-                },
+                }
+                .setAutomationId(componentId),
             onValueChange = onChangeText,
             decorationBox = { innerTextField ->
                 // Input container

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

@@ -180,10 +180,6 @@ val darkTheme = Theme(
 
 val AppTheme = staticCompositionLocalOf { defaultTheme }
 
-val AppThemeController = staticCompositionLocalOf<(Theme) -> Unit> {
-    error("No AppTheme controller provided")
-}
-
 val AppStatusBar = staticCompositionLocalOf { 0.dp }
 
 val AppNavigationBar = staticCompositionLocalOf { 0.dp }

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

@@ -30,7 +30,6 @@ import vn.momo.kits.application.MiniAppContext
 import vn.momo.kits.const.AppNavigationBar
 import vn.momo.kits.const.AppStatusBar
 import vn.momo.kits.const.AppTheme
-import vn.momo.kits.const.AppThemeController
 import vn.momo.kits.const.Theme
 import vn.momo.kits.const.ThemeAssets
 import vn.momo.kits.const.defaultTheme
@@ -80,7 +79,6 @@ fun NavigationContainer(
         LocalNavigator provides navigator,
         LocalMaxApi provides maxApi,
         AppTheme provides theme.value,
-        AppThemeController provides { theme.value = it },
         AppStatusBar provides statusBarHeight,
         AppNavigationBar provides navigationBarHeight,
         ApplicationContext provides mergedContext,

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

@@ -0,0 +1,15 @@
+package vn.momo.kits.utils
+
+import androidx.compose.runtime.Composable
+import vn.momo.kits.application.LocalComponentInformation
+
+@Composable
+fun getComponentId(
+    componentName: String? = null,
+    accessibilityLabel: String? = null,
+): String {
+    val componentInformation = LocalComponentInformation.current
+    if (accessibilityLabel != null) return accessibilityLabel
+    if (componentInformation?.componentId != null) return componentInformation.componentId
+    return ""
+}

package/gradle.properties

@@ -18,7 +18,7 @@ kotlin.apple.xcodeCompatibility.nowarn=true
 name="ComposeKits"
 group=vn.momo.kits
 artifact.id=kits
-version=0.156.1-test.6
+version=0.156.6-beta.10
 
 repo=GitLab
 url=https://gitlab.mservice.com.vn/api/v4/projects/5400/packages/maven

package/ios/Image/Image.swift

@@ -31,11 +31,7 @@ public struct ImageView: View {
             .placeholder {
                 VStack(alignment: .center, content: {
                     if error {
-                        Image("media_fail")
-                            .resizable()
-                            .renderingMode(.template)
-                            .foregroundColor(Colors.black17)
-                            .frame(width: 24, height: 24)
+                        Image(systemName: "photo.badge.exclamationmark").frame(width: 24, height: 24)
                     } else if placeholder != nil {
                         placeholder
                     }

package/ios/Input/InputPhoneNumber.swift

@@ -21,6 +21,7 @@ public struct InputPhoneNumber: View {
     public var onFocus: (() -> Void)?
     public var onBlur: (() -> Void)?
     public var onRightIconPressed: (() -> Void)?
+    public var accessibilityLabel: String?
     
     @State private var isFocused: Bool = false
     
@@ -38,7 +39,8 @@ public struct InputPhoneNumber: View {
         onChangeText: ((String) -> Void)? = nil,
         onFocus: (() -> Void)? = nil,
         onBlur: (() -> Void)? = nil,
-        onRightIconPressed: (() -> Void)? = nil
+        onRightIconPressed: (() -> Void)? = nil,
+        accessibilityLabel: String? = nil
     ) {
         self._text = text
         self.placeholder = placeholder
@@ -53,6 +55,7 @@ public struct InputPhoneNumber: View {
         self.onFocus = onFocus
         self.onBlur = onBlur
         self.onRightIconPressed = onRightIconPressed
+        self.accessibilityLabel = accessibilityLabel
     }
     
     // MARK: - Body
@@ -94,6 +97,7 @@ public struct InputPhoneNumber: View {
                     .foregroundColor(Colors.black17)
                     .applyPrimaryCursorColor()
                     .lineLimit(1)
+                    .accessibility(identifier: accessibilityLabel)
                 }
                 
                 // Clear button

package/ios/Popup/PopupDisplay.swift

@@ -113,7 +113,11 @@ public struct PopupDisplay: View {
                 }
                 
                 VStack(spacing: 0) {
-                    if(!url.isEmpty) {
+                    if(url.isEmpty) {
+                        Icon(source: "media_fail")
+                            .frame(width: .infinity, height: 184)
+                    }
+                    else {
                         WebImage(url: URL(string: url), isAnimating: .constant(true))
                             .resizable()
                             .placeholder {

package/package.json

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