Add option to call contact in conversation

This commit is contained in:
Moez Bhatti
2017-11-30 02:01:58 -05:00
parent fd5af2714b
commit 7031f94875
11 changed files with 114 additions and 24 deletions
@@ -10,7 +10,6 @@ import com.moez.QKSMS.presentation.main.MainActivity
import com.moez.QKSMS.presentation.main.MainViewModel
import com.moez.QKSMS.presentation.settings.SettingsViewModel
import com.moez.QKSMS.presentation.view.AvatarView
import com.moez.QKSMS.presentation.view.GroupAvatarView
import com.moez.QKSMS.receiver.*
import dagger.Component
import javax.inject.Singleton
@@ -4,6 +4,7 @@ import android.arch.lifecycle.ViewModel
import android.arch.lifecycle.ViewModelProvider
import android.content.Context
import android.content.Intent
import android.net.Uri
import com.moez.QKSMS.presentation.compose.ComposeActivity
import com.moez.QKSMS.presentation.compose.ComposeViewModel
import com.moez.QKSMS.presentation.main.MainViewModel
@@ -12,6 +13,8 @@ import com.moez.QKSMS.presentation.settings.SettingsViewModel
import javax.inject.Inject
import javax.inject.Singleton
@Singleton
class Navigator @Inject constructor(val context: Context) {
@@ -36,6 +39,11 @@ class Navigator @Inject constructor(val context: Context) {
startActivity(intent)
}
fun makePhoneCall(address: String) {
val intent = Intent(Intent.ACTION_DIAL, Uri.parse("tel:$address"))
startActivity(intent)
}
class ViewModelFactory(private val intent: Intent) : ViewModelProvider.Factory {
@Suppress("UNCHECKED_CAST")
@@ -1,23 +1,53 @@
package com.moez.QKSMS.presentation.base
import android.arch.lifecycle.ViewModelProviders
import android.graphics.PorterDuff
import android.os.Bundle
import android.support.v7.app.AppCompatActivity
import android.view.Menu
import android.view.MenuItem
import com.moez.QKSMS.common.util.ThemeManager
import com.moez.QKSMS.presentation.Navigator
import io.reactivex.disposables.CompositeDisposable
import io.reactivex.rxkotlin.plusAssign
import kotlinx.android.synthetic.main.toolbar.*
import javax.inject.Inject
import kotlin.reflect.KClass
abstract class QkActivity<VM : QkViewModel<*, *>> : AppCompatActivity() {
@Inject lateinit var themeManager: ThemeManager
protected abstract val viewModelClass: KClass<VM>
protected val viewModel: VM by lazy {
ViewModelProviders.of(this, Navigator.ViewModelFactory(intent))[viewModelClass.java]
}
protected var menu: Menu? = null
protected var disposables = CompositeDisposable()
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
onNewIntent(intent)
// Update the colours of the menu items
disposables += themeManager.color.subscribe { color ->
menu?.let { menu ->
(0 until menu.size())
.map { position -> menu.getItem(position) }
.forEach { menuItem ->
menuItem.icon?.let { newIcon ->
newIcon.setColorFilter(color, PorterDuff.Mode.SRC_ATOP)
menuItem.icon = newIcon
}
}
}
}
}
override fun onDestroy() {
super.onDestroy()
disposables.dispose()
}
override fun onOptionsItemSelected(item: MenuItem): Boolean {
@@ -41,4 +71,9 @@ abstract class QkActivity<VM : QkViewModel<*, *>> : AppCompatActivity() {
toolbarTitle?.text = title
}
override fun onCreateOptionsMenu(menu: Menu?): Boolean {
this.menu = menu
return super.onCreateOptionsMenu(menu)
}
}
@@ -5,37 +5,35 @@ import android.content.res.ColorStateList
import android.os.Bundle
import android.support.v7.widget.LinearLayoutManager
import android.support.v7.widget.RecyclerView
import android.view.Menu
import android.view.MenuItem
import com.google.android.flexbox.FlexboxLayoutManager
import com.jakewharton.rxbinding2.view.clicks
import com.jakewharton.rxbinding2.widget.textChanges
import com.moez.QKSMS.R
import com.moez.QKSMS.common.di.AppComponentManager
import com.moez.QKSMS.common.util.ThemeManager
import com.moez.QKSMS.common.util.extensions.setVisible
import com.moez.QKSMS.common.util.extensions.showKeyboard
import com.moez.QKSMS.data.model.Contact
import com.moez.QKSMS.data.model.Message
import com.moez.QKSMS.presentation.base.QkActivity
import io.reactivex.Observable
import io.reactivex.disposables.CompositeDisposable
import io.reactivex.rxkotlin.plusAssign
import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject
import kotlinx.android.synthetic.main.compose_activity.*
import kotlinx.android.synthetic.main.toolbar_chips.*
import javax.inject.Inject
class ComposeActivity : QkActivity<ComposeViewModel>(), ComposeView {
@Inject lateinit var themeManager: ThemeManager
private lateinit var layoutManager: LinearLayoutManager
override val viewModelClass = ComposeViewModel::class
override val queryChangedIntent: Observable<CharSequence> by lazy { chipsAdapter.textChanges }
override val chipSelectedIntent: Subject<Contact> by lazy { contactsAdapter.contactSelected }
override val chipDeletedIntent: Subject<Contact> by lazy { chipsAdapter.chipDeleted }
override val callIntent: Subject<Unit> = PublishSubject.create()
override val copyTextIntent: Subject<Message> = PublishSubject.create()
override val forwardMessageIntent: Subject<Message> = PublishSubject.create()
override val deleteMessageIntent: Subject<Message> = PublishSubject.create()
@@ -47,11 +45,14 @@ class ComposeActivity : QkActivity<ComposeViewModel>(), ComposeView {
private val contactsAdapter by lazy { ContactAdapter(this) }
private val messageAdapter by lazy { MessagesAdapter() }
private val disposables = CompositeDisposable()
private var pendingCallVisibility = false
init {
AppComponentManager.appComponent.inject(this)
}
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
AppComponentManager.appComponent.inject(this)
setContentView(R.layout.compose_activity)
supportActionBar?.setDisplayHomeAsUpEnabled(true)
viewModel.bindView(this)
@@ -82,17 +83,20 @@ class ComposeActivity : QkActivity<ComposeViewModel>(), ComposeView {
window.callback = ComposeWindowCallback(window.callback, this)
}
override fun onDestroy() {
super.onDestroy()
disposables.clear()
}
override fun render(state: ComposeState) {
toolbarTitle.setVisible(!state.editingMode)
chips.setVisible(state.editingMode)
contacts.setVisible(state.contactsVisible)
composeBar.setVisible(!state.contactsVisible)
menu?.findItem(R.id.call).let { menuItem ->
if (menuItem == null) {
pendingCallVisibility = state.canCall
} else {
menuItem.setVisible(state.canCall)
}
}
if (chipsAdapter.data.isEmpty() && state.selectedContacts.isNotEmpty()) {
message.showKeyboard()
}
@@ -144,4 +148,22 @@ class ComposeActivity : QkActivity<ComposeViewModel>(), ComposeView {
.show()
}
}
override fun onCreateOptionsMenu(menu: Menu?): Boolean {
menuInflater.inflate(R.menu.compose, menu)
menu?.findItem(R.id.call)?.isVisible = pendingCallVisibility
return super.onCreateOptionsMenu(menu)
}
override fun onOptionsItemSelected(item: MenuItem): Boolean {
return when (item.itemId) {
R.id.call -> {
callIntent.onNext(Unit)
true
}
else -> super.onOptionsItemSelected(item)
}
}
}
@@ -10,6 +10,7 @@ data class ComposeState(
val contactsVisible: Boolean = false,
val selectedContacts: List<Contact> = ArrayList(),
val title: String = "",
val canCall: Boolean = false,
val messages: RealmResults<Message>? = null,
val draft: String = "",
val canSend: Boolean = false
@@ -11,6 +11,7 @@ interface ComposeView : QkView<ComposeState> {
val queryChangedIntent: Observable<CharSequence>
val chipSelectedIntent: Subject<Contact>
val chipDeletedIntent: Subject<Contact>
val callIntent: Subject<Unit>
val copyTextIntent: Subject<Message>
val forwardMessageIntent: Subject<Message>
val deleteMessageIntent: Subject<Message>
@@ -14,6 +14,7 @@ import com.moez.QKSMS.data.repository.MessageRepository
import com.moez.QKSMS.domain.interactor.DeleteMessage
import com.moez.QKSMS.domain.interactor.MarkRead
import com.moez.QKSMS.domain.interactor.SendMessage
import com.moez.QKSMS.presentation.Navigator
import com.moez.QKSMS.presentation.base.QkViewModel
import io.reactivex.Observable
import io.reactivex.android.schedulers.AndroidSchedulers
@@ -30,6 +31,7 @@ class ComposeViewModel(threadId: Long) : QkViewModel<ComposeView, ComposeState>(
@Inject lateinit var context: Context
@Inject lateinit var contactsRepo: ContactRepository
@Inject lateinit var messageRepo: MessageRepository
@Inject lateinit var navigator: Navigator
@Inject lateinit var sendMessage: SendMessage
@Inject lateinit var markRead: MarkRead
@Inject lateinit var deleteMessage: DeleteMessage
@@ -58,7 +60,9 @@ class ComposeViewModel(threadId: Long) : QkViewModel<ComposeView, ComposeState>(
.filter { conversation -> conversation.isValid }
.mergeWith(selectedConversation)
.distinctUntilChanged { conversation -> conversation.id }
.doOnNext { conversation -> newState { it.copy(title = conversation.getTitle()) } }
.doOnNext { conversation ->
newState { it.copy(title = conversation.getTitle(), canCall = conversation.contacts.isNotEmpty()) }
}
disposables += sendMessage
disposables += markRead
@@ -108,6 +112,12 @@ class ComposeViewModel(threadId: Long) : QkViewModel<ComposeView, ComposeState>(
})
.subscribe()
intents += view.callIntent
.withLatestFrom(conversation, { _, conversation -> conversation })
.map { conversation -> conversation.contacts.first() }
.map { contact -> contact.address }
.subscribe { address -> navigator.makePhoneCall(address) }
intents += view.textChangedIntent.subscribe { text ->
newState { it.copy(draft = text.toString(), canSend = text.isNotEmpty()) }
}
@@ -18,11 +18,9 @@ import com.karumi.dexter.listener.PermissionRequest
import com.karumi.dexter.listener.multi.MultiplePermissionsListener
import com.moez.QKSMS.R
import com.moez.QKSMS.common.di.AppComponentManager
import com.moez.QKSMS.common.util.ThemeManager
import com.moez.QKSMS.common.util.extensions.setBackgroundTint
import com.moez.QKSMS.presentation.Navigator
import com.moez.QKSMS.presentation.base.QkActivity
import io.reactivex.disposables.CompositeDisposable
import io.reactivex.rxkotlin.plusAssign
import kotlinx.android.synthetic.main.drawer_view.*
import kotlinx.android.synthetic.main.main_activity.*
@@ -33,7 +31,6 @@ import javax.inject.Inject
class MainActivity : QkActivity<MainViewModel>(), MainView {
@Inject lateinit var navigator: Navigator
@Inject lateinit var themeManager: ThemeManager
@Inject lateinit var itemTouchCallback: ConversationItemTouchCallback
override val viewModelClass = MainViewModel::class
@@ -48,11 +45,12 @@ class MainActivity : QkActivity<MainViewModel>(), MainView {
private val itemTouchHelper by lazy { ItemTouchHelper(itemTouchCallback) }
private val disposables = CompositeDisposable()
init {
AppComponentManager.appComponent.inject(this)
}
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
AppComponentManager.appComponent.inject(this)
setContentView(R.layout.main_activity)
ActionBarDrawerToggle(this, drawerLayout, toolbar, 0, 0).syncState()
requestPermissions()
@@ -90,11 +88,6 @@ class MainActivity : QkActivity<MainViewModel>(), MainView {
blocked.background = rowBackground()
}
override fun onDestroy() {
super.onDestroy()
disposables.clear()
}
override fun onNewIntent(intent: Intent?) {
super.onNewIntent(intent)
intent?.getLongExtra("threadId", 0)