design message border

21 files changed, 27 insertions, 96 deletions

diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
index 7edc309c9..e8b3caa3a 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
@@ -3091,7 +3091,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
     }
 
     private int messageInputBubble() {
-        return activity.isDarkTheme() ? R.drawable.message_bubble_sent_blue_dark : R.drawable.message_bubble_sent_blue;
+        return activity.isDarkTheme() ? R.drawable.message_bubble_sent_dark : R.drawable.message_bubble_sent;
     }
 
     public Conversation getConversation() {
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 bc65fd68a..ce2ce2258 100644
--- a/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java
+++ b/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java
@@ -975,7 +975,7 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
         }
 
         if (type == SENT) {
-            viewHolder.message_box.setBackgroundResource(activity.isDarkTheme() ? R.drawable.message_bubble_sent_blue_dark : R.drawable.message_bubble_sent_blue);
+            viewHolder.message_box.setBackgroundResource(activity.isDarkTheme() ? R.drawable.message_bubble_sent_dark : R.drawable.message_bubble_sent);
         }
 
         displayStatus(viewHolder, message, type, darkBackground);
diff --git a/src/main/res/drawable/date_bubble.xml b/src/main/res/drawable/date_bubble.xml
index 3edf349e9..6d9e2462e 100644
--- a/src/main/res/drawable/date_bubble.xml
+++ b/src/main/res/drawable/date_bubble.xml
@@ -4,18 +4,11 @@
         android:topLeftRadius="5dp"
         android:topRightRadius="5dp"
         android:bottomRightRadius="5dp"
-        android:bottomLeftRadius="5dp">
-    </corners>
+        android:bottomLeftRadius="5dp" />
     <padding
         android:bottom="6dp"
         android:left="6dp"
         android:right="6dp"
         android:top="6dp" />
-    <stroke
-        android:width="1dp"
-        android:color="@color/grey500">
-    </stroke>
-    <solid
-        android:color="@color/lightgreen">
-    </solid>
+    <solid android:color="@color/lightgreen" />
 </shape>
\ No newline at end of file
diff --git a/src/main/res/drawable/date_bubble_dark.xml b/src/main/res/drawable/date_bubble_dark.xml
index 345c315c1..3859b4d83 100644
--- a/src/main/res/drawable/date_bubble_dark.xml
+++ b/src/main/res/drawable/date_bubble_dark.xml
@@ -4,18 +4,11 @@
         android:topLeftRadius="5dp"
         android:topRightRadius="5dp"
         android:bottomRightRadius="5dp"
-        android:bottomLeftRadius="5dp">
-    </corners>
+        android:bottomLeftRadius="5dp" />
     <padding
         android:bottom="6dp"
         android:left="6dp"
         android:right="6dp"
         android:top="6dp" />
-    <stroke
-        android:width="1dp"
-        android:color="@color/grey800">
-    </stroke>
-    <solid
-        android:color="@color/darkgreen">
-    </solid>
+    <solid android:color="@color/darkgreen" />
 </shape>
\ No newline at end of file
diff --git a/src/main/res/drawable/message_bubble_received_light.xml b/src/main/res/drawable/message_bubble_received_light.xml
index 32e146460..0361d848c 100644
--- a/src/main/res/drawable/message_bubble_received_light.xml
+++ b/src/main/res/drawable/message_bubble_received_light.xml
@@ -4,18 +4,14 @@
         android:topLeftRadius="0dp"
         android:topRightRadius="5dp"
         android:bottomRightRadius="5dp"
-        android:bottomLeftRadius="5dp">
-    </corners>
+        android:bottomLeftRadius="5dp" />
     <padding
         android:bottom="2dp"
         android:left="6dp"
         android:right="6dp"
         android:top="2dp" />
     <stroke
-        android:width="1dp"
-        android:color="@color/grey500">
-    </stroke>
-    <solid
-        android:color="@color/lightwhite">
-    </solid>
+        android:width="1.5dp"
+        android:color="@color/black12" />
+    <solid android:color="@color/lightwhite" />
 </shape>
\ No newline at end of file
diff --git a/src/main/res/drawable/message_bubble_received_light_dark.xml b/src/main/res/drawable/message_bubble_received_light_dark.xml
index 8f9132566..301f634bc 100644
--- a/src/main/res/drawable/message_bubble_received_light_dark.xml
+++ b/src/main/res/drawable/message_bubble_received_light_dark.xml
@@ -4,18 +4,11 @@
         android:topLeftRadius="0dp"
         android:topRightRadius="5dp"
         android:bottomRightRadius="5dp"
-        android:bottomLeftRadius="5dp">
-    </corners>
+        android:bottomLeftRadius="5dp" />
     <padding
         android:bottom="2dp"
         android:left="6dp"
         android:right="6dp"
         android:top="2dp" />
-    <stroke
-        android:width="1dp"
-        android:color="@color/grey700">
-    </stroke>
-    <solid
-        android:color="@color/darkwhite">
-    </solid>
+    <solid android:color="@color/darkwhite" />
 </shape>
\ No newline at end of file
diff --git a/src/main/res/drawable/message_bubble_received_warning.xml b/src/main/res/drawable/message_bubble_received_warning.xml
index b3bf6d451..6989c328a 100644
--- a/src/main/res/drawable/message_bubble_received_warning.xml
+++ b/src/main/res/drawable/message_bubble_received_warning.xml
@@ -4,18 +4,14 @@
         android:topLeftRadius="0dp"
         android:topRightRadius="5dp"
         android:bottomRightRadius="5dp"
-        android:bottomLeftRadius="5dp">
-    </corners>
+        android:bottomLeftRadius="5dp" />
     <padding
         android:bottom="4dp"
         android:left="6dp"
         android:right="6dp"
         android:top="4dp" />
     <stroke
-        android:width="1dp"
-        android:color="@color/grey500">
-    </stroke>
-    <solid
-        android:color="@color/lightred">
-    </solid>
+        android:width="1.5dp"
+        android:color="@color/black12" />
+    <solid android:color="@color/lightred" />
 </shape>
\ No newline at end of file
diff --git a/src/main/res/drawable/message_bubble_received_warning_dark.xml b/src/main/res/drawable/message_bubble_received_warning_dark.xml
index 5867f67ce..e25ef23a2 100644
--- a/src/main/res/drawable/message_bubble_received_warning_dark.xml
+++ b/src/main/res/drawable/message_bubble_received_warning_dark.xml
@@ -4,18 +4,11 @@
         android:topLeftRadius="0dp"
         android:topRightRadius="5dp"
         android:bottomRightRadius="5dp"
-        android:bottomLeftRadius="5dp">
-    </corners>
+        android:bottomLeftRadius="5dp" />
     <padding
         android:bottom="4dp"
         android:left="6dp"
         android:right="6dp"
         android:top="4dp" />
-    <stroke
-        android:width="1dp"
-        android:color="@color/grey700">
-    </stroke>
-    <solid
-        android:color="@color/darkred">
-    </solid>
+    <solid android:color="@color/darkred" />
 </shape>
\ No newline at end of file
diff --git a/src/main/res/drawable/message_bubble_sent_blue_dark.xml b/src/main/res/drawable/message_bubble_sent.xml
index d9853bf74..7908e72e4 100644
--- a/src/main/res/drawable/message_bubble_sent_blue_dark.xml
+++ b/src/main/res/drawable/message_bubble_sent.xml
@@ -4,18 +4,14 @@
         android:topLeftRadius="5dp"
         android:topRightRadius="5dp"
         android:bottomRightRadius="0dp"
-        android:bottomLeftRadius="5dp">
-    </corners>
+        android:bottomLeftRadius="5dp" />
     <padding
         android:bottom="4dp"
         android:left="6dp"
         android:right="6dp"
         android:top="4dp" />
     <stroke
-        android:width="1dp"
-        android:color="@color/grey700">
-    </stroke>
-    <solid
-        android:color="@color/darkblue">
-    </solid>
+        android:width="1.5dp"
+        android:color="@color/black12" />
+    <solid android:color="@color/lightblue" />
 </shape>
\ No newline at end of file
diff --git a/src/main/res/drawable/message_bubble_sent_blue.xml b/src/main/res/drawable/message_bubble_sent_dark.xml
index 1ee3ad0c8..3cbe163ec 100644
--- a/src/main/res/drawable/message_bubble_sent_blue.xml
+++ b/src/main/res/drawable/message_bubble_sent_dark.xml
@@ -4,18 +4,11 @@
         android:topLeftRadius="5dp"
         android:topRightRadius="5dp"
         android:bottomRightRadius="0dp"
-        android:bottomLeftRadius="5dp">
-    </corners>
+        android:bottomLeftRadius="5dp" />
     <padding
         android:bottom="4dp"
         android:left="6dp"
         android:right="6dp"
         android:top="4dp" />
-    <stroke
-        android:width="1dp"
-        android:color="@color/grey500">
-    </stroke>
-    <solid
-        android:color="@color/lightblue">
-    </solid>
+    <solid android:color="@color/darkblue" />
 </shape>
\ No newline at end of file
diff --git a/src/main/res/layout/account_row.xml b/src/main/res/layout/account_row.xml
index e56ca6a95..9b638172a 100644
--- a/src/main/res/layout/account_row.xml
+++ b/src/main/res/layout/account_row.xml
@@ -15,8 +15,6 @@
         android:layout_alignParentLeft="true"
         android:contentDescription="@string/account_image_description"
         android:padding="1dp"
-        app:riv_border_color="?attr/color_border"
-        app:riv_border_width="1dp"
         app:riv_corner_radius="@dimen/rounded_image_border" />
 
     <LinearLayout
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index b8c48a382..0742955d3 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -54,8 +54,6 @@
                             android:maxWidth="384dp"
                             android:maxHeight="384dp"
                             android:padding="1dp"
-                            app:riv_border_color="?attr/color_border"
-                            app:riv_border_width="1dp"
                             app:riv_corner_radius="@dimen/rounded_image_border" />
 
                         <LinearLayout
diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index 29400a246..bb5a375a4 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -156,8 +156,6 @@
                                     android:maxHeight="384dp"
                                     android:padding="1dp"
                                     android:scaleType="centerCrop"
-                                    app:riv_border_color="?attr/color_border"
-                                    app:riv_border_width="1dp"
                                     app:riv_corner_radius="@dimen/rounded_image_border" />
                             </RelativeLayout>
 
@@ -359,8 +357,6 @@
                                     android:layout_alignParentEnd="false"
                                     android:layout_alignParentRight="false"
                                     android:padding="1dp"
-                                    app:riv_border_color="?attr/color_border"
-                                    app:riv_border_width="1dp"
                                     app:riv_corner_radius="@dimen/rounded_image_border" />
 
                                 <LinearLayout
diff --git a/src/main/res/layout/activity_publish_profile_picture.xml b/src/main/res/layout/activity_publish_profile_picture.xml
index 0fb666365..ecb82f17e 100644
--- a/src/main/res/layout/activity_publish_profile_picture.xml
+++ b/src/main/res/layout/activity_publish_profile_picture.xml
@@ -51,8 +51,6 @@
                             android:maxHeight="384dp"
                             android:padding="1dp"
                             android:scaleType="centerCrop"
-                            app:riv_border_color="?attr/color_border"
-                            app:riv_border_width="1dp"
                             app:riv_corner_radius="@dimen/rounded_image_border" />
                     </FrameLayout>
 
diff --git a/src/main/res/layout/contact.xml b/src/main/res/layout/contact.xml
index 09e0ac9bf..a8f4ff499 100644
--- a/src/main/res/layout/contact.xml
+++ b/src/main/res/layout/contact.xml
@@ -13,8 +13,6 @@
             android:layout_width="56dp"
             android:layout_height="56dp"
             android:layout_alignParentLeft="true"
-            app:riv_border_color="?attr/color_border"
-            app:riv_border_width="1dp"
             app:riv_corner_radius="@dimen/rounded_image_border" />
 
         <LinearLayout
diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml
index ed0e9e1cc..bfcf3bdca 100644
--- a/src/main/res/layout/conversation_list_row.xml
+++ b/src/main/res/layout/conversation_list_row.xml
@@ -24,8 +24,6 @@
                 android:layout_alignParentLeft="true"
                 android:padding="1dp"
                 android:scaleType="centerCrop"
-                app:riv_border_color="?attr/color_border"
-                app:riv_border_width="1dp"
                 app:riv_corner_radius="@dimen/rounded_image_border" />
 
             <RelativeLayout
diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml
index 8917333c1..3151f6401 100644
--- a/src/main/res/layout/fragment_conversation.xml
+++ b/src/main/res/layout/fragment_conversation.xml
@@ -91,7 +91,7 @@
                     android:layout_alignParentStart="true"
                     android:layout_toLeftOf="@+id/textSendButton"
                     android:layout_toStartOf="@+id/textSendButton"
-                    android:background="@drawable/message_bubble_sent_blue"
+                    android:background="@drawable/message_bubble_sent"
                     android:orientation="horizontal"
                     android:paddingTop="8dp"
                     android:requiresFadingEdge="horizontal"
@@ -108,7 +108,7 @@
                     android:layout_toLeftOf="@+id/textSendButton"
                     android:layout_toRightOf="@+id/recordVoiceButton"
                     android:layout_toStartOf="@+id/textSendButton"
-                    android:background="@drawable/message_bubble_sent_blue"
+                    android:background="@drawable/message_bubble_sent"
                     android:ems="10"
                     android:imeOptions="flagNoExtractUi|actionSend"
                     android:inputType="textShortMessage|textMultiLine|textCapSentences"
diff --git a/src/main/res/layout/message_content.xml b/src/main/res/layout/message_content.xml
index 044f8c64d..296944565 100644
--- a/src/main/res/layout/message_content.xml
+++ b/src/main/res/layout/message_content.xml
@@ -13,8 +13,6 @@
         android:maxHeight="500dp"
         android:maxWidth="500dp"
         android:scaleType="centerCrop"
-        app:riv_border_color="?attr/color_border"
-        app:riv_border_width="1dp"
         app:riv_corner_radius="@dimen/rounded_image_border" />
 
     <de.pixart.messenger.ui.widget.CopyTextView
diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index 2c6fd044a..dd4602b62 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -16,8 +16,6 @@
         android:layout_alignParentLeft="true"
         android:layout_alignParentTop="true"
         android:scaleType="fitXY"
-        app:riv_border_color="?attr/color_border"
-        app:riv_border_width="1dip"
         app:riv_corner_radius="@dimen/rounded_image_border" />
 
     <LinearLayout
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index 2526e4dd2..a0defa5a6 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -23,8 +23,6 @@
             android:layout_width="48dp"
             android:layout_height="48dp"
             android:scaleType="fitXY"
-            app:riv_border_color="?attr/color_border"
-            app:riv_border_width="1dp"
             app:riv_corner_radius="@dimen/rounded_image_border" />
 
         <View
@@ -42,7 +40,7 @@
         android:layout_marginRight="4dp"
         android:layout_toLeftOf="@+id/message_photo_box"
         android:layout_toStartOf="@+id/message_photo_box"
-        android:background="@drawable/message_bubble_sent_blue"
+        android:background="@drawable/message_bubble_sent"
         android:longClickable="true"
         android:minHeight="48dp">
 
diff --git a/src/main/res/layout/message_status.xml b/src/main/res/layout/message_status.xml
index d42637175..bd731cbe4 100644
--- a/src/main/res/layout/message_status.xml
+++ b/src/main/res/layout/message_status.xml
@@ -29,8 +29,6 @@
         android:padding="0dp"
         android:scaleType="fitXY"
         android:visibility="gone"
-        app:riv_border_color="?attr/color_border"
-        app:riv_border_width="1dp"
         app:riv_corner_radius="@dimen/rounded_image_border" />
 
     <TextView