From c3c7b495c922036b7b94e176ff221411027cc07a Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Fri, 27 Dec 2019 00:39:00 -0500 Subject: [PATCH] Long-press to copy phone number Closes #1348 --- .../ConversationInfoController.kt | 4 +++- .../ConversationInfoPresenter.kt | 19 ++++++++++++++++++- .../conversationinfo/ConversationInfoView.kt | 3 ++- .../ConversationRecipientAdapter.kt | 11 +++++++++-- presentation/src/main/res/values/strings.xml | 1 + 5 files changed, 33 insertions(+), 5 deletions(-) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoController.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoController.kt index af8a345e..d618b344 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoController.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoController.kt @@ -90,7 +90,9 @@ class ConversationInfoController( showBackButton(true) } - override fun contactClicks(): Observable = recipientAdapter.contactClicks + override fun recipientClicks(): Observable = recipientAdapter.recipientClicks + + override fun recipientLongClicks(): Observable = recipientAdapter.recipientLongClicks override fun themeClicks(): Observable = recipientAdapter.themeClicks diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoPresenter.kt index 10c7b781..f595b062 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoPresenter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoPresenter.kt @@ -18,9 +18,13 @@ */ package com.moez.QKSMS.feature.conversationinfo +import android.content.Context import androidx.lifecycle.Lifecycle +import com.moez.QKSMS.R import com.moez.QKSMS.common.Navigator import com.moez.QKSMS.common.base.QkPresenter +import com.moez.QKSMS.common.util.ClipboardUtils +import com.moez.QKSMS.common.util.extensions.makeToast import com.moez.QKSMS.extensions.asObservable import com.moez.QKSMS.extensions.mapNotNull import com.moez.QKSMS.interactor.DeleteConversations @@ -32,6 +36,7 @@ import com.moez.QKSMS.repository.ConversationRepository import com.moez.QKSMS.repository.MessageRepository import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.autoDisposable +import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.rxkotlin.plusAssign import io.reactivex.rxkotlin.withLatestFrom import io.reactivex.subjects.BehaviorSubject @@ -42,6 +47,7 @@ import javax.inject.Named class ConversationInfoPresenter @Inject constructor( @Named("threadId") threadId: Long, messageRepo: MessageRepository, + private val context: Context, private val conversationRepo: ConversationRepository, private val deleteConversations: DeleteConversations, private val markArchived: MarkArchived, @@ -100,7 +106,7 @@ class ConversationInfoPresenter @Inject constructor( super.bindIntents(view) // Add or display the contact - view.contactClicks() + view.recipientClicks() .mapNotNull(conversationRepo::getRecipient) .doOnNext { recipient -> recipient.contact?.lookupKey?.let(navigator::showContact) @@ -109,6 +115,17 @@ class ConversationInfoPresenter @Inject constructor( .autoDisposable(view.scope(Lifecycle.Event.ON_DESTROY)) // ... this should be the default .subscribe() + // Copy phone number + view.recipientLongClicks() + .mapNotNull(conversationRepo::getRecipient) + .map { recipient -> recipient.address } + .observeOn(AndroidSchedulers.mainThread()) + .autoDisposable(view.scope()) + .subscribe { address -> + ClipboardUtils.copy(context, address) + context.makeToast(R.string.info_copied_address) + } + // Show the theme settings for the conversation view.themeClicks() .autoDisposable(view.scope()) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoView.kt index 1b71de22..343dd8d0 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoView.kt @@ -23,7 +23,8 @@ import io.reactivex.Observable interface ConversationInfoView : QkViewContract { - fun contactClicks(): Observable + fun recipientClicks(): Observable + fun recipientLongClicks(): Observable fun themeClicks(): Observable fun nameClicks(): Observable<*> fun nameChanges(): Observable diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationRecipientAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationRecipientAdapter.kt index 35baf7be..41b6cffa 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationRecipientAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationRecipientAdapter.kt @@ -36,7 +36,8 @@ class ConversationRecipientAdapter @Inject constructor( private val colors: Colors ) : QkRealmAdapter() { - val contactClicks: Subject = PublishSubject.create() + val recipientClicks: Subject = PublishSubject.create() + val recipientLongClicks: Subject = PublishSubject.create() val themeClicks: Subject = PublishSubject.create() override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder { @@ -45,7 +46,13 @@ class ConversationRecipientAdapter @Inject constructor( return QkViewHolder(view).apply { view.setOnClickListener { val recipient = getItem(adapterPosition) ?: return@setOnClickListener - contactClicks.onNext(recipient.id) + recipientClicks.onNext(recipient.id) + } + + view.setOnLongClickListener { + val recipient = getItem(adapterPosition) ?: return@setOnLongClickListener false + recipientLongClicks.onNext(recipient.id) + return@setOnLongClickListener true } view.theme.setOnClickListener { diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml index 35c6011a..d29e7bb1 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -145,6 +145,7 @@ Failed to send. Tap to try again Details + Address copied Conversation title Notifications Theme