From e9301ced5f56175e70d46a1ebe35d29a8df4b2d7 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Mon, 4 Dec 2017 23:33:48 -0500 Subject: [PATCH] Don't provide flowable to ConversationsAdapter --- .../presentation/base/FlowableAdapter.kt | 25 ------------- .../presentation/main/ConversationsAdapter.kt | 5 ++- .../QKSMS/presentation/main/MainActivity.kt | 35 +++++++++++++++--- .../moez/QKSMS/presentation/main/MainState.kt | 5 +-- .../moez/QKSMS/presentation/main/MainView.kt | 6 ++-- .../QKSMS/presentation/main/MainViewModel.kt | 36 +++++++++---------- qksms/src/main/res/layout/main_activity.xml | 4 +-- 7 files changed, 58 insertions(+), 58 deletions(-) delete mode 100644 qksms/src/main/java/com/moez/QKSMS/presentation/base/FlowableAdapter.kt diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/base/FlowableAdapter.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/base/FlowableAdapter.kt deleted file mode 100644 index 3cadb77d..00000000 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/base/FlowableAdapter.kt +++ /dev/null @@ -1,25 +0,0 @@ -package com.moez.QKSMS.presentation.base - -import android.support.v7.widget.RecyclerView -import io.reactivex.Flowable -import io.reactivex.disposables.Disposable - -/** - * Base RecyclerView.Adapter that provides some convenience when creating a new Adapter, such as - * data list handing and item animations - */ -abstract class FlowableAdapter(private val flowable: Flowable>) : QkAdapter() { - - private var disposable: Disposable? = null - - override fun onAttachedToRecyclerView(recyclerView: RecyclerView?) { - super.onAttachedToRecyclerView(recyclerView) - disposable = flowable.subscribe { data = it } - } - - override fun onDetachedFromRecyclerView(recyclerView: RecyclerView?) { - super.onDetachedFromRecyclerView(recyclerView) - disposable?.dispose() - } - -} \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/main/ConversationsAdapter.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/main/ConversationsAdapter.kt index 036db295..b781ba20 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/main/ConversationsAdapter.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/main/ConversationsAdapter.kt @@ -12,15 +12,14 @@ import com.moez.QKSMS.common.util.DateFormatter import com.moez.QKSMS.data.model.ConversationMessagePair import com.moez.QKSMS.data.repository.MessageRepository import com.moez.QKSMS.presentation.Navigator -import com.moez.QKSMS.presentation.base.FlowableAdapter +import com.moez.QKSMS.presentation.base.QkAdapter import com.moez.QKSMS.presentation.base.QkViewHolder -import io.reactivex.Flowable import io.reactivex.disposables.CompositeDisposable import io.reactivex.rxkotlin.plusAssign import kotlinx.android.synthetic.main.conversation_list_item.view.* import javax.inject.Inject -class ConversationsAdapter(flowable: Flowable>) : FlowableAdapter(flowable) { +class ConversationsAdapter : QkAdapter() { @Inject lateinit var context: Context @Inject lateinit var navigator: Navigator diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt index e63cb76f..69b777e5 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt @@ -19,9 +19,12 @@ import com.karumi.dexter.listener.multi.MultiplePermissionsListener import com.moez.QKSMS.R import com.moez.QKSMS.common.di.appComponent import com.moez.QKSMS.common.util.extensions.setBackgroundTint +import com.moez.QKSMS.data.model.Conversation import com.moez.QKSMS.presentation.Navigator import com.moez.QKSMS.presentation.base.QkActivity import io.reactivex.rxkotlin.plusAssign +import io.reactivex.subjects.PublishSubject +import io.reactivex.subjects.Subject import kotlinx.android.synthetic.main.drawer_view.* import kotlinx.android.synthetic.main.main_activity.* import kotlinx.android.synthetic.main.toolbar.* @@ -41,7 +44,8 @@ class MainActivity : QkActivity(), MainView { override val scheduledIntent by lazy { scheduled.clicks() } override val blockedIntent by lazy { blocked.clicks() } override val settingsIntent by lazy { settings.clicks() } - override val conversationSwipedIntent by lazy { itemTouchCallback.swipes } + override val deleteConversationIntent: Subject = PublishSubject.create() + override val archiveConversationIntent by lazy { itemTouchCallback.swipes } private val itemTouchHelper by lazy { ItemTouchHelper(itemTouchCallback) } @@ -56,7 +60,7 @@ class MainActivity : QkActivity(), MainView { requestPermissions() viewModel.bindView(this) - conversationList.layoutManager = LinearLayoutManager(this) + recyclerView.layoutManager = LinearLayoutManager(this) // Don't allow clicks to pass through the drawer layout drawer.clicks().subscribe() @@ -96,9 +100,30 @@ class MainActivity : QkActivity(), MainView { } override fun render(state: MainState) { - if (conversationList.adapter != state.adapter) { - conversationList.adapter = state.adapter - itemTouchHelper.attachToRecyclerView(if (state.page == MainPage.INBOX) conversationList else null) + when (state.page) { + MainPage.INBOX -> { + if (recyclerView.adapter !is ConversationsAdapter) recyclerView.adapter = ConversationsAdapter() + val adapter = recyclerView.adapter as ConversationsAdapter + if (adapter.data != state.conversations) adapter.data = state.conversations + itemTouchHelper.attachToRecyclerView(recyclerView) + } + + MainPage.ARCHIVED -> { + if (recyclerView.adapter !is ConversationsAdapter) recyclerView.adapter = ConversationsAdapter() + val adapter = recyclerView.adapter as ConversationsAdapter + if (adapter.data != state.archivedConversations) adapter.data = state.archivedConversations + itemTouchHelper.attachToRecyclerView(null) + } + + MainPage.SCHEDULED -> { + recyclerView.adapter = null + itemTouchHelper.attachToRecyclerView(null) + } + + MainPage.BLOCKED -> { + recyclerView.adapter = null + itemTouchHelper.attachToRecyclerView(null) + } } inbox.isSelected = state.page == MainPage.INBOX diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainState.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainState.kt index 5adfc7d5..8c190f14 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainState.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainState.kt @@ -1,10 +1,11 @@ package com.moez.QKSMS.presentation.main -import android.support.v7.widget.RecyclerView +import com.moez.QKSMS.data.model.ConversationMessagePair data class MainState( val page: MainPage = MainPage.INBOX, - val adapter: RecyclerView.Adapter<*>? = null, + val conversations: List = ArrayList(), + val archivedConversations: List = ArrayList(), val refreshing: Boolean = false, val drawerOpen: Boolean = false ) diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainView.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainView.kt index de62be3f..4c200a15 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainView.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainView.kt @@ -1,8 +1,9 @@ package com.moez.QKSMS.presentation.main +import com.moez.QKSMS.data.model.Conversation import com.moez.QKSMS.presentation.base.QkView import io.reactivex.Observable -import io.reactivex.subjects.PublishSubject +import io.reactivex.subjects.Subject interface MainView : QkView { @@ -13,6 +14,7 @@ interface MainView : QkView { val scheduledIntent: Observable val blockedIntent: Observable val settingsIntent: Observable - val conversationSwipedIntent: PublishSubject + val deleteConversationIntent: Subject + val archiveConversationIntent: Subject } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainViewModel.kt index e696a645..be6ad377 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainViewModel.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainViewModel.kt @@ -10,9 +10,10 @@ import com.moez.QKSMS.domain.interactor.PartialSync import com.moez.QKSMS.presentation.Navigator import com.moez.QKSMS.presentation.base.QkViewModel import io.reactivex.rxkotlin.plusAssign +import io.reactivex.rxkotlin.withLatestFrom import javax.inject.Inject -class MainViewModel : QkViewModel(MainState()) { +class MainViewModel : QkViewModel(MainState(page = MainPage.INBOX)) { @Inject lateinit var context: Context @Inject lateinit var navigator: Navigator @@ -26,7 +27,13 @@ class MainViewModel : QkViewModel(MainState()) { disposables += markAllSeen - newState { it.copy(page = MainPage.INBOX, adapter = ConversationsAdapter(messageRepo.getConversations())) } + disposables += messageRepo.getConversations().subscribe { conversations -> + newState { it.copy(conversations = conversations) } + } + + disposables += messageRepo.getConversations(true).subscribe { conversations -> + newState { it.copy(archivedConversations = conversations) } + } if (Telephony.Sms.getDefaultSmsPackage(context) != context.packageName) { partialSync.execute(Unit) @@ -48,21 +55,19 @@ class MainViewModel : QkViewModel(MainState()) { } intents += view.inboxIntent.subscribe { - val adapter = ConversationsAdapter(messageRepo.getConversations()) - newState { it.copy(page = MainPage.INBOX, adapter = adapter, drawerOpen = false) } + newState { it.copy(page = MainPage.INBOX, drawerOpen = false) } } intents += view.archivedIntent.subscribe { - val adapter = ConversationsAdapter(messageRepo.getConversations(true)) - newState { it.copy(page = MainPage.ARCHIVED, adapter = adapter, drawerOpen = false) } + newState { it.copy(page = MainPage.ARCHIVED, drawerOpen = false) } } intents += view.scheduledIntent.subscribe { - newState { it.copy(page = MainPage.SCHEDULED, adapter = null, drawerOpen = false) } + newState { it.copy(page = MainPage.SCHEDULED, drawerOpen = false) } } intents += view.blockedIntent.subscribe { - newState { it.copy(page = MainPage.BLOCKED, adapter = null, drawerOpen = false) } + newState { it.copy(page = MainPage.BLOCKED, drawerOpen = false) } } intents += view.settingsIntent.subscribe { @@ -70,17 +75,10 @@ class MainViewModel : QkViewModel(MainState()) { newState { it.copy(drawerOpen = false) } } - intents += view.conversationSwipedIntent.subscribe { adapterPosition -> - state.value - ?.takeIf { state -> state.page == MainPage.INBOX } - ?.takeIf { state -> state.adapter is ConversationsAdapter } - ?.let { state -> - val adapter = state.adapter as ConversationsAdapter - val conversation = adapter.getItem(adapterPosition).conversation - markArchived.execute(conversation.id) - } - } - + intents += view.archiveConversationIntent + .withLatestFrom(state, { position, state -> state.conversations[position] }) + .map { pair -> pair.conversation.id } + .subscribe { threadId -> markArchived.execute(threadId)} } } \ No newline at end of file diff --git a/qksms/src/main/res/layout/main_activity.xml b/qksms/src/main/res/layout/main_activity.xml index 3bc05c63..f0a44054 100644 --- a/qksms/src/main/res/layout/main_activity.xml +++ b/qksms/src/main/res/layout/main_activity.xml @@ -20,7 +20,7 @@ android:layout_weight="1">