Merge pull request #1 from reduxkotlin/bugfix/bookselection

patjackson52 · web-flow · commit 92a199529377 · 2019-08-22T16:46:55.000-04:00
fix selecting books not working
diff --git a/android/src/main/java/org/reduxkotlin/readinglist/store/BooksAdapter.kt b/android/src/main/java/org/reduxkotlin/readinglist/store/BooksAdapter.kt
@@ -5,17 +5,16 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import org.reduxkotlin.readinglist.GlideApp
-import org.reduxkotlin.readinglist.OpenLibraryApp
-import org.reduxkotlin.readinglist.common.ui.UiActions
 import org.reduxkotlin.readinglist.common.ui.BookListItemViewState
 import org.reduxkotlin.readinglist.common.ui.ListHeader
 import kotlinx.android.synthetic.main.item_book.view.*
 import kotlinx.android.synthetic.main.item_list_header.view.*
 import org.reduxkotlin.readinglist.R
 
-class BooksAdapter: RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+class BooksAdapter(private val onClickListener: (Int) -> Unit): RecyclerView.Adapter<RecyclerView.ViewHolder>() {
     private var data = listOf<Any>()
 
+
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         val view = LayoutInflater.from(parent.context).inflate(viewType, parent, false)
         return when (viewType) {
@@ -38,7 +37,7 @@ class BooksAdapter: RecyclerView.Adapter<RecyclerView.ViewHolder>() {
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
         when (holder) {
             is HeaderViewHolder -> holder.bind((data[position] as ListHeader).title)
-            is BookViewHolder -> holder.bind(data[position] as BookListItemViewState)
+            is BookViewHolder -> holder.bind(data[position] as BookListItemViewState, onClickListener)
         }
     }
 
@@ -51,13 +50,13 @@ class BooksAdapter: RecyclerView.Adapter<RecyclerView.ViewHolder>() {
 
 class BookViewHolder(itemView: View): RecyclerView.ViewHolder(itemView) {
 
-    fun bind(book: BookListItemViewState) {
+    fun bind(book: BookListItemViewState, clickListener: (Int) -> Unit) {
         itemView.tvAuthor.text = book.author
         itemView.tvTitle.text = book.title
         GlideApp.with(itemView)
                 .load(book.coverImageUrl)
                 .into(itemView.ivBookCover)
-        itemView.setOnClickListener { OpenLibraryApp.dispatch(UiActions.BookTapped(adapterPosition)) }
+        itemView.setOnClickListener {clickListener(adapterPosition)}
     }
 
 }
diff --git a/android/src/main/java/org/reduxkotlin/readinglist/store/CompletedFragment.kt b/android/src/main/java/org/reduxkotlin/readinglist/store/CompletedFragment.kt
@@ -11,17 +11,12 @@ import org.reduxkotlin.readinglist.common.ui.CompletedView
 import kotlinx.android.synthetic.main.fragment_completed.*
 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 org.reduxkotlin.readinglist.R
 import org.reduxkotlin.rootDispatch
-import kotlin.coroutines.CoroutineContext
 
-class CompletedFragment : BaseLibraryViewFragment<CompletedView>(), CoroutineScope, CompletedView {
-    override val coroutineContext: CoroutineContext
-        get() = Dispatchers.Main
+class CompletedFragment : BaseLibraryViewFragment<CompletedView>(), CompletedView {
 
-    private val adapter = BooksAdapter()
+    private val adapter = BooksAdapter { pos -> rootDispatch(UiActions.CompletedBookTapped(pos - 1))}
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         return inflater.inflate(R.layout.fragment_completed, container, false)
diff --git a/android/src/main/java/org/reduxkotlin/readinglist/store/ReadingListFragment.kt b/android/src/main/java/org/reduxkotlin/readinglist/store/ReadingListFragment.kt
@@ -8,28 +8,21 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import org.reduxkotlin.readinglist.MainActivity
 import org.reduxkotlin.readinglist.common.ui.ReadingListView
 import kotlinx.android.synthetic.main.fragment_reading_list.*
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlin.coroutines.CoroutineContext
 import org.reduxkotlin.readinglist.R
 import org.reduxkotlin.readinglist.common.ui.UiActions
 import org.reduxkotlin.rootDispatch
 
 
-class ReadingListFragment : BaseLibraryViewFragment<ReadingListView>(), CoroutineScope, ReadingListView {
-
-
-    override val coroutineContext: CoroutineContext
-        get() = Dispatchers.Main
-
+class ReadingListFragment : BaseLibraryViewFragment<ReadingListView>(), ReadingListView {
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         return inflater.inflate(R.layout.fragment_reading_list, container, false)
     }
 
-    private val adapter = BooksAdapter()
+    private val adapter = BooksAdapter { pos -> rootDispatch(UiActions.ReadingListBookTapped(pos - 1))}
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
         toReadRecycler.adapter = adapter
         toReadRecycler.layoutManager = LinearLayoutManager(context)
     }
diff --git a/android/src/main/java/org/reduxkotlin/readinglist/store/SearchFragment.kt b/android/src/main/java/org/reduxkotlin/readinglist/store/SearchFragment.kt
@@ -20,7 +20,7 @@ import java.util.*
 
 
 class SearchFragment : BaseLibraryViewFragment<SearchView>(), SearchView {
-    private val adapter = BooksAdapter()
+    private val adapter = BooksAdapter {pos -> rootDispatch(UiActions.SearchBookTapped(pos))}
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         return inflater.inflate(R.layout.fragment_search, container, false)
diff --git a/common/build.gradle b/common/build.gradle
@@ -72,27 +72,6 @@ kotlin {
                 implementation "io.ktor:ktor-client-serialization-jvm:$ktorVersion"
             }
         }
-//        jvmMain {
-//            dependencies {
-//                implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
-//                implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion"
-//
-//                implementation "org.jetbrains.kotlinx:kotlinx-serialization-runtime:$serializationVersion"
-//
-//                implementation "io.ktor:ktor-client-core-jvm:$ktorVersion"
-//                implementation "io.ktor:ktor-client-json-jvm:$ktorVersion"
-//                implementation "io.ktor:ktor-client-logging-jvm:$ktorVersion"
-//                implementation "com.squareup.sqldelight:sqlite-driver:$sqldelightVersion"
-//                implementation "io.ktor:ktor-client-serialization-jvm:$ktorVersion"
-//            }
-//        }
-//        jvmTest {
-//            dependencies {
-//                implementation 'org.jetbrains.kotlin:kotlin-test'
-//                implementation 'org.jetbrains.kotlin:kotlin-test-junit'
-//            }
-//        }
-
         iosMain {
             dependencies {
                 implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core-native:$coroutinesVersion"
diff --git a/common/src/commonMain/kotlin/org/reduxkotlin/readinglist/common/Actions.kt b/common/src/commonMain/kotlin/org/reduxkotlin/readinglist/common/Actions.kt
@@ -2,13 +2,16 @@ package org.reduxkotlin.readinglist.common
 
 import org.reduxkotlin.readinglist.common.middleware.Screen
 import org.reduxkotlin.readinglist.common.repo.Book
+import kotlin.reflect.KProperty1
 
 internal sealed class Actions {
     class FetchingItemsStartedAction
     data class FetchingItemsSuccessAction(val itemsHolder: List<Book>)
     data class FetchingItemsFailedAction(val message: String)
 
-    data class BookSelected(val position: Int)
+    data class ReadingListBookSelected(val position: Int)
+    data class CompletedBookSelected(val position: Int)
+    data class SearchBookSelected(val position: Int)
 
     class AddCurrentToCompleted
     class AddCurrentToRead
diff --git a/common/src/commonMain/kotlin/org/reduxkotlin/readinglist/common/AppState.kt b/common/src/commonMain/kotlin/org/reduxkotlin/readinglist/common/AppState.kt
@@ -9,10 +9,10 @@ data class AppState(val isLoadingItems: Boolean = false,
                     val searchBooks: List<Book> = listOf(),
                     val selectedBook: Book? = null,
                     val errorLoadingItems: Boolean = false,
-                    val readingList: Set<Book> = setOf(),
-                    val completedList: Set<Book> = setOf(),
+                    val readingList: List<Book> = listOf(),
+                    val completedList: List<Book> = listOf(),
                     //experimental
-                    val currentList: KProperty0<Set<Book>>? = null,
+                    val currentList: KProperty0<List<Book>>? = null,
                     val errorMsg: String = "",
                     val currentScreen: Screen = Screen.READING_LIST,
                     val settings: UserSettings = UserSettings.defaults()) {
diff --git a/common/src/commonMain/kotlin/org/reduxkotlin/readinglist/common/Reducers.kt b/common/src/commonMain/kotlin/org/reduxkotlin/readinglist/common/Reducers.kt
@@ -19,13 +19,20 @@ val reducer: Reducer<AppState> = { state, action ->
                     searchBooks = action.itemsHolder)
         }
         is FetchingItemsFailedAction -> state.copy(isLoadingItems = false, errorLoadingItems = true, errorMsg = action.message)
-        is BookSelected -> {
+        is ReadingListBookSelected -> {
+            val book = state.readingList[action.position]
+            state.copy(selectedBook = book)
+        }
+        is CompletedBookSelected -> {
+            val book = state.completedList[action.position]
+            state.copy(selectedBook = book)
+        }
+        is SearchBookSelected -> {
             val book = state.searchBooks[action.position]
             state.copy(selectedBook = book)
         }
-
-        is ToReadLoaded -> state.copy(readingList = action.books.toSet())
-        is CompletedLoaded -> state.copy(completedList = action.books.toSet())
+        is ToReadLoaded -> state.copy(readingList = action.books)
+        is CompletedLoaded -> state.copy(completedList = action.books)
         is PrevBook -> state.copy(selectedBook = state.searchBooks[state.currentSearchIndex() - 1])
         is NextBook -> state.copy(selectedBook = state.searchBooks[state.currentSearchIndex() + 1])
 
diff --git a/common/src/commonMain/kotlin/org/reduxkotlin/readinglist/common/middleware/UiMiddleware.kt b/common/src/commonMain/kotlin/org/reduxkotlin/readinglist/common/middleware/UiMiddleware.kt
@@ -15,8 +15,16 @@ fun uiActionMiddleware(networkThunks: NetworkThunks) = middleware<AppState> { st
     val result = next(action)
     when (action) {
         is UiActions.SearchQueryEntered -> dispatch(networkThunks.fetchBooksThunk(action.query))
-        is UiActions.BookTapped -> {
-            dispatch(Actions.BookSelected(action.bookPosition))
+        is UiActions.ReadingListBookTapped -> {
+            dispatch(Actions.ReadingListBookSelected(action.position))
+            dispatch(NavigationActions.GotoScreen(Screen.BOOK_DETAILS))
+        }
+        is UiActions.CompletedBookTapped -> {
+            dispatch(Actions.CompletedBookSelected(action.position))
+            dispatch(NavigationActions.GotoScreen(Screen.BOOK_DETAILS))
+        }
+        is UiActions.SearchBookTapped -> {
+            dispatch(Actions.SearchBookSelected(action.position))
             dispatch(NavigationActions.GotoScreen(Screen.BOOK_DETAILS))
         }
         is UiActions.AddToCompletedButtonTapped -> dispatch(Actions.AddCurrentToCompleted())
diff --git a/common/src/commonMain/kotlin/org/reduxkotlin/readinglist/common/ui/UiActions.kt b/common/src/commonMain/kotlin/org/reduxkotlin/readinglist/common/ui/UiActions.kt
@@ -12,7 +12,9 @@ sealed class UiActions {
     class SearchBtnTapped
     class ReadingListBtnTapped
     class CompletedListBtnTapped
-    class BookTapped(val bookPosition: Int)
+    class ReadingListBookTapped(val position: Int)
+    class CompletedBookTapped(val position: Int)
+    class SearchBookTapped(val position: Int)
     data class SearchQueryEntered(val query: String)
     class AddToReadingButtonTapped
     class RemoveFromReadingButtonTapped
diff --git a/iOS/ReadingList/ReadingList/BookTableDelegate.swift b/iOS/ReadingList/ReadingList/BookTableDelegate.swift
@@ -3,9 +3,12 @@ import UIKit
 import common
 
 class BookTableDelegate: NSObject, UITableViewDataSource, UITableViewDelegate {
-    init(_ tableView: UITableView, d: @escaping (Any) -> Any) {
+    var clickListener: (Int) -> ()
+    
+    init(_ tableView: UITableView, _ clickListener: @escaping (Int) -> ()) {
         tableView.register(UINib(nibName: "TitleCell", bundle: nil), forCellReuseIdentifier: "titleCell")
         tableView.register(UINib(nibName: "BookCell", bundle: nil), forCellReuseIdentifier: "bookCell")
+        self.clickListener = clickListener
     }
     
     
@@ -45,7 +48,7 @@ class BookTableDelegate: NSObject, UITableViewDataSource, UITableViewDelegate {
     func tableView(_ tableView: UITableView,
                    didSelectRowAt indexPath: IndexPath) {
         if (bookList[indexPath.row] is BookListItemViewState) {
-            dispatch(UiActions.BookTapped(bookPosition: Int32(indexPath.row)))
+            clickListener(indexPath.row)
         }
     }
     
diff --git a/iOS/ReadingList/ReadingList/CompletedViewController.swift b/iOS/ReadingList/ReadingList/CompletedViewController.swift
@@ -42,7 +42,7 @@ class CompletedViewController: BaseViewController, CompletedView {
     
     func setupLayout() {
         tableView.rowHeight = 161
-        tableDelegate = BookTableDelegate(tableView, d: dispatch)
+        tableDelegate = BookTableDelegate(tableView, {pos in dispatch(UiActions.CompletedBookTapped(position: Int32(pos - 1)))})
         tableView.delegate = tableDelegate
         tableView.dataSource = tableDelegate
     }
diff --git a/iOS/ReadingList/ReadingList/ReadingListViewController.swift b/iOS/ReadingList/ReadingList/ReadingListViewController.swift
@@ -40,7 +40,7 @@ class ReadingListViewController: BaseViewController, ReadingListView {
     
     func setupLayout() {
         tableView.rowHeight = 161
-        tableDelegate = BookTableDelegate(tableView, d: dispatch)
+        tableDelegate = BookTableDelegate(tableView, { pos in dispatch(UiActions.ReadingListBookTapped(position: Int32(pos - 1)))})
         tableView.delegate = tableDelegate
         tableView.dataSource = tableDelegate
     }
diff --git a/iOS/ReadingList/ReadingList/SearchViewController.swift b/iOS/ReadingList/ReadingList/SearchViewController.swift
@@ -48,7 +48,7 @@ class SearchViewController: BaseViewController, UISearchBarDelegate, SearchView
         tableView.rowHeight = 161
         searchBar.showsScopeBar = false // you can show/hide this dependant on your layout
         searchBar.placeholder = "Search by title or author"
-        tableDelegate = BookTableDelegate(tableView, d: dispatch)
+        tableDelegate = BookTableDelegate(tableView, {pos in dispatch(UiActions.SearchBookTapped(position: Int32(pos)))})
         tableView.delegate = tableDelegate
         tableView.dataSource = tableDelegate
     }
