aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/layout
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2018-02-03 23:41:07 +0100
committerChristian Schneppe <christian@pix-art.de>2018-02-04 00:02:27 +0100
commitbc4d112060cbe822bef0dda8d5104db725deeb1b (patch)
treef719786139b729892cf67d103b1922ea48cad279 /src/main/res/layout
parent282612a0612fac5eb9ced648b3d8969bff85c90c (diff)
implemented message search
fixes #110
Diffstat (limited to 'src/main/res/layout')
-rw-r--r--src/main/res/layout/fragment_conversation.xml134
1 files changed, 96 insertions, 38 deletions
diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml
index 2ac131d34..7f1a4197a 100644
--- a/src/main/res/layout/fragment_conversation.xml
+++ b/src/main/res/layout/fragment_conversation.xml
@@ -11,7 +11,6 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_above="@+id/snackbar"
- android:layout_below="@+id/messagehint"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:background="@color/grey200"
@@ -24,55 +23,114 @@
</ListView>
<RelativeLayout
- android:id="@+id/textsend"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true"
- android:background="@color/grey200"
- android:clickable="true"
- android:paddingTop="2dp"
- android:paddingLeft="2dp"
- android:paddingBottom="2dp">
+ android:id="@+id/input">
- <de.pixart.messenger.ui.widget.EditMessage
- android:id="@+id/textinput"
- android:layout_width="wrap_content"
+ <RelativeLayout
+ android:id="@+id/searchfield"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:background="@color/grey500"
+ android:minHeight="50dp"
+ android:layout_marginTop="2dp"
+ android:visibility="gone">
+
+ <EditText
+ android:id="@+id/searchfield_input"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:layout_centerVertical="true"
+ android:layout_toLeftOf="@+id/button_bar"
+ android:hint="@string/search"
+ android:maxLines="4"
+ android:minHeight="48dp"
+ android:minLines="1"
+ android:paddingBottom="12dp"
+ android:paddingLeft="8dp"
+ android:paddingRight="8dp"
+ android:paddingTop="12dp"
+ android:singleLine="false"
+ android:textColor="@color/realwhite"
+ android:textColorHint="@color/white" />
+
+ <LinearLayout
+ android:id="@+id/button_bar"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentRight="true">
+
+ <ImageButton
+ android:id="@+id/search_up"
+ style="?android:attr/borderlessButtonStyle"
+ android:layout_width="32dp"
+ android:layout_height="wrap_content"
+ android:src="@drawable/ic_keyboard_arrow_up_white_24dp"
+ android:visibility="gone"/>
+
+ <ImageButton
+ android:id="@+id/search_down"
+ style="?android:attr/borderlessButtonStyle"
+ android:layout_width="32dp"
+ android:layout_height="wrap_content"
+ android:src="@drawable/ic_keyboard_arrow_down_white_24dp"
+ android:visibility="gone"/>
+ </LinearLayout>
+ </RelativeLayout>
+
+ <RelativeLayout
+ android:id="@+id/textsend"
+ android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
- android:layout_toLeftOf="@+id/textSendButton"
- android:background="@color/grey50"
- android:ems="10"
- android:imeOptions="flagNoExtractUi|actionSend"
- android:inputType="textShortMessage|textMultiLine|textCapSentences"
- android:minHeight="48dp"
- android:minLines="1"
- android:maxLines="6"
- android:paddingBottom="12dp"
- android:paddingLeft="8dp"
- android:paddingRight="8dp"
- android:paddingTop="12dp"
- android:textColor="@color/black87"
- android:singleLine="false">
-
- </de.pixart.messenger.ui.widget.EditMessage>
-
- <ImageButton
- android:id="@+id/textSendButton"
- android:layout_width="48dp"
- android:layout_height="48dp"
- android:layout_alignParentRight="true"
- android:layout_centerVertical="true"
android:background="@color/grey200"
- android:src="@drawable/ic_send_text_offline"
- android:contentDescription="@string/send_message" />
+ android:clickable="true"
+ android:paddingBottom="2dp"
+ android:paddingLeft="2dp"
+ android:paddingTop="2dp">
+
+ <de.pixart.messenger.ui.widget.EditMessage
+ android:id="@+id/textinput"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:layout_toLeftOf="@+id/textSendButton"
+ android:background="@color/grey50"
+ android:ems="10"
+ android:imeOptions="flagNoExtractUi|actionSend"
+ android:inputType="textShortMessage|textMultiLine|textCapSentences"
+ android:maxLines="6"
+ android:minHeight="48dp"
+ android:minLines="1"
+ android:paddingBottom="12dp"
+ android:paddingLeft="8dp"
+ android:paddingRight="8dp"
+ android:paddingTop="12dp"
+ android:singleLine="false"
+ android:textColor="@color/black87">
+
+ </de.pixart.messenger.ui.widget.EditMessage>
+
+ <ImageButton
+ android:id="@+id/textSendButton"
+ android:layout_width="48dp"
+ android:layout_height="48dp"
+ android:layout_alignParentRight="true"
+ android:layout_centerVertical="true"
+ android:background="@color/grey200"
+ android:contentDescription="@string/send_message"
+ android:src="@drawable/ic_send_text_offline" />
+ </RelativeLayout>
</RelativeLayout>
<RelativeLayout
android:id="@+id/snackbar"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:layout_above="@+id/textsend"
+ android:layout_above="@+id/input"
android:layout_marginBottom="4dp"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
@@ -88,7 +146,7 @@
android:layout_centerVertical="true"
android:layout_toLeftOf="@+id/snackbar_action"
android:paddingLeft="24dp"
- android:textColor="@color/white"
+ android:textColor="@color/white70"
android:textSize="?attr/TextSizeBody" />
<TextView