Code Review

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/DefaultTimelineService.kt

@@ -23,7 +23,7 @@ import im.vector.matrix.android.api.session.room.timeline.TimelineService
 import im.vector.matrix.android.internal.database.model.EventEntity
 import im.vector.matrix.android.internal.database.query.where
 import im.vector.matrix.android.internal.task.TaskExecutor
-import im.vector.matrix.android.internal.util.fetchMappedCopied
+import im.vector.matrix.android.internal.util.fetchCopyMap
 
 internal class DefaultTimelineService(private val roomId: String,
                                       private val monarchy: Monarchy,
@@ -38,7 +38,7 @@ internal class DefaultTimelineService(private val roomId: String,
     }
 
     override fun getTimeLineEvent(eventId: String): TimelineEvent? {
-        return monarchy.fetchMappedCopied({
+        return monarchy.fetchCopyMap({
             EventEntity.where(it, eventId = eventId).findFirst()
         }, { entity, realm ->
             timelineEventFactory.create(entity, realm)

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/Monarchy.kt

@@ -42,7 +42,7 @@ fun <T : RealmModel> Monarchy.fetchCopied(query: (Realm) -> T?): T? {
     return fetch(query, true)
 }
 
-fun <U, T : RealmModel> Monarchy.fetchMappedCopied(query: (Realm) -> T?, map: (T, realm: Realm) -> U): U? {
+fun <U, T : RealmModel> Monarchy.fetchCopyMap(query: (Realm) -> T?, map: (T, realm: Realm) -> U): U? {
     val ref = AtomicReference<U?>()
     doWithRealm { realm ->
         val result = query.invoke(realm)?.let {

vector/src/main/java/im/vector/riotredesign/core/utils/DebouncedClickListener.kt

@@ -1,6 +1,7 @@
 package im.vector.riotredesign.core.utils
 
 import android.view.View
+import java.util.*
 
 
 /**
@@ -8,7 +9,7 @@ import android.view.View
  * Safe to use in different views
  */
 class DebouncedClickListener(val original: View.OnClickListener, private val minimumInterval: Long = 400) : View.OnClickListener {
-    private val lastClickMap = HashMap<View, Long>()
+    private val lastClickMap = WeakHashMap<View, Long>()
 
     override fun onClick(clickedView: View) {
         val previousClickTimestamp = lastClickMap[clickedView]

vector/src/main/java/im/vector/riotredesign/features/home/room/detail/RoomDetailFragment.kt

@@ -133,7 +133,7 @@ class RoomDetailFragment :
 
     override fun getLayoutResId() = R.layout.fragment_room_detail
 
-    lateinit var actionViewModel: ActionsHandler
+    private lateinit var actionViewModel: ActionsHandler
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
@@ -425,11 +425,11 @@ class RoomDetailFragment :
         vectorBaseActivity.notImplemented()
     }
 
-    override fun onEventCellClicked(eventId: String, informationData: MessageInformationData, messageContent: MessageContent, view: View) {
+    override fun onEventCellClicked(informationData: MessageInformationData, messageContent: MessageContent, view: View) {
 
     }
 
-    override fun onEventLongClicked(eventId: String, informationData: MessageInformationData, messageContent: MessageContent, view: View): Boolean {
+    override fun onEventLongClicked(informationData: MessageInformationData, messageContent: MessageContent, view: View): Boolean {
         view.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS)
         val roomId = (arguments?.get(MvRx.KEY_ARG) as? RoomDetailArgs)?.roomId
         if (roomId.isNullOrBlank()) {
@@ -437,7 +437,7 @@ class RoomDetailFragment :
             return false
         }
         MessageActionsBottomSheet
-                .newInstance(eventId, roomId, informationData)
+                .newInstance(roomId, informationData)
                 .show(requireActivity().supportFragmentManager, "MESSAGE_CONTEXTUAL_ACTIONS")
         return true
     }
@@ -478,7 +478,7 @@ class RoomDetailFragment :
 
                                     override fun onSuccess(image: File?) {
                                         if (image != null)
-                                            shareMedia(requireContext(), image!!, "image/*")
+                                            shareMedia(requireContext(), image, "image/*")
                                     }
 
                                     override fun onFail(error: Exception?) {}

vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/TimelineEventController.kt

@@ -54,8 +54,8 @@ class TimelineEventController(private val dateFormatter: TimelineDateFormatter,
         fun onVideoMessageClicked(messageVideoContent: MessageVideoContent, mediaData: VideoContentRenderer.Data, view: View)
         fun onFileMessageClicked(messageFileContent: MessageFileContent)
         fun onAudioMessageClicked(messageAudioContent: MessageAudioContent)
-        fun onEventCellClicked(eventId: String, informationData: MessageInformationData, messageContent: MessageContent, view: View)
+        fun onEventCellClicked(informationData: MessageInformationData, messageContent: MessageContent, view: View)
-        fun onEventLongClicked(eventId: String, informationData: MessageInformationData, messageContent: MessageContent, view: View): Boolean
+        fun onEventLongClicked(informationData: MessageInformationData, messageContent: MessageContent, view: View): Boolean
         fun onAvatarClicked(informationData: MessageInformationData)
     }
 

vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/MessageActionsBottomSheet.kt

@@ -143,10 +143,10 @@ class MessageActionsBottomSheet : BaseMvRxBottomSheetDialog() {
     ) : Parcelable
 
     companion object {
-        fun newInstance(eventId: String, roomId: String, informationData: MessageInformationData): MessageActionsBottomSheet {
+        fun newInstance(roomId: String, informationData: MessageInformationData): MessageActionsBottomSheet {
             val args = Bundle()
             val parcelableArgs = ParcelableArgs(
-                    eventId,
+                    informationData.eventId,
                     roomId,
                     informationData
             )

vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/QuickReactionFragment.kt

@@ -39,16 +39,6 @@ class QuickReactionFragment : BaseMvRxFragment() {
     @BindView(R.id.root_layout)
     lateinit var rootLayout: ConstraintLayout
 
-
-    @BindView(R.id.quick_react_1)
-    lateinit var quickReact1: View
-    @BindView(R.id.quick_react_2)
-    lateinit var quickReact2: View
-    @BindView(R.id.quick_react_3)
-    lateinit var quickReact3: View
-    @BindView(R.id.quick_react_4)
-    lateinit var quickReact4: View
-
     @BindView(R.id.quick_react_1_text)
     lateinit var quickReact1Text: TextView
 
@@ -78,16 +68,16 @@ class QuickReactionFragment : BaseMvRxFragment() {
         quickReact4Text.text = viewModel.likeNegative
 
         //configure click listeners
-        quickReact1.setOnClickListener {
+        quickReact1Text.setOnClickListener {
             viewModel.toggleAgree(true)
         }
-        quickReact2.setOnClickListener {
+        quickReact2Text.setOnClickListener {
             viewModel.toggleAgree(false)
         }
-        quickReact3.setOnClickListener {
+        quickReact3Text.setOnClickListener {
             viewModel.toggleLike(true)
         }
-        quickReact4.setOnClickListener {
+        quickReact4Text.setOnClickListener {
             viewModel.toggleLike(false)
         }
 
@@ -98,32 +88,32 @@ class QuickReactionFragment : BaseMvRxFragment() {
         TransitionManager.beginDelayedTransition(rootLayout)
         when (it.agreeTrigleState) {
             TriggleState.NONE -> {
-                quickReact1.alpha = 1f
+                quickReact1Text.alpha = 1f
-                quickReact2.alpha = 1f
+                quickReact2Text.alpha = 1f
             }
             TriggleState.FIRST -> {
-                quickReact1.alpha = 1f
+                quickReact1Text.alpha = 1f
-                quickReact2.alpha = 0.2f
+                quickReact2Text.alpha = 0.2f
 
             }
             TriggleState.SECOND -> {
-                quickReact1.alpha = 0.2f
+                quickReact1Text.alpha = 0.2f
-                quickReact2.alpha = 1f
+                quickReact2Text.alpha = 1f
             }
         }
         when (it.likeTriggleState) {
             TriggleState.NONE -> {
-                quickReact3.alpha = 1f
+                quickReact3Text.alpha = 1f
-                quickReact4.alpha = 1f
+                quickReact4Text.alpha = 1f
             }
             TriggleState.FIRST -> {
-                quickReact3.alpha = 1f
+                quickReact3Text.alpha = 1f
-                quickReact4.alpha = 0.2f
+                quickReact4Text.alpha = 0.2f
 
             }
             TriggleState.SECOND -> {
-                quickReact3.alpha = 0.2f
+                quickReact3Text.alpha = 0.2f
-                quickReact4.alpha = 1f
+                quickReact4Text.alpha = 1f
             }
         }
 

vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/factory/MessageItemFactory.kt

@@ -83,19 +83,18 @@ class MessageItemFactory(private val colorProvider: ColorProvider,
 //        val all = event.root.toContent()
 //        val ev = all.toModel<Event>()
         return when (messageContent) {
-            is MessageEmoteContent -> buildEmoteMessageItem(eventId, messageContent, informationData, callback)
+            is MessageEmoteContent -> buildEmoteMessageItem(messageContent, informationData, callback)
-            is MessageTextContent -> buildTextMessageItem(eventId, event.sendState, messageContent, informationData, callback)
+            is MessageTextContent -> buildTextMessageItem(event.sendState, messageContent, informationData, callback)
-            is MessageImageContent -> buildImageMessageItem(eventId, messageContent, informationData, callback)
+            is MessageImageContent -> buildImageMessageItem(messageContent, informationData, callback)
-            is MessageNoticeContent -> buildNoticeMessageItem(eventId, messageContent, informationData, callback)
+            is MessageNoticeContent -> buildNoticeMessageItem(messageContent, informationData, callback)
-            is MessageVideoContent -> buildVideoMessageItem(eventId, messageContent, informationData, callback)
+            is MessageVideoContent -> buildVideoMessageItem(messageContent, informationData, callback)
-            is MessageFileContent -> buildFileMessageItem(eventId, messageContent, informationData, callback)
+            is MessageFileContent -> buildFileMessageItem(messageContent, informationData, callback)
-            is MessageAudioContent -> buildAudioMessageItem(eventId, messageContent, informationData, callback)
+            is MessageAudioContent -> buildAudioMessageItem(messageContent, informationData, callback)
             else -> buildNotHandledMessageItem(messageContent)
         }
     }
 
-    private fun buildAudioMessageItem(eventId: String, messageContent: MessageAudioContent,
+    private fun buildAudioMessageItem(messageContent: MessageAudioContent, informationData: MessageInformationData,
-                                      informationData: MessageInformationData,
                                       callback: TimelineEventController.Callback?): MessageFileItem? {
         return MessageFileItem_()
                 .informationData(informationData)
@@ -107,20 +106,19 @@ class MessageItemFactory(private val colorProvider: ColorProvider,
                         }))
                 .cellClickListener(
                         DebouncedClickListener(View.OnClickListener { view ->
-                            callback?.onEventCellClicked(eventId, informationData, messageContent, view)
+                            callback?.onEventCellClicked(informationData, messageContent, view)
                         }))
                 .clickListener(
                         DebouncedClickListener(View.OnClickListener { _ ->
                             callback?.onAudioMessageClicked(messageContent)
                         }))
                 .longClickListener { view ->
-                    return@longClickListener callback?.onEventLongClicked(eventId, informationData, messageContent, view)
+                    return@longClickListener callback?.onEventLongClicked(informationData, messageContent, view)
                             ?: false
                 }
     }
 
-    private fun buildFileMessageItem(eventId: String, messageContent: MessageFileContent,
+    private fun buildFileMessageItem(messageContent: MessageFileContent, informationData: MessageInformationData,
-                                     informationData: MessageInformationData,
                                      callback: TimelineEventController.Callback?): MessageFileItem? {
         return MessageFileItem_()
                 .informationData(informationData)
@@ -132,16 +130,16 @@ class MessageItemFactory(private val colorProvider: ColorProvider,
                         }))
                 .cellClickListener(
                         DebouncedClickListener(View.OnClickListener { view ->
-                            callback?.onEventCellClicked(eventId, informationData, messageContent, view)
+                            callback?.onEventCellClicked(informationData, messageContent, view)
                         }))
+                .longClickListener { view ->
+                    return@longClickListener callback?.onEventLongClicked(informationData, messageContent, view)
+                            ?: false
+                }
                 .clickListener(
                         DebouncedClickListener(View.OnClickListener { _ ->
                             callback?.onFileMessageClicked(messageContent)
                         }))
-                .longClickListener { view ->
-                    return@longClickListener callback?.onEventLongClicked(eventId, informationData, messageContent, view)
-                            ?: false
-                }
     }
 
     private fun buildNotHandledMessageItem(messageContent: MessageContent): DefaultItem? {
@@ -149,8 +147,7 @@ class MessageItemFactory(private val colorProvider: ColorProvider,
         return DefaultItem_().text(text)
     }
 
-    private fun buildImageMessageItem(eventId: String, messageContent: MessageImageContent,
+    private fun buildImageMessageItem(messageContent: MessageImageContent, informationData: MessageInformationData,
-                                      informationData: MessageInformationData,
                                       callback: TimelineEventController.Callback?): MessageImageVideoItem? {
 
         val (maxWidth, maxHeight) = timelineMediaSizeProvider.getMaxSize()
@@ -178,17 +175,16 @@ class MessageItemFactory(private val colorProvider: ColorProvider,
                         }))
                 .cellClickListener(
                         DebouncedClickListener(View.OnClickListener { view ->
-                            callback?.onEventCellClicked(eventId, informationData, messageContent, view)
+                            callback?.onEventCellClicked(informationData, messageContent, view)
                         }))
 
                 .longClickListener { view ->
-                    return@longClickListener callback?.onEventLongClicked(eventId, informationData, messageContent, view)
+                    return@longClickListener callback?.onEventLongClicked(informationData, messageContent, view)
                             ?: false
                 }
     }
 
-    private fun buildVideoMessageItem(eventId: String, messageContent: MessageVideoContent,
+    private fun buildVideoMessageItem(messageContent: MessageVideoContent, informationData: MessageInformationData,
-                                      informationData: MessageInformationData,
                                       callback: TimelineEventController.Callback?): MessageImageVideoItem? {
 
         val (maxWidth, maxHeight) = timelineMediaSizeProvider.getMaxSize()
@@ -217,17 +213,16 @@ class MessageItemFactory(private val colorProvider: ColorProvider,
                         }))
                 .cellClickListener(
                         DebouncedClickListener(View.OnClickListener { view ->
-                            callback?.onEventCellClicked(eventId, informationData, messageContent, view)
+                            callback?.onEventCellClicked(informationData, messageContent, view)
                         }))
                 .clickListener { view -> callback?.onVideoMessageClicked(messageContent, videoData, view) }
                 .longClickListener { view ->
-                    return@longClickListener callback?.onEventLongClicked(eventId, informationData, messageContent, view)
+                    return@longClickListener callback?.onEventLongClicked(informationData, messageContent, view)
                             ?: false
                 }
     }
 
-    private fun buildTextMessageItem(eventId: String, sendState: SendState,
+    private fun buildTextMessageItem(sendState: SendState, messageContent: MessageTextContent,
-                                     messageContent: MessageTextContent,
                                      informationData: MessageInformationData,
                                      callback: TimelineEventController.Callback?): MessageTextItem? {
 
@@ -246,20 +241,19 @@ class MessageItemFactory(private val colorProvider: ColorProvider,
                 //click on the text
                 .clickListener(
                         DebouncedClickListener(View.OnClickListener { view ->
-                            callback?.onEventCellClicked(eventId, informationData, messageContent, view)
+                            callback?.onEventCellClicked(informationData, messageContent, view)
                         }))
                 .cellClickListener(
                         DebouncedClickListener(View.OnClickListener { view ->
-                            callback?.onEventCellClicked(eventId, informationData, messageContent, view)
+                            callback?.onEventCellClicked(informationData, messageContent, view)
                         }))
                 .longClickListener { view ->
-                    return@longClickListener callback?.onEventLongClicked(eventId, informationData, messageContent, view)
+                    return@longClickListener callback?.onEventLongClicked(informationData, messageContent, view)
                             ?: false
                 }
     }
 
-    private fun buildNoticeMessageItem(eventId: String, messageContent: MessageNoticeContent,
+    private fun buildNoticeMessageItem(messageContent: MessageNoticeContent, informationData: MessageInformationData,
-                                       informationData: MessageInformationData,
                                        callback: TimelineEventController.Callback?): MessageTextItem? {
 
         val message = messageContent.body.let {
@@ -279,16 +273,15 @@ class MessageItemFactory(private val colorProvider: ColorProvider,
                         }))
                 .cellClickListener(
                         DebouncedClickListener(View.OnClickListener { view ->
-                            callback?.onEventCellClicked(eventId, informationData, messageContent, view)
+                            callback?.onEventCellClicked(informationData, messageContent, view)
                         }))
                 .longClickListener { view ->
-                    return@longClickListener callback?.onEventLongClicked(eventId, informationData, messageContent, view)
+                    return@longClickListener callback?.onEventLongClicked(informationData, messageContent, view)
                             ?: false
                 }
     }
 
-    private fun buildEmoteMessageItem(eventId: String, messageContent: MessageEmoteContent,
+    private fun buildEmoteMessageItem(messageContent: MessageEmoteContent, informationData: MessageInformationData,
-                                      informationData: MessageInformationData,
                                       callback: TimelineEventController.Callback?): MessageTextItem? {
 
         val message = messageContent.body.let {
@@ -304,10 +297,10 @@ class MessageItemFactory(private val colorProvider: ColorProvider,
                         }))
                 .cellClickListener(
                         DebouncedClickListener(View.OnClickListener { view ->
-                            callback?.onEventCellClicked(eventId, informationData, messageContent, view)
+                            callback?.onEventCellClicked(informationData, messageContent, view)
                         }))
                 .longClickListener { view ->
-                    return@longClickListener callback?.onEventLongClicked(eventId, informationData, messageContent, view)
+                    return@longClickListener callback?.onEventLongClicked(informationData, messageContent, view)
                             ?: false
                 }
     }

vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/MessageInformationData.kt

@@ -29,6 +29,5 @@ data class MessageInformationData(
         val time: CharSequence? = null,
         val avatarUrl: String?,
         val memberName: CharSequence? = null,
-        val userId: String? = null,
         val showInformation: Boolean = true
 ) : Parcelable

vector/src/main/res/layout/adapter_item_action_quick_reaction.xml

@@ -2,39 +2,31 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
     android:id="@+id/root_layout"
+    android:layout_width="match_parent"
     android:layout_height="96dp">
 
-
+    <TextView
-    <RelativeLayout
+        android:id="@+id/quick_react_1_text"
-        android:id="@+id/quick_react_1"
         android:layout_width="40dp"
         android:layout_height="40dp"
         android:layout_marginEnd="4dp"
         android:layout_marginRight="4dp"
         android:background="?android:attr/selectableItemBackground"
         android:clickable="true"
-
         android:focusable="true"
+        android:textSize="30sp"
+        app:autoSizeTextType="uniform"
         app:layout_constraintBottom_toTopOf="@id/quick_react_agree_text"
-        app:layout_constraintEnd_toStartOf="@id/quick_react_2"
+        app:layout_constraintEnd_toStartOf="@id/quick_react_2_text"
         app:layout_constraintHorizontal_chainStyle="packed"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_chainStyle="packed">
+        app:layout_constraintVertical_chainStyle="packed"
+        tools:text="👍" />
 
-        <TextView
+    <TextView
-            android:id="@+id/quick_react_1_text"
+        android:id="@+id/quick_react_2_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:textSize="30sp"
-            tools:text="👍" />
-    </RelativeLayout>
-
-    <RelativeLayout
-        android:id="@+id/quick_react_2"
         android:layout_width="40dp"
         android:layout_height="40dp"
         android:layout_marginStart="4dp"
@@ -42,21 +34,15 @@
         android:background="?android:attr/selectableItemBackground"
         android:clickable="true"
         android:focusable="true"
-        app:layout_constraintBottom_toBottomOf="@id/quick_react_1"
+        android:textSize="30sp"
+        app:autoSizeTextType="uniform"
+        app:layout_constraintBottom_toBottomOf="@id/quick_react_1_text"
+
         app:layout_constraintEnd_toStartOf="@id/center_guideline"
+        app:layout_constraintStart_toEndOf="@id/quick_react_1_text"
+        app:layout_constraintTop_toTopOf="@id/quick_react_1_text"
+        tools:text="👎" />
 
-        app:layout_constraintStart_toEndOf="@id/quick_react_1"
-        app:layout_constraintTop_toTopOf="@id/quick_react_1">
-
-        <TextView
-            android:id="@+id/quick_react_2_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:layout_gravity="center_vertical"
-            android:textSize="30sp"
-            tools:text="👎" />
-    </RelativeLayout>
 
     <TextView
         android:id="@+id/quick_react_agree_text"
@@ -69,7 +55,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/center_guideline"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/quick_react_1" />
+        app:layout_constraintTop_toBottomOf="@id/quick_react_1_text" />
 
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/center_guideline"
@@ -78,8 +64,8 @@
         android:orientation="vertical"
         app:layout_constraintGuide_percent="0.5" />
 
-    <RelativeLayout
+    <TextView
-        android:id="@+id/quick_react_3"
+        android:id="@+id/quick_react_3_text"
         android:layout_width="40dp"
         android:layout_height="40dp"
         android:layout_marginEnd="4dp"
@@ -87,23 +73,17 @@
         android:background="?android:attr/selectableItemBackground"
         android:clickable="true"
         android:focusable="true"
-        app:layout_constraintBottom_toBottomOf="@+id/quick_react_1"
+        android:textSize="30sp"
-        app:layout_constraintEnd_toStartOf="@id/quick_react_4"
+        app:autoSizeTextType="uniform"
+        app:layout_constraintBottom_toBottomOf="@+id/quick_react_1_text"
+        app:layout_constraintEnd_toStartOf="@id/quick_react_4_text"
         app:layout_constraintHorizontal_chainStyle="packed"
         app:layout_constraintStart_toEndOf="@id/center_guideline"
-        app:layout_constraintTop_toTopOf="@id/quick_react_1">
+        app:layout_constraintTop_toTopOf="@id/quick_react_1_text"
+        tools:text="😀" />
 
-        <TextView
+    <TextView
-            android:id="@+id/quick_react_3_text"
+        android:id="@+id/quick_react_4_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:textSize="30sp"
-            tools:text="😀" />
-    </RelativeLayout>
-
-    <RelativeLayout
-        android:id="@+id/quick_react_4"
         android:layout_width="40dp"
         android:layout_height="40dp"
         android:layout_marginStart="4dp"
@@ -111,20 +91,13 @@
         android:background="?android:attr/selectableItemBackground"
         android:clickable="true"
         android:focusable="true"
-        app:layout_constraintBottom_toBottomOf="@id/quick_react_3"
+        android:textSize="30sp"
+        app:autoSizeTextType="uniform"
+        app:layout_constraintBottom_toBottomOf="@id/quick_react_3_text"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/quick_react_3"
+        app:layout_constraintStart_toEndOf="@id/quick_react_3_text"
-        app:layout_constraintTop_toTopOf="@id/quick_react_3">
+        app:layout_constraintTop_toTopOf="@id/quick_react_3_text"
-
+        tools:text="😞" />
-        <TextView
-            android:id="@+id/quick_react_4_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:layout_gravity="center_vertical"
-            android:textSize="30sp"
-            tools:text="😞" />
-    </RelativeLayout>
 
     <TextView
         android:id="@+id/quick_react_like_text"

vector/src/main/res/values/strings.xml

@@ -1402,10 +1402,4 @@ Why choose Riot.im?
     <string name="autodiscover_well_known_autofill_dialog_message">Riot detected a custom server configuration for your userId domain \"%s\":\n%s</string>
     <string name="autodiscover_well_known_autofill_confirm">Use Config</string>
 
-
-    <string name="title_activity_emoji_reaction_picker">Reactions</string>
-    <string name="reactions_agree">Agree</string>
-    <string name="reactions_like">Like</string>
-    <string name="message_add_reaction">Add Reaction</string>
-
 </resources>

vector/src/main/res/values/strings_riotX.xml

@@ -5,4 +5,10 @@
     <string name="global_retry">"Retry"</string>
     <string name="room_list_empty">"Join a room to start using the app."</string>
 
+
+    <string name="title_activity_emoji_reaction_picker">Reactions</string>
+    <string name="reactions_agree">Agree</string>
+    <string name="reactions_like">Like</string>
+    <string name="message_add_reaction">Add Reaction</string>
+
 </resources>