Merge pull request #3 from RocketChat/develop-2.x

merge

.circleci/config.yml

+version: 2
+jobs:
+  build-kotlin-sdk:
+    docker:
+      - image: circleci/android:api-27-alpha
+    environment:
+      JVM_OPTS: -Xmx3200m
+    steps:
+      - checkout
+      - run:
+          name: checkout Rocket.Chat.Kotlin.SDK
+          command: git clone https://github.com/RocketChat/Rocket.Chat.Kotlin.SDK.git ../Rocket.Chat.Kotlin.SDK
+      - run:
+          name: ANDROID_HOME
+          command: echo "sdk.dir="$ANDROID_HOME > local.properties 
+      - run:
+          name: Build Kotlin.SDK
+          command: pushd app/ ; ./build-sdk.sh ; popd
+      - save_cache:
+          paths:
+            - ~/.gradle
+          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}-{{ checksum "player/build.gradle" }}
+      - save_cache:
+          paths:
+            - app/libs/
+            - ../Rocket.Chat.Kotlin.SDK/.last_commit_hash
+          key: kotlin-sdk-{{ .Revision }}
+      - store_artifacts:
+          path: app/libs/
+          destination: libs
+  code-analysis:
+    docker:
+      - image: circleci/android:api-27-alpha
+    environment:
+      JVM_OPTS: -Xmx3200m
+    steps:
+      - checkout
+      - run:
+          name: ANDROID_HOME
+          command: echo "sdk.dir="$ANDROID_HOME > local.properties 
+      - run:
+          name: checkout Rocket.Chat.Kotlin.SDK
+          command: git clone https://github.com/RocketChat/Rocket.Chat.Kotlin.SDK.git ../Rocket.Chat.Kotlin.SDK
+      - restore_cache:
+          key: kotlin-sdk-{{ .Revision }}
+      - restore_cache:
+          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}-{{ checksum "player/build.gradle" }}
+      - run:
+          name: Download Dependencies
+          command: ./gradlew androidDependencies --quiet --console=plain
+      - save_cache:
+          paths:
+            - ~/.gradle
+          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}-{{ checksum "player/build.gradle" }}
+      - run:
+          name: Run Lint #, Checkstyles, PMD, Findbugs...
+          command: ./gradlew lint
+      - run:
+          name: Run Unit test
+          command: echo ./gradlew test # TODO: Fix unit test errors soon...
+      - store_artifacts:
+          path: app/build/reports/
+          destination: reports
+  build-apk:
+    docker:
+      - image: circleci/android:api-27-alpha
+    environment:
+      JVM_OPTS: -Xmx3200m
+    steps:
+      - checkout
+      - run:
+          name: restore files from ENV
+          command: |
+            echo $ROCKET_JKS_BASE64 | base64 --decode > Rocket.jks
+            echo $ROCKET_PLAY_JSON | base64 --decode > app/rocket-chat.json
+      - run:
+          name: checkout Rocket.Chat.Kotlin.SDK
+          command: git clone https://github.com/RocketChat/Rocket.Chat.Kotlin.SDK.git ../Rocket.Chat.Kotlin.SDK
+      - restore_cache:
+          key: kotlin-sdk-{{ .Revision }}
+      - restore_cache:
+          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}-{{ checksum "player/build.gradle" }}
+      - run:
+          name: Download Dependencies
+          command: ./gradlew androidDependencies --quiet --console=plain
+      - save_cache:
+          paths:
+            - ~/.gradle
+          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}-{{ checksum "player/build.gradle" }}
+      - run:
+          name: Build APK
+          command: |
+            ./gradlew assembleRelease --quiet --console=plain --stacktrace
+      - store_artifacts:
+          path: app/build/outputs/apk
+          destination: apks
+
+workflows:
+  version: 2
+  build-deploy:
+    jobs:
+      - build-kotlin-sdk
+      - code-analysis:
+          requires:
+            - build-kotlin-sdk
+          filters:
+            branches:
+              ignore: # skip on merge commits.
+                - develop
+                - develop-2.x
+                - master
+      - build-apk:
+          requires:
+            - build-kotlin-sdk

app/build.gradle

@@ -110,6 +110,8 @@ dependencies {
     androidTestImplementation(libraries.expressoCore, {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
+
+    implementation 'com.android.support:customtabs:27.0.2'
 }
 
 kotlin {

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

+package chat.rocket.android.chatroom.adapter
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import chat.rocket.android.R
+import chat.rocket.android.chatroom.adapter.CommandSuggestionsAdapter.CommandSuggestionsViewHolder
+import chat.rocket.android.chatroom.viewmodel.suggestion.CommandSuggestionViewModel
+import chat.rocket.android.widget.autocompletion.model.SuggestionModel
+import chat.rocket.android.widget.autocompletion.ui.BaseSuggestionViewHolder
+import chat.rocket.android.widget.autocompletion.ui.SuggestionsAdapter
+
+class CommandSuggestionsAdapter : SuggestionsAdapter<CommandSuggestionsViewHolder>(token = "/",
+        constraint = CONSTRAINT_BOUND_TO_START, threshold = UNLIMITED_RESULT_COUNT) {
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): CommandSuggestionsViewHolder {
+        val view = LayoutInflater.from(parent.context).inflate(R.layout.suggestion_command_item, parent,
+                false)
+        return CommandSuggestionsViewHolder(view)
+    }
+
+    class CommandSuggestionsViewHolder(view: View) : BaseSuggestionViewHolder(view) {
+
+        override fun bind(item: SuggestionModel, itemClickListener: SuggestionsAdapter.ItemClickListener?) {
+            item as CommandSuggestionViewModel
+            with(itemView) {
+                val nameTextView = itemView.findViewById<TextView>(R.id.text_command_name)
+                val descriptionTextView = itemView.findViewById<TextView>(R.id.text_command_description)
+                nameTextView.text = "/${item.text}"
+                val res = context.resources
+                val id = res.getIdentifier(item.description, "string", context.packageName)
+                val description = if (id > 0) res.getString(id) else ""
+                descriptionTextView.text = description.toLowerCase()
+                setOnClickListener {
+                    itemClickListener?.onClick(item)
+                }
+            }
+        }
+    }
+}
\ No newline at end of file

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

@@ -8,7 +8,7 @@ import android.widget.ImageView
 import android.widget.TextView
 import chat.rocket.android.R
 import chat.rocket.android.chatroom.adapter.PeopleSuggestionsAdapter.PeopleSuggestionViewHolder
-import chat.rocket.android.chatroom.viewmodel.PeopleViewModel
+import chat.rocket.android.chatroom.viewmodel.suggestion.PeopleSuggestionViewModel
 import chat.rocket.android.util.extensions.setVisible
 import chat.rocket.android.widget.autocompletion.model.SuggestionModel
 import chat.rocket.android.widget.autocompletion.ui.BaseSuggestionViewHolder
@@ -26,7 +26,7 @@ class PeopleSuggestionsAdapter : SuggestionsAdapter<PeopleSuggestionViewHolder>(
     class PeopleSuggestionViewHolder(view: View) : BaseSuggestionViewHolder(view) {
 
         override fun bind(item: SuggestionModel, itemClickListener: SuggestionsAdapter.ItemClickListener?) {
-            item as PeopleViewModel
+            item as PeopleSuggestionViewModel
             with(itemView) {
                 val username = itemView.findViewById<TextView>(R.id.text_username)
                 val name = itemView.findViewById<TextView>(R.id.text_name)

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

@@ -6,7 +6,7 @@ import android.view.ViewGroup
 import android.widget.TextView
 import chat.rocket.android.R
 import chat.rocket.android.chatroom.adapter.RoomSuggestionsAdapter.RoomSuggestionsViewHolder
-import chat.rocket.android.chatroom.viewmodel.ChatRoomViewModel
+import chat.rocket.android.chatroom.viewmodel.suggestion.ChatRoomSuggestionViewModel
 import chat.rocket.android.widget.autocompletion.model.SuggestionModel
 import chat.rocket.android.widget.autocompletion.ui.BaseSuggestionViewHolder
 import chat.rocket.android.widget.autocompletion.ui.SuggestionsAdapter
@@ -22,7 +22,7 @@ class RoomSuggestionsAdapter : SuggestionsAdapter<RoomSuggestionsViewHolder>("#"
     class RoomSuggestionsViewHolder(view: View) : BaseSuggestionViewHolder(view) {
 
         override fun bind(item: SuggestionModel, itemClickListener: SuggestionsAdapter.ItemClickListener?) {
-            item as ChatRoomViewModel
+            item as ChatRoomSuggestionViewModel
             with(itemView) {
                 val fullname = itemView.findViewById<TextView>(R.id.text_fullname)
                 val name = itemView.findViewById<TextView>(R.id.text_name)

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

@@ -2,8 +2,9 @@ package chat.rocket.android.chatroom.presentation
 
 import android.net.Uri
 import chat.rocket.android.chatroom.viewmodel.BaseViewModel
-import chat.rocket.android.chatroom.viewmodel.ChatRoomViewModel
-import chat.rocket.android.chatroom.viewmodel.PeopleViewModel
+import chat.rocket.android.chatroom.viewmodel.suggestion.ChatRoomSuggestionViewModel
+import chat.rocket.android.chatroom.viewmodel.suggestion.CommandSuggestionViewModel
+import chat.rocket.android.chatroom.viewmodel.suggestion.PeopleSuggestionViewModel
 import chat.rocket.android.core.behaviours.LoadingView
 import chat.rocket.android.core.behaviours.MessageView
 import chat.rocket.core.internal.realtime.State
@@ -102,12 +103,19 @@ interface ChatRoomView : LoadingView, MessageView {
     fun showInvalidFileSize(fileSize: Int, maxFileSize: Int)
 
     fun showConnectionState(state: State)
-    fun populateMembers(members: List<PeopleViewModel>)
-    fun populateRooms(chatRooms: List<ChatRoomViewModel>)
+    fun populatePeopleSuggestions(members: List<PeopleSuggestionViewModel>)
+    fun populateRoomSuggestions(chatRooms: List<ChatRoomSuggestionViewModel>)
     /**
      * This user has joined the chat callback.
      */
     fun onJoined()
 
     fun showReactionsPopup(messageId: String)
+
+    /**
+     * Show list of commands.
+     *
+     * @param commands The list of available commands.
+     */
+    fun populateCommandSuggestions(commands: List<CommandSuggestionViewModel>)
 }
\ No newline at end of file

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

@@ -86,9 +86,11 @@ class ChatRoomActivity : AppCompatActivity(), HasSupportFragmentInjector {
 
         isChatRoomSubscribed = intent.getBooleanExtra(INTENT_CHAT_IS_SUBSCRIBED, true)
 
-        addFragment("ChatRoomFragment", R.id.fragment_container) {
-            newInstance(chatRoomId, chatRoomName, chatRoomType, isChatRoomReadOnly, chatRoomLastSeen,
-                    isChatRoomSubscribed)
+        if (supportFragmentManager.findFragmentByTag("ChatRoomFragment") == null) {
+            addFragment("ChatRoomFragment", R.id.fragment_container) {
+                newInstance(chatRoomId, chatRoomName, chatRoomType, isChatRoomReadOnly, chatRoomLastSeen,
+                        isChatRoomSubscribed)
+            }
         }
     }
 

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

@@ -15,16 +15,14 @@ import android.support.v7.widget.LinearLayoutManager
 import android.support.v7.widget.RecyclerView
 import android.view.*
 import chat.rocket.android.R
-import chat.rocket.android.chatroom.adapter.ChatRoomAdapter
-import chat.rocket.android.chatroom.adapter.PEOPLE
-import chat.rocket.android.chatroom.adapter.PeopleSuggestionsAdapter
-import chat.rocket.android.chatroom.adapter.RoomSuggestionsAdapter
+import chat.rocket.android.chatroom.adapter.*
 import chat.rocket.android.chatroom.presentation.ChatRoomPresenter
 import chat.rocket.android.chatroom.presentation.ChatRoomView
 import chat.rocket.android.chatroom.viewmodel.BaseViewModel
-import chat.rocket.android.chatroom.viewmodel.ChatRoomViewModel
 import chat.rocket.android.chatroom.viewmodel.MessageViewModel
-import chat.rocket.android.chatroom.viewmodel.PeopleViewModel
+import chat.rocket.android.chatroom.viewmodel.suggestion.ChatRoomSuggestionViewModel
+import chat.rocket.android.chatroom.viewmodel.suggestion.CommandSuggestionViewModel
+import chat.rocket.android.chatroom.viewmodel.suggestion.PeopleSuggestionViewModel
 import chat.rocket.android.helper.EndlessRecyclerViewScrollListener
 import chat.rocket.android.helper.KeyboardHelper
 import chat.rocket.android.helper.MessageParser
@@ -133,6 +131,11 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
         presenter.unsubscribeMessages(chatRoomId)
         handler.removeCallbacksAndMessages(null)
         unsubscribeTextMessage()
+
+        // Hides the keyboard (if it's opened) before going to any view.
+        activity?.apply {
+            hideKeyboard()
+        }
         super.onDestroyView()
     }
 
@@ -218,7 +221,11 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
 
     override fun sendMessage(text: String) {
         if (!text.isBlank()) {
-            presenter.sendMessage(chatRoomId, text, editingMessageId)
+            if (!text.startsWith("/")) {
+                presenter.sendMessage(chatRoomId, text, editingMessageId)
+            } else {
+                presenter.runCommand(text, chatRoomId)
+            }
         }
     }
 
@@ -287,14 +294,18 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
 
     override fun showGenericErrorMessage() = showMessage(getString(R.string.msg_generic_error))
 
-    override fun populateMembers(members: List<PeopleViewModel>) {
+    override fun populatePeopleSuggestions(members: List<PeopleSuggestionViewModel>) {
         suggestions_view.addItems("@", members)
     }
 
-    override fun populateRooms(chatRooms: List<ChatRoomViewModel>) {
+    override fun populateRoomSuggestions(chatRooms: List<ChatRoomSuggestionViewModel>) {
         suggestions_view.addItems("#", chatRooms)
     }
 
+    override fun populateCommandSuggestions(commands: List<CommandSuggestionViewModel>) {
+        suggestions_view.addItems("/", commands)
+    }
+
     override fun copyToClipboard(message: String) {
         activity?.apply {
             val clipboard = getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
@@ -492,9 +503,11 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
     }
 
     private fun setupSuggestionsView() {
-        suggestions_view.anchor(text_message)
-                .bindTokenAdapter(PeopleSuggestionsAdapter())
-                .bindTokenAdapter(RoomSuggestionsAdapter())
+        suggestions_view.anchorTo(text_message)
+                .setMaximumHeight(resources.getDimensionPixelSize(R.dimen.suggestions_box_max_height))
+                .addTokenAdapter(PeopleSuggestionsAdapter())
+                .addTokenAdapter(CommandSuggestionsAdapter())
+                .addTokenAdapter(RoomSuggestionsAdapter())
                 .addSuggestionProviderAction("@") { query ->
                     if (query.isNotEmpty()) {
                         presenter.spotlight(query, PEOPLE, true)
@@ -505,6 +518,11 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
                         presenter.loadChatRooms()
                     }
                 }
+                .addSuggestionProviderAction("/") { _ ->
+                    presenter.loadCommands()
+                }
+
+        presenter.loadCommands()
     }
 
     private fun openEmojiKeyboardPopup() {

app/src/main/java/chat/rocket/android/chatroom/viewmodel/ChatRoomViewModel.kt

-package chat.rocket.android.chatroom.viewmodel
-
-import chat.rocket.android.widget.autocompletion.model.SuggestionModel
-
-class ChatRoomViewModel(text: String,
-                        val fullName: String,
-                        val name: String,
-                        searchList: List<String>) : SuggestionModel(text, searchList, false) {
-}
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatroom/viewmodel/PeopleViewModel.kt

-package chat.rocket.android.chatroom.viewmodel
-
-import chat.rocket.android.widget.autocompletion.model.SuggestionModel
-import chat.rocket.common.model.UserStatus
-
-class PeopleViewModel(val imageUri: String,
-                      text: String,
-                      val username: String,
-                      val name: String,
-                      val status: UserStatus?,
-                      pinned: Boolean = false,
-                      searchList: List<String>) : SuggestionModel(text, searchList, pinned) {
-
-    override fun toString(): String {
-        return "PeopleViewModel(imageUri='$imageUri', username='$username', name='$name', status=$status, pinned=$pinned)"
-    }
-}
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatroom/viewmodel/suggestion/ChatRoomSuggestionViewModel.kt

+package chat.rocket.android.chatroom.viewmodel.suggestion
+
+import chat.rocket.android.widget.autocompletion.model.SuggestionModel
+
+class ChatRoomSuggestionViewModel(text: String,
+                                  val fullName: String,
+                                  val name: String,
+                                  searchList: List<String>) : SuggestionModel(text, searchList, false) {
+}
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatroom/viewmodel/suggestion/CommandSuggestionViewModel.kt

+package chat.rocket.android.chatroom.viewmodel.suggestion
+
+import chat.rocket.android.widget.autocompletion.model.SuggestionModel
+
+class CommandSuggestionViewModel(text: String,
+                                 val description: String,
+                                 searchList: List<String>) : SuggestionModel(text, searchList)
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatroom/viewmodel/suggestion/PeopleSuggestionViewModel.kt

+package chat.rocket.android.chatroom.viewmodel.suggestion
+
+import chat.rocket.android.widget.autocompletion.model.SuggestionModel
+import chat.rocket.common.model.UserStatus
+
+class PeopleSuggestionViewModel(val imageUri: String,
+                                text: String,
+                                val username: String,
+                                val name: String,
+                                val status: UserStatus?,
+                                pinned: Boolean = false,
+                                searchList: List<String>) : SuggestionModel(text, searchList, pinned) {
+
+    override fun toString(): String {
+        return "PeopleSuggestionViewModel(imageUri='$imageUri', username='$username', name='$name', status=$status, pinned=$pinned)"
+    }
+}
\ No newline at end of file

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

@@ -73,6 +73,7 @@ class ChatRoomsFragment : Fragment(), ChatRoomsView {
 
         val searchItem = menu.findItem(R.id.action_search)
         searchView = searchItem?.actionView as SearchView
+        searchView?.maxWidth = Integer.MAX_VALUE
         searchView?.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
             override fun onQueryTextSubmit(query: String?): Boolean {
                 return queryChatRoomsByName(query)

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

@@ -7,6 +7,7 @@ import android.content.Intent
 import android.graphics.*
 import android.graphics.drawable.Drawable
 import android.net.Uri
+import android.support.customtabs.CustomTabsIntent
 import android.provider.Browser
 import android.support.v4.content.ContextCompat
 import android.support.v4.content.res.ResourcesCompat
@@ -171,16 +172,12 @@ class MessageParser @Inject constructor(val context: Application, private val co
                 if (!link.startsWith("@") && link !in consumed) {
                     builder.setSpan(object : ClickableSpan() {
                         override fun onClick(view: View) {
-                            val uri = getUri(link)
-                            val context = view.context
-                            val intent = Intent(Intent.ACTION_VIEW, uri)
-                            intent.putExtra(Browser.EXTRA_APPLICATION_ID, context.packageName)
-                            try {
-                                context.startActivity(intent)
-                            } catch (e: ActivityNotFoundException) {
-                                Timber.e("Actvity was not found for intent, $intent")
+                            with (view) {
+                                val tabsbuilder = CustomTabsIntent.Builder()
+                                tabsbuilder.setToolbarColor(ResourcesCompat.getColor(context.resources, R.color.colorPrimary, context.theme))
+                                val customTabsIntent = tabsbuilder.build()
+                                customTabsIntent.launchUrl(context, getUri(link))
                             }
-
                         }
                     }, matcher.start(0), matcher.end(0))
                     consumed.add(link)

app/src/main/java/chat/rocket/android/members/ui/MembersFragment.kt

@@ -15,7 +15,6 @@ import chat.rocket.android.members.adapter.MembersAdapter
 import chat.rocket.android.members.presentation.MembersPresenter
 import chat.rocket.android.members.presentation.MembersView
 import chat.rocket.android.members.viewmodel.MemberViewModel
-import chat.rocket.android.util.extensions.hideKeyboard
 import chat.rocket.android.util.extensions.inflate
 import chat.rocket.android.util.extensions.setVisible
 import chat.rocket.android.util.extensions.showToast
@@ -23,9 +22,6 @@ import chat.rocket.android.widget.DividerItemDecoration
 import dagger.android.support.AndroidSupportInjection
 import kotlinx.android.synthetic.main.fragment_members.*
 import javax.inject.Inject
-import android.view.inputmethod.InputMethodManager.HIDE_IMPLICIT_ONLY
-import android.app.Activity
-import android.view.inputmethod.InputMethodManager
 
 
 fun newInstance(chatRoomId: String, chatRoomType: String): Fragment {
@@ -65,8 +61,6 @@ class MembersFragment : Fragment(), MembersView {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        val imm = activity?.getSystemService(Activity.INPUT_METHOD_SERVICE) as InputMethodManager
-        imm.toggleSoftInput(InputMethodManager.HIDE_IMPLICIT_ONLY, 0)
 
         (activity as AppCompatActivity).supportActionBar?.title = ""
 

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

@@ -46,8 +46,10 @@ fun AppCompatActivity.addFragmentBackStack(tag: String, layoutId: Int, newInstan
 }
 
 fun Activity.hideKeyboard() {
-    val imm = getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
-    imm.hideSoftInputFromWindow(currentFocus.windowToken, InputMethodManager.RESULT_UNCHANGED_SHOWN)
+    if (currentFocus != null) {
+        val imm = getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+        imm.hideSoftInputFromWindow(currentFocus.windowToken, InputMethodManager.RESULT_UNCHANGED_SHOWN)
+    }
 }
 
 fun Activity.showToast(@StringRes resource: Int, duration: Int = Toast.LENGTH_SHORT) = showToast(getString(resource), duration)

app/src/main/java/chat/rocket/android/widget/autocompletion/strategy/regex/StringMatchingCompletionStrategy.kt

@@ -2,24 +2,25 @@ package chat.rocket.android.widget.autocompletion.strategy.regex
 
 import chat.rocket.android.widget.autocompletion.model.SuggestionModel
 import chat.rocket.android.widget.autocompletion.strategy.CompletionStrategy
+import chat.rocket.android.widget.autocompletion.ui.SuggestionsAdapter
 import java.util.concurrent.CopyOnWriteArrayList
 
-internal class StringMatchingCompletionStrategy : CompletionStrategy {
+internal class StringMatchingCompletionStrategy(private val threshold: Int = -1) : CompletionStrategy {
     private val list = CopyOnWriteArrayList<SuggestionModel>()
 
     override fun autocompleteItems(prefix: String): List<SuggestionModel> {
-        return list.filter {
+        val result = list.filter {
             it.searchList.forEach { word ->
                 if (word.contains(prefix, ignoreCase = true)) {
                     return@filter true
                 }
             }
             false
-        }.sortedByDescending { it.pinned }.take(5)
+        }.sortedByDescending { it.pinned }
+        return if (threshold == SuggestionsAdapter.UNLIMITED_RESULT_COUNT) result else result.take(threshold)
     }
 
     override fun addAll(list: List<SuggestionModel>) {
-//        this.list.removeAll { !it.pinned }
         this.list.addAllAbsent(list)
     }
 

app/src/main/java/chat/rocket/android/widget/autocompletion/ui/SuggestionsAdapter.kt

@@ -7,14 +7,32 @@ import chat.rocket.android.widget.autocompletion.strategy.regex.StringMatchingCo
 import java.lang.reflect.Type
 import kotlin.properties.Delegates
 
-abstract class SuggestionsAdapter<VH : BaseSuggestionViewHolder>(val token: String) : RecyclerView.Adapter<VH>() {
-    private val strategy: CompletionStrategy = StringMatchingCompletionStrategy()
+abstract class SuggestionsAdapter<VH : BaseSuggestionViewHolder>(
+        val token: String,
+        val constraint: Int = CONSTRAINT_UNBOUND,
+        threshold: Int  = MAX_RESULT_COUNT) : RecyclerView.Adapter<VH>() {
+    companion object {
+        // Any number of results.
+        const val UNLIMITED_RESULT_COUNT = -1
+        // Trigger suggestions only if on the line start.
+        const val CONSTRAINT_BOUND_TO_START = 0
+        // Trigger suggestions from anywhere.
+        const val CONSTRAINT_UNBOUND = 1
+        // Maximum number of results to display by default.
+        private const val MAX_RESULT_COUNT = 5
+    }
     private var itemType: Type? = null
     private var itemClickListener: ItemClickListener? = null
+    // Called to gather results when no results have previously matched.
     private var providerExternal: ((query: String) -> Unit)? = null
-    private var prefix: String by Delegates.observable("", { _, _, _ ->
-        strategy.autocompleteItems(prefix)
-        notifyItemRangeChanged(0, 5)
+    // Maximum number of results/suggestions to display.
+    private var resultsThreshold: Int = if (threshold > 0) threshold else UNLIMITED_RESULT_COUNT
+    // The strategy used for suggesting completions.
+    private val strategy: CompletionStrategy = StringMatchingCompletionStrategy(resultsThreshold)
+    // Current input term to look up for suggestions.
+    private var currentTerm: String by Delegates.observable("", { _, _, newTerm ->
+        val items = strategy.autocompleteItems(newTerm)
+        notifyDataSetChanged()
     })
 
     init {
@@ -29,21 +47,21 @@ abstract class SuggestionsAdapter<VH : BaseSuggestionViewHolder>(val token: Stri
         holder.bind(getItem(position), itemClickListener)
     }
 
-    override fun getItemCount() = strategy.autocompleteItems(prefix).size
+    override fun getItemCount() = strategy.autocompleteItems(currentTerm).size
 
     private fun getItem(position: Int): SuggestionModel {
-        return strategy.autocompleteItems(prefix)[position]
+        return strategy.autocompleteItems(currentTerm)[position]
     }
 
-    fun autocomplete(prefix: String) {
-        this.prefix = prefix.toLowerCase().trim()
+    fun autocomplete(newTerm: String) {
+        this.currentTerm = newTerm.toLowerCase().trim()
     }
 
     fun addItems(list: List<SuggestionModel>) {
         strategy.addAll(list)
         // Since we've just added new items we should check for possible new completion suggestions.
-        strategy.autocompleteItems(prefix)
-        notifyItemRangeChanged(0, 5)
+        strategy.autocompleteItems(currentTerm)
+        notifyDataSetChanged()
     }
 
     fun setOnClickListener(clickListener: ItemClickListener) {
@@ -52,11 +70,24 @@ abstract class SuggestionsAdapter<VH : BaseSuggestionViewHolder>(val token: Stri
 
     fun hasItemClickListener() = itemClickListener != null
 
-    fun prefix() = prefix
+    /**
+     * Return the current searched term.
+     */
+    fun term() = this.currentTerm
+
+    /**
+     * Set the maximum number of results to show.
+     *
+     * @param threshold The maximum number of suggestions to display.
+     */
+    fun setResultsThreshold(threshold: Int) {
+        check(threshold > 0)
+        resultsThreshold = threshold
+    }
 
     fun cancel() {
         strategy.addAll(emptyList())
-        strategy.autocompleteItems(prefix)
+        strategy.autocompleteItems(currentTerm)
         notifyDataSetChanged()
     }
 

app/src/main/java/chat/rocket/android/widget/autocompletion/ui/SuggestionsView.kt

@@ -21,7 +21,9 @@ import android.widget.EditText
 import android.widget.FrameLayout
 import chat.rocket.android.R
 import chat.rocket.android.widget.autocompletion.model.SuggestionModel
+import chat.rocket.android.widget.autocompletion.ui.SuggestionsAdapter.Companion.CONSTRAINT_BOUND_TO_START
 import java.lang.ref.WeakReference
+import java.util.concurrent.CopyOnWriteArrayList
 import java.util.concurrent.atomic.AtomicInteger
 
 /**
@@ -31,12 +33,14 @@ private const val NO_STATE_INDEX = 0
 
 class SuggestionsView : FrameLayout, TextWatcher {
     private val recyclerView: RecyclerView
+    private val registeredTokens = CopyOnWriteArrayList<String>()
     // Maps tokens to their respective adapters.
     private val adaptersByToken = hashMapOf<String, SuggestionsAdapter<out BaseSuggestionViewHolder>>()
     private val externalProvidersByToken = hashMapOf<String, ((query: String) -> Unit)>()
     private val localProvidersByToken = hashMapOf<String, HashMap<String, List<SuggestionModel>>>()
     private var editor: WeakReference<EditText>? = null
     private var completionStartIndex = AtomicInteger(NO_STATE_INDEX)
+    private var maxHeight: Int = 0
 
     companion object {
         private val SLIDE_TRANSITION = Slide(Gravity.BOTTOM).setDuration(200)
@@ -75,6 +79,10 @@ class SuggestionsView : FrameLayout, TextWatcher {
 
         val new = s.subSequence(start, start + count).toString()
         if (adaptersByToken.containsKey(new)) {
+            val constraint = adapter(new).constraint
+            if (constraint == CONSTRAINT_BOUND_TO_START && start != 0) {
+                return
+            }
             swapAdapter(getAdapterForToken(new)!!)
             completionStartIndex.compareAndSet(NO_STATE_INDEX, start + 1)
             editor?.let {
@@ -110,9 +118,18 @@ class SuggestionsView : FrameLayout, TextWatcher {
         }
     }
 
+    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
+        if (maxHeight > 0) {
+            val hSpec = MeasureSpec.makeMeasureSpec(maxHeight, MeasureSpec.AT_MOST)
+            super.onMeasure(widthMeasureSpec, hSpec)
+        } else {
+            super.onMeasure(widthMeasureSpec, heightMeasureSpec)
+        }
+    }
+
     private fun swapAdapter(adapter: SuggestionsAdapter<*>): SuggestionsView {
         recyclerView.adapter = adapter
-        // Don't override if user set an item click listener already/
+        // Don't override if user has set an item click listener already
         if (!adapter.hasItemClickListener()) {
             setOnItemClickListener(adapter) {
                 // set default item click behavior
@@ -121,16 +138,16 @@ class SuggestionsView : FrameLayout, TextWatcher {
         return this
     }
 
-    fun getAdapterForToken(token: String): SuggestionsAdapter<*>? = adaptersByToken.get(token)
+    private fun getAdapterForToken(token: String): SuggestionsAdapter<*>? = adaptersByToken.get(token)
 
-    fun anchor(editText: EditText): SuggestionsView {
+    fun anchorTo(editText: EditText): SuggestionsView {
         editText.removeTextChangedListener(this)
         editText.addTextChangedListener(this)
         editor = WeakReference(editText)
         return this
     }
 
-    fun bindTokenAdapter(adapter: SuggestionsAdapter<*>): SuggestionsView {
+    fun addTokenAdapter(adapter: SuggestionsAdapter<*>): SuggestionsView {
         adaptersByToken.getOrPut(adapter.token, { adapter })
         return this
     }
@@ -139,13 +156,20 @@ class SuggestionsView : FrameLayout, TextWatcher {
         if (list.isNotEmpty()) {
             val adapter = adapter(token)
             localProvidersByToken.getOrPut(token, { hashMapOf() })
-                    .put(adapter.prefix(), list)
+                    .put(adapter.term(), list)
             if (completionStartIndex.get() > NO_STATE_INDEX && adapter.itemCount == 0) expand()
             adapter.addItems(list)
         }
         return this
     }
 
+    fun setMaximumHeight(height: Int): SuggestionsView {
+        check(height > 0)
+        this.maxHeight = height
+        requestLayout()
+        return this
+    }
+
     fun setOnItemClickListener(tokenAdapter: SuggestionsAdapter<*>,
                                clickListener: (item: SuggestionModel) -> Unit): SuggestionsView {
         tokenAdapter.setOnClickListener(object : SuggestionsAdapter.ItemClickListener {
@@ -160,6 +184,9 @@ class SuggestionsView : FrameLayout, TextWatcher {
     }
 
     fun addSuggestionProviderAction(token: String, provider: (query: String) -> Unit): SuggestionsView {
+        if (adaptersByToken[token] == null) {
+            throw IllegalStateException("token \"$token\" suggestion provider added without adapter")
+        }
         externalProvidersByToken.getOrPut(token, { provider })
         return this
     }

app/src/main/java/chat/rocket/android/widget/emoji/CategoryPagerAdapter.kt

@@ -9,6 +9,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import chat.rocket.android.R
+import chat.rocket.android.util.extensions.setVisible
 import java.util.*
 
 class CategoryPagerAdapter(val listener: EmojiKeyboardListener) : PagerAdapter() {
@@ -24,11 +25,18 @@ class CategoryPagerAdapter(val listener: EmojiKeyboardListener) : PagerAdapter()
         val recycler = view.findViewById(R.id.emojiRecyclerView) as RecyclerView
         val adapter = EmojiAdapter(layoutManager.spanCount, listener)
         val category = EmojiCategory.values().get(position)
+        val emojiNoRecentText : TextView = view.findViewById(R.id.text_no_recent_emoji)
         val emojis = if (category != EmojiCategory.RECENTS) {
             EmojiRepository.getEmojisByCategory(category)
         } else {
             EmojiRepository.getRecents()
         }
+        val recentEmojiSize = EmojiRepository.getRecents().size
+        if (category == EmojiCategory.RECENTS && recentEmojiSize == 0){
+            emojiNoRecentText.setVisible(true)
+        }else{
+            emojiNoRecentText.setVisible(false)
+        }
         adapter.addEmojis(emojis)
         recycler.layoutManager = layoutManager
         recycler.itemAnimator = DefaultItemAnimator()

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

@@ -15,4 +15,14 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <TextView
+        android:id="@+id/text_no_recent_emoji"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/msg_no_recent_emoji"
+        android:layout_gravity="center"
+        android:elevation="10dp"
+        android:textSize="16sp"
+        android:visibility="gone"/>
+
 </android.support.design.widget.CoordinatorLayout>
\ No newline at end of file

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

@@ -35,13 +35,20 @@
             android:layout_height="1dp"
             android:layout_width="0dp"
             android:layout_weight="1"
-            android:layout_marginRight="4dp"
+            android:layout_marginEnd="4dp"
             android:background="@color/red"/>
         <TextView
             android:layout_width="wrap_content"
             android:text="@string/msg_unread_messages"
             android:layout_height="wrap_content"
             android:textColor="@color/red" />
+        <View
+            android:layout_gravity="center"
+            android:layout_height="1dp"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_marginStart="4dp"
+            android:background="@color/red"/>
     </LinearLayout>
 
     <LinearLayout

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

+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginBottom="4dp"
+    android:layout_marginTop="4dp"
+    android:background="@color/suggestion_background_color"
+    android:orientation="horizontal"
+    android:paddingTop="2dp">
+
+    <TextView
+        android:id="@+id/text_command_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_marginStart="8dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textColor="@color/black"
+        android:textSize="14sp"
+        tools:text="/leave" />
+
+    <TextView
+        android:id="@+id/text_command_description"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="8dp"
+        android:layout_marginStart="16dp"
+        android:layout_toRightOf="@id/text_command_name"
+        android:ellipsize="end"
+        android:gravity="start"
+        android:maxLines="1"
+        android:textColor="@color/gray_material"
+        android:textSize="14sp"
+        tools:text="Leave a channel" />
+
+</RelativeLayout>
\ No newline at end of file

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

@@ -114,4 +114,30 @@
     <string name="status_authenticating">autenticando</string>
     <string name="status_disconnecting">desconectando</string>
     <string name="status_waiting">conectando em %d segundos</string>
+
+    <!-- Slash Commands -->
+    <string name="Slash_Gimme_Description">Exibir ༼ つ ◕_◕ ༽つ antes de sua mensagem</string>
+    <string name="Slash_LennyFace_Description">Exibir ( ͡° ͜ʖ ͡°) depois de sua mensagem</string>
+    <string name="Slash_Shrug_Description">Exibir ¯\_(ツ)_/¯ depois de sua mensagem</string>
+    <string name="Slash_Tableflip_Description">Exibir (╯°□°）╯︵ ┻━┻</string>
+    <string name="Slash_TableUnflip_Description">Exibir ┬─┬ ノ( ゜-゜ノ)</string>
+    <string name="Create_A_New_Channel">Criar um novo canal</string>
+    <string name="Show_the_keyboard_shortcut_list">Show the keyboard shortcut list</string>
+    <string name="Invite_user_to_join_channel_all_from"> do [#canal] para entrar neste</string>
+    <string name="Invite_user_to_join_channel_all_to">Convidar todos os usuários deste canal para entrar no [#canal]</string>
+    <string name="Archive">Arquivar</string>
+    <string name="Remove_someone_from_room">Remover alguém do canal</string>
+    <string name="Leave_the_current_channel">Sair do canal atual</string>
+    <string name="Displays_action_text">Exibir texto de ação</string>
+    <string name="Direct_message_someone">Enviar DM para alguém</string>
+    <string name="Mute_someone_in_room">Mutar alguém</string>
+    <string name="Unmute_someone_in_room">Desmutar alguém na sala</string>
+    <string name="Invite_user_to_join_channel">Convidar algum usuário para entrar neste canal</string>
+    <string name="Unarchive">Desarquivar</string>
+    <string name="Join_the_given_channel">Entrar no canal especificado</string>
+    <string name="Guggy_Command_Description">Gera um gif baseado no texto dado</string>
+    <string name="Slash_Topic_Description">Definir tópico</string>
+
+    <!-- Emoji message-->
+    <string name="msg_no_recent_emoji">Nenhum emoji recente</string>
 </resources>
\ No newline at end of file

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

@@ -34,5 +34,6 @@
 
     <!-- Autocomplete Popup -->
     <dimen name="popup_max_height">150dp</dimen>
+    <dimen name="suggestions_box_max_height">250dp</dimen>
 
 </resources>
\ No newline at end of file

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

@@ -116,4 +116,29 @@
     <string name="status_disconnecting">disconnecting</string>
     <string name="status_waiting">connecting in %d seconds</string>
 
+    <!-- Slash Commands -->
+    <string name="Slash_Gimme_Description">Displays ༼ つ ◕_◕ ༽つ before your message</string>
+    <string name="Slash_LennyFace_Description">Displays ( ͡° ͜ʖ ͡°) after your message</string>
+    <string name="Slash_Shrug_Description">Displays ¯\_(ツ)_/¯ after your message</string>
+    <string name="Slash_Tableflip_Description">Displays (╯°□°）╯︵ ┻━┻</string>
+    <string name="Slash_TableUnflip_Description">Displays ┬─┬ ノ( ゜-゜ノ)</string>
+    <string name="Create_A_New_Channel">Create a new channel</string>
+    <string name="Show_the_keyboard_shortcut_list">Show the keyboard shortcut list</string>
+    <string name="Invite_user_to_join_channel_all_from">Invite all users from [#channel] to join this channel</string>
+    <string name="Invite_user_to_join_channel_all_to">Invite all users from this channel to join [#channel]</string>
+    <string name="Archive">Archive</string>
+    <string name="Remove_someone_from_room">Remove someone from the room</string>
+    <string name="Leave_the_current_channel">Leave the current channel</string>
+    <string name="Displays_action_text">Displays action text</string>
+    <string name="Direct_message_someone">Direct message someone</string>
+    <string name="Mute_someone_in_room">Mute someone in the room</string>
+    <string name="Unmute_someone_in_room">Unmute someone in the room</string>
+    <string name="Invite_user_to_join_channel">Invite one user to join this channel</string>
+    <string name="Unarchive">Unarchive</string>
+    <string name="Join_the_given_channel">Join the given channel</string>
+    <string name="Guggy_Command_Description">Generates a gif based upon the provided text</string>
+    <string name="Slash_Topic_Description">Set topic</string>
+
+    <!-- Emoji message-->
+    <string name="msg_no_recent_emoji">No recent emoji</string>
 </resources>
\ No newline at end of file

circle.yml

-#
-# Build configuration for Circle CI
-#
-# See this thread for speeding up and caching directories: https://discuss.circleci.com/t/installing-android-build-tools-23-0-2/924
-#
-
-machine:
-  environment:
-    ANDROID_HOME: /usr/local/android-sdk-linux
-    GRADLE_OPTS: '-Xmx1536M -Dorg.gradle.jvmargs="-Xmx1536M -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError"'
-    JAVA_OPTS: "-Xms518m -Xmx1536M"
-  pre:
-    - git clone https://github.com/RocketChat/Rocket.Chat.Kotlin.SDK.git Rocket.Chat.Kotlin.SDK
-
-dependencies:
-  pre:
-    - sudo service mysql stop; sleep 5
-    - sudo service mongod stop; sleep 5
-    - sudo killall postgres; sleep 5
-
-    - git fetch --tags
-
-    - echo "sdk.dir="$ANDROID_HOME > local.properties
-
-    - echo $ROCKET_JKS_BASE64 | base64 --decode > Rocket.jks
-    - echo $ROCKET_PLAY_JSON | base64 --decode > app/rocket-chat.json
-
-    - mkdir -p app/src/release/res/values
-# TODO: remove the comment when using that file on the project
-#    - echo $GOOGLE_SERVICES_BASE64 | base64 --decode > app/src/release/google-services.json
-#   - echo $API_KEY_STRINGS_BASE64 | base64 --decode > app/src/release/res/values/api_key_strings.xml
-
-    - mkdir -p $ANDROID_HOME/licenses/  
-    - echo 8933bad161af4178b1185d1a37fbf41ea5269c55 >> $ANDROID_HOME/licenses/android-sdk-license
-    - echo d56f5187479451eabf01fb78af6dfcb131a6481e >> $ANDROID_HOME/licenses/android-sdk-license  
-    - echo y | android update sdk --no-ui --all --filter tools,platform-tools
-    - echo y | android update sdk --no-ui --all --filter android-27
-    - echo y | android update sdk --no-ui --all --filter extra-android-m2repository,extra-android-support
-    - echo y | android update sdk --no-ui --all --filter extra-google-m2repository,extra-google-google_play_services
-    - echo y | android update sdk --no-ui --all --filter build-tools-27.0.0
-      #- yes | sdkmanager --licenses  
-  cache_directories:
-          #- /usr/local/android-sdk-linux/tools
-          #- /usr/local/android-sdk-linux/build-tools/27.0.0
-
-test:
-  override:
-    - ./gradlew assembleRelease --stacktrace
-    - find . -name *.apk -exec mv {} $CIRCLE_ARTIFACTS/ \;
-
-deployment:
-  beta:
-    tag: /v\d+\.\d+\.\d+(?!.)/
-    owner: RocketChat
-    commands:
-      - ./gradlew publishListingRelease
-        -Dorg.gradle.project.track=beta
-  alpha:
-    tag: /v\d+\.\d+\.\d+/
-    owner: RocketChat
-    commands:
-      - ./gradlew publishListingRelease
-        -Dorg.gradle.pr oject.track=alpha

dependencies.gradle

@@ -4,14 +4,14 @@ ext {
         compileSdk        : 27,
         targetSdk         : 27,
         buildTools        : '27.0.3',
-        kotlin            : '1.2.30',
-        coroutine         : '0.22',
-        dokka             : '0.9.15',
+        kotlin            : '1.2.31',
+        coroutine         : '0.22.5',
+        dokka             : '0.9.16',
 
         // Main dependencies
         support                : '27.0.2',
         constraintLayout       : '1.0.2',
-        androidKtx             : '0.1',
+        androidKtx             : '0.2',
         dagger                 : '2.14.1',
         exoPlayer              : '2.6.0',
         playServices           : '11.8.0',
@@ -19,12 +19,12 @@ ext {
         rxKotlin               : '2.2.0',
         rxAndroid              : '2.0.2',
         moshi                  : '1.6.0-SNAPSHOT',
-        okhttp                 : '3.9.1',
+        okhttp                 : '3.10.0',
         timber                 : '4.6.1',
         threeTenABP            : '1.0.5',
         rxBinding              : '2.0.0',
         fresco                 : '1.8.1',
-        kotshi                 : '0.3.0',
+        kotshi                 : '1.0.2',
         frescoImageViewer      : '0.5.1',
         markwon                : '1.0.3',
         sheetMenu              : '1.3.3',
@@ -51,7 +51,7 @@ ext {
         cardView               : "com.android.support:cardview-v7:${versions.support}",
         flexbox                : "com.google.android:flexbox:${versions.flexbox}",
 
-        androidKtx             :  "androidx.core:core-ktx:${versions.androidKtx}",
+        androidKtx             : "androidx.core:core-ktx:${versions.androidKtx}",
 
         dagger                 : "com.google.dagger:dagger:${versions.dagger}",
         daggerSupport          : "com.google.dagger:dagger-android-support:${versions.dagger}",