forked from upstream-mirrors/quik
Create Navigator to allow custom ViewModel constructors
This commit is contained in:
+17
-18
@@ -9,19 +9,20 @@ import com.jakewharton.rxbinding2.view.RxView
|
||||
import com.jakewharton.rxbinding2.widget.RxTextView
|
||||
import com.moez.QKSMS.R
|
||||
import com.moez.QKSMS.common.di.AppComponentManager
|
||||
import com.moez.QKSMS.data.model.Message
|
||||
import com.moez.QKSMS.presentation.base.QkActivity
|
||||
import com.moez.QKSMS.common.util.ThemeManager
|
||||
import com.moez.QKSMS.common.util.extensions.setTint
|
||||
import com.moez.QKSMS.data.model.Message
|
||||
import com.moez.QKSMS.presentation.Navigator
|
||||
import com.moez.QKSMS.presentation.base.QkActivity
|
||||
import io.realm.RealmResults
|
||||
import kotlinx.android.synthetic.main.message_list_activity.*
|
||||
import javax.inject.Inject
|
||||
|
||||
class MessageListActivity : QkActivity(), Observer<MessageListViewState> {
|
||||
class MessagesActivity : QkActivity(), MessagesView {
|
||||
|
||||
@Inject lateinit var themeManager: ThemeManager
|
||||
|
||||
private lateinit var viewModel: MessageListViewModel
|
||||
private lateinit var viewModel: MessagesViewModel
|
||||
private lateinit var layoutManager: LinearLayoutManager
|
||||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
@@ -30,9 +31,9 @@ class MessageListActivity : QkActivity(), Observer<MessageListViewState> {
|
||||
setContentView(R.layout.message_list_activity)
|
||||
supportActionBar?.setDisplayHomeAsUpEnabled(true)
|
||||
|
||||
viewModel = ViewModelProviders.of(this)[MessageListViewModel::class.java]
|
||||
viewModel.threadId = intent.getLongExtra("threadId", 0)
|
||||
viewModel.state.observe(this, this)
|
||||
viewModel = ViewModelProviders.of(this, Navigator.ViewModelFactory(intent))[MessagesViewModel::class.java]
|
||||
viewModel.state.observe(this, Observer { it?.let { render(it) } })
|
||||
viewModel.view = this
|
||||
|
||||
attach.setTint(themeManager.color)
|
||||
|
||||
@@ -45,20 +46,18 @@ class MessageListActivity : QkActivity(), Observer<MessageListViewState> {
|
||||
RxView.clicks(send).subscribe { viewModel.sendMessage(message.text.toString()) }
|
||||
}
|
||||
|
||||
override fun onChanged(state: MessageListViewState?) {
|
||||
state?.let {
|
||||
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 (state.hasError) finish()
|
||||
override fun render(state: MessagesState) {
|
||||
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 (state.hasError) finish()
|
||||
|
||||
send.setTint(if (state.canSend) themeManager.color else resources.getColor(R.color.textTertiary))
|
||||
send.isEnabled = state.canSend
|
||||
}
|
||||
send.setTint(if (state.canSend) themeManager.color else resources.getColor(R.color.textTertiary))
|
||||
send.isEnabled = state.canSend
|
||||
}
|
||||
|
||||
private fun createAdapter(messages: RealmResults<Message>): MessageAdapter {
|
||||
val adapter = MessageAdapter(messages)
|
||||
private fun createAdapter(messages: RealmResults<Message>): MessagesAdapter {
|
||||
val adapter = MessagesAdapter(messages)
|
||||
adapter.registerAdapterDataObserver(object : RecyclerView.AdapterDataObserver() {
|
||||
override fun onItemRangeInserted(positionStart: Int, itemCount: Int) {
|
||||
super.onItemRangeInserted(positionStart, itemCount)
|
||||
+1
-1
@@ -22,7 +22,7 @@ import timber.log.Timber
|
||||
import java.util.concurrent.TimeUnit
|
||||
import javax.inject.Inject
|
||||
|
||||
class MessageAdapter(data: OrderedRealmCollection<Message>?) : RealmRecyclerViewAdapter<Message, QkViewHolder>(data, true) {
|
||||
class MessagesAdapter(data: OrderedRealmCollection<Message>?) : RealmRecyclerViewAdapter<Message, QkViewHolder>(data, true) {
|
||||
|
||||
companion object {
|
||||
private val VIEWTYPE_ME = -1
|
||||
+1
-1
@@ -3,7 +3,7 @@ package com.moez.QKSMS.presentation.messages
|
||||
import com.moez.QKSMS.data.model.Message
|
||||
import io.realm.RealmResults
|
||||
|
||||
data class MessageListViewState(
|
||||
data class MessagesState(
|
||||
val title: String = "",
|
||||
val messages: RealmResults<Message>? = null,
|
||||
val draft: String = "",
|
||||
@@ -0,0 +1,5 @@
|
||||
package com.moez.QKSMS.presentation.messages
|
||||
|
||||
import com.moez.QKSMS.presentation.base.QkView
|
||||
|
||||
interface MessagesView : QkView<MessagesState>
|
||||
+5
-14
@@ -8,29 +8,20 @@ import com.moez.QKSMS.domain.interactor.SendMessage
|
||||
import com.moez.QKSMS.presentation.base.QkViewModel
|
||||
import javax.inject.Inject
|
||||
|
||||
class MessageListViewModel : QkViewModel<MessageListViewState>(MessageListViewState()) {
|
||||
class MessagesViewModel(val threadId: Long) : QkViewModel<MessagesView, MessagesState>(MessagesState()) {
|
||||
|
||||
@Inject lateinit var messageRepo: MessageRepository
|
||||
@Inject lateinit var sendMessage: SendMessage
|
||||
@Inject lateinit var markRead: MarkRead
|
||||
|
||||
var threadId: Long = 0
|
||||
set(value) {
|
||||
field = value
|
||||
newThreadId()
|
||||
}
|
||||
|
||||
private var conversation: Conversation? = null
|
||||
private var conversation: Conversation
|
||||
|
||||
init {
|
||||
AppComponentManager.appComponent.inject(this)
|
||||
}
|
||||
|
||||
private fun newThreadId() {
|
||||
dataChanged()
|
||||
conversation?.removeAllChangeListeners()
|
||||
conversation = messageRepo.getConversationAsync(threadId)
|
||||
conversation?.addChangeListener { conversation: Conversation ->
|
||||
conversation.addChangeListener { conversation: Conversation ->
|
||||
when (conversation.isValid) {
|
||||
true -> {
|
||||
val title = conversation.getTitle()
|
||||
@@ -43,7 +34,7 @@ class MessageListViewModel : QkViewModel<MessageListViewState>(MessageListViewSt
|
||||
}
|
||||
|
||||
fun sendMessage(body: String) {
|
||||
conversation?.takeIf { conversation -> conversation.isValid }?.let { conversation ->
|
||||
conversation.takeIf { conversation -> conversation.isValid }?.let { conversation ->
|
||||
sendMessage.execute(SendMessage.Params(threadId, conversation.contacts[0].address, body))
|
||||
newState { it.copy(draft = "", canSend = false) }
|
||||
}
|
||||
@@ -61,7 +52,7 @@ class MessageListViewModel : QkViewModel<MessageListViewState>(MessageListViewSt
|
||||
super.onCleared()
|
||||
sendMessage.dispose()
|
||||
markRead.dispose()
|
||||
conversation?.removeAllChangeListeners()
|
||||
conversation.removeAllChangeListeners()
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user