Merge branch 'develop' into fix/lists-on-chat-room

app/build.gradle

@@ -114,8 +114,6 @@ dependencies {
 
     implementation libraries.markwon
 
-    implementation libraries.sheetMenu
-
     implementation libraries.aVLoadingIndicatorView
 
     implementation "com.github.luciofm:livedata-ktx:b1e8bbc25a"

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

 package chat.rocket.android.chatroom.adapter
 
-import androidx.recyclerview.widget.RecyclerView
+import android.view.ContextThemeWrapper
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
+import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.children
+import androidx.recyclerview.widget.RecyclerView
 import chat.rocket.android.R
-import chat.rocket.android.chatroom.ui.bottomsheet.BottomSheetMenu
-import chat.rocket.android.chatroom.ui.bottomsheet.adapter.ActionListAdapter
+import chat.rocket.android.chatroom.ui.bottomsheet.MessageActionsBottomSheet
 import chat.rocket.android.chatroom.uimodel.BaseUiModel
 import chat.rocket.android.emoji.Emoji
 import chat.rocket.android.emoji.EmojiReactionListener
+import chat.rocket.android.util.extensions.inflate
+import chat.rocket.android.util.extensions.toList
 import chat.rocket.core.model.Message
 import chat.rocket.core.model.isSystemMessage
 import com.google.android.flexbox.FlexDirection
 import com.google.android.flexbox.FlexboxLayoutManager
-import ru.whalemare.sheetmenu.extension.inflate
-import ru.whalemare.sheetmenu.extension.toList
 
 abstract class BaseViewHolder<T : BaseUiModel<*>>(
     itemView: View,
@@ -89,8 +90,15 @@ abstract class BaseViewHolder<T : BaseUiModel<*>>(
                     setTitle(if (isStarred) R.string.action_msg_unstar else R.string.action_msg_star)
                     isChecked = isStarred
                 }
-                val adapter = ActionListAdapter(menuItems, this@BaseViewHolder)
-                BottomSheetMenu(adapter).show(view.context)
+                view.context?.let {
+                    if (it is ContextThemeWrapper && it.baseContext is AppCompatActivity) {
+                        with(it.baseContext as AppCompatActivity) {
+                            val actionsBottomSheet = MessageActionsBottomSheet()
+                            actionsBottomSheet.addItems(menuItems, this@BaseViewHolder)
+                            actionsBottomSheet.show(supportFragmentManager, null)
+                        }
+                    }
+                }
             }
         }
     }

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

-package chat.rocket.android.chatroom.ui.bottomsheet
-
-import com.google.android.material.bottomsheet.BottomSheetDialog
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import android.view.MenuItem
-import ru.whalemare.sheetmenu.SheetMenu
-import ru.whalemare.sheetmenu.adapter.MenuAdapter
-
-class BottomSheetMenu(adapter: MenuAdapter) : SheetMenu(adapter = adapter) {
-
-    override fun processRecycler(recycler: RecyclerView, dialog: BottomSheetDialog) {
-        if (layoutManager == null) {
-            layoutManager = LinearLayoutManager(recycler.context)
-        }
-
-        // Superclass SheetMenu adapter property is nullable MenuAdapter? but this class enforces
-        // passing one at the constructor, so we assume it's always non-null.
-        val adapter = adapter!!
-        val callback = adapter.callback
-        adapter.callback = MenuItem.OnMenuItemClickListener {
-            callback?.onMenuItemClick(it)
-            dialog.cancel()
-            true
-        }
-
-        recycler.adapter = adapter
-        recycler.layoutManager = layoutManager
-    }
-}
\ No newline at end of file

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

+package chat.rocket.android.chatroom.ui.bottomsheet
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import chat.rocket.android.R
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import kotlinx.android.synthetic.main.message_action_item.view.*
+import kotlinx.android.synthetic.main.message_bottomsheet.*
+
+class MessageActionsBottomSheet : BottomSheetDialogFragment() {
+
+    private lateinit var adapter: MessageActionAdapter
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+        return inflater.inflate(R.layout.message_bottomsheet, container, false)
+    }
+
+    fun addItems(items: List<MenuItem>, itemClickListener: MenuItem.OnMenuItemClickListener) {
+        adapter = MessageActionAdapter()
+        adapter.addItems(items, ActionItemClickListener(dismissAction = { dismiss() },
+            itemClickListener = itemClickListener))
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        bottomsheet_recycler_view.layoutManager = LinearLayoutManager(context)
+        bottomsheet_recycler_view.adapter = adapter
+    }
+
+    private class ActionItemClickListener(
+        val dismissAction: () -> Unit,
+        val itemClickListener: MenuItem.OnMenuItemClickListener
+    )
+
+    private class MessageActionAdapter : RecyclerView.Adapter<MessageActionViewHolder>() {
+
+        private lateinit var itemClickListener: ActionItemClickListener
+        private val menuItems = mutableListOf<MenuItem>()
+
+        override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MessageActionViewHolder {
+            return MessageActionViewHolder(
+                LayoutInflater.from(parent.context).inflate(R.layout.message_action_item, parent, false)
+            )
+        }
+
+        override fun getItemCount() = menuItems.size
+
+        override fun onBindViewHolder(holder: MessageActionViewHolder, position: Int) {
+            holder.bind(menuItems[position], itemClickListener)
+        }
+
+        fun addItems(items: List<MenuItem>, itemClickListener: ActionItemClickListener) {
+            this.itemClickListener = itemClickListener
+            menuItems.clear()
+            menuItems.addAll(items)
+        }
+    }
+
+    private class MessageActionViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+
+        fun bind(item: MenuItem, itemClickListener: ActionItemClickListener) {
+            with(itemView) {
+                message_action_title.text = item.title
+                message_action_icon.setImageDrawable(item.icon)
+                setOnClickListener {
+                    itemClickListener.itemClickListener.onMenuItemClick(item)
+                    itemClickListener.dismissAction.invoke()
+                }
+            }
+        }
+    }
+}
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatroom/ui/bottomsheet/adapter/ActionListAdapter.kt

-package chat.rocket.android.chatroom.ui.bottomsheet.adapter
-
-import android.view.MenuItem
-import chat.rocket.android.R
-import chat.rocket.android.util.extensions.setVisible
-
-/**
- * An adapter for bottomsheet menu that lists all the actions that could be taken over a chat message.
- */
-class ActionListAdapter(
-    menuItems: List<MenuItem> = emptyList(),
-    callback: MenuItem.OnMenuItemClickListener
-) : ListBottomSheetAdapter(menuItems = menuItems, callback = callback) {
-
-    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        val item = menuItems[position]
-
-        if (showIcons) {
-            holder.imageIcon.setVisible(item.icon != null)
-        } else {
-            holder.imageIcon.setVisible(false)
-        }
-
-        holder.imageIcon.setImageDrawable(item.icon)
-        holder.textTitle.text = item.title
-        holder.itemView.setOnClickListener {
-            callback?.onMenuItemClick(item)
-        }
-        val deleteTextColor = holder.itemView.context.resources.getColor(R.color.colorRed)
-        val color = if (item.itemId == R.id.action_message_delete) {
-            deleteTextColor
-        } else {
-            textColors.get(item.itemId)
-        }
-        holder.textTitle.setTextColor(color)
-    }
-}
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatroom/ui/bottomsheet/adapter/ListBottomSheetAdapter.kt

-package chat.rocket.android.chatroom.ui.bottomsheet.adapter
-
-import android.graphics.Color
-import androidx.annotation.ColorInt
-import androidx.annotation.IdRes
-import android.util.SparseIntArray
-import android.view.MenuItem
-import chat.rocket.android.R
-import ru.whalemare.sheetmenu.adapter.MenuAdapter
-
-/**
- * A regular bottomsheet adapter with added possibility to hide or show a menu item given its item id.
- * Also added the possibility to change text colors for the menu items.
- */
-open class ListBottomSheetAdapter(menuItems: List<MenuItem> = emptyList(), callback: MenuItem.OnMenuItemClickListener) :
-        MenuAdapter(menuItems = menuItems, callback = callback, itemLayoutId = R.layout.item_linear, showIcons = true) {
-
-    // Maps menu item ids to colors.
-    protected val textColors: SparseIntArray = SparseIntArray(menuItems.size)
-
-    init {
-        for (item in menuItems) {
-            textColors.put(item.itemId, Color.BLACK)
-        }
-    }
-
-    /**
-     * Hide a menu item and disable it.
-     *
-     * @param itemId The id of the menu item to disable and hide.
-     */
-    fun hideMenuItem(@IdRes itemId: Int) {
-        menuItems.firstOrNull { it.itemId == itemId }?.apply {
-            setVisible(false)
-            setEnabled(false)
-        }
-    }
-
-    /**
-     * Show a menu item and enable it.
-     *
-     * @param itemId The id of the menu item to enable and show.
-     */
-    fun showMenuItem(@IdRes itemId: Int) {
-        menuItems.firstOrNull { it.itemId == itemId }?.apply {
-            setVisible(true)
-            setEnabled(true)
-        }
-    }
-
-    /**
-     * Change a menu item text color given by its id to the given color.
-     *
-     * @param itemId The id of menu item.
-     * @param color The color (not the resource color id) of the menu item.
-     */
-    fun setMenuItemTextColor(@IdRes itemId: Int, @ColorInt color: Int) {
-        val itemIndex = menuItems.indexOfFirst { it.itemId == itemId }
-        if (itemIndex > -1) {
-            textColors.put(itemId, color)
-        }
-    }
-}
\ No newline at end of file

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

@@ -13,6 +13,7 @@ import chat.rocket.android.infrastructure.checkIfMyself
 import chat.rocket.android.server.domain.PublicSettings
 import chat.rocket.android.server.domain.showLastMessage
 import chat.rocket.android.server.domain.useRealName
+import chat.rocket.android.server.domain.useSpecialCharsOnRoom
 import chat.rocket.android.util.extensions.avatarUrl
 import chat.rocket.android.util.extensions.date
 import chat.rocket.android.util.extensions.localDateTime
@@ -111,7 +112,7 @@ class RoomUiModelMapper(
     }
 
     private fun mapName(name: String, fullName: String?, unread: Boolean): CharSequence {
-        val roomName = if (settings.useRealName()) {
+        val roomName = if (settings.useSpecialCharsOnRoom() || settings.useRealName()) {
             fullName ?: name
         } else {
             name

app/src/main/java/chat/rocket/android/chatrooms/presentation/ChatRoomsPresenter.kt

@@ -6,6 +6,7 @@ import chat.rocket.android.helper.UserHelper
 import chat.rocket.android.infrastructure.LocalRepository
 import chat.rocket.android.main.presentation.MainNavigator
 import chat.rocket.android.server.domain.SettingsRepository
+import chat.rocket.android.server.domain.useSpecialCharsOnRoom
 import chat.rocket.android.server.domain.useRealName
 import chat.rocket.android.server.infraestructure.ConnectionManager
 import chat.rocket.android.util.extensions.launchUI
@@ -36,13 +37,11 @@ class ChatRoomsPresenter @Inject constructor(
     fun loadChatRoom(chatRoom: chat.rocket.android.db.model.ChatRoom) {
         with(chatRoom.chatRoom) {
             val isDirectMessage = roomTypeOf(type) is RoomType.DirectMessage
-            val roomName = if (isDirectMessage
-                    && fullname != null
-                    && settings.useRealName()) {
-                fullname!!
-            } else {
-                name
-            }
+            val roomName = if (settings.useSpecialCharsOnRoom() || (isDirectMessage && settings.useRealName())) {
+                    fullname ?: name
+                } else {
+                    name
+                }
 
             launchUI(strategy) {
                 val myself = getCurrentUser()

app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsAdapter.kt

@@ -18,6 +18,7 @@ import chat.rocket.android.infrastructure.checkIfMyself
 import chat.rocket.android.server.domain.PublicSettings
 import chat.rocket.android.server.domain.showLastMessage
 import chat.rocket.android.server.domain.useRealName
+import chat.rocket.android.server.domain.useSpecialCharsOnRoom
 import chat.rocket.android.util.extensions.*
 import chat.rocket.common.model.RoomType
 import chat.rocket.core.model.ChatRoom
@@ -123,7 +124,7 @@ class ChatRoomsAdapter(
         }
 
         private fun chatRoomName(chatRoom: ChatRoom): String {
-            return if (settings.useRealName()) {
+            return if (settings.useSpecialCharsOnRoom() || settings.useRealName()) {
                 chatRoom.fullName ?: chatRoom.name
             } else {
                 chatRoom.name

app/src/main/java/chat/rocket/android/helper/MessageHelper.kt

@@ -3,6 +3,7 @@ package chat.rocket.android.helper
 import chat.rocket.android.server.domain.GetCurrentServerInteractor
 import chat.rocket.android.server.domain.GetSettingsInteractor
 import chat.rocket.android.server.domain.PublicSettings
+import chat.rocket.android.server.domain.useSpecialCharsOnRoom
 import chat.rocket.android.server.domain.useRealName
 import chat.rocket.common.model.RoomType
 import chat.rocket.core.model.ChatRoom
@@ -24,7 +25,11 @@ class MessageHelper @Inject constructor(
             is RoomType.LiveChat -> "livechat"
             else -> "custom"
         }
-        val name = if (settings.useRealName()) chatRoom.fullName ?: chatRoom.name else chatRoom.name
+        val name = if (settings.useSpecialCharsOnRoom() || settings.useRealName()) {
+            chatRoom.fullName ?: chatRoom.name
+        } else {
+            chatRoom.name
+        }
         return "[ ]($currentServer/$type/$name?msg=${message.id}) "
     }
 

app/src/main/java/chat/rocket/android/server/domain/SettingsRepository.kt

@@ -71,6 +71,7 @@ fun PublicSettings.gitlabUrl(): String? = this[ACCOUNT_GITLAB_URL]?.value as Str
 fun PublicSettings.isWordpressAuthenticationEnabled(): Boolean = this[ACCOUNT_WORDPRESS]?.value == true
 
 fun PublicSettings.useRealName(): Boolean = this[USE_REALNAME]?.value == true
+fun PublicSettings.useSpecialCharsOnRoom(): Boolean = this[ALLOW_ROOM_NAME_SPECIAL_CHARS]?.value == true
 fun PublicSettings.faviconLarge(): String? = this[FAVICON_512]?.value as String?
 fun PublicSettings.favicon(): String? = this[FAVICON_196]?.value as String?
 fun PublicSettings.wideTile(): String? = this[WIDE_TILE_310]?.value as String?

app/src/main/java/chat/rocket/android/server/infraestructure/RocketChatClientFactory.kt

 package chat.rocket.android.server.infraestructure
 
+import android.os.Build
+import chat.rocket.android.BuildConfig
+import chat.rocket.android.server.domain.TokenRepository
 import chat.rocket.common.util.PlatformLogger
 import chat.rocket.core.RocketChatClient
-import chat.rocket.android.server.domain.TokenRepository
 import okhttp3.OkHttpClient
 import timber.log.Timber
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class RocketChatClientFactory @Inject constructor(private val okHttpClient: OkHttpClient,
-                                                  private val repository: TokenRepository,
-                                                  private val logger: PlatformLogger) {
+class RocketChatClientFactory @Inject constructor(
+    private val okHttpClient: OkHttpClient,
+    private val repository: TokenRepository,
+    private val logger: PlatformLogger
+) {
     private val cache = HashMap<String, RocketChatClient>()
 
     fun create(url: String): RocketChatClient {
@@ -23,6 +27,7 @@ class RocketChatClientFactory @Inject constructor(private val okHttpClient: OkHt
         val client = RocketChatClient.create {
             httpClient = okHttpClient
             restUrl = url
+            userAgent = "RC Mobile; Android ${Build.VERSION.RELEASE}; v${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})"
             tokenRepository = repository
             platformLogger = logger
         }

app/src/main/java/chat/rocket/android/util/extensions/Ui.kt

 package chat.rocket.android.util.extensions
 
+import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Context
 import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
 import android.view.inputmethod.InputMethodManager
 import android.widget.Toast
 import androidx.annotation.LayoutRes
+import androidx.annotation.MenuRes
 import androidx.annotation.StringRes
 import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.view.SupportMenuInflater
+import androidx.appcompat.view.menu.MenuBuilder
 import androidx.fragment.app.Fragment
 import chat.rocket.android.R
 
@@ -86,4 +92,23 @@ fun Fragment.showToast(@StringRes resource: Int, duration: Int = Toast.LENGTH_SH
     showToast(getString(resource), duration)
 
 fun Fragment.showToast(message: String, duration: Int = Toast.LENGTH_SHORT) =
-    activity?.showToast(message, duration)
\ No newline at end of file
+    activity?.showToast(message, duration)
+
+@SuppressLint("RestrictedApi")
+fun Context.inflate(@MenuRes menuRes: Int): Menu {
+    val menu = MenuBuilder(this)
+    val menuInflater = SupportMenuInflater(this)
+    menuInflater.inflate(menuRes, menu)
+    return menu
+}
+
+/**
+ * Developed by Magora-Systems.com
+ * @since 2017
+ * @author Anton Vlasov - whalemare
+ */
+fun Menu.toList(): List<MenuItem> {
+    val menuItems = ArrayList<MenuItem>(this.size())
+    (0 until this.size()).mapTo(menuItems) { this.getItem(it) }
+    return menuItems
+}
\ No newline at end of file

app/src/main/res/layout/message_action_item.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="wrap_content"
+    android:background="?attr/selectableItemBackground"
+    android:paddingStart="16dp"
+    android:paddingTop="8dp"
+    android:paddingEnd="16dp"
+    android:paddingBottom="8dp">
+
+    <ImageView
+        android:id="@+id/message_action_icon"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="32dp"
+        android:layout_marginBottom="8dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/message_action_title"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:srcCompat="@drawable/ic_action_message_reply_24dp" />
+
+    <TextView
+        android:id="@+id/message_action_title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="8dp"
+        android:textSize="16sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/message_action_icon"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="Responder" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

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

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/bottomsheet_recycler_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="8dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+</LinearLayout>
\ No newline at end of file

app/src/main/res/menu/message_actions.xml

 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/action_message_reply"

build.gradle

@@ -10,7 +10,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.0-alpha18'
+        classpath 'com.android.tools.build:gradle:3.2.0-beta02'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:${versions.dokka}"
         classpath 'com.google.gms:google-services:3.2.0'

dependencies.gradle

@@ -34,7 +34,6 @@ ext {
             kotshi                : '1.0.2',
             frescoImageViewer     : '0.5.1',
             markwon               : '1.0.3',
-            sheetMenu             : '5ff79ccf14',
             aVLoadingIndicatorView: '2.1.3',
             flexbox               : '0.3.2',
 
@@ -102,12 +101,8 @@ ext {
 
             markwon               : "ru.noties:markwon:${versions.markwon}",
 
-            //sheetMenu             : "com.github.whalemare:sheetmenu:${versions.sheetMenu}",
-            sheetMenu             : "com.github.luciofm:sheetmenu:${versions.sheetMenu}",
-
             aVLoadingIndicatorView: "com.wang.avi:library:${versions.aVLoadingIndicatorView}",
 
-
             //For the wear app
             wearable              : "com.google.android.support:wearable:${versions.wear}",
             playServicesWearable  : "com.google.android.gms:play-services-wearable:${versions.playServicesWearable}",