clean up

Patrick Jackson · Patrick Jackson · commit d494ac95caf9 · 2019-08-04T21:28:21.000-04:00
diff --git a/android/src/main/java/com/jackson/openlibrary/BottomNavigationDialogFragment.kt b/android/src/main/java/com/jackson/openlibrary/BottomNavigationDialogFragment.kt
@@ -5,11 +5,11 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
-import com.willowtreeapps.common.*
 import com.willowtreeapps.common.external.AttachView
 import com.willowtreeapps.common.external.DetachView
 import com.willowtreeapps.common.external.rootDispatch
 import com.willowtreeapps.common.ui.BottomNavSheet
+import com.willowtreeapps.common.ui.UiActions
 import kotlinx.android.synthetic.main.fragment_bottomsheet.*
 
 class BottomNavigationDrawerFragment : BottomSheetDialogFragment(), BottomNavSheet {
diff --git a/android/src/main/java/com/jackson/openlibrary/MainActivity.kt b/android/src/main/java/com/jackson/openlibrary/MainActivity.kt
@@ -6,7 +6,7 @@ import android.view.*
 import androidx.appcompat.app.AppCompatActivity
 import com.bumptech.glide.annotation.GlideModule
 import com.bumptech.glide.module.AppGlideModule
-import com.willowtreeapps.common.UiActions
+import com.willowtreeapps.common.ui.UiActions
 import com.willowtreeapps.hyperion.core.Hyperion
 import kotlinx.android.synthetic.main.activity_main.*
 
diff --git a/android/src/main/java/com/jackson/openlibrary/store/BooksAdapter.kt b/android/src/main/java/com/jackson/openlibrary/store/BooksAdapter.kt
@@ -7,7 +7,7 @@ import androidx.recyclerview.widget.RecyclerView
 import com.jackson.openlibrary.GlideApp
 import com.jackson.openlibrary.OpenLibraryApp
 import com.jackson.openlibrary.R
-import com.willowtreeapps.common.UiActions
+import com.willowtreeapps.common.ui.UiActions
 import com.willowtreeapps.common.ui.BookListItemViewState
 import com.willowtreeapps.common.ui.ListHeader
 import kotlinx.android.synthetic.main.item_book.view.*
diff --git a/android/src/main/java/com/jackson/openlibrary/store/CompletedFragment.kt b/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.UiActions
+import com.willowtreeapps.common.ui.UiActions
 import com.willowtreeapps.common.external.rootDispatch
 import com.willowtreeapps.common.ui.CompletedView
 import kotlinx.android.synthetic.main.fragment_completed.*
diff --git a/android/src/main/java/com/jackson/openlibrary/store/DetailsFragment.kt b/android/src/main/java/com/jackson/openlibrary/store/DetailsFragment.kt
@@ -4,10 +4,9 @@ import android.os.Bundle
 import android.view.*
 import com.jackson.openlibrary.GlideApp
 import com.jackson.openlibrary.MainActivity
-import com.jackson.openlibrary.OpenLibraryApp.Companion.dispatch
 import com.jackson.openlibrary.R
 import com.jackson.openlibrary.tintAllIcons
-import com.willowtreeapps.common.UiActions
+import com.willowtreeapps.common.ui.UiActions
 import com.willowtreeapps.common.external.rootDispatch
 import com.willowtreeapps.common.ui.BookDetailViewState
 import com.willowtreeapps.common.ui.DetailsView
diff --git a/android/src/main/java/com/jackson/openlibrary/store/ReadingListFragment.kt b/android/src/main/java/com/jackson/openlibrary/store/ReadingListFragment.kt
@@ -12,7 +12,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlin.coroutines.CoroutineContext
 import com.jackson.openlibrary.R
-import com.willowtreeapps.common.UiActions
+import com.willowtreeapps.common.ui.UiActions
 import com.willowtreeapps.common.external.rootDispatch
 
 
diff --git a/android/src/main/java/com/jackson/openlibrary/store/SearchFragment.kt b/android/src/main/java/com/jackson/openlibrary/store/SearchFragment.kt
@@ -7,19 +7,15 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.jackson.openlibrary.OpenLibraryApp
 import com.jackson.openlibrary.R
-import com.willowtreeapps.common.UiActions
+import com.willowtreeapps.common.ui.UiActions
 import com.willowtreeapps.common.external.rootDispatch
 import com.willowtreeapps.common.ui.BookListItemViewState
 import com.willowtreeapps.common.ui.SearchView
 import kotlinx.android.synthetic.main.fragment_search.*
 import kotlinx.android.synthetic.main.fragment_reading_list.loading_spinner
 import kotlinx.android.synthetic.main.fragment_reading_list.txt_error
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
 import java.util.*
-import kotlin.coroutines.CoroutineContext
 
 class SearchFragment : BaseLibraryViewFragment<SearchView>(), SearchView {
     private val adapter = BooksAdapter()
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/Actions.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/Actions.kt
@@ -5,8 +5,6 @@ import com.willowtreeapps.common.repo.Book
 import com.willowtreeapps.common.ui.BookListItemViewState
 
 internal sealed class Actions {
-
-
     class FetchingItemsStartedAction
     data class FetchingItemsSuccessAction(val itemsHolder: List<Book>)
     data class FetchingItemsFailedAction(val message: String)
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/NetworkThunks.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/NetworkThunks.kt
@@ -15,7 +15,7 @@ class NetworkThunks(private val networkContext: CoroutineContext,
     override val coroutineContext: CoroutineContext
         get() = networkContext + job
 
-    fun fetchBooksThunk2(query: String) = createThunk { dispatch, getState, extraArgument ->
+    fun fetchBooksThunk(query: String) = createThunk { dispatch, getState, extraArgument ->
         Logger.d("Fetching Books and Feed")
         launch {
             dispatch(Actions.FetchingItemsStartedAction())
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/external/PresenterInjecter.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/external/PresenterInjecter.kt
@@ -11,13 +11,15 @@ data class DetachView(val view: Any)
 data class ClearView(val view: Any)
 
 /*
- * All views implement this interface.  The PresenterFactory handles setting and removing references
- * to the dispatch() and a selectorBuilder.
+ * Dispatch set by PresenterMiddleware that is same function as the store's dispatch.
+ * It is globally accessible and value is set when createStore is called.
  */
-interface View {
-////    var dispatch: Dispatcher
-////    var selectorBuilder: SelectorSubscriberBuilder<S>?
-}
+lateinit var rootDispatch: Dispatcher
+
+/*
+ * All views implement this interface.
+ */
+interface View
 
 
 interface PresenterProvider {
@@ -33,7 +35,6 @@ enum class ViewLifecycle {
 
 data class StoreSubscriberHolder(val lifecycleState: ViewLifecycle, val subscriber: StoreSubscriber)
 
-lateinit var rootDispatch: Dispatcher
 val presenterEnhancer: StoreEnhancer = { storeCreator: StoreCreator ->
     { reducer: Reducer, initialState: Any, en: Any? ->
         val store = storeCreator(reducer, initialState, en)
@@ -70,7 +71,6 @@ fun presenterMiddleware(uiContext: CoroutineContext): Middleware = { store ->
 
     fun attachView(view: ViewWithProvider) {
         Logger.d("AttachView: $view", Logger.Category.LIFECYCLE)
-//        view.dispatch = store.dispatch
         //TODO is hanging onto subscription needed?
         if (subscription == null) {
             subscription = store.subscribe(::onStateChange)
@@ -175,15 +175,10 @@ fun <State : Any, V : Any> selectorSubscriberFn(store: Store, view: V, selectorS
     val subscriberBuilder: SelectorSubscriberBuilder<State> = SelectorSubscriberBuilder(store)
     subscriberBuilder.selectorSubscriberBuilderInit()
     selectorSubscriberMap[view] = subscriberBuilder
-    /*
-    view.selectorBuilder = SelectorSubscriberBuilder(store)
-    view.selectorBuilder!!.selectorSubscriberBuilderInit()
-     */
     return {
         selectorSubscriberMap[view]!!.selectorList.forEach { entry ->
             (entry.key as Selector<State, *>).onChangeIn(store.getState() as State) { entry.value(store.getState()) }
         }
         selectorSubscriberMap[view]!!.withAnyChangeFun?.invoke()
-//        view.selectorBuilder!!.withAnyChangeFun?.invoke()
     }
 }
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/middleware/UiMiddleware.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/middleware/UiMiddleware.kt
@@ -3,7 +3,7 @@ package com.willowtreeapps.common.middleware
 import com.willowtreeapps.common.Actions
 import com.willowtreeapps.common.NavigationActions
 import com.willowtreeapps.common.NetworkThunks
-import com.willowtreeapps.common.UiActions
+import com.willowtreeapps.common.ui.UiActions
 import org.reduxkotlin.middleware
 
 /**
@@ -13,7 +13,7 @@ fun uiActionMiddleware(networkThunks: NetworkThunks) = middleware { store, next,
     val dispatch = store.dispatch
     val result = next(action)
     when (action) {
-        is UiActions.SearchQueryEntered -> dispatch(networkThunks.fetchBooksThunk2(action.query))
+        is UiActions.SearchQueryEntered -> dispatch(networkThunks.fetchBooksThunk(action.query))
         is UiActions.BookTapped -> {
             dispatch(Actions.BookSelected(action.book))
             dispatch(NavigationActions.GotoScreen(Screen.BOOK_DETAILS))
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/repo/LibraryDatabase.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/repo/LibraryDatabase.kt
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/CompletedPresenter.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/CompletedPresenter.kt
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/CompletedView.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/CompletedView.kt
@@ -1,5 +1,6 @@
 package com.willowtreeapps.common.ui
 
+import com.willowtreeapps.common.boundary.toBookListViewState
 import com.willowtreeapps.common.external.ViewWithProvider
 
 
@@ -10,3 +11,22 @@ interface CompletedView : ViewWithProvider {
     fun showBooks(books: List<Any>)
     override fun presenter() = completedPresenter
 }
+
+const val COMPLETED_TITLE = "Completed"
+
+val completedPresenter = presenter<CompletedView> {
+    {
+        +{ state.completedList } + { showBooks(state.completedList.toList().toBookListViewState(COMPLETED_TITLE)) }
+        +{ state.isLoadingItems } + {
+            if (state.isLoadingItems) {
+                showLoading()
+            } else {
+                hideLoading()
+            }
+        }
+
+        +{ state.errorLoadingItems } + {
+            showError(state.errorMsg)
+        }
+    }
+}
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/DetailsPresenter.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/DetailsPresenter.kt
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/DetailsView.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/DetailsView.kt
@@ -1,8 +1,14 @@
 package com.willowtreeapps.common.ui
 
+import com.willowtreeapps.common.boundary.toBookDetailsViewState
 import com.willowtreeapps.common.external.ViewWithProvider
 
 interface DetailsView: ViewWithProvider{
     fun render(detailsViewState: BookDetailViewState)
     override fun presenter() = detailsPresenter
 }
+val detailsPresenter = presenter<DetailsView> {
+    {
+        withAnyChange { render(state.selectedBook!!.toBookDetailsViewState()) }
+    }
+}
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/LibraryBaseView.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/LibraryBaseView.kt
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/ReadingListPresenter.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/ReadingListPresenter.kt
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/ReadingListView.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/ReadingListView.kt
@@ -1,5 +1,6 @@
 package com.willowtreeapps.common.ui
 
+import com.willowtreeapps.common.boundary.toBookListViewState
 import com.willowtreeapps.common.external.ViewWithProvider
 
 
@@ -10,3 +11,21 @@ interface ReadingListView : ViewWithProvider{
     fun showBooks(toReadBook: List<Any>)
     override fun presenter() = readingListPresenter
 }
+
+const val READING_LIST_TITLE = "Reading List"
+
+val readingListPresenter = presenter<ReadingListView> {
+    {
+        +{ state.readingList } + { showBooks(state.readingList.toBookListViewState(READING_LIST_TITLE)) }
+
+        +{ state.isLoadingItems } + {
+            if (state.isLoadingItems) {
+                showLoading()
+            } else {
+                hideLoading()
+            }
+        }
+
+        +{ state.errorLoadingItems } + { showError(state.errorMsg) }
+    }
+}
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/SearchPresenter.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/SearchPresenter.kt
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/SearchView.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/SearchView.kt
@@ -1,5 +1,6 @@
 package com.willowtreeapps.common.ui
 
+import com.willowtreeapps.common.boundary.toBookListViewState
 import com.willowtreeapps.common.external.ViewWithProvider
 
 
@@ -11,6 +12,27 @@ interface SearchView : ViewWithProvider {
     override fun presenter() = searchPresenter
 }
 
+val searchPresenter = presenter<SearchView> {
+    {
+        select { state.isLoadingItems } then {
+            if (state.isLoadingItems) {
+                showLoading()
+            } else {
+                hideLoading()
+            }
+        }
+
+        +{ state.searchBooks } + { showResults(state.searchBooks.toBookListViewState()) }
+        select { state.searchBooks } then { showResults(state.searchBooks.toBookListViewState()) }
+    }
+}
+
+val searchP3 = presenterWithViewArg<SearchView> { view ->
+    {
+        select { state.isLoadingItems } then { view.showLoading() }
+    }
+}
+
 interface BottomNavSheet: ViewWithProvider {
     override fun presenter() = presenter<BottomNavSheet> { {
         // no op
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/UiActions.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/UiActions.kt
@@ -1,7 +1,10 @@
-package com.willowtreeapps.common
-
-import com.willowtreeapps.common.ui.BookListItemViewState
+package com.willowtreeapps.common.ui
 
+/**
+ * Actions to be dispatched from the UI layer.  This are the only actions
+ * that should be dispatched by the UI.  These actions are handled by the UiMiddleware
+ * and dispatches appropriate and reusable actions.
+ */
 sealed class UiActions {
     //Should we fire event when screen shown? or always navigate to a screen
     class ReadingListShown
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/ViewStates.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/ViewStates.kt
@@ -2,6 +2,9 @@ package com.willowtreeapps.common.ui
 
 import com.willowtreeapps.common.repo.Book
 
+/**
+ * ViewStates are data in format needed to display.
+ */
 
 data class BookListItemViewState(
         val title: String,
