From 8b922caea49c927c6aacd323d3226e793e0b8658 Mon Sep 17 00:00:00 2001
From: Mario Danic <mario@lovelyhq.com>
Date: Thu, 28 Jun 2018 00:40:05 +0200
Subject: [PATCH] Fix a few layout bugs

Signed-off-by: Mario Danic <mario@lovelyhq.com>
---
 .../nextcloud/talk/utils/DisplayUtils.java    |   2 +-
 app/src/main/res/layout/activity_main.xml     |   5 +-
 app/src/main/res/layout/controller_chat.xml   | 134 ++++++++++--------
 .../main/res/layout/rv_item_conversation.xml  |   2 +-
 app/src/main/res/values/styles.xml            |   1 +
 5 files changed, 80 insertions(+), 64 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.java b/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.java
index 9b31cdbb7..89ce1f6c9 100644
--- a/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.java
+++ b/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.java
@@ -49,7 +49,7 @@ import java.util.regex.Pattern;
 
 public class DisplayUtils {
 
-    private static final String TAG = "DIsplayHelper";
+    private static final String TAG = "DisplayUtils";
 
     public static float convertDpToPixel(float dp, Context context) {
         Resources resources = context.getResources();
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index ef10ae505..ab114a813 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -10,12 +10,13 @@
 
     <android.support.design.widget.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:id="@+id/appBarLayout">
 
         <android.support.v7.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
+            android:layout_height="?android:attr/actionBarSize"
             android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
             />
 
diff --git a/app/src/main/res/layout/controller_chat.xml b/app/src/main/res/layout/controller_chat.xml
index 942bf6956..1b53d5cf1 100644
--- a/app/src/main/res/layout/controller_chat.xml
+++ b/app/src/main/res/layout/controller_chat.xml
@@ -19,69 +19,83 @@
   ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:app="http://schemas.android.com/apk/res-auto"
+<android.support.design.widget.CoordinatorLayout 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"
+                                                 android:orientation="vertical">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:layout_alignParentBottom="true"
+            android:id="@+id/inputLinearLayout">
+
+            <View
+                android:id="@+id/separator"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:fitsSystemWindows="true">
+                android:layout_height="1dp"
+                android:layout_marginLeft="16dp"
+                android:layout_marginRight="16dp"
+                android:background="@color/nc_light_grey"/>
 
-    <com.stfalcon.chatkit.messages.MessagesList
-        android:id="@+id/messagesListView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_above="@+id/messageInputView"
-        app:incomingDefaultBubbleColor="@color/white_two"
-        app:incomingDefaultBubblePressedColor="@color/white_two"
-        app:incomingDefaultBubbleSelectedColor="@color/colorPrimaryDark"
-        app:incomingTextColor="@color/nc_incoming_text_default"
-        app:incomingTextLinkColor="@color/nc_incoming_text_default"
-        app:incomingTextSize="@dimen/chat_text_size"
-        app:incomingTimeTextSize="12sp"
-        app:outcomingDefaultBubbleColor="@color/colorPrimary"
-        app:outcomingDefaultBubblePressedColor="@color/colorPrimary"
-        app:outcomingDefaultBubbleSelectedColor="@color/colorPrimaryDark"
-        app:outcomingTextColor="@color/nc_outcoming_text_default"
-        app:outcomingTextLinkColor="@color/nc_outcoming_text_default"
-        app:outcomingTextSize="@dimen/chat_text_size"
-        app:outcomingTimeTextColor="@color/warm_grey_four"
-        app:outcomingTimeTextSize="12sp"
-        app:textAutoLink="all"/>
+            <com.stfalcon.chatkit.messages.MessageInput
+                android:id="@+id/messageInputView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:maxLength="1000"
+                app:inputButtonDefaultBgColor="@color/colorPrimary"
+                app:inputButtonDefaultBgPressedColor="@color/colorPrimaryDark"
+                app:inputButtonHeight="30dp"
+                app:inputButtonMargin="16dp"
+                app:inputButtonWidth="30dp"
+                app:inputHint="@string/nc_hint_enter_a_message"
+                app:inputTextColor="@color/black"
+                app:inputTextSize="16sp"/>
+        </LinearLayout>
 
-    <com.webianks.library.PopupBubble
-        android:id="@+id/popupBubbleView"
-        android:layout_margin="16dp"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_above="@+id/separator"
-        android:layout_centerHorizontal="true"
-        android:paddingEnd="8dp"
-        app:pb_backgroundColor="@color/colorPrimary"
-        app:pb_icon="@drawable/ic_baseline_arrow_downward_24px"
-        app:pb_text="@string/nc_new_messages"
-        app:pb_textColor="@color/white"/>
+        <com.stfalcon.chatkit.messages.MessagesList
+            android:id="@+id/messagesListView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_above="@id/inputLinearLayout"
+            app:incomingDefaultBubbleColor="@color/white_two"
+            app:incomingDefaultBubblePressedColor="@color/white_two"
+            app:incomingDefaultBubbleSelectedColor="@color/colorPrimaryDark"
+            app:incomingTextColor="@color/nc_incoming_text_default"
+            app:incomingTextLinkColor="@color/nc_incoming_text_default"
+            app:incomingTextSize="@dimen/chat_text_size"
+            app:incomingTimeTextSize="12sp"
+            app:outcomingDefaultBubbleColor="@color/colorPrimary"
+            app:outcomingDefaultBubblePressedColor="@color/colorPrimary"
+            app:outcomingDefaultBubbleSelectedColor="@color/colorPrimaryDark"
+            app:outcomingTextColor="@color/nc_outcoming_text_default"
+            app:outcomingTextLinkColor="@color/nc_outcoming_text_default"
+            app:outcomingTextSize="@dimen/chat_text_size"
+            app:outcomingTimeTextColor="@color/warm_grey_four"
+            app:outcomingTimeTextSize="12sp"
+            app:textAutoLink="all"/>
 
-    <View
-        android:id="@+id/separator"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_above="@+id/messageInputView"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
-        android:background="@color/nc_light_grey"/>
+        <com.webianks.library.PopupBubble
+            android:id="@+id/popupBubbleView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="top|center_horizontal"
+            android:layout_margin="16dp"
+            android:paddingEnd="8dp"
+            app:pb_backgroundColor="@color/colorPrimary"
+            app:pb_icon="@drawable/ic_baseline_arrow_downward_24px"
+            app:pb_text="@string/nc_new_messages"
+            android:layout_above="@id/inputLinearLayout"
+            android:layout_centerHorizontal="true"
+            app:pb_textColor="@color/white"/>
 
-    <com.stfalcon.chatkit.messages.MessageInput
-        android:id="@+id/messageInputView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:maxLength="1000"
-        app:inputButtonDefaultBgColor="@color/colorPrimary"
-        app:inputButtonDefaultBgPressedColor="@color/colorPrimaryDark"
-        app:inputButtonHeight="30dp"
-        app:inputButtonMargin="16dp"
-        app:inputButtonWidth="30dp"
-        app:inputHint="@string/nc_hint_enter_a_message"
-        app:inputTextColor="@color/black"
-        app:inputTextSize="16sp"/>
+    </RelativeLayout>
 
-</RelativeLayout>
+
+</android.support.design.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/rv_item_conversation.xml b/app/src/main/res/layout/rv_item_conversation.xml
index 0477c5c93..bb552ec90 100644
--- a/app/src/main/res/layout/rv_item_conversation.xml
+++ b/app/src/main/res/layout/rv_item_conversation.xml
@@ -66,7 +66,7 @@
         android:layout_toStartOf="@+id/more_menu"
         android:orientation="vertical">
 
-        <TextView
+        <com.kevalpatel2106.emoticongifkeyboard.widget.EmoticonTextView
             android:id="@+id/name_text"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index ff29343b5..3af6112fd 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -6,6 +6,7 @@
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorPrimary</item>
+        <item name="coordinatorLayoutStyle">@style/Widget.Design.CoordinatorLayout</item>
     </style>
 
 </resources>