fix ktlint errors

Author: Patrick Jackson

README.md

@@ -18,38 +18,53 @@ Documentation to come.
 
 Example usage:
 
+Subscribe to a single substate:
+
 ```
-val subscriber: StoreSubscriber = SelectorSubscriberFn<AppState>(store) {
-    withSingleField({ it.isLoadingItems }) {  <--  only called when isLoadingItems changes from previous state.
-        if (state.isLoadingItems) {
-                view?.showLoading()
-            } else {
-                view?.hideLoading()
-            }
-        }
+//selecting a substate subscribes to changes.  Lambda block will be executed when there is 
+//a change in value of `isLoading`
+val subscriber: StoreSubscriber = store.select({ it.isLoading }) {
+        loadingIndicator.visibility = if (store.state.isLoading) View.VISIBLE else View.GONE
+    }
 
-store.subscribe(subscriber)
+//invoking subcription unsubscribes.  Do this when appropriate for component lifecycle
+subscriber()  
+```
 
+Subscribe to multiple substates:
 ```
+val multiSubscription = store.selectors {
+            select({ it.isLoading }) {
+                loadingIndicator.visibility = if (store.state.isLoading) View.VISIBLE else View.GONE
+            }
+            select({ it.name }) {
+                nameTextView.text = store.state.name
+            }
+        }
 
+//unsubscribe when appropriate
+multiSubscription()
+```
 __How to add to project:__
 
+Requires Kotlin 1.4.0.
 Artifacts are hosted on maven central.  For multiplatform, add the following to your shared module:
 
+
 ```
 kotlin {
   sourceSets {
         commonMain { //   <---  name may vary on your project
             dependencies {
-                implementation "org.reduxkotlin:redux-kotlin-reselect:0.4.0"
+                implementation "org.reduxkotlin:redux-kotlin-reselect:0.5.5"
             }
         }
  }
 ```
 
 For JVM only:
 ```
-  implementation "org.reduxkotlin:redux-kotlin-jvm-reselect:0.4.0"
+  implementation "org.reduxkotlin:redux-kotlin-jvm-reselect:0.5.5"
 ```
 
 [badge-android]: http://img.shields.io/badge/platform-android-brightgreen.svg?style=flat

buildSrc/src/main/kotlin/Libs.kt

@@ -11,7 +11,7 @@ object Libs {
      * https://developer.android.com/studio
      */
     const val com_android_tools_build_gradle: String = "com.android.tools.build:gradle:" +
-            Versions.com_android_tools_build_gradle
+        Versions.com_android_tools_build_gradle
 
     const val dokka_gradle_plugin: String = "org.jetbrains.dokka:dokka-gradle-plugin:" +
         Versions.dokka_gradle_plugin
@@ -102,5 +102,4 @@ object Libs {
 
     const val redux_kotlin: String = "org.reduxkotlin:redux-kotlin:" +
         Versions.org_reduxkotlin_redux_kotlin
-
 }

reselect/src/commonMain/kotlin/org/reduxkotlin/Reselect.kt

@@ -2,7 +2,7 @@ package org.reduxkotlin
 
 import kotlin.jvm.JvmField
 
-private typealias EqualityCheckFn = (a:Any, b:Any) -> Boolean
+private typealias EqualityCheckFn = (a: Any, b: Any) -> Boolean
 
 /**
  * A rewrite for kotlin of https://github.com/reactjs/reselect library for redux (https://github.com/reactjs/redux)
@@ -27,18 +27,18 @@ interface Memoizer<T> {
 fun <T> computationMemoizer(computeFn: (Array<out Any>) -> T) = object : Memoizer<T> {
     var lastArgs: Array<out Any>? = null
     var lastResult: T? = null
-    override fun memoize(state:Any,vararg inputs: SelectorInput<Any, Any>): T {
-        val nInputs=inputs.size
-        val args=Array<Any>(nInputs) { inputs[it].invoke(state) }
-        if(lastArgs!=null && lastArgs!!.size==inputs.size) {
-            var bMatchedArgs=true
-            for(i in 0 until nInputs) {
-                if(!inputs[i].equalityCheck(args[i],lastArgs!![i])) {
-                    bMatchedArgs=false
+    override fun memoize(state: Any, vararg inputs: SelectorInput<Any, Any>): T {
+        val nInputs = inputs.size
+        val args = Array<Any>(nInputs) { inputs[it].invoke(state) }
+        if (lastArgs != null && lastArgs!!.size == inputs.size) {
+            var bMatchedArgs = true
+            for (i in 0 until nInputs) {
+                if (!inputs[i].equalityCheck(args[i], lastArgs!![i])) {
+                    bMatchedArgs = false
                     break
                 }
             }
-            if(bMatchedArgs) {
+            if (bMatchedArgs) {
                 return lastResult!!
             }
         }
@@ -48,19 +48,18 @@ fun <T> computationMemoizer(computeFn: (Array<out Any>) -> T) = object : Memoize
     }
 }
 
-
-
 /**
  * specialization for the case of single input (a little bit faster)
  */
-fun <T> singleInputMemoizer(func: (Array<out Any>) -> T)=object: Memoizer<T> {
-    var lastArg:Any?=null
-    var lastResult:T?=null
+fun <T> singleInputMemoizer(func: (Array<out Any>) -> T) = object : Memoizer<T> {
+    var lastArg: Any? = null
+    var lastResult: T? = null
     override fun memoize(state: Any, vararg inputs: SelectorInput<Any, Any>): T {
-        val input=inputs[0]
-        val arg=input.invoke(state)
+        val input = inputs[0]
+        val arg = input.invoke(state)
         if (lastArg != null &&
-                input.equalityCheck(arg,lastArg!!)){
+            input.equalityCheck(arg, lastArg!!)
+        ) {
             return lastResult!!
         }
         lastArg = arg
@@ -69,7 +68,6 @@ fun <T> singleInputMemoizer(func: (Array<out Any>) -> T)=object: Memoizer<T> {
     }
 }
 
-
 interface SelectorInput<S, I> {
     operator fun invoke(state: S): I
     val equalityCheck: EqualityCheckFn
@@ -78,11 +76,10 @@ interface SelectorInput<S, I> {
 /**
  * a selector function is a function that map a field in state object to the input for the selector compute function
  */
-class InputField<S, I>(val fn: S.() -> I,override val equalityCheck: EqualityCheckFn) : SelectorInput<S, I> {
+class InputField<S, I>(val fn: S.() -> I, override val equalityCheck: EqualityCheckFn) : SelectorInput<S, I> {
     override operator fun invoke(state: S): I = state.fn()
 }
 
-
 /**
  * note: [Selector] inherit from [SelectorInput] because of support for composite selectors
  */
@@ -107,7 +104,6 @@ interface Selector<S, O> : SelectorInput<S, O> {
     fun onChangeIn(state: S, blockfn: (O) -> Unit) {
         getIfChangedIn(state)?.let(blockfn)
     }
-
 }
 
 /**
@@ -130,37 +126,34 @@ abstract class AbstractSelector<S, O> : Selector<S, O> {
         recomputationsLastChanged = _recomputations
     }
 
-
     protected abstract val computeAndCount: (i: Array<out Any>) -> O
     /**
      * 'lazy' because computeandcount is abstract. Cannot reference to it before it is initialized in concrete selectors
      * 'open' because we can provide a custom memoizer if needed
      */
     open val memoizer by lazy { computationMemoizer(computeAndCount) }
-
 }
 
-
 /**
  * wrapper class for Selector factory methods , that basically is used only to capture
  * type information for the state parameter
  */
-class SelectorBuilder<S:Any> {
+class SelectorBuilder<S : Any> {
     /**
      * special single input selector that should be used when you just want to retrieve a single field:
      * Warning: Don't use this with primitive type fields, use [withSingleFieldByValue] instead!!!
      */
     fun <I : Any> withSingleField(fn: S.() -> I) = object : AbstractSelector<S, I>() {
         @Suppress("UNCHECKED_CAST")
-        private val inputField= InputField(fn, byRefEqualityCheck) as SelectorInput<Any, Any>
+        private val inputField = InputField(fn, byRefEqualityCheck) as SelectorInput<Any, Any>
         override val computeAndCount = fun(i: Array<out Any>): I {
             ++_recomputations
             @Suppress("UNCHECKED_CAST")
             return i[0] as I
         }
 
         override operator fun invoke(state: S): I {
-            return memoizer.memoize(state,inputField)
+            return memoizer.memoize(state, inputField)
         }
         override val equalityCheck: EqualityCheckFn
             get() = byRefEqualityCheck
@@ -174,14 +167,14 @@ class SelectorBuilder<S:Any> {
      */
     fun <I : Any> withSingleFieldByValue(fn: S.() -> I) = object : AbstractSelector<S, I>() {
         @Suppress("UNCHECKED_CAST")
-        private val inputField= InputField(fn, byValEqualityCheck) as SelectorInput<Any, Any>
+        private val inputField = InputField(fn, byValEqualityCheck) as SelectorInput<Any, Any>
         override val computeAndCount = fun(i: Array<out Any>): I {
             ++_recomputations
             @Suppress("UNCHECKED_CAST")
             return i[0] as I
         }
         override operator fun invoke(state: S): I {
-            return memoizer.memoize(state,inputField)
+            return memoizer.memoize(state, inputField)
         }
         override val equalityCheck: EqualityCheckFn
             get() = byValEqualityCheck
@@ -209,7 +202,7 @@ class SelectorBuilder<S:Any> {
  *          }
  *      }
  */
-fun <State: Any>Store<State>.selectors(selectorSubscriberBuilderInit: SelectorSubscriberBuilder<State>.() -> Unit): StoreSubscriber {
+fun <State : Any> Store<State>.selectors(selectorSubscriberBuilderInit: SelectorSubscriberBuilder<State>.() -> Unit): StoreSubscriber {
     val subscriberBuilder: SelectorSubscriberBuilder<State> = SelectorSubscriberBuilder(this)
     subscriberBuilder.selectorSubscriberBuilderInit()
     val sub = {
@@ -220,13 +213,15 @@ fun <State: Any>Store<State>.selectors(selectorSubscriberBuilderInit: SelectorSu
         subscriberBuilder.withAnyChangeFun?.invoke()
         Unit
     }
-    //call subscriber immediately when subscribing
+    // call subscriber immediately when subscribing
     sub()
     return this.subscribe(sub)
 }
 
-fun <State: Any>Store<State>.select(selector: (State) -> Any, action: (Any) -> Unit): StoreSubscriber {
-    return subscribe(this.selectors {
-        select(selector, action)
-    })
+fun <State : Any> Store<State>.select(selector: (State) -> Any, action: (Any) -> Unit): StoreSubscriber {
+    return subscribe(
+        this.selectors {
+            select(selector, action)
+        }
+    )
 }

reselect/src/commonMain/kotlin/org/reduxkotlin/SelectorSubscriberBuilder.kt

@@ -11,7 +11,7 @@ class SelectorSubscriberBuilder<State : Any>(val store: Store<State>) {
 
     val selectorList = mutableMapOf<Selector<State, Any>, (Any) -> Unit>()
 
-    //state is here to make available to lambda with receiver in DSL
+    // state is here to make available to lambda with receiver in DSL
     val state: State
         get() = store.getState()
 

sample/src/androidTest/java/org/reduxkotlin/reselect/sample/ExampleInstrumentedTest.kt

@@ -3,4 +3,4 @@ package org.reduxkotlin.reselect.sample
 data class AppState(
     val counter: Int = 0,
     val isLoading: Boolean = false
-)
+)

sample/src/main/java/org/reduxkotlin/reselect/sample/AppState.kt

@@ -1,21 +1,21 @@
 package org.reduxkotlin.reselect.sample
 
 import android.os.Bundle
-import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
+import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
-import org.reduxkotlin.*
 
 /**
  * A simple [Fragment] subclass as the default destination in the navigation.
  */
 class FirstFragment : Fragment() {
 
     override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
+        inflater: LayoutInflater,
+        container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
         // Inflate the layout for this fragment

sample/src/main/java/org/reduxkotlin/reselect/sample/FirstFragment.kt

@@ -1,16 +1,26 @@
 package org.reduxkotlin.reselect.sample
 
 import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import android.widget.ProgressBar
+import androidx.appcompat.app.AppCompatActivity
 import com.google.android.material.snackbar.Snackbar
-
 import kotlinx.android.synthetic.main.activity_main.*
-import kotlinx.coroutines.*
-import org.reduxkotlin.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import org.reduxkotlin.Reducer
+import org.reduxkotlin.StoreSubscription
+import org.reduxkotlin.Thunk
+import org.reduxkotlin.applyMiddleware
+import org.reduxkotlin.createStore
+import org.reduxkotlin.createThunkMiddleware
+import org.reduxkotlin.select
+import org.reduxkotlin.selectors
 
 class MainActivity : AppCompatActivity() {
 
@@ -27,12 +37,12 @@ class MainActivity : AppCompatActivity() {
                 .setAction("Action", null).show()
         }
 
-        subscription = store.select({it.isLoading}) {
-            loadingIndicator.visibility = if (store.state.isLoading) View.VISIBLE else View.GONE
-        }
+//        subscription = store.select({ it.isLoading }) {
+//            loadingIndicator.visibility = if (store.state.isLoading) View.VISIBLE else View.GONE
+//        }
 
         multiSubscription = store.selectors {
-            select({ it.isLoading}) {
+            select({ it.isLoading }) {
                 loadingIndicator.visibility = if (store.state.isLoading) View.VISIBLE else View.GONE
             }
         }

sample/src/main/java/org/reduxkotlin/reselect/sample/MainActivity.kt

@@ -1,11 +1,11 @@
 package org.reduxkotlin.reselect.sample
 
 import android.os.Bundle
-import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
+import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
 
 /**
@@ -14,7 +14,8 @@ import androidx.navigation.fragment.findNavController
 class SecondFragment : Fragment() {
 
     override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
+        inflater: LayoutInflater,
+        container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
         // Inflate the layout for this fragment