From 45a14263196d86ee6b5e2f1266ab558bb2995adf Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Mon, 12 Jan 2026 03:49:25 -0500 Subject: [PATCH 1/5] Implement tapping emoji to see who reacted --- .../QKSMS/feature/compose/ComposeActivity.kt | 13 +++++++++++ .../moez/QKSMS/feature/compose/ComposeView.kt | 2 ++ .../QKSMS/feature/compose/ComposeViewModel.kt | 23 +++++++++++++++++++ .../QKSMS/feature/compose/MessagesAdapter.kt | 3 +++ .../main/res/layout/message_list_item_in.xml | 4 ++-- .../main/res/layout/message_list_item_out.xml | 10 ++++---- presentation/src/main/res/values/strings.xml | 2 ++ 7 files changed, 49 insertions(+), 8 deletions(-) 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 From 625b08d5f8a476c5df130addf3dddaf9352b7acd Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Mon, 12 Jan 2026 10:45:41 -0500 Subject: [PATCH 2/5] simplify --- .../QKSMS/feature/compose/ComposeActivity.kt | 8 ++----- .../moez/QKSMS/feature/compose/ComposeView.kt | 2 +- .../QKSMS/feature/compose/ComposeViewModel.kt | 22 +++++++------------ 3 files changed, 11 insertions(+), 21 deletions(-) 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 bc274b0a..a6c69100 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 @@ -758,14 +758,10 @@ class ComposeActivity : QkThemedActivity(), ComposeView { .show() } - override fun showReactionsDialog(reactions: List>>) { - val message = reactions.flatMap { (emoji, contacts) -> - contacts.map { "$emoji $it" } - }.joinToString("\n") - + override fun showReactionsDialog(reactions: List) { AlertDialog.Builder(this) .setTitle(R.string.compose_reactions_title) - .setMessage(message) + .setMessage(reactions.joinToString("\n")) .setPositiveButton(R.string.button_ok, null) .show() } 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 5e0b8641..3f661878 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 @@ -112,7 +112,7 @@ interface ComposeView : QkView { fun showQksmsPlusSnackbar(@StringRes message: Int) fun showDeleteDialog( messages: List) fun showClearCurrentMessageDialog() - fun showReactionsDialog(reactions: List>>) + 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 f8c191d1..440a975e 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 @@ -763,21 +763,15 @@ class ComposeViewModel @Inject constructor( 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 + message.emojiReactions.map { reaction -> + val contactName = conv.recipients + .firstOrNull { recipient -> + phoneNumberUtils.compare(recipient.address, reaction.senderAddress) } - emoji to contactNames - } - .sortedByDescending { it.second.size } - reactions + ?.getDisplayName() + ?: reaction.senderAddress + "${reaction.emoji} $contactName" + } } .autoDisposable(view.scope()) .subscribe { reactions -> view.showReactionsDialog(reactions) } From a35c27d6761988cf31d81942a84556a3ac0827d6 Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Wed, 14 Jan 2026 00:41:02 -0500 Subject: [PATCH 3/5] remove ok button --- .../main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt | 1 - presentation/src/main/res/values/strings.xml | 1 - 2 files changed, 2 deletions(-) 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 a6c69100..27a44cfb 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 @@ -762,7 +762,6 @@ class ComposeActivity : QkThemedActivity(), ComposeView { AlertDialog.Builder(this) .setTitle(R.string.compose_reactions_title) .setMessage(reactions.joinToString("\n")) - .setPositiveButton(R.string.button_ok, null) .show() } diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml index 7844a8ab..396f5bf9 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -489,7 +489,6 @@ Yes - OK Continue Cancel Delete From 56d19f366f32fae8fa1383b4c829cf964108dcb1 Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Wed, 14 Jan 2026 00:47:11 -0500 Subject: [PATCH 4/5] fix clipping --- .../src/main/res/layout/message_list_item_in.xml | 10 +++++++--- .../src/main/res/layout/message_list_item_out.xml | 4 +++- 2 files changed, 10 insertions(+), 4 deletions(-) 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 2ae4cbf2..48488ae5 100644 --- a/presentation/src/main/res/layout/message_list_item_in.xml +++ b/presentation/src/main/res/layout/message_list_item_in.xml @@ -23,13 +23,17 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/selectableItemBackground"> + android:background="?attr/selectableItemBackground" + android:clipChildren="false" + android:clipToPadding="false"> + android:orientation="vertical" + android:clipChildren="false" + android:clipToPadding="false"> 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 1482bfd9..a2561f6f 100644 --- a/presentation/src/main/res/layout/message_list_item_out.xml +++ b/presentation/src/main/res/layout/message_list_item_out.xml @@ -152,6 +152,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingStart="18dp" + android:clipChildren="false" + android:clipToPadding="false" android:orientation="vertical"> From dfe009409329d4e217379a29f0cf6bad0d2a8c2a Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Wed, 14 Jan 2026 01:02:01 -0500 Subject: [PATCH 5/5] remove excessive padding --- .../moez/QKSMS/feature/compose/MessagesAdapter.kt | 14 -------------- 1 file changed, 14 deletions(-) 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 19064963..f1affcdd 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 @@ -420,7 +420,6 @@ 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) @@ -428,19 +427,6 @@ class MessagesAdapter @Inject constructor( } } - private fun makeRoomForEmojis(holder: QkViewHolder) { - val paddingBottom = 25.dpToPx(context) - - (holder.reactions?.parent?.parent as? ViewGroup)?.let { parent -> - parent.setPadding( - parent.paddingLeft, - parent.paddingTop, - parent.paddingRight, - paddingBottom - ) - } - } - private fun bindStatus( holder: QkViewHolder, bodyTextTruncated: Boolean,