forked from upstream-mirrors/quik
Reorganize packages
This commit is contained in:
@@ -0,0 +1,139 @@
|
||||
package com.moez.QKSMS.presentation.messages
|
||||
|
||||
import android.content.Context
|
||||
import android.view.LayoutInflater
|
||||
import android.view.View
|
||||
import android.view.ViewGroup
|
||||
import com.moez.QKSMS.R
|
||||
import com.moez.QKSMS.common.di.AppComponentManager
|
||||
import com.moez.QKSMS.common.util.DateFormatter
|
||||
import com.moez.QKSMS.common.util.ThemeManager
|
||||
import com.moez.QKSMS.common.util.extensions.dpToPx
|
||||
import com.moez.QKSMS.common.util.extensions.setBackgroundTint
|
||||
import com.moez.QKSMS.common.util.extensions.setPadding
|
||||
import com.moez.QKSMS.data.model.Message
|
||||
import com.moez.QKSMS.data.repository.ContactRepository
|
||||
import io.realm.OrderedRealmCollection
|
||||
import io.realm.RealmRecyclerViewAdapter
|
||||
import timber.log.Timber
|
||||
import java.util.concurrent.TimeUnit
|
||||
import javax.inject.Inject
|
||||
|
||||
class MessageAdapter(data: OrderedRealmCollection<Message>?) : RealmRecyclerViewAdapter<Message, MessageViewHolder>(data, true) {
|
||||
|
||||
companion object {
|
||||
private val VIEWTYPE_ME = -1
|
||||
private val TIMESTAMP_THRESHOLD = 60
|
||||
}
|
||||
|
||||
@Inject lateinit var context: Context
|
||||
@Inject lateinit var themeManager: ThemeManager
|
||||
@Inject lateinit var dateFormatter: DateFormatter
|
||||
@Inject lateinit var contactRepo: ContactRepository
|
||||
|
||||
private val people = ArrayList<String>()
|
||||
|
||||
init {
|
||||
AppComponentManager.appComponent.inject(this)
|
||||
}
|
||||
|
||||
override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): MessageViewHolder {
|
||||
val layoutRes: Int
|
||||
val bubbleColor: Int
|
||||
when (viewType) {
|
||||
VIEWTYPE_ME -> {
|
||||
layoutRes = R.layout.message_list_item_out
|
||||
bubbleColor = themeManager.color
|
||||
}
|
||||
else -> {
|
||||
layoutRes = R.layout.message_list_item_in
|
||||
bubbleColor = themeManager.bubbleColor
|
||||
}
|
||||
}
|
||||
|
||||
val layoutInflater = LayoutInflater.from(context)
|
||||
val viewHolder = MessageViewHolder(layoutInflater.inflate(layoutRes, parent, false))
|
||||
viewHolder.body.setBackgroundTint(bubbleColor)
|
||||
|
||||
if (viewType != VIEWTYPE_ME) {
|
||||
viewHolder.avatar?.contact = contactRepo.getContactFromCache(people[viewType])
|
||||
}
|
||||
|
||||
return viewHolder
|
||||
}
|
||||
|
||||
override fun onBindViewHolder(viewHolder: MessageViewHolder, position: Int) {
|
||||
val message = getItem(position)!!
|
||||
|
||||
viewHolder.itemView.setOnClickListener { Timber.v(message.toString()) }
|
||||
|
||||
bindGrouping(viewHolder, position)
|
||||
|
||||
viewHolder.status?.visibility = when {
|
||||
message.isSending() || message.isFailedMessage() -> View.VISIBLE
|
||||
else -> View.GONE
|
||||
}
|
||||
viewHolder.status?.text = when {
|
||||
message.isSending() -> "Sending..."
|
||||
message.isFailedMessage() -> "Failed to send. Tap to try again"
|
||||
else -> null
|
||||
}
|
||||
|
||||
viewHolder.body.text = message.body
|
||||
viewHolder.timestamp.text = dateFormatter.getMessageTimestamp(message.date)
|
||||
}
|
||||
|
||||
private fun bindGrouping(viewHolder: MessageViewHolder, position: Int) {
|
||||
val message = getItem(position)!!
|
||||
val previous = if (position == 0) null else getItem(position - 1)
|
||||
val next = if (position == itemCount - 1) null else getItem(position + 1)
|
||||
|
||||
val diff = TimeUnit.MILLISECONDS.toMinutes(message.date - (previous?.date ?: 0))
|
||||
viewHolder.timestamp.visibility = if (diff < TIMESTAMP_THRESHOLD) View.GONE else View.VISIBLE
|
||||
|
||||
val sent = message.isMe()
|
||||
val canGroupWithPrevious = canGroup(message, previous)
|
||||
val canGroupWithNext = canGroup(message, next)
|
||||
|
||||
when {
|
||||
!canGroupWithPrevious && canGroupWithNext -> {
|
||||
viewHolder.itemView.setPadding(bottom = 2.dpToPx(context))
|
||||
viewHolder.body.setBackgroundResource(if (sent) R.drawable.message_out_first else R.drawable.message_in_first)
|
||||
viewHolder.avatar?.visibility = View.INVISIBLE
|
||||
}
|
||||
canGroupWithPrevious && canGroupWithNext -> {
|
||||
viewHolder.itemView.setPadding(bottom = 2.dpToPx(context))
|
||||
viewHolder.body.setBackgroundResource(if (sent) R.drawable.message_out_middle else R.drawable.message_in_middle)
|
||||
viewHolder.avatar?.visibility = View.INVISIBLE
|
||||
}
|
||||
canGroupWithPrevious && !canGroupWithNext -> {
|
||||
viewHolder.itemView.setPadding(bottom = 16.dpToPx(context))
|
||||
viewHolder.body.setBackgroundResource(if (sent) R.drawable.message_out_last else R.drawable.message_in_last)
|
||||
viewHolder.avatar?.visibility = View.VISIBLE
|
||||
}
|
||||
else -> {
|
||||
viewHolder.itemView.setPadding(bottom = 16.dpToPx(context))
|
||||
viewHolder.body.setBackgroundResource(R.drawable.message_only)
|
||||
viewHolder.avatar?.visibility = View.VISIBLE
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private fun canGroup(message: Message, other: Message?): Boolean {
|
||||
if (other == null) return false
|
||||
val diff = TimeUnit.MILLISECONDS.toMinutes(Math.abs(message.date - other.date))
|
||||
return message.isMe() == other.isMe() && diff < TIMESTAMP_THRESHOLD
|
||||
}
|
||||
|
||||
override fun getItemViewType(position: Int): Int {
|
||||
val message = getItem(position)!!
|
||||
if (message.isMe()) {
|
||||
return VIEWTYPE_ME
|
||||
}
|
||||
|
||||
if (!people.contains(message.address)) {
|
||||
people.add(message.address)
|
||||
}
|
||||
return people.indexOf(message.address)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,80 @@
|
||||
package com.moez.QKSMS.presentation.messages
|
||||
|
||||
import android.arch.lifecycle.Observer
|
||||
import android.arch.lifecycle.ViewModelProviders
|
||||
import android.os.Bundle
|
||||
import android.support.v7.widget.LinearLayoutManager
|
||||
import android.support.v7.widget.RecyclerView
|
||||
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 io.realm.RealmResults
|
||||
import kotlinx.android.synthetic.main.message_list_activity.*
|
||||
import javax.inject.Inject
|
||||
|
||||
class MessageListActivity : QkActivity(), Observer<MessageListViewState> {
|
||||
|
||||
@Inject lateinit var themeManager: ThemeManager
|
||||
|
||||
private lateinit var viewModel: MessageListViewModel
|
||||
private lateinit var layoutManager: LinearLayoutManager
|
||||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
AppComponentManager.appComponent.inject(this)
|
||||
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)
|
||||
|
||||
attach.setTint(themeManager.color)
|
||||
|
||||
layoutManager = LinearLayoutManager(this)
|
||||
layoutManager.stackFromEnd = true
|
||||
messageList.layoutManager = layoutManager
|
||||
|
||||
RxTextView.textChanges(message).subscribe { text -> viewModel.textChanged(text.toString()) }
|
||||
RxView.clicks(attach).subscribe { }
|
||||
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()
|
||||
|
||||
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)
|
||||
adapter.registerAdapterDataObserver(object : RecyclerView.AdapterDataObserver() {
|
||||
override fun onItemRangeInserted(positionStart: Int, itemCount: Int) {
|
||||
super.onItemRangeInserted(positionStart, itemCount)
|
||||
viewModel.dataChanged()
|
||||
|
||||
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
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,69 @@
|
||||
package com.moez.QKSMS.presentation.messages
|
||||
|
||||
import android.arch.lifecycle.MutableLiveData
|
||||
import android.arch.lifecycle.ViewModel
|
||||
import com.moez.QKSMS.common.di.AppComponentManager
|
||||
import com.moez.QKSMS.data.model.Conversation
|
||||
import com.moez.QKSMS.data.repository.MessageRepository
|
||||
import io.reactivex.subjects.PublishSubject
|
||||
import javax.inject.Inject
|
||||
|
||||
class MessageListViewModel : ViewModel() {
|
||||
|
||||
@Inject lateinit var messageRepo: MessageRepository
|
||||
|
||||
val state: MutableLiveData<MessageListViewState> = MutableLiveData()
|
||||
var threadId: Long = 0
|
||||
set(value) {
|
||||
field = value
|
||||
newThreadId()
|
||||
}
|
||||
|
||||
private val partialStates: PublishSubject<PartialState> = PublishSubject.create()
|
||||
private var conversation: Conversation? = null
|
||||
|
||||
init {
|
||||
AppComponentManager.appComponent.inject(this)
|
||||
|
||||
partialStates
|
||||
.scan(MessageListViewState(), { previous, changes -> changes.reduce(previous) })
|
||||
.subscribe { newState -> state.value = newState }
|
||||
}
|
||||
|
||||
private fun newThreadId() {
|
||||
dataChanged()
|
||||
conversation?.removeAllChangeListeners()
|
||||
conversation = messageRepo.getConversationAsync(threadId)
|
||||
conversation?.addChangeListener { conversation: Conversation ->
|
||||
when (conversation.isValid) {
|
||||
true -> {
|
||||
val title = conversation.getTitle()
|
||||
val messages = messageRepo.getMessages(threadId)
|
||||
partialStates.onNext(PartialState.ConversationLoaded(title, messages))
|
||||
}
|
||||
false -> partialStates.onNext(PartialState.ConversationError(true))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fun sendMessage(body: String) {
|
||||
conversation?.takeIf { conversation -> conversation.isValid }?.let { conversation ->
|
||||
messageRepo.sendMessage(threadId, conversation.contacts[0].address, body)
|
||||
partialStates.onNext(PartialState.TextChanged(""))
|
||||
}
|
||||
}
|
||||
|
||||
fun dataChanged() {
|
||||
messageRepo.markRead(threadId)
|
||||
}
|
||||
|
||||
fun textChanged(text: String) {
|
||||
partialStates.onNext(PartialState.TextChanged(text))
|
||||
}
|
||||
|
||||
override fun onCleared() {
|
||||
super.onCleared()
|
||||
conversation?.removeAllChangeListeners()
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,37 @@
|
||||
package com.moez.QKSMS.presentation.messages
|
||||
|
||||
import com.moez.QKSMS.data.model.Message
|
||||
import io.realm.RealmResults
|
||||
|
||||
data class MessageListViewState(
|
||||
val title: String = "",
|
||||
val messages: RealmResults<Message>? = null,
|
||||
val draft: String = "",
|
||||
val hasError: Boolean = false
|
||||
) {
|
||||
val canSend: Boolean get() = draft.isNotBlank()
|
||||
}
|
||||
|
||||
sealed class PartialState {
|
||||
|
||||
abstract fun reduce(previousState: MessageListViewState): MessageListViewState
|
||||
|
||||
data class ConversationLoaded(private val title: String, private val messages: RealmResults<Message>) : PartialState() {
|
||||
override fun reduce(previousState: MessageListViewState): MessageListViewState {
|
||||
return previousState.copy(title = title, messages = messages)
|
||||
}
|
||||
}
|
||||
|
||||
data class ConversationError(private val hasError: Boolean) : PartialState() {
|
||||
override fun reduce(previousState: MessageListViewState): MessageListViewState {
|
||||
return previousState.copy(hasError = hasError)
|
||||
}
|
||||
}
|
||||
|
||||
data class TextChanged(private val text: String) : PartialState() {
|
||||
override fun reduce(previousState: MessageListViewState): MessageListViewState {
|
||||
return previousState.copy(draft = text)
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
package com.moez.QKSMS.presentation.messages
|
||||
|
||||
import android.support.v7.widget.RecyclerView
|
||||
import android.view.View
|
||||
import android.widget.TextView
|
||||
import com.moez.QKSMS.R
|
||||
import com.moez.QKSMS.presentation.view.AvatarView
|
||||
|
||||
class MessageViewHolder(view: View) : RecyclerView.ViewHolder(view) {
|
||||
|
||||
val timestamp: TextView = view.findViewById(R.id.timestamp)
|
||||
val message: View = view.findViewById(R.id.message)
|
||||
val status: TextView? = view.findViewById(R.id.status)
|
||||
val avatar: AvatarView? = view.findViewById(R.id.avatar)
|
||||
val body: TextView = view.findViewById(R.id.body)
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user