Merge branch 'develop' into develop

README.md

@@ -43,8 +43,8 @@ cd Rocket.Chat.Android/app
 
 ## Bug report & Feature request
 
-Are you having a technical issue trying to compile the app, or setting up Push Notifications? Please use our Community Support channel for that: https://forums.rocket.chat/c/community-support. The issues are only suppose to be used for bugs, improvements and features in the native Android application.
+Are you having a technical issue trying to compile the app, or setting up Push Notifications? Please use our Community Support channel for that: https://forums.rocket.chat/c/community-support. The issues are only supposed to be used for bugs, improvements, and features in the native Android application.
 
 ## Coding Style
 
-Please follow the official [Kotlin coding convections](https://kotlinlang.org/docs/reference/coding-conventions.html) when contributing.
+Please follow the official [Kotlin coding conventions](https://kotlinlang.org/docs/reference/coding-conventions.html) when contributing.

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

@@ -1295,9 +1295,7 @@ class ChatRoomPresenter @Inject constructor(
      * @param unfinishedMessage The unfinished message to save.
      */
     fun saveDraftMessage(unfinishedMessage: String) {
-        if (unfinishedMessage.isNotBlank()) {
-            localRepository.save(draftKey, unfinishedMessage)
-        }
+        localRepository.save(draftKey, unfinishedMessage)
     }
 
     fun clearDraftMessage() {

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/java/chat/rocket/android/chatrooms/adapter/RoomUiModelMapper.kt

@@ -36,14 +36,29 @@ class RoomUiModelMapper(
         grouped: Boolean = false,
         showLastMessage: Boolean = true
     ): List<ItemHolder<*>> {
-        val list = ArrayList<ItemHolder<*>>(rooms.size + 4)
+        val list = ArrayList<ItemHolder<*>>(rooms.size + 5)
         var lastType: String? = null
-        rooms.forEach { room ->
-            if (grouped && lastType != room.chatRoom.type) {
-                list.add(HeaderItemHolder(roomType(room.chatRoom.type)))
+        if (grouped) {
+            val favRooms = rooms.filter { it.chatRoom.favorite == true }
+            val unfavRooms = rooms.filterNot { it.chatRoom.favorite == true }
+
+            if (favRooms.isNotEmpty()) {
+                list.add(HeaderItemHolder(context.resources.getString(R.string.header_favorite)))
+            }
+            favRooms.forEach { room ->
+                list.add(RoomItemHolder(map(room, showLastMessage)))
+            }
+            unfavRooms.forEach { room ->
+                if (lastType != room.chatRoom.type) {
+                    list.add(HeaderItemHolder(roomType(room.chatRoom.type)))
+                }
+                list.add(RoomItemHolder(map(room, showLastMessage)))
+                lastType = room.chatRoom.type
+            }
+        } else {
+            rooms.forEach { room ->
+                list.add(RoomItemHolder(map(room, showLastMessage)))
             }
-            list.add(RoomItemHolder(map(room, showLastMessage)))
-            lastType = room.chatRoom.type
         }
 
         return list
@@ -108,6 +123,7 @@ class RoomUiModelMapper(
             val type = roomTypeOf(type)
             val status = chatRoom.status?.let { userStatusOf(it) }
             val roomName = mapName(name, fullname)
+            val favorite = favorite
             val timestamp = mapDate(lastMessageTimestamp ?: updatedAt)
             val avatar = if (type is RoomType.DirectMessage) {
                 serverUrl.avatarUrl(name)
@@ -140,6 +156,7 @@ class RoomUiModelMapper(
                 date = timestamp,
                 unread = unread,
                 mentions = hasMentions,
+                favorite = favorite,
                 alert = isUnread,
                 lastMessage = lastMessageMarkdown,
                 status = status,
@@ -157,6 +174,7 @@ class RoomUiModelMapper(
 
     private fun roomType(type: String): String {
         val resources = context.resources
+
         return when (type) {
             RoomType.CHANNEL -> resources.getString(R.string.header_channel)
             RoomType.PRIVATE_GROUP -> resources.getString(R.string.header_private_groups)

app/src/main/java/chat/rocket/android/chatrooms/adapter/model/RoomUiModel.kt

@@ -12,6 +12,7 @@ data class RoomUiModel(
     val date: CharSequence? = null,
     val unread: String? = null,
     val alert: Boolean = false,
+    val favorite: Boolean? = false,
     val mentions: Boolean = false,
     val lastMessage: CharSequence? = null,
     val status: UserStatus? = null,

app/src/main/java/chat/rocket/android/profile/ui/ProfileFragment.kt

@@ -293,19 +293,14 @@ class ProfileFragment : Fragment(), ProfileView, ActionMode.Callback {
     }
 
     fun showDeleteAccountDialog() {
-        val passwordEditText = EditText(context)
-        passwordEditText.hint = getString(R.string.msg_password)
-
         context?.let {
-            val builder = AlertDialog.Builder(it)
-            builder.setTitle(R.string.title_are_you_sure)
-                .setView(passwordEditText)
-                .setPositiveButton(R.string.action_delete_account) { _, _ ->
-                    presenter.deleteAccount(passwordEditText.text.toString())
-                }
-                .setNegativeButton(android.R.string.no) { dialog, _ -> dialog.cancel() }
-                .create()
-                .show()
+            val passwordEText = EditText(context);
+            val mDialogView = LayoutInflater.from(it).inflate(R.layout.item_account_delete, null)
+            val mBuilder = AlertDialog.Builder(it)
+
+            mBuilder.setView(mDialogView).setPositiveButton(R.string.action_delete_account) { _, _ ->
+                presenter.deleteAccount(passwordEText.text.toString())
+            }.setNegativeButton(android.R.string.no) { dialog, _ -> dialog.cancel() }.create().show()
         }
     }
 }

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

+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="@dimen/screen_edge_left_and_right_margins">
+
+    <TextView
+        android:id="@+id/text_reset_password"
+        style="@style/Authentication.TextView.Headline"
+        android:text="@string/title_are_you_sure"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <EditText
+        android:id="@+id/text_delete_account_password"
+        style="@style/Authentication.EditText.Border"
+        android:layout_marginTop="16dp"
+        android:drawableStart="@drawable/ic_key_black_20dp"
+        android:hint="@string/msg_password"
+        android:imeOptions="actionDone"
+        android:inputType="textPassword"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/text_reset_password" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

app/src/main/res/values-de/strings.xml

@@ -324,6 +324,7 @@
     <string name="chatroom_header">Kopf</string>
 
     <!--ChatRooms Headers-->
+    <string name="header_favorite">Favorites</string><!-- TODO - Add proper translation -->
     <string name="header_channel">Räume</string>
     <string name="header_private_groups">Private Räume</string>
     <string name="header_direct_messages">Direkt Nachrichten</string>

app/src/main/res/values-es/strings.xml

@@ -315,6 +315,7 @@
     <string name="chatroom_header">Cabezazo</string>
 
     <!--ChatRooms Headers-->
+    <string name="header_favorite">Favorites</string><!-- TODO - Add proper translation -->
     <string name="header_channel">Canales</string>
     <string name="header_private_groups">Grupos privados</string>
     <string name="header_direct_messages">Mensajes directos</string>

app/src/main/res/values-fa/strings.xml

@@ -318,6 +318,7 @@
     <string name="chatroom_header">سرپیام</string>
 
     <!--ChatRooms Headers-->
+    <string name="header_favorite">Favorites</string><!-- TODO - Add proper translation -->
     <string name="header_channel">کانال‌ها</string>
     <string name="header_private_groups">گروه‌های خصوصی</string>
     <string name="header_direct_messages">پیام‌های خصوصی</string>

app/src/main/res/values-fr/strings.xml

@@ -319,6 +319,7 @@
     <string name="chatroom_header">Entête</string>
 
     <!--ChatRooms Headers-->
+    <string name="header_favorite">Favorites</string><!-- TODO - Add proper translation -->
     <string name="header_channel">Salons</string>
     <string name="header_private_groups">Groupes privés</string>
     <string name="header_direct_messages">Messages directs</string>

app/src/main/res/values-hi-rIN/strings.xml

@@ -319,6 +319,7 @@
     <string name="chatroom_header">हैडर</string>
 
     <!--ChatRooms Headers-->
+    <string name="header_favorite">Favorites</string><!-- TODO - Add proper translation -->
     <string name="header_channel">चैनलों</string>
     <string name="header_private_groups">निजी समूहों</string>
     <string name="header_direct_messages">प्रत्यक्ष संदेश</string>

app/src/main/res/values-it/strings.xml

@@ -315,6 +315,7 @@
     <string name="chatroom_header">Intestazione</string>
 
     <!--ChatRooms Headers-->
+    <string name="header_favorite">Favorites</string><!-- TODO - Add proper translation -->
     <string name="header_channel">Canali</string>
     <string name="header_private_groups">Gruppi Privati</string>
     <string name="header_direct_messages">Messaggi Diretti</string>

app/src/main/res/values-ja/strings.xml

@@ -319,6 +319,7 @@
 
 
     <!--ChatRooms Headers-->
+    <string name="header_favorite">Favorites</string><!-- TODO - Add proper translation -->
     <string name="header_channel">チャンネル</string>
     <string name="header_private_groups">プライベートグループ</string>
     <string name="header_direct_messages">ダイレクトメッセージ</string>

app/src/main/res/values-pt-rBR/strings.xml

@@ -317,6 +317,7 @@
     <string name="chatroom_header">Cabeçalho</string>
 
     <!--ChatRooms Headers-->
+    <string name="header_favorite">Favoritos</string>
     <string name="header_channel">Canais</string>
     <string name="header_private_groups">Grupos Privados</string>
     <string name="header_direct_messages">Mensagens diretas</string>

app/src/main/res/values-ru-rRU/strings.xml

@@ -315,6 +315,7 @@
     <string name="chatroom_header">Заголовок</string>
 
     <!--ChatRooms Headers-->
+    <string name="header_favorite">Favorites</string><!-- TODO - Add proper translation -->
     <string name="header_channel">Каналы</string>
     <string name="header_private_groups">Приватные каналы</string>
     <string name="header_direct_messages">Личная переписка</string>

app/src/main/res/values-tr/strings.xml

@@ -320,6 +320,7 @@
     <string name="chatroom_header">Başlık</string>
 
     <!--ChatRooms Headers-->
+    <string name="header_favorite">Favorites</string><!-- TODO - Add proper translation -->
     <string name="header_channel">Kanallar</string>
     <string name="header_private_groups">Gizli Gruplar</string>
     <string name="header_direct_messages">Direkt Mesajlar</string>

app/src/main/res/values-uk/strings.xml

@@ -316,6 +316,7 @@
     <string name="chatroom_header">Заголовок</string>
 
     <!--ChatRooms Headers-->
+    <string name="header_favorite">Favorites</string><!-- TODO - Add proper translation -->
     <string name="header_channel">Канали</string>
     <string name="header_private_groups">Приватні канали</string>
     <string name="header_direct_messages">Особисті повідомлення</string>

app/src/main/res/values-zh-rCN/strings.xml

@@ -315,6 +315,7 @@
     <string name="chatroom_header">头部</string>
 
     <!--ChatRooms Headers-->
+    <string name="header_favorite">Favorites</string><!-- TODO - Add proper translation -->
     <string name="header_channel">频道</string>
     <string name="header_private_groups">私人组</string>
     <string name="header_direct_messages">直接对话</string>

app/src/main/res/values/strings.xml

@@ -331,6 +331,7 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <string name="chatroom_header">Header</string>
 
     <!--ChatRooms Headers-->
+    <string name="header_favorite">Favorites</string>
     <string name="header_channel">Channels</string>
     <string name="header_private_groups">Private Groups</string>
     <string name="header_direct_messages">Direct Messages</string>

draw/src/main/java/chat/rocket/android/draw/main/ui/DrawActivity.kt

@@ -61,8 +61,15 @@ class DrawingActivity : DaggerAppCompatActivity(), DrawView {
     }
 
     private fun setupDrawTools() {
-        image_draw_eraser.setOnClickListener {
+        image_draw_eraser.setOnLongClickListener{
             custom_draw_view.clearCanvas()
+            return@setOnLongClickListener true
+        }
+
+        image_draw_eraser.setOnClickListener {
+            custom_draw_view.setColor(
+                ResourcesCompat.getColor(resources, R.color.color_white, null)
+            )
             toggleDrawTools(draw_tools, false)
         }
 
@@ -128,6 +135,13 @@ class DrawingActivity : DaggerAppCompatActivity(), DrawView {
 
 
     private fun colorSelector() {
+        image_color_black.setOnClickListener {
+            custom_draw_view.setColor(
+                    ResourcesCompat.getColor(resources, R.color.color_black, null)
+            )
+            scaleColorView(image_color_black)
+        }
+
         image_color_red.setOnClickListener {
             custom_draw_view.setColor(
                 ResourcesCompat.getColor(resources, R.color.color_red, null)

draw/src/main/java/chat/rocket/android/draw/widget/CustomDrawView.kt

@@ -42,7 +42,6 @@ class CustomDrawView(context: Context, attrs: AttributeSet) : View(context, attr
     fun undo() {
         if (mPaths.isEmpty() && mLastPaths.isNotEmpty()) {
             mPaths = mLastPaths.clone() as LinkedHashMap<MyPath, PaintOptions>
-            mLastPaths.clear()
             invalidate()
             return
         }