From 23294c5737f0759595ee6ee6e9d89f214208c7b2 Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Fri, 10 Feb 2017 22:35:12 +0100 Subject: changed message bubbles from PNG to XML --- .../messenger/ui/adapter/MessageAdapter.java | 6 +++--- .../drawable-hdpi/message_bubble_received.9.png | Bin 375 -> 0 bytes .../message_bubble_received_warning.9.png | Bin 384 -> 0 bytes .../res/drawable-hdpi/message_bubble_sent.9.png | Bin 355 -> 0 bytes .../drawable-hdpi/message_bubble_sent_white.9.png | Bin 338 -> 0 bytes .../drawable-mdpi/message_bubble_received.9.png | Bin 266 -> 0 bytes .../message_bubble_received_warning.9.png | Bin 265 -> 0 bytes .../res/drawable-mdpi/message_bubble_sent.9.png | Bin 247 -> 0 bytes .../drawable-mdpi/message_bubble_sent_white.9.png | Bin 241 -> 0 bytes .../drawable-xhdpi/message_bubble_received.9.png | Bin 523 -> 0 bytes .../message_bubble_received_warning.9.png | Bin 526 -> 0 bytes .../res/drawable-xhdpi/message_bubble_sent.9.png | Bin 492 -> 0 bytes .../drawable-xhdpi/message_bubble_sent_white.9.png | Bin 468 -> 0 bytes .../drawable-xxhdpi/message_bubble_received.9.png | Bin 868 -> 0 bytes .../message_bubble_received_warning.9.png | Bin 875 -> 0 bytes .../res/drawable-xxhdpi/message_bubble_sent.9.png | Bin 754 -> 0 bytes .../message_bubble_sent_white.9.png | Bin 734 -> 0 bytes .../drawable-xxxhdpi/message_bubble_received.9.png | Bin 1232 -> 0 bytes .../message_bubble_received_warning.9.png | Bin 1224 -> 0 bytes .../res/drawable-xxxhdpi/message_bubble_sent.9.png | Bin 1071 -> 0 bytes .../message_bubble_sent_white.9.png | Bin 1044 -> 0 bytes src/main/res/drawable/message_border.xml | 2 +- .../drawable/message_bubble_received_lightred.xml | 21 +++++++++++++++++++++ .../res/drawable/message_bubble_received_white.xml | 21 +++++++++++++++++++++ .../res/drawable/message_bubble_sent_lightblue.xml | 21 +++++++++++++++++++++ .../res/drawable/message_bubble_sent_white.xml | 21 +++++++++++++++++++++ src/main/res/layout/contact.xml | 2 +- src/main/res/layout/conversation_list_row.xml | 4 ++-- src/main/res/layout/message_received.xml | 17 +++++++++-------- src/main/res/layout/message_sent.xml | 15 ++++++++------- src/main/res/values/colors.xml | 4 ++++ 31 files changed, 112 insertions(+), 22 deletions(-) delete mode 100644 src/main/res/drawable-hdpi/message_bubble_received.9.png delete mode 100644 src/main/res/drawable-hdpi/message_bubble_received_warning.9.png delete mode 100644 src/main/res/drawable-hdpi/message_bubble_sent.9.png delete mode 100644 src/main/res/drawable-hdpi/message_bubble_sent_white.9.png delete mode 100644 src/main/res/drawable-mdpi/message_bubble_received.9.png delete mode 100644 src/main/res/drawable-mdpi/message_bubble_received_warning.9.png delete mode 100644 src/main/res/drawable-mdpi/message_bubble_sent.9.png delete mode 100644 src/main/res/drawable-mdpi/message_bubble_sent_white.9.png delete mode 100644 src/main/res/drawable-xhdpi/message_bubble_received.9.png delete mode 100644 src/main/res/drawable-xhdpi/message_bubble_received_warning.9.png delete mode 100644 src/main/res/drawable-xhdpi/message_bubble_sent.9.png delete mode 100644 src/main/res/drawable-xhdpi/message_bubble_sent_white.9.png delete mode 100644 src/main/res/drawable-xxhdpi/message_bubble_received.9.png delete mode 100644 src/main/res/drawable-xxhdpi/message_bubble_received_warning.9.png delete mode 100644 src/main/res/drawable-xxhdpi/message_bubble_sent.9.png delete mode 100644 src/main/res/drawable-xxhdpi/message_bubble_sent_white.9.png delete mode 100644 src/main/res/drawable-xxxhdpi/message_bubble_received.9.png delete mode 100644 src/main/res/drawable-xxxhdpi/message_bubble_received_warning.9.png delete mode 100644 src/main/res/drawable-xxxhdpi/message_bubble_sent.9.png delete mode 100644 src/main/res/drawable-xxxhdpi/message_bubble_sent_white.9.png create mode 100644 src/main/res/drawable/message_bubble_received_lightred.xml create mode 100644 src/main/res/drawable/message_bubble_received_white.xml create mode 100644 src/main/res/drawable/message_bubble_sent_lightblue.xml create mode 100644 src/main/res/drawable/message_bubble_sent_white.xml (limited to 'src') diff --git a/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java index f8eb6e044..fa65b3af6 100644 --- a/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java +++ b/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java @@ -933,10 +933,10 @@ public class MessageAdapter extends ArrayAdapter implements CopyTextVie if (type == RECEIVED) { if (isInValidSession) { - viewHolder.message_box.setBackgroundResource(R.drawable.message_bubble_received); + viewHolder.message_box.setBackgroundResource(R.drawable.message_bubble_received_white); viewHolder.encryption.setVisibility(View.GONE); } else { - viewHolder.message_box.setBackgroundResource(R.drawable.message_bubble_received_warning); + viewHolder.message_box.setBackgroundResource(R.drawable.message_bubble_received_lightred); viewHolder.encryption.setVisibility(View.VISIBLE); if (omemoEncryption && !message.isTrusted()) { viewHolder.encryption.setText(R.string.not_trusted); @@ -950,7 +950,7 @@ public class MessageAdapter extends ArrayAdapter implements CopyTextVie if (mUseWhiteBackground) { viewHolder.message_box.setBackgroundResource(R.drawable.message_bubble_sent_white); } else { - viewHolder.message_box.setBackgroundResource(R.drawable.message_bubble_sent); + viewHolder.message_box.setBackgroundResource(R.drawable.message_bubble_sent_lightblue); } } diff --git a/src/main/res/drawable-hdpi/message_bubble_received.9.png b/src/main/res/drawable-hdpi/message_bubble_received.9.png deleted file mode 100644 index f4998a025..000000000 Binary files a/src/main/res/drawable-hdpi/message_bubble_received.9.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/message_bubble_received_warning.9.png b/src/main/res/drawable-hdpi/message_bubble_received_warning.9.png deleted file mode 100644 index a38d49f49..000000000 Binary files a/src/main/res/drawable-hdpi/message_bubble_received_warning.9.png and /dev/null 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 deleted file mode 100644 index 93a120890..000000000 Binary files a/src/main/res/drawable-hdpi/message_bubble_sent.9.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/message_bubble_sent_white.9.png b/src/main/res/drawable-hdpi/message_bubble_sent_white.9.png deleted file mode 100644 index f97cde6c6..000000000 Binary files a/src/main/res/drawable-hdpi/message_bubble_sent_white.9.png and /dev/null 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 deleted file mode 100644 index 520e985ac..000000000 Binary files a/src/main/res/drawable-mdpi/message_bubble_received.9.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/message_bubble_received_warning.9.png b/src/main/res/drawable-mdpi/message_bubble_received_warning.9.png deleted file mode 100644 index 96c225577..000000000 Binary files a/src/main/res/drawable-mdpi/message_bubble_received_warning.9.png and /dev/null 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 deleted file mode 100644 index 0f96e8947..000000000 Binary files a/src/main/res/drawable-mdpi/message_bubble_sent.9.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/message_bubble_sent_white.9.png b/src/main/res/drawable-mdpi/message_bubble_sent_white.9.png deleted file mode 100644 index 79ba75cb1..000000000 Binary files a/src/main/res/drawable-mdpi/message_bubble_sent_white.9.png and /dev/null 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 deleted file mode 100644 index 2a0c14c1c..000000000 Binary files a/src/main/res/drawable-xhdpi/message_bubble_received.9.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/message_bubble_received_warning.9.png b/src/main/res/drawable-xhdpi/message_bubble_received_warning.9.png deleted file mode 100644 index b9826d990..000000000 Binary files a/src/main/res/drawable-xhdpi/message_bubble_received_warning.9.png and /dev/null 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 deleted file mode 100644 index d2cdeb9b3..000000000 Binary files a/src/main/res/drawable-xhdpi/message_bubble_sent.9.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/message_bubble_sent_white.9.png b/src/main/res/drawable-xhdpi/message_bubble_sent_white.9.png deleted file mode 100644 index 170b6800e..000000000 Binary files a/src/main/res/drawable-xhdpi/message_bubble_sent_white.9.png and /dev/null 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 deleted file mode 100644 index c5adfe791..000000000 Binary files a/src/main/res/drawable-xxhdpi/message_bubble_received.9.png and /dev/null differ diff --git a/src/main/res/drawable-xxhdpi/message_bubble_received_warning.9.png b/src/main/res/drawable-xxhdpi/message_bubble_received_warning.9.png deleted file mode 100644 index 7efb3b5b3..000000000 Binary files a/src/main/res/drawable-xxhdpi/message_bubble_received_warning.9.png and /dev/null 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 deleted file mode 100644 index 69094d0e6..000000000 Binary files a/src/main/res/drawable-xxhdpi/message_bubble_sent.9.png and /dev/null differ diff --git a/src/main/res/drawable-xxhdpi/message_bubble_sent_white.9.png b/src/main/res/drawable-xxhdpi/message_bubble_sent_white.9.png deleted file mode 100644 index 8c30fc880..000000000 Binary files a/src/main/res/drawable-xxhdpi/message_bubble_sent_white.9.png and /dev/null 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 deleted file mode 100644 index 267de5f27..000000000 Binary files a/src/main/res/drawable-xxxhdpi/message_bubble_received.9.png and /dev/null differ diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_received_warning.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_received_warning.9.png deleted file mode 100644 index fef8d6eb5..000000000 Binary files a/src/main/res/drawable-xxxhdpi/message_bubble_received_warning.9.png and /dev/null 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 deleted file mode 100644 index 45576d85a..000000000 Binary files a/src/main/res/drawable-xxxhdpi/message_bubble_sent.9.png and /dev/null differ diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_sent_white.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_sent_white.9.png deleted file mode 100644 index 249002f89..000000000 Binary files a/src/main/res/drawable-xxxhdpi/message_bubble_sent_white.9.png and /dev/null differ diff --git a/src/main/res/drawable/message_border.xml b/src/main/res/drawable/message_border.xml index 73c7a6716..83eef8eb8 100644 --- a/src/main/res/drawable/message_border.xml +++ b/src/main/res/drawable/message_border.xml @@ -10,6 +10,6 @@ android:right="1.5dp" android:top="1.5dp" /> - + \ No newline at end of file diff --git a/src/main/res/drawable/message_bubble_received_lightred.xml b/src/main/res/drawable/message_bubble_received_lightred.xml new file mode 100644 index 000000000..b3bf6d451 --- /dev/null +++ b/src/main/res/drawable/message_bubble_received_lightred.xml @@ -0,0 +1,21 @@ + + + + + + + + + + \ No newline at end of file diff --git a/src/main/res/drawable/message_bubble_received_white.xml b/src/main/res/drawable/message_bubble_received_white.xml new file mode 100644 index 000000000..9055bad70 --- /dev/null +++ b/src/main/res/drawable/message_bubble_received_white.xml @@ -0,0 +1,21 @@ + + + + + + + + + + \ No newline at end of file diff --git a/src/main/res/drawable/message_bubble_sent_lightblue.xml b/src/main/res/drawable/message_bubble_sent_lightblue.xml new file mode 100644 index 000000000..1ee3ad0c8 --- /dev/null +++ b/src/main/res/drawable/message_bubble_sent_lightblue.xml @@ -0,0 +1,21 @@ + + + + + + + + + + \ No newline at end of file diff --git a/src/main/res/drawable/message_bubble_sent_white.xml b/src/main/res/drawable/message_bubble_sent_white.xml new file mode 100644 index 000000000..7e627ed11 --- /dev/null +++ b/src/main/res/drawable/message_bubble_sent_white.xml @@ -0,0 +1,21 @@ + + + + + + + + + + \ No newline at end of file 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" /> @@ -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" /> + android:minHeight="48dp" + android:longClickable="true" + android:layout_marginBottom="4dp" + android:layout_marginLeft="4dp" + android:layout_marginRight="4dp" + android:layout_marginTop="-4dp"> + android:layout_marginBottom="0dp" + android:layout_marginLeft="4dp" + android:layout_marginRight="4dp" + android:layout_marginTop="4dp" > #ffc62828 #ffff9800 #ff2e4272 + #ffffffff + #ffe6e6e6 + #ffc7d1e8 + #ffd55555 -- cgit v1.2.3