From f16d637b0c07563eb12b4f5d8eb6631fc2692720 Mon Sep 17 00:00:00 2001
From: deviant <lubotin@gmail.com>
Date: Tue, 24 Oct 2017 16:12:22 +0300
Subject: [PATCH] binding initialization fix

---
 .../main/java/ds/bindingtools/demo/MainActivity.kt  |  3 +++
 .../main/java/ds/bindingtools/demo/MainViewModel.kt |  9 +++++----
 app/src/main/res/layout/activity_main.xml           |  2 +-
 lib/src/main/java/ds/bindingtools/ViewBindings.kt   | 13 ++++++++-----
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/ds/bindingtools/demo/MainActivity.kt b/app/src/main/java/ds/bindingtools/demo/MainActivity.kt
index c820a32..de351bc 100644
--- a/app/src/main/java/ds/bindingtools/demo/MainActivity.kt
+++ b/app/src/main/java/ds/bindingtools/demo/MainActivity.kt
@@ -2,6 +2,7 @@ package ds.bindingtools.demo
 
 import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
+import android.util.Log
 import ds.bindingtools.bind
 import ds.bindingtools.bundle
 import ds.bindingtools.startActivity
@@ -12,6 +13,7 @@ import kotlinx.android.synthetic.main.activity_main.*
 class MainActivity : AppCompatActivity() {
 
     private val leaksDetector = ByteArray(50_000_000) { 127 }
+    private val TAG = javaClass.simpleName
 
     private lateinit var prefs: Prefs
 
@@ -21,6 +23,7 @@ class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
+        Log.v(TAG, "onCreate")
         prefs = Prefs(this)
 
         bindViews()
diff --git a/app/src/main/java/ds/bindingtools/demo/MainViewModel.kt b/app/src/main/java/ds/bindingtools/demo/MainViewModel.kt
index 7d79364..0e28ffb 100644
--- a/app/src/main/java/ds/bindingtools/demo/MainViewModel.kt
+++ b/app/src/main/java/ds/bindingtools/demo/MainViewModel.kt
@@ -4,19 +4,20 @@ import android.os.Handler
 import ds.bindingtools.Bindable
 import ds.bindingtools.binding
 
+
 object MainViewModel : Bindable {
-    var text: String by binding("")
-    var buttonText: String by binding()
+    var text: String by binding()
+    var buttonText: String by binding("...")
 
     fun sayHello() {
         if (text.isEmpty())
             text = "Hello, World!"
-        buttonText = "navigate"
     }
 
     fun onBindClick() {
         Handler().postDelayed({
-            buttonText = "ooops"
+            buttonText = "navigate"
         }, 2000)
     }
+
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 1c4bed0..738222b 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -18,7 +18,7 @@
         android:id="@+id/navigateButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="\???"/>
+        />
 
     <Button
         android:id="@+id/bindButton"
diff --git a/lib/src/main/java/ds/bindingtools/ViewBindings.kt b/lib/src/main/java/ds/bindingtools/ViewBindings.kt
index 2baa816..7f56b32 100644
--- a/lib/src/main/java/ds/bindingtools/ViewBindings.kt
+++ b/lib/src/main/java/ds/bindingtools/ViewBindings.kt
@@ -25,10 +25,11 @@ class BindingProperty<T : Any?>(private var value: T?, private val type: Class<T
         ensureUiThread()
         val getter = Binder.getAccessors<T>(thisRef, property)?.getter
         if (getter != null) {
+            log("${property.name}.get: filling from getter")
             value = getter.invoke()
         }
         val value = value ?: default(type)
-        log("get value [$value]")
+        log("get: value [$value]")
         return value
     }
 
@@ -36,10 +37,10 @@ class BindingProperty<T : Any?>(private var value: T?, private val type: Class<T
         ensureUiThread()
         val oldValue = this.value
         if (oldValue != value) {
-            log("internal value has been set")
+            log("${property.name}.set: internal value [$value] has been set")
             this.value = value
             Binder.getAccessors<T>(thisRef, property)?.setters?.forEach {
-                log("set value [$value]")
+                log("set: value [$value]")
                 it(value)
             }
         }
@@ -85,6 +86,9 @@ inline fun <reified T : Boolean> Bindable.bind(prop: KProperty0<T>, view: Compou
 fun <T : Any?> Bindable.bind(prop: KProperty0<T>, setter: (T) -> Unit, getter: (() -> T)? = null) {
     Binder.getOrPutAccessors<T>(this, prop).let {
         log("bind ${prop.name}")
+        log("set default for ${prop.name}: ${prop.get()}")
+        setter(prop.get())  // initialize view
+
         it.setters += setter
         if (getter != null)
             if (it.getter == null)
@@ -92,7 +96,6 @@ fun <T : Any?> Bindable.bind(prop: KProperty0<T>, setter: (T) -> Unit, getter: (
             else
                 error("Only one getter per property allowed")
 
-        setter(prop.get())  // initialize view
     }
 }
 
@@ -173,7 +176,7 @@ private object Binder {
 }
 
 private fun log(message: String) {
-    if (BuildConfig.DEBUG) Log.v("DATABINDING", message)
+    /*if (BuildConfig.DEBUG) */Log.v("DATABINDING", message)
 }
 
 interface Bindable
\ No newline at end of file