@momo-kits/native-kits 0.155.1-hello.14-debug → 0.155.1-hello.2-debug

package/.gitlab-ci.yml

@@ -0,0 +1,15 @@
+stages:
+    - build_release_publish
+
+build_release_publish:
+    stage: build_release_publish
+    only:
+        variables:
+            - $CI_COMMIT_MESSAGE =~ /\[ci build\]/
+    except:
+        variables:
+            - $CI_COMMIT_REF_NAME =~ /^engine\/w*/
+    tags:
+        - momo-publish-package-runner
+    script:
+        - sh publish_release.sh

package/.npmignore.backup

@@ -0,0 +1,22 @@
+sample/
+gradle/
+compose/
+build/
+
+.fleet
+.gradle
+.idea
+.kotlin
+.run
+
+.gitattributes
+.gitlab-ci.yml
+
+README.md
+build.gradle.kts
+gradle.properties
+gradlew
+gradlew.bat
+local.properties
+publish_release.sh
+settings.gradle.kts

package/compose/build.gradle.kts

@@ -1,5 +1,5 @@
-// import com.vanniktech.maven.publish.JavadocJar
-// import com.vanniktech.maven.publish.KotlinMultiplatform
+import com.vanniktech.maven.publish.JavadocJar
+import com.vanniktech.maven.publish.KotlinMultiplatform
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
@@ -7,7 +7,7 @@ plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.compose)
     alias(libs.plugins.kotlin.compose.compiler)
-//         alias(libs.plugins.vanniktech.mavenPublish)
+    alias(libs.plugins.vanniktech.mavenPublish)
     id(libs.plugins.jetbrains.kotlin.cocoapods.get().pluginId)
     kotlin("plugin.serialization")
 }
@@ -40,7 +40,7 @@ kotlin {
     }
 
     cocoapods {
-        version = "0.155.1-hello.14-debug"
+        version = gitlabVersion
         summary = "IOS Shared module"
         homepage = "https://momo.vn"
         ios.deploymentTarget = "15.0"
@@ -84,14 +84,14 @@ kotlin {
 }
 
 android {
-    namespace = "vn.momo.kits.kits"
-    compileSdk = 35
+    namespace = "$gitlabGroup.$gitlabArtifactId"
+    compileSdk = libs.versions.android.compileSdk.get().toInt()
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
     defaultConfig {
-        minSdk = 24
+        minSdk = libs.versions.android.minSdk.get().toInt()
     }
 }
 
@@ -125,56 +125,56 @@ compose {
     }
 }
 
-// publishing {
-//     repositories {
-//         maven {
-//             name = "${gitlabRepo}Packages"
-//             credentials {
-//                 username = gitlabUser
-//                 password = gitlabKey
-//             }
-//             url = uri("$gitlabUrl")
-//         }
-//     }
-// }
-
-// mavenPublishing {
-//     configure(
-//         KotlinMultiplatform(
-//             javadocJar = JavadocJar.Empty(),
-//             sourcesJar = true,
-//             androidVariantsToPublish = listOf("release")
-//         )
-//     )
-// 
-//     repositories {
-//         maven {
-//             name = "${gitlabRepo}Packages"
-//             credentials { username = gitlabUser; password = gitlabKey }
-//             url = uri("$gitlabUrl")
-//         }
-//     }
-// 
-//     coordinates(gitlabGroup.toString(), gitlabArtifactId, gitlabVersion.toString())
-// 
-//     pom {
-//         name = "$gitlabName Klib"
-//         description = "$gitlabName"
-//         url = "https://gitlab.mservice.com.vn"
-//         licenses {
-//             license {
-//                 name = "The Apache License, Version 2.0"
-//                 url = "https://www.apache.org/licenses/LICENSE-2.0.txt"
-//                 distribution = "https://www.apache.org/licenses/LICENSE-2.0.txt"
-//             }
-//         }
-//         developers {
-//             developer {
-//                 id = "kotlin-hands-on"
-//                 name = "Kotlin Developer Advocate"
-//                 url = "https://github.com/kotlin-hands-on/"
-//             }
-//         }
-//     }
-// }
+publishing {
+    repositories {
+        maven {
+            name = "${gitlabRepo}Packages"
+            credentials {
+                username = gitlabUser
+                password = gitlabKey
+            }
+            url = uri("$gitlabUrl")
+        }
+    }
+}
+
+mavenPublishing {
+    configure(
+        KotlinMultiplatform(
+            javadocJar = JavadocJar.Empty(),
+            sourcesJar = true,
+            androidVariantsToPublish = listOf("release")
+        )
+    )
+
+    repositories {
+        maven {
+            name = "${gitlabRepo}Packages"
+            credentials { username = gitlabUser; password = gitlabKey }
+            url = uri("$gitlabUrl")
+        }
+    }
+
+    coordinates(gitlabGroup.toString(), gitlabArtifactId, gitlabVersion.toString())
+
+    pom {
+        name = "$gitlabName Klib"
+        description = "$gitlabName"
+        url = "https://gitlab.mservice.com.vn"
+        licenses {
+            license {
+                name = "The Apache License, Version 2.0"
+                url = "https://www.apache.org/licenses/LICENSE-2.0.txt"
+                distribution = "https://www.apache.org/licenses/LICENSE-2.0.txt"
+            }
+        }
+        developers {
+            developer {
+                id = "kotlin-hands-on"
+                name = "Kotlin Developer Advocate"
+                url = "https://github.com/kotlin-hands-on/"
+            }
+        }
+    }
+}
 

package/compose/compose.podspec

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

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

@@ -13,7 +13,6 @@ 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
@@ -29,13 +28,18 @@ 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.PasswordVisualTransformation
+import androidx.compose.ui.text.input.OffsetMapping
+import androidx.compose.ui.text.input.TransformedText
 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
@@ -46,9 +50,12 @@ 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,
@@ -89,6 +96,38 @@ 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
@@ -219,7 +258,7 @@ fun Input(
         if (disabled) "input_${floatingValue}_disabled" else "input_$floatingValue"
     }
 
-    val fontSize = 16.sp
+    val fontSize = 14.sp
     val lineHeight = 24.sp
     val scaleFontSize = scaleSize(fontSize)
     val scaleLineHeight = scaleSize(lineHeight)
@@ -244,13 +283,15 @@ fun Input(
 
     val keyboardOptionsConfig = remember(secureTextEntry, keyboardType) {
         KeyboardOptions.Default.copy(
-            keyboardType = if (secureTextEntry) KeyboardType.Ascii else keyboardType
+            keyboardType = keyboardType
         )
     }
 
-    val visualTransformation = remember(secureTextEntry, inputState.passHidden) {
+    val passwordFontFamily = getFont(Res.font.sfprotext_regular)
+    val passwordFontSize = scaleSize(24.sp)
+    val visualTransformation = remember(secureTextEntry, inputState.passHidden, passwordFontFamily) {
         if (secureTextEntry && !inputState.passHidden)
-            PasswordVisualTransformation()
+            PasswordVisualTransformation(fontFamily = passwordFontFamily, fontSize = passwordFontSize)
         else
             VisualTransformation.None
     }
@@ -367,8 +408,7 @@ fun Input(
 
                         // Clear button
                         if (inputState.isFocused && text.value.isNotEmpty()) {
-                            Row {
-                                Spacer(Modifier.width(Spacing.XS))
+                            Row(Modifier.padding(horizontal = Spacing.XS)) {
                                 Icon(
                                     source = "24_navigation_close_circle_full",
                                     size = 16.dp,

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

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

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

@@ -9,6 +9,7 @@ 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
@@ -25,6 +26,7 @@ class Navigation(
     fun setOptions(
         onBackHandler: (() -> Unit)? = null,
         hiddenBack: Boolean? = null,
+        headerBackProps: HeaderBackProps? = null,
         headerTitle: HeaderTitle? = null,
         headerRight: HeaderRight? = null,
         headerType: HeaderType? = null,
@@ -39,6 +41,7 @@ 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,
@@ -71,6 +74,7 @@ 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,6 +16,8 @@ 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
@@ -40,6 +42,33 @@ 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) {
@@ -56,13 +85,13 @@ class Navigator(
             callBack?.invoke()
         }
     }
-    private suspend fun CoroutineScope.dismissOverplay(isDelay: Boolean = true) {
+    private suspend fun dismissOverplay(isDelay: Boolean = true) {
         OverplayComponentRegistry.clear()
         if (isDelay) delay(300L)
         OverplayComponentRegistry.hardClearAfterDismiss()
     }
 
-    private suspend fun CoroutineScope.dismissScreen() {
+    private suspend fun dismissScreen() {
         if (navController.previousBackStackEntry != null){
             navController.popBackStack()
             delay(300L)

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

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

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

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

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

@@ -30,6 +30,7 @@ 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
@@ -43,7 +44,7 @@ const val HEADER_HEIGHT = 52
 enum class InputSearchType { None, Header, Animated }
 
 @Composable
-fun Header() {
+fun Header(onBackHandler: (() -> Unit)? = null) {
     val options = LocalOptions.current
     val navigator = LocalNavigator.current
     val scrollState = LocalScrollState.current
@@ -55,7 +56,12 @@ fun Header() {
         else -> HEADER_HEIGHT
     }
     val opacity by animateFloatAsState(
-        targetValue = ((scrollState.value * 1f / opacityHeight * 1f)).coerceIn(0f, 1f),
+        targetValue = if (options.headerType is HeaderType.Transparent) {
+            0f
+        } else {
+            (scrollState.value / opacityHeight.toFloat())
+                .coerceIn(0f, 1f)
+        }
     )
 
     val headerColor = getHeaderColor(options.headerType, opacity, options.tintColor, Colors.black_17)
@@ -64,11 +70,16 @@ fun Header() {
 
     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(AppTheme.current.colors.background.surface.copy(alpha = animatedAlpha))
+            .background(background.copy(alpha = animatedAlpha))
             .conditional(application.isShowBaselineDebug()) {
                 border(1.dp, Colors.blue_03)
             },
@@ -87,7 +98,7 @@ fun Header() {
                     backgroundButton = headerColor.backgroundButton,
                     tintIconColor = headerColor.tintIconColor,
                     onBackHandler = {
-                        options.onBackHandler?.invoke() ?: navigator.pop()
+                        onBackHandler?.invoke() ?: navigator.onBackSafe {  }
                     }
                 )
             }
@@ -223,8 +234,16 @@ 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.14
+version=0.155.1-hello.2
 
 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.14-debug",
+  "version": "0.155.1-hello.2-debug",
   "private": false,
   "dependencies": {},
   "devDependencies": {},

package/publish_release.sh

@@ -62,50 +62,6 @@ else
     sed -i "s/\"version\": \"$VERSION\"/\"version\": \"$DEBUG_VERSION\"/" package.json
 fi
 
-# Backup compose/build.gradle.kts
-echo "? Backing up compose/build.gradle.kts..."
-cp compose/build.gradle.kts compose/build.gradle.kts.backup
-
-# Comment out maven publish in compose/build.gradle.kts
-echo "💬 Commenting out maven publish in compose/build.gradle.kts..."
-if [[ "$OSTYPE" == "darwin"* ]]; then
-    # macOS - Comment out imports
-    sed -i '' 's/^import com\.vanniktech\.maven\.publish\.JavadocJar$/\/\/ &/' compose/build.gradle.kts
-    sed -i '' 's/^import com\.vanniktech\.maven\.publish\.KotlinMultiplatform$/\/\/ &/' compose/build.gradle.kts
-    # Comment out plugin
-    sed -i '' 's/^    alias(libs\.plugins\.vanniktech\.mavenPublish)$/\/\/     &/' compose/build.gradle.kts
-    # Comment out publishing block
-    sed -i '' '/^publishing {$/,/^}$/s/^/\/\/ /' compose/build.gradle.kts
-    # Comment out entire mavenPublishing block (lines starting from mavenPublishing { to its closing })
-    sed -i '' '/^mavenPublishing {$/,/^}$/s/^/\/\/ /' compose/build.gradle.kts
-else
-    # Linux - Comment out imports
-    sed -i 's/^import com\.vanniktech\.maven\.publish\.JavadocJar$/\/\/ &/' compose/build.gradle.kts
-    sed -i 's/^import com\.vanniktech\.maven\.publish\.KotlinMultiplatform$/\/\/ &/' compose/build.gradle.kts
-    # Comment out plugin
-    sed -i 's/^    alias(libs\.plugins\.vanniktech\.mavenPublish)$/\/\/     &/' compose/build.gradle.kts
-    # Comment out publishing block
-    sed -i '/^publishing {$/,/^}$/s/^/\/\/ /' compose/build.gradle.kts
-    # Comment out entire mavenPublishing block
-    sed -i '/^mavenPublishing {$/,/^}$/s/^/\/\/ /' compose/build.gradle.kts
-fi
-
-# Modify android configuration for debug version
-echo "🔧 Modifying android configuration for debug version..."
-if [[ "$OSTYPE" == "darwin"* ]]; then
-    # macOS
-    sed -i '' 's/namespace = "\$gitlabGroup\.\$gitlabArtifactId"/namespace = "vn.momo.kits.kits"/' compose/build.gradle.kts
-    sed -i '' 's/compileSdk = libs\.versions\.android\.compileSdk\.get()\.toInt()/compileSdk = 35/' compose/build.gradle.kts
-    sed -i '' 's/minSdk = libs\.versions\.android\.minSdk\.get()\.toInt()/minSdk = 24/' compose/build.gradle.kts
-    sed -i '' "s/version = gitlabVersion/version = \"$DEBUG_VERSION\"/" compose/build.gradle.kts
-else
-    # Linux
-    sed -i 's/namespace = "\$gitlabGroup\.\$gitlabArtifactId"/namespace = "vn.momo.kits.kits"/' compose/build.gradle.kts
-    sed -i 's/compileSdk = libs\.versions\.android\.compileSdk\.get()\.toInt()/compileSdk = 35/' compose/build.gradle.kts
-    sed -i 's/minSdk = libs\.versions\.android\.minSdk\.get()\.toInt()/minSdk = 24/' compose/build.gradle.kts
-    sed -i "s/version = gitlabVersion/version = \"$DEBUG_VERSION\"/" compose/build.gradle.kts
-fi
-
 # Backup .npmignore
 cp .npmignore .npmignore.backup
 
@@ -121,8 +77,6 @@ build/
 .run
 
 .gitattributes
-.gitlab-ci.yml
-.npmignore.backup
 EOF
 
 echo "📤 Publishing debug version (with compose)..."
@@ -132,10 +86,6 @@ npm publish --tag beta --access=public
 mv .npmignore.backup .npmignore
 echo "✅ .npmignore restored"
 
-# Restore compose/build.gradle.kts
-mv compose/build.gradle.kts.backup compose/build.gradle.kts
-echo "✅ compose/build.gradle.kts restored"
-
 # Restore package.json version to original
 if [[ "$OSTYPE" == "darwin"* ]]; then
     # macOS

package/compose/build.gradle.kts.backup

@@ -1,180 +0,0 @@
-import com.vanniktech.maven.publish.JavadocJar
-import com.vanniktech.maven.publish.KotlinMultiplatform
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-
-plugins {
-    alias(libs.plugins.jetbrains.kotlin.multiplatform)
-    alias(libs.plugins.android.library)
-    alias(libs.plugins.compose)
-    alias(libs.plugins.kotlin.compose.compiler)
-    alias(libs.plugins.vanniktech.mavenPublish)
-    id(libs.plugins.jetbrains.kotlin.cocoapods.get().pluginId)
-    kotlin("plugin.serialization")
-}
-
-val gitlabName: String? = findProperty("name") as String? ?: ""
-val gitlabRepo: String? = findProperty("repo") as String? ?: ""
-val gitlabUrl: String? = findProperty("url") as String? ?: ""
-val gitlabGroup: String? = findProperty("group") as String? ?: ""
-val gitlabArtifactId: String = findProperty("artifact.id") as String? ?: ""
-val gitlabVersion: String? = findProperty("version") as String? ?: ""
-val gitlabUser: String? = findProperty("gitlab.user") as String? ?: ""
-val gitlabKey: String? = findProperty("gitlab.password") as String? ?: ""
-
-kotlin {
-    androidTarget {
-        compilerOptions {
-            jvmTarget.set(JvmTarget.JVM_17)
-        }
-        publishLibraryVariants("release")
-    }
-
-    val fwName = gitlabArtifactId
-    val iosTargets = listOf(iosX64(), iosArm64(), iosSimulatorArm64())
-    iosTargets.forEach {
-        it.binaries.framework {
-            baseName = fwName
-            binaryOption("bundleId", "$gitlabGroup.$fwName")
-            isStatic = true
-        }
-    }
-
-    cocoapods {
-        version = gitlabVersion
-        summary = "IOS Shared module"
-        homepage = "https://momo.vn"
-        ios.deploymentTarget = "15.0"
-
-        framework {
-            baseName = fwName
-            isStatic = true
-        }
-
-        pod("lottie-ios") {
-            moduleName = "Lottie"
-            version = "4.4.3"
-            extraOpts += listOf("-compiler-option", "-fmodules")
-        }
-    }
-
-    sourceSets {
-        commonMain.dependencies {
-            implementation(compose.runtime)
-            implementation(compose.material)
-            implementation(compose.material3)
-            implementation(compose.components.resources)
-            implementation(libs.ktor.client.core)
-            implementation(libs.jetbrains.coroutines.core)
-            implementation(libs.navigation.multiplatform)
-            implementation(libs.coil.multiplatform.compose)
-            implementation(libs.coil.multiplatform.core)
-            implementation(libs.coil.multiplatform.network.ktor)
-            implementation(libs.jetbrains.serialization.json)
-            implementation(libs.kotlinx.datetime)
-            api(libs.native.max.api)
-        }
-        androidMain.dependencies {
-            implementation(libs.ktor.client.okhttp)
-            implementation(libs.airbnb.lottie)
-        }
-        iosMain.dependencies {
-            implementation(libs.ktor.client.darwin)
-        }
-    }
-}
-
-android {
-    namespace = "$gitlabGroup.$gitlabArtifactId"
-    compileSdk = libs.versions.android.compileSdk.get().toInt()
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
-    defaultConfig {
-        minSdk = libs.versions.android.minSdk.get().toInt()
-    }
-}
-
-dependencies {
-}
-
-repositories {
-    google {
-        mavenContent {
-            includeGroupAndSubgroups("androidx")
-            includeGroupAndSubgroups("com.android")
-            includeGroupAndSubgroups("com.google")
-        }
-    }
-    mavenCentral()
-    maven {
-        url = uri("https://gitlab.mservice.com.vn/api/v4/projects/5400/packages/maven")
-        credentials {username = "download_packages"; password = "gldt-bjDqLpU_sPcHDuXau2ws" }
-    }
-    maven {
-        url = uri("http://nexus.mservice.com.vn:8081/repository/maven-public/")
-        isAllowInsecureProtocol = true
-    }
-}
-
-compose {
-    resources {
-        publicResClass = true
-        packageOfResClass = "vn.momo.uikits.resources"
-        generateResClass = always
-    }
-}
-
-publishing {
-    repositories {
-        maven {
-            name = "${gitlabRepo}Packages"
-            credentials {
-                username = gitlabUser
-                password = gitlabKey
-            }
-            url = uri("$gitlabUrl")
-        }
-    }
-}
-
-mavenPublishing {
-    configure(
-        KotlinMultiplatform(
-            javadocJar = JavadocJar.Empty(),
-            sourcesJar = true,
-            androidVariantsToPublish = listOf("release")
-        )
-    )
-
-    repositories {
-        maven {
-            name = "${gitlabRepo}Packages"
-            credentials { username = gitlabUser; password = gitlabKey }
-            url = uri("$gitlabUrl")
-        }
-    }
-
-    coordinates(gitlabGroup.toString(), gitlabArtifactId, gitlabVersion.toString())
-
-    pom {
-        name = "$gitlabName Klib"
-        description = "$gitlabName"
-        url = "https://gitlab.mservice.com.vn"
-        licenses {
-            license {
-                name = "The Apache License, Version 2.0"
-                url = "https://www.apache.org/licenses/LICENSE-2.0.txt"
-                distribution = "https://www.apache.org/licenses/LICENSE-2.0.txt"
-            }
-        }
-        developers {
-            developer {
-                id = "kotlin-hands-on"
-                name = "Kotlin Developer Advocate"
-                url = "https://github.com/kotlin-hands-on/"
-            }
-        }
-    }
-}
-