Reorganize packages

This commit is contained in:
Moez Bhatti
2017-09-29 14:20:13 -04:00
parent 321eadce6c
commit 5a8b8f36ee
40 changed files with 89 additions and 88 deletions
@@ -0,0 +1,30 @@
package com.moez.QKSMS.presentation.base
import android.support.v7.app.AppCompatActivity
import android.view.MenuItem
import kotlinx.android.synthetic.main.toolbar.*
abstract class QkActivity : AppCompatActivity() {
override fun onOptionsItemSelected(item: MenuItem): Boolean {
return when(item.itemId) {
android.R.id.home -> {
onBackPressed()
true
}
else -> super.onOptionsItemSelected(item)
}
}
override fun setContentView(layoutResID: Int) {
super.setContentView(layoutResID)
setSupportActionBar(toolbar)
title = title // The title may have been set before layout inflation
}
override fun setTitle(title: CharSequence?) {
super.setTitle(title)
toolbarTitle?.text = title
}
}
@@ -0,0 +1,71 @@
package com.moez.QKSMS.presentation.conversations
import android.content.Context
import android.content.Intent
import android.view.LayoutInflater
import android.view.ViewGroup
import com.moez.QKSMS.R
import com.moez.QKSMS.common.di.AppComponentManager
import com.moez.QKSMS.data.model.Message
import com.moez.QKSMS.data.repository.MessageRepository
import com.moez.QKSMS.presentation.messages.MessageListActivity
import com.moez.QKSMS.common.util.DateFormatter
import com.moez.QKSMS.common.util.ThemeManager
import com.moez.QKSMS.common.util.extensions.getColorCompat
import io.realm.OrderedRealmCollection
import io.realm.RealmList
import io.realm.RealmRecyclerViewAdapter
import javax.inject.Inject
class ConversationAdapter(data: OrderedRealmCollection<Message>?) : RealmRecyclerViewAdapter<Message, ConversationViewHolder>(data, true) {
@Inject lateinit var context: Context
@Inject lateinit var messageRepo: MessageRepository
@Inject lateinit var dateFormatter: DateFormatter
@Inject lateinit var themeManager: ThemeManager
init {
AppComponentManager.appComponent.inject(this)
}
override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): ConversationViewHolder {
val layoutRes = when(viewType) {
0 -> R.layout.conversation_list_item
else -> R.layout.conversation_list_item_unread
}
val layoutInflater = LayoutInflater.from(context)
val viewHolder = ConversationViewHolder(layoutInflater.inflate(layoutRes, parent, false))
if (viewType == 1) viewHolder.date.setTextColor(themeManager.color)
return viewHolder
}
override fun onBindViewHolder(viewHolder: ConversationViewHolder, position: Int) {
val message = getItem(position)!!
val conversation = messageRepo.getConversation(message.threadId)
viewHolder.itemView.setOnClickListener {
context.startActivity(Intent(context, MessageListActivity::class.java)
.putExtra("threadId", message.threadId))
}
val dateColor = if (message.read) context.getColorCompat(R.color.textTertiary) else themeManager.color
val snippetColor = context.getColorCompat(if (message.read) R.color.textTertiary else R.color.textPrimary)
viewHolder.avatar.contacts = conversation?.contacts ?: RealmList()
viewHolder.title.text = conversation?.getTitle()
viewHolder.date.text = dateFormatter.getConversationTimestamp(message.date)
viewHolder.date.setTextColor(dateColor)
viewHolder.snippet.text = message.body
viewHolder.snippet.setTextColor(snippetColor)
viewHolder.snippet.maxLines = if (message.read) 1 else 3
}
override fun getItemViewType(position: Int): Int {
return if (getItem(position)!!.read) 0 else 1
}
}
@@ -0,0 +1,73 @@
package com.moez.QKSMS.presentation.conversations
import android.Manifest
import android.arch.lifecycle.Observer
import android.arch.lifecycle.ViewModelProviders
import android.content.Intent
import android.os.Bundle
import android.support.v7.widget.LinearLayoutManager
import com.jakewharton.rxbinding2.view.RxView
import com.karumi.dexter.Dexter
import com.karumi.dexter.MultiplePermissionsReport
import com.karumi.dexter.PermissionToken
import com.karumi.dexter.listener.PermissionRequest
import com.karumi.dexter.listener.multi.MultiplePermissionsListener
import com.moez.QKSMS.R
import com.moez.QKSMS.presentation.base.QkActivity
import com.moez.QKSMS.presentation.messages.MessageListActivity
import kotlinx.android.synthetic.main.conversation_list_activity.*
import timber.log.Timber
class ConversationListActivity : QkActivity(), Observer<ConversationListViewState> {
private lateinit var viewModel: ConversationListViewModel
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.conversation_list_activity)
onNewIntent(intent)
requestPermissions()
viewModel = ViewModelProviders.of(this)[ConversationListViewModel::class.java]
viewModel.state.observe(this, this)
conversationList.layoutManager = LinearLayoutManager(this)
swipeRefresh.setOnRefreshListener { viewModel.onRefresh() }
RxView.clicks(compose).subscribe {
// TODO: add entry point to compose view here
}
}
override fun onNewIntent(intent: Intent?) {
super.onNewIntent(intent)
intent?.getLongExtra("threadId", -1)?.takeIf { threadId -> threadId != -1L }.let { threadId ->
startActivity(Intent(this, MessageListActivity::class.java).putExtra("threadId", threadId))
}
}
override fun onChanged(state: ConversationListViewState?) {
state?.let {
if (conversationList.adapter == null && state.conversations?.isValid == true) {
conversationList.adapter = ConversationAdapter(state.conversations)
}
swipeRefresh.isRefreshing = state.refreshing
}
}
private fun requestPermissions() {
Dexter.withActivity(this)
.withPermissions(arrayListOf(Manifest.permission.READ_CONTACTS, Manifest.permission.READ_SMS))
.withListener(object : MultiplePermissionsListener {
override fun onPermissionRationaleShouldBeShown(request: MutableList<PermissionRequest>, token: PermissionToken) {
}
override fun onPermissionsChecked(report: MultiplePermissionsReport) {
for (response in report.grantedPermissionResponses) Timber.v("Permission granted: ${response.permissionName}")
for (response in report.deniedPermissionResponses) Timber.v("Permission denied: ${response.permissionName}")
}
})
.check()
}
}
@@ -0,0 +1,43 @@
package com.moez.QKSMS.presentation.conversations
import android.arch.lifecycle.MutableLiveData
import android.arch.lifecycle.ViewModel
import com.moez.QKSMS.common.di.AppComponentManager
import com.moez.QKSMS.data.model.Message
import com.moez.QKSMS.data.repository.MessageRepository
import com.moez.QKSMS.data.sync.SyncManager
import com.moez.QKSMS.common.util.NotificationManager
import io.reactivex.subjects.PublishSubject
import io.realm.RealmResults
import javax.inject.Inject
class ConversationListViewModel : ViewModel() {
@Inject lateinit var syncManager: SyncManager
@Inject lateinit var notificationManager: NotificationManager
@Inject lateinit var messageRepo: MessageRepository
val state: MutableLiveData<ConversationListViewState> = MutableLiveData()
private val partialStates: PublishSubject<PartialState> = PublishSubject.create()
private val conversations: RealmResults<Message>
init {
AppComponentManager.appComponent.inject(this)
partialStates
.scan(ConversationListViewState(), { previous, changes -> changes.reduce(previous) })
.subscribe { newState -> state.value = newState }
conversations = messageRepo.getConversationMessagesAsync()
partialStates.onNext(PartialState.ConversationsLoaded(conversations))
messageRepo.markAllSeen()
}
fun onRefresh() {
partialStates.onNext(PartialState.Refreshing(true))
syncManager.copyToRealm { partialStates.onNext(PartialState.Refreshing(false)) }
}
}
@@ -0,0 +1,27 @@
package com.moez.QKSMS.presentation.conversations
import com.moez.QKSMS.data.model.Message
import io.realm.OrderedRealmCollection
data class ConversationListViewState(
val conversations: OrderedRealmCollection<Message>? = null,
val refreshing: Boolean = false
)
sealed class PartialState {
abstract fun reduce(previousState: ConversationListViewState): ConversationListViewState
data class ConversationsLoaded(val conversations: OrderedRealmCollection<Message>) : PartialState() {
override fun reduce(previousState: ConversationListViewState): ConversationListViewState {
return previousState.copy(conversations = conversations)
}
}
data class Refreshing(val refreshing: Boolean) : PartialState (){
override fun reduce(previousState: ConversationListViewState): ConversationListViewState {
return previousState.copy(refreshing = refreshing)
}
}
}
@@ -0,0 +1,16 @@
package com.moez.QKSMS.presentation.conversations
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.GroupAvatarView
class ConversationViewHolder(view: View) : RecyclerView.ViewHolder(view) {
val avatar: GroupAvatarView = view.findViewById(R.id.avatars)
val title: TextView = view.findViewById(R.id.title)
val date: TextView = view.findViewById(R.id.date)
val snippet: TextView = view.findViewById(R.id.snippet)
}
@@ -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)
}
@@ -0,0 +1,59 @@
package com.moez.QKSMS.presentation.view
import android.content.Context
import android.content.res.ColorStateList
import android.util.AttributeSet
import android.view.View
import android.widget.FrameLayout
import com.moez.QKSMS.R
import com.moez.QKSMS.common.di.AppComponentManager
import com.moez.QKSMS.data.model.Contact
import com.moez.QKSMS.data.repository.ContactRepository
import com.moez.QKSMS.common.util.extensions.getColorCompat
import io.reactivex.disposables.Disposable
import kotlinx.android.synthetic.main.avatar_view.view.*
import javax.inject.Inject
class AvatarView(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : FrameLayout(context, attrs, defStyleAttr) {
var contact: Contact? = null
set(value) {
field = value
updateView()
}
@Inject lateinit var contactRepo: ContactRepository
private var avatarRequest: Disposable? = null
constructor(context: Context, attrs: AttributeSet?) : this(context, attrs, 0)
constructor(context: Context) : this(context, null, 0)
init {
AppComponentManager.appComponent.inject(this)
View.inflate(context, R.layout.avatar_view, this)
}
override fun onFinishInflate() {
super.onFinishInflate()
setBackgroundResource(R.drawable.circle)
clipToOutline = true
backgroundTintList = ColorStateList.valueOf(context.getColorCompat(R.color.bubbleLight))
if (!isInEditMode) {
updateView()
}
}
private fun updateView() {
avatarRequest?.dispose()
photo.setImageDrawable(null)
initial.text = "?"
contact?.let { contact ->
avatarRequest = contactRepo.getAvatar(contact.photoUri).subscribe({ photo.setImageBitmap(it) }, {})
initial.text = if (contact.name.isNotEmpty()) contact.name.substring(0, 1) else "?"
}
}
}
@@ -0,0 +1,43 @@
package com.moez.QKSMS.presentation.view
import android.content.Context
import android.support.constraint.ConstraintLayout
import android.util.AttributeSet
import android.view.View
import com.moez.QKSMS.R
import com.moez.QKSMS.data.model.Contact
import io.realm.RealmList
import kotlinx.android.synthetic.main.group_avatar_view.view.*
class GroupAvatarView(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : ConstraintLayout(context, attrs, defStyleAttr) {
var contacts: RealmList<Contact> = RealmList()
set(value) {
field = value
updateView()
}
constructor(context: Context, attrs: AttributeSet?) : this(context, attrs, 0)
constructor(context: Context) : this(context, null, 0)
init {
View.inflate(context, R.layout.group_avatar_view, this)
}
override fun onFinishInflate() {
super.onFinishInflate()
if (!isInEditMode) {
updateView()
}
}
private fun updateView() {
avatar1.visibility = if (contacts.size > 0) View.VISIBLE else View.GONE
avatar1.contact = if (contacts.size > 0) contacts[0] else null
avatar2.visibility = if (contacts.size > 1) View.VISIBLE else View.GONE
avatar2.contact = if (contacts.size > 1) contacts[1] else null
avatar3.visibility = if (contacts.size > 2) View.VISIBLE else View.GONE
avatar3.contact = if (contacts.size > 2) contacts[2] else null
}
}