@momo-kits/native-kits 0.160.1-searchBackground.3-debug → 0.160.1-searchBackground.5-debug

package/compose/build.gradle.kts

@@ -40,7 +40,7 @@ kotlin {
     }
 
     cocoapods {
-        version = "0.160.1-searchBackground.3-debug"
+        version = "0.160.1-searchBackground.5-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.159.1-beta.7'
+    spec.version                  = '0.159.1-beta.12'
     spec.homepage                 = 'https://momo.vn'
     spec.source                   = { :http=> ''}
     spec.authors                  = ''

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

@@ -70,13 +70,14 @@ actual fun getScreenHeight(): Dp {
     return getScreenDimensions().height.dp + if (getOSVersion() >= 35) 0.dp else AppStatusBar.current + AppNavigationBar.current
 }
 
-actual fun getOSVersion(): Int = Build.VERSION.SDK_INT
+actual fun getOSVersion(): OSVersion = OSVersion.Android(sdk = Build.VERSION.SDK_INT)
 
 @Composable
 actual fun LottieAnimation(
     path: String,
     tintColor: Color?,
     bgColor: Color?,
+    placedAsOverlay: Boolean,
     modifier: Modifier
 ) {
     val json = readJson(path)

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

@@ -63,6 +63,7 @@ import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.unit.Constraints
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.IntOffset
@@ -300,7 +301,7 @@ private fun LiteScreenHeader(
                                 color = headerColor.borderColor,
                                 shape = CircleShape,
                             )
-                            .background(color = headerColor.backgroundButton)
+                                .background(color = headerColor.backgroundButton)
                         }
                         .noFeedbackClickable(onClick = onGoBack)
                         .setAutomationId("btn_navigation_back")
@@ -522,11 +523,11 @@ data class LiteInputSearchProps(
     val disabled: Boolean = false,
 
     val placeHolder: String? = null,
-    
+
     val customBackIcon: @Composable (() -> Unit)? = null,
     val customSearchIcon: @Composable (() -> Unit)? = null,
     val customPlaceHolder: @Composable (() -> Unit)? = null,
-
+    val customTextStyle: TextStyle? = null,
     val iconRightTextField: @Composable ((Modifier) -> Unit)? = null,
 )
 
@@ -568,7 +569,6 @@ private fun LiteInputSearch(
         val textFieldModifier = remember(inputSearchProps.modifier) {
             inputSearchProps.modifier
                 .weight(1f)
-                .sizeIn(minHeight = 36.dp)
         }
         BasicTextField(
             value = textState,
@@ -577,7 +577,7 @@ private fun LiteInputSearch(
             keyboardOptions = inputSearchProps.keyboardOptions,
             keyboardActions = inputSearchProps.keyboardActions,
             modifier = textFieldModifier,
-            textStyle = inputFieldStyle,
+            textStyle = inputSearchProps.customTextStyle ?: inputFieldStyle,
             singleLine = true,
             interactionSource = interactionSource,
             decorationBox = { innerTextField ->
@@ -615,10 +615,6 @@ private fun LiteInputSearch(
 
                 Row(
                     modifier = Modifier
-                        .background(
-                            color = theme.colors.background.surface,
-                            shape = RoundedCornerShape(Radius.XL),
-                        )
                         .padding(
                             horizontal = Spacing.M,
                             vertical = Spacing.S,
@@ -639,7 +635,7 @@ private fun LiteInputSearch(
                         if (!placeHolder.isNullOrEmpty()) {
                             inputSearchProps.customPlaceHolder?.invoke() ?: Text(
                                 text = placeHolder ?: "",
-                                style = Typography.bodyDefaultRegular,
+                                style = inputSearchProps.customTextStyle ?: Typography.bodyDefaultRegular,
                                 maxLines = 1,
                                 color = theme.colors.text.hint,
                                 overflow = TextOverflow.Ellipsis

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

@@ -59,8 +59,9 @@ import vn.momo.kits.modifier.DeprecatedModifier
 import vn.momo.kits.modifier.conditional
 import vn.momo.kits.modifier.shadow
 import vn.momo.kits.navigation.component.SnackBar
-import vn.momo.kits.platform.getOSVersion
+import vn.momo.kits.platform.supportsImePadding
 import vn.momo.kits.utils.getAppStatusBarHeight
+import vn.momo.kits.utils.getNavigationBarHeight
 
 enum class HeaderType {
     DEFAULT,
@@ -102,7 +103,7 @@ fun Screen(
     val keyboardController = LocalSoftwareKeyboardController.current
 
     val isKeyboardVisible = isKeyboardVisible()
-    val indicator = getAppStatusBarHeight()
+    val indicator = getNavigationBarHeight()
     val bottomPadding = if (isKeyboardVisible) 0.dp else indicator
 
     val headerHeight = if (animatedHeader !== null)
@@ -134,7 +135,7 @@ fun Screen(
         Box(
             Modifier.fillMaxSize()
                 .background(backgroundColor ?: AppTheme.current.colors.background.default)
-                .conditional(useAvoidKeyboard && getOSVersion() > 29) {
+                .conditional(useAvoidKeyboard && supportsImePadding()) {
                     imePadding()
                 }.then(DeprecatedModifier())
         ) {

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

@@ -221,6 +221,7 @@ fun Input(
     onBlur: () -> Unit = {},
     loading: Boolean = false,
     required: Boolean = false,
+    maxLength: Int? = null,
     fontWeight: InputFontWeight = InputFontWeight.REGULAR,
     keyboardType: KeyboardType = KeyboardType.Text,
     modifier: Modifier = Modifier,
@@ -319,7 +320,10 @@ fun Input(
                         onBlur()
                     }
                 },
-            onValueChange = onChangeText,
+            onValueChange = { newText ->
+                val limitedText = maxLength?.let { newText.take(it) } ?: newText
+                onChangeText(limitedText)
+            },
             decorationBox = { innerTextField ->
                 // Floating label
                 if (floatingValue.isNotEmpty() || floatingIcon.isNotEmpty()) {

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

@@ -8,6 +8,7 @@ import androidx.compose.animation.core.rememberInfiniteTransition
 import androidx.compose.animation.core.tween
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
+import androidx.compose.ui.draw.alpha
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -129,8 +130,11 @@ fun InputOTP(
                 if (!it.isFocused && isBlurred) onBlur()
                 if (it.isFocused && !isBlurred) isBlurred = true
             },
-            decorationBox = { _ ->
+            decorationBox = { innerTextField ->
                 Box {
+                    Box(
+                        modifier = Modifier.fillMaxWidth().height(56.dp).alpha(0f)
+                    ) { innerTextField() }
                     if (floatingValue.isNotEmpty()) {
                         Box(
                             modifier = Modifier.wrapContentSize()

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

@@ -105,6 +105,8 @@ data class InputSearchProps(
     val iconModifier: Modifier = Modifier,
     val onClearPress: () -> Unit = {},
     val leftPosition: Dp? = null,
+    val placeholderCustomRender: (@Composable () -> Unit)? = null,
+    val searchIcon: (@Composable () -> Unit)? = null
 )
 
 @Composable
@@ -145,12 +147,13 @@ fun InputSearch(
         )
     }
 
-    Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier
-        .fillMaxWidth()
-        .height(36.dp)
-        .conditional(IsShowBaseLineDebug) {
-            border(1.dp, Colors.blue_03)
-        }
+    Row(
+        verticalAlignment = Alignment.CenterVertically, modifier = Modifier
+            .fillMaxWidth()
+            .height(36.dp)
+            .conditional(IsShowBaseLineDebug) {
+                border(1.dp, Colors.blue_03)
+            }
     ) {
         BasicTextField(
             enabled = !inputSearchProps.disabled,
@@ -184,13 +187,14 @@ fun InputSearch(
                         horizontalArrangement = Arrangement.Start,
                         verticalAlignment = Alignment.CenterVertically
                     ) {
+
                         Row(
                             modifier = Modifier.padding(
                                 horizontal = Spacing.M
                             ),
                             verticalAlignment = Alignment.CenterVertically
                         ) {
-                            Icon(
+                            inputSearchProps.searchIcon?.invoke() ?: Icon(
                                 source = "navigation_search",
                                 modifier = Modifier.padding(end = Spacing.XS),
                                 size = 24.dp,
@@ -198,13 +202,14 @@ fun InputSearch(
                             )
                             Box(Modifier.weight(1f)) {
                                 if (inputSearchProps.text.value.isEmpty()) {
-                                    Text(
-                                        text = inputSearchProps.placeholder,
-                                        style = placeHolderStyle,
-                                        maxLines = 1,
-                                        color = placeholderColor,
-                                        overflow = TextOverflow.Ellipsis
-                                    )
+                                    inputSearchProps.placeholderCustomRender?.invoke()
+                                        ?: Text(
+                                            text = inputSearchProps.placeholder,
+                                            style = placeHolderStyle,
+                                            maxLines = 1,
+                                            color = placeholderColor,
+                                            overflow = TextOverflow.Ellipsis
+                                        )
                                 }
                                 innerTextField()
                             }

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

@@ -62,7 +62,7 @@ import vn.momo.kits.navigation.component.HeaderRight
 import vn.momo.kits.navigation.component.HeaderType
 import vn.momo.kits.navigation.component.InputSearchType
 import vn.momo.kits.platform.BackHandler
-import vn.momo.kits.platform.getOSVersion
+import vn.momo.kits.platform.supportsImePadding
 import vn.momo.kits.navigation.tracking.ScreenTracker
 import vn.momo.kits.navigation.tracking.ScreenTrackingState
 import kotlinx.coroutines.delay
@@ -166,7 +166,7 @@ internal fun StackScreen(
             .conditional(options.keyboardOptions.keyboardShouldPersistTaps) {
                 hideKeyboardOnTap()
             }
-            .conditional(options.keyboardOptions.useAvoidKeyboard && getOSVersion() > 29) {
+            .conditional(options.keyboardOptions.useAvoidKeyboard && supportsImePadding()) {
                 imePadding()
             }
         ) {

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

@@ -30,13 +30,26 @@ expect fun ProvideNavigationEventDispatcherOwner(content: @Composable () -> Unit
 @Composable
 expect fun getScreenHeight(): Dp
 
-expect fun getOSVersion(): Int
+sealed interface OSVersion {
+    val value: Int
+    data class Android(val sdk: Int) : OSVersion { override val value: Int get() = sdk }
+    data class IOS(val major: Int) : OSVersion { override val value: Int get() = major }
+
+    operator fun compareTo(other: Int): Int = value.compareTo(other)
+}
+expect fun getOSVersion(): OSVersion
+
+fun supportsImePadding(): Boolean = when (val v = getOSVersion()) {
+    is OSVersion.Android -> v.sdk > 29
+    is OSVersion.IOS -> true
+}
 
 @Composable
 expect fun LottieAnimation(
     path: String,
     tintColor: Color? = null,
     bgColor: Color? = null,
+    placedAsOverlay: Boolean = false,
     modifier: Modifier = Modifier
 )
 

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

@@ -12,17 +12,19 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.InternalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.backhandler.LocalCompatNavigationEventDispatcherOwner
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.NativePaint
 import androidx.compose.ui.graphics.toArgb
-import androidx.compose.ui.interop.UIKitView
 import androidx.compose.ui.semantics.SemanticsPropertyKey
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.viewinterop.UIKitInteropProperties
+import androidx.compose.ui.viewinterop.UIKitView
 import cocoapods.lottie_ios.CompatibleAnimation
 import cocoapods.lottie_ios.CompatibleAnimationKeypath
 import cocoapods.lottie_ios.CompatibleAnimationView
@@ -85,16 +87,17 @@ actual fun getScreenHeight(): Dp {
     return getScreenDimensions().height.dp
 }
 
-actual fun getOSVersion(): Int {
-    return UIDevice.currentDevice.systemVersion.substringBefore(".").toIntOrNull() ?: 0
-}
+actual fun getOSVersion(): OSVersion = OSVersion.IOS(
+    major = UIDevice.currentDevice.systemVersion.substringBefore(".").toIntOrNull() ?: 0
+)
 
-@OptIn(ExperimentalForeignApi::class)
+@OptIn(ExperimentalForeignApi::class, ExperimentalComposeUiApi::class)
 @Composable
 actual fun LottieAnimation(
     path: String,
     tintColor: Color?,
     bgColor: Color?,
+    placedAsOverlay: Boolean,
     modifier: Modifier
 ) {
     var animation by remember { mutableStateOf<CompatibleAnimation?>(null) }
@@ -112,11 +115,12 @@ actual fun LottieAnimation(
             Box(modifier) {
                 UIKitView(
                     modifier = Modifier.fillMaxSize(),
+                    properties = UIKitInteropProperties(placedAsOverlay = placedAsOverlay),
                     factory = {
                         CompatibleAnimationView(value).apply {
                             translatesAutoresizingMaskIntoConstraints = true
 
-                            setBackgroundColor(bgColor?.toUIColor() ?: UIColor.whiteColor)
+                            setBackgroundColor(bgColor?.toUIColor() ?: UIColor.clearColor)
 
                             setLoopAnimationCount(-1.0)
                             setAnimationSpeed(1.0)
@@ -137,7 +141,7 @@ actual fun LottieAnimation(
                     },
 
                     update = { view ->
-                        view.setBackgroundColor(bgColor?.toUIColor() ?: UIColor.whiteColor)
+                        view.setBackgroundColor(bgColor?.toUIColor() ?: UIColor.clearColor)
 
                         if (tintColor != null) {
                             val uiColor = tintColor.toUIColor()

package/gradle.properties

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

package/ios/Input/Input.swift

@@ -22,6 +22,7 @@ public struct Input: View {
     public var leadingIconColor: Color
     public var loading: Bool
     public var required: Bool
+    public var maxLength: Int?
     public var fontWeight: InputFontWeight
     public var keyboardType: UIKeyboardType
     public var autofocus: Bool
@@ -52,6 +53,7 @@ public struct Input: View {
         leadingIconColor: Color = Colors.black12,
         loading: Bool = false,
         required: Bool = false,
+        maxLength: Int? = nil,
         fontWeight: InputFontWeight = .regular,
         keyboardType: UIKeyboardType = .default,
         autofocus: Bool = false,
@@ -78,6 +80,7 @@ public struct Input: View {
         self.leadingIconColor = leadingIconColor
         self.loading = loading
         self.required = required
+        self.maxLength = maxLength
         self.fontWeight = fontWeight
         self.keyboardType = keyboardType
         self.autofocus = autofocus
@@ -93,10 +96,10 @@ public struct Input: View {
             get: { self.text },
             set: { newValue in
                 self.text = newValue
-                self.onChangeText?(newValue)
+                self.onChangeText?(limitText(newValue))
             }
         )
-        
+
         VStack(alignment: .leading, spacing: 4) {
             ZStack(alignment: .topLeading) {
                 // Floating label
@@ -142,6 +145,7 @@ public struct Input: View {
                                 fontWeight: fontWeight == .bold ? .bold : .regular,
                                 textColor: UIColor(getTextColor()),
                                 isDisabled: disabled || readOnly,
+                                maxLength: maxLength,
                                 onFocusChange: { focused in
                                     handleFocusChange(focused)
                                 },
@@ -156,6 +160,12 @@ public struct Input: View {
                             .foregroundColor(getTextColor())
                             .disabled(disabled || readOnly)
                             .applyPrimaryCursorColor()
+                            .onChange(of: text) { newValue in
+                                let limited = limitText(newValue)
+                                if limited != newValue {
+                                    text = limited
+                                }
+                            }
                         }
                     }
                     
@@ -239,6 +249,13 @@ public struct Input: View {
         isPasswordHidden.toggle()
         onRightIconPressed?()
     }
+
+    private func limitText(_ value: String) -> String {
+        guard let maxLength = maxLength else {
+            return value
+        }
+        return String(value.prefix(maxLength))
+    }
     
     private func borderColor() -> Color {
         if disabled {
@@ -279,6 +296,7 @@ private struct SecureInputField: UIViewRepresentable {
     var fontWeight: UIFont.Weight
     var textColor: UIColor
     var isDisabled: Bool
+    var maxLength: Int?
     var onFocusChange: (Bool) -> Void
     var onChangeText: ((String) -> Void)?
 
@@ -307,6 +325,7 @@ private struct SecureInputField: UIViewRepresentable {
     }
 
     func updateUIView(_ textField: UITextField, context: Context) {
+        context.coordinator.parent = self
         if textField.text != text {
             textField.text = text
         }
@@ -342,7 +361,7 @@ private struct SecureInputField: UIViewRepresentable {
         }
 
         func textFieldDidEndEditing(_ textField: UITextField) {
-            parent.text = textField.text ?? ""
+            parent.text = limitText(textField.text ?? "")
             parent.onFocusChange(false)
         }
 
@@ -357,7 +376,10 @@ private struct SecureInputField: UIViewRepresentable {
 
         @objc func textFieldDidChange(_ textField: UITextField) {
             if isResettingText { return }
-            let newText = textField.text ?? ""
+            let newText = limitText(textField.text ?? "")
+            if textField.text != newText {
+                textField.text = newText
+            }
             parent.text = newText
             parent.onChangeText?(newText)
         }
@@ -366,6 +388,13 @@ private struct SecureInputField: UIViewRepresentable {
             textField.resignFirstResponder()
             return true
         }
+
+        private func limitText(_ value: String) -> String {
+            guard let maxLength = parent.maxLength else {
+                return value
+            }
+            return String(value.prefix(maxLength))
+        }
     }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.160.1-searchBackground.3-debug",
+  "version": "0.160.1-searchBackground.5-debug",
   "private": false,
   "dependencies": {},
   "devDependencies": {},