From f914f19ee8654e3565543b154bd602a4f3a9020a Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Tue, 28 Nov 2017 16:03:41 -0500 Subject: [PATCH] Use lists of data instead of Flowables for ChipsAdapter and ContactsAdapter --- .../presentation/base/FlowableAdapter.kt | 25 ++++++++++++++ .../moez/QKSMS/presentation/base/QkAdapter.kt | 23 +++---------- .../presentation/compose/ChipsAdapter.kt | 5 ++- .../presentation/compose/ComposeActivity.kt | 28 ++++++++-------- .../presentation/compose/ComposeState.kt | 5 ++- .../QKSMS/presentation/compose/ComposeView.kt | 2 +- .../presentation/compose/ComposeViewModel.kt | 33 +++++++------------ .../presentation/compose/ContactAdapter.kt | 3 +- .../presentation/main/ConversationsAdapter.kt | 4 +-- 9 files changed, 62 insertions(+), 66 deletions(-) create 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 new file mode 100644 index 00000000..a75e6c7b --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/base/FlowableAdapter.kt @@ -0,0 +1,25 @@ +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/base/QkAdapter.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkAdapter.kt index 7438b6c5..22b5c37e 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkAdapter.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkAdapter.kt @@ -3,39 +3,24 @@ package com.moez.QKSMS.presentation.base import android.support.v7.util.DiffUtil import android.support.v7.widget.RecyclerView import com.moez.QKSMS.common.util.AbstractDiffUtilCallback -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 - * - * If Sections are required for the RecyclerView UI, please use the BaseSectionAdapter */ -abstract class QkAdapter(private val flowable: Flowable>) : RecyclerView.Adapter() { +abstract class QkAdapter : RecyclerView.Adapter() { - private var disposable: Disposable? = null - - private var data: List = ArrayList() + var data: List = ArrayList() set(value) { - DiffUtil.calculateDiff(provideDiffUtilCallback(field, value)).dispatchUpdatesTo(this) + val diff = DiffUtil.calculateDiff(provideDiffUtilCallback(field, value)) field = value + diff.dispatchUpdatesTo(this) } fun getItem(position: Int): T { return data[position] } - override fun onAttachedToRecyclerView(recyclerView: RecyclerView?) { - super.onAttachedToRecyclerView(recyclerView) - disposable = flowable.subscribe { data = it } - } - - override fun onDetachedFromRecyclerView(recyclerView: RecyclerView?) { - super.onDetachedFromRecyclerView(recyclerView) - disposable?.dispose() - } - override fun getItemCount(): Int { return data.size } diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ChipsAdapter.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ChipsAdapter.kt index fd46dc8f..aadf3cd8 100755 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ChipsAdapter.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ChipsAdapter.kt @@ -19,14 +19,13 @@ import com.moez.QKSMS.common.util.extensions.dpToPx import com.moez.QKSMS.data.model.Contact import com.moez.QKSMS.presentation.base.QkAdapter import com.moez.QKSMS.presentation.base.QkViewHolder -import io.reactivex.Flowable import io.reactivex.subjects.PublishSubject import kotlinx.android.synthetic.main.contact_chip.view.* class ChipsAdapter( private val context: Context, - private val view: RecyclerView, - data: Flowable>) : QkAdapter(data) { + private val view: RecyclerView) + : QkAdapter() { companion object { private val TYPE_EDIT_TEXT = 0 diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt index 92a38a5e..4e99ed0a 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt @@ -15,6 +15,7 @@ import com.moez.QKSMS.common.util.extensions.setTint import com.moez.QKSMS.data.model.Contact import com.moez.QKSMS.data.model.Message import com.moez.QKSMS.presentation.base.QkActivity +import io.reactivex.Observable import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject import io.realm.RealmResults @@ -30,9 +31,9 @@ class ComposeActivity : QkActivity(), ComposeView { private lateinit var layoutManager: LinearLayoutManager override val viewModelClass = ComposeViewModel::class - override val queryChangedIntent: Subject = PublishSubject.create() - override val chipSelectedIntent: Subject = PublishSubject.create() - override val chipDeletedIntent: Subject = PublishSubject.create() + override val queryChangedIntent: Observable by lazy { chipsAdapter.textChanges } + override val chipSelectedIntent: Subject by lazy { contactsAdapter.contactSelected } + override val chipDeletedIntent: Subject by lazy { chipsAdapter.chipDeleted } override val copyTextIntent: Subject = PublishSubject.create() override val forwardMessageIntent: Subject = PublishSubject.create() override val deleteMessageIntent: Subject = PublishSubject.create() @@ -40,6 +41,9 @@ class ComposeActivity : QkActivity(), ComposeView { override val attachIntent by lazy { attach.clicks() } override val sendIntent by lazy { send.clicks() } + private val chipsAdapter by lazy { ChipsAdapter(this, chips) } + private val contactsAdapter by lazy { ContactAdapter(this) } + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) AppComponentManager.appComponent.inject(this) @@ -48,7 +52,10 @@ class ComposeActivity : QkActivity(), ComposeView { viewModel.bindView(this) chips.layoutManager = FlexboxLayoutManager(this) + chips.adapter = chipsAdapter + contacts.layoutManager = LinearLayoutManager(this) + contacts.adapter = contactsAdapter window.callback = ComposeWindowCallback(window.callback, this) @@ -62,19 +69,12 @@ class ComposeActivity : QkActivity(), ComposeView { chips.visibility = if (state.editingMode) View.VISIBLE else View.GONE contacts.visibility = if (state.editingMode) View.VISIBLE else View.GONE - if (chips.adapter == null && state.selectedContacts != null) { - val adapter = ChipsAdapter(this, chips, state.selectedContacts) - adapter.chipDeleted.subscribe { chipDeletedIntent.onNext(it) } - adapter.textChanges.subscribe { queryChangedIntent.onNext(it) } - - chips.adapter = adapter + if (chipsAdapter.data !== state.selectedContacts) { + chipsAdapter.data = state.selectedContacts } - if (contacts.adapter == null && state.contacts != null) { - val adapter = ContactAdapter(this, state.contacts) - adapter.contactSelected.subscribe { chipSelectedIntent.onNext(it) } - - contacts.adapter = adapter + if (contactsAdapter.data !== state.contacts) { + contactsAdapter.data = state.contacts } if (title != state.title) title = state.title diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeState.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeState.kt index 9b739097..5f013b12 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeState.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeState.kt @@ -2,13 +2,12 @@ package com.moez.QKSMS.presentation.compose import com.moez.QKSMS.data.model.Contact import com.moez.QKSMS.data.model.Message -import io.reactivex.Flowable import io.realm.RealmResults data class ComposeState( val editingMode: Boolean = false, - val contacts: Flowable>? = null, - val selectedContacts: Flowable>? = null, + val contacts: List = ArrayList(), + val selectedContacts: List = ArrayList(), val title: String = "", val messages: RealmResults? = null, val draft: String = "", diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeView.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeView.kt index af33fc8e..abd684bc 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeView.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeView.kt @@ -8,7 +8,7 @@ import io.reactivex.subjects.Subject interface ComposeView : QkView { - val queryChangedIntent: Subject + val queryChangedIntent: Observable val chipSelectedIntent: Subject val chipDeletedIntent: Subject val copyTextIntent: Subject diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeViewModel.kt index b74bdfec..c5874bf1 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeViewModel.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeViewModel.kt @@ -15,12 +15,10 @@ import com.moez.QKSMS.domain.interactor.MarkRead import com.moez.QKSMS.domain.interactor.SendMessage import com.moez.QKSMS.presentation.base.QkViewModel import io.reactivex.BackpressureStrategy -import io.reactivex.Flowable +import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.rxkotlin.plusAssign import io.reactivex.schedulers.Schedulers -import io.reactivex.subjects.BehaviorSubject -import io.reactivex.subjects.Subject import javax.inject.Inject class ComposeViewModel(val threadId: Long) : QkViewModel(ComposeState(editingMode = threadId == 0L)) { @@ -32,9 +30,6 @@ class ComposeViewModel(val threadId: Long) : QkViewModel> = BehaviorSubject.create() - private val selectedContactsReducer: Subject<(List) -> List> = BehaviorSubject.create() - private val contacts: List private var conversation: Conversation? = null @@ -60,14 +55,6 @@ class ComposeViewModel(val threadId: Long) : QkViewModel> = selectedContactsReducer - .scan(listOf(), { previousState, reducer -> reducer(previousState) }) - .toFlowable(BackpressureStrategy.BUFFER) - - newState { it.copy(contacts = contactsFlowable, selectedContacts = selectedContacts) } - dataChanged() } @@ -84,15 +71,17 @@ class ComposeViewModel(val threadId: Long) : QkViewModel contactsSubject.onNext(contacts) } + .subscribe { contacts -> newState { it.copy(contacts = contacts) } } - intents += view.chipSelectedIntent.subscribe { contact -> - selectedContactsReducer.onNext { it.toMutableList().apply { add(contact) } } - } - - intents += view.chipDeletedIntent.subscribe { contact -> - selectedContactsReducer.onNext { it.filterNot { it == contact } } - } + intents += Observable.merge<(List) -> List>( + view.chipDeletedIntent.map { contact -> + { contacts: List -> contacts.filterNot { it == contact } } + }, + view.chipSelectedIntent.map { contact -> + { contacts: List -> contacts.toMutableList().apply { add(contact) } } + }) + .scan(listOf(), { previousState, reducer -> reducer(previousState) }) + .subscribe { contacts -> newState { it.copy(selectedContacts = contacts) } } intents += view.textChangedIntent.subscribe { text -> newState { it.copy(draft = text.toString(), canSend = text.isNotEmpty()) } diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ContactAdapter.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ContactAdapter.kt index 494ba855..ecb350a6 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ContactAdapter.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ContactAdapter.kt @@ -8,12 +8,11 @@ import com.moez.QKSMS.R import com.moez.QKSMS.data.model.Contact import com.moez.QKSMS.presentation.base.QkAdapter import com.moez.QKSMS.presentation.base.QkViewHolder -import io.reactivex.Flowable import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject import kotlinx.android.synthetic.main.contact_list_item.view.* -class ContactAdapter(private val context: Context, data: Flowable>) : QkAdapter(data) { +class ContactAdapter(private val context: Context) : QkAdapter() { val contactSelected: Subject = PublishSubject.create() 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 03d7df15..4591d337 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 @@ -11,13 +11,13 @@ import com.moez.QKSMS.common.util.ThemeManager 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.QkAdapter +import com.moez.QKSMS.presentation.base.FlowableAdapter import com.moez.QKSMS.presentation.base.QkViewHolder import io.reactivex.Flowable import kotlinx.android.synthetic.main.conversation_list_item.view.* import javax.inject.Inject -class ConversationsAdapter(flowable: Flowable>) : QkAdapter(flowable) { +class ConversationsAdapter(flowable: Flowable>) : FlowableAdapter(flowable) { @Inject lateinit var context: Context @Inject lateinit var navigator: Navigator