@momo-kits/native-kits 0.162.3-debug → 0.162.3-fontscale.1-debug

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

@@ -3,11 +3,7 @@ package vn.momo.kits.components
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
@@ -22,7 +18,6 @@ import vn.momo.kits.const.Spacing
 import vn.momo.kits.modifier.conditional
 import vn.momo.kits.modifier.setAutomationId
 
-// Pre-computed shapes to avoid repeated creation
 private val switchShape = RoundedCornerShape(20.dp)
 private val circleShape = RoundedCornerShape(percent = 100)
 

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

@@ -2,34 +2,12 @@ package vn.momo.kits.components
 
 import androidx.compose.animation.core.animateDpAsState
 import androidx.compose.animation.core.tween
-import androidx.compose.foundation.ScrollState
-import androidx.compose.foundation.background
-import androidx.compose.foundation.border
-import androidx.compose.foundation.horizontalScroll
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-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.layout.wrapContentWidth
+import androidx.compose.foundation.*
+import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.pager.HorizontalPager
 import androidx.compose.foundation.pager.rememberPagerState
-import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateListOf
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.setValue
-import androidx.compose.runtime.snapshotFlow
+import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -41,18 +19,10 @@ import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import kotlinx.coroutines.launch
 import vn.momo.kits.application.IsShowBaseLineDebug
-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.const.Typography
+import vn.momo.kits.const.*
 import vn.momo.kits.modifier.activeOpacityClickable
 import vn.momo.kits.modifier.conditional
 
-// ---------------------------------------------------------------------------
-// Data model
-// ---------------------------------------------------------------------------
-
 data class TabViewItem(
     val title: String,
     val icon: String? = null,
@@ -68,10 +38,6 @@ enum class TabViewType { DEFAULT, CARD }
 
 enum class TabViewDirection { ROW, COLUMN }
 
-// ---------------------------------------------------------------------------
-// Public composable
-// ---------------------------------------------------------------------------
-
 @Composable
 fun TabView(
     modifier: Modifier = Modifier,
@@ -186,10 +152,6 @@ fun TabView(
     }
 }
 
-// ---------------------------------------------------------------------------
-// Default fixed-width tab bar
-// ---------------------------------------------------------------------------
-
 @Composable
 private fun DefaultTabBar(
     tabs: List<TabViewItem>,
@@ -240,24 +202,10 @@ private fun DefaultTabBar(
         }
 
         // Animated underline indicator
-        Box(
-            modifier = Modifier
-                .align(Alignment.BottomStart)
-                .offset(x = indicatorOffsetX)
-                .width(indicatorWidth)
-                .height(2.dp)
-                .background(
-                    color = selectedColor,
-                    shape = RoundedCornerShape(topStart = Radius.XXS, topEnd = Radius.XXS),
-                ),
-        )
+        TabUnderlineIndicator(offsetX = indicatorOffsetX, width = indicatorWidth, color = selectedColor)
     }
 }
 
-// ---------------------------------------------------------------------------
-// Scrollable tab bar
-// ---------------------------------------------------------------------------
-
 @Composable
 private fun ScrollableTabBar(
     tabs: List<TabViewItem>,
@@ -338,24 +286,14 @@ private fun ScrollableTabBar(
         }
 
         // Animated underline indicator aligned to bottom of the bar
-        Box(
-            modifier = Modifier
-                .align(Alignment.BottomStart)
-                .offset(x = animatedX - scrollOffsetDp + Spacing.XS)
-                .width((animatedWidth - Spacing.XS * 2).coerceAtLeast(0.dp))
-                .height(2.dp)
-                .background(
-                    color = selectedColor,
-                    shape = RoundedCornerShape(topStart = Radius.XXS, topEnd = Radius.XXS),
-                ),
+        TabUnderlineIndicator(
+            offsetX = animatedX - scrollOffsetDp + Spacing.XS,
+            width = (animatedWidth - Spacing.XS * 2).coerceAtLeast(0.dp),
+            color = selectedColor,
         )
     }
 }
 
-// ---------------------------------------------------------------------------
-// Card tab bar
-// ---------------------------------------------------------------------------
-
 @Composable
 private fun CardTabBar(
     tabs: List<TabViewItem>,
@@ -394,17 +332,7 @@ private fun CardTabBar(
                 contentAlignment = Alignment.Center,
             ) {
                 Row(verticalAlignment = Alignment.CenterVertically) {
-                    if (tab.renderIcon != null) {
-                        tab.renderIcon.invoke(isActive)
-                        Spacer(modifier = Modifier.width(Spacing.XS))
-                    } else if (tab.icon != null) {
-                        Icon(
-                            source = tab.icon,
-                            size = 18.dp,
-                            color = iconColor,
-                        )
-                        Spacer(modifier = Modifier.width(Spacing.XS))
-                    }
+                    TabLeadingIcon(tab = tab, active = isActive, color = iconColor)
                     Text(
                         text = tab.title,
                         style = if (isActive) Typography.headerSSemibold else Typography.bodyDefaultRegular,
@@ -413,23 +341,13 @@ private fun CardTabBar(
                         overflow = TextOverflow.Ellipsis,
                         modifier = Modifier.weight(1f, fill = false),
                     )
-                    if (tab.showDot) {
-                        Spacer(modifier = Modifier.width(Spacing.XS))
-                        BadgeDot(size = tab.dotSize)
-                    } else if (!tab.badgeValue.isNullOrEmpty()) {
-                        Spacer(modifier = Modifier.width(Spacing.XS))
-                        Badge(label = tab.badgeValue, modifier = Modifier)
-                    }
+                    TabTrailingBadge(tab)
                 }
             }
         }
     }
 }
 
-// ---------------------------------------------------------------------------
-// Shared tab item used by DefaultTabBar and ScrollableTabBar
-// ---------------------------------------------------------------------------
-
 @Composable
 private fun TabItemView(
     modifier: Modifier = Modifier,
@@ -500,17 +418,7 @@ private fun TabItemView(
             horizontalArrangement = Arrangement.Center,
             verticalAlignment = Alignment.CenterVertically,
         ) {
-            if (tab.renderIcon != null) {
-                tab.renderIcon.invoke(active)
-                Spacer(modifier = Modifier.width(Spacing.XS))
-            } else if (tab.icon != null) {
-                Icon(
-                    source = tab.icon,
-                    size = 18.dp,
-                    color = textColor,
-                )
-                Spacer(modifier = Modifier.width(Spacing.XS))
-            }
+            TabLeadingIcon(tab = tab, active = active, color = textColor)
             Text(
                 text = tab.title,
                 style = textStyle,
@@ -519,13 +427,44 @@ private fun TabItemView(
                 overflow = TextOverflow.Ellipsis,
                 modifier = if (scrollable) Modifier else Modifier.weight(1f, fill = false),
             )
-            if (tab.showDot) {
-                Spacer(modifier = Modifier.width(Spacing.XS))
-                BadgeDot(size = tab.dotSize)
-            } else if (!tab.badgeValue.isNullOrEmpty()) {
-                Spacer(modifier = Modifier.width(Spacing.XS))
-                Badge(label = tab.badgeValue, modifier = Modifier)
-            }
+            TabTrailingBadge(tab)
         }
     }
 }
+
+@Composable
+private fun BoxScope.TabUnderlineIndicator(offsetX: Dp, width: Dp, color: Color) {
+    Box(
+        modifier = Modifier
+            .align(Alignment.BottomStart)
+            .offset(x = offsetX)
+            .width(width)
+            .height(2.dp)
+            .background(
+                color = color,
+                shape = RoundedCornerShape(topStart = Radius.XXS, topEnd = Radius.XXS),
+            ),
+    )
+}
+
+@Composable
+private fun TabLeadingIcon(tab: TabViewItem, active: Boolean, color: Color) {
+    if (tab.renderIcon != null) {
+        tab.renderIcon.invoke(active)
+        Spacer(modifier = Modifier.width(Spacing.XS))
+    } else if (tab.icon != null) {
+        Icon(source = tab.icon, size = 18.dp, color = color)
+        Spacer(modifier = Modifier.width(Spacing.XS))
+    }
+}
+
+@Composable
+private fun TabTrailingBadge(tab: TabViewItem) {
+    if (tab.showDot) {
+        Spacer(modifier = Modifier.width(Spacing.XS))
+        BadgeDot(size = tab.dotSize)
+    } else if (!tab.badgeValue.isNullOrEmpty()) {
+        Spacer(modifier = Modifier.width(Spacing.XS))
+        Badge(label = tab.badgeValue, modifier = Modifier)
+    }
+}

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

@@ -13,11 +13,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import vn.momo.kits.application.IsShowBaseLineDebug
-import vn.momo.kits.const.Colors
-import vn.momo.kits.const.Radius
-import vn.momo.kits.const.Spacing
-import vn.momo.kits.const.Typography
-import vn.momo.kits.const.scaleSize
+import vn.momo.kits.const.*
 import vn.momo.kits.modifier.conditional
 
 enum class TagSize(val height: Float) {

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

@@ -15,11 +15,7 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.TextUnit
 import androidx.compose.ui.unit.dp
 import vn.momo.kits.application.IsShowBaseLineDebug
-import vn.momo.kits.const.AppTheme
-import vn.momo.kits.const.Colors
-import vn.momo.kits.const.Typography
-import vn.momo.kits.const.getFontFamily
-import vn.momo.kits.const.scaleSize
+import vn.momo.kits.const.*
 import vn.momo.kits.modifier.conditional
 import vn.momo.kits.modifier.setAutomationId
 

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

@@ -3,18 +3,7 @@ package vn.momo.kits.components
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.IntrinsicSize
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxHeight
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment

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

@@ -5,28 +5,9 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.IntrinsicSize
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-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.size
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.layout.widthIn
-import androidx.compose.foundation.layout.wrapContentSize
+import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.Stable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
+import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
@@ -36,63 +17,32 @@ import androidx.compose.ui.graphics.PathEffect
 import androidx.compose.ui.graphics.drawscope.drawIntoCanvas
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.IntOffset
-import androidx.compose.ui.unit.IntRect
-import androidx.compose.ui.unit.IntSize
-import androidx.compose.ui.unit.LayoutDirection
-import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.*
 import androidx.compose.ui.window.Popup
 import androidx.compose.ui.window.PopupPositionProvider
 import androidx.compose.ui.window.PopupProperties
 import vn.momo.kits.application.IsShowBaseLineDebug
-import vn.momo.kits.const.Colors
-import vn.momo.kits.const.Radius
-import vn.momo.kits.const.Spacing
-import vn.momo.kits.const.Typography
-import vn.momo.kits.const.scaleSize
+import vn.momo.kits.const.*
 import vn.momo.kits.modifier.activeOpacityClickable
 import vn.momo.kits.modifier.conditional
 
 
-// region Types
-
-/**
- * Tooltip placement relative to the anchor element.
- */
 enum class TooltipPlacement {
     TOP,
     BOTTOM,
     LEFT,
     RIGHT,
 }
-
-/**
- * Cross-axis alignment of the tooltip relative to the anchor.
- */
 enum class TooltipAlign {
     START,
     CENTER,
     END,
 }
-
-/**
- * Describes a single action button displayed in the tooltip.
- *
- * @param title Text label for the button (used for text buttons).
- * @param icon  Icon source for the button (used for icon buttons).
- * @param onPress Callback invoked when the button is pressed.
- */
 data class TooltipButton(
     val title: String? = null,
     val icon: String? = null,
     val onPress: (() -> Unit)? = null,
 )
-
-
-/**
- * State holder for controlling tooltip visibility imperatively.
- * Equivalent to the React Native `useImperativeHandle` ref pattern.
- */
 @Stable
 class TooltipState {
     var isVisible by mutableStateOf(false)
@@ -113,30 +63,12 @@ class TooltipState {
         isVisible = !isVisible
     }
 }
-
-/**
- * Creates and remembers a [TooltipState].
- */
 @Composable
 fun rememberTooltipState(): TooltipState {
     return remember { TooltipState() }
 }
 private val TOOLTIP_OFFSET = Spacing.S
 private val ARROW_SIZE = 6.dp
-/**
- * Custom [PopupPositionProvider] that positions the tooltip relative to the anchor.
- *
- * Mirrors the React Native `placementStyle` calculation:
- * - TOP:    tooltip bottom edge sits at `anchorTop - TOOLTIP_OFFSET`
- * - BOTTOM: tooltip top edge sits at `anchorBottom + TOOLTIP_OFFSET`
- * - LEFT:   tooltip right edge sits at `anchorLeft - TOOLTIP_OFFSET`
- * - RIGHT:  tooltip left edge sits at `anchorRight + TOOLTIP_OFFSET`
- *
- * Cross-axis alignment:
- * - start:  tooltip aligns to anchor start edge
- * - center: tooltip centers on anchor
- * - end:    tooltip aligns to anchor end edge
- */
 private class TooltipPositionProvider(
     private val placement: TooltipPlacement,
     private val align: TooltipAlign,
@@ -199,27 +131,6 @@ private class TooltipPositionProvider(
     }
 }
 
-// endregion
-
-// region Tooltip Composable
-
-/**
- * A tooltip component that wraps [content] (the anchor) and shows a positioned
- * tooltip popup with title, description, close button, and action buttons.
- *
- * Port of the React Native `Tooltip` component.
- *
- * @param state            Controls visibility (use [rememberTooltipState]).
- * @param title            Title text displayed in the tooltip header.
- * @param description      Description text shown under the title.
- * @param buttons          Action buttons rendered at the bottom.
- * @param placement        Tooltip position relative to the anchor (default TOP).
- * @param align            Cross-axis alignment (default CENTER).
- * @param onVisibleChange  Callback when visibility changes.
- * @param onPressClose     Callback when the close button (X) is pressed.
- * @param modifier         Modifier for the anchor wrapper.
- * @param content          The anchor element that the tooltip is attached to.
- */
 @Composable
 fun Tooltip(
     state: TooltipState,
@@ -525,9 +436,6 @@ private fun TooltipSingleButton(btn: TooltipButton) {
         )
     }
 }
-
-private const val MAX_BUTTON_LENGTH = 16
-
 private fun String.limitWithEllipsis(max: Int = 16): String {
     return if (length > max) take(max) + "…" else this
 }

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

@@ -18,8 +18,7 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.unit.dp
-import vn.momo.kits.application.AppConfig
-import vn.momo.kits.application.AppLanguage
+import vn.momo.kits.application.LocalLocalize
 import vn.momo.kits.application.IsShowBaseLineDebug
 import vn.momo.kits.const.Colors
 import vn.momo.kits.const.Typography
@@ -68,9 +67,8 @@ fun TrustBanner(
     onPress: ((Map<String, String>) -> Unit)? = null,
     trackEvent: ((String, Map<String, String>) -> Unit)? = null
 ) {
-    val appConfig = AppConfig.current
-    val language = AppLanguage.current ?: "vi"
-    val trustBanner = appConfig?.trustBanner ?: defaultBanner
+    val localize = LocalLocalize.current
+    val trustBanner = defaultBanner
     val trackParams = mapOf(
         "service_name" to serviceName,
         "screen_name" to screenName,
@@ -124,7 +122,7 @@ fun TrustBanner(
                 .padding(start = 10.dp)
         ) {
             Text(
-                text = trustBanner.content[language] ?: "",
+                text = localize.translateData(trustBanner.content),
                 modifier = Modifier.padding(bottom = 8.dp),
                 color = Color(contentColor),
                 style = Typography.descriptionDefaultRegular,
@@ -138,7 +136,7 @@ fun TrustBanner(
                     verticalAlignment = Alignment.CenterVertically,
                 ) {
                     Text(
-                        text = trustBanner.subContent[language] ?: "",
+                        text = localize.translateData(trustBanner.subContent),
                         color = Color(subContentColor),
                         style = Typography.actionXsBold,
                         maxLines = 2

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

@@ -3,13 +3,7 @@ package vn.momo.kits.components
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.horizontalScroll
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
@@ -25,11 +19,7 @@ import androidx.compose.ui.graphics.drawscope.Stroke
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import vn.momo.kits.application.IsShowBaseLineDebug
-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.const.Typography
+import vn.momo.kits.const.*
 import vn.momo.kits.modifier.activeOpacityClickable
 import vn.momo.kits.modifier.conditional
 

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

@@ -2,20 +2,8 @@ package vn.momo.kits.components.datetimepicker
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.width
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.runtime.snapshotFlow
+import androidx.compose.foundation.layout.*
+import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
@@ -74,7 +62,7 @@ fun DateTimePicker(
     var currentDate by remember(initialValue) {
         mutableStateOf(
             PickerData(
-                day = initialValue.dayOfMonth,
+                day = initialValue.day,
                 month = initialValue.month.number,
                 year = initialValue.year,
                 hour = initialValue.hour,
@@ -95,10 +83,10 @@ fun DateTimePicker(
                 month = when (year) {
                     effectiveMaxDate.year -> month.coerceIn(
                         1,
-                        effectiveMaxDate.monthNumber
+                        effectiveMaxDate.month.number
                     )
                     effectiveMinDate.year -> month.coerceIn(
-                        effectiveMinDate.monthNumber,
+                        effectiveMinDate.month.number,
                         12,
                     )
                     else -> month
@@ -112,11 +100,11 @@ fun DateTimePicker(
                 }
 
                 day = when {
-                    year == effectiveMaxDate.year && month == effectiveMaxDate.monthNumber ->
-                        day.coerceIn(1, effectiveMaxDate.dayOfMonth)
+                    year == effectiveMaxDate.year && month == effectiveMaxDate.month.number ->
+                        day.coerceIn(1, effectiveMaxDate.day)
 
-                    year == effectiveMinDate.year && month == effectiveMinDate.monthNumber ->
-                        day.coerceIn(effectiveMinDate.dayOfMonth, maxDayOfMonth)
+                    year == effectiveMinDate.year && month == effectiveMinDate.month.number ->
+                        day.coerceIn(effectiveMinDate.day, maxDayOfMonth)
 
                     day > maxDayOfMonth -> maxDayOfMonth
                     else -> day

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

@@ -13,8 +13,8 @@ data class PickerData(
     fun toLocalDateTime(): LocalDateTime {
         return LocalDateTime(
             year = year,
-            monthNumber = month,
-            dayOfMonth = day,
+            month = month,
+            day = day,
             hour = hour,
             minute = minute,
             second = 0,

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

@@ -2,15 +2,10 @@ package vn.momo.kits.components.datetimepicker
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
+import kotlinx.datetime.*
+import kotlinx.datetime.number
 import kotlin.time.Clock
 import kotlin.time.ExperimentalTime
-import kotlinx.datetime.DatePeriod
-import kotlinx.datetime.LocalDateTime
-import kotlinx.datetime.TimeZone
-import kotlinx.datetime.minus
-import kotlinx.datetime.number
-import kotlinx.datetime.plus
-import kotlinx.datetime.toLocalDateTime
 
 /**
  * Format a LocalDateTime object into a string
@@ -19,13 +14,13 @@ fun formatLocalDateTime(dateTime: LocalDateTime, format: String = "yyyy-MM-dd HH
     return when (format) {
         "yyyy-MM-dd HH:mm" -> "${dateTime.year}-${paddingNum(dateTime.month.number)}-${
             paddingNum(
-                dateTime.dayOfMonth
+                dateTime.day
             )
         } ${paddingNum(dateTime.hour)}:${paddingNum(dateTime.minute)}"
 
-        "dd-MM-yyyy" -> "${paddingNum(dateTime.dayOfMonth)}-${paddingNum(dateTime.month.number)}-${dateTime.year}"
+        "dd-MM-yyyy" -> "${paddingNum(dateTime.day)}-${paddingNum(dateTime.month.number)}-${dateTime.year}"
         "HH:mm" -> "${paddingNum(dateTime.hour)}:${paddingNum(dateTime.minute)}"
-        else -> "${dateTime.year}-${paddingNum(dateTime.month.number)}-${paddingNum(dateTime.dayOfMonth)} ${
+        else -> "${dateTime.year}-${paddingNum(dateTime.month.number)}-${paddingNum(dateTime.day)} ${
             paddingNum(
                 dateTime.hour
             )
@@ -60,11 +55,11 @@ fun getDaysInMonth(
     var endDay = daysInMonth
 
     if (year == minDate.year && month == minDate.month.number) {
-        startDay = minDate.dayOfMonth
+        startDay = minDate.day
     }
 
     if (year == maxDate.year && month == maxDate.month.number) {
-        endDay = maxDate.dayOfMonth
+        endDay = maxDate.day
     }
 
     val days = mutableListOf<String>()
@@ -170,8 +165,8 @@ fun createRelativeDate(years: Int): LocalDateTime {
 
     return LocalDateTime(
         adjustedDate.year,
-        adjustedDate.monthNumber,
-        adjustedDate.dayOfMonth,
+        adjustedDate.month.number,
+        adjustedDate.day,
         currentDateTime.hour,
         currentDateTime.minute
     )