aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/res/layout/account_row.xml19
-rw-r--r--src/main/res/layout/activity_edit_account.xml15
-rw-r--r--src/main/res/layout/activity_muc_details.xml13
-rw-r--r--src/main/res/layout/contact.xml15
-rw-r--r--src/main/res/layout/conversation_list_row.xml12
-rw-r--r--src/main/res/layout/message_received.xml20
-rw-r--r--src/main/res/layout/message_sent.xml20
-rw-r--r--src/main/res/layout/message_status.xml20
8 files changed, 74 insertions, 60 deletions
diff --git a/src/main/res/layout/account_row.xml b/src/main/res/layout/account_row.xml
index 077170b29..cac9a9fa6 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"
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index 53226b826..3dabfc6fc 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="@color/grey200" >
+ xmlns:tools="http://schemas.android.com/tools"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@color/grey200">
<ScrollView
android:layout_width="fill_parent"
@@ -27,12 +28,14 @@
android:background="@drawable/infocard_border"
android:orientation="vertical"
android:padding="@dimen/infocard_padding">
- <ImageView android:id="@+id/avater"
+ <com.makeramen.roundedimageview.RoundedImageView
+ android:id="@+id/avater"
android:layout_width="72dp"
android:layout_height="72dp"
android:layout_alignParentTop="true"
android:layout_marginRight="16dp"
- android:contentDescription="@string/account_image_description"/>
+ android:contentDescription="@string/account_image_description"
+ app:riv_corner_radius="2dp"/>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index b89c9945b..6edbb7060 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:background="@color/grey200">
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:background="@color/grey200">
<LinearLayout
android:layout_width="fill_parent"
@@ -35,13 +36,13 @@
android:layout_height="wrap_content"
android:layout_marginBottom="32dp">
- <ImageView
+ <com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/your_photo"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_alignParentLeft="true"
- android:src="@drawable/ic_profile">
- </ImageView>
+ android:src="@drawable/ic_profile"
+ app:riv_corner_radius="2dp" />
<LinearLayout
android:layout_width="fill_parent"
diff --git a/src/main/res/layout/contact.xml b/src/main/res/layout/contact.xml
index 3c0c74876..56443c346 100644
--- a/src/main/res/layout/contact.xml
+++ b/src/main/res/layout/contact.xml
@@ -1,18 +1,19 @@
<?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:padding="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:padding="8dp">
- <ImageView
+ <com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/contact_photo"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_alignParentLeft="true"
android:scaleType="centerCrop"
- android:src="@drawable/ic_profile" >
- </ImageView>
+ android:src="@drawable/ic_profile"
+ app:riv_corner_radius="2dp" />
<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 28e526e0b..15fa60af4 100644
--- a/src/main/res/layout/conversation_list_row.xml
+++ b/src/main/res/layout/conversation_list_row.xml
@@ -1,7 +1,8 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:descendantFocusability="blocksDescendants">
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:descendantFocusability="blocksDescendants">
<View
android:layout_width="fill_parent"
@@ -21,12 +22,13 @@
android:orientation="horizontal"
android:padding="8dp" >
- <ImageView
+ <com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/conversation_image"
android:layout_width="56dp"
android:layout_height="56dp"
android:layout_alignParentLeft="true"
- android:scaleType="centerCrop" />
+ android:scaleType="centerCrop"
+ app:riv_corner_radius="2dp" />
<RelativeLayout
android:layout_width="fill_parent"
diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index 4de9adddf..1919c0753 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -1,21 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:paddingBottom="3dp"
- android:paddingLeft="8dp"
- android:paddingRight="8dp"
- android:paddingTop="3dp">
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:paddingBottom="3dp"
+ android:paddingLeft="8dp"
+ android:paddingRight="8dp"
+ android:paddingTop="3dp">
- <ImageView
+ <com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/message_photo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:scaleType="fitXY"
- android:src="@drawable/ic_profile" />
+ android:src="@drawable/ic_profile"
+ app:riv_corner_radius="2dp" />
<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 96e7808f2..24750c9ba 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -1,14 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:paddingBottom="3dp"
- android:paddingLeft="8dp"
- android:paddingRight="8dp"
- android:paddingTop="3dp">
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:paddingBottom="3dp"
+ android:paddingLeft="8dp"
+ android:paddingRight="8dp"
+ android:paddingTop="3dp">
- <ImageView
+ <com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/message_photo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -17,7 +18,8 @@
android:src="@drawable/ic_profile"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
- android:layout_alignParentEnd="true"/>
+ android:layout_alignParentEnd="true"
+ app:riv_corner_radius="2dp" />
<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 222e23f5e..ad2579faa 100644
--- a/src/main/res/layout/message_status.xml
+++ b/src/main/res/layout/message_status.xml
@@ -1,14 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:paddingBottom="5dp"
- android:paddingLeft="8dp"
- android:paddingRight="8dp"
- android:paddingTop="5dp" >
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:paddingBottom="5dp"
+ android:paddingLeft="8dp"
+ android:paddingRight="8dp"
+ android:paddingTop="5dp">
- <ImageView
+ <com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/message_photo"
android:layout_width="32dp"
android:layout_height="32dp"
@@ -17,7 +18,8 @@
android:layout_marginRight="-1.5dp"
android:padding="0dp"
android:scaleType="fitXY"
- android:src="@drawable/ic_profile" />
+ android:src="@drawable/ic_profile"
+ app:riv_corner_radius="1dp"/>
<TextView
android:id="@+id/status_message"