Keep a reference to a conversation observable instead of conversation, don't manually call methods in VM from Activity

This commit is contained in:
Moez Bhatti
2017-11-28 19:12:40 -05:00
parent 62e19a154c
commit ad4fa5deba
4 changed files with 53 additions and 42 deletions
@@ -1,10 +1,20 @@
package com.moez.QKSMS.common.util.extensions package com.moez.QKSMS.common.util.extensions
import io.reactivex.Observable
import io.realm.Realm import io.realm.Realm
import io.realm.RealmObject import io.realm.RealmObject
import io.realm.RealmResults
fun RealmObject.insertOrUpdate() { fun RealmObject.insertOrUpdate() {
val realm = Realm.getDefaultInstance() val realm = Realm.getDefaultInstance()
realm.executeTransaction { realm.insertOrUpdate(this) } realm.executeTransaction { realm.insertOrUpdate(this) }
realm.close() realm.close()
} }
fun <T : RealmObject> RealmObject.asObservable(): Observable<T> {
return asFlowable<T>().toObservable()
}
fun <T : RealmObject> RealmResults<T>.asObservable(): Observable<RealmResults<T>> {
return asFlowable().toObservable()
}
@@ -18,7 +18,6 @@ import com.moez.QKSMS.presentation.base.QkActivity
import io.reactivex.Observable import io.reactivex.Observable
import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject import io.reactivex.subjects.Subject
import io.realm.RealmResults
import kotlinx.android.synthetic.main.compose_activity.* import kotlinx.android.synthetic.main.compose_activity.*
import kotlinx.android.synthetic.main.toolbar_chips.* import kotlinx.android.synthetic.main.toolbar_chips.*
import javax.inject.Inject import javax.inject.Inject
@@ -43,6 +42,7 @@ class ComposeActivity : QkActivity<ComposeViewModel>(), ComposeView {
private val chipsAdapter by lazy { ChipsAdapter(this, chips) } private val chipsAdapter by lazy { ChipsAdapter(this, chips) }
private val contactsAdapter by lazy { ContactAdapter(this) } private val contactsAdapter by lazy { ContactAdapter(this) }
private val messageAdapter by lazy { MessagesAdapter() }
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
@@ -57,11 +57,13 @@ class ComposeActivity : QkActivity<ComposeViewModel>(), ComposeView {
contacts.layoutManager = LinearLayoutManager(this) contacts.layoutManager = LinearLayoutManager(this)
contacts.adapter = contactsAdapter contacts.adapter = contactsAdapter
window.callback = ComposeWindowCallback(window.callback, this) setupMessagesAdapter()
layoutManager = LinearLayoutManager(this) layoutManager = LinearLayoutManager(this).apply { stackFromEnd = true }
layoutManager.stackFromEnd = true
messageList.layoutManager = layoutManager messageList.layoutManager = layoutManager
messageList.adapter = messageAdapter
window.callback = ComposeWindowCallback(window.callback, this)
} }
override fun render(state: ComposeState) { override fun render(state: ComposeState) {
@@ -78,34 +80,35 @@ class ComposeActivity : QkActivity<ComposeViewModel>(), ComposeView {
contactsAdapter.data = state.contacts contactsAdapter.data = state.contacts
} }
if (messageAdapter.data !== state.messages) {
messageAdapter.updateData(state.messages)
}
if (title != state.title) title = state.title if (title != state.title) title = state.title
if (messageList.adapter == null && state.messages?.isValid == true) messageList.adapter = createAdapter(state.messages)
if (message.text.toString() != state.draft) message.setText(state.draft) if (message.text.toString() != state.draft) message.setText(state.draft)
send.setTint(if (state.canSend) themeManager.color else resources.getColor(R.color.textTertiary)) send.setTint(if (state.canSend) themeManager.color else resources.getColor(R.color.textTertiary))
send.isEnabled = state.canSend send.isEnabled = state.canSend
} }
private fun createAdapter(messages: RealmResults<Message>): MessagesAdapter { private fun setupMessagesAdapter() {
val adapter = MessagesAdapter(messages) messageAdapter.registerAdapterDataObserver(object : RecyclerView.AdapterDataObserver() {
adapter.registerAdapterDataObserver(object : RecyclerView.AdapterDataObserver() {
override fun onItemRangeInserted(positionStart: Int, itemCount: Int) { override fun onItemRangeInserted(positionStart: Int, itemCount: Int) {
super.onItemRangeInserted(positionStart, itemCount) super.onItemRangeInserted(positionStart, itemCount)
viewModel.dataChanged()
if (positionStart > 0) { if (positionStart > 0) {
adapter.notifyItemChanged(positionStart - 1) messageAdapter.notifyItemChanged(positionStart - 1)
} }
// If we're at the bottom, scroll down to show new messages // If we're at the bottom, scroll down to show new messages
val lastVisiblePosition = layoutManager.findLastCompletelyVisibleItemPosition() val lastVisiblePosition = layoutManager.findLastCompletelyVisibleItemPosition()
if (positionStart >= adapter.itemCount - 1 && lastVisiblePosition == positionStart - 1) { if (positionStart >= messageAdapter.itemCount - 1 && lastVisiblePosition == positionStart - 1) {
messageList.scrollToPosition(positionStart) messageList.scrollToPosition(positionStart)
} }
} }
}) })
adapter.longClicks.subscribe { message -> messageAdapter.longClicks.subscribe { message ->
AlertDialog.Builder(this) AlertDialog.Builder(this)
.setItems(R.array.message_options, { _, row -> .setItems(R.array.message_options, { _, row ->
when (row) { when (row) {
@@ -116,7 +119,5 @@ class ComposeActivity : QkActivity<ComposeViewModel>(), ComposeView {
}) })
.show() .show()
} }
return adapter
} }
} }
@@ -5,6 +5,7 @@ import android.telephony.PhoneNumberUtils
import com.moez.QKSMS.R import com.moez.QKSMS.R
import com.moez.QKSMS.common.di.AppComponentManager import com.moez.QKSMS.common.di.AppComponentManager
import com.moez.QKSMS.common.util.ClipboardUtils import com.moez.QKSMS.common.util.ClipboardUtils
import com.moez.QKSMS.common.util.extensions.asObservable
import com.moez.QKSMS.common.util.extensions.makeToast import com.moez.QKSMS.common.util.extensions.makeToast
import com.moez.QKSMS.data.model.Contact import com.moez.QKSMS.data.model.Contact
import com.moez.QKSMS.data.model.Conversation import com.moez.QKSMS.data.model.Conversation
@@ -33,30 +34,35 @@ class ComposeViewModel(threadId: Long) : QkViewModel<ComposeView, ComposeState>(
private val contacts: List<Contact> private val contacts: List<Contact>
private var conversation: Conversation? = null private val conversation: Observable<Conversation>
init { init {
AppComponentManager.appComponent.inject(this) AppComponentManager.appComponent.inject(this)
conversation = messageRepo.getConversationAsync(threadId)
.asObservable<Conversation>()
.filter { conversation -> conversation.isLoaded }
.filter { conversation -> conversation.isValid }
.distinctUntilChanged { conversation -> conversation.id }
.doOnNext { conversation -> newState { it.copy(title = conversation.getTitle()) } }
disposables += sendMessage disposables += sendMessage
disposables += markRead disposables += markRead
disposables += messageRepo.getConversationAsync(threadId) disposables += conversation.subscribe()
.asFlowable<Conversation>()
.filter { it.isLoaded } // When the conversation changes, update the messages for the adapter
.subscribe { conversation -> // When the message list changes, make sure to mark them read
when (conversation.isValid) { disposables += conversation
true -> { .map { conversation -> messageRepo.getMessages(conversation.id) }
this.conversation = conversation .doOnNext { messages -> newState { it.copy(messages = messages) } }
val title = conversation.getTitle() .flatMap { messages -> messages.asObservable() }
val messages = messageRepo.getMessages(threadId) .withLatestFrom(conversation, { messages, conversation ->
newState { it.copy(title = title, messages = messages) } markRead.execute(conversation.id)
} messages
} })
} .subscribe()
contacts = contactsRepo.getContacts() contacts = contactsRepo.getContacts()
dataChanged()
} }
override fun bindView(view: ComposeView) { override fun bindView(view: ComposeView) {
@@ -92,12 +98,13 @@ class ComposeViewModel(threadId: Long) : QkViewModel<ComposeView, ComposeState>(
intents += view.sendIntent intents += view.sendIntent
.withLatestFrom(view.textChangedIntent, { _, body -> body }) .withLatestFrom(view.textChangedIntent, { _, body -> body })
.map { body -> body.toString() } .map { body -> body.toString() }
.subscribe { body -> .withLatestFrom(conversation, { body, conversation ->
val threadId = conversation?.id ?: 0 val threadId = conversation.id
val address = conversation?.contacts?.first()?.address.orEmpty() val address = conversation.contacts.first()?.address.orEmpty()
sendMessage.execute(SendMessage.Params(threadId, address, body)) sendMessage.execute(SendMessage.Params(threadId, address, body))
newState { it.copy(draft = "", canSend = false) } newState { it.copy(draft = "", canSend = false) }
} })
.subscribe()
intents += view.copyTextIntent.subscribe { message -> intents += view.copyTextIntent.subscribe { message ->
ClipboardUtils.copy(context, message.body) ClipboardUtils.copy(context, message.body)
@@ -109,10 +116,4 @@ class ComposeViewModel(threadId: Long) : QkViewModel<ComposeView, ComposeState>(
} }
} }
fun dataChanged() {
conversation?.id?.let { threadId ->
markRead.execute(threadId)
}
}
} }
@@ -17,14 +17,13 @@ import com.moez.QKSMS.data.model.Message
import com.moez.QKSMS.presentation.base.QkViewHolder import com.moez.QKSMS.presentation.base.QkViewHolder
import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject import io.reactivex.subjects.Subject
import io.realm.OrderedRealmCollection
import io.realm.RealmRecyclerViewAdapter import io.realm.RealmRecyclerViewAdapter
import kotlinx.android.synthetic.main.message_list_item_in.view.* import kotlinx.android.synthetic.main.message_list_item_in.view.*
import timber.log.Timber import timber.log.Timber
import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit
import javax.inject.Inject import javax.inject.Inject
class MessagesAdapter(data: OrderedRealmCollection<Message>?) : RealmRecyclerViewAdapter<Message, QkViewHolder>(data, true) { class MessagesAdapter : RealmRecyclerViewAdapter<Message, QkViewHolder>(null, true) {
companion object { companion object {
private val VIEWTYPE_ME = -1 private val VIEWTYPE_ME = -1