Use flowables for mainactivity

This commit is contained in:
Moez Bhatti
2017-12-14 15:03:14 -05:00
parent a4b6edc45a
commit 19c5fac2f2
7 changed files with 109 additions and 40 deletions
@@ -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<T> : QkAdapter<T>() {
var flowable: Flowable<List<T>>? = 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<RecyclerView>()
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()
}
}
@@ -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<Int> = PublishSubject.create()
val swipes: Subject<Int> = PublishSubject.create()
override fun onMove(recyclerView: RecyclerView?, viewHolder: RecyclerView.ViewHolder?, target: RecyclerView.ViewHolder?): Boolean {
return false
@@ -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<ConversationMessagePair>() {
) : FlowableAdapter<ConversationMessagePair>() {
val longClicks: Subject<Long> = PublishSubject.create<Long>()
@@ -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()
}
@@ -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<MainViewModel>(), MainView {
override val blockedIntent by lazy { blocked.clicks() }
override val settingsIntent by lazy { settings.clicks() }
override val deleteConversationIntent: Subject<Long> = PublishSubject.create()
override val archiveConversationIntent by lazy { itemTouchCallback.swipes }
override val archiveConversationIntent: Observable<Long> 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<MainViewModel>(), 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)
@@ -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<ConversationMessagePair> = ArrayList(),
val archivedConversations: List<ConversationMessagePair> = ArrayList(),
val refreshing: Boolean = false,
val page: MainPage = Inbox(null),
val drawerOpen: Boolean = false
)
enum class MainPage { INBOX, ARCHIVED, SCHEDULED, BLOCKED }
sealed class MainPage
data class Inbox(val data: Flowable<List<ConversationMessagePair>>?) : MainPage()
data class Archived(val data: Flowable<List<ConversationMessagePair>>?) : MainPage()
data class Scheduled(val data: Any? = null) : MainPage()
data class Blocked(val data: Any? = null) : MainPage()
@@ -14,6 +14,6 @@ interface MainView : QkView<MainState> {
val blockedIntent: Observable<Unit>
val settingsIntent: Observable<Unit>
val deleteConversationIntent: Subject<Long>
val archiveConversationIntent: Subject<Int>
val archiveConversationIntent: Observable<Long>
}
@@ -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<MainView, MainState>(MainState(page = MainPage.INBOX)) {
class MainViewModel : QkViewModel<MainView, MainState>(MainState()) {
@Inject lateinit var context: Context
@Inject lateinit var navigator: Navigator
@@ -28,14 +27,11 @@ class MainViewModel : QkViewModel<MainView, MainState>(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<MainView, MainState>(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<MainView, MainState>(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) }
}