aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/layout
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2017-02-10 22:35:12 +0100
committerChristian Schneppe <christian@pix-art.de>2017-02-10 22:35:12 +0100
commit23294c5737f0759595ee6ee6e9d89f214208c7b2 (patch)
tree0ab7e15d39f3ea28448ce8229f7319c138d7e2ec /src/main/res/layout
parent53e2f9608d1608d9bad7124ef129725dbbb7f9f5 (diff)
changed message bubbles from PNG to XML
Diffstat (limited to 'src/main/res/layout')
-rw-r--r--src/main/res/layout/contact.xml2
-rw-r--r--src/main/res/layout/conversation_list_row.xml4
-rw-r--r--src/main/res/layout/message_received.xml17
-rw-r--r--src/main/res/layout/message_sent.xml15
4 files changed, 20 insertions, 18 deletions
diff --git a/src/main/res/layout/contact.xml b/src/main/res/layout/contact.xml
index 92e6020c9..027b0d353 100644
--- a/src/main/res/layout/contact.xml
+++ b/src/main/res/layout/contact.xml
@@ -13,7 +13,7 @@
android:layout_alignParentLeft="true"
android:src="@drawable/ic_profile"
app:riv_border_width="1dp"
- app:riv_border_color="@color/black12"
+ app:riv_border_color="@color/grey500"
app:riv_corner_radius="5dp" />
<LinearLayout
diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml
index 16d611ce9..c494e07d7 100644
--- a/src/main/res/layout/conversation_list_row.xml
+++ b/src/main/res/layout/conversation_list_row.xml
@@ -30,7 +30,7 @@
android:scaleType="centerCrop"
android:background="@drawable/message_border"
android:padding="1dp"
- app:riv_border_color="@color/black12"
+ app:riv_border_color="@color/grey500"
app:riv_border_width="1dp"
app:riv_corner_radius="5dp" />
@@ -83,7 +83,7 @@
android:id="@+id/conversation_lastimage"
android:layout_width="wrap_content"
android:layout_height="36dp"
- app:riv_border_color="@color/black12"
+ app:riv_border_color="@color/grey500"
app:riv_border_width="1dp"
android:scaleType="centerCrop"
android:visibility="gone"
diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index 9717081a8..45808695e 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -19,7 +19,7 @@
android:scaleType="fitXY"
android:src="@drawable/ic_profile"
app:riv_border_width="1dip"
- app:riv_border_color="@color/black12"
+ app:riv_border_color="@color/grey500"
app:riv_corner_radius="5dp" />
<LinearLayout
@@ -28,11 +28,12 @@
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_toRightOf="@+id/message_photo"
- android:background="@drawable/message_bubble_received"
- android:minHeight="53dp"
- android:layout_marginTop="-2dp"
- android:layout_marginRight="-4dp"
- android:longClickable="true">
+ android:minHeight="48dp"
+ android:longClickable="true"
+ android:layout_marginBottom="4dp"
+ android:layout_marginLeft="4dp"
+ android:layout_marginRight="4dp"
+ android:layout_marginTop="-4dp">
<LinearLayout
android:layout_width="wrap_content"
@@ -45,11 +46,11 @@
android:id="@+id/message_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginTop="8dp"
+ android:layout_marginTop="2dp"
android:layout_marginBottom="4dp"
android:adjustViewBounds="true"
app:riv_border_width="1dp"
- app:riv_border_color="@color/black12"
+ app:riv_border_color="@color/grey500"
app:riv_corner_radius="5dp"
android:scaleType="centerCrop"
android:longClickable="true"
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index d1923df71..b45da4470 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -20,7 +20,7 @@
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
app:riv_border_width="1dp"
- app:riv_border_color="@color/black12"
+ app:riv_border_color="@color/grey500"
app:riv_corner_radius="5dp" />
<LinearLayout
@@ -29,11 +29,12 @@
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_toLeftOf="@+id/message_photo"
- android:background="@drawable/message_bubble_sent"
- android:minHeight="53dp"
- android:layout_marginLeft="-4dp"
+ android:minHeight="48dp"
android:longClickable="true"
- android:layout_marginBottom="-4dp">
+ android:layout_marginBottom="0dp"
+ android:layout_marginLeft="4dp"
+ android:layout_marginRight="4dp"
+ android:layout_marginTop="4dp" >
<LinearLayout
android:layout_width="wrap_content"
@@ -46,12 +47,12 @@
android:id="@+id/message_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginTop="8dp"
+ android:layout_marginTop="2dp"
android:layout_marginBottom="4dp"
android:adjustViewBounds="true"
android:longClickable="true"
app:riv_border_width="1dp"
- app:riv_border_color="@color/black12"
+ app:riv_border_color="@color/grey500"
app:riv_corner_radius="5dp"
android:scaleType="centerCrop"
android:maxHeight="400dp"