diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListActivity.kt b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListActivity.kt index f33f3102..2bd59fa6 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListActivity.kt @@ -1,5 +1,6 @@ package com.moez.QKSMS.ui.messages +import android.arch.lifecycle.Observer import android.os.Bundle import android.support.v7.widget.LinearLayoutManager import com.moez.QKSMS.R @@ -7,10 +8,11 @@ import com.moez.QKSMS.dagger.AppComponentManager import com.moez.QKSMS.dagger.DaggerMessagesComponent import com.moez.QKSMS.dagger.MessagesModule import com.moez.QKSMS.ui.base.QkActivity +import com.moez.QKSMS.util.observe import kotlinx.android.synthetic.main.message_list_activity.* import javax.inject.Inject -class MessageListActivity : QkActivity() { +class MessageListActivity : QkActivity(), Observer { @Inject lateinit var viewModel: MessageListViewModel @@ -26,18 +28,31 @@ class MessageListActivity : QkActivity() { .build() .inject(this) - viewModel.conversation.addChangeListener { realmResults -> - if (realmResults.size > 0) { - title = realmResults[0]?.getTitle() - } else { - finish() - } - } - val layoutManager = LinearLayoutManager(this) layoutManager.stackFromEnd = true messageList.layoutManager = layoutManager - messageList.adapter = MessageAdapter(this, viewModel.messages) + + viewModel.state.observe(this) + } + + override fun onChanged(state: MessageListViewState?) { + when (state) { + is MessageListViewState.ConversationLoaded -> onConversationLoaded(state) + is MessageListViewState.ConversationError -> onConversationError(state) + is MessageListViewState.MessagesLoaded -> onMessagesLoaded(state) + } + } + + private fun onConversationLoaded(conversationLoaded: MessageListViewState.ConversationLoaded) { + title = conversationLoaded.data.getTitle() + } + + private fun onConversationError(conversationError: MessageListViewState.ConversationError) { + finish() + } + + private fun onMessagesLoaded(messagesLoaded: MessageListViewState.MessagesLoaded) { + messageList.adapter = MessageAdapter(this, messagesLoaded.data) } } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListViewModel.kt index c98b35de..d549ea8e 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListViewModel.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListViewModel.kt @@ -1,5 +1,6 @@ package com.moez.QKSMS.ui.messages +import android.arch.lifecycle.MutableLiveData import android.arch.lifecycle.ViewModel import com.moez.QKSMS.data.model.Message import com.moez.QKSMS.data.repository.ConversationRepository @@ -8,8 +9,21 @@ import io.realm.RealmResults class MessageListViewModel(val threadId: Long, conversations: ConversationRepository, repository: MessageRepository) : ViewModel() { - val conversation = conversations.getConversation(threadId) - val messages: RealmResults = repository.getMessages() + val state: MutableLiveData = MutableLiveData() + + private val conversation = conversations.getConversation(threadId) + private val messages: RealmResults = repository.getMessages() + + init { + state.value = MessageListViewState.MessagesLoaded(messages) + + conversation.addChangeListener { realmResults -> + when (realmResults.size) { + 0 -> state.value = MessageListViewState.ConversationError(0) + else -> state.value = MessageListViewState.ConversationLoaded(realmResults[0]) + } + } + } override fun onCleared() { super.onCleared() diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListViewState.kt b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListViewState.kt new file mode 100644 index 00000000..e2c387c5 --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListViewState.kt @@ -0,0 +1,11 @@ +package com.moez.QKSMS.ui.messages + +import com.moez.QKSMS.data.model.Conversation +import com.moez.QKSMS.data.model.Message +import io.realm.OrderedRealmCollection + +sealed class MessageListViewState { + data class ConversationLoaded(val data: Conversation) : MessageListViewState() + data class ConversationError(val count: Int) : MessageListViewState() + data class MessagesLoaded(val data: OrderedRealmCollection) : MessageListViewState() +} \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/util/Extensions.kt b/qksms/src/main/java/com/moez/QKSMS/util/Extensions.kt index 287c430b..a77ad58c 100644 --- a/qksms/src/main/java/com/moez/QKSMS/util/Extensions.kt +++ b/qksms/src/main/java/com/moez/QKSMS/util/Extensions.kt @@ -1,5 +1,8 @@ package com.moez.QKSMS.util +import android.arch.lifecycle.LifecycleOwner +import android.arch.lifecycle.LiveData +import android.arch.lifecycle.Observer import android.database.Cursor import io.reactivex.Flowable import java.util.* @@ -32,6 +35,11 @@ fun Cursor.forEach(closeOnComplete: Boolean = true, method: (Cursor) -> Unit = { } } + +fun LiveData.observe(observer: O) where O : LifecycleOwner, O : Observer { + observe(observer, observer) +} + /** * We're using this simple implementation with .range() because of the * complexities of dealing with Backpressure with a Cursor. We can't simply diff --git a/qksms/src/main/java/com/moez/QKSMS/util/LiveRealmData.kt b/qksms/src/main/java/com/moez/QKSMS/util/LiveRealmData.kt new file mode 100644 index 00000000..988ec38a --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/util/LiveRealmData.kt @@ -0,0 +1,24 @@ +package com.moez.QKSMS.util + +import android.arch.lifecycle.LiveData +import io.realm.RealmChangeListener +import io.realm.RealmModel +import io.realm.RealmResults + +class LiveRealmData(private val results: RealmResults) : LiveData>() { + + private val listener: RealmChangeListener> = RealmChangeListener { results -> + value = results + } + + override fun onActive() { + super.onActive() + results.addChangeListener(listener) + } + + override fun onInactive() { + super.onInactive() + results.removeChangeListener(listener) + } + +} \ No newline at end of file