From 092926db0bdf298bb99b41ab67305c34aa960469 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Fri, 28 Sep 2018 22:33:28 +0200
Subject: Revert "design: bubbles more curvier, avatar higher radius and no
 border"

This reverts commit 1816092e68584b5794303578b6af6d621ffc58d4.
This causes render errors on some devices.
---
 src/main/res/layout/account_row.xml                      | 2 ++
 src/main/res/layout/activity_edit_account.xml            | 2 ++
 src/main/res/layout/activity_muc_details.xml             | 4 ++++
 src/main/res/layout/activity_publish_profile_picture.xml | 2 ++
 src/main/res/layout/contact.xml                          | 2 ++
 src/main/res/layout/conversation_list_row.xml            | 2 ++
 src/main/res/layout/message_content.xml                  | 2 ++
 src/main/res/layout/message_received.xml                 | 4 +++-
 src/main/res/layout/message_sent.xml                     | 4 +++-
 src/main/res/layout/message_status.xml                   | 2 ++
 10 files changed, 24 insertions(+), 2 deletions(-)

(limited to 'src/main/res/layout')

diff --git a/src/main/res/layout/account_row.xml b/src/main/res/layout/account_row.xml
index 9b638172a..e56ca6a95 100644
--- a/src/main/res/layout/account_row.xml
+++ b/src/main/res/layout/account_row.xml
@@ -15,6 +15,8 @@
         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 275a1d894..342d748f0 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -54,6 +54,8 @@
                             android:maxHeight="384dp"
                             android:maxWidth="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 e1ac744ea..c88afab8d 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -157,6 +157,8 @@
                                     android:maxWidth="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,6 +361,8 @@
                                     android:layout_alignParentLeft="true"
                                     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 1db8a159d..3f883f1ba 100644
--- a/src/main/res/layout/activity_publish_profile_picture.xml
+++ b/src/main/res/layout/activity_publish_profile_picture.xml
@@ -45,6 +45,8 @@
                         android:maxWidth="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 9635d4c47..ef020f976 100644
--- a/src/main/res/layout/contact.xml
+++ b/src/main/res/layout/contact.xml
@@ -13,6 +13,8 @@
             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 cbd884ae2..3e3bef6c9 100644
--- a/src/main/res/layout/conversation_list_row.xml
+++ b/src/main/res/layout/conversation_list_row.xml
@@ -24,6 +24,8 @@
                 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/message_content.xml b/src/main/res/layout/message_content.xml
index 296944565..044f8c64d 100644
--- a/src/main/res/layout/message_content.xml
+++ b/src/main/res/layout/message_content.xml
@@ -13,6 +13,8 @@
         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 f8b5fce95..2c6fd044a 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -16,6 +16,8 @@
         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
@@ -23,7 +25,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:layout_marginLeft="-7dp"
+        android:layout_marginLeft="4dp"
         android:layout_marginRight="4dp"
         android:layout_toRightOf="@+id/message_photo"
         android:background="@drawable/message_bubble_received_light"
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index 188e466d5..2526e4dd2 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -23,6 +23,8 @@
             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
@@ -37,7 +39,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_marginLeft="4dp"
-        android:layout_marginRight="-7dp"
+        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"
diff --git a/src/main/res/layout/message_status.xml b/src/main/res/layout/message_status.xml
index bd731cbe4..d42637175 100644
--- a/src/main/res/layout/message_status.xml
+++ b/src/main/res/layout/message_status.xml
@@ -29,6 +29,8 @@
         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
-- 
cgit v1.2.3