From d53fa6fbe845d18f9a49ea776b9bc7e2869dd2ea Mon Sep 17 00:00:00 2001 From: Soumya Ranjan Patra Date: Tue, 21 Jan 2025 19:34:34 +0530 Subject: [PATCH] NTP-30527 | Divider Property Int to Float (#675) --- .../main/java/com/navi/uitron/model/ui/DividerProperty.kt | 6 +++--- .../main/java/com/navi/uitron/render/DividerRenderer.kt | 8 +++----- .../src/main/java/com/navi/uitron/utils/UiTronBrush.kt | 3 ++- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/navi-uitron/src/main/java/com/navi/uitron/model/ui/DividerProperty.kt b/navi-uitron/src/main/java/com/navi/uitron/model/ui/DividerProperty.kt index 44a4275..e56084e 100644 --- a/navi-uitron/src/main/java/com/navi/uitron/model/ui/DividerProperty.kt +++ b/navi-uitron/src/main/java/com/navi/uitron/model/ui/DividerProperty.kt @@ -9,9 +9,9 @@ package com.navi.uitron.model.ui data class DividerProperty( var color: String? = null, - var thickness: Int? = null, - var separation: Int? = null, - var dashedAtomicWidth: Int? = null, + var thickness: Float? = null, + var separation: Float? = null, + var dashedAtomicWidth: Float? = null, ) : BaseProperty() { override fun copyNonNullFrom(property: BaseProperty?) { super.copyNonNullFrom(property) diff --git a/navi-uitron/src/main/java/com/navi/uitron/render/DividerRenderer.kt b/navi-uitron/src/main/java/com/navi/uitron/render/DividerRenderer.kt index 494d8df..6d91688 100644 --- a/navi-uitron/src/main/java/com/navi/uitron/render/DividerRenderer.kt +++ b/navi-uitron/src/main/java/com/navi/uitron/render/DividerRenderer.kt @@ -56,7 +56,7 @@ class DividerRenderer : Renderer { } if (property.visible.orTrue()) { val rootView = LocalView.current.rootView - if (property.separation == null || property.separation == 0) { + if (property.separation == null || property.separation == 0f) { Divider( modifier = if (UiTronSdkManager.isModifierBuilderEnabled()) { @@ -102,10 +102,8 @@ class DividerRenderer : Renderer { val pathEffect = PathEffect.dashPathEffect( floatArrayOf( - property.dashedAtomicWidth?.toFloat() - ?: property.separation?.times(2f) - ?: 0f, - property.separation?.toFloat() ?: 0f, + property.dashedAtomicWidth ?: property.separation?.times(2f) ?: 0f, + property.separation ?: 0f, ), 0f, ) diff --git a/navi-uitron/src/main/java/com/navi/uitron/utils/UiTronBrush.kt b/navi-uitron/src/main/java/com/navi/uitron/utils/UiTronBrush.kt index 3a8b978..1d80b99 100644 --- a/navi-uitron/src/main/java/com/navi/uitron/utils/UiTronBrush.kt +++ b/navi-uitron/src/main/java/com/navi/uitron/utils/UiTronBrush.kt @@ -203,8 +203,9 @@ class UiTronBrush( } } - private val colorData: Array>? = + private val colorData: Array> = brushData?.colorStops?.map { Pair(it.first, it.second.hexToComposeColor) }?.toTypedArray() + ?: arrayOf(Pair(0f, Color.Transparent), Pair(1f, Color.Transparent)) private val processedColorStops = colorData as Array> private val tileMode = getTileMode(brushData?.tileMode) private val gradientColors = processedColorStops.map { it.second }