@momo-kits/native-kits 0.160.1-beta.6-debug → 0.160.1-beta.7-debug

package/compose/build.gradle.kts

@@ -40,7 +40,7 @@ kotlin {
     }
 
     cocoapods {
-        version = "0.160.1-beta.6-debug"
+        version = "0.160.1-beta.7-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/Context.kt

@@ -6,9 +6,7 @@ import vn.momo.kits.components.TrustBannerData
 
 @Immutable
 data class FeatureFlags(
-    val isBaselineEnabled: Boolean? = false,
-    val isWhiteList: Boolean? = false,
-    val allowFontScale: Boolean? = true,
+    val showBaseLineDebug: Boolean? = false,
 )
 
 @Immutable
@@ -30,6 +28,7 @@ data class MiniAppContext(
     val providerId: String = "",
     val permissions: List<Map<String, Any>>? = emptyList(),
     val features: FeatureFlags? = null,
+    val scaleSizeMaxRate: Float? = null,
 ) {
     companion object {
 
@@ -61,6 +60,7 @@ data class MiniAppContext(
                 providerId = parent.providerId.ifBlank { child.providerId },
                 permissions = if (!parent.permissions.isNullOrEmpty()) parent.permissions else child.permissions,
                 features = mergeFeatureFlags(parent.features, child.features),
+                scaleSizeMaxRate = parent.scaleSizeMaxRate ?: child.scaleSizeMaxRate,
             )
         }
 
@@ -74,7 +74,7 @@ data class MiniAppContext(
             if (child == null) return parent
 
             return FeatureFlags(
-                isBaselineEnabled = parent.isBaselineEnabled ?: child.isBaselineEnabled
+                showBaseLineDebug = parent.showBaseLineDebug ?: child.showBaseLineDebug
             )
         }
     }
@@ -88,13 +88,12 @@ data class ComponentInformation(
     val action: String? = null
 )
 
+var IsShowBaseLineDebug = false
+
 val ApplicationContext = staticCompositionLocalOf<MiniAppContext?> {
     null
 }
 
-var IsShowBaseLineDebug = false
-
-var UseFontScaleSystem = true
 val AppConfig = staticCompositionLocalOf<KitConfig?> {
     null
 }
@@ -106,3 +105,5 @@ val AppLanguage = staticCompositionLocalOf<String?> {
 val LocalComponentInformation = staticCompositionLocalOf<ComponentInformation?> {
     null
 }
+
+val ScaleSizeMaxRate = staticCompositionLocalOf<Float?> { null }

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/BaselineView.kt

@@ -21,6 +21,10 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.PathEffect
 import androidx.compose.ui.graphics.StrokeCap
 import androidx.compose.ui.unit.dp
+import io.ktor.util.Platform
+import vn.momo.kits.application.IsShowBaseLineDebug
+import vn.momo.kits.const.Colors
+import vn.momo.kits.modifier.conditional
 import vn.momo.kits.platform.getPlatformName
 import vn.momo.kits.platform.getStatusBarHeight
 

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/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/components/ScaleSizeScope.kt

@@ -0,0 +1,17 @@
+package vn.momo.kits.components
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import vn.momo.kits.application.ScaleSizeMaxRate
+
+@Composable
+fun ScaleSizeScope(
+    scaleSizeMaxRate: Float? = null,
+    content: @Composable () -> Unit
+) {
+    CompositionLocalProvider(
+        ScaleSizeMaxRate provides scaleSizeMaxRate,
+    ) {
+        content()
+    }
+}

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

@@ -7,11 +7,15 @@ import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextDecoration
-import androidx.compose.ui.unit.*
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.TextUnit
+import androidx.compose.ui.unit.TextUnitType
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import org.jetbrains.compose.resources.Font
 import org.jetbrains.compose.resources.FontResource
 import org.jetbrains.compose.resources.InternalResourceApi
-import vn.momo.kits.application.UseFontScaleSystem
+import vn.momo.kits.application.ScaleSizeMaxRate
 import vn.momo.kits.platform.getScreenDimensions
 import vn.momo.uikits.resources.Res
 import vn.momo.uikits.resources.momosignature
@@ -29,23 +33,34 @@ import kotlin.math.max
 import kotlin.math.min
 
 const val DEFAULT_SCREEN_SIZE = 375f
-const val MAX_FONT_SCALE = 1.2f
+const val MAX_FONT_SCALE = 1.5f
+const val MAX_DEVICE_SCALE = 5
 
 @Composable
 fun scaleSize(size: Float): Float {
-    if (UseFontScaleSystem) {
-        val deviceWidth = getScreenDimensions().width
-        val deviceScale = deviceWidth / DEFAULT_SCREEN_SIZE
-        val fontScale = LocalDensity.current.fontScale
+    val scaleSizeMaxRate: Float = ScaleSizeMaxRate.current ?: MAX_FONT_SCALE
+    val deviceWidth = getScreenDimensions().width
+    val deviceScale = deviceWidth / DEFAULT_SCREEN_SIZE
 
-        val maxSize = size * MAX_FONT_SCALE
-        val fontSizeScaleDevice = if (deviceScale > 1) deviceScale * size else size
-        val fontSizeScaleOS = if (fontScale > 1) fontScale * size else size
+    val density = LocalDensity.current
+    val fontScale = density.fontScale
+
+    var fontSizeScaleDevice = size
+    var fontSizeScaleOS = size
 
-        return min(max(fontSizeScaleDevice, fontSizeScaleOS), maxSize)
+    if (deviceScale > 1) {
+        fontSizeScaleDevice =
+            min(deviceScale * fontSizeScaleDevice, fontSizeScaleDevice + MAX_DEVICE_SCALE)
     }
 
-    return size
+    if (fontScale > 1) {
+        fontSizeScaleOS = min(fontScale * fontSizeScaleOS, fontSizeScaleOS * scaleSizeMaxRate)
+    }
+
+    return max(
+        fontSizeScaleDevice,
+        fontSizeScaleOS
+    )
 }
 
 @Composable

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

@@ -61,6 +61,7 @@ fun NavigationContainer(
             ApplicationContext provides mergedContext,
             AppConfig provides config,
             AppLanguage provides language,
+            ScaleSizeMaxRate provides mergedContext?.scaleSizeMaxRate,
         ) {
             LaunchedEffect(Unit) {
                 setNavigator?.invoke(navigator)

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/libs.versions.toml

@@ -18,7 +18,7 @@ androidx-appcompat = "1.7.0"
 material = "1.10.0"
 maxapi = "0.1.1"
 vanniktechMavenPublish = "0.34.0"
-kits = "0.160.1-beta.6"
+kits = "0.159.1-beta.7"
 nativemaxapi = "0.0.6"
 
 [libraries]

package/gradle.properties

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

package/ios/Application/ApplicationEnvironment.swift

@@ -17,7 +17,7 @@ public class MiniAppContext {
     public var toolkitConfig: [String: Any] = [:]
     public var providerId: String = "momo"
     public var permissions: [[String: Any]] = []
-
+    
     public init(appId: String, appCode: String, appName: Any? = nil, appIcon: String, description: Any? = nil, support: [String: Any] = [:], toolkitConfig: [String: Any] = [:], providerId: String = "momo", permissions: [[String: Any]] = []) {
         self.appId = appId
         self.appCode = appCode
@@ -37,15 +37,11 @@ public class KitConfig {
     public var headerGradient: String? = nil
 }
 
-public var IsShowBaseLineDebug = false
-
-public var UseFontScaleSystem = true
-
 public class ApplicationEnvironment: ObservableObject {
     let applicationContext: MiniAppContext?
     let composeApi: KitComposeApi?
     let config: KitConfig?
-
+    
     public init(applicationContext: MiniAppContext? = nil, composeApi: KitComposeApi? = nil, config: KitConfig? = nil) {
         self.applicationContext = applicationContext
         self.composeApi = composeApi