Merge pull request #1880 from RocketChat/fix/some-fixes

[FIX] Layout fixes and Room refresh fix

app/src/main/java/chat/rocket/android/chatroom/adapter/AttachmentViewHolder.kt

@@ -146,7 +146,8 @@ class AttachmentViewHolder(
 
     private fun bindAudioOrVideo(data: AttachmentUiModel) {
         with(itemView) {
-            text_file_name.content = data.title
+            file_name.isVisible = data.hasTitle
+            file_name.text = data.title
 
             file_text.isVisible = data.hasText
             file_text.text = data.text

app/src/main/java/chat/rocket/android/db/DatabaseManager.kt

@@ -170,7 +170,7 @@ class DatabaseManager(val context: Application, val serverUrl: String) {
     fun processRooms(rooms: List<ChatRoom>) {
         launch(dbManagerContext) {
             val entities = rooms.map { mapChatRoom(it) }
-            sendOperation(Operation.InsertRooms(entities))
+            sendOperation(Operation.CleanInsertRooms(entities))
         }
     }
 

app/src/main/res/layout/item_message.xml

@@ -52,7 +52,7 @@
         android:layout_width="40dp"
         android:layout_height="40dp"
         app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/text_sender" />
+        app:layout_constraintTop_toTopOf="@+id/message_header" />
 
     <LinearLayout
         android:id="@+id/new_messages_notif"
@@ -88,17 +88,25 @@
             android:background="@color/colorRed" />
     </LinearLayout>
 
-    <TextView
-        android:id="@+id/text_sender"
-        style="@style/Sender.Name.TextView"
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:id="@+id/message_header"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:orientation="horizontal"
         android:layout_marginStart="16dp"
-        app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintLeft_toRightOf="@+id/layout_avatar"
         app:layout_constraintStart_toEndOf="@+id/layout_avatar"
-        app:layout_constraintTop_toBottomOf="@+id/day_marker_layout"
-        tools:text="Ronald Perkins" />
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/day_marker_layout">
+
+        <TextView
+            android:id="@+id/text_sender"
+            style="@style/Sender.Name.TextView"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:layout_marginEnd="8dp"
+            tools:text="User Name with long name" />
 
         <TextView
             android:id="@+id/text_message_time"
@@ -106,9 +114,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="4dp"
-        app:layout_constraintBaseline_toBaselineOf="@+id/text_sender"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/text_sender"
             tools:text="11:45 PM" />
 
         <TextView
@@ -119,9 +124,6 @@
             android:text="@string/msg_edited"
             android:textStyle="italic"
             android:visibility="gone"
-        app:layout_constraintBaseline_toBaselineOf="@+id/text_sender"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/text_message_time"
             tools:visibility="visible" />
 
         <ImageView
@@ -132,10 +134,6 @@
             android:layout_marginStart="4dp"
             android:layout_marginTop="2dp"
             android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="@+id/text_sender"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/text_edit_indicator"
-        app:layout_constraintTop_toTopOf="@+id/text_sender"
             app:srcCompat="@drawable/ic_action_message_star_24dp"
             tools:visibility="visible" />
 
@@ -144,12 +142,9 @@
             android:layout_width="24dp"
             android:layout_height="24dp"
             android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="@+id/text_sender"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/image_star_indicator"
-        app:layout_constraintTop_toTopOf="@+id/text_sender"
             app:srcCompat="@drawable/ic_check_unread_24dp"
             tools:visibility="visible" />
+    </LinearLayout>
 
     <TextView
         android:id="@+id/text_content"
@@ -160,8 +155,8 @@
         android:layout_marginEnd="4dp"
         android:layout_marginBottom="2dp"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="@+id/text_sender"
-        app:layout_constraintTop_toBottomOf="@+id/text_sender"
+        app:layout_constraintStart_toStartOf="@+id/message_header"
+        app:layout_constraintTop_toBottomOf="@+id/message_header"
         tools:text="This is a multiline chat message from Bertie that will take more than just one line of text. I have sure that everything is amazing!" />
 
     <include