Merge branch 'develop-2.x' into project/dependencies-update

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/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/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/values-pt-rBR/strings.xml

@@ -138,4 +138,6 @@
     <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/strings.xml

@@ -139,4 +139,6 @@
     <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