Merge branch 'develop' into fix/oauth-path

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

@@ -255,10 +255,9 @@ class ChatRoomPresenter @Inject constructor(
                         messagesRepository.save(newMessage)
                         view.showNewMessage(
                             mapper.map(
-                                newMessage, RoomUiModel(
-                                    roles = chatRoles, isBroadcast = chatIsBroadcast
-                                )
-                            )
+                                newMessage, 
+                                RoomUiModel(roles = chatRoles, isBroadcast = chatIsBroadcast)
+                            ), false
                         )
                         client.sendMessage(id, chatRoomId, text)
                     } catch (ex: Exception) {
@@ -473,7 +472,7 @@ class ChatRoomPresenter @Inject constructor(
                                 messagesRepository.saveAll(messages.result)
 
                                 launchUI(strategy) {
-                                    view.showNewMessage(models)
+                                    view.showNewMessage(models, true)
                                 }
 
                                 if (messages.result.size == 50) {
@@ -990,7 +989,7 @@ class ChatRoomPresenter @Inject constructor(
             } else {
                 Timber.d("Adding new message")
                 messagesRepository.save(streamedMessage)
-                view.showNewMessage(viewModelStreamedMessage)
+                view.showNewMessage(viewModelStreamedMessage, true)
             }
         }
     }

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

@@ -60,7 +60,7 @@ interface ChatRoomView : LoadingView, MessageView {
      *
      * @param message The (recent) message sent to a chat room.
      */
-    fun showNewMessage(message: List<BaseUiModel<*>>)
+    fun showNewMessage(message: List<BaseUiModel<*>>, isMessageReceived: Boolean)
 
     /**
      * Dispatch to the recycler views adapter that we should remove a message.

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

@@ -9,6 +9,7 @@ import chat.rocket.android.util.extensions.getMimeType
 fun ChatRoomFragment.showFileAttachmentDialog(uri: Uri) {
     activity?.let { fragmentActivity ->
         uri.getMimeType(fragmentActivity).let { mimeType ->
+            description.text.clear()
             when {
                 mimeType.startsWith("image") -> {
                     imagePreview.isVisible = true
@@ -27,16 +28,14 @@ fun ChatRoomFragment.showFileAttachmentDialog(uri: Uri) {
 
     sendButton.setOnClickListener {
         presenter.uploadFile(chatRoomId, uri, (citation ?: "") + description.text.toString())
-        clearMessageComposition()
         alertDialog.dismiss()
     }
-
     cancelButton.setOnClickListener { alertDialog.dismiss() }
-
     alertDialog.show()
 }
 
 fun ChatRoomFragment.showDrawAttachmentDialog(byteArray: ByteArray) {
+    description.text.clear()
     imagePreview.isVisible = true
     imagePreview.setImageDrawable(Drawable.createFromStream(byteArray.inputStream(), ""))
 
@@ -46,11 +45,9 @@ fun ChatRoomFragment.showDrawAttachmentDialog(byteArray: ByteArray) {
             byteArray,
             (citation ?: "") + description.text.toString()
         )
-        clearMessageComposition()
         alertDialog.dismiss()
     }
 
     cancelButton.setOnClickListener { alertDialog.dismiss() }
-
     alertDialog.show()
 }
\ No newline at end of file

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

@@ -133,6 +133,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
     internal lateinit var chatRoomId: String
     private lateinit var chatRoomName: String
     private lateinit var chatRoomType: String
+    private var newMessageCount: Int = 0
     private var chatRoomMessage: String? = null
     private var isSubscribed: Boolean = true
     private var isReadOnly: Boolean = false
@@ -448,10 +449,13 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
     private val fabScrollListener = object : RecyclerView.OnScrollListener() {
         override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
             if (!recyclerView.canScrollVertically(1)) {
+                text_count.isVisible = false
                 button_fab.hide()
+                newMessageCount = 0
             } else {
                 if (dy < 0 && !button_fab.isVisible) {
                     button_fab.show()
+                    if (newMessageCount !=0) text_count.isVisible = true
                 }
             }
         }
@@ -504,9 +508,21 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
         showMessage(getString(R.string.msg_invalid_file))
     }
 
-    override fun showNewMessage(message: List<BaseUiModel<*>>) {
+    override fun showNewMessage(message: List<BaseUiModel<*>>, isMessageReceived: Boolean) {
         ui {
             adapter.prependData(message)
+            if (isMessageReceived && button_fab.isVisible) {
+                newMessageCount++
+
+            if (newMessageCount <= 99)
+                text_count.text = newMessageCount.toString()
+            else
+                text_count.text = "99+"
+
+                text_count.isVisible = true
+            }
+            else if (!button_fab.isVisible)
+                recycler_view.scrollToPosition(0)
             verticalScrollOffset.set(0)
             empty_chat_view.isVisible = adapter.itemCount == 0
         }
@@ -531,8 +547,9 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
         ui {
             citation = null
             editingMessageId = null
-            if (deleteMessage)
-            text_message.textContent = ""
+            if (deleteMessage) {
+                text_message.textContent = ""
+            }
             actionSnackbar.dismiss()
         }
     }
@@ -742,7 +759,9 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
         button_fab.setOnClickListener {
             recycler_view.scrollToPosition(0)
             verticalScrollOffset.set(0)
+            text_count.isVisible = false
             button_fab.hide()
+            newMessageCount = 0
         }
     }
 

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

+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+
+  <solid android:color="@color/colorAccent" />
+
+  <size
+      android:width="20dp"
+      android:height="20dp" />
+
+</shape>
\ No newline at end of file

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

@@ -10,18 +10,40 @@
         android:layout_height="match_parent"
         android:scrollbars="vertical" />
 
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/button_fab"
+    <RelativeLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="16dp"
-        android:src="@drawable/ic_arrow_downward_24dp"
-        android:theme="@style/Theme.AppCompat"
-        android:tint="@color/actionMenuColor"
-        android:visibility="invisible"
-        app:backgroundTint="@color/colorWhite"
-        app:fabSize="mini"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentBottom="true"
         app:layout_anchor="@id/recycler_view"
-        app:layout_anchorGravity="bottom|end" />
+        app:layout_anchorGravity="bottom|end">
+
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            android:id="@+id/button_fab"
+            android:layout_alignParentEnd="true"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="invisible"
+            android:layout_margin="16dp"
+            android:src="@drawable/ic_arrow_downward_24dp"
+            android:theme="@style/Theme.AppCompat"
+            android:tint="@color/actionMenuColor"
+            app:backgroundTint="@color/colorWhite"
+            app:fabSize="mini" />
+
+        <TextView
+            android:id="@+id/text_count"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:elevation="7dp"
+            android:padding="2dp"
+            android:gravity="center"
+            android:layout_margin="10dp"
+            android:textColor="@color/colorWhite"
+            android:visibility="invisible"
+            android:layout_alignParentEnd="true"
+            android:textSize="@dimen/message_time_text_size"
+            android:background="@drawable/round_textview" />
+    </RelativeLayout>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file