From 84f02fc03f3266bb8611e08be019e52c15a24907 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Wed, 28 Mar 2018 18:09:32 -0400 Subject: [PATCH] Add option to call or view conversation from qkreply --- .../java/feature/qkreply/QkReplyViewModel.kt | 21 +++++++++++++++++++ presentation/src/main/res/menu/qkreply.xml | 8 +++++++ presentation/src/main/res/values/strings.xml | 2 ++ 3 files changed, 31 insertions(+) diff --git a/presentation/src/main/java/feature/qkreply/QkReplyViewModel.kt b/presentation/src/main/java/feature/qkreply/QkReplyViewModel.kt index aae318fc..b1f4fa66 100644 --- a/presentation/src/main/java/feature/qkreply/QkReplyViewModel.kt +++ b/presentation/src/main/java/feature/qkreply/QkReplyViewModel.kt @@ -23,6 +23,7 @@ import android.telephony.SmsMessage import com.moez.QKSMS.R import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.kotlin.autoDisposable +import common.Navigator import common.base.QkViewModel import injection.appComponent import interactor.MarkRead @@ -33,6 +34,7 @@ import io.reactivex.schedulers.Schedulers import model.Conversation import repository.MessageRepository import util.extensions.asObservable +import util.extensions.mapNotNull import java.util.concurrent.TimeUnit import javax.inject.Inject @@ -40,6 +42,7 @@ class QkReplyViewModel(intent: Intent) : QkViewModel( @Inject lateinit var markRead: MarkRead @Inject lateinit var messageRepo: MessageRepository + @Inject lateinit var navigator: Navigator @Inject lateinit var sendMessage: SendMessage private val conversation by lazy { @@ -74,6 +77,15 @@ class QkReplyViewModel(intent: Intent) : QkViewModel( .autoDisposable(view.scope()) .subscribe { threadId -> markRead.execute(threadId) { view.finish() } } + // Call + view.menuItemIntent + .filter { id -> id == R.id.call } + .withLatestFrom(conversation, { _, conversation -> conversation }) + .mapNotNull { conversation -> conversation.recipients.first()?.address } + .doOnNext { address -> navigator.makePhoneCall(address) } + .autoDisposable(view.scope()) + .subscribe { view.finish() } + // Show all messages view.menuItemIntent .filter { id -> id == R.id.expand } @@ -90,6 +102,15 @@ class QkReplyViewModel(intent: Intent) : QkViewModel( .autoDisposable(view.scope()) .subscribe { data -> newState { it.copy(expanded = false, data = data) } } + // View conversation + view.menuItemIntent + .filter { id -> id == R.id.view } + .withLatestFrom(conversation, { _, conversation -> conversation }) + .mapNotNull { conversation -> conversation.id } + .doOnNext { threadId -> navigator.showConversation(threadId) } + .autoDisposable(view.scope()) + .subscribe { view.finish() } + // Enable the send button when there is text input into the new message body or there's // an attachment, disable otherwise view.textChangedIntent diff --git a/presentation/src/main/res/menu/qkreply.xml b/presentation/src/main/res/menu/qkreply.xml index 28398cf2..01ddf187 100644 --- a/presentation/src/main/res/menu/qkreply.xml +++ b/presentation/src/main/res/menu/qkreply.xml @@ -25,6 +25,10 @@ android:title="@string/qkreply_menu_read" app:showAsAction="ifRoom" /> + + @@ -34,4 +38,8 @@ android:title="@string/qkreply_menu_collapse" android:visible="false" /> + + \ No newline at end of file diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml index 729289c3..9f4a3664 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -141,8 +141,10 @@ View more conversations Mark read + Call Show more Show less + Open conversation Material QKSMS+