Fix annotation detection in ReactiveComponent

Author: Simon3244

build.gradle.kts

@@ -11,13 +11,16 @@ repositories {
 
 dependencies {
 
+    implementation("org.jetbrains.kotlin:kotlin-stdlib")
+    implementation("org.jetbrains.kotlin:kotlin-reflect")
 
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
 
 tasks.test {
     useJUnitPlatform()
 }
+
 kotlin {
     jvmToolchain(17)
 }

gradlew

@@ -7,4 +7,4 @@ pluginManagement {
 
 rootProject.name = "void-ui"
 
-include("test-mod")
+//include("test-mod")

settings.gradle.kts

@@ -1,6 +1,9 @@
 package com.neptuneclient.voidui
 
 import com.neptuneclient.voidui.rendering.Renderer
+import com.neptuneclient.voidui.ui.Component
+import com.neptuneclient.voidui.ui.ReactiveComponent
+import com.neptuneclient.voidui.ui.State
 
 /**
  * The main class of VoidUI. It is mostly used to contain settings and singleton instances of other classes
@@ -14,4 +17,25 @@ class VoidUI
  */
 constructor(val renderer: Renderer) {
 
+}
+
+class TestComponent : ReactiveComponent() {
+    @State
+    public var testState = 5
+
+    override fun build(): Component {
+        println("Building TestComponent")
+        return this
+    }
+}
+
+fun main(args: Array<String>) {
+
+    val component = TestComponent().build()
+    if (component is TestComponent) {
+        println("TestComponent.testState: ${component.testState}")
+        component.testState = 1
+        println("TestComponent.testState: ${component.testState}")
+    }
+
 }

src/main/kotlin/com/neptuneclient/voidui/VoidUI.kt

@@ -1,20 +1,31 @@
 package com.neptuneclient.voidui.ui
 
 import kotlin.properties.Delegates
+import kotlin.reflect.KMutableProperty
+import kotlin.reflect.full.declaredMemberProperties
+import kotlin.reflect.full.findAnnotation
+import kotlin.reflect.jvm.javaField
 
 /**
  * @see Component
  */
 abstract class ReactiveComponent : Component() {
 
     init {
-        for (field in javaClass.declaredFields) {
-            if (!field.isAnnotationPresent(State::class.java)) continue
-            val fieldObserver = Delegates.observable(field.get(this)) { _, _, new ->
+        for (member in this::class.declaredMemberProperties) {
+            println("Member $member")
+            println("Member annotations size: ${member.annotations.size}")
+            if (member.findAnnotation<State>() == null) continue
+            println("Member $member is a state")
+            val memberObserver = Delegates.observable(member.getter.call(this)) { _, _, new ->
+                println("Member $member changed to $new")
                 this.build()
                 // TODO do proper rebuilding in the component tree
             }
-            field.set(this, fieldObserver)
+
+            if (member is KMutableProperty<*>) {
+                member.setter.call(this, memberObserver)
+            }
         }
     }
 

src/main/kotlin/com/neptuneclient/voidui/ui/ReactiveComponent.kt

@@ -0,0 +1,18 @@
+package com.neptuneclient.voidui.tests
+
+import com.neptuneclient.voidui.rendering.Renderer
+import java.awt.Color
+
+class MockRenderer : Renderer {
+    override fun beginFrame() {
+        println("beginFrame")
+    }
+
+    override fun endFrame() {
+        println("endFrame")
+    }
+
+    override fun rectangle(x: Float, y: Float, width: Float, height: Float, color: Color) {
+        println("rectangle: x=$x, y=$y, width=$width, height=$height, color=$color")
+    }
+}

src/test/kotlin/com/neptuneclient/voidui/tests/MockRenderer.kt

@@ -0,0 +1,42 @@
+package com.neptuneclient.voidui.tests
+
+import com.neptuneclient.voidui.VoidUI
+import com.neptuneclient.voidui.ui.Component
+import com.neptuneclient.voidui.ui.ReactiveComponent
+import com.neptuneclient.voidui.ui.Screen
+import com.neptuneclient.voidui.ui.State
+import org.junit.jupiter.api.Test
+
+class VoidScreenTest(void: VoidUI) : Screen(void) {
+    override fun build(): Component {
+        return TestComponent()
+    }
+}
+
+class TestComponent : ReactiveComponent() {
+    @State
+    public var testState = 5
+
+    override fun build(): Component {
+        println("Building TestComponent")
+        return this
+    }
+}
+
+object Tests {
+    @Test
+    fun testState() {
+        val renderer = MockRenderer()
+        val void = VoidUI(renderer)
+        val screen = VoidScreenTest(void)
+
+        val screen_component = screen.build()
+        val component = screen_component.build()
+        if (component is TestComponent) {
+            println("TestComponent.testState: ${component.testState}")
+            component.testState = 1
+            println("TestComponent.testState: ${component.testState}")
+        }
+
+    }
+}