aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/layout
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2017-02-16 20:58:27 +0100
committerChristian Schneppe <christian@pix-art.de>2017-02-19 20:04:26 +0100
commitb8cce73649a8c61fba3786f6804a0bf8db9ae055 (patch)
treeb8698c5696cde9e67404f48099eaeb4a75ae642b /src/main/res/layout
parent269ff52846f53b7e0fa6f31cf9099bd756f52333 (diff)
add date bubble in chatlist
fixes #104
Diffstat (limited to '')
-rw-r--r--src/main/res/layout/message_received.xml4
-rw-r--r--src/main/res/layout/message_sent.xml9
-rw-r--r--src/main/res/layout/message_status.xml28
3 files changed, 13 insertions, 28 deletions
diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index 45808695e..57279bde8 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -30,10 +30,8 @@
android:layout_toRightOf="@+id/message_photo"
android:minHeight="48dp"
android:longClickable="true"
- android:layout_marginBottom="4dp"
android:layout_marginLeft="4dp"
- android:layout_marginRight="4dp"
- android:layout_marginTop="-4dp">
+ android:layout_marginRight="4dp">
<LinearLayout
android:layout_width="wrap_content"
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index b45da4470..d37d418bf 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -27,14 +27,13 @@
android:id="@+id/message_box"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentBottom="true"
- android:layout_toLeftOf="@+id/message_photo"
android:minHeight="48dp"
android:longClickable="true"
- android:layout_marginBottom="0dp"
+ android:layout_alignParentBottom="true"
+ android:layout_toLeftOf="@+id/message_photo"
+ android:layout_toStartOf="@+id/message_photo"
android:layout_marginLeft="4dp"
- android:layout_marginRight="4dp"
- android:layout_marginTop="4dp" >
+ android:layout_marginRight="4dp">
<LinearLayout
android:layout_width="wrap_content"
diff --git a/src/main/res/layout/message_status.xml b/src/main/res/layout/message_status.xml
index 117f31264..211f1a2e7 100644
--- a/src/main/res/layout/message_status.xml
+++ b/src/main/res/layout/message_status.xml
@@ -19,30 +19,18 @@
android:layout_centerVertical="true"
android:layout_centerHorizontal="true" />
- <com.makeramen.roundedimageview.RoundedImageView
- android:id="@+id/message_photo"
- android:layout_width="32dp"
- android:layout_height="32dp"
- android:layout_alignParentLeft="true"
- android:layout_alignParentTop="true"
- android:layout_marginRight="-1.5dp"
- android:padding="1dp"
- android:scaleType="fitXY"
- android:src="@drawable/ic_profile"
- android:background="@drawable/message_border"
- app:riv_corner_radius="5dp" />
-
<TextView
android:id="@+id/status_message"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_centerVertical="true"
- android:layout_marginLeft="8dp"
- android:layout_toEndOf="@+id/message_photo"
- android:layout_toRightOf="@+id/message_photo"
- android:text="@string/contact_has_read_up_to_this_point"
- android:textColor="@color/black54"
+ android:text="01.01.2017"
+ android:textColor="@color/black87"
android:textSize="?attr/TextSizeInfo"
- android:textStyle="italic" />
+ android:textStyle="italic"
+ android:background="@drawable/date_bubble"
+ android:layout_alignBaseline="@+id/load_more_messages"
+ android:layout_alignBottom="@+id/load_more_messages"
+ android:layout_centerHorizontal="true"
+ android:layout_margin="8dp" />
</RelativeLayout> \ No newline at end of file