Merge branch 'develop' into moksh-mahajan-patch-1

app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt

@@ -259,7 +259,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
                 button_fab.hide()
                 newMessageCount = 0
             } else {
-                if (dy < 0 && !button_fab.isVisible) {
+                if (dy < 0 && isAdded && !button_fab.isVisible) {
                     button_fab.show()
                     if (newMessageCount != 0) text_count.isVisible = true
                 }

app/src/main/res/drawable/bg_empty_user_avatar.xml

+<vector android:height="24dp" android:viewportHeight="100"
+    android:viewportWidth="100" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ededed" android:pathData="M50,100q-24.66,0 -49.32,0c-0.57,0 -0.68,-0.11 -0.68,-0.68Q0,50 0,0.68C0,0.11 0.11,0 0.68,0Q50,0 99.32,0c0.57,0 0.68,0.11 0.68,0.68q0,49.32 0,98.64c0,0.57 -0.11,0.68 -0.68,0.68Q74.66,100 50,100Z"/>
+    <path android:fillColor="#afafae" android:pathData="M49.42,90C41.72,90 34,90 26.34,90a13.82,13.82 0,0 1,-8.55 -2.75A11.18,11.18 0,0 1,13.22 79a46.76,46.76 0,0 1,3 -21.44,17.06 17.06,0 0,1 6.56,-8.48 15.67,15.67 0,0 1,7.3 -2.28,4.52 4.52,0 0,1 2.84,1c1.62,1 3.18,2.14 4.86,3.05a23.24,23.24 0,0 0,20.34 1.5A25.39,25.39 0,0 0,65 48.51c2.81,-2.26 5.65,-1.76 8.61,-0.71 3.73,1.32 6.24,4 8.11,7.39A35.18,35.18 0,0 1,85.31 67,54.2 54.2,0 0,1 86,77.31a12.47,12.47 0,0 1,-4 9.28,12.65 12.65,0 0,1 -7.33,3.22c-3.9,0.4 -7.82,0.13 -11.73,0.17C58.41,90 53.92,90 49.42,90Z"/>
+    <path android:fillColor="#afafae" android:pathData="M69.35,30.28c0.4,10.36 -8.74,20 -19.89,19.93s-19.92,-9.58 -19.89,-20 8.81,-19.93 20,-19.88C60.64,10.35 69.77,19.87 69.35,30.28Z"/>
+</vector>

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

@@ -10,6 +10,7 @@
         android:layout_width="120dp"
         android:layout_height="120dp"
         android:layout_centerHorizontal="true"
+        android:background="@drawable/bg_empty_user_avatar"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"

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

@@ -34,8 +34,8 @@
             android:id="@+id/day"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="16dp"
-            android:layout_marginRight="16dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
             android:textAppearance="@style/Message.DayMarker"
             tools:text="Wednesday" />
 
@@ -51,7 +51,7 @@
         layout="@layout/avatar"
         android:layout_width="40dp"
         android:layout_height="40dp"
-        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@+id/message_header" />
 
     <LinearLayout
@@ -95,17 +95,16 @@
         android:layout_marginStart="16dp"
         android:orientation="horizontal"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintLeft_toRightOf="@+id/layout_avatar"
         app:layout_constraintStart_toEndOf="@+id/layout_avatar"
         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_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="8dp"
-            android:layout_weight="1"
+            android:maxLength="22"
             tools:text="User Name with long name" />
 
         <TextView
@@ -123,7 +122,7 @@
             android:layout_marginStart="4dp"
             android:text="@string/msg_edited"
             android:textStyle="italic"
-            android:visibility="gone"
+            android:visibility="invisible"
             tools:visibility="visible" />
 
         <ImageView
@@ -133,7 +132,7 @@
             android:layout_gravity="center_vertical"
             android:layout_marginStart="4dp"
             android:layout_marginTop="2dp"
-            android:visibility="gone"
+            android:visibility="invisible"
             app:srcCompat="@drawable/ic_action_message_star_24dp"
             tools:visibility="visible" />
 
@@ -141,7 +140,7 @@
             android:id="@+id/read_receipt_view"
             android:layout_width="24dp"
             android:layout_height="24dp"
-            android:visibility="gone"
+            android:visibility="invisible"
             app:srcCompat="@drawable/ic_check_unread_24dp"
             tools:visibility="visible" />
     </LinearLayout>

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

@@ -21,6 +21,7 @@
         android:id="@+id/image_avatar"
         android:layout_width="60dp"
         android:layout_height="60dp"
+        android:background="@drawable/bg_empty_user_avatar"
         android:layout_marginStart="16dp"
         android:layout_marginTop="16dp"
         app:layout_constraintStart_toStartOf="parent"