aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/layout/fragment_conversation.xml
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/res/layout/fragment_conversation.xml')
-rw-r--r--src/main/res/layout/fragment_conversation.xml19
1 files changed, 18 insertions, 1 deletions
diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml
index db92c05f..927e7239 100644
--- a/src/main/res/layout/fragment_conversation.xml
+++ b/src/main/res/layout/fragment_conversation.xml
@@ -5,6 +5,13 @@
android:layout_height="match_parent"
android:background="@color/grey200" >
+ <android.support.v4.widget.SwipeRefreshLayout
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_above="@+id/snackbar"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentTop="true"
+ android:id="@+id/swipe_refresh_container">
<ListView
android:id="@+id/messages_view"
android:layout_width="fill_parent"
@@ -20,6 +27,7 @@
android:transcriptMode="normal"
tools:listitem="@layout/message_sent">
</ListView>
+ </android.support.v4.widget.SwipeRefreshLayout>
<RelativeLayout
android:id="@+id/textsend"
@@ -33,8 +41,8 @@
android:id="@+id/textinput"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
android:layout_toLeftOf="@+id/textSendButton"
+ android:layout_toRightOf="@+id/emoji_btn"
android:background="@color/grey50"
android:ems="10"
android:imeOptions="flagNoExtractUi|actionSend"
@@ -58,6 +66,15 @@
android:layout_centerVertical="true"
android:background="?android:selectableItemBackground"
android:src="@drawable/ic_send_text_offline" />
+
+ <ImageView
+ android:layout_width="48dp"
+ android:layout_height="48dp"
+ android:id="@+id/emoji_btn"
+ android:layout_centerVertical="true"
+ android:layout_alignParentLeft="true"
+ android:padding="4dp"
+ android:src="@drawable/smiley" />
</RelativeLayout>
<RelativeLayout