Layout adjustments on commands

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

@@ -31,7 +31,7 @@ class CommandSuggestionsAdapter : SuggestionsAdapter<CommandSuggestionsViewHolde
                 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
+                descriptionTextView.text = description.toLowerCase()
                 setOnClickListener {
                     itemClickListener?.onClick(item)
                 }

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

@@ -499,6 +499,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
 
     private fun setupSuggestionsView() {
         suggestions_view.anchorTo(text_message)
+                .setMaximumHeight(resources.getDimensionPixelSize(R.dimen.suggestions_box_max_height))
                 .addTokenAdapter(PeopleSuggestionsAdapter())
                 .addTokenAdapter(CommandSuggestionsAdapter())
                 .addTokenAdapter(RoomSuggestionsAdapter())

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

@@ -40,6 +40,7 @@ class SuggestionsView : FrameLayout, TextWatcher {
     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)
@@ -117,6 +118,15 @@ 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 has set an item click listener already
@@ -153,6 +163,13 @@ class SuggestionsView : FrameLayout, TextWatcher {
         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 {

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

@@ -3,9 +3,11 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="2dp"
+    android:layout_marginBottom="4dp"
+    android:layout_marginTop="4dp"
     android:background="@color/suggestion_background_color"
-    android:orientation="horizontal">
+    android:orientation="horizontal"
+    android:paddingTop="2dp">
 
     <TextView
         android:id="@+id/text_command_name"
@@ -13,23 +15,25 @@
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
-        android:layout_marginStart="16dp"
+        android:layout_marginStart="8dp"
         android:ellipsize="end"
         android:maxLines="1"
         android:textColor="@color/black"
-        android:textSize="16sp"
+        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:gravity="end"
+        android:ellipsize="end"
+        android:gravity="start"
+        android:maxLines="1"
         android:textColor="@color/gray_material"
-        android:layout_marginEnd="16dp"
-        android:textSize="16sp"
+        android:textSize="14sp"
         tools:text="Leave a channel" />
 
 </RelativeLayout>
\ 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