Merge branch 'develop' into wear-module

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

@@ -25,6 +25,7 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        android:textDirection="locale"
         tools:text="This is a very, very, very long filename, to test how the layout will work on very very very long filenames.pdf" />
 
     <include

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

@@ -13,21 +13,13 @@
     android:paddingStart="@dimen/screen_edge_left_and_right_padding"
     android:paddingTop="@dimen/message_item_top_and_bottom_padding">
 
-    <include
-        android:id="@+id/layout_avatar"
-        layout="@layout/avatar"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        android:layout_marginTop="5dp"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/new_messages_notif" />
-
     <LinearLayout
         android:id="@+id/new_messages_notif"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         android:visibility="gone"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:visibility="visible">
@@ -55,13 +47,22 @@
             android:background="@color/red" />
     </LinearLayout>
 
+    <include
+        android:id="@+id/layout_avatar"
+        layout="@layout/avatar"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_marginTop="5dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/new_messages_notif" />
+
     <LinearLayout
         android:id="@+id/top_container"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:orientation="horizontal"
-        app:layout_constraintLeft_toRightOf="@+id/layout_avatar"
+        app:layout_constraintStart_toEndOf="@+id/layout_avatar"
         app:layout_constraintTop_toBottomOf="@+id/new_messages_notif">
 
         <TextView
@@ -108,9 +109,10 @@
         android:layout_height="wrap_content"
         android:layout_marginBottom="2dp"
         android:layout_marginTop="5dp"
-        app:layout_constraintLeft_toLeftOf="@+id/top_container"
-        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintStart_toStartOf="@+id/top_container"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/top_container"
+        android:textDirection="locale"
         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

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

@@ -23,31 +23,27 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <LinearLayout
-        android:id="@+id/top_container"
-        android:layout_width="0dp"
+    <TextView
+        android:id="@+id/text_sender"
+        style="@style/Sender.Name.TextView"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:orientation="horizontal"
-        app:layout_constraintLeft_toRightOf="@+id/quote_bar"
-        app:layout_constraintTop_toBottomOf="@id/new_messages_notif">
-
-        <TextView
-            android:id="@+id/text_sender"
-            style="@style/Sender.Name.TextView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/colorPrimary"
-            tools:text="Ronald Perkins" />
+        android:textColor="@color/colorPrimary"
+        tools:text="Ronald Perkins"
+        app:layout_constraintStart_toEndOf="@+id/quote_bar"
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_marginStart="8dp" />
 
-        <TextView
-            android:id="@+id/text_message_time"
-            style="@style/Timestamp.TextView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            tools:text="11:45 PM" />
-    </LinearLayout>
+    <TextView
+        android:id="@+id/text_message_time"
+        style="@style/Timestamp.TextView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="10dp"
+        tools:text="11:45 PM"
+        app:layout_constraintStart_toEndOf="@+id/text_sender"
+        app:layout_constraintTop_toTopOf="@+id/text_sender"
+        app:layout_constraintBottom_toBottomOf="@+id/text_sender"/>
 
     <TextView
         android:id="@+id/text_content"
@@ -57,8 +53,8 @@
         android:ellipsize="end"
         android:singleLine="true"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="@+id/top_container"
-        app:layout_constraintTop_toBottomOf="@+id/top_container"
+        app:layout_constraintStart_toStartOf="@+id/text_sender"
+        app:layout_constraintTop_toBottomOf="@+id/text_sender"
         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

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

@@ -13,6 +13,8 @@
         android:id="@+id/image_preview"
         android:layout_width="70dp"
         android:layout_height="50dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         app:actualImageScaleType="centerCrop" />
 
     <TextView
@@ -23,6 +25,7 @@
         android:textColor="@color/colorSecondaryText"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/image_preview"
+        android:textDirection="locale"
         tools:text="www.uol.com.br" />
 
     <TextView
@@ -33,6 +36,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@+id/text_host"
         app:layout_constraintTop_toBottomOf="@id/text_host"
+        android:textDirection="locale"
         tools:text="Web page title" />
 
     <TextView
@@ -42,6 +46,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@+id/text_host"
         app:layout_constraintTop_toBottomOf="@id/text_title"
+        android:textDirection="locale"
         tools:text="description" />
 
     <include