@momo-kits/native-kits 0.162.2-lottie.1-debug → 0.162.2-lottie.2-debug

package/compose/build.gradle.kts

@@ -40,7 +40,7 @@ kotlin {
     }
 
     cocoapods {
-        version = "0.162.2-lottie.1-debug"
+        version = "0.162.2-lottie.2-debug"
         summary = "IOS Shared module"
         homepage = "https://momo.vn"
         ios.deploymentTarget = "15.0"

package/compose/compose.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
     spec.name                     = 'compose'
-    spec.version                  = '0.162.2-beta.20'
+    spec.version                  = '0.162.2-lottie.1'
     spec.homepage                 = 'https://momo.vn'
     spec.source                   = { :http=> ''}
     spec.authors                  = ''

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

@@ -9,7 +9,6 @@ import android.os.Build
 import androidx.compose.foundation.layout.Box
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.key
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.NativePaint
@@ -80,12 +79,11 @@ actual fun LottieAnimation(
     placedAsOverlay: Boolean,
     iterations: Int,
     isPlaying: Boolean,
-    restartKey: Any?,
     modifier: Modifier,
     useCompose: Boolean
 ) {
     if (useCompose) {
-        ComposeLottieAnimation(path, tintColor, bgColor, iterations, isPlaying, restartKey, modifier)
+        ComposeLottieAnimation(path, tintColor, bgColor, iterations, isPlaying, modifier)
         return
     }
 
@@ -114,17 +112,15 @@ actual fun LottieAnimation(
     )
 
     // LottieConstants.IterateForever == Int.MAX_VALUE == LottieIterateForever sentinel.
-    // key(restartKey) replays from frame 0; restartOnPlay = false makes isPlaying resume.
-    key(restartKey) {
-        LottieAnimation(
-            composition = composition,
-            iterations = iterations,
-            isPlaying = isPlaying,
-            restartOnPlay = false,
-            dynamicProperties = if (tintColor != null) dynamicProperties else null,
-            modifier = modifier
-        )
-    }
+    // restartOnPlay = false makes isPlaying resume from the current frame.
+    LottieAnimation(
+        composition = composition,
+        iterations = iterations,
+        isPlaying = isPlaying,
+        restartOnPlay = false,
+        dynamicProperties = if (tintColor != null) dynamicProperties else null,
+        modifier = modifier
+    )
 }
 
 actual fun NativePaint.setColor(color: Color){

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

@@ -6,7 +6,6 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.key
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import io.github.alexzhirkevich.compottie.ExperimentalCompottieApi
@@ -25,7 +24,6 @@ internal fun ComposeLottieAnimation(
     bgColor: Color?,
     iterations: Int,
     isPlaying: Boolean,
-    restartKey: Any?,
     modifier: Modifier,
 ) {
     val json = readJson(path)
@@ -51,16 +49,13 @@ internal fun ComposeLottieAnimation(
     }
 
     // Our sentinel LottieIterateForever == Compottie.IterateForever (both Int.MAX_VALUE).
-    // key(restartKey) recreates the animation state so a new key replays from frame 0;
-    // restartOnPlay = false makes isPlaying resume from the current frame instead.
-    val lottieState = key(restartKey) {
-        animateLottieCompositionAsState(
-            composition = composition,
-            iterations = iterations,
-            isPlaying = isPlaying,
-            restartOnPlay = false,
-        )
-    }
+    // restartOnPlay = false makes isPlaying resume from the current frame.
+    val lottieState = animateLottieCompositionAsState(
+        composition = composition,
+        iterations = iterations,
+        isPlaying = isPlaying,
+        restartOnPlay = false,
+    )
 
     Box(modifier.background(bgColor ?: Color.Transparent)) {
         Image(

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

@@ -53,9 +53,8 @@ expect fun LottieAnimation(
     bgColor: Color? = null,
     placedAsOverlay: Boolean = false,
     iterations: Int = LottieIterateForever,
-    // isPlaying pauses/resumes from the current frame; assign a new restartKey to replay from frame 0.
+    // Pauses/resumes from the current frame; auto-plays when true (the default).
     isPlaying: Boolean = true,
-    restartKey: Any? = null,
     modifier: Modifier = Modifier,
     useCompose: Boolean = false
 )

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

@@ -98,12 +98,11 @@ actual fun LottieAnimation(
     placedAsOverlay: Boolean,
     iterations: Int,
     isPlaying: Boolean,
-    restartKey: Any?,
     modifier: Modifier,
     useCompose: Boolean
 ) {
     if (useCompose) {
-        ComposeLottieAnimation(path, tintColor, bgColor, iterations, isPlaying, restartKey, modifier)
+        ComposeLottieAnimation(path, tintColor, bgColor, iterations, isPlaying, modifier)
         return
     }
 
@@ -118,19 +117,12 @@ actual fun LottieAnimation(
         animation = CompatibleAnimation(name = "compose-resources/composeResources/vn.momo.compose.resources/".plus(path), subdirectory = null, NSBundle.mainBundle)
     }
 
-    // Pause / resume from the current frame.
+    // Auto-play on attach; pause / resume from the current frame as isPlaying changes.
     LaunchedEffect(animationView.value, isPlaying) {
         val view = animationView.value ?: return@LaunchedEffect
         if (isPlaying) view.play() else view.pause()
     }
 
-    // Replay from frame 0 whenever restartKey changes (and on first attach).
-    LaunchedEffect(animationView.value, restartKey) {
-        val view = animationView.value ?: return@LaunchedEffect
-        view.stop()
-        if (isPlaying) view.play()
-    }
-
     when (val value = animation) {
         null -> {
             Box(modifier)

package/gradle.properties

@@ -18,7 +18,7 @@ kotlin.apple.xcodeCompatibility.nowarn=true
 name="ComposeKits"
 group=vn.momo.kits
 artifact.id=kits
-version=0.162.2-lottie.1
+version=0.162.2-lottie.2
 
 repo=GitLab
 url=https://gitlab.mservice.com.vn/api/v4/projects/5400/packages/maven

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.162.2-lottie.1-debug",
+  "version": "0.162.2-lottie.2-debug",
   "private": false,
   "dependencies": {},
   "devDependencies": {},