[WIP] refactor PresenterFactory to presenterMiddleware. update BaseViewController to handle attach/detach. created GlobalDispatch

Author: Patrick Jackson

android/src/main/java/com/jackson/openlibrary/BottomNavigationDialogFragment.kt

@@ -4,20 +4,14 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Toast
-import androidx.fragment.app.Fragment
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
-import com.jackson.openlibrary.store.CompletedFragment
-import com.willowtreeapps.common.AppState
-import com.willowtreeapps.common.NavigationActions
-import com.willowtreeapps.common.SelectorSubscriberBuilder
-import com.willowtreeapps.common.UiActions
-import com.willowtreeapps.common.middleware.Screen
+import com.willowtreeapps.common.*
+import com.willowtreeapps.common.external.AttachView
+import com.willowtreeapps.common.external.DetachView
+import com.willowtreeapps.common.external.SelectorSubscriberBuilder
 import com.willowtreeapps.common.ui.BottomNavSheet
-import com.willowtreeapps.common.ui.LibraryView
 import kotlinx.android.synthetic.main.fragment_bottomsheet.*
 import org.reduxkotlin.Dispatcher
-import java.lang.IllegalArgumentException
 
 class BottomNavigationDrawerFragment : BottomSheetDialogFragment(), BottomNavSheet {
 
@@ -31,12 +25,12 @@ class BottomNavigationDrawerFragment : BottomSheetDialogFragment(), BottomNavShe
 
     override fun onResume() {
         super.onResume()
-        OpenLibraryApp.gameEngine().attachView(this)
+        OpenLibraryApp.dispatch(AttachView(this))
     }
 
     override fun onPause() {
         super.onPause()
-        OpenLibraryApp.gameEngine().detachView(this)
+        OpenLibraryApp.dispatch(DetachView(this))
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {

android/src/main/java/com/jackson/openlibrary/MainActivity.kt

@@ -35,7 +35,7 @@ class MainActivity : AppCompatActivity() {
         fragTransaction.replace(R.id.nav_host_fragment, fragment, fragment::class.java.name)
         fragTransaction.commit()
         fab.setOnClickListener {
-            OpenLibraryApp.gameEngine().dispatch(UiActions.SearchBtnTapped())
+            OpenLibraryApp.dispatch(UiActions.SearchBtnTapped())
             fab.hide()
         }
 

android/src/main/java/com/jackson/openlibrary/OpenLibraryApp.kt

@@ -13,6 +13,7 @@ import com.willowtreeapps.common.LibraryApp
 import com.willowtreeapps.common.Logger
 import com.willowtreeapps.common.createDatabase
 import kotlinx.coroutines.Dispatchers
+import org.reduxkotlin.Dispatcher
 
 class OpenLibraryApp : Application() {
 
@@ -48,6 +49,8 @@ class OpenLibraryApp : Application() {
         lateinit var instance: OpenLibraryApp
 
         fun gameEngine() = instance.libraryApp
+        val dispatch
+            get() = instance.libraryApp.store.dispatch
     }
 }
 

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

@@ -2,14 +2,11 @@ package com.jackson.openlibrary.store
 
 import android.os.Bundle
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.LifecycleObserver
-import androidx.lifecycle.OnLifecycleEvent
-import com.willowtreeapps.common.Logger
 import com.jackson.openlibrary.OpenLibraryApp
-import com.willowtreeapps.common.AppState
-import com.willowtreeapps.common.SelectorSubscriberBuilder
-import com.willowtreeapps.common.ui.LibraryProvider
+import com.willowtreeapps.common.*
+import com.willowtreeapps.common.external.AttachView
+import com.willowtreeapps.common.external.DetachView
+import com.willowtreeapps.common.external.SelectorSubscriberBuilder
 import com.willowtreeapps.common.ui.LibraryView
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -39,7 +36,7 @@ open class BaseLibraryViewFragment<V: LibraryView>: Fragment(), LibraryView, Cor
 
     override fun onResume() {
         super.onResume()
-        OpenLibraryApp.gameEngine().attachView(this)
+        OpenLibraryApp.dispatch(AttachView(this))
         if (viewRecreated) {
             //TODO update view with all state
 //            presenter?.recreateView()
@@ -48,7 +45,7 @@ open class BaseLibraryViewFragment<V: LibraryView>: Fragment(), LibraryView, Cor
 
     override fun onPause() {
         super.onPause()
-        OpenLibraryApp.gameEngine().detachView(this)
+        OpenLibraryApp.dispatch(DetachView(this))
     }
 }
 

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

@@ -58,7 +58,7 @@ class BookViewHolder(itemView: View): RecyclerView.ViewHolder(itemView) {
         GlideApp.with(itemView)
                 .load(book.coverImageUrl)
                 .into(itemView.ivBookCover)
-        itemView.setOnClickListener { OpenLibraryApp.gameEngine().dispatch(UiActions.BookTapped(book)) }
+        itemView.setOnClickListener { OpenLibraryApp.dispatch(UiActions.BookTapped(book)) }
     }
 
 }

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

@@ -40,11 +40,6 @@ class ReadingListFragment : BaseLibraryViewFragment<ReadingListView>(), Coroutin
         (activity as MainActivity).showFab()
     }
 
-    override fun onPause() {
-        super.onPause()
-        OpenLibraryApp.gameEngine().detachView(this)
-    }
-
     override fun hideLoading() {
         loading_spinner.visibility = View.GONE
     }

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

@@ -3,9 +3,8 @@ package com.willowtreeapps.common
 import com.willowtreeapps.common.middleware.Screen
 import com.willowtreeapps.common.repo.Book
 import com.willowtreeapps.common.ui.BookListItemViewState
-import com.willowtreeapps.common.ui.View
 
-sealed class Actions {
+internal sealed class Actions {
 
 
     class FetchingItemsStartedAction
@@ -22,27 +21,13 @@ sealed class Actions {
     data class ToReadLoaded(val books: List<Book>)
     class LoadCompleted
     data class CompletedLoaded(val books: List<Book>)
-    data class AttachView<S: Any>(val view: View<S>)
 
     class NextBook
     class PrevBook
 }
 
-sealed class UiActions {
-    //Should we fire event when screen shown? or always navigate to a screen
-    class ReadingListShown
-    class CompletedListShown
-    class SearchBtnTapped
-    class ReadingListBtnTapped
-    class CompletedListBtnTapped
-    class BookTapped(val book: BookListItemViewState)
-    data class SearchQueryEntered(val query: String)
-    class AddToReadingButtonTapped
-    class RemoveFromReadingButtonTapped
-    class AddToCompletedButtonTapped
-    class RemoveFromCompletedButtonTapped
-}
 
-sealed class NavigationActions {
+
+internal sealed class NavigationActions {
     data class GotoScreen(val screen: Screen)
 }

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

@@ -1,14 +1,14 @@
 package com.willowtreeapps.common
 
 import com.willowtree.common.LibraryDatabase
+import com.willowtreeapps.common.external.coroutineDispatcher
+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.LibraryProvider
-import com.willowtreeapps.common.ui.LibraryView
-import com.willowtreeapps.common.ui.PresenterFactory
+import com.willowtreeapps.common.ui.*
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import org.reduxkotlin.combineReducers
@@ -22,11 +22,13 @@ class LibraryApp(navigator: Navigator,
     private val localStorageRepo = BookDatabaseRepo(libraryDatabase)
     private val databaseMiddleware = DatabaseMiddleware(localStorageRepo)
     private val bookRepository: BookRepository by lazy { KtorOpenBookRepository(networkContext) }
-    private val presenterFactory by lazy { PresenterFactory(this, uiContext) }
     override val networkThunks = NetworkThunks(networkContext, bookRepository)
 
     val store by lazy {
-        createStore(combineReducers(reducer, navigationReducer), AppState.INITIAL_STATE, applyMiddleware(createThunkMiddleware2(),
+        createStore(combineReducers(reducer, navigationReducer), AppState.INITIAL_STATE, applyMiddleware(
+                presenterMiddleware<AppState, LibraryView>(uiContext),
+                coroutineDispatcher(uiContext),
+                createThunkMiddleware2(),
                 uiActionMiddleware(networkThunks),
                 databaseMiddleware.middleware,
                 navigationMiddleware::dispatch,
@@ -36,21 +38,12 @@ class LibraryApp(navigator: Navigator,
     init {
         CoroutineScope(uiContext).launch {
             //do any initialization here
-            dispatch(NavigationActions.GotoScreen(state.currentScreen))
-        }
-    }
-
-    fun dispatch(action: Any) {
-        CoroutineScope(uiContext).launch {
-            store.dispatch(action)
+            store.dispatch(NavigationActions.GotoScreen(state.currentScreen))
         }
     }
 
     val state: AppState
         get() = store.state as AppState
+}
 
-    fun <V : LibraryView> attachView(view: V) = presenterFactory.attachView(view)
-
-    fun detachView(view: LibraryView) = presenterFactory.detachView(view)
 
-}

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

@@ -0,0 +1,5 @@
+package com.willowtreeapps.common
+
+interface LibraryProvider {
+    val networkThunks: NetworkThunks
+}

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

@@ -0,0 +1,20 @@
+package com.willowtreeapps.common
+
+import com.willowtreeapps.common.ui.BookListItemViewState
+
+sealed class UiActions {
+    //Should we fire event when screen shown? or always navigate to a screen
+    class ReadingListShown
+    class CompletedListShown
+    class SearchBtnTapped
+    class ReadingListBtnTapped
+    class CompletedListBtnTapped
+    class BookTapped(val book: BookListItemViewState)
+    data class SearchQueryEntered(val query: String)
+    class AddToReadingButtonTapped
+    class RemoveFromReadingButtonTapped
+    class AddToCompletedButtonTapped
+    class RemoveFromCompletedButtonTapped
+
+
+}