Fix/recomposition (#29)

* removes heavy logic * unfinished * seems to be working for basic cases * ParentName + Computed * fixes * fixes * undoes unnecessary modifications * fixes tests and other validations * undoes unnecessary modifications * upgrades nimbus-core from alpha5 to alpha6 * fixes extra recompositions * fix for detekt
ZupIT · Aug 8, 2022 · d9bc063 · d9bc063
1 parent 370130f
commit d9bc063
Show file tree

Hide file tree

Showing 6 changed files with 110 additions and 8 deletions.
diff --git a/compose-sample/build.gradle.kts b/compose-sample/build.gradle.kts
@@ -23,12 +23,12 @@ dependencies {
     implementation("com.google.android.material:material:1.6.1")
     implementation("androidx.appcompat:appcompat:1.4.2")
     implementation("androidx.constraintlayout:constraintlayout:2.1.4")
-    implementation ("androidx.navigation:navigation-compose:2.5.0")
+    implementation ("androidx.navigation:navigation-compose:2.5.1")
     implementation("androidx.compose.ui:ui:${rootProject.extra["compose_version"]}")
     implementation("androidx.compose.material:material:${rootProject.extra["compose_version"]}")
     implementation("androidx.compose.ui:ui-tooling-preview:${rootProject.extra["compose_version"]}")
-    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.5.0")
-    implementation("androidx.activity:activity-compose:1.5.0")
+    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.5.1")
+    implementation("androidx.activity:activity-compose:1.5.1")
     androidTestImplementation("androidx.compose.ui:ui-test-junit4:${rootProject.extra["compose_version"]}")
     debugImplementation("androidx.compose.ui:ui-tooling:${rootProject.extra["compose_version"]}")
 }

diff --git a/compose-sample/src/main/java/br/com/zup/nimbus/compose/sample/JsonProvider.kt b/compose-sample/src/main/java/br/com/zup/nimbus/compose/sample/JsonProvider.kt
@@ -47,3 +47,73 @@ val json1 = """
       ]
     }
 """.trimIndent()
+
+const val UPDATE_TEST = """{
+  "_:component": "layout:container",
+  "children": [
+    {
+      "_:component": "layout:container",
+      "properties": {
+        "backgroundColor": "@{global.backgroundColor}",
+        "padding": 10
+      },
+      "children": [
+        {
+          "_:component": "layout:container",
+          "children": [
+            {
+              "_:component": "material:text",
+              "properties": {
+                "text": "Row 1"
+              }
+            }
+          ]
+        },
+        {
+          "_:component": "material:button",
+          "properties": {
+            "text": "Change BG to red",
+            "onPress": [
+              {
+                "_:action": "setState",
+                "properties": {
+                  "path": "global.backgroundColor",
+                  "value": "#FF0000"
+                }
+              }
+            ]
+          }
+        }
+      ]
+    },
+    {
+      "_:component": "layout:container",
+      "properties": {
+        "padding": 10
+      },
+      "children": [
+        {
+          "_:component": "material:text",
+          "properties": {
+            "text": "Row 2"
+          }
+        }
+      ]
+    },
+    {
+      "_:component": "layout:container",
+      "properties": {
+        "padding": 10
+      },
+      "children": [
+        {
+          "_:component": "material:text",
+          "properties": {
+            "text": "Row 3"
+          }
+        }
+      ]
+    }
+  ]
+}
+"""
diff --git a/compose-sample/src/main/java/br/com/zup/nimbus/compose/sample/components/NimbusContainer.kt b/compose-sample/src/main/java/br/com/zup/nimbus/compose/sample/components/NimbusContainer.kt
@@ -1,11 +1,30 @@
 package br.com.zup.nimbus.compose.sample.components
 
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.dp
+import br.zup.com.nimbus.compose.ComponentData
+import br.zup.com.nimbus.compose.NimbusTheme
+import com.zup.nimbus.core.deserialization.ComponentDeserializer
+
+private fun getColor(colorString: String): Color {
+    return Color(android.graphics.Color.parseColor(colorString))
+}
 
 @Composable
-fun NimbusContainer(children: @Composable () -> Unit) {
-    Column {
-        children()
+fun NimbusContainer(it: ComponentData) {
+    val logger = NimbusTheme.nimbus.logger
+    val deserializer = ComponentDeserializer(logger, it.node)
+    deserializer.start()
+    val background = deserializer.asStringOrNull("backgroundColor")
+    val padding = deserializer.asDoubleOrNull("padding")
+    var modifier = Modifier.padding((padding ?: 0.0).dp)
+    if (background != null) modifier = modifier.background(color = getColor(background))
+    Column(modifier = modifier) {
+        it.children()
     }
 }
diff --git a/compose-sample/src/main/java/br/com/zup/nimbus/compose/sample/components/library.kt b/compose-sample/src/main/java/br/com/zup/nimbus/compose/sample/components/library.kt
@@ -4,7 +4,7 @@ import androidx.compose.runtime.Composable
 import br.zup.com.nimbus.compose.ComponentLibrary
 
 val layoutLib = ComponentLibrary("layout")
-    .add("container") @Composable { NimbusContainer(it.children) }
+    .add("container") @Composable { NimbusContainer(it) }
 
 val customLib = ComponentLibrary("custom")
     .add("text") @Composable { NimbusText(it) }

diff --git a/compose/build.gradle.kts b/compose/build.gradle.kts
@@ -20,6 +20,7 @@ dependencies {
     implementation("com.google.android.material:material:1.6.1")
     implementation("androidx.appcompat:appcompat:1.4.2")
     implementation("androidx.constraintlayout:constraintlayout:2.1.4")
+    implementation("androidx.compose.runtime:runtime:${rootProject.extra["compose_version"]}")
     implementation("androidx.compose.ui:ui:${rootProject.extra["compose_version"]}")
     implementation("androidx.compose.material:material:${rootProject.extra["compose_version"]}")
     implementation("androidx.compose.ui:ui-tooling-preview:${rootProject.extra["compose_version"]}")

diff --git a/compose/src/main/java/br/zup/com/nimbus/compose/ComponentData.kt b/compose/src/main/java/br/zup/com/nimbus/compose/ComponentData.kt
@@ -1,10 +1,22 @@
 package br.zup.com.nimbus.compose
 
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Immutable
 import com.zup.nimbus.core.tree.ServerDrivenNode
 
+@Immutable
 class ComponentData(
     val node: ServerDrivenNode,
     val parent: ServerDrivenNode?,
     val children: @Composable () -> Unit,
-)
+) {
+    private val hash: Int = node.properties?.hashCode() ?: 0
+
+    override fun hashCode(): Int {
+        return hash
+    }
+
+    override fun equals(other: Any?): Boolean {
+        return if (other is ComponentData) other.hashCode() == hash else false
+    }
+}