@momo-kits/native-kits 0.114.2-beta.1 → 0.114.2-beta.2

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

@@ -0,0 +1,201 @@
+package vn.momo.kits.components.dateTimePicker
+
+import androidx.compose.animation.core.tween
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.gestures.Orientation
+import androidx.compose.foundation.gestures.animateScrollBy
+import androidx.compose.foundation.gestures.draggable
+import androidx.compose.foundation.gestures.rememberDraggableState
+import androidx.compose.foundation.gestures.scrollBy
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.alpha
+import androidx.compose.ui.draw.scale
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.zIndex
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+import vn.momo.kits.components.Text
+import vn.momo.kits.const.AppTheme
+import vn.momo.kits.const.Colors
+import vn.momo.kits.const.Radius
+import vn.momo.kits.const.Typography
+import kotlin.math.abs
+import kotlin.math.roundToInt
+
+private val wheelItemHeight = 42.dp
+private val wheelPickerBorderWidth = 1.dp
+
+private fun onDragStopped(
+    listState: androidx.compose.foundation.lazy.LazyListState,
+    itemHeight: Float,
+    coroutineScope: CoroutineScope
+) {
+
+    coroutineScope.launch {
+        val targetPosition = listState.firstVisibleItemScrollOffset / itemHeight
+        val targetOffset = if (targetPosition.roundToInt() == targetPosition.toInt()) {
+            0f
+        } else {
+            if (targetPosition - targetPosition.toInt() > 0.5f) {
+                (1 - (targetPosition - targetPosition.toInt())) * itemHeight
+            } else {
+                -(targetPosition - targetPosition.toInt()) * itemHeight
+            }
+        }
+
+        listState.animateScrollBy(targetOffset, tween(150))
+    }
+}
+
+@Composable
+fun WheelPicker(
+    name: String,
+    data: List<String>,
+    selectedData: String,
+    onChange: (String, String) -> Unit,
+    modifier: Modifier = Modifier
+) {
+    val coroutineScope = rememberCoroutineScope()
+    val listState = rememberLazyListState()
+    val itemHeightPx = with(LocalDensity.current) { wheelItemHeight.toPx() }
+
+    val paddedData = remember(data) {
+        listOf("", "") + data + listOf("", "")
+    }
+
+    val initialIndex = remember(selectedData, paddedData) {
+        paddedData.indexOf(selectedData).coerceAtLeast(2)
+    }
+
+    LaunchedEffect(initialIndex) {
+        listState.scrollToItem(initialIndex - 2)
+    }
+
+    val selectedIndex by remember {
+        derivedStateOf {
+            (listState.firstVisibleItemIndex + 2).coerceIn(2, paddedData.size - 3)
+        }
+    }
+
+    LaunchedEffect(listState.isScrollInProgress) {
+        if (!listState.isScrollInProgress) {
+            val centeredIndex = selectedIndex
+            if (centeredIndex in 2 until paddedData.size - 2) {
+                onChange(name, paddedData[centeredIndex])
+            }
+        }
+    }
+
+    Box(
+        modifier = modifier
+            .border(
+                width = wheelPickerBorderWidth,
+                color = AppTheme.current.colors.border.default,
+                shape = RoundedCornerShape(Radius.S)
+            )
+            .background(
+                color = AppTheme.current.colors.background.surface,
+            )
+    ) {
+        LazyColumn(
+            state = listState,
+            modifier = Modifier
+                .fillMaxWidth()
+                .draggable(
+                    orientation = Orientation.Vertical,
+                    state = rememberDraggableState { delta ->
+                        coroutineScope.launch {
+                            listState.scrollBy(-delta)
+                        }
+                    },
+                    onDragStopped = {
+                        onDragStopped(
+                            listState = listState,
+                            itemHeight = itemHeightPx,
+                            coroutineScope = coroutineScope
+                        )
+                    }
+                )
+        ) {
+            items(paddedData.size) { index ->
+                WheelPickerItem(
+                    text = paddedData[index],
+                    isSelected = index == selectedIndex,
+                    index = index,
+                    listState = listState,
+                    itemHeight = wheelItemHeight
+                )
+            }
+        }
+
+        Box(
+            modifier = Modifier
+                .fillMaxWidth()
+                .height(wheelItemHeight)
+                .background(Colors.blue_10)
+                .align(Alignment.Center)
+                .alpha(0.2f)
+                .zIndex(-2f)
+        )
+    }
+}
+
+@Composable
+fun WheelPickerItem(
+    text: String,
+    isSelected: Boolean,
+    index: Int,
+    listState: androidx.compose.foundation.lazy.LazyListState,
+    itemHeight: Dp
+) {
+    val firstVisibleIndex = listState.firstVisibleItemIndex
+    val visibleItemOffset = listState.firstVisibleItemScrollOffset
+
+    val viewportHeight = 5 * itemHeight.value
+    val itemHeightValue = itemHeight.value
+
+    val absoluteOffset =
+        (index - firstVisibleIndex) * itemHeightValue - (visibleItemOffset / itemHeightValue)
+    val relativePosition = absoluteOffset / viewportHeight
+
+    val distance = abs(2 - relativePosition)
+
+    val opacity = when {
+        distance <= 1 -> 1f
+        distance <= 2 -> 0.8f
+        distance <= 3 -> 0.4f
+        else -> 0.4f
+    }
+
+    val scale = if (isSelected) 1f else 0.87f
+
+    Box(
+        modifier = Modifier
+            .fillMaxWidth()
+            .height(itemHeight)
+            .alpha(opacity),
+        contentAlignment = Alignment.Center
+    ) {
+        Text(
+            text = text,
+            style = Typography.actionS,
+            modifier = Modifier.scale(scale)
+        )
+    }
+} 

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

@@ -75,183 +75,143 @@ fun getFontFamily(fontFamily: String, fontWeight: FontWeight? = FontWeight.Norma
 
 @Immutable
 class AppTypography internal constructor(
-    val headlineDefault: TextStyle,
-    val headlineS: TextStyle,
-    val headlineL: TextStyle,
-    val headlineXl: TextStyle,
-    val titleDefault: TextStyle,
-    val titleXs: TextStyle,
-    val titleS: TextStyle,
-    val headerDefault: TextStyle,
-    val headerXs: TextStyle,
-    val headerS: TextStyle,
-    val paragraphDefault: TextStyle,
-    val paragraphBold: TextStyle,
-    val paragraphItalic: TextStyle,
-    val descriptionDefault: TextStyle,
-    val descriptionXs: TextStyle,
-    val descriptionS: TextStyle,
-    val labelDefault: TextStyle,
-    val labelXxs: TextStyle,
-    val labelXs: TextStyle,
-    val labelS: TextStyle,
-    val actionDefault: TextStyle,
-    val actionXxs: TextStyle,
-    val actionXs: TextStyle,
-    val actionS: TextStyle,
+    val headlineDefaultBold: TextStyle,
+    val headerMBold: TextStyle,
+    val headerDefaultBold: TextStyle,
+    val headerSSemibold: TextStyle,
+    val headerXsSemibold: TextStyle,
+    val bodyDefaultRegular: TextStyle,
+    val bodyDefaultRegularStrikethrough: TextStyle,
+    val descriptionDefaultRegular: TextStyle,
+    val descriptionDefaultRegularStrikethrough: TextStyle,
+    val descriptionXsRegular: TextStyle,
+    val descriptionXsRegularStrikethrough: TextStyle,
+    val labelDefaultMedium: TextStyle,
+    val labelSMedium: TextStyle,
+    val labelXsMedium: TextStyle,
+    val actionDefaultBold: TextStyle,
+    val actionSBold: TextStyle,
+    val actionXsBold: TextStyle,
+    val actionXxsBold: TextStyle,
 ) {
     constructor(
         default: TextStyle = TextStyle(
-            fontSize = 15.sp,
-            lineHeight = 22.sp,
+            fontSize = 14.sp,
+            lineHeight = 20.sp,
             fontWeight = FontWeight.Normal
         ),
-        headlineDefault: TextStyle = TextStyle(
-            fontSize = 28.sp,
-            lineHeight = 34.sp,
-            fontWeight = FontWeight.SemiBold
-        ),
-        headlineS: TextStyle = TextStyle(
+        headlineDefaultBold: TextStyle = TextStyle(
             fontSize = 24.sp,
-            lineHeight = 32.sp,
-            fontWeight = FontWeight.SemiBold
-        ),
-        headlineL: TextStyle = TextStyle(
-            fontSize = 32.sp,
-            lineHeight = 36.sp,
-            fontWeight = FontWeight.SemiBold
-        ),
-        headlineXl: TextStyle = TextStyle(
-            fontSize = 36.sp,
-            lineHeight = 44.sp,
-            fontWeight = FontWeight.SemiBold
+            lineHeight = 34.sp,
+            fontWeight = FontWeight.Bold
         ),
-        titleDefault: TextStyle = TextStyle(
-            fontSize = 20.sp,
-            lineHeight = 28.sp,
+        headerMBold: TextStyle = TextStyle(
+            fontSize = 18.sp,
+            lineHeight = 26.sp,
             fontWeight = FontWeight.Bold
         ),
-        titleXs: TextStyle = TextStyle(
+        headerDefaultBold: TextStyle = TextStyle(
             fontSize = 16.sp,
             lineHeight = 22.sp,
             fontWeight = FontWeight.Bold
         ),
-        titleS: TextStyle = TextStyle(
-            fontSize = 18.sp,
-            lineHeight = 28.sp,
-            fontWeight = FontWeight.Bold
-        ),
-        headerDefault: TextStyle = TextStyle(
-            fontSize = 15.sp,
-            lineHeight = 22.sp,
+        headerSSemibold: TextStyle = TextStyle(
+            fontSize = 14.sp,
+            lineHeight = 20.sp,
             fontWeight = FontWeight.SemiBold
         ),
-        headerXs: TextStyle = TextStyle(
+        headerXsSemibold: TextStyle = TextStyle(
             fontSize = 12.sp,
-            lineHeight = 16.sp,
+            lineHeight = 18.sp,
             fontWeight = FontWeight.SemiBold
         ),
-        headerS: TextStyle = TextStyle(
+        bodyDefaultRegular: TextStyle = TextStyle(
             fontSize = 14.sp,
             lineHeight = 20.sp,
-            fontWeight = FontWeight.SemiBold
-        ),
-        paragraphDefault: TextStyle = TextStyle(
-            fontSize = 15.sp,
-            lineHeight = 22.sp,
             fontWeight = FontWeight.Normal
         ),
-        paragraphBold: TextStyle = TextStyle(
-            fontSize = 15.sp,
-            lineHeight = 22.sp,
-            fontWeight = FontWeight.Bold
-        ),
-        paragraphItalic: TextStyle = TextStyle(
-            fontSize = 15.sp,
-            lineHeight = 22.sp,
-            fontWeight = FontWeight.Normal,
-            fontStyle = FontStyle.Italic
-        ),
-        descriptionDefault: TextStyle = TextStyle(
+        bodyDefaultRegularStrikethrough: TextStyle = TextStyle(
             fontSize = 14.sp,
             lineHeight = 20.sp,
+            fontWeight = FontWeight.Normal,
+            textDecoration = TextDecoration.LineThrough
+        ),
+        descriptionDefaultRegular: TextStyle = TextStyle(
+            fontSize = 12.sp,
+            lineHeight = 18.sp,
             fontWeight = FontWeight.Normal
         ),
-        descriptionXs: TextStyle = TextStyle(
+        descriptionDefaultRegularStrikethrough: TextStyle = TextStyle(
+            fontSize = 12.sp,
+            lineHeight = 18.sp,
+            fontWeight = FontWeight.Normal,
+            textDecoration = TextDecoration.LineThrough
+        ),
+        descriptionXsRegular: TextStyle = TextStyle(
             fontSize = 10.sp,
             lineHeight = 14.sp,
             fontWeight = FontWeight.Normal
         ),
-        descriptionS: TextStyle = TextStyle(
-            fontSize = 12.sp,
-            lineHeight = 16.sp,
+        descriptionXsRegularStrikethrough: TextStyle = TextStyle(
+            fontSize = 10.sp,
+            lineHeight = 14.sp,
             fontWeight = FontWeight.Normal,
+            textDecoration = TextDecoration.LineThrough
         ),
-        labelDefault: TextStyle = TextStyle(
+        labelDefaultMedium: TextStyle = TextStyle(
             fontSize = 14.sp,
             lineHeight = 20.sp,
             fontWeight = FontWeight.Medium
         ),
-        labelXxs: TextStyle = TextStyle(
-            fontSize = 8.sp,
-            lineHeight = 12.sp,
+        labelSMedium: TextStyle = TextStyle(
+            fontSize = 12.sp,
+            lineHeight = 18.sp,
             fontWeight = FontWeight.Medium
         ),
-        labelXs: TextStyle = TextStyle(
+        labelXsMedium: TextStyle = TextStyle(
             fontSize = 10.sp,
             lineHeight = 14.sp,
             fontWeight = FontWeight.Medium
         ),
-        labelS: TextStyle = TextStyle(
-            fontSize = 12.sp,
-            lineHeight = 16.sp,
-            fontWeight = FontWeight.Medium
-        ),
-        actionDefault: TextStyle = TextStyle(
+        actionDefaultBold: TextStyle = TextStyle(
             fontSize = 16.sp,
             lineHeight = 22.sp,
             fontWeight = FontWeight.Bold
         ),
-        actionXxs: TextStyle = TextStyle(
-            fontSize = 10.sp,
-            lineHeight = 14.sp,
+        actionSBold: TextStyle = TextStyle(
+            fontSize = 14.sp,
+            lineHeight = 20.sp,
             fontWeight = FontWeight.Bold
         ),
-        actionXs: TextStyle = TextStyle(
+        actionXsBold: TextStyle = TextStyle(
             fontSize = 12.sp,
-            lineHeight = 16.sp,
+            lineHeight = 18.sp,
             fontWeight = FontWeight.Bold
         ),
-        actionS: TextStyle = TextStyle(
-            fontSize = 15.sp,
-            lineHeight = 22.sp,
+        actionXxsBold: TextStyle = TextStyle(
+            fontSize = 10.sp,
+            lineHeight = 14.sp,
             fontWeight = FontWeight.Bold
         ),
     ) : this(
-        headlineDefault = headlineDefault,
-        headlineS = headlineS,
-        headlineL = headlineL,
-        headlineXl = headlineXl,
-        titleDefault = titleDefault,
-        titleXs = titleXs,
-        titleS = titleS,
-        headerDefault = headerDefault,
-        headerXs = headerXs,
-        headerS = headerS,
-        paragraphDefault = paragraphDefault,
-        paragraphBold = paragraphBold,
-        paragraphItalic = paragraphItalic,
-        descriptionDefault = descriptionDefault,
-        descriptionXs = descriptionXs,
-        descriptionS = descriptionS,
-        labelDefault = labelDefault,
-        labelXxs = labelXxs,
-        labelXs = labelXs,
-        labelS = labelS,
-        actionDefault = actionDefault,
-        actionXxs = actionXxs,
-        actionXs = actionXs,
-        actionS = actionS
+        headlineDefaultBold = headlineDefaultBold,
+        headerMBold = headerMBold,
+        headerDefaultBold = headerDefaultBold,
+        headerSSemibold = headerSSemibold,
+        headerXsSemibold = headerXsSemibold,
+        bodyDefaultRegular = bodyDefaultRegular,
+        bodyDefaultRegularStrikethrough = bodyDefaultRegularStrikethrough,
+        descriptionDefaultRegular = descriptionDefaultRegular,
+        descriptionDefaultRegularStrikethrough = descriptionDefaultRegularStrikethrough,
+        descriptionXsRegular = descriptionXsRegular,
+        descriptionXsRegularStrikethrough = descriptionXsRegularStrikethrough,
+        labelDefaultMedium = labelDefaultMedium,
+        labelSMedium = labelSMedium,
+        labelXsMedium = labelXsMedium,
+        actionDefaultBold = actionDefaultBold,
+        actionSBold = actionSBold,
+        actionXsBold = actionXsBold,
+        actionXxsBold = actionXxsBold
     )
 }
 

package/ios/Application/ApplicationEnvironment.swift

@@ -13,12 +13,12 @@ public class MiniAppContext {
     public var appName: Any? = nil
     public var appIcon: String = ""
     public var description: Any? = nil
-    public var support: Any? = nil
-    public var toolkitConfig: Any? = nil
-    public var providerId: String = ""
-    public var permissions: Any? = nil
-
-    public init(appId: String, appCode: String, appName: Any? = nil, appIcon: String, description: Any? = nil, support: Any? = nil, toolkitConfig: Any? = nil, providerId: String, permissions: Any? = nil) {
+    public var support: [String: Any] = [:]
+    public var toolkitConfig: [String: Any] = [:]
+    public var providerId: String = "momo"
+    public var permissions: [[String: Any]] = []
+    
+    public init(appId: String, appCode: String, appName: Any? = nil, appIcon: String, description: Any? = nil, support: [String: Any] = [:], toolkitConfig: [String: Any] = [:], providerId: String = "momo", permissions: [[String: Any]] = []) {
         self.appId = appId
         self.appCode = appCode
         self.appName = appName
@@ -31,12 +31,20 @@ public class MiniAppContext {
     }
 }
 
+public class KitConfig {
+    public var trustBanner: TrustBannerData? = nil
+    public var headerBar: String? = nil
+    public var headerGradient: String? = nil
+}
+
 public class ApplicationEnvironment: ObservableObject {
     let applicationContext: MiniAppContext?
-    let composeApi: KitComposeApi
-
-    public init(applicationContext: MiniAppContext?, composeApi: KitComposeApi) {
+    let composeApi: KitComposeApi?
+    let config: KitConfig?
+    
+    public init(applicationContext: MiniAppContext? = nil, composeApi: KitComposeApi? = nil, config: KitConfig? = nil) {
         self.applicationContext = applicationContext
         self.composeApi = composeApi
+        self.config = config
     }
 }