update InputControl

Author: Alex

reactiveviewmodel/build.gradle

@@ -44,7 +44,7 @@ afterEvaluate {
             release(MavenPublication) {
                 from components.release
                 groupId = 'com.alexdeww.reactiveviewmodel'
-                version = '2.3.7'
+                version = '2.3.8'
             }
         }
     }

reactiveviewmodel/src/main/java/com/alexdeww/reactiveviewmodel/component/ReactiveActivity.kt

@@ -1,5 +1,6 @@
 package com.alexdeww.reactiveviewmodel.component
 
+import androidx.annotation.CallSuper
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.LifecycleOwner
 import com.alexdeww.reactiveviewmodel.core.RvmViewComponent
@@ -13,12 +14,14 @@ abstract class ReactiveActivity : AppCompatActivity(), RvmViewComponent {
     override val componentLifecycleOwner: LifecycleOwner
         get() = this
 
+    @CallSuper
     override fun onStop() {
         disposableOnStopList.values.forEach { it.dispose() }
         disposableOnStopList.clear()
         super.onStop()
     }
 
+    @CallSuper
     override fun onDestroy() {
         disposableOnDestroyList.values.forEach { it.dispose() }
         disposableOnDestroyList.clear()

reactiveviewmodel/src/main/java/com/alexdeww/reactiveviewmodel/component/ReactiveFragment.kt

@@ -1,5 +1,6 @@
 package com.alexdeww.reactiveviewmodel.component
 
+import androidx.annotation.CallSuper
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.LifecycleOwner
 import com.alexdeww.reactiveviewmodel.core.RvmViewComponent
@@ -14,18 +15,21 @@ abstract class ReactiveFragment : Fragment(), RvmViewComponent {
     override val componentLifecycleOwner: LifecycleOwner
         get() = viewLifecycleOwner
 
+    @CallSuper
     override fun onStop() {
         disposableOnStopList.values.forEach { it.dispose() }
         disposableOnStopList.clear()
         super.onStop()
     }
 
+    @CallSuper
     override fun onDestroyView() {
         disposableOnDestroyViewList.values.forEach { it.dispose() }
         disposableOnDestroyViewList.clear()
         super.onDestroyView()
     }
 
+    @CallSuper
     override fun onDestroy() {
         disposableOnDestroyList.values.forEach { it.dispose() }
         disposableOnDestroyList.clear()

reactiveviewmodel/src/main/java/com/alexdeww/reactiveviewmodel/core/property/State.kt

@@ -6,7 +6,6 @@ import io.reactivex.rxjava3.core.Flowable
 import io.reactivex.rxjava3.core.Observable
 import io.reactivex.rxjava3.functions.Consumer
 import io.reactivex.rxjava3.subjects.BehaviorSubject
-import java.util.concurrent.TimeUnit
 
 class State<T : Any> internal constructor(
     initValue: T? = null,
@@ -19,7 +18,10 @@ class State<T : Any> internal constructor(
     }
     private val serializedSubject = subject.toSerialized()
 
-    internal val consumer: Consumer<T> = Consumer { serializedSubject.onNext(it) }
+    internal var valueChangesHook: ((value: T) -> T)? = null
+    internal val consumer: Consumer<T> = Consumer { newValue ->
+        serializedSubject.onNext(valueChangesHook?.invoke(newValue) ?: newValue)
+    }
     internal val observable: Observable<T> = serializedSubject.letDebounce(debounceInterval)
 
     val value: T? get() = subject.value

reactiveviewmodel/src/main/java/com/alexdeww/reactiveviewmodel/widget/BaseVisualControl.kt

@@ -4,7 +4,6 @@ import android.view.View
 import androidx.annotation.CallSuper
 import androidx.lifecycle.MediatorLiveData
 import com.alexdeww.reactiveviewmodel.core.RvmViewComponent
-import io.reactivex.rxjava3.core.Observable
 import io.reactivex.rxjava3.functions.Consumer
 import java.lang.ref.WeakReference
 
@@ -29,12 +28,9 @@ abstract class BaseVisualControl<T : Any>(
     init {
         actionChangeValue.observable
             .filter { it != value.value }
-            .let { transformObservable(it) }
             .subscribe(::onChangedValue)
     }
 
-    protected open fun transformObservable(observable: Observable<T>): Observable<T> = observable
-
     @CallSuper
     protected open fun onChangedValue(newValue: T) {
         value.consumer.accept(newValue)

reactiveviewmodel/src/main/java/com/alexdeww/reactiveviewmodel/widget/InputControl.kt

@@ -1,34 +1,29 @@
 package com.alexdeww.reactiveviewmodel.widget
 
-import android.annotation.SuppressLint
 import android.text.*
 import android.widget.EditText
 import com.alexdeww.reactiveviewmodel.core.RvmViewComponent
 import com.google.android.material.textfield.TextInputLayout
-import io.reactivex.rxjava3.core.Observable
 
 typealias FormatterAction = (text: String) -> String
 
-@SuppressLint("CheckResult")
 class InputControl internal constructor(
     initialText: String,
     private val hideErrorOnUserInput: Boolean,
-    private val formatter: FormatterAction?,
+    formatter: FormatterAction?,
     initialEnabled: Boolean,
     initialVisibility: Visibility
 ) : BaseVisualControl<String>(initialText, initialEnabled, initialVisibility) {
 
-    val error = state<String>()
-
-    override fun transformObservable(
-        observable: Observable<String>
-    ): Observable<String> = observable.map { s ->
-        formatter?.let { it(s) } ?: s
+    init {
+        value.valueChangesHook = formatter
     }
 
+    val error = state<String>()
+
     override fun onChangedValue(newValue: String) {
-        super.onChangedValue(newValue)
         if (hideErrorOnUserInput) error.consumer.accept("")
+        super.onChangedValue(newValue)
     }
 
 }