From 5d19d7f0495e4bd65b6ac3c8f1f75ac93526afdf Mon Sep 17 00:00:00 2001
From: imndx <imndxx@gmail.com>
Date: Wed, 23 Oct 2019 16:32:04 +0800
Subject: [PATCH] update conversation input layout

---
 .../conversation/ConversationInputPanel.java   |  3 ++-
 .../res/layout/conversation_input_panel.xml    | 18 ++++++++++++------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/chat/kit/src/main/java/cn/wildfire/chat/kit/conversation/ConversationInputPanel.java b/chat/kit/src/main/java/cn/wildfire/chat/kit/conversation/ConversationInputPanel.java
index 46825bb3e..ed03a82dc 100644
--- a/chat/kit/src/main/java/cn/wildfire/chat/kit/conversation/ConversationInputPanel.java
+++ b/chat/kit/src/main/java/cn/wildfire/chat/kit/conversation/ConversationInputPanel.java
@@ -230,8 +230,8 @@ void onExtImageViewClick() {
             return;
         }
         if (rootLinearLayout.getCurrentInput() == extContainerFrameLayout) {
-            rootLinearLayout.showSoftkey(editText);
             hideConversationExtension();
+            rootLinearLayout.showSoftkey(editText);
         } else {
             emotionImageView.setImageResource(R.mipmap.ic_cheat_emo);
             showConversationExtension();
@@ -246,6 +246,7 @@ void onEmotionImageViewClick() {
         }
         if (rootLinearLayout.getCurrentInput() == emotionContainerFrameLayout) {
             hideEmotionLayout();
+            rootLinearLayout.showSoftkey(editText);
         } else {
             hideAudioButton();
             showEmotionLayout();
diff --git a/chat/kit/src/main/res/layout/conversation_input_panel.xml b/chat/kit/src/main/res/layout/conversation_input_panel.xml
index 8587526c8..224bfb87e 100644
--- a/chat/kit/src/main/res/layout/conversation_input_panel.xml
+++ b/chat/kit/src/main/res/layout/conversation_input_panel.xml
@@ -18,23 +18,22 @@
         <LinearLayout
             android:id="@+id/inputContainerLinearLayout"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:animateLayoutChanges="true"
-            android:focusable="true"
             android:focusableInTouchMode="true"
-            android:gravity="center_vertical"
             android:orientation="horizontal">
 
             <ImageView
                 android:id="@+id/audioImageView"
                 android:layout_width="35dp"
                 android:layout_height="35dp"
+                android:layout_gravity="bottom"
                 android:layout_margin="5dp"
                 android:src="@mipmap/ic_cheat_voice" />
 
             <RelativeLayout
                 android:layout_width="0dp"
-                android:layout_height="40dp"
+                android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:layout_weight="1"
                 android:gravity="center">
@@ -42,9 +41,10 @@
                 <EditText
                     android:id="@+id/editText"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
+                    android:layout_height="wrap_content"
                     android:layout_centerInParent="true"
                     android:background="@drawable/shape_session_text_input"
+                    android:maxLines="5"
                     android:minHeight="30dp"
                     android:paddingLeft="5dp"
                     android:textSize="16sp"
@@ -54,7 +54,7 @@
                     android:id="@+id/audioButton"
                     style="?android:attr/borderlessButtonStyle"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
+                    android:layout_height="40dp"
                     android:background="@drawable/shape_session_btn_voice_normal"
                     android:gravity="center"
                     android:text="@string/please_to_talk"
@@ -68,6 +68,7 @@
                 android:id="@+id/emotionImageView"
                 android:layout_width="35dp"
                 android:layout_height="35dp"
+                android:layout_gravity="bottom"
                 android:layout_margin="5dp"
                 android:src="@mipmap/ic_cheat_emo" />
 
@@ -75,7 +76,9 @@
                 android:id="@+id/extImageView"
                 android:layout_width="35dp"
                 android:layout_height="35dp"
+                android:layout_gravity="bottom"
                 android:layout_marginRight="5dp"
+                android:layout_marginBottom="5dp"
                 android:scaleType="centerInside"
                 android:src="@mipmap/ic_cheat_add" />
 
@@ -84,8 +87,11 @@
                 style="?android:attr/borderlessButtonStyle"
                 android:layout_width="50dp"
                 android:layout_height="35dp"
+                android:layout_gravity="bottom"
                 android:layout_marginRight="5dp"
+                android:layout_marginBottom="2.5dp"
                 android:background="@drawable/shape_session_btn_send"
+                android:gravity="center"
                 android:text="@string/send"
                 android:textColor="@color/white"
                 android:textSize="13sp"