optimized some colors and switched back to square avatars

11 files changed, 22 insertions, 18 deletions

diff --git a/src/main/res/layout/account_row.xml b/src/main/res/layout/account_row.xml
index 6a9dee422..f0b539c6d 100644
--- a/src/main/res/layout/account_row.xml
+++ b/src/main/res/layout/account_row.xml
@@ -13,10 +13,11 @@
         android:layout_width="48dp"
         android:layout_height="48dp"
         android:layout_alignParentLeft="true"
-        android:background="@drawable/message_border"
         android:contentDescription="@string/account_image_description"
         android:padding="1dp"
-        app:riv_corner_radius="24dp" />
+        app:riv_border_color="?attr/message_border"
+        app:riv_border_width="1dp"
+        app:riv_corner_radius="@dimen/rounded_image_border" />
 
     <LinearLayout
         android:layout_width="fill_parent"
diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml
index 2f8f33f01..f6a2b1069 100644
--- a/src/main/res/layout/activity_contact_details.xml
+++ b/src/main/res/layout/activity_contact_details.xml
@@ -56,7 +56,7 @@
                             android:layout_below="@+id/contact_display_name"
                             android:layout_centerHorizontal="true"
                             android:adjustViewBounds="true"
-                            android:background="@drawable/message_border"
+                            android:background="?attr/message_border"
                             android:maxHeight="384dp"
                             android:maxWidth="384dp"
                             android:padding="1dp"
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index 8a77f939a..dcd358201 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -49,12 +49,13 @@
                             android:layout_centerHorizontal="true"
                             android:layout_marginBottom="16dp"
                             android:adjustViewBounds="true"
-                            android:background="@drawable/message_border"
                             android:contentDescription="@string/account_image_description"
                             android:maxHeight="384dp"
                             android:maxWidth="384dp"
                             android:padding="1dp"
-                            app:riv_corner_radius="5dp" />
+                            app:riv_border_color="?attr/message_border"
+                            app:riv_border_width="1dp"
+                            app:riv_corner_radius="@dimen/rounded_image_border" />
 
                         <LinearLayout
                             android:id="@+id/jid_password_box"
diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index 35fe03f16..ac668c70e 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -50,16 +50,18 @@
                             android:textIsSelectable="false"
                             android:textStyle="bold" />
 
-                        <ImageView
+                        <com.makeramen.roundedimageview.RoundedImageView
                             android:id="@+id/details_muc_avatar"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:adjustViewBounds="true"
-                            android:background="@drawable/message_border"
                             android:maxHeight="384dp"
                             android:maxWidth="384dp"
                             android:padding="1dp"
-                            android:scaleType="centerCrop" />
+                            android:scaleType="centerCrop"
+                            app:riv_border_color="?attr/color_border"
+                            app:riv_border_width="1dp"
+                            app:riv_corner_radius="@dimen/rounded_image_border"/>
 
                         <RelativeLayout
                             android:id="@+id/muc_settings"
@@ -133,7 +135,7 @@
                                 android:padding="1dp"
                                 app:riv_border_color="?attr/color_border"
                                 app:riv_border_width="1dp"
-                                app:riv_corner_radius="36dp" />
+                                app:riv_corner_radius="@dimen/rounded_image_border" />
 
                             <LinearLayout
                                 android:layout_width="fill_parent"
diff --git a/src/main/res/layout/activity_publish_profile_picture.xml b/src/main/res/layout/activity_publish_profile_picture.xml
index dd3afeeac..1ede0bea1 100644
--- a/src/main/res/layout/activity_publish_profile_picture.xml
+++ b/src/main/res/layout/activity_publish_profile_picture.xml
@@ -48,12 +48,13 @@
                         android:layout_alignParentTop="true"
                         android:layout_centerHorizontal="true"
                         android:adjustViewBounds="true"
-                        android:background="@drawable/message_border"
                         android:contentDescription="@string/account_image_description"
                         android:maxHeight="384dp"
                         android:maxWidth="384dp"
                         android:padding="1dp"
-                        app:riv_corner_radius="5dp" />
+                        app:riv_border_color="?attr/message_border"
+                        app:riv_border_width="1dp"
+                        app:riv_corner_radius="@dimen/rounded_image_border" />
                 </LinearLayout>
 
                 <TextView
diff --git a/src/main/res/layout/contact.xml b/src/main/res/layout/contact.xml
index 47a5a74ad..c2e374356 100644
--- a/src/main/res/layout/contact.xml
+++ b/src/main/res/layout/contact.xml
@@ -15,7 +15,7 @@
             android:layout_alignParentLeft="true"
             app:riv_border_color="?attr/color_border"
             app:riv_border_width="1dp"
-            app:riv_corner_radius="28dp" />
+            app:riv_corner_radius="@dimen/rounded_image_border" />
 
         <LinearLayout
             android:layout_width="wrap_content"
diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml
index 6acc6a56f..b00be5a4b 100644
--- a/src/main/res/layout/conversation_list_row.xml
+++ b/src/main/res/layout/conversation_list_row.xml
@@ -22,12 +22,11 @@
                 android:layout_width="56dp"
                 android:layout_height="56dp"
                 android:layout_alignParentLeft="true"
-                android:background="@drawable/message_border"
                 android:padding="1dp"
                 android:scaleType="centerCrop"
                 app:riv_border_color="?attr/color_border"
                 app:riv_border_width="1dp"
-                app:riv_corner_radius="28dp" />
+                app:riv_corner_radius="@dimen/rounded_image_border" />
 
             <RelativeLayout
                 android:layout_width="fill_parent"
diff --git a/src/main/res/layout/message_content.xml b/src/main/res/layout/message_content.xml
index 37f374f65..044f8c64d 100644
--- a/src/main/res/layout/message_content.xml
+++ b/src/main/res/layout/message_content.xml
@@ -15,7 +15,7 @@
         android:scaleType="centerCrop"
         app:riv_border_color="?attr/color_border"
         app:riv_border_width="1dp"
-        app:riv_corner_radius="5dp" />
+        app:riv_corner_radius="@dimen/rounded_image_border" />
 
     <de.pixart.messenger.ui.widget.CopyTextView
         android:id="@+id/message_body"
diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index dbc379aaf..2c6fd044a 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -18,7 +18,7 @@
         android:scaleType="fitXY"
         app:riv_border_color="?attr/color_border"
         app:riv_border_width="1dip"
-        app:riv_corner_radius="24dp" />
+        app:riv_corner_radius="@dimen/rounded_image_border" />
 
     <LinearLayout
         android:id="@+id/message_box"
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index 0174a9f57..63ce65b76 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -19,7 +19,7 @@
         android:scaleType="fitXY"
         app:riv_border_color="?attr/color_border"
         app:riv_border_width="1dp"
-        app:riv_corner_radius="24dp" />
+        app:riv_corner_radius="@dimen/rounded_image_border" />
 
     <LinearLayout
         android:id="@+id/message_box"
diff --git a/src/main/res/layout/message_status.xml b/src/main/res/layout/message_status.xml
index e9c43279f..d42637175 100644
--- a/src/main/res/layout/message_status.xml
+++ b/src/main/res/layout/message_status.xml
@@ -31,7 +31,7 @@
         android:visibility="gone"
         app:riv_border_color="?attr/color_border"
         app:riv_border_width="1dp"
-        app:riv_corner_radius="16dp" />
+        app:riv_corner_radius="@dimen/rounded_image_border" />
 
     <TextView
         android:id="@+id/status_message"