@momo-kits/native-kits 0.127.1-beta.2 → 0.150.0-beta.1

package/build/kotlin/commonizedNativeDistributionLocation.txt

@@ -1 +1 @@
-/Users/sonnguyen/.konan/kotlin-native-prebuilt-macos-aarch64-2.1.0/klib/commonized/2.1.0
+/Users/huynhdung/.konan/kotlin-native-prebuilt-macos-aarch64-2.1.0/klib/commonized/2.1.0

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

@@ -1,6 +1,5 @@
 package vn.momo.kits.application
 
-import androidx.compose.foundation.LocalOverscrollFactory
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.LaunchedEffect
@@ -202,7 +201,6 @@ fun ApplicationContainer(
         ApplicationContext provides applicationContext,
         AppConfig provides config,
         AppLanguage provides language,
-        LocalOverscrollFactory provides null
     ) {
         content()
     }

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

@@ -41,7 +41,6 @@ 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.modifier.conditional
 import vn.momo.kits.modifier.noFeedbackClickable
 import vn.momo.kits.platform.BackHandler
 import vn.momo.kits.platform.getScreenHeight
@@ -50,6 +49,7 @@ import vn.momo.kits.platform.getScreenHeight
 internal fun BottomSheet(
     content: @Composable () -> Unit,
     header: BottomHeader,
+    isSurface: Boolean = false,
     barrierDismissible: Boolean = true,
     onDismiss: (() -> Unit)?
 ) {
@@ -101,6 +101,7 @@ internal fun BottomSheet(
                 )
             )
             navigator.pop()
+            OverplayComponentRegistry.hardClearAfterDismiss()
         }
     }
 
@@ -109,6 +110,7 @@ internal fun BottomSheet(
     }
 
     DisposableEffect(Unit) {
+        OverplayComponentRegistry.bindClose { closeEvent() }
         onDispose {
             onDismiss?.invoke()
         }
@@ -122,10 +124,8 @@ internal fun BottomSheet(
         modifier = Modifier
             .fillMaxSize()
             .background(Color.Black.copy(alpha = alpha))
-            .conditional(barrierDismissible){
-                noFeedbackClickable {
-                    closeEvent()
-                }
+            .noFeedbackClickable {
+                if(barrierDismissible) closeEvent()
             }
     ) {
         val parentHeight = with(LocalDensity.current) { constraints.maxHeight.toDp() }
@@ -136,7 +136,7 @@ internal fun BottomSheet(
                 .fillMaxWidth()
                 .heightIn(max = parentHeight - 90.dp)
                 .background(
-                    color = AppTheme.current.colors.background.default,
+                    color = if (isSurface) AppTheme.current.colors.background.surface else AppTheme.current.colors.background.default,
                     shape = RoundedCornerShape(topStart = Radius.M, topEnd = Radius.M)
                 )
                 .noFeedbackClickable {  },

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

@@ -60,20 +60,16 @@ internal fun ModalScreen(
 
     fun closeEvent() {
         coroutineScope.launch {
-            launch {
-                alpha.animateTo(
-                    targetValue = 0f,
-                    animationSpec = tween(durationMillis = 200)
-                )
-            }
-            launch {
-                scale.animateTo(
-                    targetValue = 0.8f,
-                    animationSpec = tween(durationMillis = 200)
-                )
-            }.invokeOnCompletion {
-                navigator.pop()
-            }
+            alpha.animateTo(
+                targetValue = 0f,
+                animationSpec = tween(durationMillis = 200)
+            )
+            scale.animateTo(
+                targetValue = 0.8f,
+                animationSpec = tween(durationMillis = 200)
+            )
+            navigator.pop()
+            OverplayComponentRegistry.hardClearAfterDismiss()
         }
     }
 
@@ -82,6 +78,7 @@ internal fun ModalScreen(
     }
 
     DisposableEffect(Unit) {
+        OverplayComponentRegistry.bindClose { closeEvent() }
         onDispose {
             onDismiss?.invoke()
         }
@@ -95,10 +92,8 @@ internal fun ModalScreen(
         modifier = Modifier
             .fillMaxSize()
             .background(Color.Black.copy(alpha = 0.6f * alpha.value))
-            .conditional(barrierDismissible){
-                noFeedbackClickable {
-                    closeEvent()
-                }
+            .noFeedbackClickable {
+                if(barrierDismissible) closeEvent()
             },
         contentAlignment = Alignment.Center
     ) {

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

@@ -74,16 +74,17 @@ class Navigator(
         barrierDismissible: Boolean = true,
         onDismiss: (() -> Unit)? = null
     ){
-        OverplayComponentRegistry.registerModal(content, barrierDismissible, onDismiss, false)
+        OverplayComponentRegistry.registerModal(content, false, barrierDismissible, onDismiss, false)
     }
 
     fun showBottomSheet(
         content: @Composable () -> Unit,
+        isSurface: Boolean = false,
         barrierDismissible: Boolean = true,
         onDismiss: (() -> Unit)? = null,
         bottomSheetHeader: BottomHeader? = null
     ){
-        OverplayComponentRegistry.registerModal(content, barrierDismissible, onDismiss, true, bottomSheetHeader)
+        OverplayComponentRegistry.registerModal(content, isSurface, barrierDismissible, onDismiss, true, bottomSheetHeader)
     }
 
     fun dispose(){
@@ -151,6 +152,7 @@ sealed class OverplayComponentParams {
     ) : OverplayComponentParams()
 
     class BottomSheet(
+        val isSurface: Boolean = false,
         val onDismiss: (() -> Unit)? = null,
         val barrierDismissible: Boolean = true,
         val bottomSheetHeader: BottomHeader? = null,
@@ -164,16 +166,21 @@ data class OverplayComponent(
 
 object OverplayComponentRegistry {
     private var currentOverlayComponent : MutableState<OverplayComponent?> = mutableStateOf(null)
+    private var requestClose: (() -> Unit)? = null
+    internal fun bindClose(handler: (() -> Unit)?) {
+        requestClose = handler
+    }
 
     fun registerModal(
         content: @Composable () -> Unit,
+        isSurface: Boolean = false,
         barrierDismissible: Boolean = true,
         onDismiss: (() -> Unit)?,
         isBottomSheet: Boolean = false,
         bottomSheetHeader: BottomHeader? = null,
     ){
         val params = if (isBottomSheet) {
-            OverplayComponentParams.BottomSheet(onDismiss, barrierDismissible, bottomSheetHeader)
+            OverplayComponentParams.BottomSheet(isSurface, onDismiss, barrierDismissible, bottomSheetHeader)
         } else {
             OverplayComponentParams.Modal(onDismiss, barrierDismissible)
         }
@@ -186,7 +193,16 @@ object OverplayComponentRegistry {
     fun isOverplayShowing(): Boolean = currentOverlayComponent.value != null
 
     fun clear(){
+        if (requestClose != null) {
+            requestClose?.invoke()
+        } else {
+            currentOverlayComponent.value = null
+        }
+    }
+
+    internal fun hardClearAfterDismiss() {
         currentOverlayComponent.value = null
+        requestClose = null
     }
 
     @Composable
@@ -199,6 +215,7 @@ object OverplayComponentRegistry {
             BottomSheet(
                 content = overplay.content,
                 header = param.bottomSheetHeader ?: BottomHeader.Title(),
+                isSurface = param.isSurface,
                 barrierDismissible = param.barrierDismissible == true,
                 onDismiss = param.onDismiss
             )

package/local.properties

@@ -4,5 +4,5 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Tue Apr 08 11:13:31 ICT 2025
-sdk.dir=/Users/sonnguyen/Library/Android/sdk
+#Wed Aug 21 14:20:12 ICT 2024
+sdk.dir=/Users/huynhdung/Library/Android/sdk

package/package.json

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

package/build/ios/Debug-iphonesimulator/Compose Kits.app/PkgInfo

@@ -1 +0,0 @@
-APPL????

package/build/ios/Debug-iphonesimulator/Compose Kits.app/_CodeSignature/CodeResources

@@ -1,271 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>files</key>
-	<dict>
-		<key>AppIcon60x60@2x.png</key>
-		<data>
-		l0tZNqHIXLQHAlddMsJPE72bYn0=
-		</data>
-		<key>AppIcon76x76@2x~ipad.png</key>
-		<data>
-		0KnC4u0atM5/TWAEI8nQZzbUNoM=
-		</data>
-		<key>Assets.car</key>
-		<data>
-		PkGEFZiRCErjqHuD0soq+Ab+F/E=
-		</data>
-		<key>Compose Kits.debug.dylib</key>
-		<data>
-		HDMQimPQYyRCY6LL/ca9+0YzQJo=
-		</data>
-		<key>Info.plist</key>
-		<data>
-		RDveVfPijoZTuyjsDMGYqT3f1UQ=
-		</data>
-		<key>PkgInfo</key>
-		<data>
-		n57qDP4tZfLD1rCS43W0B4LQjzE=
-		</data>
-		<key>__preview.dylib</key>
-		<data>
-		XdU4VMdW5sZsMWZMB0iYfDUf5kU=
-		</data>
-		<key>compose-resources/font/momosignature.otf</key>
-		<data>
-		mzCKksICl+wu9eQDFbuOdOg2Nm4=
-		</data>
-		<key>compose-resources/font/sfprotext_black.ttf</key>
-		<data>
-		4yY2QXhxUdQcC/IAnVwxo7DMLWI=
-		</data>
-		<key>compose-resources/font/sfprotext_bold.ttf</key>
-		<data>
-		Yy5s6hcbJ25d0fE7FSxwL79WLO4=
-		</data>
-		<key>compose-resources/font/sfprotext_heavy.ttf</key>
-		<data>
-		v8dcVF2+Kox8PW1iI+QqqlzLlDI=
-		</data>
-		<key>compose-resources/font/sfprotext_light.ttf</key>
-		<data>
-		7MjaMsLqxgRMgH6UU3UYC3zaOiA=
-		</data>
-		<key>compose-resources/font/sfprotext_medium.ttf</key>
-		<data>
-		O432GM0j6DhDsWqKMt4d3J3kTfQ=
-		</data>
-		<key>compose-resources/font/sfprotext_regular.ttf</key>
-		<data>
-		aGSkWBaLXmJpgEd2zP9Ztzy1ad8=
-		</data>
-		<key>compose-resources/font/sfprotext_semibold.ttf</key>
-		<data>
-		lWCuQS1zx8mvcjM9tQRktOWXsPk=
-		</data>
-		<key>compose-resources/font/sfprotext_thin.ttf</key>
-		<data>
-		9H29KVLvEvVeTm9zRYYmmGKCMbI=
-		</data>
-		<key>compose-resources/font/sfprotext_ultralight.ttf</key>
-		<data>
-		9QiaRneaqo8m+cp3wK3FbayKGnk=
-		</data>
-	</dict>
-	<key>files2</key>
-	<dict>
-		<key>AppIcon60x60@2x.png</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			KgkeGYNpK9BwfVsT9hJCRngNzTM29qhTSMqfBM+aObk=
-			</data>
-		</dict>
-		<key>AppIcon76x76@2x~ipad.png</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			IetV/yMtySFD3XQIITLzUt/LkZzTvZVD+K3ryBmq2Y0=
-			</data>
-		</dict>
-		<key>Assets.car</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			gb4sd7SAlES3S2+gwHXoXHy7Fq89WbKUsJFFkMtMh/U=
-			</data>
-		</dict>
-		<key>Compose Kits.debug.dylib</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			QCV1Ixg/vN8yGbYAvyFanaTgl4jvstnJMqxQ4cz4nIg=
-			</data>
-		</dict>
-		<key>__preview.dylib</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			Zo+wVW3CV2o3VoDJOHMchZJ15inuaeTau0zv25OHHHQ=
-			</data>
-		</dict>
-		<key>compose-resources/font/momosignature.otf</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			F+KACN9wuF9mWxIVhxWq+PkDcml6zb4ucs5YVSEujZI=
-			</data>
-		</dict>
-		<key>compose-resources/font/sfprotext_black.ttf</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			P6yiqkR05Jp8RbLpL0itO1wuJSRgB/7snI+8HT5bMMY=
-			</data>
-		</dict>
-		<key>compose-resources/font/sfprotext_bold.ttf</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			51IjeHYgu4uhufl/aMXh++ZZ2SzGFDnLgbTO8eyMBUQ=
-			</data>
-		</dict>
-		<key>compose-resources/font/sfprotext_heavy.ttf</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			V91Ol+EfW+Unj3hHdr7ky2gfOpdXAI4A3dtHmkng/JM=
-			</data>
-		</dict>
-		<key>compose-resources/font/sfprotext_light.ttf</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			USMyFRxAk+cdg/dCoK9OvsSOkV7h3J2C6ss7BZen9Dc=
-			</data>
-		</dict>
-		<key>compose-resources/font/sfprotext_medium.ttf</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			x+/F2AN2ZKWUaA8XnlXG+JwiA2bam7jS0MrDUEfHp5U=
-			</data>
-		</dict>
-		<key>compose-resources/font/sfprotext_regular.ttf</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			bVUUwEqBQJpRuPFxYto9fFRCuPi412m1No8lOKbCzPk=
-			</data>
-		</dict>
-		<key>compose-resources/font/sfprotext_semibold.ttf</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			lf1iocm4OI3ZS9MN3Ss1IT/O+g8cPqEmhzWgwrdiO8Q=
-			</data>
-		</dict>
-		<key>compose-resources/font/sfprotext_thin.ttf</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			cRobdX4o3CpLEwUj/OCAlCILWNNt0kVSBSmE+6pczNk=
-			</data>
-		</dict>
-		<key>compose-resources/font/sfprotext_ultralight.ttf</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			p4Vbq779e9H0ggk+MMN6NwR0ubBDLx7lxJStqnO5d9c=
-			</data>
-		</dict>
-	</dict>
-	<key>rules</key>
-	<dict>
-		<key>^.*</key>
-		<true/>
-		<key>^.*\.lproj/</key>
-		<dict>
-			<key>optional</key>
-			<true/>
-			<key>weight</key>
-			<real>1000</real>
-		</dict>
-		<key>^.*\.lproj/locversion.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>1100</real>
-		</dict>
-		<key>^Base\.lproj/</key>
-		<dict>
-			<key>weight</key>
-			<real>1010</real>
-		</dict>
-		<key>^version.plist$</key>
-		<true/>
-	</dict>
-	<key>rules2</key>
-	<dict>
-		<key>.*\.dSYM($|/)</key>
-		<dict>
-			<key>weight</key>
-			<real>11</real>
-		</dict>
-		<key>^(.*/)?\.DS_Store$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>2000</real>
-		</dict>
-		<key>^.*</key>
-		<true/>
-		<key>^.*\.lproj/</key>
-		<dict>
-			<key>optional</key>
-			<true/>
-			<key>weight</key>
-			<real>1000</real>
-		</dict>
-		<key>^.*\.lproj/locversion.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>1100</real>
-		</dict>
-		<key>^Base\.lproj/</key>
-		<dict>
-			<key>weight</key>
-			<real>1010</real>
-		</dict>
-		<key>^Info\.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^PkgInfo$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^embedded\.provisionprofile$</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^version\.plist$</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-	</dict>
-</dict>
-</plist>

package/build/ios/Debug-iphonesimulator/Compose Kits.app.dSYM/Contents/Info.plist

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-	<dict>
-		<key>CFBundleDevelopmentRegion</key>
-		<string>English</string>
-		<key>CFBundleIdentifier</key>
-		<string>com.apple.xcode.dsym.com.myapplication.MyApplication</string>
-		<key>CFBundleInfoDictionaryVersion</key>
-		<string>6.0</string>
-		<key>CFBundlePackageType</key>
-		<string>dSYM</string>
-		<key>CFBundleSignature</key>
-		<string>????</string>
-		<key>CFBundleShortVersionString</key>
-		<string>1.0</string>
-		<key>CFBundleVersion</key>
-		<string>1</string>
-	</dict>
-</plist>