mirror of
https://github.com/quik-sms/quik.git
synced 2026-11-21 13:18:52 +01:00
Scroll to bottom when new messages sent
This commit is contained in:
@@ -4,17 +4,22 @@ import android.arch.lifecycle.Observer
|
|||||||
import android.arch.lifecycle.ViewModelProviders
|
import android.arch.lifecycle.ViewModelProviders
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.support.v7.widget.LinearLayoutManager
|
import android.support.v7.widget.LinearLayoutManager
|
||||||
|
import android.support.v7.widget.RecyclerView
|
||||||
import com.jakewharton.rxbinding2.view.RxView
|
import com.jakewharton.rxbinding2.view.RxView
|
||||||
import com.jakewharton.rxbinding2.widget.RxTextView
|
import com.jakewharton.rxbinding2.widget.RxTextView
|
||||||
import com.moez.QKSMS.R
|
import com.moez.QKSMS.R
|
||||||
|
import com.moez.QKSMS.data.model.Message
|
||||||
import com.moez.QKSMS.ui.base.QkActivity
|
import com.moez.QKSMS.ui.base.QkActivity
|
||||||
import com.moez.QKSMS.util.extensions.setTint
|
import com.moez.QKSMS.util.extensions.setTint
|
||||||
|
import io.realm.RealmResults
|
||||||
import kotlinx.android.synthetic.main.message_list_activity.*
|
import kotlinx.android.synthetic.main.message_list_activity.*
|
||||||
|
|
||||||
class MessageListActivity : QkActivity(), Observer<MessageListViewState> {
|
class MessageListActivity : QkActivity(), Observer<MessageListViewState> {
|
||||||
|
|
||||||
private lateinit var viewModel: MessageListViewModel
|
private lateinit var viewModel: MessageListViewModel
|
||||||
|
|
||||||
|
private lateinit var layoutManager: LinearLayoutManager
|
||||||
|
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
super.onCreate(savedInstanceState)
|
super.onCreate(savedInstanceState)
|
||||||
setContentView(R.layout.message_list_activity)
|
setContentView(R.layout.message_list_activity)
|
||||||
@@ -24,7 +29,9 @@ class MessageListActivity : QkActivity(), Observer<MessageListViewState> {
|
|||||||
viewModel.threadId = intent.getLongExtra("threadId", 0)
|
viewModel.threadId = intent.getLongExtra("threadId", 0)
|
||||||
viewModel.state.observe(this, this)
|
viewModel.state.observe(this, this)
|
||||||
|
|
||||||
messageList.layoutManager = LinearLayoutManager(this).apply { stackFromEnd = true }
|
layoutManager = LinearLayoutManager(this)
|
||||||
|
layoutManager.stackFromEnd = true
|
||||||
|
messageList.layoutManager = layoutManager
|
||||||
|
|
||||||
RxTextView.textChanges(message).subscribe { text -> viewModel.textChanged(text.toString()) }
|
RxTextView.textChanges(message).subscribe { text -> viewModel.textChanged(text.toString()) }
|
||||||
RxView.clicks(attach).subscribe { }
|
RxView.clicks(attach).subscribe { }
|
||||||
@@ -34,7 +41,7 @@ class MessageListActivity : QkActivity(), Observer<MessageListViewState> {
|
|||||||
override fun onChanged(state: MessageListViewState?) {
|
override fun onChanged(state: MessageListViewState?) {
|
||||||
state?.let {
|
state?.let {
|
||||||
if (title != state.title) title = state.title
|
if (title != state.title) title = state.title
|
||||||
if (messageList.adapter == null && state.messages?.isValid == true) messageList.adapter = MessageAdapter(state.messages)
|
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)
|
||||||
if (state.hasError) finish()
|
if (state.hasError) finish()
|
||||||
|
|
||||||
@@ -43,4 +50,23 @@ class MessageListActivity : QkActivity(), Observer<MessageListViewState> {
|
|||||||
send.isEnabled = state.canSend
|
send.isEnabled = state.canSend
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun createAdapter(messages: RealmResults<Message>): MessageAdapter {
|
||||||
|
val adapter = MessageAdapter(messages)
|
||||||
|
adapter.registerAdapterDataObserver(object : RecyclerView.AdapterDataObserver() {
|
||||||
|
override fun onItemRangeInserted(positionStart: Int, itemCount: Int) {
|
||||||
|
super.onItemRangeInserted(positionStart, itemCount)
|
||||||
|
if (positionStart > 0) {
|
||||||
|
adapter.notifyItemChanged(positionStart - 1)
|
||||||
|
}
|
||||||
|
|
||||||
|
// If we're at the bottom, scroll down to show new messages
|
||||||
|
val lastVisiblePosition = layoutManager.findLastCompletelyVisibleItemPosition()
|
||||||
|
if (positionStart >= adapter.itemCount - 1 && lastVisiblePosition == positionStart - 1) {
|
||||||
|
messageList.scrollToPosition(positionStart)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
return adapter
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -1,12 +1,11 @@
|
|||||||
package com.moez.QKSMS.ui.messages
|
package com.moez.QKSMS.ui.messages
|
||||||
|
|
||||||
import com.moez.QKSMS.data.model.Message
|
import com.moez.QKSMS.data.model.Message
|
||||||
import io.realm.OrderedRealmCollection
|
|
||||||
import io.realm.RealmResults
|
import io.realm.RealmResults
|
||||||
|
|
||||||
data class MessageListViewState(
|
data class MessageListViewState(
|
||||||
val title: String = "",
|
val title: String = "",
|
||||||
val messages: OrderedRealmCollection<Message>? = null,
|
val messages: RealmResults<Message>? = null,
|
||||||
val draft: String = "",
|
val draft: String = "",
|
||||||
val hasError: Boolean = false
|
val hasError: Boolean = false
|
||||||
) {
|
) {
|
||||||
|
|||||||
Reference in New Issue
Block a user