From 19c5fac2f21cbe1911b6922fad23a3c8ddbe0470 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Thu, 14 Dec 2017 15:03:14 -0500 Subject: [PATCH] Use flowables for mainactivity --- .../common/base/FlowableAdapter.kt | 62 +++++++++++++++++++ .../main/ConversationItemTouchCallback.kt | 3 +- .../presentation/main/ConversationsAdapter.kt | 6 +- .../QKSMS/presentation/main/MainActivity.kt | 36 ++++++----- .../moez/QKSMS/presentation/main/MainState.kt | 16 +++-- .../moez/QKSMS/presentation/main/MainView.kt | 2 +- .../QKSMS/presentation/main/MainViewModel.kt | 24 +++---- 7 files changed, 109 insertions(+), 40 deletions(-) create mode 100644 qksms/src/main/java/com/moez/QKSMS/presentation/common/base/FlowableAdapter.kt diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/common/base/FlowableAdapter.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/common/base/FlowableAdapter.kt new file mode 100644 index 00000000..e4c61a42 --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/common/base/FlowableAdapter.kt @@ -0,0 +1,62 @@ +package com.moez.QKSMS.presentation.common.base + +import android.support.annotation.CallSuper +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 : QkAdapter() { + + var flowable: Flowable>? = null + set(value) { + field = value + + // Stop listening for updates on the old flowable + dispose() + + // Wipe the data + data = ArrayList() + + // If we're attached to any RecyclerViews, then subscribe to updates + if (recyclerViews.isNotEmpty()) { + subscribe() + } + } + + private val recyclerViews = ArrayList() + private var disposable: Disposable? = null + + @CallSuper + override fun onAttachedToRecyclerView(recyclerView: RecyclerView) { + + // If this is the first RecyclerView to be attached, then start listening to updates + if (recyclerViews.isEmpty() || disposable == null) { + subscribe() + } + + recyclerViews.add(recyclerView) + } + + @CallSuper + override fun onDetachedFromRecyclerView(recyclerView: RecyclerView) { + recyclerViews.remove(recyclerView) + + // If no more RecyclerViews are attached, stop listening to updates + if (recyclerViews.isEmpty()) { + dispose() + } + } + + private fun subscribe() { + disposable = flowable?.subscribe { data = it } + } + + private fun dispose() { + disposable?.dispose() + } + +} \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/main/ConversationItemTouchCallback.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/main/ConversationItemTouchCallback.kt index cbea8252..2453eeee 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/main/ConversationItemTouchCallback.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/main/ConversationItemTouchCallback.kt @@ -3,11 +3,12 @@ package com.moez.QKSMS.presentation.main import android.support.v7.widget.RecyclerView import android.support.v7.widget.helper.ItemTouchHelper import io.reactivex.subjects.PublishSubject +import io.reactivex.subjects.Subject import javax.inject.Inject class ConversationItemTouchCallback @Inject constructor() : ItemTouchHelper.SimpleCallback(0, ItemTouchHelper.RIGHT) { - val swipes: PublishSubject = PublishSubject.create() + val swipes: Subject = PublishSubject.create() override fun onMove(recyclerView: RecyclerView?, viewHolder: RecyclerView.ViewHolder?, target: RecyclerView.ViewHolder?): Boolean { return false 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 63ae6706..5dc3ffca 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,7 +12,7 @@ import com.moez.QKSMS.data.model.Contact 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.common.base.QkAdapter +import com.moez.QKSMS.presentation.common.base.FlowableAdapter import com.moez.QKSMS.presentation.common.base.QkViewHolder import io.reactivex.disposables.CompositeDisposable import io.reactivex.rxkotlin.plusAssign @@ -27,7 +27,7 @@ class ConversationsAdapter @Inject constructor( val messageRepo: MessageRepository, val dateFormatter: DateFormatter, val colors: Colors -) : QkAdapter() { +) : FlowableAdapter() { val longClicks: Subject = PublishSubject.create() @@ -50,7 +50,7 @@ class ConversationsAdapter @Inject constructor( return QkViewHolder(view) } - override fun onDetachedFromRecyclerView(recyclerView: RecyclerView?) { + override fun onDetachedFromRecyclerView(recyclerView: RecyclerView) { super.onDetachedFromRecyclerView(recyclerView) disposables.clear() } 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 9bf27bcc..51f86552 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 @@ -23,6 +23,7 @@ import com.moez.QKSMS.common.di.appComponent import com.moez.QKSMS.common.util.extensions.setBackgroundTint import com.moez.QKSMS.presentation.Navigator import com.moez.QKSMS.presentation.common.base.QkActivity +import io.reactivex.Observable import io.reactivex.rxkotlin.Observables import io.reactivex.rxkotlin.plusAssign import io.reactivex.subjects.PublishSubject @@ -48,7 +49,12 @@ class MainActivity : QkActivity(), MainView { override val blockedIntent by lazy { blocked.clicks() } override val settingsIntent by lazy { settings.clicks() } override val deleteConversationIntent: Subject = PublishSubject.create() - override val archiveConversationIntent by lazy { itemTouchCallback.swipes } + override val archiveConversationIntent: Observable by lazy { + itemTouchCallback.swipes + .map { position -> conversationsAdapter.getItem(position) } + .map { pair -> pair.conversation } + .map { conversation -> conversation.id } + } private val itemTouchHelper by lazy { ItemTouchHelper(itemTouchCallback) } @@ -128,37 +134,37 @@ class MainActivity : QkActivity(), MainView { override fun render(state: MainState) { when (state.page) { - MainPage.INBOX -> { + is Inbox -> { if (recyclerView.adapter != conversationsAdapter) recyclerView.adapter = conversationsAdapter - if (conversationsAdapter.data != state.conversations) conversationsAdapter.data = state.conversations + if (conversationsAdapter.flowable != state.page.data) conversationsAdapter.flowable = state.page.data itemTouchHelper.attachToRecyclerView(recyclerView) } - MainPage.ARCHIVED -> { + is Archived -> { if (recyclerView.adapter != conversationsAdapter) recyclerView.adapter = conversationsAdapter - if (conversationsAdapter.data != state.archivedConversations) conversationsAdapter.data = state.archivedConversations + if (conversationsAdapter.flowable != state.page.data) conversationsAdapter.flowable = state.page.data itemTouchHelper.attachToRecyclerView(null) } - MainPage.SCHEDULED -> { + is Scheduled -> { recyclerView.adapter = null itemTouchHelper.attachToRecyclerView(null) } - MainPage.BLOCKED -> { + is Blocked -> { recyclerView.adapter = null itemTouchHelper.attachToRecyclerView(null) } } - inbox.isSelected = state.page == MainPage.INBOX - inboxIcon.isSelected = state.page == MainPage.INBOX - archived.isSelected = state.page == MainPage.ARCHIVED - archivedIcon.isSelected = state.page == MainPage.ARCHIVED - scheduled.isSelected = state.page == MainPage.SCHEDULED - scheduledIcon.isSelected = state.page == MainPage.SCHEDULED - blocked.isSelected = state.page == MainPage.BLOCKED - blockedIcon.isSelected = state.page == MainPage.BLOCKED + inbox.isSelected = state.page is Inbox + inboxIcon.isSelected = state.page is Inbox + archived.isSelected = state.page is Archived + archivedIcon.isSelected = state.page is Archived + scheduled.isSelected = state.page is Scheduled + scheduledIcon.isSelected = state.page is Scheduled + blocked.isSelected = state.page is Blocked + blockedIcon.isSelected = state.page is Blocked if (drawerLayout.isDrawerOpen(Gravity.START) && !state.drawerOpen) drawerLayout.closeDrawer(Gravity.START) else if (!drawerLayout.isDrawerVisible(Gravity.START) && state.drawerOpen) drawerLayout.openDrawer(Gravity.START) 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 8c190f14..2005148e 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,13 +1,19 @@ package com.moez.QKSMS.presentation.main import com.moez.QKSMS.data.model.ConversationMessagePair +import io.reactivex.Flowable data class MainState( - val page: MainPage = MainPage.INBOX, - val conversations: List = ArrayList(), - val archivedConversations: List = ArrayList(), - val refreshing: Boolean = false, + val page: MainPage = Inbox(null), val drawerOpen: Boolean = false ) -enum class MainPage { INBOX, ARCHIVED, SCHEDULED, BLOCKED } \ No newline at end of file +sealed class MainPage + +data class Inbox(val data: Flowable>?) : MainPage() + +data class Archived(val data: Flowable>?) : MainPage() + +data class Scheduled(val data: Any? = null) : MainPage() + +data class Blocked(val data: Any? = null) : MainPage() \ No newline at end of file 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 0cc4189e..68d089f2 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 @@ -14,6 +14,6 @@ interface MainView : QkView { val blockedIntent: Observable val settingsIntent: Observable val deleteConversationIntent: Subject - val archiveConversationIntent: Subject + val archiveConversationIntent: Observable } \ 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 bc16fd7e..524e2e0e 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 @@ -11,10 +11,9 @@ import com.moez.QKSMS.domain.interactor.PartialSync import com.moez.QKSMS.presentation.Navigator import com.moez.QKSMS.presentation.common.base.QkViewModel import io.reactivex.rxkotlin.plusAssign -import io.reactivex.rxkotlin.withLatestFrom import javax.inject.Inject -class MainViewModel : QkViewModel(MainState(page = MainPage.INBOX)) { +class MainViewModel : QkViewModel(MainState()) { @Inject lateinit var context: Context @Inject lateinit var navigator: Navigator @@ -28,14 +27,11 @@ class MainViewModel : QkViewModel(MainState(page = MainPage appComponent.inject(this) disposables += markAllSeen + disposables += deleteConversation + disposables += markArchived + disposables += partialSync - disposables += messageRepo.getConversations().subscribe { conversations -> - newState { it.copy(conversations = conversations) } - } - - disposables += messageRepo.getConversations(true).subscribe { conversations -> - newState { it.copy(archivedConversations = conversations) } - } + newState { it.copy(page = Inbox(messageRepo.getConversations())) } if (Telephony.Sms.getDefaultSmsPackage(context) != context.packageName) { partialSync.execute(Unit) @@ -57,19 +53,19 @@ class MainViewModel : QkViewModel(MainState(page = MainPage } intents += view.inboxIntent.subscribe { - newState { it.copy(page = MainPage.INBOX, drawerOpen = false) } + newState { it.copy(page = Inbox(messageRepo.getConversations()), drawerOpen = false) } } intents += view.archivedIntent.subscribe { - newState { it.copy(page = MainPage.ARCHIVED, drawerOpen = false) } + newState { it.copy(page = Archived(messageRepo.getConversations(true)), drawerOpen = false) } } intents += view.scheduledIntent.subscribe { - newState { it.copy(page = MainPage.SCHEDULED, drawerOpen = false) } + newState { it.copy(page = Scheduled(), drawerOpen = false) } } intents += view.blockedIntent.subscribe { - newState { it.copy(page = MainPage.BLOCKED, drawerOpen = false) } + newState { it.copy(page = Blocked(), drawerOpen = false) } } intents += view.settingsIntent.subscribe { @@ -81,8 +77,6 @@ class MainViewModel : QkViewModel(MainState(page = MainPage .subscribe { threadId -> deleteConversation.execute(threadId) } intents += view.archiveConversationIntent - .withLatestFrom(state, { position, state -> state.conversations[position] }) - .map { pair -> pair.conversation.id } .subscribe { threadId -> markArchived.execute(threadId) } }