diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt index aa569b43..bc274b0a 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt @@ -190,6 +190,7 @@ class ComposeActivity : QkThemedActivity(), ComposeView { override val confirmDeleteIntent: Subject> = PublishSubject.create() override val clearCurrentMessageIntent: Subject = PublishSubject.create() override val messageLinkAskIntent: Subject by lazy { messageAdapter.messageLinkClicks } + override val reactionClickIntent: Subject by lazy { messageAdapter.reactionClicks } override val speechRecogniserIntent by lazy { speechToTextIcon.clicks() } override val shadeIntent by lazy { shadeBackground.clicks() } override val recordAudioStartStopRecording: Subject = PublishSubject.create() @@ -757,6 +758,18 @@ class ComposeActivity : QkThemedActivity(), ComposeView { .show() } + override fun showReactionsDialog(reactions: List>>) { + val message = reactions.flatMap { (emoji, contacts) -> + contacts.map { "$emoji $it" } + }.joinToString("\n") + + AlertDialog.Builder(this) + .setTitle(R.string.compose_reactions_title) + .setMessage(message) + .setPositiveButton(R.string.button_ok, null) + .show() + } + override fun onCreateOptionsMenu(menu: Menu?): Boolean { menuInflater.inflate(R.menu.compose, menu) return super.onCreateOptionsMenu(menu) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeView.kt index 16477093..5e0b8641 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeView.kt @@ -77,6 +77,7 @@ interface ComposeView : QkView { val confirmDeleteIntent: Observable> val clearCurrentMessageIntent: Subject val messageLinkAskIntent: Observable + val reactionClickIntent: Subject val speechRecogniserIntent: Observable<*> val shadeIntent: Observable val recordAudioStartStopRecording: Subject @@ -111,6 +112,7 @@ interface ComposeView : QkView { fun showQksmsPlusSnackbar(@StringRes message: Int) fun showDeleteDialog( messages: List) fun showClearCurrentMessageDialog() + fun showReactionsDialog(reactions: List>>) fun startSpeechRecognition() fun focusMessage() } \ No newline at end of file diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt index d0f2349e..f8c191d1 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt @@ -759,6 +759,29 @@ class ComposeViewModel @Inject constructor( .autoDisposable(view.scope()) .subscribe { view.showMessageLinkAskDialog(it) } + // Show reaction details popup + view.reactionClickIntent + .mapNotNull { messageId -> messageRepo.getMessage(messageId) } + .withLatestFrom(conversation) { message, conv -> + val reactions = message.emojiReactions + .groupBy { it.emoji } + .map { (emoji, emojiReactions) -> + val contactNames = emojiReactions.map { reaction -> + conv.recipients + .firstOrNull { recipient -> + phoneNumberUtils.compare(recipient.address, reaction.senderAddress) + } + ?.getDisplayName() + ?: reaction.senderAddress + } + emoji to contactNames + } + .sortedByDescending { it.second.size } + reactions + } + .autoDisposable(view.scope()) + .subscribe { reactions -> view.showReactionsDialog(reactions) } + // Set the current conversation Observables .combineLatest( diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt index b2e5d535..19064963 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt @@ -119,6 +119,7 @@ class MessagesAdapter @Inject constructor( val sendNowClicks: Subject = PublishSubject.create() val resendClicks: Subject = PublishSubject.create() val partContextMenuRegistrar: Subject = PublishSubject.create() + val reactionClicks: Subject = PublishSubject.create() var data: Pair>? = null set(value) { @@ -417,10 +418,12 @@ class MessagesAdapter @Inject constructor( } holder.reactionText?.text = reactionText + holder.reactionText?.setOnClickListener { reactionClicks.onNext(message.id) } reactionsContainer.setVisible(true) makeRoomForEmojis(holder) } else { reactionsContainer.setVisible(false) + holder.reactionText?.setOnClickListener(null) } } } diff --git a/presentation/src/main/res/layout/message_list_item_in.xml b/presentation/src/main/res/layout/message_list_item_in.xml index 792727ef..2ae4cbf2 100644 --- a/presentation/src/main/res/layout/message_list_item_in.xml +++ b/presentation/src/main/res/layout/message_list_item_in.xml @@ -132,10 +132,10 @@ android:id="@+id/reactions" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignBottom="@id/body" + android:layout_below="@id/body" android:layout_alignEnd="@id/body" android:layout_marginEnd="-12dp" - android:layout_marginBottom="-20dp" + android:layout_marginTop="-16dp" android:orientation="horizontal" android:visibility="gone" tools:visibility="visible"> diff --git a/presentation/src/main/res/layout/message_list_item_out.xml b/presentation/src/main/res/layout/message_list_item_out.xml index 16cc8886..1482bfd9 100644 --- a/presentation/src/main/res/layout/message_list_item_out.xml +++ b/presentation/src/main/res/layout/message_list_item_out.xml @@ -148,12 +148,11 @@ android:layout_height="match_parent" android:layout_weight="1" /> - + android:orientation="vertical"> @@ -196,7 +194,7 @@ - + Next Clear Message details + Reactions Type: %s From: %s To: %s @@ -488,6 +489,7 @@ Yes + OK Continue Cancel Delete