Merge branch 'develop' into project/emoji-as-a-module

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

@@ -16,7 +16,7 @@ class ColorAttachmentViewHolder(itemView: View,
     : BaseViewHolder<ColorAttachmentUiModel>(itemView, listener, reactionListener) {
 
     val drawable: Drawable? = ContextCompat.getDrawable(itemView.context,
-            R.drawable.quote_vertical_bar)
+            R.drawable.quote_vertical_gray_bar)
 
     init {
         with(itemView) {

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

@@ -16,7 +16,18 @@ import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.helper.MessageHelper
 import chat.rocket.android.helper.UserHelper
 import chat.rocket.android.infrastructure.LocalRepository
-import chat.rocket.android.server.domain.*
+import chat.rocket.android.server.domain.ChatRoomsInteractor
+import chat.rocket.android.server.domain.GetCurrentServerInteractor
+import chat.rocket.android.server.domain.GetSettingsInteractor
+import chat.rocket.android.server.domain.JobSchedulerInteractor
+import chat.rocket.android.server.domain.MessagesRepository
+import chat.rocket.android.server.domain.PermissionsInteractor
+import chat.rocket.android.server.domain.PublicSettings
+import chat.rocket.android.server.domain.RoomRepository
+import chat.rocket.android.server.domain.UsersRepository
+import chat.rocket.android.server.domain.uploadMaxFileSize
+import chat.rocket.android.server.domain.uploadMimeTypeFilter
+import chat.rocket.android.server.domain.useRealName
 import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
 import chat.rocket.android.server.infraestructure.state
 import chat.rocket.android.util.extensions.avatarUrl
@@ -33,11 +44,27 @@ import chat.rocket.core.internal.realtime.setTypingStatus
 import chat.rocket.core.internal.realtime.socket.model.State
 import chat.rocket.core.internal.realtime.subscribeTypingStatus
 import chat.rocket.core.internal.realtime.unsubscribe
-import chat.rocket.core.internal.rest.*
+import chat.rocket.core.internal.rest.chatRoomRoles
+import chat.rocket.core.internal.rest.commands
+import chat.rocket.core.internal.rest.deleteMessage
+import chat.rocket.core.internal.rest.getMembers
+import chat.rocket.core.internal.rest.history
+import chat.rocket.core.internal.rest.joinChat
+import chat.rocket.core.internal.rest.markAsRead
+import chat.rocket.core.internal.rest.messages
+import chat.rocket.core.internal.rest.pinMessage
+import chat.rocket.core.internal.rest.runCommand
+import chat.rocket.core.internal.rest.sendMessage
+import chat.rocket.core.internal.rest.spotlight
+import chat.rocket.core.internal.rest.starMessage
+import chat.rocket.core.internal.rest.toggleReaction
+import chat.rocket.core.internal.rest.unpinMessage
+import chat.rocket.core.internal.rest.unstarMessage
+import chat.rocket.core.internal.rest.updateMessage
+import chat.rocket.core.internal.rest.uploadFile
 import chat.rocket.core.model.ChatRoomRole
 import chat.rocket.core.model.Command
 import chat.rocket.core.model.Message
-import chat.rocket.core.model.Myself
 import kotlinx.coroutines.experimental.CommonPool
 import kotlinx.coroutines.experimental.DefaultDispatcher
 import kotlinx.coroutines.experimental.android.UI
@@ -139,12 +166,10 @@ class ChatRoomPresenter @Inject constructor(
             try {
                 if (offset == 0L) {
                     val localMessages = messagesRepository.getByRoomId(chatRoomId)
-                    val oldMessages = mapper.map(
-                        localMessages, RoomUiModel(
-                            roles = chatRoles,
-                            isBroadcast = chatIsBroadcast, isRoom = true
-                        )
-                    )
+                    val oldMessages = mapper.map(localMessages, RoomUiModel(
+                        roles = chatRoles,
+                        isBroadcast = chatIsBroadcast, isRoom = true
+                    ))
                     if (oldMessages.isNotEmpty()) {
                         view.showMessages(oldMessages)
                         loadMissingMessages()
@@ -187,12 +212,10 @@ class ChatRoomPresenter @Inject constructor(
             }
         messagesRepository.saveAll(messages)
         view.showMessages(
-            mapper.map(
-                messages, RoomUiModel(
-                    roles = chatRoles,
-                    isBroadcast = chatIsBroadcast, isRoom = true
-                )
-            )
+            mapper.map(messages, RoomUiModel(
+                roles = chatRoles,
+                isBroadcast = chatIsBroadcast, isRoom = true
+            ))
         )
     }
 
@@ -231,8 +254,8 @@ class ChatRoomPresenter @Inject constructor(
                         view.showNewMessage(
                             mapper.map(
                                 newMessage, RoomUiModel(
-                                    roles = chatRoles, isBroadcast = chatIsBroadcast
-                                )
+                                roles = chatRoles, isBroadcast = chatIsBroadcast
+                            )
                             )
                         )
                         client.sendMessage(id, chatRoomId, text)
@@ -415,13 +438,11 @@ class ChatRoomPresenter @Inject constructor(
                             Timber.d("History: $messages")
 
                             if (messages.result.isNotEmpty()) {
-                                val models = mapper.map(
-                                    messages.result, RoomUiModel(
-                                        roles = chatRoles,
-                                        isBroadcast = chatIsBroadcast,
-                                        isRoom = true
-                                    )
-                                )
+                                val models = mapper.map(messages.result, RoomUiModel(
+                                    roles = chatRoles,
+                                    isBroadcast = chatIsBroadcast,
+                                    isRoom = true
+                                ))
                                 messagesRepository.saveAll(messages.result)
 
                                 launchUI(strategy) {
@@ -481,18 +502,12 @@ class ChatRoomPresenter @Inject constructor(
     fun citeMessage(roomName: String, roomType: String, messageId: String, mentionAuthor: Boolean) {
         launchUI(strategy) {
             val message = messagesRepository.getById(messageId)
-            val me: Myself? = try {
-                retryIO("me()") { client.me() } //TODO: Cache this and use an interactor
-            } catch (ex: Exception) {
-                Timber.e(ex)
-                null
-            }
+            val currentUsername: String? = userHelper.user()?.username
             message?.let { msg ->
                 val id = msg.id
                 val username = msg.sender?.username ?: ""
-                val mention = if (mentionAuthor && me?.username != username) "@$username" else ""
-                val room =
-                    if (roomTypeOf(roomType) is RoomType.DirectMessage) username else roomName
+                val mention = if (mentionAuthor && currentUsername != username) "@$username" else ""
+                val room = if (roomTypeOf(roomType) is RoomType.DirectMessage) username else roomName
                 val chatRoomType = when (roomTypeOf(roomType)) {
                     is RoomType.DirectMessage -> "direct"
                     is RoomType.PrivateGroup -> "group"
@@ -503,12 +518,10 @@ class ChatRoomPresenter @Inject constructor(
                 view.showReplyingAction(
                     username = getDisplayName(msg.sender),
                     replyMarkdown = "[ ]($currentServer/$chatRoomType/$room?msg=$id) $mention ",
-                    quotedMessage = mapper.map(
-                        message, RoomUiModel(
-                            roles = chatRoles,
-                            isBroadcast = chatIsBroadcast
-                        )
-                    ).last().preview?.message ?: ""
+                    quotedMessage = mapper.map(message, RoomUiModel(
+                        roles = chatRoles,
+                        isBroadcast = chatIsBroadcast
+                    )).last().preview?.message ?: ""
                 )
             }
         }
@@ -912,11 +925,9 @@ class ChatRoomPresenter @Inject constructor(
 
     private fun updateMessage(streamedMessage: Message) {
         launchUI(strategy) {
-            val viewModelStreamedMessage = mapper.map(
-                streamedMessage, RoomUiModel(
-                    roles = chatRoles, isBroadcast = chatIsBroadcast
-                )
-            )
+            val viewModelStreamedMessage = mapper.map(streamedMessage, RoomUiModel(
+                roles = chatRoles, isBroadcast = chatIsBroadcast
+            ))
 
             val roomMessages = messagesRepository.getByRoomId(streamedMessage.roomId)
             val index = roomMessages.indexOfFirst { msg -> msg.id == streamedMessage.id }

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

 package chat.rocket.android.chatroom.ui
 
-import com.google.android.material.snackbar.BaseTransientBottomBar
-import androidx.core.view.ViewCompat
 import android.text.Spannable
 import android.text.SpannableStringBuilder
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.ImageView
 import android.widget.TextView
+import androidx.core.content.ContextCompat
+import androidx.core.view.ViewCompat
+import androidx.core.view.setPadding
 import chat.rocket.android.R
 import chat.rocket.android.helper.MessageParser
 import chat.rocket.android.util.extensions.content
+import com.google.android.material.snackbar.BaseTransientBottomBar
+import kotlinx.android.synthetic.main.message_action_bar.view.*
 import ru.noties.markwon.Markwon
 
-class ActionSnackbar : BaseTransientBottomBar<ActionSnackbar> {
+class ActionSnackbar private constructor(
+    parentViewGroup: ViewGroup, content:
+    View, contentViewCallback: com.google.android.material.snackbar.ContentViewCallback
+) : BaseTransientBottomBar<ActionSnackbar>(parentViewGroup, content, contentViewCallback) {
 
     companion object {
         fun make(parentViewGroup: ViewGroup, content: String = "", parser: MessageParser): ActionSnackbar {
             val context = parentViewGroup.context
             val view = LayoutInflater.from(context).inflate(R.layout.message_action_bar, parentViewGroup, false)
             val actionSnackbar = ActionSnackbar(parentViewGroup, view, CallbackImpl(view))
-            actionSnackbar.parser = parser
-            actionSnackbar.messageTextView = view.findViewById(R.id.text_view_action_text) as TextView
-            actionSnackbar.titleTextView = view.findViewById(R.id.text_view_action_title) as TextView
-            actionSnackbar.cancelView = view.findViewById(R.id.image_view_action_cancel_quote) as ImageView
-            actionSnackbar.duration = BaseTransientBottomBar.LENGTH_INDEFINITE
-            val spannable = Markwon.markdown(context, content).trim()
-            actionSnackbar.messageTextView.content = spannable
+            with(view) {
+                actionSnackbar.getView().setPadding(0)
+                actionSnackbar.getView().setBackgroundColor(ContextCompat.getColor(context, R.color.colorWhite))
+                actionSnackbar.parser = parser
+                actionSnackbar.messageTextView = text_view_action_text
+                actionSnackbar.titleTextView = text_view_action_title
+                actionSnackbar.cancelView = image_view_action_cancel_quote
+                actionSnackbar.duration = BaseTransientBottomBar.LENGTH_INDEFINITE
+                val spannable = Markwon.markdown(context, content).trim()
+                actionSnackbar.messageTextView.content = spannable
+            }
             return actionSnackbar
         }
     }
@@ -56,25 +65,22 @@ class ActionSnackbar : BaseTransientBottomBar<ActionSnackbar> {
         title = ""
     }
 
-    private constructor(parentViewGroup: ViewGroup, content: View, contentViewCallback: BaseTransientBottomBar.ContentViewCallback) :
-            super(parentViewGroup, content, contentViewCallback)
-
-    class CallbackImpl(val content: View) : BaseTransientBottomBar.ContentViewCallback {
+    class CallbackImpl(val content: View) : com.google.android.material.snackbar.ContentViewCallback {
 
         override fun animateContentOut(delay: Int, duration: Int) {
-            ViewCompat.setScaleY(content, 1f)
+            content.scaleY = 1f
             ViewCompat.animate(content)
-                    .scaleY(0f)
-                    .setDuration(duration.toLong())
-                    .startDelay = delay.toLong()
+                .scaleY(0f)
+                .setDuration(duration.toLong())
+                .startDelay = delay.toLong()
         }
 
         override fun animateContentIn(delay: Int, duration: Int) {
-            ViewCompat.setScaleY(content, 0f)
+            content.scaleY = 0f
             ViewCompat.animate(content)
-                    .scaleY(1f)
-                    .setDuration(duration.toLong())
-                    .startDelay = delay.toLong()
+                .scaleY(1f)
+                .setDuration(duration.toLong())
+                .startDelay = delay.toLong()
         }
     }
 }
\ No newline at end of file

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

+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="@color/actionMenuColor"
+        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+</vector>

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

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/colorAccent" />
+    <size
+        android:width="4dp"
+        android:height="4dp" />
+
+    <corners android:radius="8dp" />
+
+</shape>
\ No newline at end of file

app/src/main/res/drawable/quote_vertical_bar.xml → app/src/main/res/drawable/quote_vertical_gray_bar.xml

 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-
     <solid android:color="@color/quoteBar" />
     <size
         android:width="4dp"
         android:height="4dp" />
-
     <corners android:radius="8dp" />
-
 </shape>
\ No newline at end of file

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

@@ -18,7 +18,7 @@
         android:layout_width="4dp"
         android:layout_height="0dp"
         android:layout_marginStart="56dp"
-        android:background="@drawable/quote_vertical_bar"
+        android:background="@drawable/quote_vertical_gray_bar"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toTopOf="@+id/recycler_view_reactions"/>

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

@@ -18,7 +18,7 @@
         android:layout_width="4dp"
         android:layout_height="0dp"
         android:layout_marginStart="56dp"
-        android:background="@drawable/quote_vertical_bar"
+        android:background="@drawable/quote_vertical_gray_bar"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toTopOf="@id/recycler_view_reactions"/>

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

@@ -18,7 +18,7 @@
         android:layout_width="4dp"
         android:layout_height="0dp"
         android:layout_marginStart="56dp"
-        android:background="@drawable/quote_vertical_bar"
+        android:background="@drawable/quote_vertical_gray_bar"
         app:layout_constraintBottom_toTopOf="@+id/recycler_view_reactions"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />

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

@@ -4,15 +4,16 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/colorPrimary">
+    android:background="@color/colorWhite">
 
     <View
         android:id="@+id/quote_bar"
         android:layout_width="4dp"
         android:layout_height="0dp"
-        android:background="@drawable/quote_vertical_bar"
         android:layout_marginTop="4dp"
         android:layout_marginBottom="4dp"
+        android:layout_marginStart="8dp"
+        android:background="@drawable/quote_vertical_blue_bar"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toEndOf="@+id/image_view_action_cancel_quote"
         app:layout_constraintTop_toTopOf="parent" />
@@ -21,17 +22,17 @@
         android:id="@+id/text_view_action_text"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="8dp"
-        android:layout_marginEnd="8dp"
         android:layout_marginStart="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="8dp"
         android:ellipsize="end"
         android:maxLines="2"
-        android:textColor="@color/colorWhite"
+        android:textColor="@color/actionMenuColor"
         android:textSize="14sp"
         android:typeface="normal"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/image_view_action_cancel_quote"
+        app:layout_constraintStart_toEndOf="@+id/quote_bar"
         app:layout_constraintTop_toBottomOf="@+id/text_view_action_title"
         tools:text="action text" />
 
@@ -39,26 +40,29 @@
         android:id="@+id/image_view_action_cancel_quote"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="8dp"
         android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
+        android:adjustViewBounds="true"
+        android:cropToPadding="true"
         app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/quote_bar"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_close_white_24dp" />
+        app:srcCompat="@drawable/ic_close_gray_24dp" />
 
     <TextView
         android:id="@+id/text_view_action_title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="8dp"
         android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
         android:textColor="@color/colorAccent"
         android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@+id/text_view_action_text"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/image_view_action_cancel_quote"
+        app:layout_constraintStart_toEndOf="@+id/quote_bar"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="Edit message" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

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

@@ -17,7 +17,7 @@
         android:layout_margin="16dp"
         android:src="@drawable/ic_arrow_downward_24dp"
         android:theme="@style/Theme.AppCompat"
-        android:tint="@color/gray_material"
+        android:tint="@color/actionMenuColor"
         android:visibility="invisible"
         app:backgroundTint="@color/colorWhite"
         app:fabSize="mini"

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

@@ -32,7 +32,7 @@
         android:ellipsize="end"
         android:gravity="start"
         android:maxLines="1"
-        android:textColor="@color/gray_material"
+        android:textColor="@color/actionMenuColor"
         android:textSize="14sp"
         tools:text="Leave a channel" />
 

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

@@ -46,7 +46,7 @@
         android:layout_marginStart="5dp"
         android:ellipsize="end"
         android:maxLines="1"
-        android:textColor="@color/gray_material"
+        android:textColor="@color/actionMenuColor"
         android:textSize="16sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toEndOf="@+id/text_username"

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

@@ -25,7 +25,7 @@
         android:layout_toEndOf="@+id/text_name"
         android:maxLines="1"
         android:layout_marginStart="8dp"
-        android:textColor="@color/gray_material"
+        android:textColor="@color/actionMenuColor"
         android:textSize="16sp"
         tools:text="@tools:sample/full_names" />