From d3922a43bb3bfc24c6adcb173c93e05986cff428 Mon Sep 17 00:00:00 2001 From: Kishan Kumar Date: Wed, 17 May 2023 13:28:31 +0530 Subject: [PATCH] TP-29127 | content scale type added for lottie render (#61) * TP-29127 | content scale type added for lottiee render --- .../main/java/com/navi/uitron/model/ui/LottieProperty.kt | 4 +++- .../main/java/com/navi/uitron/render/LottieRenderer.kt | 9 ++++++--- navi-uitron/src/main/java/com/navi/uitron/utils/Ext.kt | 3 +-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/navi-uitron/src/main/java/com/navi/uitron/model/ui/LottieProperty.kt b/navi-uitron/src/main/java/com/navi/uitron/model/ui/LottieProperty.kt index 2df4ef9..e90e55c 100644 --- a/navi-uitron/src/main/java/com/navi/uitron/model/ui/LottieProperty.kt +++ b/navi-uitron/src/main/java/com/navi/uitron/model/ui/LottieProperty.kt @@ -7,4 +7,6 @@ package com.navi.uitron.model.ui -class LottieProperty : BaseProperty() +data class LottieProperty( + val contentScale: String? = null +) : BaseProperty() \ No newline at end of file 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 2eb512b..a99c1ef 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 @@ -33,6 +33,7 @@ import com.navi.uitron.utils.KEY_UI_TRON_DATA import com.navi.uitron.utils.KEY_PROPERTY import com.navi.uitron.viewmodel.UiTronViewModel import customClickable +import getContentScale import orFalse import orTrue import setHeight @@ -106,13 +107,15 @@ class LottieRenderer: Renderer { LottieAnimation( composition = composition, progress = { it }, - modifier = modifier + modifier = modifier, + contentScale = getContentScale(property.contentScale) ) - }?: run { + } ?: run { LottieAnimation( composition = composition, iterations = uiTronLottieData?.iterations ?: 1, - modifier = modifier + modifier = modifier, + contentScale = getContentScale(property.contentScale) ) } uiTronLottieData?.placeholderIcon?.takeIf { progress == 0f }?.let { 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 0d2adaf..b348a3b 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 @@ -533,5 +533,4 @@ fun getKeyboardOptions(keyboardOptions: OutlinedTextFieldKeyBoardOptions?): Keyb keyboardType = KeyboardUtil.getKeyboardType(keyboardOptions?.keyboardType), imeAction = KeyboardUtil.getImeAction(keyboardOptions?.imeAction) ) -} - +} \ No newline at end of file