@momo-kits/native-kits 0.113.2-beta.5 → 0.113.3-beta.2

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

@@ -3,12 +3,9 @@ package vn.momo.kits.platform
 import android.annotation.SuppressLint
 import android.content.res.Resources
 import android.graphics.BlurMaskFilter
-import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.foundation.layout.statusBars
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.NativePaint
 import androidx.compose.ui.platform.LocalConfiguration
-import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 
@@ -31,6 +28,10 @@ actual fun NativePaint.setMaskFilter(blurRadius: Float) {
 @SuppressLint("InternalInsetResource")
 @Composable
 actual fun getStatusBarHeight(): Dp {
-    val density = LocalDensity.current
-    return with(density) { WindowInsets.statusBars.getTop(density).toDp() }
+    val resourceId = Resources.getSystem().getIdentifier(
+        "status_bar_height",
+        "dimen",
+        "android"
+    )
+    return if(resourceId > 0) Resources.getSystem().getDimensionPixelSize(resourceId).dp else 0.dp
 }

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

@@ -0,0 +1,58 @@
+package vn.momo.kits.application
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.offset
+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.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.zIndex
+import vn.momo.kits.components.InputSearch
+import vn.momo.kits.components.InputSearchProps
+import vn.momo.kits.const.Radius
+import vn.momo.kits.const.Spacing
+
+@Composable
+fun AnimationSearchInput(
+    animations: HeaderAnimations,
+    inputSearchProps: InputSearchProps
+) {
+    Box(
+        modifier = Modifier
+            .fillMaxWidth()
+            .offset(
+                x = animations.translateX.dp,
+                y = animations.translateY.dp
+            )
+    ) {
+        Box(
+            modifier = Modifier
+                .height(52.dp)
+                .padding(vertical = Spacing.S)
+                .zIndex(1f)
+        ) {
+            Box(
+                modifier = Modifier
+                    .width(animations.width.dp)
+                    .background(
+                        color = animations.backgroundSearch,
+                        shape = RoundedCornerShape(Radius.XL)
+                    )
+            ) {
+                InputSearch(
+                    inputSearchProps = inputSearchProps.copy(
+                        showButtonText = false,
+                        backgroundColor = Color.Transparent
+                    )
+                )
+            }
+        }
+    }
+
+}

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,10 +23,10 @@ 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
+import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.zIndex
 import kotlinx.coroutines.flow.distinctUntilChanged
@@ -42,15 +41,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,
@@ -58,16 +48,16 @@ fun Header(
     title: String,
     headerRight: @Composable (() -> Unit)? = null,
     goBack: (() -> Unit)? = null,
-    opacity: Float? = null,
+    opacity: Float = 1f,
     animatedHeader: AnimatedHeader? = null,
     scrollState: Int = 0,
     inputSearchProps: InputSearchProps? = null,
+    headerRightWidth: Dp = 0.dp,
     useAnimationSearch: Boolean = false
 ) {
     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) }
 
@@ -77,15 +67,22 @@ fun Header(
             .distinctUntilChanged()
             .collect { fraction -> colorFraction = fraction }
     }
+    val animations = useHeaderSearchAnimation(
+        opacityAni = opacity,
+        scrollState = scrollState,
+        headerRightWidth = headerRightWidth,
+        isBack = goBack != null
+    )
 
-    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
     )
 
+    val searchAnimationEnable =
+        inputSearchProps != null && useAnimationSearch && headerType == HeaderType.EXTENDED
+
     if (headerType != HeaderType.NONE) {
         BoxWithConstraints(
             Modifier.height(statusBarHeight + 52.dp)
@@ -132,9 +129,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 else 1f
                     }) {
                         headerRight?.invoke()
                     }
@@ -156,11 +153,7 @@ fun Header(
                 } else {
                     Box(
                         Modifier.weight(1f).graphicsLayer {
-                            alpha = if (useAnimationSearch && inputSearchProps != null) {
-                                1f - (opacity ?: 1f)
-                            } else {
-                                if (animatedHeader !== null) opacity ?: 1f else 1f
-                            }
+                            alpha = if (searchAnimationEnable) 1f - (opacity) else 1f
                         },
                         contentAlignment = if (titlePosition == TitlePosition.LEFT) Alignment.TopStart else Alignment.Center
                     ) {
@@ -174,16 +167,13 @@ fun Header(
                     }
                 }
             }
+
+            if (searchAnimationEnable) {
+                AnimationSearchInput(
+                    animations = animations,
+                    inputSearchProps = inputSearchProps!!
+                )
+            }
         }
     }
-}
-
-
-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,66 +1,70 @@
 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
 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(
-    isBack: Boolean = true,
     headerType: HeaderType = HeaderType.DEFAULT,
     scrollState: Int,
-    inputSearchProps: InputSearchProps? = null,
-    headerRightWidth: Dp = 0.dp,
-    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,
             )
         }
 
         HeaderType.EXTENDED -> {
-           HeaderExtended(
-                animations = animations,
-                inputSearchProps = inputSearchProps,
-                useAnimationSearch = useAnimationSearch,
-                backgroundColor = backgroundColor
-           )
+            HeaderExtended(
+                opacityAni = opacityAni,
+                statusBarHeight = statusBarHeight,
+                backgroundColor = backgroundColor,
+            )
         }
 
         else -> {

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

@@ -21,13 +21,13 @@ import vn.momo.kits.utils.bottomBorder
 
 @Composable
 fun HeaderDefault(
-    height: Dp,
-    backgroundColor: Color,
-    animations: HeaderAnimations
+    opacityAni: Float,
+    statusBarHeight: Dp,
 ) {
+    val height = statusBarHeight + 52.dp
     Box(
         modifier = Modifier.fillMaxWidth().height(height)
-            .background(backgroundColor)
+            .background(AppTheme.current.colors.background.surface)
             .bottomBorder(
                 strokeWidth = 1.dp,
                 color = AppTheme.current.colors.border.default
@@ -37,7 +37,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,86 +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 androidx.compose.ui.zIndex
 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
 
 @Composable
 fun HeaderExtended(
-    animations: HeaderAnimations,
-    inputSearchProps: InputSearchProps? = null,
-    useAnimationSearch: Boolean = false,
-    backgroundColor: Color = Color.Transparent
-){
+    opacityAni: Float,
+    statusBarHeight: Dp,
+    backgroundColor: Color
+) {
     Box(
-        modifier = Modifier.fillMaxWidth().height(animations.height.dp)
-    ) {
-        Box(
-            modifier = Modifier
-                .fillMaxWidth()
-                .height(154.dp)
-                .alpha(animations.opacity)
-                .background(
-                    Brush.linearGradient(
-                        colors = listOf(
-                            Color(0xFFFDCADE),
-                            Color(0x00FDCADE)
-                        ),
-                        start = Offset(0f, 0f),
-                        end = Offset(0f, with(LocalDensity.current) { 154.dp.toPx() })
-                    )
+        modifier = Modifier
+            .fillMaxWidth()
+            .height(154.dp)
+            .alpha(opacityAni)
+            .background(
+                Brush.linearGradient(
+                    colors = listOf(
+                        Color(0xFFFDCADE),
+                        Color(0x00FDCADE)
+                    ),
+                    start = Offset(0f, 0f),
+                    end = Offset(0f, with(LocalDensity.current) { 154.dp.toPx() })
                 )
-        ) {
-            if (AppTheme.current.assets.headerBackground != null) {
-                Box(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .background(backgroundColor)
-                ) {
-                    Image(
-                        loading = false,
-                        source = AppTheme.current.assets.headerBackground!!,
-                        modifier = Modifier.fillMaxWidth().height(154.dp),
-                        options = Options(
-                            contentScale = ContentScale.FillWidth
-                        )
-                    )
-                }
-            }
-        }
-
-        if (inputSearchProps != null && useAnimationSearch) {
+            )
+    ) {
+        if (AppTheme.current.assets.headerBackground != null) {
             Box(
                 modifier = Modifier
-                    .height(52.dp)
-                    .offset(
-                        x = animations.translateX.dp
-                    )
-                    .padding(vertical = Spacing.S)
-                    .align(Alignment.BottomStart)
+                    .fillMaxWidth()
+                    .background(backgroundColor)
             ) {
-                Box(
-                    modifier = Modifier
-                        .width(animations.width.dp)
-                        .background(
-                            color = animations.backgroundSearch,
-                            shape = RoundedCornerShape(Radius.XL)
-                        )
-                ) {
-                    InputSearch(
-                        inputSearchProps = inputSearchProps.copy(
-                            showButtonText = false,
-                            backgroundColor = Color.Transparent
-                        )
+                Image(
+                    loading = false,
+                    source = AppTheme.current.assets.headerBackground!!,
+                    modifier = Modifier.fillMaxWidth().height(154.dp),
+                    options = Options(
+                        contentScale = ContentScale.FillWidth
                     )
-                }
+                )
             }
         }
     }
-}
 
+    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
+            )
+    )
+}

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

@@ -9,7 +9,6 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.dp
 import vn.momo.kits.components.TrustBannerData
 import vn.momo.kits.const.AppStatusBar
 import vn.momo.kits.const.AppTheme
@@ -75,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,
@@ -99,8 +98,6 @@ fun ApplicationContainer(
 
     val appStatusBarHeight = statusBarHeight ?: getStatusBarHeight()
 
-    println("appStatusBarHeight ${appStatusBarHeight.value}")
-
     disableOverscroll()
     CompositionLocalProvider(
         AppTheme provides appTheme,

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

@@ -50,7 +50,6 @@ enum class HeaderType {
 @Composable
 fun Screen(
     backgroundColor: Color? = null,
-    isBack: Boolean = true,
     headerType: HeaderType = HeaderType.DEFAULT,
     verticalArrangement: Arrangement.Vertical = Arrangement.Top,
     horizontalAlignment: Alignment.Horizontal = Alignment.Start,
@@ -64,10 +63,9 @@ fun Screen(
     footer: @Composable (() -> Unit)? = null,
     headerRight: @Composable (() -> Unit)? = { HeaderRight() },
     fabProps: FabProps? = null,
-    animatedHeader: AnimatedHeader? = null,
-    layoutOffset: Dp = 56.dp,
     inputSearchProps: InputSearchProps? = null,
     useAnimationSearch: Boolean = false,
+    headerRightWidth: Dp = 0.dp,
     content: @Composable () -> Unit,
 ) {
     val statusBarHeight = AppStatusBar.current ?: getStatusBarHeight()
@@ -84,58 +82,34 @@ 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 =
-        @Composable {
-            animatedHeader?.composable?.invoke(scrollState.value)
-        }
-
     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
-            )
-        } else {
-            Box(
-                Modifier.zIndex(2f)
-                    .background(Color.White.copy(alpha = opacity))
-                    .graphicsLayer { alpha = opacity }
-            ) {
-                HeaderBackground(
-                    isBack = isBack,
-                    headerType = headerType,
-                    scrollState = scrollState.value,
-                    inputSearchProps = inputSearchProps,
-                    useAnimationSearch = useAnimationSearch
-                )
-            }
-        }
-
+        HeaderBackground(
+            headerType = headerType,
+            scrollState = scrollState.value,
+        )
         Header(
             headerType = headerType,
             title = title,
             titlePosition = titlePosition,
             headerRight = headerRight,
+            headerRightWidth = headerRightWidth,
             goBack = goBack,
             opacity = opacity,
-            animatedHeader = animatedHeader,
             inputSearchProps = inputSearchProps,
             scrollState = scrollState.value,
-            useAnimationSearch = useAnimationSearch
+            useAnimationSearch = useAnimationSearch,
         )
 
         Column(
             modifier = Modifier.fillMaxSize()
-                .padding(top = if (animatedHeader === null && headerType !== HeaderType.NONE) statusBarHeight + 52.dp else 0.dp)
+                .padding(top = if (headerType !== HeaderType.NONE) statusBarHeight + 52.dp else 0.dp)
                 .pointerInput(Unit) {
                     detectTapGestures(onTap = {
                         keyboardController?.hide()
@@ -143,7 +117,6 @@ fun Screen(
                 }
                 .zIndex(1f),
         ) {
-
             Column(
                 modifier = Modifier
                     .conditional(scrollable) { weight(1f) }
@@ -155,18 +128,9 @@ fun Screen(
                 verticalArrangement = verticalArrangement,
                 horizontalAlignment = horizontalAlignment
             ) {
-                Box(
-                    modifier = Modifier.background(
-                        backgroundColor ?: AppTheme.current.colors.background.default
-                    )
-                ) {
-                    headerAnimated()
+                Box {
                     Column {
-                        if (animatedHeader !== null) {
-                            Spacer(modifier = Modifier.padding(top = statusBarHeight + 52.dp + layoutOffset))
-                        }
-
-                        if (useAnimationSearch && inputSearchProps != null) {
+                        if (useAnimationSearch && inputSearchProps != null && headerType == HeaderType.EXTENDED) {
                             Spacer(modifier = Modifier.padding(top = statusBarHeight))
                         }
                         content()

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

@@ -3,59 +3,63 @@ package vn.momo.kits.application
 import androidx.compose.animation.animateColorAsState
 import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
 import vn.momo.kits.const.AppTheme
 import vn.momo.kits.const.Colors
-import androidx.compose.runtime.getValue
+import vn.momo.kits.platform.getScreenDimensions
 
 data class HeaderAnimations(
     val opacity: Float,
     val backgroundSearch: Color,
     val translateX: Float,
     val width: Float,
-    val height: Float
+    val translateY: Float
 )
 
+private const val SCREEN_PADDING = 12
+private const val BACK_WIDTH = 28
+
 @Composable
 fun useHeaderSearchAnimation(
+    opacityAni: Float,
     scrollState: Int,
-    statusBarHeight: Dp,
-    leftPosition: Dp,
-    searchWidth: Int,
-    headerRightWidth: Dp
+    headerRightWidth: Dp,
+    isBack: Boolean
 ): HeaderAnimations {
-    val opacityAni by animateFloatAsState(
-        targetValue = (1 - (scrollState / 52f)).coerceIn(0f, 1f)
-    )
+    val screenWidth = getScreenDimensions().width
+    val leftPosition = if (isBack) (BACK_WIDTH + 20).dp else 12.dp
+    val searchWidth = screenWidth - (SCREEN_PADDING * 2)
 
     val backgroundSearch by animateColorAsState(
         targetValue = animateColor(
-            AppTheme.current.colors.background.default,
             Colors.black_01,
+            AppTheme.current.colors.background.default,
             opacityAni
-        )
+        ),
     )
 
     val animatedTranslateX by animateFloatAsState(
-        targetValue = (scrollState / 52f).coerceIn(0f, 1f) * (leftPosition.value - 12) + 12
+        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
+        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)
+    val animatedTranslateY by animateFloatAsState(
+        targetValue = (1 - (scrollState / 52f).coerceIn(0f, 1f)) * 52
     )
-
     return HeaderAnimations(
         opacity = opacityAni,
         backgroundSearch = backgroundSearch,
         translateX = animatedTranslateX,
         width = animatedWidth,
-        height = animatedHeight
+        translateY = animatedTranslateY
     )
 }

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

@@ -35,6 +35,7 @@ import vn.momo.kits.const.AppTheme
 import vn.momo.kits.const.Radius
 import vn.momo.kits.const.Spacing
 import vn.momo.kits.const.Typography
+import vn.momo.kits.modifier.setAutomationId
 import vn.momo.kits.utils.ifNotNull
 
 data class PopupAction(
@@ -95,12 +96,12 @@ fun PopupNotify(
         callback?.invoke()
     }
 
-    Box(Modifier.semantics {
-        testTag = "popup_notify"
-    }, contentAlignment = Alignment.TopEnd) {
+    Box(Modifier.setAutomationId("popup_notify")
+        , contentAlignment = Alignment.TopEnd) {
         Column(
             modifier = Modifier
                 .fillMaxWidth()
+                .padding(horizontal = 12.dp)
                 .clip(RoundedCornerShape(Radius.L))
                 .background(
                     AppTheme.current.colors.background.surface,
@@ -115,7 +116,7 @@ fun PopupNotify(
             )
 
             Column(modifier = Modifier.padding(Spacing.XL)) {
-                Text(style = Typography.titleXs, maxLines = 2, text = title)
+                Text(style = Typography.titleXs, maxLines = 2, text = title, modifier = Modifier.setAutomationId("title_popup_permission"))
                 content(Modifier.padding(top = Spacing.S))
                 if (error.isNotEmpty()) {
                     Text(
@@ -142,7 +143,7 @@ fun PopupNotify(
             Modifier
                 .width(22.dp)
                 .height(22.dp)
-                .offset(x = Spacing.S, y = -Spacing.S)
+                .offset(x = Spacing.M / 2, y = -Spacing.M)
                 .background(
                     color = AppTheme.current.colors.text.default,
                     shape = RoundedCornerShape(Radius.M)
@@ -164,9 +165,7 @@ fun PopupNotify(
                 source = "navigation_close",
                 color = AppTheme.current.colors.background.surface,
                 size = 16.dp,
-                modifier = Modifier.semantics {
-                    testTag = "ic_popup_close"
-                }
+                modifier = Modifier.setAutomationId("ic_popup_close")
             )
         }
     }
@@ -233,9 +232,7 @@ fun renderRow(
                     },
                     title = it.title,
                     type = ButtonType.TEXT,
-                    modifier = Modifier.semantics {
-                        testTag = "btn_popup_cancel"
-                    }
+                    modifier = Modifier.setAutomationId("btn_popup_cancel")
                 )
             }
             Spacer(modifier = Modifier.width(Spacing.S))
@@ -248,9 +245,7 @@ fun renderRow(
                     onAction(primary?.onPress)
                 },
                 title = primary?.title ?: "",
-                modifier = Modifier.semantics {
-                    testTag = "btn_popup_allow"
-                }
+                modifier = Modifier.setAutomationId("btn_popup_allow")
             )
         }
     }
@@ -271,9 +266,7 @@ fun renderColumn(
                 onAction(primary?.onPress)
             },
             title = primary?.title ?: "",
-            modifier = Modifier.semantics {
-                testTag = "btn_popup_allow"
-            }
+            modifier = Modifier.setAutomationId("btn_popup_allow")
         )
         secondary?.let {
             Spacer(modifier = Modifier.height(Spacing.S))
@@ -286,9 +279,7 @@ fun renderColumn(
                     },
                     title = it.title,
                     type = ButtonType.TEXT,
-                    modifier = Modifier.semantics {
-                        testTag = "btn_popup_cancel"
-                    }
+                    modifier = Modifier.setAutomationId("btn_popup_cancel")
                 )
             }
         }

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,8 +46,10 @@ 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)
+                    .accessibility(identifier: "ic_popup_close")
 
             VStack {
                 if(!url.isEmpty) {
@@ -70,6 +72,7 @@ public struct PopupDisplay: View {
                             .padding(.top, 16)
                             .padding(.bottom, 8)
                             .lineLimit(2)
+                            .accessibility(identifier: "title_popup_permission")
 
                         Text(description)
                             .foregroundColor(.black)
@@ -77,7 +80,9 @@ public struct PopupDisplay: View {
                             .opacity(0.6)
                             .multilineTextAlignment(.leading)
                             .padding(.bottom, 20)
-                    }.padding(.horizontal, 24)
+                    }
+                    .frame(maxWidth: .infinity, alignment: .leading)
+                    .padding(.horizontal, 24)
 
                     if buttonDirection == .row {
                         if buttonType == .text {
@@ -97,7 +102,7 @@ public struct PopupDisplay: View {
             }
         }
         .background(Color.white.cornerRadius(15))
-        .padding(.horizontal, 24)
+        .padding(.horizontal, 12)
     }
 
     // MARK: Internal
@@ -150,8 +155,9 @@ public struct PopupDisplay: View {
 
     var RowButtons: some View {
         HStack {
-            Button(title: closeButtonTitle, action: onPressCloseButton, type: .secondary, size: .medium)
+            Button(title: closeButtonTitle, action: onPressCloseButton, type: .secondary, size: .medium).accessibility(identifier: "btn_popup_cancel")
             Button(title: actionButtonTitle, action: onPressAction, size: .medium)
+                .accessibility(identifier: "btn_popup_allow")
         }
         .frame(maxWidth: .infinity, alignment: .center)
         .padding(.horizontal, 24)
@@ -164,8 +170,9 @@ public struct PopupDisplay: View {
                 title: actionButtonTitle,
                 action: onPressAction,
                 size: .medium
-            )
-            Button(title: closeButtonTitle, action: onPressCloseButton, type: .secondary, size: .medium)
+            ).accessibility(identifier: "btn_popup_allow")
+            Button(title: closeButtonTitle, action: onPressCloseButton, type: .secondary, size: .medium).accessibility(identifier: "btn_popup_cancel")
+
         }
         .frame(maxWidth: .infinity, alignment: .trailing)
         .padding(.horizontal, 24)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.113.2-beta.5",
+  "version": "0.113.3-beta.2",
   "private": false,
   "dependencies": {},
   "devDependencies": {},