diff --git a/app/src/main/res/raw/mock.json b/app/src/main/res/raw/mock.json index 4526ad9..24591cd 100644 --- a/app/src/main/res/raw/mock.json +++ b/app/src/main/res/raw/mock.json @@ -7503,11 +7503,13 @@ "layoutId": "text_1", "width": "MATCH_PARENT", "height": "WRAP_CONTENT", - "rowConstraints": { - "rowWeight": { - "weight": 4 - }, - "verticalAlignment": "Bottom" + "parentConstraints": { + "rowConstraints": { + "rowWeight": { + "weight": 4 + }, + "verticalAlignment": "Bottom" + } }, "backgroundColor": "#983643" } @@ -7518,9 +7520,11 @@ "layoutId": "text_2", "width": "MATCH_PARENT", "height": "WRAP_CONTENT", - "rowConstraints": { - "rowWeight": { - "weight": 2 + "parentConstraints": { + "rowConstraints": { + "rowWeight": { + "weight": 2 + } } }, "backgroundColor": "#123874" diff --git a/navi-uitron/src/main/java/com/navi/uitron/model/ui/RowProperty.kt b/navi-uitron/src/main/java/com/navi/uitron/model/ui/RowProperty.kt index 5ae84d6..d1d5ee4 100644 --- a/navi-uitron/src/main/java/com/navi/uitron/model/ui/RowProperty.kt +++ b/navi-uitron/src/main/java/com/navi/uitron/model/ui/RowProperty.kt @@ -34,6 +34,10 @@ data class ArrangementData( val spacingValue: Int? = null ) +@Parcelize +data class ParentConstraints( + var rowConstraints: RowConstraints? = null +): Parcelable @Parcelize data class RowConstraints( diff --git a/navi-uitron/src/main/java/com/navi/uitron/model/ui/UiTronView.kt b/navi-uitron/src/main/java/com/navi/uitron/model/ui/UiTronView.kt index b2e1d44..aaced9f 100644 --- a/navi-uitron/src/main/java/com/navi/uitron/model/ui/UiTronView.kt +++ b/navi-uitron/src/main/java/com/navi/uitron/model/ui/UiTronView.kt @@ -38,7 +38,7 @@ open class BaseProperty( var backgroundColor: String? = null, var shape: UiTronShape? = null, var statesMap: Map? = null, - var rowConstraints: RowConstraints? = null, + var parentConstraints: ParentConstraints? = null, @SerializedName("visible", alternate = ["isVisible"]) var visible: Boolean? = null, var alpha: Float? = null, @@ -57,7 +57,7 @@ open class BaseProperty( property?.backgroundColor?.let { backgroundColor = it } property?.shape?.let { shape = it } property?.statesMap?.let { statesMap = it } - property?.rowConstraints?.let { rowConstraints = it } + property?.parentConstraints?.let { parentConstraints = it } property?.visible?.let { visible = it } property?.alpha?.let { alpha = it } property?.borderStrokeData?.let { borderStrokeData = it } diff --git a/navi-uitron/src/main/java/com/navi/uitron/render/RowRenderer.kt b/navi-uitron/src/main/java/com/navi/uitron/render/RowRenderer.kt index a97bee7..5f45d42 100644 --- a/navi-uitron/src/main/java/com/navi/uitron/render/RowRenderer.kt +++ b/navi-uitron/src/main/java/com/navi/uitron/render/RowRenderer.kt @@ -102,12 +102,12 @@ class RowRenderer( if (childrenView.data.isNullOrEmpty()) { uiTronRenderer.Render( listOf(childrenView), - constraintsToModifier(childrenView.property?.rowConstraints) + constraintsToModifier(childrenView.property?.parentConstraints?.rowConstraints) ) } else { UiTronRenderer(childrenView.data, uiTronViewModel).Render( listOf(childrenView), - constraintsToModifier(childrenView.property?.rowConstraints) + constraintsToModifier(childrenView.property?.parentConstraints?.rowConstraints) ) } } @@ -126,7 +126,7 @@ class RowRenderer( if (childrenView.data.isNullOrEmpty()) { uiTronRenderer.Render( listOf(childrenView), - constraintsToModifier(childrenView.property?.rowConstraints) + constraintsToModifier(childrenView.property?.parentConstraints?.rowConstraints) ) } else { UiTronRenderer( @@ -134,7 +134,7 @@ class RowRenderer( uiTronViewModel ).Render( listOf(childrenView), - constraintsToModifier(childrenView.property?.rowConstraints) + constraintsToModifier(childrenView.property?.parentConstraints?.rowConstraints) ) } }