Show messages in QkReplyActivity

This commit is contained in:
Moez Bhatti
2018-03-28 01:31:01 -04:00
parent 16d49e8e64
commit 5bda23c1c8
7 changed files with 52 additions and 18 deletions
@@ -26,6 +26,7 @@ import android.view.View
import android.view.ViewGroup
import com.jakewharton.rxbinding2.view.RxView
import com.moez.QKSMS.R
import common.base.QkViewHolder
import common.util.Colors
import common.util.DateFormatter
import common.util.extensions.dpToPx
@@ -44,7 +45,6 @@ import model.Contact
import model.Conversation
import model.Message
import model.PhoneNumber
import common.base.QkViewHolder
import util.extensions.isImage
import java.util.concurrent.TimeUnit
import javax.inject.Inject
@@ -65,6 +65,8 @@ class MessagesAdapter @Inject constructor(
var data: Pair<Conversation, RealmResults<Message>>? = null
set(value) {
if (field === value) return
field = value
people.clear()
contactMap.clear()
@@ -19,6 +19,7 @@
package feature.qkreply
import android.os.Bundle
import android.support.v7.widget.LinearLayoutManager
import android.view.ViewGroup
import android.view.Window
import android.view.WindowManager
@@ -27,13 +28,17 @@ import com.uber.autodispose.android.lifecycle.scope
import com.uber.autodispose.kotlin.autoDisposable
import common.base.QkThemedActivity
import common.util.extensions.setBackgroundTint
import feature.compose.MessagesAdapter
import injection.appComponent
import kotlinx.android.synthetic.main.qkreply_activity.*
import javax.inject.Inject
class QkReplyActivity : QkThemedActivity<QkReplyViewModel>(), QkReplyView {
override val viewModelClass = QkReplyViewModel::class
@Inject lateinit var adapter: MessagesAdapter
init {
appComponent.inject(this)
}
@@ -48,16 +53,22 @@ class QkReplyActivity : QkThemedActivity<QkReplyViewModel>(), QkReplyView {
window.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
viewModel.bindView(this)
toolbar.clipToOutline = true
colors.composeBackground
.autoDisposable(scope())
.subscribe { color -> background.setBackgroundTint(color) }
toolbar.clipToOutline = true
val layoutManager = LinearLayoutManager(this).apply { stackFromEnd = true }
messages.layoutManager = layoutManager
messages.adapter = adapter
}
override fun render(state: QkReplyState) {
title = state.title
adapter.data = state.data
}
override fun getAppThemeResourcesObservable() = colors.appDialogThemeResources
@@ -19,9 +19,10 @@
package feature.qkreply
import io.realm.RealmResults
import model.Conversation
import model.Message
data class QkReplyState(
val title: String = "",
val data: RealmResults<Message>? = null
val data: Pair<Conversation, RealmResults<Message>>? = null
)
@@ -40,7 +40,11 @@ class QkReplyViewModel(intent: Intent) : QkViewModel<QkReplyView, QkReplyState>(
.asObservable<Conversation>()
.filter { it.isLoaded }
.filter { it.isValid }
.subscribe { conversation -> newState { it.copy(title = conversation.getTitle()) } }
.distinctUntilChanged()
.doOnNext { conversation -> newState { it.copy(title = conversation.getTitle()) } }
.map { conversation -> Pair(conversation, messageRepo.getUnreadMessages(conversation.id)) }
.doOnNext { data -> newState { it.copy(data = data) } }
.subscribe()
}
}