Merge branch 'trz/rebase' into trz/rename

1 files changed, 66 insertions, 8 deletions

diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index a35e3301..4c6b0301 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -1,10 +1,12 @@
 <?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:id="@+id/muc_main_layout"
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content"
 		android:orientation="vertical">
@@ -35,13 +37,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"
@@ -86,7 +88,7 @@
 				android:id="@+id/muc_conference_type"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-			    android:text="@string/private_conference"
+				android:text="@string/private_conference"
 				android:layout_centerVertical="true"
 				android:textColor="@color/primaryText"
 				android:textSize="?attr/TextSizeBody"
@@ -102,10 +104,66 @@
 				android:layout_alignParentRight="true"
 				android:layout_centerVertical="true"
 				android:background="?android:selectableItemBackground"
-				android:padding="@dimen/image_button_padding"
+				android:padding="8dp"
 				android:src="?attr/icon_settings"/>
 				</RelativeLayout>
 
+			<RelativeLayout
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content">
+				<TextView
+					android:id="@+id/notification_status_text"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="@string/notify_on_all_messages"
+					android:layout_centerVertical="true"
+					android:textColor="@color/primaryText"
+					android:textSize="?attr/TextSizeBody"
+					android:layout_alignParentLeft="true"
+					android:layout_toLeftOf="@+id/notification_status_button"
+					/>
+				<ImageButton
+					android:id="@+id/notification_status_button"
+					style="?android:attr/buttonStyleSmall"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_gravity="center_horizontal"
+					android:layout_alignParentRight="true"
+					android:layout_centerVertical="true"
+					android:background="?android:selectableItemBackground"
+					android:padding="@dimen/image_button_padding"
+					android:src="@drawable/ic_notifications_grey600_24dp"/>
+			</RelativeLayout>
+
+			<TableLayout
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:id="@+id/muc_info_more"
+				android:stretchColumns="1"
+				android:visibility="gone">
+
+				<TableRow
+					android:layout_width="fill_parent"
+					android:layout_height="match_parent">
+
+					<TextView
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:text="@string/server_info_mam"
+						android:textColor="@color/primaryText"
+						android:textSize="?attr/TextSizeBody" />
+
+					<TextView
+						android:id="@+id/muc_info_mam"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:layout_gravity="right"
+						android:textColor="@color/primaryText"
+						android:textSize="?attr/TextSizeBody" />
+				</TableRow>
+
+			</TableLayout>
+
 			<TextView
 				android:id="@+id/details_account"
 				android:layout_width="wrap_content"