Update sample app

Author: fragarsie

README.md

@@ -18,15 +18,11 @@ data class LoginAction(val username: String,
 The dispatcher receives Actions and broadcast payloads to registered callbacks. The instance of the Dispatcher must be unique across the whole application and it will execute all the logic in the main thread making state muations synchronous. 
 
 ```kotlin
-//Dispatch the action in the current Thread
+//Dispatch an action on the main thread synchronously
 dispatcher.dispatch(LoginAction(username = "user", password = "123"))
 
-//Dispatch the action in the UI Thread, this action will be processed in the next event loop
-dispatcher.dispatchOnUi(LoginAction(username = "user", password = "123"))
-
-//Post and event that will dispatch the action on the Ui thread 
-//and block until the dispatch is complete. Only useful when calling from a background thread.
-dispatcher.dispatchOnUiSync(LoginAction(username = "user", password = "123"))
+//Post an event that will dispatch the action on the UI thread and return immediately.
+dispatcher.dispatchAsync(LoginAction(username = "user", password = "123"))
 ```
 
 ### Store
@@ -55,7 +51,15 @@ class SessionStore : Store<SessionState>() {
 ```
 
 ### Generated code
-MiniActionReducer explanation. //TODO
+Mini uses an annotation processor to generate code automatically based on the `@Reducer` annotations in your code.
+Annotating a function inside a `Store` with `@Reducer` will generate all the code needed to call the right methods of your stores when an `Action` goes though the `Dispatcher`.
+
+A method annotated with `@Reducer` must:
+- Receive a class that inherits from `Action` by parameter
+- Return an State of the same type that the store which contains the function
+- Optionally, it can receive also another `State` as second parameter. This is useful for unitary testing purposes.
+
+All the generated code is contained inside the class `MiniActionReducer`.
 
 ### View changes
 Each ``Store`` exposes a custom `StoreCallback` though the method `observe` or a `Flowable` if you wanna make use of RxJava. Both of them emits changes produced on their states, allowing the view to listen reactive the state changes. Being able to update the UI according to the new `Store` state.
@@ -79,13 +83,11 @@ A Task is a basic object to represent an ongoing process. They should be used in
 Having the next code:
 
 ```kotlin
-
 data class LoginAction(val username: String, val password: String)
-data class LoginCompleteAction(val loginTask: Task,
-                               val user: User?)
-
-data class SessionState(val loginTask: Task = taskIdle(),
-                        val loggedUser: User? = null)
+data class LoginCompleteAction(val loginTask: Task, val user: User?)
+```
+```kotlin
+data class SessionState(val loginTask: Task = taskIdle(), val loggedUser: User? = null)
 
 class SessionStore @Inject constructor(val controller: SessionController) : Store<SessionState>() {
     @Reducer
@@ -185,9 +187,9 @@ fun login_redirects_to_home_with_success_task() {
 ### Import the library
 To setup Mini in your application, first you will need to add the library itself together with the annotation processor:
 ```groovy
-implementation 'com.github.pabloogc:Mini:1.0.5'
-kapt 'com.github.pabloogc.Mini:mini-processor:1.0.5'
-androidTestImplementation 'com.github.pabloogc.Mini:mini-android-testing:1.0.5' //Optional
+implementation 'com.github.pabloogc:Mini:1.1.0'
+kapt 'com.github.pabloogc.Mini:mini-processor:1.1.0'
+androidTestImplementation 'com.github.pabloogc.Mini:mini-android-testing:1.1.0' //Optional
 ```
 
 ### Setting up your App file

app/build.gradle

@@ -7,7 +7,7 @@ buildscript {
         rx_android_version = "2.0.2"
         leak_canary_version = "1.5"
         butterkinfe_version = "8.4.0"
-        support_version = "26.0.1"
+        support_version = "27.0.0"
         target_sdk_version = 26
     }
 }
@@ -34,7 +34,7 @@ kotlin {
 //Android
 android {
     compileSdkVersion target_sdk_version
-    buildToolsVersion '27.0.3'
+    buildToolsVersion '28.0.3'
 
     defaultConfig {
         applicationId "com.minivac.mini"
@@ -78,7 +78,7 @@ dependencies {
     implementation project(":mini-common")
     kapt project(":mini-processor")
 
-    implementation 'com.android.support.constraint:constraint-layout:1.1.2'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
 
     //Support
     implementation "com.android.support:appcompat-v7:$support_version"
@@ -93,9 +93,11 @@ dependencies {
     kapt "com.google.dagger:dagger-compiler:$dagger_version"
     kapt "com.google.dagger:dagger-android-processor:$dagger_version"
 
-    //Rx
-    implementation "io.reactivex.rxjava2:rxjava:$rx_version"
-    implementation "io.reactivex.rxjava2:rxandroid:$rx_android_version"
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation project(":mini-android-testing")
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
+    androidTestImplementation 'com.agoda.kakao:kakao:1.4.0'
 }
 
 

app/src/androidTest/java/org/sample/LoginActivityTest.kt

@@ -0,0 +1,79 @@
+package org.sample
+
+import com.agoda.kakao.KEditText
+import com.agoda.kakao.KProgressBar
+import com.agoda.kakao.KTextView
+import com.agoda.kakao.Screen
+import mini.onUiSync
+import mini.taskRunning
+import org.junit.Assert
+import org.junit.Rule
+import org.junit.Test
+import org.sample.session.store.LoginWithCredentialsAction
+import org.sample.session.store.SessionState
+import org.sample.session.store.SessionStore
+
+class LoginScreen : Screen<LoginScreen>() {
+    val email: KEditText = KEditText { withId(R.id.emailInput) }
+    val password: KEditText = KEditText { withId(R.id.passwordInput) }
+    val credentialsLoginButton: KTextView = KTextView { withId(R.id.loginCredentialsButton) }
+    val progress: KProgressBar = KProgressBar { withId(R.id.progress) }
+}
+
+class LoginActivityTest {
+
+    @get:Rule
+    val activity = testActivity(LoginActivity::class)
+    @get:Rule
+    val cleanState = cleanStateRule()
+    @get:Rule
+    val testDispatcher = testDispatcherRule()
+
+    @Test
+    fun login_with_credentials_dispatch_right_action() {
+        val screen = LoginScreen()
+        val anyEmail = "notADreadLord@gmail.com"
+        val anyPassword = "GarroshDidNothingWrong"
+
+        screen {
+            email {
+                scrollTo()
+                typeText(anyEmail)
+            }
+            closeSoftKeyboard()
+
+            password {
+                scrollTo()
+                typeText(anyPassword)
+            }
+            closeSoftKeyboard()
+
+            credentialsLoginButton {
+                scrollTo()
+                click()
+            }
+
+            //Check action
+            view.check { _, _ ->
+                val expectedAction = LoginWithCredentialsAction(anyEmail, anyPassword)
+                Assert.assertTrue(testDispatcher.testInterceptor.actions.any { it == expectedAction })
+            }
+        }
+    }
+
+    @Test
+    fun progress_bar_is_show_when_logging() {
+        val screen = LoginScreen()
+        val sessionStore = store<SessionStore>()
+
+        screen { progress.isGone() }
+
+        //Set login state to success
+        onUiSync {
+            val state = SessionState().copy(loginTask = taskRunning())
+            sessionStore.setTestState(state)
+        }
+
+        screen { progress.isVisible() }
+    }
+}

app/src/androidTest/java/org/sample/TestUtils.kt

@@ -0,0 +1,32 @@
+package org.sample
+
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
+import android.support.test.InstrumentationRegistry
+import android.support.test.rule.ActivityTestRule
+import com.durmin.mini_android_testing.CleanStateRule
+import com.durmin.mini_android_testing.TestDispatcherRule
+import mini.Store
+import org.sample.core.app
+import kotlin.reflect.KClass
+
+fun cleanStateRule() = CleanStateRule(app.component.stores().values.toList())
+fun testDispatcherRule() = TestDispatcherRule(app.component.dispatcher())
+
+inline fun <reified T : Store<*>> store(): T {
+    return app.component.stores()[T::class.java] as T
+}
+
+fun <T : Activity> testActivity(clazz: KClass<T>,
+                                createIntent: ((context: Context) -> Intent)? = null): ActivityTestRule<T> {
+
+    //Overriding the rule throws an exception
+    if (createIntent == null) return ActivityTestRule<T>(clazz.java)
+    return object : ActivityTestRule<T>(clazz.java) {
+        override fun getActivityIntent(): Intent = createIntent(InstrumentationRegistry.getTargetContext())
+    }
+}
+
+inline fun <reified T : Activity> testActivity(intent: Intent): ActivityTestRule<T> =
+    ActivityTestRule(T::class.java)

app/src/main/AndroidManifest.xml

@@ -1,23 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.minivac.mini">
+          xmlns:tools="http://schemas.android.com/tools" package="org.sample">
+
+    <application android:allowBackup="true"
+                 android:label="@string/app_name"
+                 android:icon="@mipmap/ic_launcher"
+                 android:roundIcon="@mipmap/ic_launcher_round"
+                 android:supportsRtl="true"
+                 android:name=".core.App"
+                 android:theme="@style/AppTheme" tools:ignore="GoogleAppIndexingWarning">
+
+        <activity
+                android:name=".LoginActivity"
+                android:screenOrientation="portrait">
 
-    <application
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:name="org.sample.todo.core.App"
-        android:supportsRtl="true"
-        android:theme="@style/AppTheme">
-        <activity android:name="org.sample.todo.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
 
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
 
-        <activity android:name="org.sample.todo.SecondActivity"/>
+        <activity
+                android:name=".HomeActivity"
+                android:screenOrientation="portrait"/>
     </application>
-
-</manifest>
+</manifest>

app/src/main/ic_launcher-web.png

@@ -0,0 +1,65 @@
+package org.sample
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import kotlinx.android.synthetic.main.home_activity.*
+import mini.Dispatcher
+import mini.mapNotNull
+import org.sample.core.dagger.BaseActivity
+import org.sample.session.store.SessionStore
+import org.sample.session.store.SignOutAction
+import javax.inject.Inject
+
+class HomeActivity : BaseActivity() {
+
+    @Inject
+    lateinit var dispatcher: Dispatcher
+
+    @Inject
+    lateinit var sessionStore: SessionStore
+
+    companion object {
+        fun newIntent(context: Context): Intent = Intent(context, HomeActivity::class.java)
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.home_activity)
+        initializeInterface()
+        startListeningSessionChanges()
+    }
+
+    private fun startListeningSessionChanges() {
+        sessionStore.flowable()
+            .mapNotNull { it.loggedUser }
+            .subscribe { updateEmail(it.email) }
+            .track()
+
+        sessionStore.flowable()
+            .map { it.logged }
+            .filter { !it }
+            .subscribe { goToLogin() }
+            .track()
+    }
+
+
+    private fun initializeInterface() {
+        signOut.setOnClickListener { signOut() }
+    }
+
+    private fun updateEmail(value: String) {
+        email.text = value
+    }
+
+    private fun signOut() {
+        dispatcher.dispatch(SignOutAction())
+    }
+
+    private fun goToLogin() {
+        val intent = LoginActivity.newIntent(this).apply {
+            flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
+        }
+        startActivity(intent)
+    }
+}