From 49615c93a56e701b2b9ae8e42eb3834ea5e96280 Mon Sep 17 00:00:00 2001 From: Soumya Ranjan Patra Date: Wed, 6 Mar 2024 17:33:17 +0530 Subject: [PATCH] TP-59699 | lottie version bummp (#372) --- gradle/libs.versions.toml | 2 +- .../src/main/java/com/navi/uitron/render/LottieRenderer.kt | 7 +++++-- navi-uitron/src/main/java/com/navi/uitron/utils/Ext.kt | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c4e6270..b8051d7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -24,7 +24,7 @@ hilt = "2.48" junit = "4.13.2" kotlin = "1.9.22" ksp = "1.9.22-1.0.17" -lottie = "6.1.0" +lottie = "6.4.0" mvel2 = "2.4.15.Final" navi-alfred = "1.0.20" navigation-compose = "2.6.0" diff --git a/navi-uitron/src/main/java/com/navi/uitron/render/LottieRenderer.kt b/navi-uitron/src/main/java/com/navi/uitron/render/LottieRenderer.kt index 47976ee..2ea6467 100644 --- a/navi-uitron/src/main/java/com/navi/uitron/render/LottieRenderer.kt +++ b/navi-uitron/src/main/java/com/navi/uitron/render/LottieRenderer.kt @@ -18,6 +18,7 @@ import androidx.compose.ui.draw.alpha import androidx.compose.ui.layout.layoutId import androidx.compose.ui.platform.LocalView import androidx.compose.ui.unit.dp +import com.airbnb.lottie.AsyncUpdates import com.airbnb.lottie.LottieComposition import com.airbnb.lottie.compose.LottieAnimation import com.airbnb.lottie.compose.LottieCompositionSpec @@ -146,7 +147,8 @@ class LottieRenderer : Renderer { composition = composition, progress = { it }, modifier = modifier, - contentScale = getContentScale(property.contentScale) + contentScale = getContentScale(property.contentScale), + asyncUpdates = AsyncUpdates.ENABLED, ) } ?: run { @@ -154,7 +156,8 @@ class LottieRenderer : Renderer { composition = composition, iterations = uiTronLottieData?.iterations ?: 1, modifier = modifier, - contentScale = getContentScale(property.contentScale) + contentScale = getContentScale(property.contentScale), + asyncUpdates = AsyncUpdates.ENABLED, ) } } diff --git a/navi-uitron/src/main/java/com/navi/uitron/utils/Ext.kt b/navi-uitron/src/main/java/com/navi/uitron/utils/Ext.kt index 7f40d1e..06537a3 100644 --- a/navi-uitron/src/main/java/com/navi/uitron/utils/Ext.kt +++ b/navi-uitron/src/main/java/com/navi/uitron/utils/Ext.kt @@ -604,7 +604,7 @@ fun String?.toDoubleWithSafe(): Double { } } -fun getTextAlignment(textAlignment: String?): TextAlign? { +fun getTextAlignment(textAlignment: String?): TextAlign { return when (textAlignment) { TextAlign.Start.toString() -> TextAlign.Start TextAlign.End.toString() -> TextAlign.End @@ -612,7 +612,7 @@ fun getTextAlignment(textAlignment: String?): TextAlign? { TextAlign.Left.toString() -> TextAlign.Left TextAlign.Right.toString() -> TextAlign.Right TextAlign.Justify.toString() -> TextAlign.Justify - else -> null + else -> TextAlign.Unspecified } }