add convenience fun for createThunk

Author: Patrick Jackson

android/src/main/java/com/jackson/openlibrary/store/BaseLibraryViewFragment.kt

@@ -13,17 +13,12 @@ import kotlinx.coroutines.Dispatchers
 import org.reduxkotlin.Dispatcher
 import kotlin.coroutines.CoroutineContext
 
-open class BaseLibraryViewFragment<V: LibraryView>: Fragment(), LibraryView, CoroutineScope,
-        LibraryProvider by OpenLibraryApp.gameEngine() {
+open class BaseLibraryViewFragment<V: LibraryView>: Fragment(), LibraryView {
 
     private var viewRecreated: Boolean = false
     override lateinit var dispatch: Dispatcher
     override var selectorBuilder: SelectorSubscriberBuilder<AppState>? = null
 
-    override val coroutineContext: CoroutineContext
-        get() = Dispatchers.Main
-
-
     override fun onViewCreated(view: android.view.View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         if (savedInstanceState == null)

android/src/main/java/com/jackson/openlibrary/store/BooksAdapter.kt

@@ -7,7 +7,6 @@ import androidx.recyclerview.widget.RecyclerView
 import com.jackson.openlibrary.GlideApp
 import com.jackson.openlibrary.OpenLibraryApp
 import com.jackson.openlibrary.R
-import com.willowtreeapps.common.Actions
 import com.willowtreeapps.common.UiActions
 import com.willowtreeapps.common.ui.BookListItemViewState
 import com.willowtreeapps.common.ui.ListHeader

android/src/main/java/com/jackson/openlibrary/store/CompletedFragment.kt

@@ -7,7 +7,7 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.jackson.openlibrary.MainActivity
 import com.jackson.openlibrary.R
-import com.willowtreeapps.common.Actions
+import com.willowtreeapps.common.UiActions
 import com.willowtreeapps.common.ui.CompletedView
 import kotlinx.android.synthetic.main.fragment_completed.*
 import kotlinx.android.synthetic.main.fragment_reading_list.loading_spinner
@@ -34,7 +34,7 @@ class CompletedFragment : BaseLibraryViewFragment<CompletedView>(), CoroutineSco
     override fun onResume() {
         super.onResume()
         (activity as MainActivity).showFab()
-        dispatch(Actions.LoadCompleted())
+        dispatch(UiActions.CompletedListShown())
     }
 
     override fun hideLoading() {

android/src/main/java/com/jackson/openlibrary/store/ReadingListFragment.kt

@@ -6,14 +6,13 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.jackson.openlibrary.MainActivity
-import com.jackson.openlibrary.OpenLibraryApp
-import com.willowtreeapps.common.Actions
 import com.willowtreeapps.common.ui.ReadingListView
 import kotlinx.android.synthetic.main.fragment_reading_list.*
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlin.coroutines.CoroutineContext
 import com.jackson.openlibrary.R
+import com.willowtreeapps.common.UiActions
 
 
 class ReadingListFragment : BaseLibraryViewFragment<ReadingListView>(), CoroutineScope, ReadingListView {
@@ -36,7 +35,7 @@ class ReadingListFragment : BaseLibraryViewFragment<ReadingListView>(), Coroutin
 
     override fun onResume() {
         super.onResume()
-        dispatch(Actions.LoadToRead())
+        dispatch(UiActions.ReadingListShown())
         (activity as MainActivity).showFab()
     }
 

common/src/commonMain/kotlin/com/willowtreeapps/common/LibraryApp.kt

@@ -6,21 +6,15 @@ import com.willowtreeapps.common.external.presenterMiddleware
 import org.reduxkotlin.createStore
 import org.reduxkotlin.applyMiddleware
 import com.willowtreeapps.common.middleware.*
-import com.willowtreeapps.common.middleware.NavigationMiddleware
 import com.willowtreeapps.common.repo.*
 import com.willowtreeapps.common.ui.*
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
 import org.reduxkotlin.combineReducers
 import kotlin.coroutines.CoroutineContext
 
 class LibraryApp(navigator: Navigator,
                  networkContext: CoroutineContext,
                  private val uiContext: CoroutineContext,
                  libraryDatabase: LibraryDatabase) : LibraryProvider {
-    private val navigationMiddleware = NavigationMiddleware(navigator)
-    private val localStorageRepo = BookDatabaseRepo(libraryDatabase)
-    private val databaseMiddleware = DatabaseMiddleware(localStorageRepo)
     private val bookRepository: BookRepository by lazy { KtorOpenBookRepository(networkContext) }
     override val networkThunks = NetworkThunks(networkContext, bookRepository)
 
@@ -30,16 +24,14 @@ class LibraryApp(navigator: Navigator,
                 coroutineDispatcher(uiContext),
                 createThunkMiddleware2(),
                 uiActionMiddleware(networkThunks),
-                databaseMiddleware.middleware,
-                navigationMiddleware::dispatch,
+                databaseMiddleware(BookDatabaseRepo(libraryDatabase)),
+                navigationMiddleware(navigator),
                 loggerMiddleware))
     }
 
     init {
-        CoroutineScope(uiContext).launch {
-            //do any initialization here
-            store.dispatch(NavigationActions.GotoScreen(state.currentScreen))
-        }
+        //do any initialization here
+        store.dispatch(NavigationActions.GotoScreen(state.currentScreen))
     }
 
     val state: AppState

common/src/commonMain/kotlin/com/willowtreeapps/common/NetworkThunks.kt

@@ -53,31 +53,47 @@ class NetworkThunks(private val networkContext: CoroutineContext,
         }
     }
 
-    fun fetchBooksThunk2(query: String): Thunk2 = object : Thunk2 {
-        override fun dispatch(dispatch: Dispatcher, getState: GetState, extraArgument: Any?) {
-            Logger.d("Fetching Books and Feed")
-            launch {
-                dispatch(Actions.FetchingItemsStartedAction())
-                val result = repo.search(query)
-                if (result.isSuccessful) {
-                    dispatch(Actions.FetchingItemsSuccessAction(result.response!!))
-                } else {
-                    dispatch(Actions.FetchingItemsFailedAction(result.message!!))
-                }
+    fun fetchBooksThunk2(query: String) = createThunk { dispatch, getState, extraArgument ->
+        Logger.d("Fetching Books and Feed")
+        launch {
+            dispatch(Actions.FetchingItemsStartedAction())
+            val result = repo.search(query)
+            if (result.isSuccessful) {
+                dispatch(Actions.FetchingItemsSuccessAction(result.response!!))
+            } else {
+                dispatch(Actions.FetchingItemsFailedAction(result.message!!))
             }
         }
     }
 }
 
 interface Thunk2 {
-    fun dispatch(dispatch: Dispatcher, getState: GetState, extraArgument: Any?)
+    fun dispatch(dispatch: Dispatcher, getState: GetState, extraArgument: Any?): Any
+}
+
+/**
+ * Convenience function for creating thunks.
+ * Usage:
+ *      val myThunk = createThunk { dispatch, getState, extraArgument ->
+ *              //do async stuff
+ *              dispatch(NewAction())
+ *              }
+ */
+fun createThunk(thunkLambda: (dispatch: Dispatcher, getState: GetState, extraArgument: Any?) -> Any): Thunk2 {
+    return object : Thunk2 {
+        override fun dispatch(dispatch: Dispatcher, getState: GetState, extraArgument: Any?): Any =
+                thunkLambda(dispatch, getState, extraArgument)
+
+    }
+
 }
 
 fun createThunkMiddleware2(extraArgument: Any? = null): ThunkMiddleware =
         { store ->
             { next: Dispatcher ->
                 { action: Any ->
                     if (action is Thunk2) {
+                        createThunk { dispatch, getState, extraArgument -> }
                         try {
                             action.dispatch(store.dispatch, store.getState, extraArgument)
                         } catch (e: Exception) {

common/src/commonMain/kotlin/com/willowtreeapps/common/external/PresenterInjecter.kt

@@ -30,9 +30,10 @@ interface PresenterProvider<S : Any> {
 interface ViewWithProvider<S : Any> : View<S>, PresenterProvider<S>
 
 /**
- * PresenterFactory that creates presenters for all views in the application.
- * Each view must attach/detach itself as it becomes visible/not visible.
- * Attaching returns a presenter to the view.
+ * PresenterMiddleware that attaches presenters with views and calls subscribers (Presenters)
+ * to update the view when state changes.
+ * Each view must attach/detach itself as it becomes visible/not visible by dispatching AttachView or DetachView
+ * Attaching sets the presenter to the view.
  * PresenterFactory subscribes to changes in state, and passes state to presenters.
  */
 //TODO handle config changes on android where view has been destroyed and must be recreated.  Probably

common/src/commonMain/kotlin/com/willowtreeapps/common/middleware/DatabaseMiddleware.kt

@@ -5,18 +5,16 @@ import com.willowtreeapps.common.AppState
 import com.willowtreeapps.common.repo.BookDatabaseRepo
 import org.reduxkotlin.middleware
 
-class DatabaseMiddleware(private val bookDatabaseRepo: BookDatabaseRepo) {
-    val middleware = middleware { store, next, action ->
-        when (action) {
-            is Actions.AddCurrentToCompleted ->
-                bookDatabaseRepo.insertCompleted((store.state as AppState).selectedBook!!)
-            is Actions.AddCurrentToRead ->
-                bookDatabaseRepo.insertToRead((store.state as AppState).selectedBook!!)
-            is Actions.LoadToRead ->
-                next(Actions.ToReadLoaded(bookDatabaseRepo.loadToRead()))
-            is Actions.LoadCompleted ->
-                next(Actions.CompletedLoaded(bookDatabaseRepo.loadCompleted()))
-        }
-        next(action)
+fun databaseMiddleware(bookDatabaseRepo: BookDatabaseRepo) = middleware { store, next, action ->
+    when (action) {
+        is Actions.AddCurrentToCompleted ->
+            bookDatabaseRepo.insertCompleted((store.state as AppState).selectedBook!!)
+        is Actions.AddCurrentToRead ->
+            bookDatabaseRepo.insertToRead((store.state as AppState).selectedBook!!)
+        is Actions.LoadToRead ->
+            next(Actions.ToReadLoaded(bookDatabaseRepo.loadToRead()))
+        is Actions.LoadCompleted ->
+            next(Actions.CompletedLoaded(bookDatabaseRepo.loadCompleted()))
     }
+    next(action)
 }

common/src/commonMain/kotlin/com/willowtreeapps/common/middleware/LoggingMiddleware.kt

@@ -1,6 +1,5 @@
 package com.willowtreeapps.common.middleware
 
-import com.willowtreeapps.common.Actions
 import com.willowtreeapps.common.Logger
 import org.reduxkotlin.*
 
@@ -10,11 +9,3 @@ val loggerMiddleware = middleware { store, next, action ->
     Logger.d("********************************************")
     next(action)
 }
-
-val splitterMiddleware = middleware { store, next, action ->
-    val dispatch = store.dispatch
-    when(action) {
-        is Actions.NextBook -> dispatch(Actions.NextBook())
-    }
-    next(action)
-}

common/src/commonMain/kotlin/com/willowtreeapps/common/middleware/NavigationMiddleware.kt

@@ -2,23 +2,22 @@ package com.willowtreeapps.common.middleware
 
 import com.willowtreeapps.common.Actions
 import com.willowtreeapps.common.NavigationActions
-import org.reduxkotlin.Dispatcher
-import org.reduxkotlin.Store
+import org.reduxkotlin.Middleware
 
-internal class NavigationMiddleware(private val navigator: Navigator) {
-
-    fun dispatch(store: Store) = { next: Dispatcher ->
-        { action: Any ->
-            when (action) {
-                is NavigationActions.GotoScreen -> navigator.goto(action.screen)
-            }
-            next(action)
-            when (action) {
-                is Actions.PrevBook, is Actions.NextBook -> navigator.goto(Screen.BOOK_DETAILS)
+internal fun navigationMiddleware(navigator: Navigator): Middleware =
+        { store ->
+            { next ->
+                { action ->
+                    when (action) {
+                        is NavigationActions.GotoScreen -> navigator.goto(action.screen)
+                    }
+                    next(action)
+                    when (action) {
+                        is Actions.PrevBook, is Actions.NextBook -> navigator.goto(Screen.BOOK_DETAILS)
+                    }
+                }
             }
         }
-    }
-}
 
 enum class Screen {
     READING_LIST,