[WIP] reading list working

Author: Patrick Jackson

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

@@ -31,10 +31,10 @@ class DetailsFragment : BaseLibraryViewFragment<DetailsView>(), CoroutineScope,
                 .load(bookViewState.coverImageUrl)
                 .into(imgBook)
         btnToRead.setOnClickListener {
-            dispatch(Actions.AddToRead(bookViewState.book))
+            dispatch(Actions.AddCurrentToRead())
         }
         btnCompleted.setOnClickListener {
-            dispatch(Actions.AddToCompleted(bookViewState.book))
+            dispatch(Actions.AddCurrentToCompleted())
         }
     }
 }

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

@@ -12,8 +12,8 @@ sealed class Actions {
 
     data class BookSelected(val book: BookListItemViewState)
 
-    data class AddToCompleted(val book: Book)
-    data class AddToRead(val book: Book)
+    class AddCurrentToCompleted
+    class AddCurrentToRead
 
 
     class LoadAllSettingsAction

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

@@ -46,7 +46,6 @@ class NetworkThunks(private val networkContext: CoroutineContext,
     fun fetchBooks(query: String): Thunk = { dispatch, getState, extraArgument ->
         Logger.d("Fetching Books and Feed")
         launch {
-            Logger.d("INSIDE FetchBooks 1")
             dispatch(Actions.FetchingItemsStartedAction())
             val result = repo.search(query)
             if (result.isSuccessful) {
@@ -63,7 +62,6 @@ class NetworkThunks(private val networkContext: CoroutineContext,
         override fun dispatch(dispatch: Dispatcher, getState: GetState, extraArgument: Any?) {
             Logger.d("Fetching Books and Feed")
             launch {
-                Logger.d("INSIDE FetchBooks 1")
                 dispatch(Actions.FetchingItemsStartedAction())
                 val result = repo.search(query)
                 if (result.isSuccessful) {
@@ -86,22 +84,14 @@ fun createThunkMiddleware2(extraArgument: Any? = null): ThunkMiddleware =
         { store ->
             { next: Dispatcher ->
                 { action: Any ->
-                    Logger.d("INSIDE ThunkMiddleware 1: $action")
                     if (action is Thunk2) {
-                        Logger.d("INSIDE ThunkMiddleware 2: ")
                         try {
-                            Logger.d("dispatch thunk 1: ${store.dispatch}")
-                            Logger.d("dispatch thunk 2: ${store.getState}")
-                            Logger.d("dispatch thunk 3: ${extraArgument}")
-                            Logger.d("dispatch thunk 4: $action")
                             action.dispatch(store.dispatch, store.getState, extraArgument)
                         } catch (e: Exception) {
-                            Logger.d("INSIDE ThunkMiddleware 3: ${e.message}")
-                            throw IllegalArgumentException()
                             Logger.d("Dispatching functions must use type Thunk: " + e.message)
+                            throw IllegalArgumentException()
                         }
                     } else {
-                        Logger.d("INSIDE ThunkMiddleware 4: ")
                         next(action)
                     }
                 }

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

@@ -1,21 +1,22 @@
 package com.willowtreeapps.common.middleware
 
 import com.willowtreeapps.common.Actions
+import com.willowtreeapps.common.AppState
 import com.willowtreeapps.common.repo.BookDatabaseRepo
 import org.reduxkotlin.middleware
 
-class DatabaseMiddleware(val bookDatabaseRepo: BookDatabaseRepo) {
+class DatabaseMiddleware(private val bookDatabaseRepo: BookDatabaseRepo) {
     val middleware = middleware { store, next, action ->
         when (action) {
-            is Actions.AddToCompleted ->
-                bookDatabaseRepo.insertCompleted(action.book)
-            is Actions.AddToRead ->
-                bookDatabaseRepo.insertToRead(action.book)
+            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

@@ -4,6 +4,8 @@ import com.willowtreeapps.common.Logger
 import org.reduxkotlin.*
 
 val loggerMiddleware = middleware { store, next, action ->
-    Logger.d("DISPATCH action: $action")
+    Logger.d("********************************************")
+    Logger.d("* DISPATCHED action: $action")
+    Logger.d("********************************************")
     next(action)
 }

common/src/commonMain/kotlin/com/willowtreeapps/common/ui/PresenterFactory.kt

@@ -9,8 +9,8 @@ import org.reduxkotlin.*
 import kotlin.coroutines.CoroutineContext
 import kotlin.reflect.KClass
 
-interface LibraryView: ViewWithProvider<AppState>
-interface BaseLibraryView: View<AppState>
+interface LibraryView : ViewWithProvider<AppState>
+interface BaseLibraryView : View<AppState>
 
 fun testMiddleware(store: Store): (Dispatcher) -> Dispatcher {
     return { next: Dispatcher ->
@@ -76,11 +76,8 @@ class PresenterFactory(private val libraryApp: LibraryApp,
     private fun hasAttachedViews() = subscribers.isNotEmpty()
 
     private fun onStateChange() {
-        Logger.d("PresenterFactory::onStateChanged!")
         launch {
-            Logger.d("subscribers.size: ${subscribers.size}")
             subscribers.forEach {
-                Logger.d("Subscriber: ${it.key} + ${it.value}")
                 it.value()
             }
         }
@@ -106,7 +103,7 @@ interface PresenterProvider {
     fun presenter(): Presenter<View<AppState>> = throw NotImplementedError("Must implement this method to provide a presenterBuilder for ${this::class}")
 }
 
-interface ViewWithProvider<S: Any>: View<S>, PresenterProvider
+interface ViewWithProvider<S : Any> : View<S>, PresenterProvider
 
 //TODO handle config changes on android where view has been destroyed and must be recreated.  Probably
 //can be treated as if a new state - wipe out the selector cache and treat as new view?