@momo-kits/native-kits 0.113.1-beta.14 → 0.113.1-beta.16

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

@@ -1,6 +1,5 @@
 package vn.momo.kits.application
 
-import androidx.compose.animation.animateColorAsState
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
@@ -24,7 +23,6 @@ import androidx.compose.runtime.setValue
 import androidx.compose.runtime.snapshotFlow
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.semantics.testTag
@@ -42,15 +40,6 @@ import vn.momo.kits.const.Spacing
 import vn.momo.kits.modifier.setAutomationId
 import vn.momo.kits.platform.getStatusBarHeight
 
-enum class TitlePosition {
-    LEFT, CENTER,
-}
-
-data class AnimatedHeader(
-    val type: HeaderType = HeaderType.DEFAULT,
-    val composable: @Composable (scrollState: Int) -> Unit = {}
-)
-
 @Composable
 fun Header(
     headerType: HeaderType = HeaderType.DEFAULT,
@@ -67,7 +56,6 @@ fun Header(
     val statusBarHeight = AppStatusBar.current ?: getStatusBarHeight()
     val tintIconColor = AppTheme.current.colors.text.default
     val backgroundButton = Colors.black_01.copy(alpha = 0.6f)
-    val miniAppContext = ApplicationContext.current
 
     var colorFraction by remember { mutableStateOf(0f) }
 
@@ -78,12 +66,10 @@ fun Header(
             .collect { fraction -> colorFraction = fraction }
     }
 
-    val backgroundSearch by animateColorAsState(
-        targetValue = animateColor(
-            Colors.black_01,
-            AppTheme.current.colors.background.default,
-            colorFraction
-        )
+    val backgroundSearch = animateColor(
+        Colors.black_01,
+        AppTheme.current.colors.background.default,
+        colorFraction
     )
 
     if (headerType != HeaderType.NONE) {
@@ -132,9 +118,9 @@ fun Header(
                     }
                 }
 
-                if (((useAnimationSearch && inputSearchProps != null) || inputSearchProps == null) && miniAppContext != null) {
+                if (useAnimationSearch || inputSearchProps == null) {
                     Box(Modifier.graphicsLayer {
-                        alpha = if (useAnimationSearch) 1f - (opacity ?: 1f) else 1f
+                        alpha = if (animatedHeader !== null) opacity ?: 1f else 1f
                     }) {
                         headerRight?.invoke()
                     }
@@ -151,12 +137,13 @@ fun Header(
                 if (goBack != null && titlePosition == TitlePosition.LEFT) {
                     Spacer(Modifier.width(40.dp))
                 }
+
                 if (inputSearchProps != null && !useAnimationSearch) {
                     InputSearch(inputSearchProps = inputSearchProps.copy(backgroundColor = backgroundSearch))
                 } else {
                     Box(
                         Modifier.weight(1f).graphicsLayer {
-                            alpha = if (useAnimationSearch && inputSearchProps != null) {
+                            alpha = if (useAnimationSearch) {
                                 1f - (opacity ?: 1f)
                             } else {
                                 if (animatedHeader !== null) opacity ?: 1f else 1f
@@ -164,6 +151,7 @@ fun Header(
                         },
                         contentAlignment = if (titlePosition == TitlePosition.LEFT) Alignment.TopStart else Alignment.Center
                     ) {
+
                         HeaderTitle(
                             title = title,
                             color = tintIconColor,
@@ -176,14 +164,4 @@ fun Header(
             }
         }
     }
-}
-
-
-fun animateColor(start: Color, stop: Color, fraction: Float): Color {
-    return Color(
-        red = start.red + fraction * (stop.red - start.red),
-        green = start.green + fraction * (stop.green - start.green),
-        blue = start.blue + fraction * (stop.blue - start.blue),
-        alpha = start.alpha + fraction * (stop.alpha - start.alpha)
-    )
-}
+}

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

@@ -1,8 +1,11 @@
 package vn.momo.kits.application
 
+import androidx.compose.animation.animateColorAsState
+import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.Dp
@@ -10,11 +13,25 @@ import androidx.compose.ui.unit.dp
 import vn.momo.kits.components.InputSearchProps
 import vn.momo.kits.const.AppStatusBar
 import vn.momo.kits.const.AppTheme
-import vn.momo.kits.platform.getScreenDimensions
 import vn.momo.kits.platform.getStatusBarHeight
 
-private const val SCREEN_PADDING = 12
-private const val BACK_WIDTH = 28
+enum class TitlePosition {
+    LEFT, CENTER,
+}
+
+data class AnimatedHeader(
+    val type: HeaderType = HeaderType.DEFAULT,
+    val composable: @Composable (scrollState: Int) -> Unit = {}
+)
+
+fun animateColor(start: Color, stop: Color, fraction: Float): Color {
+    return Color(
+        red = start.red + fraction * (stop.red - start.red),
+        green = start.green + fraction * (stop.green - start.green),
+        blue = start.blue + fraction * (stop.blue - start.blue),
+        alpha = start.alpha + fraction * (stop.alpha - start.alpha)
+    )
+}
 
 @Composable
 fun HeaderBackground(
@@ -26,41 +43,39 @@ fun HeaderBackground(
     useAnimationSearch: Boolean = false
 ) {
     val statusBarHeight = AppStatusBar.current ?: getStatusBarHeight()
-    val screenWidth = getScreenDimensions().width
-    val leftPosition = if (isBack) (BACK_WIDTH + 20).dp else 20.dp
-    val searchWidth = screenWidth - (SCREEN_PADDING * 2)
 
-    val animations = useHeaderSearchAnimation(
-        scrollState = scrollState,
-        statusBarHeight = statusBarHeight,
-        leftPosition = leftPosition,
-        searchWidth = searchWidth,
-        headerRightWidth = headerRightWidth
+    val opacityAni by animateFloatAsState(
+        targetValue = (1 - (scrollState / 52f)).coerceIn(0f, 1f),
     )
 
-    val backgroundColor = if (scrollState == 0) {
-        Color.Transparent
-    } else {
-        AppTheme.current.colors.background.surface
-    }
+    val backgroundColor by animateColorAsState(
+        targetValue = animateColor(
+            Color.Transparent,
+            AppTheme.current.colors.background.surface,
+            opacityAni
+        ),
+    )
 
     when (headerType) {
         HeaderType.DEFAULT -> {
-            val height = statusBarHeight + 52.dp
             HeaderDefault(
-                height = height,
-                animations = animations,
-                backgroundColor = backgroundColor
+                opacityAni = opacityAni,
+                statusBarHeight = statusBarHeight,
+                backgroundColor = backgroundColor,
             )
         }
 
         HeaderType.EXTENDED -> {
-           HeaderExtended(
-                animations = animations,
+            HeaderExtended(
+                scrollState = scrollState,
                 inputSearchProps = inputSearchProps,
+                headerRightWidth = headerRightWidth,
                 useAnimationSearch = useAnimationSearch,
-                backgroundColor = backgroundColor
-           )
+                opacityAni = opacityAni,
+                isBack = isBack,
+                statusBarHeight = statusBarHeight,
+                backgroundColor = backgroundColor,
+            )
         }
 
         else -> {

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

@@ -21,10 +21,11 @@ import vn.momo.kits.utils.bottomBorder
 
 @Composable
 fun HeaderDefault(
-    height: Dp,
-    backgroundColor: Color,
-    animations: HeaderAnimations
+    opacityAni: Float,
+    statusBarHeight: Dp,
+    backgroundColor: Color
 ) {
+    val height = statusBarHeight + 52.dp
     Box(
         modifier = Modifier.fillMaxWidth().height(height)
             .background(backgroundColor)
@@ -37,7 +38,7 @@ fun HeaderDefault(
             modifier = Modifier
                 .height(height)
                 .fillMaxWidth()
-                .alpha(animations.opacity)
+                .alpha(opacityAni)
                 .background(
                     Brush.linearGradient(
                         colors = listOf(

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

@@ -1,5 +1,7 @@
 package vn.momo.kits.application
 
+import androidx.compose.animation.animateColorAsState
+import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -9,6 +11,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
@@ -17,30 +20,71 @@ import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import vn.momo.kits.components.Image
 import vn.momo.kits.components.InputSearch
 import vn.momo.kits.components.InputSearchProps
 import vn.momo.kits.components.Options
 import vn.momo.kits.const.AppTheme
+import vn.momo.kits.const.Colors
 import vn.momo.kits.const.Radius
 import vn.momo.kits.const.Spacing
+import vn.momo.kits.platform.getScreenDimensions
+import vn.momo.kits.utils.bottomBorder
+
+private const val SCREEN_PADDING = 12
+private const val BACK_WIDTH = 28
 
 @Composable
 fun HeaderExtended(
-    animations: HeaderAnimations,
-    inputSearchProps: InputSearchProps? = null,
-    useAnimationSearch: Boolean = false,
-    backgroundColor: Color = Color.Transparent
-){
+    opacityAni: Float,
+    inputSearchProps: InputSearchProps?,
+    useAnimationSearch: Boolean = true,
+    scrollState: Int,
+    headerRightWidth: Dp,
+    isBack: Boolean,
+    statusBarHeight: Dp,
+    backgroundColor: Color
+) {
+    val screenWidth = getScreenDimensions().width
+    val leftPosition = if (isBack) (BACK_WIDTH + 20).dp else 20.dp
+    val searchWidth = screenWidth - (SCREEN_PADDING * 2)
+
+    val backgroundSearch by animateColorAsState(
+        targetValue = animateColor(
+            AppTheme.current.colors.background.default,
+            Colors.black_01,
+            opacityAni
+        ),
+    )
+
+    val animatedTranslateX by animateFloatAsState(
+        targetValue = (scrollState / 52f).coerceIn(0f, 1f) * (leftPosition.value - 12) + 12,
+    )
+
+    val animatedWidth by animateFloatAsState(
+        targetValue = (scrollState / 52f).coerceIn(
+            0f,
+            1f
+        ) * ((searchWidth - leftPosition.value - headerRightWidth.value + 12) - searchWidth) + searchWidth,
+    )
+
+    val animatedHeight by animateFloatAsState(
+        targetValue = (1 - (scrollState / 52f).coerceIn(
+            0f,
+            1f
+        )) * (statusBarHeight.value + 94 - (statusBarHeight.value + 52)) + (statusBarHeight.value + 52),
+    )
     Box(
-        modifier = Modifier.fillMaxWidth().height(animations.height.dp)
+        modifier = Modifier.fillMaxWidth()
+            .height(animatedHeight.dp)
     ) {
         Box(
             modifier = Modifier
                 .fillMaxWidth()
                 .height(154.dp)
-                .alpha(animations.opacity)
+                .alpha(opacityAni)
                 .background(
                     Brush.linearGradient(
                         colors = listOf(
@@ -70,21 +114,34 @@ fun HeaderExtended(
             }
         }
 
+        Box(
+            modifier = Modifier
+                .fillMaxWidth()
+                .alpha(1f - opacityAni)
+                .height(statusBarHeight + 52.dp)
+                .background(
+                    AppTheme.current.colors.background.surface
+                )
+                .bottomBorder(
+                    strokeWidth = 1.dp,
+                    color = AppTheme.current.colors.border.default
+                )
+        )
         if (inputSearchProps != null && useAnimationSearch) {
             Box(
                 modifier = Modifier
                     .height(52.dp)
                     .offset(
-                        x = animations.translateX.dp
+                        x = animatedTranslateX.dp
                     )
                     .padding(vertical = Spacing.S)
                     .align(Alignment.BottomStart)
             ) {
                 Box(
                     modifier = Modifier
-                        .width(animations.width.dp)
+                        .width(animatedWidth.dp)
                         .background(
-                            color = animations.backgroundSearch,
+                            color = backgroundSearch,
                             shape = RoundedCornerShape(Radius.XL)
                         )
                 ) {
@@ -98,5 +155,4 @@ fun HeaderExtended(
             }
         }
     }
-}
-
+}

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

@@ -79,12 +79,12 @@ object Spacing {
 
 @Composable
 fun HeaderRight(
-    data: HeaderRightData? = null,
+    headerRight: HeaderRightData? = null,
 ) {
     Row(
         verticalAlignment = Alignment.CenterVertically,
     ) {
-        ToolkitHeaderRight(headerRight = data)
+        ToolkitHeaderRight(headerRight = headerRight)
     }
 }
 

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

@@ -8,7 +8,6 @@ import androidx.compose.ui.zIndex
 import vn.momo.kits.components.Text
 import vn.momo.kits.const.Typography
 
-
 @Composable
 fun HeaderTitle(
     title: String = "",

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

@@ -74,7 +74,7 @@ data class KitConfig(
 fun ApplicationContainer(
     theme: Theme = defaultTheme,
     composeApi: ComposeApi? = null,
-    statusBarHeight: Dp? = null,
+    statusBarHeight: Dp? = AppStatusBar.current,
     applicationContext: MiniAppContext? = null,
     config: KitConfig? = null,
     content: @Composable () -> Unit,

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

@@ -68,6 +68,7 @@ fun Screen(
     layoutOffset: Dp = 56.dp,
     inputSearchProps: InputSearchProps? = null,
     useAnimationSearch: Boolean = false,
+    headerRightWidth: Dp = 0.dp,
     content: @Composable () -> Unit,
 ) {
     val statusBarHeight = AppStatusBar.current ?: getStatusBarHeight()
@@ -84,7 +85,7 @@ fun Screen(
     val bottomPadding = min(indicator, 21.dp)
 
     val opacity by animateFloatAsState(
-        targetValue = ((scrollState.value / 114f)).coerceIn(0f, 1f)
+        targetValue = ((scrollState.value / 52f)).coerceIn(0f, 1f),
     )
 
     val headerAnimated =
@@ -94,15 +95,16 @@ fun Screen(
 
     Box(
         Modifier.fillMaxSize()
-            .background(AppTheme.current.colors.background.surface)
+            .background(backgroundColor ?: AppTheme.current.colors.background.default)
     ) {
 
         if (animatedHeader === null) {
             HeaderBackground(
                 headerType = headerType,
                 scrollState = scrollState.value,
-                inputSearchProps = inputSearchProps,
-                useAnimationSearch = useAnimationSearch
+                inputSearchProps= inputSearchProps,
+                useAnimationSearch = useAnimationSearch,
+                headerRightWidth = headerRightWidth
             )
         } else {
             Box(
@@ -114,8 +116,9 @@ fun Screen(
                     isBack = isBack,
                     headerType = headerType,
                     scrollState = scrollState.value,
-                    inputSearchProps = inputSearchProps,
-                    useAnimationSearch = useAnimationSearch
+                    inputSearchProps= inputSearchProps,
+                    useAnimationSearch = useAnimationSearch,
+                    headerRightWidth = headerRightWidth
                 )
             }
         }
@@ -130,7 +133,7 @@ fun Screen(
             animatedHeader = animatedHeader,
             inputSearchProps = inputSearchProps,
             scrollState = scrollState.value,
-            useAnimationSearch = useAnimationSearch
+            useAnimationSearch = useAnimationSearch,
         )
 
         Column(
@@ -155,18 +158,14 @@ fun Screen(
                 verticalArrangement = verticalArrangement,
                 horizontalAlignment = horizontalAlignment
             ) {
-                Box(
-                    modifier = Modifier.background(
-                        backgroundColor ?: AppTheme.current.colors.background.default
-                    )
-                ) {
+                Box {
                     headerAnimated()
                     Column {
                         if (animatedHeader !== null) {
                             Spacer(modifier = Modifier.padding(top = statusBarHeight + 52.dp + layoutOffset))
                         }
 
-                        if (useAnimationSearch && inputSearchProps != null) {
+                        if (useAnimationSearch && headerType == HeaderType.EXTENDED && inputSearchProps != null) {
                             Spacer(modifier = Modifier.padding(top = statusBarHeight))
                         }
                         content()

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

@@ -37,7 +37,7 @@ fun Text(
         modifier = modifier.setAutomationId(accessibilityId?:text, text),
         text = text,
         color = color ?: AppTheme.current.colors.text.default,
-        style = style,
+        style = style.copy(fontWeight = null),
         textAlign = textAlign,
         fontSize = fontSize,
         fontFamily = font,

package/ios/Image/Image.swift

@@ -27,7 +27,7 @@ public struct ImageView: View {
                 error = false
             }
             .resizable()
-            .renderingMode(.template)
+            .renderingMode(.original)
             .placeholder {
                 Rectangle().foregroundColor(.gray)
                 VStack(alignment: .center, content: {

package/ios/Popup/PopupDisplay.swift

@@ -46,7 +46,8 @@ public struct PopupDisplay: View {
                         .overlay(RoundedRectangle(cornerRadius: Radius.L).stroke(Colors.black01, lineWidth: 1))
                 }.foregroundColor(Colors.black20)
                     .background(Colors.black01.cornerRadius(15))
-                    .offset(x: 6, y: -6)
+                    .padding(.trailing, -Spacing.M )
+                    .padding(.top, -Spacing.M)
                     .zIndex(1)
 
             VStack {

package/local.properties

@@ -4,5 +4,5 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Thu Jan 09 10:43:10 ICT 2025
-sdk.dir=/Users/sophia/Library/Android/sdk
+#Tue Apr 23 16:40:15 ICT 2024
+sdk.dir=/Users/hung.dao1/Library/Android/sdk

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.113.1-beta.14",
+  "version": "0.113.1-beta.16",
   "private": false,
   "dependencies": {},
   "devDependencies": {},

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

@@ -1,61 +0,0 @@
-package vn.momo.kits.application
-
-import androidx.compose.animation.animateColorAsState
-import androidx.compose.animation.core.animateFloatAsState
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.unit.Dp
-import vn.momo.kits.const.AppTheme
-import vn.momo.kits.const.Colors
-import androidx.compose.runtime.getValue
-
-data class HeaderAnimations(
-    val opacity: Float,
-    val backgroundSearch: Color,
-    val translateX: Float,
-    val width: Float,
-    val height: Float
-)
-
-@Composable
-fun useHeaderSearchAnimation(
-    scrollState: Int,
-    statusBarHeight: Dp,
-    leftPosition: Dp,
-    searchWidth: Int,
-    headerRightWidth: Dp
-): HeaderAnimations {
-    val opacityAni by animateFloatAsState(
-        targetValue = (1 - (scrollState / 52f)).coerceIn(0f, 1f)
-    )
-
-    val backgroundSearch by animateColorAsState(
-        targetValue = animateColor(
-            AppTheme.current.colors.background.default,
-            Colors.black_01,
-            opacityAni
-        )
-    )
-
-    val animatedTranslateX by animateFloatAsState(
-        targetValue = (scrollState / 52f).coerceIn(0f, 1f) * (leftPosition.value - 12) + 12
-    )
-
-    val animatedWidth by animateFloatAsState(
-        targetValue = (scrollState / 52f).coerceIn(0f, 1f) *
-                ((searchWidth - leftPosition.value - headerRightWidth.value + 12) - searchWidth) + searchWidth
-    )
-
-    val animatedHeight by animateFloatAsState(
-        targetValue = (1 - (scrollState / 52f).coerceIn(0f, 1f)) *
-                (statusBarHeight.value + 94 - (statusBarHeight.value + 52)) + (statusBarHeight.value + 52)
-    )
-
-    return HeaderAnimations(
-        opacity = opacityAni,
-        backgroundSearch = backgroundSearch,
-        translateX = animatedTranslateX,
-        width = animatedWidth,
-        height = animatedHeight
-    )
-}