@momo-kits/native-kits 0.154.1-beta.6 → 0.154.1-beta.8

package/compose/src/commonMain/kotlin/vn/momo/kits/application/Context.kt

@@ -0,0 +1,107 @@
+package vn.momo.kits.application
+
+import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.staticCompositionLocalOf
+import vn.momo.kits.components.TrustBannerData
+
+
+private fun Map<String, Any?>?.string(key: String): String? =
+    (this?.get(key) as? String)
+
+@Suppress("UNCHECKED_CAST")
+private fun Map<String, Any?>?.mapStringAny(key: String): Map<String, Any?> =
+    (this?.get(key) as? Map<String, Any?>) ?: emptyMap()
+
+@Suppress("UNCHECKED_CAST")
+private fun Map<String, Any?>?.listOfMapStringAny(key: String): List<Map<String, Any>> =
+    (this?.get(key) as? List<Map<String, Any>>) ?: emptyList()
+
+@Immutable
+data class FeatureFlags(
+    val showBaseLineDebug: Boolean? = false,
+)
+
+@Immutable
+data class KitConfig(
+    val trustBanner: TrustBannerData? = null,
+    val headerBar: String? = null,
+    val headerGradient: String? = null,
+)
+
+@Immutable
+data class MiniAppContext(
+    val appIcon: String = "",
+    val appName: Any? = null,
+    val appId: String = "",
+    val appCode: String = "",
+    val description: Any? = null,
+    val support: Map<String, Any?> = emptyMap(),
+    val toolkitConfig: Map<String, Any?> = emptyMap(),
+    val providerId: String = "",
+    val permissions: List<Map<String, Any>>? = emptyList(),
+    val features: FeatureFlags? = null,
+) {
+    companion object {
+        private const val KEY_ICON        = "icon"
+        private const val KEY_NAME        = "name"
+        private const val KEY_APP_ID      = "appId"
+        private const val KEY_CODE        = "code"
+        private const val KEY_DESCRIPTION = "description"
+        private const val KEY_SUPPORT     = "support"
+        private const val KEY_TOOLKIT_CFG = "toolkitConfig"
+        private const val KEY_PERMISSIONS = "permissions"
+        private const val KEY_ORIGIN_APP  = "originAppId"
+
+        fun toMap(context: MiniAppContext?): Map<String, Any?> = mapOf(
+            "icon"          to (context?.appIcon ?: ""),
+            "name"          to context?.appName,
+            "appId"         to (context?.appId ?: ""),
+            "code"          to (context?.appCode ?: ""),
+            "description"   to (context?.description ?: ""),
+            "support"       to (context?.support ?: emptyMap()),
+            "toolkitConfig" to (context?.toolkitConfig ?: emptyMap()),
+            "providerId"    to (context?.providerId ?: ""),
+            "permissions"   to (context?.permissions ?: emptyList()),
+        )
+
+        fun fromMap(data: Map<String, Any?>?): MiniAppContext = MiniAppContext(
+            appIcon       = data.string(KEY_ICON) ?: "",
+            appName       = data?.get(KEY_NAME),
+            appId         = data.string(KEY_APP_ID) ?: "",
+            appCode       = data.string(KEY_CODE) ?: "",
+            description   = data?.get(KEY_DESCRIPTION),
+            support       = data.mapStringAny(KEY_SUPPORT),
+            toolkitConfig = data.mapStringAny(KEY_TOOLKIT_CFG),
+            providerId    = computeProviderId(
+                originAppId = data.string(KEY_ORIGIN_APP),
+                appId       = data.string(KEY_APP_ID)
+            ),
+            permissions   = data.listOfMapStringAny(KEY_PERMISSIONS),
+        )
+
+        private fun computeProviderId(originAppId: String?, appId: String?): String {
+            val id = when {
+                !originAppId.isNullOrBlank() -> originAppId
+                !appId.isNullOrBlank()       -> appId
+                else                         -> null
+            } ?: return "unknown"
+
+            val parts = id.split('.')
+            return parts.getOrNull(1) ?: "unknown"
+        }
+    }
+}
+
+val ApplicationContext = staticCompositionLocalOf<MiniAppContext?> {
+    null
+}
+
+val AppConfig = staticCompositionLocalOf<KitConfig?> {
+    null
+}
+
+val AppLanguage = staticCompositionLocalOf<String?> {
+    null
+}
+
+internal val ScaleSizeMaxRate  = staticCompositionLocalOf<Float?> { null }

package/compose/src/commonMain/kotlin/vn/momo/kits/application/HeaderRight.kt

@@ -32,6 +32,7 @@ import vn.momo.kits.components.DotSize
 import vn.momo.kits.components.Icon
 import vn.momo.kits.const.AppTheme
 import vn.momo.kits.const.Colors
+import vn.momo.kits.const.Spacing
 
 @Stable
 data class HeaderRightData(
@@ -77,11 +78,7 @@ data class NavigationButtonConfig(
     val onPress: () -> Unit
 )
 
-object Spacing {
-    val M = 16.dp
-    val S = 8.dp
-    val XXS = 2.dp
-}
+
 
 @Deprecated("Use vn.momo.kits.navigation.component.HeaderRight instead", ReplaceWith("vn.momo.kits.navigation.component.HeaderRight"))
 @Composable

package/compose/src/commonMain/kotlin/vn/momo/kits/application/NavigationContainer.kt

@@ -2,7 +2,6 @@ package vn.momo.kits.application
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
-import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -10,7 +9,6 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.unit.Dp
-import vn.momo.kits.components.TrustBannerData
 import vn.momo.kits.const.AppStatusBar
 import vn.momo.kits.const.AppTheme
 import vn.momo.kits.const.Theme
@@ -64,123 +62,12 @@ class Navigator {
     }
 }
 
-@Immutable
-data class MiniAppContext(
-    val appIcon: String = "",
-    val appName: Any? = null,
-    val appId: String = "",
-    val appCode: String = "",
-    val description: Any? = null,
-    val support: Map<String, Any?> = emptyMap(),
-    val toolkitConfig: Map<String, Any?> = emptyMap(),
-    val providerId: String = "",
-    val permissions: List<Map<String, Any>>? = emptyList(),
-    val isBaselineEnabled: Boolean = false
-) {
-    companion object {
-        private const val KEY_ICON        = "icon"
-        private const val KEY_NAME        = "name"
-        private const val KEY_APP_ID      = "appId"
-        private const val KEY_CODE        = "code"
-        private const val KEY_DESCRIPTION = "description"
-        private const val KEY_SUPPORT     = "support"
-        private const val KEY_TOOLKIT_CFG = "toolkitConfig"
-        private const val KEY_PERMISSIONS = "permissions"
-        private const val KEY_ORIGIN_APP  = "originAppId"
-        private const val KEY_BASELINE_ENABLED  = "isBaselineEnabled"
-
-        fun toMap(context: MiniAppContext?): Map<String, Any?> = mapOf(
-            "icon"          to (context?.appIcon ?: ""),
-            "name"          to context?.appName,
-            "appId"         to (context?.appId ?: ""),
-            "code"          to (context?.appCode ?: ""),
-            "description"   to (context?.description ?: ""),
-            "support"       to (context?.support ?: emptyMap<String, Any?>()),
-            "toolkitConfig" to (context?.toolkitConfig ?: emptyMap<String, Any?>()),
-            "providerId"    to (context?.providerId ?: ""),
-            "permissions"   to (context?.permissions ?: emptyList<Map<String, Any>>()),
-            "isBaselineEnabled"   to (context?.isBaselineEnabled ?: false)
-        )
-
-        fun fromMap(data: Map<String, Any?>?): MiniAppContext = MiniAppContext(
-            appIcon       = data.string(KEY_ICON) ?: "",
-            appName       = data?.get(KEY_NAME),
-            appId         = data.string(KEY_APP_ID) ?: "",
-            appCode       = data.string(KEY_CODE) ?: "",
-            description   = data?.get(KEY_DESCRIPTION),
-            support       = data.mapStringAny(KEY_SUPPORT),
-            toolkitConfig = data.mapStringAny(KEY_TOOLKIT_CFG),
-            providerId    = computeProviderId(
-                originAppId = data.string(KEY_ORIGIN_APP),
-                appId       = data.string(KEY_APP_ID)
-            ),
-            permissions   = data.listOfMapStringAny(KEY_PERMISSIONS),
-            isBaselineEnabled = data?.get(KEY_BASELINE_ENABLED) as Boolean
-        )
-
-        private fun computeProviderId(originAppId: String?, appId: String?): String {
-            val id = when {
-                !originAppId.isNullOrBlank() -> originAppId
-                !appId.isNullOrBlank()       -> appId
-                else                         -> null
-            } ?: return "unknown"
-
-            val parts = id.split('.')
-            return parts.getOrNull(1) ?: "unknown"
-        }
-    }
-}
-
-private fun Map<String, Any?>?.string(key: String): String? =
-    (this?.get(key) as? String)
 
-@Suppress("UNCHECKED_CAST")
-private fun Map<String, Any?>?.mapStringAny(key: String): Map<String, Any?> =
-    (this?.get(key) as? Map<String, Any?>) ?: emptyMap()
 
-@Suppress("UNCHECKED_CAST")
-private fun Map<String, Any?>?.listOfMapStringAny(key: String): List<Map<String, Any>> =
-    (this?.get(key) as? List<Map<String, Any>>) ?: emptyList()
 
 @Deprecated("Use LocalApi instead", ReplaceWith("LocalApi"))
 val PlatformApi = staticCompositionLocalOf<Any?> { null }
 
-@Deprecated("Use LocalNavigator instead", ReplaceWith("LocalNavigator"))
-val AppNavigator = staticCompositionLocalOf<Navigator?> {
-    null
-}
-
-val ApplicationContext = staticCompositionLocalOf<MiniAppContext?> {
-    null
-}
-
-val AppConfig = staticCompositionLocalOf<KitConfig?> {
-    null
-}
-
-val AppLanguage = staticCompositionLocalOf<String?> {
-    null
-}
-
-val Feature = staticCompositionLocalOf<FeatureFlags?> {
-    FeatureFlags(
-        showBaseLineDebug = false
-    )
-}
-
-@Immutable
-data class FeatureFlags(
-    val showBaseLineDebug: Boolean? = false,
-)
-
-@Immutable
-data class KitConfig(
-    val trustBanner: TrustBannerData? = null,
-    val headerBar: String? = null,
-    val headerGradient: String? = null,
-)
-
-internal var DesignSystemWhiteList: Boolean? = null
 
 @Deprecated("Use NavigationContainer instead", ReplaceWith("NavigationContainer"))
 @Composable
@@ -197,7 +84,6 @@ fun ApplicationContainer(
     var appTheme by remember { mutableStateOf(theme) }
 
     LaunchedEffect(Unit) {
-        DesignSystemWhiteList = isWhiteList
         try {
             val headerBar = config?.headerBar
             if (headerBar != null && appTheme.assets.headerBackground == null) {
@@ -217,7 +103,6 @@ fun ApplicationContainer(
     CompositionLocalProvider(
         AppTheme provides appTheme,
         PlatformApi provides composeApi,
-        AppNavigator provides Navigator(),
         AppStatusBar provides appStatusBarHeight,
         ApplicationContext provides applicationContext,
         AppConfig provides config,

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

@@ -2,9 +2,7 @@ package vn.momo.kits.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
-import androidx.compose.runtime.staticCompositionLocalOf
-
-internal val ScaleSizeMaxRate  = staticCompositionLocalOf<Float?> { null }
+import vn.momo.kits.application.ScaleSizeMaxRate
 
 @Composable
 fun ScaleSizeScope(

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

@@ -12,7 +12,7 @@ import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.TextUnit
 import androidx.compose.ui.unit.dp
-import vn.momo.kits.application.Feature
+import vn.momo.kits.application.ApplicationContext
 import vn.momo.kits.const.AppTheme
 import vn.momo.kits.const.Colors
 import vn.momo.kits.const.Typography
@@ -38,6 +38,7 @@ fun Text(
     softWrap: Boolean = true,
     accessibilityId: String? = null
 ) {
+    val application = ApplicationContext.current
     // Cache theme access to avoid repeated lookups
     val theme = AppTheme.current
 
@@ -70,7 +71,7 @@ fun Text(
     }
 
     // on/off baseline config value, default will be false
-    val showBaseLineDebug = Feature.current?.showBaseLineDebug ?: false
+    val showBaseLineDebug = application?.features?.showBaseLineDebug == true
 
     androidx.compose.material3.Text(
         modifier = modifier.conditional(showBaseLineDebug){

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

@@ -17,12 +17,10 @@ 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 androidx.compose.ui.unit.sp
 import vn.momo.kits.application.AppConfig
 import vn.momo.kits.application.AppLanguage
-import vn.momo.kits.modifier.noFeedbackClickable
-import vn.momo.kits.components.Text
 import vn.momo.kits.const.Typography
+import vn.momo.kits.modifier.noFeedbackClickable
 
 val defaultBanner = TrustBannerData(
     content = mapOf(

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

@@ -15,10 +15,8 @@ import androidx.compose.ui.unit.sp
 import org.jetbrains.compose.resources.Font
 import org.jetbrains.compose.resources.FontResource
 import org.jetbrains.compose.resources.InternalResourceApi
-import vn.momo.kits.components.ScaleSizeMaxRate
+import vn.momo.kits.application.ScaleSizeMaxRate
 import vn.momo.kits.platform.getScreenDimensions
-import kotlin.math.max
-import kotlin.math.min
 import vn.momo.uikits.resources.Res
 import vn.momo.uikits.resources.momosignature
 import vn.momo.uikits.resources.momotrustdisplay
@@ -31,6 +29,8 @@ import vn.momo.uikits.resources.sfprotext_regular
 import vn.momo.uikits.resources.sfprotext_semibold
 import vn.momo.uikits.resources.sfprotext_thin
 import vn.momo.uikits.resources.sfprotext_ultralight
+import kotlin.math.max
+import kotlin.math.min
 
 const val DEFAULT_SCREEN_SIZE = 375f
 const val MAX_FONT_SCALE = 1.5f

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

@@ -25,8 +25,6 @@ import androidx.navigation.toRoute
 import vn.momo.kits.application.AppConfig
 import vn.momo.kits.application.AppLanguage
 import vn.momo.kits.application.ApplicationContext
-import vn.momo.kits.application.Feature
-import vn.momo.kits.application.FeatureFlags
 import vn.momo.kits.application.KitConfig
 import vn.momo.kits.application.MiniAppContext
 import vn.momo.kits.const.AppNavigationBar
@@ -49,8 +47,7 @@ fun NavigationContainer(
     setNavigator: ((Navigator) -> Unit)? = null,
     statusBarHeight: Dp? = null,
     config: KitConfig? = null,
-    language: String? = null,
-    featureFlags: FeatureFlags
+    language: String? = null
 ){
     val navController = rememberNavController()
     val navigator = remember { Navigator(navController = navController, maxApi = maxApi) }
@@ -86,7 +83,6 @@ fun NavigationContainer(
         ApplicationContext provides applicationContext,
         AppConfig provides config,
         AppLanguage provides language,
-        Feature provides featureFlags
     ) {
         LaunchedEffect(Unit) {
             setNavigator?.invoke(navigator)

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

@@ -26,11 +26,11 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import vn.momo.kits.application.ApplicationContext
 import vn.momo.kits.application.MiniAppContext
-import vn.momo.kits.application.Spacing
 import vn.momo.kits.components.BadgeDot
 import vn.momo.kits.components.DotSize
 import vn.momo.kits.components.Icon
 import vn.momo.kits.const.Colors
+import vn.momo.kits.const.Spacing
 import vn.momo.kits.modifier.activeOpacityClickable
 import vn.momo.kits.navigation.LocalMaxApi
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.154.1-beta.6",
+  "version": "0.154.1-beta.8",
   "private": false,
   "dependencies": {
     "@momo-platform/native-max-api": "1.0.18"