Merge branch 'trz/rebase' into trz/rename

1 files changed, 14 insertions, 12 deletions

diff --git a/src/main/res/layout/account_row.xml b/src/main/res/layout/account_row.xml
index 77138a4a..05270e3a 100644
--- a/src/main/res/layout/account_row.xml
+++ b/src/main/res/layout/account_row.xml
@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?android:attr/activatedBackgroundIndicator"
-    android:paddingLeft="8dp"
-    android:paddingBottom="8dp"
-    android:paddingTop="8dp">
+                xmlns:app="http://schemas.android.com/apk/res-auto"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="?android:attr/activatedBackgroundIndicator"
+                android:paddingLeft="8dp"
+                android:paddingBottom="8dp"
+                android:paddingTop="8dp">
 
-    <ImageView
+    <com.makeramen.roundedimageview.RoundedImageView
         android:id="@+id/account_image"
         android:layout_width="48dp"
         android:layout_height="48dp"
         android:layout_alignParentLeft="true"
         android:src="@drawable/ic_profile"
-        android:contentDescription="@string/account_image_description">
-    </ImageView>
+        android:contentDescription="@string/account_image_description"
+        app:riv_corner_radius="2dp" />
 
     <LinearLayout
         android:layout_width="fill_parent"
@@ -40,18 +41,19 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/account_status_unknown"
-            android:textColor="@color/secondaryText"
+            android:textColor="@color/black54"
             android:textSize="?attr/TextSizeBody"
             android:textStyle="bold" />
     </LinearLayout>
 
-    <Switch
+    <de.thedevstack.conversationsplus.ui.widget.Switch
+        style="@style/MD"
         android:id="@+id/tgl_account_status"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
-        android:padding="8dp"
+        android:padding="16dp"
         android:focusable="false"/>
 
 </RelativeLayout>
\ No newline at end of file