Add OmegaBindView

anton-knyazev · anton-knyazev · commit ec217876dd7f · 2020-12-28T15:12:20.000+03:00
Minor fixes
Add sample
diff --git a/app/src/main/java/com/omega_r/bind/app/MainActivity.kt b/app/src/main/java/com/omega_r/bind/app/MainActivity.kt
@@ -2,17 +2,41 @@ package com.omega_r.bind.app
 
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import android.util.SparseArray
+import android.view.View
+import android.view.ViewGroup
+import android.view.ViewGroup.LayoutParams.MATCH_PARENT
+import com.omega_r.bind.OmegaAutoAdapter
+import com.omega_r.bind.OmegaBindView
 import com.omega_r.bind.model.BindModel
-import com.omega_r.bind.model.binders.bindString
+import com.omega_r.bind.model.binders.*
 
 class MainActivity : AppCompatActivity() {
 
     private val bindModel = BindModel.create<String> {
         bindString(R.id.NO_DEBUG)
+        bindVisible(R.id.NO_DEBUG) {
+            true
+        }
+        bindMultiCustom(R.id.NO_DEBUG, R.id.NO_DEBUG) { sparseArray: SparseArray<View>, s: String ->
+            sparseArray[R.id.NO_DEBUG]
+        }
     }
 
+    private val adapter = OmegaAutoAdapter.create(R.layout.activity_main, bindModel)
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
+
+        val bindView = OmegaBindView.create<String>(this, R.layout.activity_main) {
+            bindString(R.id.textview_hello)
+        }
+
+
+        bindView.bind("Bind: Hello World!")
+
+        addContentView(bindView, ViewGroup.LayoutParams(MATCH_PARENT, MATCH_PARENT))
     }
+
 }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -7,9 +7,10 @@
     tools:context=".MainActivity">
 
     <TextView
+        android:id="@+id/textview_hello"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Hello World!"
+        tools:text="Hello World!"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
diff --git a/library/src/main/java/com/omega_r/bind/OmegaBindView.kt b/library/src/main/java/com/omega_r/bind/OmegaBindView.kt
@@ -0,0 +1,46 @@
+package com.omega_r.bind
+
+import android.content.Context
+import android.util.AttributeSet
+import android.widget.FrameLayout
+import androidx.annotation.LayoutRes
+import com.omega_r.bind.model.BindModel
+
+class OmegaBindView<M> @JvmOverloads constructor(
+    context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0,
+) : FrameLayout(context, attrs, defStyleAttr) {
+
+    companion object {
+
+        fun <M> create(context: Context, @LayoutRes layoutRes: Int, bindModel: BindModel<M>): OmegaBindView<M> {
+            return OmegaBindView<M>(context).apply {
+                setBindModel(layoutRes, bindModel)
+            }
+        }
+
+        fun <M> create(
+            context: Context,
+            @LayoutRes layoutRes: Int,
+            parentBindModel: BindModel<M>? = null,
+            builder: BindModel.Builder<M>.() -> Unit,
+        ): OmegaBindView<M> {
+            val bindModel = BindModel.create(parentBindModel, builder)
+            return create(context, layoutRes, bindModel)
+        }
+
+    }
+
+    private var bindModel: BindModel<M>? = null
+
+    fun setBindModel(@LayoutRes layoutRes: Int, bindModel: BindModel<M>) {
+        removeAllViews()
+        inflate(context, layoutRes, this)
+        bindModel.onViewCreated(this)
+        this.bindModel = bindModel
+    }
+
+    fun bind(item: M) {
+        bindModel?.bind(this, item)
+    }
+
+}
diff --git a/library/src/main/java/com/omega_r/bind/model/BindModel.kt b/library/src/main/java/com/omega_r/bind/model/BindModel.kt
@@ -1,7 +1,11 @@
 package com.omega_r.bind.model
 
+import android.app.Activity
 import android.util.SparseArray
 import android.view.View
+import android.view.ViewGroup
+import android.widget.FrameLayout
+import androidx.annotation.LayoutRes
 import com.omega_r.bind.R
 import com.omega_r.bind.model.binders.*
 
@@ -35,6 +39,9 @@ class BindModel<M>(private val list: List<Binder<*, M>>) {
 
     constructor(vararg binder: Binder<*, M>) : this(binder.toList())
 
+    fun onViewCreated(activity: Activity) {
+        onViewCreated(activity.window.decorView)
+    }
 
     fun onViewCreated(view: View) {
         val viewCache = SparseArray<View>()
@@ -57,12 +64,16 @@ class BindModel<M>(private val list: List<Binder<*, M>>) {
                 }
             } else {
                 viewCache.put(id, childView)
-                array[id].forEach { it.dispatchOnCreateView(childView, viewCache) }
+                array[id].forEach { it.dispatchOnViewCreated(childView, viewCache) }
             }
         }
 
     }
 
+    fun bind(activity: Activity, item: M) {
+        bind(activity.window.decorView, item)
+    }
+
     fun bind(view: View, item: M) {
         @Suppress("UNCHECKED_CAST")
         val viewCache = view.getTag(R.id.omega_autobind) as SparseArray<View>
diff --git a/library/src/main/java/com/omega_r/bind/model/binders/Binder.kt b/library/src/main/java/com/omega_r/bind/model/binders/Binder.kt
@@ -10,12 +10,12 @@ abstract class Binder<V : View, M> {
 
     var viewOptionally: Boolean = false
 
-    open fun dispatchOnCreateView(view: View, viewCache: SparseArray<View>) {
+    internal open fun dispatchOnViewCreated(view: View, viewCache: SparseArray<View>) {
         @Suppress("UNCHECKED_CAST")
-        onCreateView(view as V)
+        onViewCreated(view as V)
     }
 
-    protected open fun onCreateView(itemView: V) {
+    protected open fun onViewCreated(itemView: V) {
         // nothing
     }
 
diff --git a/library/src/main/java/com/omega_r/bind/model/binders/BinderTextWatcher.kt b/library/src/main/java/com/omega_r/bind/model/binders/BinderTextWatcher.kt
@@ -45,10 +45,10 @@ class BinderTextWatcher<E> : TextWatcher {
         // nothing
     }
 
-    override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+    override fun onTextChanged(text: CharSequence?, start: Int, before: Int, count: Int) {
         if (enabled) {
             item?.let { item ->
-                callbacks.forEach { it(item, s.toString()) }
+                callbacks.forEach { it(item, text.toString()) }
             }
         }
     }
diff --git a/library/src/main/java/com/omega_r/bind/model/binders/ClickBinder.kt b/library/src/main/java/com/omega_r/bind/model/binders/ClickBinder.kt
@@ -11,7 +11,7 @@ open class ClickBinder<M>(
     private val block: (M) -> Unit
 ) : Binder<View, M>() {
 
-    override fun onCreateView(itemView: View) {
+    override fun onViewCreated(itemView: View) {
         val tag = itemView.getTag(R.id.omega_click_bind) as? ClickManager
         if (tag == null) {
             itemView.setTag(R.id.omega_click_bind, ClickManager())
diff --git a/library/src/main/java/com/omega_r/bind/model/binders/MultiBinder.kt b/library/src/main/java/com/omega_r/bind/model/binders/MultiBinder.kt
@@ -5,8 +5,7 @@ import android.view.View
 
 abstract class MultiBinder<V : View, M>(final override val id: Int, vararg ids: Int) : Binder<V, M>() {
 
-    val ids = listOf(id, *ids.toTypedArray())
-
+    private val ids = listOf(id, *ids.toTypedArray())
 
     @Suppress("UNCHECKED_CAST")
     override fun dispatchBind(viewCache: SparseArray<View>, item: M) {
diff --git a/library/src/main/java/com/omega_r/bind/model/binders/RecyclerViewListBinder.kt b/library/src/main/java/com/omega_r/bind/model/binders/RecyclerViewListBinder.kt
@@ -16,8 +16,13 @@ open class RecyclerViewListBinder<M, SM>(
     private val block: BindModel.Builder<SM>.() -> Unit
 ) : Binder<RecyclerView, M>() {
 
-    override fun onCreateView(itemView: RecyclerView) {
-        itemView.adapter = OmegaAutoAdapter.create(layoutRes, callback?.let { Callback(callback) }, parentModel, block)
+    override fun onViewCreated(itemView: RecyclerView) {
+        itemView.adapter = OmegaAutoAdapter.create(
+            layoutRes = layoutRes,
+            callback = callback?.let { Callback(callback) },
+            parentModel = parentModel,
+            block = block
+        )
     }
 
     @Suppress("UNCHECKED_CAST")
diff --git a/library/src/main/java/com/omega_r/bind/model/binders/SpinnerListBinder.kt b/library/src/main/java/com/omega_r/bind/model/binders/SpinnerListBinder.kt
@@ -18,7 +18,7 @@ open class SpinnerListBinder<M, SM>(
     private val converter: (Context, SM, isDropDown: Boolean) -> CharSequence
 ) : Binder<Spinner, M>() {
 
-    override fun onCreateView(itemView: Spinner) {
+    override fun onViewCreated(itemView: Spinner) {
         itemView.adapter = OmegaSpinnerAdapter.CustomAdapter(itemView.context, layoutRes, converter).also {
             it.nonSelectedItem = nonSelectedItem
         }
diff --git a/library/src/main/java/com/omega_r/bind/model/binders/StringBinder.kt b/library/src/main/java/com/omega_r/bind/model/binders/StringBinder.kt
@@ -14,11 +14,7 @@ open class StringBinder<M>(
     override fun bind(itemView: TextView, item: M) = BinderTextWatcher.runTextChangedTransaction(itemView) {
         val obj: Any? = item.findValue(item, properties)
 
-        if (formatter == null) {
-            itemView.text = obj?.toString()
-        } else {
-            itemView.text = formatter.invoke(obj)
-        }
+        itemView.text = if (formatter == null) obj?.toString() else formatter.invoke(obj)
     }
 }
 
diff --git a/library/src/main/java/com/omega_r/bind/model/binders/TextBinder.kt b/library/src/main/java/com/omega_r/bind/model/binders/TextBinder.kt
@@ -7,10 +7,7 @@ import com.omega_r.libs.omegatypes.Text
 import com.omega_r.libs.omegatypes.setText
 import kotlin.reflect.KProperty
 
-open class TextBinder<M>(
-    override val id: Int,
-    private vararg val properties: KProperty<*>
-) : Binder<TextView, M>() {
+open class TextBinder<M>(override val id: Int, private vararg val properties: KProperty<*>) : Binder<TextView, M>() {
 
     override fun bind(itemView: TextView, item: M) = BinderTextWatcher.runTextChangedTransaction(itemView) {
         val text: Text? = item.findValue(item, properties)
diff --git a/library/src/main/java/com/omega_r/bind/model/binders/TextChangedBinder.kt b/library/src/main/java/com/omega_r/bind/model/binders/TextChangedBinder.kt
@@ -5,23 +5,22 @@ import android.view.View
 import android.widget.TextView
 import com.omega_r.bind.model.BindModel
 
-open class TextChangedBinder<E>(override val id: Int, private val block: (E, String) -> Unit) :
-    Binder<TextView, E>() {
+open class TextChangedBinder<E>(override val id: Int, private val block: (E, String) -> Unit) : Binder<TextView, E>() {
 
-    private val autoBinders = mutableListOf<Binder<*, E>>()
+    private val binders = mutableListOf<Binder<*, E>>()
 
-    override fun dispatchOnCreateView(view: View, viewCache: SparseArray<View>) {
-        super.dispatchOnCreateView(view, viewCache)
-        if (autoBinders.isNotEmpty()) {
+    override fun dispatchOnViewCreated(view: View, viewCache: SparseArray<View>) {
+        super.dispatchOnViewCreated(view, viewCache)
+        if (binders.isNotEmpty()) {
             BinderTextWatcher.from<E>(view).let {
                 it.callbacks.add { item: E, _ ->
-                    autoBinders.forEach { callback -> callback.dispatchBind(viewCache, item) }
+                    binders.forEach { callback -> callback.dispatchBind(viewCache, item) }
                 }
             }
         }
     }
 
-    override fun onCreateView(itemView: TextView) {
+    override fun onViewCreated(itemView: TextView) {
         BinderTextWatcher.from<E>(itemView).let {
             it.callbacks.add(block)
             itemView.addTextChangedListener(it)
@@ -33,7 +32,7 @@ open class TextChangedBinder<E>(override val id: Int, private val block: (E, Str
     }
 
     fun addAutoUpdateBinder(vararg binders: Binder<*, E>) {
-        autoBinders += binders
+        this.binders += binders
     }
 
 }
diff --git a/library/src/main/java/com/omega_r/bind/model/binders/VisbleCustomBinder.kt b/library/src/main/java/com/omega_r/bind/model/binders/VisbleCustomBinder.kt
@@ -4,8 +4,7 @@ import android.view.View
 import androidx.annotation.IdRes
 import com.omega_r.bind.model.BindModel
 
-open class VisibleCustomBinder<M>(override val id: Int, private val queryBlock: (item: M) -> Boolean) :
-    Binder<View, M>() {
+open class VisibleCustomBinder<M>(override val id: Int, private val queryBlock: (item: M) -> Boolean) : Binder<View, M>() {
 
     override fun bind(itemView: View, item: M) {
         itemView.visibility = if (queryBlock(item)) View.VISIBLE else View.GONE
diff --git a/library/src/main/java/com/omega_r/bind/model/binders/VisbleCustomMultiBinder.kt b/library/src/main/java/com/omega_r/bind/model/binders/VisbleCustomMultiBinder.kt
@@ -22,4 +22,4 @@ fun <M> BindModel.Builder<M>.bindVisible(
     @IdRes id: Int,
     vararg ids: Int,
     queryBlock: (M) -> Boolean
-) = bindBinder(VisibleCustomMultiBinder(id, ids = *ids, queryBlock = queryBlock))
+) = bindBinder(VisibleCustomMultiBinder(id, ids = ids, queryBlock = queryBlock))

Original file line number	Diff line number	Diff line change
`@@ -10,12 +10,12 @@ abstract class Binder<V : View, M> {`
`10`	`10`
`11`	`11`	`var viewOptionally: Boolean = false`
`12`	`12`
`13`		`- open fun dispatchOnCreateView(view: View, viewCache: SparseArray<View>) {`
	`13`	`+ internal open fun dispatchOnViewCreated(view: View, viewCache: SparseArray<View>) {`
`14`	`14`	`@Suppress("UNCHECKED_CAST")`
`15`		`- onCreateView(view as V)`
	`15`	`+ onViewCreated(view as V)`
`16`	`16`	`}`
`17`	`17`
`18`		`- protected open fun onCreateView(itemView: V) {`
	`18`	`+ protected open fun onViewCreated(itemView: V) {`
`19`	`19`	`// nothing`
`20`	`20`	`}`
`21`	`21`
Original file line number	Diff line number	Diff line change
`@@ -45,10 +45,10 @@ class BinderTextWatcher<E> : TextWatcher {`
`45`	`45`	`// nothing`
`46`	`46`	`}`
`47`	`47`
`48`		`- override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {`
	`48`	`+ override fun onTextChanged(text: CharSequence?, start: Int, before: Int, count: Int) {`
`49`	`49`	`if (enabled) {`
`50`	`50`	`item?.let { item ->`
`51`		`- callbacks.forEach { it(item, s.toString()) }`
	`51`	`+ callbacks.forEach { it(item, text.toString()) }`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ open class SpinnerListBinder<M, SM>(`
`18`	`18`	`private val converter: (Context, SM, isDropDown: Boolean) -> CharSequence`
`19`	`19`	`) : Binder<Spinner, M>() {`
`20`	`20`
`21`		`- override fun onCreateView(itemView: Spinner) {`
	`21`	`+ override fun onViewCreated(itemView: Spinner) {`
`22`	`22`	`itemView.adapter = OmegaSpinnerAdapter.CustomAdapter(itemView.context, layoutRes, converter).also {`
`23`	`23`	`it.nonSelectedItem = nonSelectedItem`
`24`	`24`	`}`