@momo-kits/native-kits 0.89.19 → 0.89.21

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

@@ -0,0 +1,65 @@
+package vn.momo.kits.components
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.horizontalScroll
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+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.rememberScrollState
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import vn.momo.kits.const.AppTheme
+import vn.momo.kits.const.Spacing
+
+val INDICATOR_WIDTH = 24.dp
+val PROGRESS_WIDTH = 72.dp
+
+fun calculateOffset(currentPosition: Int, maxBound: Int): Dp {
+    return (PROGRESS_WIDTH - INDICATOR_WIDTH).times(currentPosition / maxBound.toFloat())
+}
+
+@Composable
+fun PaginationScroll(
+    modifier: Modifier = Modifier,
+    content: @Composable () -> Unit
+) {
+    val scrollOffset = rememberScrollState()
+
+    Column(horizontalAlignment = Alignment.CenterHorizontally) {
+        Row(
+            modifier = modifier.fillMaxWidth().padding(bottom = Spacing.L)
+                .horizontalScroll(scrollOffset)
+        ) {
+            content()
+        }
+        Box(
+            modifier = Modifier.clip(
+                RoundedCornerShape(Spacing.XS)
+            ).width(PROGRESS_WIDTH).height(4.dp)
+                .background(color = AppTheme.current.colors.background.pressed)
+        ) {
+            Box(
+                modifier = Modifier.offset(
+                    x = calculateOffset(
+                        scrollOffset.value,
+                        scrollOffset.maxValue
+                    )
+                ).clip(RoundedCornerShape(Spacing.XS))
+                    .width(
+                        INDICATOR_WIDTH
+                    ).height(4.dp)
+                    .background(color = AppTheme.current.colors.primary)
+            )
+        }
+    }
+}

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

@@ -0,0 +1,43 @@
+package vn.momo.kits.components
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.BoxWithConstraints
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.alpha
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.draw.clipToBounds
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.dp
+import vn.momo.kits.const.AppTheme
+import vn.momo.kits.const.Colors
+import vn.momo.kits.const.Spacing
+import vn.momo.kits.const.Typography
+
+@Composable
+fun PaginationWhiteDot(
+    activeIndex: Int = 0,
+    dataLength: Int = 3
+) {
+    Row(
+        modifier = Modifier.background(
+            color = Color(0x33000000),
+            shape = RoundedCornerShape(Spacing.S)
+        ).padding(Spacing.XS)
+    ) {
+        for (i in 0 until dataLength) {
+            Dot(
+                i == activeIndex,
+                Colors.black_01,
+                modifier = Modifier.padding(end = if (i != dataLength - 1) Spacing.XS else 0.dp)
+            )
+        }
+    }
+}

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

@@ -32,7 +32,6 @@ import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.semantics.testTag
 import androidx.compose.ui.text.TextLayoutResult
 import androidx.compose.ui.unit.dp
-import vn.momo.kits.application.AppNavigator
 import vn.momo.kits.const.AppTheme
 import vn.momo.kits.const.Radius
 import vn.momo.kits.const.Spacing
@@ -63,7 +62,6 @@ fun PopupNotify(
 ) {
     var isScroll by remember { mutableStateOf(false) }
     val layoutResult = remember { mutableStateOf<TextLayoutResult?>(null) }
-    val navigator = AppNavigator.current
 
     LaunchedEffect(layoutResult.value) {
         if ((layoutResult.value?.lineCount ?: 0) > 3) {
@@ -95,7 +93,6 @@ fun PopupNotify(
     }
 
     fun onClose(callback: (() -> Unit)?) {
-        navigator.pop()
         callback?.invoke()
     }
 

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

@@ -41,8 +41,6 @@ fun Switch(
                 RoundedCornerShape(20.dp)
             ).background(backgroundColor, RoundedCornerShape(20.dp)).clip(RoundedCornerShape(20.dp))
                 .clickable(
-                    interactionSource = remember { MutableInteractionSource() },
-                    indication = rememberRipple(),
                     enabled = !disabled,
                     onClick = { onChange(!value) }
                 )

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

@@ -16,7 +16,6 @@ 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.utils.primaryColors
 
 enum class TagSize(val height: Float) {
     Large(24.toFloat()),
@@ -40,6 +39,20 @@ fun Tag(
     size: TagSize = TagSize.Large,
     customColor: Color? = null,
 ) {
+    val primaryColors = listOf(
+        Color(0xFFF0F0F0),
+        Color(0xFFEB2F96),
+        Color(0xFF962AF0),
+        Color(0xFF4E4BFF),
+        Color(0xFF007AFF),
+        Color(0xFF13C2C2),
+        Color(0xFF34C759),
+        Color(0xFFA0D911),
+        Color(0xFFFFCC00),
+        Color(0xFFFA8C16),
+        Color(0xFFFA541C),
+        Color(0xFFF5222D)
+    )
     var tagColor = color.backgroundColor
     var labelColor = color.textColor
 

package/compose/src/commonMain/kotlin/vn/momo/kits/const/Typography.kt

@@ -11,13 +11,13 @@ import org.jetbrains.compose.resources.Font
 import org.jetbrains.compose.resources.FontResource
 import org.jetbrains.compose.resources.InternalResourceApi
 import org.jetbrains.compose.resources.ResourceItem
-import vn.momo.kits.utils.getScreenDimensions
+import vn.momo.kits.platform.getScreenDimensions
 
 const val DEFAULT_SCREEN_SIZE = 375f
 
 @Composable
 fun scaleSize(size: Float): Float {
-    val deviceWidth = getScreenDimensions().screenWidth
+    val deviceWidth = getScreenDimensions().width
     val scaleRate = deviceWidth / DEFAULT_SCREEN_SIZE
     if (scaleRate > 1) {
         return if ((scaleRate * size) > (size + 5)) size + 5 else scaleRate * size

package/compose/src/commonMain/kotlin/vn/momo/kits/layout/Item.kt

@@ -1,2 +1,30 @@
 package vn.momo.kits.layout
 
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.width
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.Dp
+
+data class GridContext (
+    val numberOfColumns: Number,
+    val gutterSize: Number,
+    val sizePerSpan: Number,
+    val getSizeSpan: (Number) -> Number
+)
+
+@Composable
+fun Item(heightSpan: Number = 1,
+         widthSpan: Number = 1,
+         content: @Composable() () -> Unit,
+         modifier: Modifier = Modifier,
+         grid: GridContext) {
+
+    val widthItem = grid.getSizeSpan(widthSpan)
+    val heightItem = grid.getSizeSpan(heightSpan)
+
+    Box(modifier = modifier.width(width = Dp(widthItem.toFloat())).height(height = Dp(heightItem.toFloat()))) {
+        content()
+    }
+}

package/compose/src/commonMain/kotlin/vn/momo/kits/modifier/Shadow.kt

@@ -8,7 +8,7 @@ import androidx.compose.ui.graphics.drawscope.drawIntoCanvas
 import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
-import vn.momo.kits.utils.setMaskFilter
+import vn.momo.kits.platform.setMaskFilter
 
 
 fun Modifier.shadow(
@@ -29,7 +29,6 @@ fun Modifier.shadow(
             val topPixel = (0f - spreadPixel) + offsetY.toPx()
             val rightPixel = (this.size.width + spreadPixel)
             val bottomPixel = (0f + spreadPixel) - offsetY.toPx()
-//            val bottomPixel = if (offsetY < 0.dp) 0f else this.size.height + spreadPixel
 
             if (blurRadius != 0f) {
                 frameworkPaint.setMaskFilter(blurRadius)

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

@@ -0,0 +1,18 @@
+package vn.momo.kits.platform
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.NativePaint
+
+data class ScreenDimension(
+    val width: Int,
+    val height: Int,
+)
+
+expect fun getPlatformName(): String
+
+expect fun disableOverscroll(): Unit
+
+@Composable
+expect fun getScreenDimensions(): ScreenDimension
+
+expect fun NativePaint.setMaskFilter(blurRadius: Float)

package/compose/src/commonMain/kotlin/vn/momo/kits/utils/Utils.kt

@@ -1,6 +1,5 @@
 package vn.momo.kits.utils
 
-import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.composed
 import androidx.compose.ui.draw.drawBehind
@@ -11,10 +10,6 @@ import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import kotlin.math.abs
 
-data class ScreenDimension(
-    val screenWidth: Int,
-    val screenHeight: Int,
-)
 
 internal fun Modifier.bottomBorder(strokeWidth: Dp, color: Color) = composed(
     factory = {
@@ -77,21 +72,3 @@ fun formatNumberToMoney(number: Long, currency: String = "đ"): String {
 
     return result + currency
 }
-
-@Composable
-expect fun getScreenDimensions(): ScreenDimension
-
-val primaryColors = listOf(
-    Color(0xFFF0F0F0),
-    Color(0xFFEB2F96),
-    Color(0xFF962AF0),
-    Color(0xFF4E4BFF),
-    Color(0xFF007AFF),
-    Color(0xFF13C2C2),
-    Color(0xFF34C759),
-    Color(0xFFA0D911),
-    Color(0xFFFFCC00),
-    Color(0xFFFA8C16),
-    Color(0xFFFA541C),
-    Color(0xFFF5222D)
-)

package/compose/src/iosMain/kotlin/vn/momo/kits/platform/Platform.ios.kt

@@ -0,0 +1,33 @@
+package vn.momo.kits.platform
+
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.gestures.optOutOfCupertinoOverscroll
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.NativePaint
+import kotlinx.cinterop.ExperimentalForeignApi
+import kotlinx.cinterop.get
+import kotlinx.cinterop.memScoped
+import org.jetbrains.skia.FilterBlurMode
+import org.jetbrains.skia.MaskFilter
+import platform.UIKit.UIScreen
+
+actual fun getPlatformName(): String = "iOS"
+
+@OptIn(ExperimentalFoundationApi::class)
+actual fun disableOverscroll() {
+    optOutOfCupertinoOverscroll()
+}
+
+@OptIn(ExperimentalForeignApi::class)
+@Composable
+actual fun getScreenDimensions(): ScreenDimension = memScoped {
+    val config = UIScreen.mainScreen.bounds.ptr[0]
+    return ScreenDimension(
+        config.size.width.toInt(),
+        config.size.height.toInt()
+    )
+}
+
+actual fun NativePaint.setMaskFilter(blurRadius: Float) {
+    this.maskFilter = MaskFilter.makeBlur(FilterBlurMode.NORMAL, blurRadius / 2, true)
+}

package/gradle.properties

@@ -14,6 +14,6 @@ android.minSdk=24
 #Versions
 kotlin.version=1.9.24
 agp.version=8.1.1
-compose.version=1.6.11
+compose.version=1.7.0-alpha02
 composeCompilerVersion = 1.5.14
 maven-publish.version=0.25.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.89.19",
+  "version": "0.89.21",
   "private": false,
   "dependencies": {},
   "devDependencies": {},

package/settings.gradle.kts

@@ -13,6 +13,7 @@ pluginManagement {
     }
 
     plugins {
+
         val kotlinVersion = extra["kotlin.version"] as String
         val agpVersion = extra["agp.version"] as String
         val composeVersion = extra["compose.version"] as String

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

@@ -1,3 +0,0 @@
-package vn.momo.kits.utils
-
-actual fun getPlatformName(): String = "Android"

package/compose/src/androidMain/kotlin/vn/momo/kits/utils/SetMaskFilter.kt

@@ -1,8 +0,0 @@
-package vn.momo.kits.utils
-
-import android.graphics.BlurMaskFilter
-import androidx.compose.ui.graphics.NativePaint
-
-actual fun NativePaint.setMaskFilter(blurRadius: Float) {
-    this.maskFilter = BlurMaskFilter(blurRadius, BlurMaskFilter.Blur.NORMAL)
-}

package/compose/src/androidMain/kotlin/vn/momo/kits/utils/Utils.android.kt

@@ -1,14 +0,0 @@
-package vn.momo.kits.utils
-
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.platform.LocalConfiguration
-import androidx.compose.ui.text.font.Font
-import androidx.compose.ui.text.font.FontFamily
-
-@Composable
-actual fun getScreenDimensions(): ScreenDimension {
-    val config = LocalConfiguration.current
-    return ScreenDimension(
-        config.screenWidthDp, config.screenHeightDp
-    )
-}

package/compose/src/commonMain/kotlin/vn/momo/kits/utils/Platform.kt

@@ -1,3 +0,0 @@
-package vn.momo.kits.utils
-
-expect fun getPlatformName(): String

package/compose/src/commonMain/kotlin/vn/momo/kits/utils/SetMaskFilter.kt

@@ -1,5 +0,0 @@
-package vn.momo.kits.utils
-
-import androidx.compose.ui.graphics.NativePaint
-
-expect fun NativePaint.setMaskFilter(blurRadius: Float)

package/compose/src/iosMain/kotlin/vn/momo/kits/utils/Platform.kt

@@ -1,3 +0,0 @@
-package vn.momo.kits.utils
-
-actual fun getPlatformName(): String = "iOS"

package/compose/src/iosMain/kotlin/vn/momo/kits/utils/SetMaskFilter.kt

@@ -1,9 +0,0 @@
-package vn.momo.kits.utils
-
-import androidx.compose.ui.graphics.NativePaint
-import org.jetbrains.skia.FilterBlurMode
-import org.jetbrains.skia.MaskFilter
-
-actual fun NativePaint.setMaskFilter(blurRadius: Float) {
-    this.maskFilter = MaskFilter.makeBlur(FilterBlurMode.NORMAL, blurRadius / 2, true)
-}

package/compose/src/iosMain/kotlin/vn/momo/kits/utils/Utils.ios.kt

@@ -1,18 +0,0 @@
-package vn.momo.kits.utils
-
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.text.font.FontFamily
-import kotlinx.cinterop.ExperimentalForeignApi
-import kotlinx.cinterop.get
-import kotlinx.cinterop.memScoped
-import platform.UIKit.UIScreen
-
-@OptIn(ExperimentalForeignApi::class)
-@Composable
-actual fun getScreenDimensions(): ScreenDimension = memScoped {
-    val config = UIScreen.mainScreen.bounds.ptr[0]
-    return ScreenDimension(
-        config.size.width.toInt(),
-        config.size.height.toInt()
-    )
-}