Merge pull request #949 from TheGamer007/mark_as_read

[FIX] Properly mark a room as read

app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt

@@ -71,13 +71,13 @@ class ChatRoomPresenter @Inject constructor(private val view: ChatRoomView,
                         client.messages(chatRoomId, roomTypeOf(chatRoomType), offset, 30).result
                 messagesRepository.saveAll(messages)
 
+                val messagesViewModels = mapper.map(messages)
+                view.showMessages(messagesViewModels)
+
                 // TODO: For now we are marking the room as read if we can get the messages (I mean, no exception occurs)
                 // but should mark only when the user see the first unread message.
                 markRoomAsRead(chatRoomId)
 
-                val messagesViewModels = mapper.map(messages)
-                view.showMessages(messagesViewModels)
-
                 subscribeMessages(chatRoomId)
             } catch (ex: Exception) {
                 ex.printStackTrace()
@@ -230,6 +230,9 @@ class ChatRoomPresenter @Inject constructor(private val view: ChatRoomView,
     fun unsubscribeMessages(chatRoomId: String) {
         manager.removeStatusChannel(stateChannel)
         manager.unsubscribeRoomMessages(chatRoomId)
+        // All messages during the subscribed period are assumed to be read,
+        // and lastSeen is updated as the time when the user leaves the room
+        markRoomAsRead(chatRoomId)
     }
 
     /**

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

@@ -35,13 +35,20 @@
             android:layout_height="1dp"
             android:layout_width="0dp"
             android:layout_weight="1"
-            android:layout_marginRight="4dp"
+            android:layout_marginEnd="4dp"
             android:background="@color/red"/>
         <TextView
             android:layout_width="wrap_content"
             android:text="@string/msg_unread_messages"
             android:layout_height="wrap_content"
             android:textColor="@color/red" />
+        <View
+            android:layout_gravity="center"
+            android:layout_height="1dp"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_marginStart="4dp"
+            android:background="@color/red"/>
     </LinearLayout>
 
     <LinearLayout