Merge pull request #29 from RocketChat/develop

merge

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

 package chat.rocket.android.chatroom.adapter
 
+import android.app.AlertDialog
+import android.content.Context
 import androidx.recyclerview.widget.RecyclerView
 import android.view.MenuItem
 import android.view.ViewGroup
@@ -18,7 +20,8 @@ class ChatRoomAdapter(
     private val roomName: String? = null,
     private val presenter: ChatRoomPresenter? = null,
     private val enableActions: Boolean = true,
-    private val reactionListener: EmojiReactionListener? = null
+    private val reactionListener: EmojiReactionListener? = null,
+    private val context: Context? = null
 ) : RecyclerView.Adapter<BaseViewHolder<*>>() {
     private val dataSet = ArrayList<BaseUiModel<*>>()
 
@@ -233,7 +236,16 @@ class ChatRoomAdapter(
                             presenter?.unpinMessage(id)
                         }
                     }
-                    R.id.action_message_delete -> presenter?.deleteMessage(roomId, id)
+                    R.id.action_message_delete -> {
+                        context?.let {
+                            val builder = AlertDialog.Builder(it)
+                            builder.setTitle(it.getString(R.string.msg_delete_message))
+                                    .setMessage(it.getString(R.string.msg_delete_description))
+                                    .setPositiveButton(it.getString(R.string.msg_ok)) { _, _ -> presenter?.deleteMessage(roomId, id) }
+                                    .setNegativeButton(it.getString(R.string.msg_cancel)) { _, _ ->  }
+                                    .show()
+                        }
+                    }
                     R.id.action_menu_msg_react -> presenter?.showReactions(id)
                     else -> TODO("Not implemented")
                 }

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

@@ -257,7 +257,8 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
                     chatRoomType,
                     chatRoomName,
                     presenter,
-                    reactionListener = this@ChatRoomFragment
+                    reactionListener = this@ChatRoomFragment,
+                    context = context
                 )
                 recycler_view.adapter = adapter
                 if (dataSet.size >= 30) {

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

@@ -132,6 +132,9 @@
     // TODO: Add proper translation.
     <string name="msg_search">Search</string>
     <string name="msg_message_copied">Mensaje copiado</string>
+    // TODO: Add proper translation.
+    <string name="msg_delete_message">Delete Message</string>
+    <string name="msg_delete_description">Are you sure you want to delete this message</string>
 
     <!-- Create channel messages -->
     // TODO: Add proper translation.

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

@@ -132,6 +132,9 @@
     // TODO: Add proper translation.
     <string name="msg_search">Search</string>
     <string name="msg_message_copied">Message copié</string>
+    // TODO: Add proper translation.
+    <string name="msg_delete_message">Delete Message</string>
+    <string name="msg_delete_description">Are you sure you want to delete this message</string>
 
     <!-- Create channel messages -->
     // TODO: Add proper translation.

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

@@ -123,6 +123,8 @@
     // TODO: Add proper translation.
     <string name="msg_search">Search</string>
     <string name="msg_message_copied">संदेश कॉपी किया गया</string>
+    <string name="msg_delete_message">संदेश को हटाएं</string>
+    <string name="msg_delete_description">क्या आप निश्चित रूप से यह संदेश हटाना चाहते हैं</string>
 
     <!-- Create channel messages -->
     // TODO: Add proper translation.

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

@@ -119,6 +119,9 @@
     <string name="msg_channel_name">Nome do chat</string>
     <string name="msg_search">Buscar</string>
     <string name="msg_message_copied">Mensagem copiada</string>
+    // TODO: Add proper translation.
+    <string name="msg_delete_message">Delete Message</string>
+    <string name="msg_delete_description">Are you sure you want to delete this message</string>
 
     <!-- Create channel messages -->
     <string name="msg_private_channel">Privado</string>

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

@@ -117,6 +117,9 @@
     <string name="msg_several_users_are_typing">Несколько пользователей печатают…</string>
     <string name="msg_no_search_found">Результатов не найдено</string>
     <string name="msg_message_copied">Сообщение скопировано</string>
+    // TODO: Add proper translation.
+    <string name="msg_delete_message">Delete Message</string>
+    <string name="msg_delete_description">Are you sure you want to delete this message</string>
     <string name="msg_channel_name">Назва каналу</string>
     <string name="msg_search">Пошук</string>
 

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

@@ -133,6 +133,8 @@
     <string name="msg_channel_created_successfully">Channel created successfully</string>
 
     <string name="msg_message_copied">Message copied</string>
+    <string name="msg_delete_message">Delete Message</string>
+    <string name="msg_delete_description">Are you sure you want to delete this message</string>
 
     <!-- System messages -->
     <string name="message_room_name_changed">Room name changed to: %1$s by %2$s</string>