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..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 @@ -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,13 @@ class ComposeActivity : QkThemedActivity(), ComposeView { .show() } + override fun showReactionsDialog(reactions: List) { + AlertDialog.Builder(this) + .setTitle(R.string.compose_reactions_title) + .setMessage(reactions.joinToString("\n")) + .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..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 @@ -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..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 @@ -759,6 +759,23 @@ 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 -> + message.emojiReactions.map { reaction -> + val contactName = conv.recipients + .firstOrNull { recipient -> + phoneNumberUtils.compare(recipient.address, reaction.senderAddress) + } + ?.getDisplayName() + ?: reaction.senderAddress + "${reaction.emoji} $contactName" + } + } + .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 d5d1894f..080eef29 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) { @@ -413,27 +414,15 @@ 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) } } } - 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, 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..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 16cc8886..a2561f6f 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,13 @@ android:layout_height="match_parent" android:layout_weight="1" /> - + android:orientation="vertical"> @@ -196,7 +196,7 @@ - + Next Clear Message details + Reactions Type: %s From: %s To: %s