From 02d34e90c0d8ab9dca9e8689cc7b121542fad679 Mon Sep 17 00:00:00 2001
From: Marcin Moskala <marcinmoskala@gmail.com>
Date: Thu, 4 May 2017 18:43:46 +0200
Subject: [PATCH] Hide bindings with functions to protect user experience

---
 .../kotlinandroidviewbindings/BindToClick.kt         |  7 ++-----
 .../kotlinandroidviewbindings/BindToEditText.kt      |  7 ++-----
 .../kotlinandroidviewbindings/BindToErrorId.kt       |  7 ++-----
 .../kotlinandroidviewbindings/BindToLongClick.kt     |  7 ++-----
 .../kotlinandroidviewbindings/BindToRequestFocus.kt  |  7 ++-----
 .../kotlinandroidviewbindings/BindToSwipeRefresh.kt  | 10 +++-------
 .../BindToSwitchVisibility.kt                        | 12 ++----------
 .../kotlinandroidviewbindings/BindToTextView.kt      |  7 ++-----
 .../kotlinandroidviewbindings/BindToVisibility.kt    |  7 ++-----
 9 files changed, 19 insertions(+), 52 deletions(-)

diff --git a/kotlinandroidviewbindings/src/main/java/com/marcinmoskala/kotlinandroidviewbindings/BindToClick.kt b/kotlinandroidviewbindings/src/main/java/com/marcinmoskala/kotlinandroidviewbindings/BindToClick.kt
index 6bee9a3..6b51435 100644
--- a/kotlinandroidviewbindings/src/main/java/com/marcinmoskala/kotlinandroidviewbindings/BindToClick.kt
+++ b/kotlinandroidviewbindings/src/main/java/com/marcinmoskala/kotlinandroidviewbindings/BindToClick.kt
@@ -9,11 +9,8 @@ import kotlin.reflect.KProperty
 fun Activity.bindToClick(@IdRes viewId: Int): ReadWriteProperty<Any?, () -> Unit>
         = bindToClick { findViewById(viewId) }
 
-fun bindToClick(viewProvider: () -> View): ReadWriteProperty<Any?, () -> Unit>
-        = bindToClick(lazy(viewProvider))
-
-private fun bindToClick(lazyViewProvider: Lazy<View>): ReadWriteProperty<Any?, () -> Unit>
-        = OnClickBinding(lazyViewProvider)
+private fun bindToClick(viewProvider: () -> View): ReadWriteProperty<Any?, () -> Unit>
+        = OnClickBinding(lazy(viewProvider))
 
 private class OnClickBinding(viewProvider: Lazy<View>) : ReadWriteProperty<Any?, () -> Unit> {
 
diff --git a/kotlinandroidviewbindings/src/main/java/com/marcinmoskala/kotlinandroidviewbindings/BindToEditText.kt b/kotlinandroidviewbindings/src/main/java/com/marcinmoskala/kotlinandroidviewbindings/BindToEditText.kt
index d8403a4..d778ce2 100644
--- a/kotlinandroidviewbindings/src/main/java/com/marcinmoskala/kotlinandroidviewbindings/BindToEditText.kt
+++ b/kotlinandroidviewbindings/src/main/java/com/marcinmoskala/kotlinandroidviewbindings/BindToEditText.kt
@@ -9,11 +9,8 @@ import kotlin.reflect.KProperty
 fun Activity.bindToEditText(@IdRes editTextId: Int): ReadWriteProperty<Any?, String>
         = bindToEditText { findViewById(editTextId) as EditText }
 
-fun bindToEditText(viewProvider: () -> EditText): ReadWriteProperty<Any?, String>
-        = bindToEditText(lazy(viewProvider))
-
-private fun bindToEditText(lazyViewProvider: Lazy<EditText>): ReadWriteProperty<Any?, String>
-        = EditTextViewTextBinding(lazyViewProvider)
+private fun bindToEditText(viewProvider: () -> EditText): ReadWriteProperty<Any?, String>
+        = EditTextViewTextBinding(lazy(viewProvider))
 
 private class EditTextViewTextBinding(lazyViewProvider: Lazy<EditText>) : ReadWriteProperty<Any?, String> {
 
diff --git a/kotlinandroidviewbindings/src/main/java/com/marcinmoskala/kotlinandroidviewbindings/BindToErrorId.kt b/kotlinandroidviewbindings/src/main/java/com/marcinmoskala/kotlinandroidviewbindings/BindToErrorId.kt
index 97cd580..1132c1a 100644
--- a/kotlinandroidviewbindings/src/main/java/com/marcinmoskala/kotlinandroidviewbindings/BindToErrorId.kt
+++ b/kotlinandroidviewbindings/src/main/java/com/marcinmoskala/kotlinandroidviewbindings/BindToErrorId.kt
@@ -9,11 +9,8 @@ import kotlin.reflect.KProperty
 fun Activity.bindToErrorId(@IdRes editTextId: Int): ReadWriteProperty<Any?, Int?>
         = bindToErrorId { findViewById(editTextId) as EditText }
 
-fun bindToErrorId(viewProvider: () -> EditText): ReadWriteProperty<Any?, Int?>
-        = bindToErrorId(lazy(viewProvider))
-
-private fun bindToErrorId(lazyViewProvider: Lazy<EditText>): ReadWriteProperty<Any?, Int?>
-        = EditTextViewErrorIdBinding(lazyViewProvider)
+private fun bindToErrorId(viewProvider: () -> EditText): ReadWriteProperty<Any?, Int?>
+        = EditTextViewErrorIdBinding(lazy(viewProvider))
 
 private class EditTextViewErrorIdBinding(lazyViewProvider: Lazy<EditText>) : ReadWriteProperty<Any?, Int?> {
 
diff --git a/kotlinandroidviewbindings/src/main/java/com/marcinmoskala/kotlinandroidviewbindings/BindToLongClick.kt b/kotlinandroidviewbindings/src/main/java/com/marcinmoskala/kotlinandroidviewbindings/BindToLongClick.kt
index cbd4a41..96a716b 100644
--- a/kotlinandroidviewbindings/src/main/java/com/marcinmoskala/kotlinandroidviewbindings/BindToLongClick.kt
+++ b/kotlinandroidviewbindings/src/main/java/com/marcinmoskala/kotlinandroidviewbindings/BindToLongClick.kt
@@ -9,11 +9,8 @@ import kotlin.reflect.KProperty
 fun Activity.bindToLongClick(@IdRes viewId: Int): ReadWriteProperty<Any?, () -> Unit>
         = bindToLongClick { findViewById(viewId) }
 
-fun bindToLongClick(viewProvider: () -> View): ReadWriteProperty<Any?, () -> Unit>
-        = bindToLongClick(lazy(viewProvider))
-
-private fun bindToLongClick(lazyViewProvider: Lazy<View>): ReadWriteProperty<Any?, () -> Unit>
-        = OnLongClickBinding(lazyViewProvider)
+private fun bindToLongClick(viewProvider: () -> View): ReadWriteProperty<Any?, () -> Unit>
+        = OnLongClickBinding(lazy(viewProvider))
 
 private class OnLongClickBinding(viewProvider: Lazy<View>) : ReadWriteProperty<Any?, () -> Unit> {
 
diff --git a/kotlinandroidviewbindings/src/main/java/com/marcinmoskala/kotlinandroidviewbindings/BindToRequestFocus.kt b/kotlinandroidviewbindings/src/main/java/com/marcinmoskala/kotlinandroidviewbindings/BindToRequestFocus.kt
index 5516835..429f723 100644
--- a/kotlinandroidviewbindings/src/main/java/com/marcinmoskala/kotlinandroidviewbindings/BindToRequestFocus.kt
+++ b/kotlinandroidviewbindings/src/main/java/com/marcinmoskala/kotlinandroidviewbindings/BindToRequestFocus.kt
@@ -9,11 +9,8 @@ import kotlin.reflect.KProperty
 fun Activity.bindToRequestFocus(@IdRes editViewId: Int): ReadOnlyProperty<Any?, () -> Unit>
         = bindToRequestFocus { findViewById(editViewId) }
 
-fun bindToRequestFocus(viewProvider: () -> View): ReadOnlyProperty<Any?, () -> Unit>
-        = bindToRequestFocus(lazy(viewProvider))
-
-private fun bindToRequestFocus(lazyViewProvider: Lazy<View>): ReadOnlyProperty<Any?, () -> Unit>
-        = RequestFocusBinding(lazyViewProvider)
+private fun bindToRequestFocus(viewProvider: () -> View): ReadOnlyProperty<Any?, () -> Unit>
+        = RequestFocusBinding(lazy(viewProvider))
 
 private class RequestFocusBinding(viewProvider: Lazy<View>) : ReadOnlyProperty<Any?, () -> Unit> {
 
diff --git a/kotlinandroidviewbindings/src/main/java/com/marcinmoskala/kotlinandroidviewbindings/BindToSwipeRefresh.kt b/kotlinandroidviewbindings/src/main/java/com/marcinmoskala/kotlinandroidviewbindings/BindToSwipeRefresh.kt
index 88bf40b..0c65df9 100644
--- a/kotlinandroidviewbindings/src/main/java/com/marcinmoskala/kotlinandroidviewbindings/BindToSwipeRefresh.kt
+++ b/kotlinandroidviewbindings/src/main/java/com/marcinmoskala/kotlinandroidviewbindings/BindToSwipeRefresh.kt
@@ -3,18 +3,14 @@ package com.marcinmoskala.kotlinandroidviewbindings
 import android.app.Activity
 import android.support.annotation.IdRes
 import android.support.v4.widget.SwipeRefreshLayout
-import kotlin.properties.ReadOnlyProperty
 import kotlin.properties.ReadWriteProperty
 import kotlin.reflect.KProperty
 
-fun Activity.bindToSwipeRefresh(@IdRes swipeRefreshLayoutId: Int): ReadOnlyProperty<Any?, Boolean>
+fun Activity.bindToSwipeRefresh(@IdRes swipeRefreshLayoutId: Int): ReadWriteProperty<Any?, Boolean>
         = bindToSwipeRefresh { findViewById(swipeRefreshLayoutId) as SwipeRefreshLayout }
 
-fun bindToSwipeRefresh(viewProvider: () -> SwipeRefreshLayout): ReadOnlyProperty<Any?, Boolean>
-        = bindToSwipeRefresh(lazy(viewProvider))
-
-private fun bindToSwipeRefresh(lazyViewProvider: Lazy<SwipeRefreshLayout>): ReadOnlyProperty<Any?, Boolean>
-        = bindToSwipeRefresh(lazyViewProvider)
+private fun bindToSwipeRefresh(viewProvider: () -> SwipeRefreshLayout): ReadWriteProperty<Any?, Boolean>
+        = SwipeRefreshBinding(lazy(viewProvider))
 
 private class SwipeRefreshBinding(viewProvider: Lazy<SwipeRefreshLayout>) : ReadWriteProperty<Any?, Boolean> {
 
diff --git a/kotlinandroidviewbindings/src/main/java/com/marcinmoskala/kotlinandroidviewbindings/BindToSwitchVisibility.kt b/kotlinandroidviewbindings/src/main/java/com/marcinmoskala/kotlinandroidviewbindings/BindToSwitchVisibility.kt
index 1dac671..bb7abe5 100644
--- a/kotlinandroidviewbindings/src/main/java/com/marcinmoskala/kotlinandroidviewbindings/BindToSwitchVisibility.kt
+++ b/kotlinandroidviewbindings/src/main/java/com/marcinmoskala/kotlinandroidviewbindings/BindToSwitchVisibility.kt
@@ -14,22 +14,14 @@ fun Activity.bindToLoading(
         restViewHolderProvider = { restViewHolderId?.let { findViewById(it) } }
 )
 
-fun bindToLoading(
+private fun bindToLoading(
         progressViewProvider: () -> View,
         restViewHolderProvider: () -> View?
-): ReadWriteProperty<Any?, Boolean> = bindToLoading(
+): ReadWriteProperty<Any?, Boolean> = LoadingBinding(
         lazy(progressViewProvider),
         lazy(restViewHolderProvider)
 )
 
-private fun bindToLoading(
-        progressLazyViewProvider: Lazy<View>,
-        restViewHolderLazyProvider: Lazy<View?>
-): ReadWriteProperty<Any?, Boolean> = LoadingBinding(
-        progressLazyViewProvider,
-        restViewHolderLazyProvider
-)
-
 private class LoadingBinding(
         progressLazyViewProvider: Lazy<View>,
         restViewHolderLazyProvider: Lazy<View?>
diff --git a/kotlinandroidviewbindings/src/main/java/com/marcinmoskala/kotlinandroidviewbindings/BindToTextView.kt b/kotlinandroidviewbindings/src/main/java/com/marcinmoskala/kotlinandroidviewbindings/BindToTextView.kt
index 3c1fca7..4a98987 100644
--- a/kotlinandroidviewbindings/src/main/java/com/marcinmoskala/kotlinandroidviewbindings/BindToTextView.kt
+++ b/kotlinandroidviewbindings/src/main/java/com/marcinmoskala/kotlinandroidviewbindings/BindToTextView.kt
@@ -9,11 +9,8 @@ import kotlin.reflect.KProperty
 fun Activity.bindToTextView(@IdRes textViewId: Int): ReadWriteProperty<Any?, String>
         = bindToTextView { findViewById(textViewId) as TextView }
 
-fun bindToTextView(viewProvider: () -> TextView): ReadWriteProperty<Any?, String>
-        = bindToTextView(lazy(viewProvider))
-
-private fun bindToTextView(lazyViewProvider: Lazy<TextView>): ReadWriteProperty<Any?, String>
-        = TextViewTextBinding(lazyViewProvider)
+private fun bindToTextView(viewProvider: () -> TextView): ReadWriteProperty<Any?, String>
+        = TextViewTextBinding(lazy(viewProvider))
 
 private class TextViewTextBinding(lazyViewProvider: Lazy<TextView>) : ReadWriteProperty<Any?, String> {
 
diff --git a/kotlinandroidviewbindings/src/main/java/com/marcinmoskala/kotlinandroidviewbindings/BindToVisibility.kt b/kotlinandroidviewbindings/src/main/java/com/marcinmoskala/kotlinandroidviewbindings/BindToVisibility.kt
index c65c56c..3d0dff2 100644
--- a/kotlinandroidviewbindings/src/main/java/com/marcinmoskala/kotlinandroidviewbindings/BindToVisibility.kt
+++ b/kotlinandroidviewbindings/src/main/java/com/marcinmoskala/kotlinandroidviewbindings/BindToVisibility.kt
@@ -9,11 +9,8 @@ import kotlin.reflect.KProperty
 fun Activity.bindToVisibility(@IdRes editTextId: Int): ReadWriteProperty<Any?, Boolean>
         = bindToVisibility { findViewById(editTextId) }
 
-fun bindToVisibility(viewProvider: () -> View): ReadWriteProperty<Any?, Boolean>
-        = bindToVisibility(lazy(viewProvider))
-
-private fun bindToVisibility(lazyViewProvider: Lazy<View>): ReadWriteProperty<Any?, Boolean>
-        = ViewVisibilityBinding(lazyViewProvider)
+private fun bindToVisibility(viewProvider: () -> View): ReadWriteProperty<Any?, Boolean>
+        = ViewVisibilityBinding(lazy(viewProvider))
 
 private class ViewVisibilityBinding(viewProvider: Lazy<View>) : ReadWriteProperty<Any?, Boolean> {