add UiActions for ui events

Author: Patrick Jackson

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

@@ -5,7 +5,10 @@ import android.app.Application
 import android.content.Intent
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.Fragment
 import androidx.navigation.findNavController
+import com.jackson.openlibrary.store.CompletedFragment
+import com.jackson.openlibrary.store.ReadingListFragment
 import com.willowtreeapps.common.Logger
 import com.willowtreeapps.common.middleware.Navigator
 import com.willowtreeapps.common.middleware.Screen
@@ -28,16 +31,24 @@ class AndroidNavigator : Navigator, Application.ActivityLifecycleCallbacks {
             cachedNavigationScreen = screen
         } else {
 //            val navController = currentActivity!!.findNavController(R.id.nav_host_fragment)
+
             when (screen) {
-//                Screen.QUESTION -> navController.navigate(R.id.action_startScreen_to_questionScreen)
-//                Screen.GAME_COMPLETE -> navController.navigate(R.id.action_questionScreen_to_resultsFragment)
                 Screen.BOOK_DETAILS -> currentActivity?.startActivity(Intent(currentActivity, DetailsActivity::class.java))
-//                Screen.START -> navController.navigate(R.id.action_resultsFragment_to_startScreen)
+                Screen.COMPLETED_LIST -> navigateToFragment(currentActivity!!.supportFragmentManager.findFragmentByTag(CompletedFragment::class.java.name)
+                        ?: CompletedFragment())
+                Screen.READING_LIST -> navigateToFragment(currentActivity!!.supportFragmentManager.findFragmentByTag(ReadingListFragment::class.java.name)
+                        ?: ReadingListFragment())
                 else -> throw IllegalArgumentException("Screen $screen is not handled in AndroidNavigator")
             }
         }
     }
 
+    private fun navigateToFragment(fragment: Fragment) {
+        val fragTransaction = currentActivity!!.supportFragmentManager.beginTransaction()
+        fragTransaction.replace(R.id.nav_host_fragment, fragment, fragment::class.java.name)
+        fragTransaction.commit()
+    }
+
     override fun onActivityPaused(activity: Activity?) {
     }
 

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

@@ -8,21 +8,42 @@ import android.widget.Toast
 import androidx.fragment.app.Fragment
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import com.jackson.openlibrary.store.CompletedFragment
-import com.jackson.openlibrary.store.ReadingListFragment
+import com.willowtreeapps.common.AppState
+import com.willowtreeapps.common.NavigationActions
+import com.willowtreeapps.common.SelectorSubscriberBuilder
+import com.willowtreeapps.common.middleware.Screen
+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() {
+class BottomNavigationDrawerFragment : BottomSheetDialogFragment(), BottomNavSheet {
+
+    override lateinit var dispatch: Dispatcher
+    override var selectorBuilder: SelectorSubscriberBuilder<AppState>? = null
+
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         return inflater.inflate(R.layout.fragment_bottomsheet, container, false)
     }
 
+    override fun onResume() {
+        super.onResume()
+        OpenLibraryApp.gameEngine().attachView(this)
+    }
+
+    override fun onPause() {
+        super.onPause()
+        OpenLibraryApp.gameEngine().detachView(this)
+    }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         navigation_view.setNavigationItemSelectedListener { menuItem ->
             // Bottom Navigation Drawer menu item clicks
 
-            val fragment: Fragment = when (menuItem!!.itemId) {
+            /*
+            val fragment: Fragment = when (menuItem.itemId) {
                 R.id.readingList -> {
                     fragmentManager?.findFragmentByTag(ReadingListFragment::class.java.name)
                             ?: ReadingListFragment()
@@ -37,6 +58,11 @@ class BottomNavigationDrawerFragment : BottomSheetDialogFragment() {
             val fragTransaction = fragmentManager?.beginTransaction()
             fragTransaction?.replace(R.id.nav_host_fragment, fragment, fragment::class.java.name)
             fragTransaction?.commit()
+             */
+            when (menuItem.itemId) {
+                R.id.readingList -> dispatch(NavigationActions.GotoScreen(Screen.READING_LIST))
+                R.id.completedList -> dispatch(NavigationActions.GotoScreen(Screen.COMPLETED_LIST))
+            }
             dismiss()
 
             true

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

@@ -2,6 +2,9 @@ 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
@@ -13,15 +16,16 @@ import kotlinx.coroutines.Dispatchers
 import org.reduxkotlin.Dispatcher
 import kotlin.coroutines.CoroutineContext
 
-open class BaseLibraryViewFragment<V: LibraryView>: Fragment(),
-        CoroutineScope, LibraryView, LibraryProvider by OpenLibraryApp.gameEngine() {
+open class BaseLibraryViewFragment<V: LibraryView>: Fragment(), LibraryView, CoroutineScope,
+        LibraryProvider by OpenLibraryApp.gameEngine() {
+
+    private var viewRecreated: Boolean = false
     override lateinit var dispatch: Dispatcher
     override var selectorBuilder: SelectorSubscriberBuilder<AppState>? = null
 
     override val coroutineContext: CoroutineContext
         get() = Dispatchers.Main
 
-    private var viewRecreated: Boolean = false
 
     override fun onViewCreated(view: android.view.View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
@@ -47,3 +51,5 @@ open class BaseLibraryViewFragment<V: LibraryView>: Fragment(),
         OpenLibraryApp.gameEngine().detachView(this)
     }
 }
+
+

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

@@ -8,7 +8,8 @@ import com.jackson.openlibrary.GlideApp
 import com.jackson.openlibrary.OpenLibraryApp
 import com.jackson.openlibrary.R
 import com.willowtreeapps.common.Actions
-import com.willowtreeapps.common.BookListItemViewState
+import com.willowtreeapps.common.UiActions
+import com.willowtreeapps.common.ui.BookListItemViewState
 import com.willowtreeapps.common.ui.ListHeader
 import kotlinx.android.synthetic.main.item_book.view.*
 import kotlinx.android.synthetic.main.item_list_header.view.*
@@ -57,7 +58,7 @@ class BookViewHolder(itemView: View): RecyclerView.ViewHolder(itemView) {
         GlideApp.with(itemView)
                 .load(book.coverImageUrl)
                 .into(itemView.ivBookCover)
-        itemView.setOnClickListener { OpenLibraryApp.gameEngine().dispatch(Actions.BookSelected(book)) }
+        itemView.setOnClickListener { OpenLibraryApp.gameEngine().dispatch(UiActions.BookTapped(book)) }
     }
 
 }

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

@@ -7,7 +7,8 @@ import android.view.ViewGroup
 import com.jackson.openlibrary.GlideApp
 import com.jackson.openlibrary.R
 import com.willowtreeapps.common.Actions
-import com.willowtreeapps.common.BookListItemViewState
+import com.willowtreeapps.common.UiActions
+import com.willowtreeapps.common.ui.BookDetailViewState
 import com.willowtreeapps.common.ui.*
 import kotlinx.android.synthetic.main.fragment_book_detail.*
 import kotlinx.coroutines.CoroutineScope
@@ -24,17 +25,17 @@ class DetailsFragment : BaseLibraryViewFragment<DetailsView>(), CoroutineScope,
         return inflater.inflate(R.layout.fragment_book_detail, container, false)
     }
 
-    override fun render(bookViewState: BookListItemViewState) {
-        txtTitle.text = bookViewState.title
-        txtAuthorName.text = bookViewState.author
+    override fun render(vs: BookDetailViewState) {
+        txtTitle.text = vs.book.title
+        txtAuthorName.text = vs.book.author
         GlideApp.with(this)
-                .load(bookViewState.coverImageUrl)
+                .load(vs.book.coverImageUrl)
                 .into(imgBook)
         btnToRead.setOnClickListener {
-            dispatch(Actions.AddCurrentToRead())
+            dispatch(UiActions.AddToReadingButtonTapped())
         }
         btnCompleted.setOnClickListener {
-            dispatch(Actions.AddCurrentToCompleted())
+            dispatch(UiActions.AddToCompletedButtonTapped())
         }
     }
 }

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

@@ -4,18 +4,14 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.LinearLayout
-import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.jackson.openlibrary.OpenLibraryApp
 import com.willowtreeapps.common.Actions
-import com.willowtreeapps.common.BookListItemViewState
 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 android.graphics.drawable.InsetDrawable
 import com.jackson.openlibrary.R
 
 

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

@@ -9,7 +9,8 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.jackson.openlibrary.OpenLibraryApp
 import com.jackson.openlibrary.R
-import com.willowtreeapps.common.BookListItemViewState
+import com.willowtreeapps.common.UiActions
+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
@@ -43,9 +44,7 @@ class SearchFragment : BaseLibraryViewFragment<SearchView>(), CoroutineScope, Se
                 timer = Timer()
                 timer?.schedule(object: TimerTask() {
                     override fun run() {
-                        //could be a regular action with network middleware?
-                        dispatch(OpenLibraryApp.gameEngine().networkThunks.fetchBooks(s.toString()))
-//                        presenter?.onTextChanged(s.toString())
+                        dispatch(UiActions.SearchQueryEntered(s.toString()))
                     }
 
                 }, 1000)

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

@@ -1,6 +1,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 {
@@ -16,13 +18,28 @@ sealed class Actions {
     class AddCurrentToRead
 
 
-    class LoadAllSettingsAction
-    data class ChangeNumQuestionsSettingsAction(val num: Int)
-    data class ChangeMicrophoneModeSettingsAction(val enabled: Boolean)
     class LoadToRead
     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 BookTapped(val book: BookListItemViewState)
+    data class SearchQueryEntered(val query: String)
+    class AddToReadingButtonTapped
+    class RemoveFromReadingButtonTapped
+    class AddToCompletedButtonTapped
+    class RemoveFromCompletedButtonTapped
 }
 
+sealed class NavigationActions {
+    data class GotoScreen(val screen: Screen)
+}

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

@@ -1,6 +1,7 @@
 package com.willowtreeapps.common
 
 import com.willowtreeapps.common.repo.Book
+import kotlin.reflect.KProperty0
 
 
 data class AppState(val isLoadingItems: Boolean = false,
@@ -9,11 +10,15 @@ data class AppState(val isLoadingItems: Boolean = false,
                     val errorLoadingItems: Boolean = false,
                     val toReadBook: Set<Book> = setOf(),
                     val completed: Set<Book> = setOf(),
+                    val currentList: KProperty0<Set<Book>>? = null,
                     val errorMsg: String = "",
                     val settings: UserSettings = UserSettings.defaults()) {
     companion object {
         val INITIAL_STATE = AppState()
     }
+
+
+    fun currentSearchIndex() = currentList?.invoke()?.indexOf(selectedBook) ?: 0
 }
 
 data class UserSettings(val numQuestions: Int,

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

@@ -11,7 +11,6 @@ import com.willowtreeapps.common.ui.LibraryView
 import com.willowtreeapps.common.ui.PresenterFactory
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
-import org.reduxkotlin.thunk
 import kotlin.coroutines.CoroutineContext
 
 class LibraryApp(navigator: Navigator,
@@ -23,19 +22,19 @@ class LibraryApp(navigator: Navigator,
     private val databaseMiddleware = DatabaseMiddleware(localStorageRepo)
     private val bookRepository: BookRepository by lazy { KtorOpenBookRepository(networkContext) }
     private val presenterFactory by lazy { PresenterFactory(this, uiContext) }
-//    val fetchBooks = fetchBooksThunk(networkContext, bookRepository)
     override val networkThunks = NetworkThunks(networkContext, bookRepository)
 
     val store by lazy {
         createStore(reducer, AppState.INITIAL_STATE, applyMiddleware(createThunkMiddleware2(),
+                uiActionMiddleware(networkThunks),
                 databaseMiddleware.middleware,
                 navigationMiddleware::dispatch,
                 loggerMiddleware))
     }
 
     init {
         CoroutineScope(uiContext).launch {
-            store.dispatch(Actions.LoadAllSettingsAction())
+            //do any initialization here
         }
     }