Complete runtime variant, minor cleanup

Author: Pablo Orgaz

app/build.gradle

@@ -76,6 +76,7 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
     implementation project(":mini-common")
+    implementation project(":mini-runtime")
     kapt project(":mini-processor")
 
     //Misc

app/src/main/java/org/sample/SampleActivity.kt

@@ -18,7 +18,9 @@ class SampleActivity : AppCompatActivity(), SubscriptionTracker by DefaultSubscr
         Grove.plant(ConsoleLogTree())
         val stores = listOf(dummyStore)
 
-        MiniGen.initialize(dispatcher, stores)
+        //MiniGen.initialize(dispatcher, stores)
+        MiniRuntime.initialize(dispatcher, stores)
+
         dispatcher.addInterceptor(LoggerInterceptor(stores, { tag, msg ->
             Grove.tag(tag).d { msg }
         }))

build.gradle

@@ -11,7 +11,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0'
+        classpath 'com.android.tools.build:gradle:3.3.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'org.junit.platform:junit-platform-gradle-plugin:1.0.0'
         classpath 'com.github.triplet.gradle:play-publisher:1.2.0'

mini-common/src/main/java/mini/Dispatcher.kt

@@ -1,6 +1,8 @@
 package mini
 
+import io.reactivex.disposables.Disposable
 import java.util.*
+import kotlin.reflect.KClass
 
 /**
  * Hub for actions.
@@ -55,10 +57,15 @@ class Dispatcher {
     }
 
     @Suppress("UNCHECKED_CAST")
-    inline fun <reified A> register(priority: Int = 100, noinline callback: (A) -> Unit): Registration {
+    inline fun <reified A : Any> register(priority: Int = 100, noinline callback: (A) -> Unit): Registration {
+        return register(A::class, priority, callback)
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    fun <T : Any> register(clazz: KClass<T>, priority: Int = 100, callback: (T) -> Unit): Registration {
         synchronized(subscriptions) {
-            val reg = Registration(A::class.java, priority, callback as (Any) -> Unit)
-            val set = subscriptions.getOrPut(A::class.java) {
+            val reg = Registration(this, clazz.java, priority, callback as (Any) -> Unit)
+            val set = subscriptions.getOrPut(clazz.java) {
                 TreeSet(kotlin.Comparator { a, b -> a.priority.compareTo(b.priority) })
             }
             set.add(reg)
@@ -97,5 +104,15 @@ class Dispatcher {
         onUi { dispatch(action) }
     }
 
-    data class Registration(val type: Class<*>, val priority: Int, val fn: (Any) -> Unit)
+    data class Registration(val dispatcher: Dispatcher,
+                            val type: Class<*>,
+                            val priority: Int, val fn: (Any) -> Unit) : Disposable {
+        var disposed = false
+        override fun isDisposed(): Boolean = disposed
+
+        override fun dispose() {
+            dispatcher.unregister(this)
+            disposed = true
+        }
+    }
 }

mini-common/src/main/java/mini/MiniInitializer.kt

@@ -0,0 +1,8 @@
+package mini
+
+/**
+ * Common interface for code generation and reflection approaches.
+ */
+interface MiniInitializer {
+    fun initialize(dispatcher: Dispatcher, stores: List<Store<*>>)
+}

mini-common/src/main/java/mini/Store.kt

@@ -31,9 +31,7 @@ abstract class Store<S : Any> {
         get() = throw UnsupportedOperationException("This is a write only property")
         set(value) = setStateInternal(value)
 
-    /**
-     * Same as property, suffix style
-     */
+    /** Same as property, suffix style */
     protected fun S.newState(): S {
         setStateInternal(this)
         return this
@@ -82,18 +80,20 @@ abstract class Store<S : Any> {
     }
 
     private fun setStateInternal(newState: S) {
-        onUiSync {
-            //Need state mutation to happen on UI thread
-            if (newState != _state) {
-                _state = newState
-                processor.onNext(_state)
-            }
+        assertOnUiThread()
+        //Need state mutation to happen on UI thread
+        if (newState != _state) {
+            _state = newState
+            processor.onNext(_state)
         }
     }
 
+    /** Thread safe, since espresso runs in it's own thread */
     @TestOnly
     fun setTestState(other: S) {
-        setStateInternal(other)
+        onUiSync {
+            setStateInternal(other)
+        }
     }
 
     @TestOnly

mini-processor/src/main/java/mini/processor/MiniProcessor.kt

@@ -3,6 +3,7 @@ package mini.processor
 import com.squareup.kotlinpoet.FileSpec
 import com.squareup.kotlinpoet.TypeSpec
 import mini.Action
+import mini.MiniInitializer
 import mini.Reducer
 import javax.annotation.processing.*
 import javax.lang.model.SourceVersion
@@ -35,7 +36,8 @@ class MiniProcessor : AbstractProcessor() {
         val className = "MiniGen"
         val file = FileSpec.builder("mini", className)
         val container = TypeSpec.objectBuilder(className)
-        container.addKdoc("Automatically generated, do not edit.\n")
+            .addSuperinterface(MiniInitializer::class)
+            .addKdoc("Automatically generated, do not edit.\n")
 
         //Get non-abstract actions
         ActionTypesGenerator.generate(container, roundActions)

mini-processor/src/main/java/mini/processor/ReducersGenerator.kt

@@ -53,6 +53,7 @@ object ReducersGenerator {
             .build()
 
         val initDispatcherFn = FunSpec.builder("initialize")
+            .addModifiers(KModifier.OVERRIDE)
             .addParameter("dispatcher", Dispatcher::class)
             .addParameter("stores", listOfStoresTypeName)
             .addCode(CodeBlock.builder()

mini-runtime/build.gradle

@@ -3,6 +3,7 @@ apply from: "../jitpack.gradle"
 
 dependencies {
     compile project(":mini-common")
+    compileOnly group: 'com.google.android', name: 'android', version: '4.1.1.4'
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     compile 'com.github.yanex:takenoko:0.1'
     compile 'io.github.classgraph:classgraph:4.6.32'