aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main/res/drawable-hdpi/message_bubble_received.9.pngbin759 -> 760 bytes
-rw-r--r--src/main/res/drawable-hdpi/message_bubble_sent.9.pngbin693 -> 687 bytes
-rw-r--r--src/main/res/drawable-mdpi/message_bubble_received.9.pngbin589 -> 588 bytes
-rw-r--r--src/main/res/drawable-mdpi/message_bubble_sent.9.pngbin570 -> 558 bytes
-rw-r--r--src/main/res/drawable-xhdpi/message_bubble_received.9.pngbin922 -> 917 bytes
-rw-r--r--src/main/res/drawable-xhdpi/message_bubble_sent.9.pngbin832 -> 857 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/message_bubble_received.9.pngbin1319 -> 1309 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/message_bubble_sent.9.pngbin1195 -> 1190 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/message_bubble_received.9.pngbin1672 -> 1695 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/message_bubble_sent.9.pngbin1519 -> 1499 bytes
-rw-r--r--src/main/res/layout/fragment_conversation.xml3
-rw-r--r--src/main/res/layout/message_received.xml21
-rw-r--r--src/main/res/layout/message_sent.xml26
-rw-r--r--src/main/res/layout/message_status.xml8
-rw-r--r--src/main/res/values/dimens.xml1
15 files changed, 29 insertions, 30 deletions
diff --git a/src/main/res/drawable-hdpi/message_bubble_received.9.png b/src/main/res/drawable-hdpi/message_bubble_received.9.png
index eb44a1b6d..20647f9f5 100644
--- a/src/main/res/drawable-hdpi/message_bubble_received.9.png
+++ b/src/main/res/drawable-hdpi/message_bubble_received.9.png
Binary files differ
diff --git a/src/main/res/drawable-hdpi/message_bubble_sent.9.png b/src/main/res/drawable-hdpi/message_bubble_sent.9.png
index 9daa36bd1..6cc8e81e5 100644
--- a/src/main/res/drawable-hdpi/message_bubble_sent.9.png
+++ b/src/main/res/drawable-hdpi/message_bubble_sent.9.png
Binary files differ
diff --git a/src/main/res/drawable-mdpi/message_bubble_received.9.png b/src/main/res/drawable-mdpi/message_bubble_received.9.png
index 3b4eee56e..6525d6c0f 100644
--- a/src/main/res/drawable-mdpi/message_bubble_received.9.png
+++ b/src/main/res/drawable-mdpi/message_bubble_received.9.png
Binary files differ
diff --git a/src/main/res/drawable-mdpi/message_bubble_sent.9.png b/src/main/res/drawable-mdpi/message_bubble_sent.9.png
index 74fb8d41a..72cda8202 100644
--- a/src/main/res/drawable-mdpi/message_bubble_sent.9.png
+++ b/src/main/res/drawable-mdpi/message_bubble_sent.9.png
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/message_bubble_received.9.png b/src/main/res/drawable-xhdpi/message_bubble_received.9.png
index 0f5f1ac6e..d543043ad 100644
--- a/src/main/res/drawable-xhdpi/message_bubble_received.9.png
+++ b/src/main/res/drawable-xhdpi/message_bubble_received.9.png
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/message_bubble_sent.9.png b/src/main/res/drawable-xhdpi/message_bubble_sent.9.png
index 7939f213f..12b4a2431 100644
--- a/src/main/res/drawable-xhdpi/message_bubble_sent.9.png
+++ b/src/main/res/drawable-xhdpi/message_bubble_sent.9.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/message_bubble_received.9.png b/src/main/res/drawable-xxhdpi/message_bubble_received.9.png
index c47974c5f..9bbdd98cf 100644
--- a/src/main/res/drawable-xxhdpi/message_bubble_received.9.png
+++ b/src/main/res/drawable-xxhdpi/message_bubble_received.9.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/message_bubble_sent.9.png b/src/main/res/drawable-xxhdpi/message_bubble_sent.9.png
index 2117c187b..3b9977593 100644
--- a/src/main/res/drawable-xxhdpi/message_bubble_sent.9.png
+++ b/src/main/res/drawable-xxhdpi/message_bubble_sent.9.png
Binary files differ
diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_received.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_received.9.png
index 5e65d062f..498277659 100644
--- a/src/main/res/drawable-xxxhdpi/message_bubble_received.9.png
+++ b/src/main/res/drawable-xxxhdpi/message_bubble_received.9.png
Binary files differ
diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_sent.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_sent.9.png
index 3d7ddbddf..74601a370 100644
--- a/src/main/res/drawable-xxxhdpi/message_bubble_sent.9.png
+++ b/src/main/res/drawable-xxxhdpi/message_bubble_sent.9.png
Binary files differ
diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml
index 09d0573b9..db92c05f9 100644
--- a/src/main/res/layout/fragment_conversation.xml
+++ b/src/main/res/layout/fragment_conversation.xml
@@ -18,9 +18,6 @@
android:listSelector="@android:color/transparent"
android:stackFromBottom="true"
android:transcriptMode="normal"
- android:paddingTop="@dimen/activity_horizontal_margin"
- android:paddingBottom="@dimen/activity_horizontal_margin"
- android:clipToPadding="false"
tools:listitem="@layout/message_sent">
</ListView>
diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index 785e5b969..4de9adddf 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -3,19 +3,17 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:paddingBottom="0dp"
- android:paddingLeft="@dimen/activity_vertical_margin"
- android:paddingRight="4dp"
- android:paddingTop="0dp">
+ android:paddingBottom="3dp"
+ android:paddingLeft="8dp"
+ android:paddingRight="8dp"
+ android:paddingTop="3dp">
<ImageView
android:id="@+id/message_photo"
- android:layout_width="36dp"
- android:layout_height="38dp"
- android:paddingTop="2dp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
- android:layout_marginRight="@dimen/message_profile_image_gap"
android:scaleType="fitXY"
android:src="@drawable/ic_profile" />
@@ -26,14 +24,17 @@
android:layout_alignParentBottom="true"
android:layout_toRightOf="@+id/message_photo"
android:background="@drawable/message_bubble_received"
- android:minHeight="48dp"
+ android:minHeight="53dp"
+ android:layout_marginTop="-2dp"
+ android:layout_marginRight="-4dp"
android:longClickable="true">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:gravity="center_vertical"
- android:orientation="vertical">
+ android:orientation="vertical"
+ android:padding="2dp">
<ImageView
android:id="@+id/message_image"
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index 15969d825..96e7808f2 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -3,21 +3,21 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:paddingBottom="0dp"
- android:paddingLeft="4dp"
- android:paddingRight="@dimen/activity_vertical_margin"
- android:paddingTop="0dp">
+ android:paddingBottom="3dp"
+ android:paddingLeft="8dp"
+ android:paddingRight="8dp"
+ android:paddingTop="3dp">
<ImageView
android:id="@+id/message_photo"
- android:layout_width="36dp"
- android:layout_height="40dp"
- android:paddingBottom="4dp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:scaleType="fitXY"
+ android:paddingBottom="3dp"
+ android:src="@drawable/ic_profile"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
- android:layout_marginLeft="@dimen/message_profile_image_gap"
- android:scaleType="fitXY"
- android:src="@drawable/ic_profile" />
+ android:layout_alignParentEnd="true"/>
<LinearLayout
android:id="@+id/message_box"
@@ -26,14 +26,16 @@
android:layout_alignParentBottom="true"
android:layout_toLeftOf="@+id/message_photo"
android:background="@drawable/message_bubble_sent"
- android:minHeight="48dp"
+ android:minHeight="53dp"
+ android:layout_marginLeft="-4dp"
android:longClickable="true">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:gravity="center_vertical"
- android:orientation="vertical">
+ android:orientation="vertical"
+ android:padding="2dp">
<ImageView
android:id="@+id/message_image"
diff --git a/src/main/res/layout/message_status.xml b/src/main/res/layout/message_status.xml
index 99a09527d..222e23f5e 100644
--- a/src/main/res/layout/message_status.xml
+++ b/src/main/res/layout/message_status.xml
@@ -3,15 +3,15 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:paddingBottom="2dp"
+ android:paddingBottom="5dp"
android:paddingLeft="8dp"
android:paddingRight="8dp"
- android:paddingTop="2dp" >
+ android:paddingTop="5dp" >
<ImageView
android:id="@+id/message_photo"
- android:layout_width="24dp"
- android:layout_height="24dp"
+ android:layout_width="32dp"
+ android:layout_height="32dp"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:layout_marginRight="-1.5dp"
diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml
index 0e5dbf0f8..95e800557 100644
--- a/src/main/res/values/dimens.xml
+++ b/src/main/res/values/dimens.xml
@@ -5,5 +5,4 @@
<dimen name="infocard_padding">16dp</dimen>
<dimen name="conversations_overview_width">288dp</dimen>
<dimen name="image_button_padding">8dp</dimen>
- <dimen name="message_profile_image_gap">0dp</dimen>
</resources>