@momo-kits/native-kits 0.155.1-hello.3-debug → 0.155.1-hello.5-debug

package/compose/compose.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
     spec.name                     = 'compose'
-    spec.version                  = '0.155.1-test.6'
+    spec.version                  = '0.155.1-beta.9'
     spec.homepage                 = 'https://momo.vn'
     spec.source                   = { :http=> ''}
     spec.authors                  = ''

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

@@ -13,6 +13,7 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.wrapContentSize
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.BasicTextField
@@ -28,18 +29,13 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.onFocusChanged
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.text.AnnotatedString
-import androidx.compose.ui.text.SpanStyle
 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.input.KeyboardType
-import androidx.compose.ui.text.input.OffsetMapping
-import androidx.compose.ui.text.input.TransformedText
+import androidx.compose.ui.text.input.PasswordVisualTransformation
 import androidx.compose.ui.text.input.VisualTransformation
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.TextUnit
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.compose.ui.zIndex
@@ -50,12 +46,9 @@ import vn.momo.kits.application.ApplicationContext
 import vn.momo.kits.application.MiniAppContext.Companion.isShowBaselineDebug
 import vn.momo.kits.const.Colors
 import vn.momo.kits.const.Typography
-import vn.momo.kits.const.getFont
 import vn.momo.kits.const.scaleSize
 import vn.momo.kits.modifier.conditional
 import vn.momo.kits.modifier.setAutomationId
-import vn.momo.uikits.resources.Res
-import vn.momo.uikits.resources.sfprotext_regular
 
 data class InputSizeDetail(
     val borderWidth: Dp,
@@ -96,38 +89,6 @@ data class InputState(
     val hasBeenBlurred: Boolean = false
 )
 
-private class PasswordVisualTransformation(
-    private val fontFamily: FontFamily,
-    private val fontSize: TextUnit
-) : VisualTransformation {
-    private val mask: Char = '\u2022'
-
-    override fun filter(text: AnnotatedString): TransformedText {
-
-        val maskedText = AnnotatedString(
-            text = mask.toString().repeat(text.length),
-            spanStyles = listOf(
-                AnnotatedString.Range(
-                    SpanStyle(fontSize = fontSize, letterSpacing = 0.sp, fontFamily = fontFamily),
-                    0,
-                    text.length
-                )
-            )
-        )
-        return TransformedText(maskedText, OffsetMapping.Identity)
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (other !is PasswordVisualTransformation) return false
-        return mask == other.mask && fontSize == other.fontSize
-    }
-
-    override fun hashCode(): Int {
-        return 31 * mask.hashCode() + fontSize.hashCode()
-    }
-}
-
 @Composable
 fun getBorderColor(isFocused: Boolean, error: String, disabled: Boolean): Color {
     val theme = AppTheme.current
@@ -258,7 +219,7 @@ fun Input(
         if (disabled) "input_${floatingValue}_disabled" else "input_$floatingValue"
     }
 
-    val fontSize = 14.sp
+    val fontSize = 16.sp
     val lineHeight = 24.sp
     val scaleFontSize = scaleSize(fontSize)
     val scaleLineHeight = scaleSize(lineHeight)
@@ -283,15 +244,13 @@ fun Input(
 
     val keyboardOptionsConfig = remember(secureTextEntry, keyboardType) {
         KeyboardOptions.Default.copy(
-            keyboardType = keyboardType
+            keyboardType = if (secureTextEntry) KeyboardType.Ascii else keyboardType
         )
     }
 
-    val passwordFontFamily = getFont(Res.font.sfprotext_regular)
-    val passwordFontSize = scaleSize(24.sp)
-    val visualTransformation = remember(secureTextEntry, inputState.passHidden, passwordFontFamily) {
+    val visualTransformation = remember(secureTextEntry, inputState.passHidden) {
         if (secureTextEntry && !inputState.passHidden)
-            PasswordVisualTransformation(fontFamily = passwordFontFamily, fontSize = passwordFontSize)
+            PasswordVisualTransformation()
         else
             VisualTransformation.None
     }
@@ -408,7 +367,8 @@ fun Input(
 
                         // Clear button
                         if (inputState.isFocused && text.value.isNotEmpty()) {
-                            Row(Modifier.padding(horizontal = Spacing.XS)) {
+                            Row {
+                                Spacer(Modifier.width(Spacing.XS))
                                 Icon(
                                     source = "24_navigation_close_circle_full",
                                     size = 16.dp,

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

@@ -77,21 +77,17 @@ private fun heightForLines(
     return heightPx
 }
 
-data class PopupNotifyProps(
-    val image: String = "",
-    val title: String = "Title",
-    val description: String = "Description",
-    val error: String = "",
-    val primary: PopupAction? = null,
-    val secondary: PopupAction? = null,
-    val buttonDirection: PopupActionDirection = PopupActionDirection.ROW,
-    val onIconClose: () -> Unit,
-    val isShowCloseIcon: Boolean = true,
-)
-
 @Composable
 fun PopupNotify(
-    props: PopupNotifyProps,
+    image: String = "",
+    title: String = "Title",
+    description: String = "Description",
+    error: String = "",
+    primary: PopupAction? = null,
+    secondary: PopupAction? = null,
+    buttonDirection: PopupActionDirection = PopupActionDirection.ROW,
+    onIconClose: () -> Unit,
+    isShowCloseIcon: Boolean = true,
 ) {
     var isScroll by remember { mutableStateOf(false) }
     val layoutResult = remember { mutableStateOf<TextLayoutResult?>(null) }
@@ -126,7 +122,7 @@ fun PopupNotify(
             ) {
                 item {
                     Text(
-                        text = props.description,
+                        text = description,
                         onTextLayout = { layoutResult.value = it },
                         style = Typography.bodyDefaultRegular
                     )
@@ -137,7 +133,7 @@ fun PopupNotify(
         { modifier ->
             Box(modifier = modifier) {
                 Text(
-                    text = props.description,
+                    text = description,
                     onTextLayout = { layoutResult.value = it },
                     style = Typography.bodyDefaultRegular
                 )
@@ -167,9 +163,9 @@ fun PopupNotify(
                     border(1.dp, Colors.blue_03)
                 }
         ) {
-            if(props.image.isNotEmpty()) {
+            if(image.isNotEmpty()) {
                 Image(
-                    source = props.image,
+                    source = image,
                     modifier = Modifier.fillMaxWidth().aspectRatio(1.777f),
                     options = Options(alignment = Alignment.Center)
                 )
@@ -179,13 +175,13 @@ fun PopupNotify(
                 Text(
                     style = Typography.headerDefaultBold,
                     maxLines = 2,
-                    text = props.title,
+                    text = title,
                     modifier = Modifier.setAutomationId("title_popup_permission")
                 )
                 content(Modifier.padding(top = Spacing.S))
-                if (props.error.isNotEmpty()) {
+                if (error.isNotEmpty()) {
                     Text(
-                        text = errorCode[language] + props.error,
+                        text = errorCode[language] + error,
                         style = Typography.descriptionXsRegular,
                         color = AppTheme.current.colors.text.hint,
                         maxLines = 1,
@@ -198,13 +194,13 @@ fun PopupNotify(
                 modifier = Modifier.padding(horizontal = Spacing.XL)
                     .padding(bottom = Spacing.XL)
             ) {
-                BuildAction(props.primary, props.secondary, props.buttonDirection, onAction = { callback ->
+                BuildAction(primary, secondary, buttonDirection, onAction = { callback ->
                     onClose(callback)
                 })
             }
         }
 
-        if(props.isShowCloseIcon) {
+        if(isShowCloseIcon) {
             Box(
                 Modifier
                     .width(22.dp)
@@ -223,7 +219,7 @@ fun PopupNotify(
                     .clickable(
                         interactionSource = remember { MutableInteractionSource() },
                         indication = null,
-                        onClick = { onClose { props.onIconClose() } }
+                        onClick = { onClose { onIconClose() } }
                     ),
                 contentAlignment = Alignment.Center
             ) {

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

@@ -9,7 +9,6 @@ import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.graphics.Color
 import vn.momo.kits.navigation.bottomtab.setBottomTabOption
 import vn.momo.kits.navigation.component.FloatingButtonProps
-import vn.momo.kits.navigation.component.HeaderBackProps
 import vn.momo.kits.navigation.component.HeaderRight
 import vn.momo.kits.navigation.component.HeaderTitle
 import vn.momo.kits.navigation.component.HeaderType
@@ -26,7 +25,6 @@ class Navigation(
     fun setOptions(
         onBackHandler: (() -> Unit)? = null,
         hiddenBack: Boolean? = null,
-        headerBackProps: HeaderBackProps? = null,
         headerTitle: HeaderTitle? = null,
         headerRight: HeaderRight? = null,
         headerType: HeaderType? = null,
@@ -41,7 +39,6 @@ class Navigation(
             options.copy(
                 onBackHandler = onBackHandler ?: options.onBackHandler,
                 hiddenBack = hiddenBack ?: options.hiddenBack,
-                headerBackProps = headerBackProps ?: options.headerBackProps,
                 headerTitle = headerTitle ?: options.headerTitle,
                 headerRight = headerRight ?: options.headerRight,
                 headerType = headerType ?: options.headerType,
@@ -74,7 +71,6 @@ val LocalNavigation = staticCompositionLocalOf<Navigation> {
 data class NavigationOptions(
     val onBackHandler: (() -> Unit)? = null,
     val hiddenBack: Boolean = false,
-    val headerBackProps: HeaderBackProps = HeaderBackProps(),
     val headerTitle: HeaderTitle = HeaderTitle.Default("Stack"),
     val headerRight: HeaderRight = HeaderRight.Toolkit(),
     val headerType: HeaderType = HeaderType.Default(),

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

@@ -16,8 +16,6 @@ import kotlinx.coroutines.cancel
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.serialization.Serializable
-import vn.momo.kits.components.PopupAction
-import vn.momo.kits.components.PopupNotify
 import vn.momo.kits.navigation.BottomHeader.*
 import vn.momo.kits.navigation.component.SnackBar
 import vn.momo.maxapi.IMaxApi
@@ -42,33 +40,6 @@ class Navigator(
         }
     }
 
-    fun onBackSafe(callBack: (() -> Unit)? = null) {
-        val latestScreen = DynamicScreenRegistry.getLatestScreen()
-        val options = latestScreen?.options
-        if (options?.onBackHandler != null) {
-            options.onBackHandler.invoke()
-            return
-        }
-        val preventBack = options?.headerBackProps?.preventBack
-        if (preventBack != null) {
-            showModal(
-                content = {
-                    PopupNotify(preventBack.copy(
-                        primary = PopupAction(
-                            title = preventBack.primary?.title ?: "",
-                            onPress = {
-                                preventBack.primary?.onPress?.invoke()
-                                pop(2, callBack) // close popup notify, then close the screen
-                            }
-                        )
-                    ))
-                }
-            )
-        } else {
-            pop(1, callBack)
-        }
-    }
-
     fun pop(count: Int = 1, callBack: (() -> Unit)? = null) {
         scope.launch {
             repeat(count) {
@@ -85,13 +56,13 @@ class Navigator(
             callBack?.invoke()
         }
     }
-    private suspend fun dismissOverplay(isDelay: Boolean = true) {
+    private suspend fun CoroutineScope.dismissOverplay(isDelay: Boolean = true) {
         OverplayComponentRegistry.clear()
         if (isDelay) delay(300L)
         OverplayComponentRegistry.hardClearAfterDismiss()
     }
 
-    private suspend fun dismissScreen() {
+    private suspend fun CoroutineScope.dismissScreen() {
         if (navController.previousBackStackEntry != null){
             navController.popBackStack()
             delay(300L)

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

@@ -75,7 +75,6 @@ internal fun StackScreen(
     navigationOptions: NavigationOptions? = null,
     id: Int = -1,
     bottomTabIndex: Int = -1,
-    onBackHandler: (() -> Unit)? = null,
 ) {
     val navigator = LocalNavigator.current
     val statusBar = AppStatusBar.current
@@ -96,7 +95,7 @@ internal fun StackScreen(
     val footerHeightPx = remember { mutableIntStateOf(0) }
     val headerRightWidthPx = remember { mutableIntStateOf(0) }
 
-    BackHandler(true) { navigator.onBackSafe() }
+    BackHandler(true) { navigator.pop() }
 
     CompositionLocalProvider(
         StackScreenScrollableState provides options.scrollData.scrollState,
@@ -121,7 +120,7 @@ internal fun StackScreen(
             }
 
             Box(Modifier.zIndex(5f)) {
-                Header(onBackHandler)
+                Header()
             }
 
             Column (Modifier.zIndex(6f)) {
@@ -176,10 +175,7 @@ fun ColumnScope.MainContent(content: @Composable ()-> Unit){
     val density = LocalDensity.current
     val scrollState = LocalScrollState.current
 
-    Spacer(Modifier.height(
-        if (options.headerType is HeaderType.DefaultOrExtended || (options.headerType is HeaderType.Transparent && !options.headerType.isFullScreenContent))
-            AppStatusBar.current + HEADER_HEIGHT.dp else 0.dp)
-    )
+    Spacer(Modifier.height(if (options.headerType is HeaderType.DefaultOrExtended) AppStatusBar.current + HEADER_HEIGHT.dp else 0.dp))
     if (inputSearchType == InputSearchType.Animated){
         val scrollDp = with(density) { scrollState.value.toDp() }
 

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

@@ -54,7 +54,16 @@ fun BottomTab(
     val navController = rememberNavController()
 
     bottomTabOptionItems = items.mapIndexed { index, item ->
-        item.options ?: NavigationOptions()
+        val options = item.options ?: NavigationOptions()
+        options.copy(
+            onBackHandler = {
+                if (index != 0) {
+                    navController.popBackStack()
+                } else {
+                    navigator.pop()
+                }
+            }
+        )
     }.toMutableList()
 
 
@@ -105,23 +114,21 @@ fun BottomTab(
                                     )
                         }
                     ) {
-                        val option = getBottomTabOption(index)
-
-                        StackScreen(
-                            content = item.screen,
-                            navigationOptions = option,
-                            bottomTabIndex = index,
+                        val option = getBottomTabOption(index)?.copy(
                             onBackHandler = {
                                 if (index != 0) {
-                                    navController.popBackStack(
-                                        navController.graph.startDestinationRoute!!,
-                                        inclusive = false
-                                    )
+                                    navController.popBackStack()
                                 } else {
                                     navigator.pop()
                                 }
                             }
                         )
+
+                        StackScreen(
+                            content = item.screen,
+                            navigationOptions = option,
+                            bottomTabIndex = index
+                        )
                     }
                 }
             }

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

@@ -30,7 +30,6 @@ import vn.momo.kits.const.AppTheme
 import vn.momo.kits.const.Colors
 import vn.momo.kits.application.ApplicationContext
 import vn.momo.kits.application.MiniAppContext.Companion.isShowBaselineDebug
-import vn.momo.kits.components.PopupNotifyProps
 import vn.momo.kits.const.Spacing
 import vn.momo.kits.modifier.activeOpacityClickable
 import vn.momo.kits.modifier.conditional
@@ -44,7 +43,7 @@ const val HEADER_HEIGHT = 52
 enum class InputSearchType { None, Header, Animated }
 
 @Composable
-fun Header(onBackHandler: (() -> Unit)? = null) {
+fun Header() {
     val options = LocalOptions.current
     val navigator = LocalNavigator.current
     val scrollState = LocalScrollState.current
@@ -56,12 +55,7 @@ fun Header(onBackHandler: (() -> Unit)? = null) {
         else -> HEADER_HEIGHT
     }
     val opacity by animateFloatAsState(
-        targetValue = if (options.headerType is HeaderType.Transparent) {
-            0f
-        } else {
-            (scrollState.value / opacityHeight.toFloat())
-                .coerceIn(0f, 1f)
-        }
+        targetValue = ((scrollState.value * 1f / opacityHeight * 1f)).coerceIn(0f, 1f),
     )
 
     val headerColor = getHeaderColor(options.headerType, opacity, options.tintColor, Colors.black_17)
@@ -70,16 +64,11 @@ fun Header(onBackHandler: (() -> Unit)? = null) {
 
     val application = ApplicationContext.current
 
-    val background = if (options.headerType is HeaderType.Transparent)
-        options.backgroundColor ?: AppTheme.current.colors.background.surface
-    else
-        AppTheme.current.colors.background.surface
-
     if (options.headerType == HeaderType.None) return
     Box(
         Modifier.height(AppStatusBar.current + HEADER_HEIGHT.dp)
             .fillMaxWidth()
-            .background(background.copy(alpha = animatedAlpha))
+            .background(AppTheme.current.colors.background.surface.copy(alpha = animatedAlpha))
             .conditional(application.isShowBaselineDebug()) {
                 border(1.dp, Colors.blue_03)
             },
@@ -98,7 +87,7 @@ fun Header(onBackHandler: (() -> Unit)? = null) {
                     backgroundButton = headerColor.backgroundButton,
                     tintIconColor = headerColor.tintIconColor,
                     onBackHandler = {
-                        onBackHandler?.invoke() ?: navigator.onBackSafe {  }
+                        options.onBackHandler?.invoke() ?: navigator.pop()
                     }
                 )
             }
@@ -234,16 +223,8 @@ sealed class HeaderType {
         val layoutOffSet: Dp = 56.dp,
         val composable: @Composable (scrollState: Int) -> Unit = {}
     ) : HeaderType()
-
-    data class Transparent(
-        val isFullScreenContent: Boolean = false
-    ) : HeaderType()
 }
 
-data class HeaderBackProps(
-    val preventBack: PopupNotifyProps? = null,
-)
-
 data class HeaderColor(val tintIconColor: Color, val backgroundButton: Color, val borderColor: Color)
 fun getHeaderColor(headerType: HeaderType, opacity: Float, tintColor: Color?, defaultColor: Color): HeaderColor{
     return if(headerType is HeaderType.Animated) {

package/gradle.properties

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

package/package.json

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