Merge master-origin

Conflicts:
	src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
	src/main/java/eu/siacs/conversations/ui/XmppActivity.java
	src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
	src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
	src/main/java/eu/siacs/conversations/utils/UIHelper.java
	src/main/res/values-de/strings.xml

1 files changed, 150 insertions, 115 deletions

diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index f689f10d..36873654 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -1,119 +1,154 @@
 <?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/secondarybackground" >
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical" >
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="8dp"
-        android:background="@drawable/infocard_border"
-        android:orientation="vertical"
-        android:padding="16dp" >
-
-        <TextView
-            android:id="@+id/muc_jabberid"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/account_settings_example_jabber_id"
-            android:textColor="@color/primarytext"
-            android:textSize="?attr/TextSizeHeadline"
-            android:textStyle="bold"
-            android:layout_marginBottom="16dp"/>
-        
-        <RelativeLayout
             android:layout_width="fill_parent"
-            android:layout_height="wrap_content">
-
-            <ImageView
-                android:id="@+id/your_photo"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:layout_alignParentLeft="true"
-                android:src="@drawable/ic_profile" >
-            </ImageView>
-
-            <LinearLayout
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:layout_toRightOf="@+id/your_photo"
-                android:orientation="vertical"
-                android:paddingLeft="8dp" >
-
-                <TextView
-                    android:id="@+id/muc_your_nick"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:singleLine="true"
-                    android:textColor="@color/primarytext"
-                    android:textSize="?attr/TextSizeHeadline" />
-
-                <TextView
-                    android:id="@+id/muc_role"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:singleLine="true"
-                    android:textColor="@color/primarytext"
-                    android:textSize="?attr/TextSizeBody" />
-            </LinearLayout>
-
-            <ImageButton
-                android:id="@+id/edit_nick_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:background="?android:selectableItemBackground"
-                android:padding="8dp"
-                android:src="@drawable/ic_action_edit_dark" />
-        </RelativeLayout>
-         <TextView
-                android:id="@+id/details_account"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="right"
-                android:layout_marginTop="32dp"
-                android:text="@string/using_account"
-                android:textColor="@color/secondarytext"
-                android:textSize="?attr/TextSizeInfo" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/muc_more_details"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="8dp"
-        android:background="@drawable/infocard_border"
-        android:orientation="vertical"
-        android:padding="8dp" >
-
-
-            <LinearLayout
-                android:id="@+id/muc_members"
-                android:layout_width="fill_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1"
-                android:divider="?android:dividerHorizontal"
-                android:orientation="vertical"
-                android:showDividers="middle" >
-            </LinearLayout>
-
-        <Button
-            android:id="@+id/invite"
-            style="?android:attr/buttonStyleSmall"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="24dp"
-            android:text="@string/invite_contact" />
-    </LinearLayout>
-
-</LinearLayout>
+            android:layout_height="fill_parent"
+            android:background="@color/secondarybackground">
+
+	<LinearLayout
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:orientation="vertical">
+
+		<LinearLayout
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginLeft="@dimen/activity_horizontal_margin"
+			android:layout_marginRight="@dimen/activity_horizontal_margin"
+			android:layout_marginTop="@dimen/activity_vertical_margin"
+			android:layout_marginBottom="@dimen/activity_vertical_margin"
+			android:background="@drawable/infocard_border"
+			android:orientation="vertical"
+			android:padding="@dimen/infocard_padding">
+
+			<TextView
+				android:id="@+id/muc_jabberid"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_marginBottom="16dp"
+				android:text="@string/account_settings_example_jabber_id"
+				android:textColor="@color/primarytext"
+				android:textSize="?attr/TextSizeHeadline"
+				android:textStyle="bold"/>
+
+			<RelativeLayout
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginBottom="32dp">
+
+				<ImageView
+					android:id="@+id/your_photo"
+					android:layout_width="48dp"
+					android:layout_height="48dp"
+					android:layout_alignParentLeft="true"
+					android:src="@drawable/ic_profile">
+				</ImageView>
+
+				<LinearLayout
+					android:layout_width="fill_parent"
+					android:layout_height="wrap_content"
+					android:layout_centerVertical="true"
+					android:layout_toRightOf="@+id/your_photo"
+					android:orientation="vertical"
+					android:paddingLeft="8dp">
+
+					<TextView
+						android:id="@+id/muc_your_nick"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:singleLine="true"
+						android:textColor="@color/primarytext"
+						android:textSize="?attr/TextSizeHeadline"/>
+
+					<TextView
+						android:id="@+id/muc_role"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:singleLine="true"
+						android:textColor="@color/primarytext"
+						android:textSize="?attr/TextSizeBody"/>
+				</LinearLayout>
+
+				<ImageButton
+					android:id="@+id/edit_nick_button"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_alignParentRight="true"
+					android:layout_centerVertical="true"
+					android:background="?android:selectableItemBackground"
+					android:padding="8dp"
+					android:src="?attr/icon_edit_dark"/>
+			</RelativeLayout>
+
+			<RelativeLayout
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content">
+				<TextView
+				android:id="@+id/muc_conference_type"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+			    android:text="@string/private_conference"
+				android:layout_centerVertical="true"
+				android:textColor="@color/primarytext"
+				android:textSize="?attr/TextSizeBody"
+				android:layout_alignParentLeft="true"
+				android:layout_toLeftOf="@+id/change_conference_button"
+				/>
+			<ImageButton
+				android:id="@+id/change_conference_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="8dp"
+				android:src="?attr/icon_settings"/>
+				</RelativeLayout>
+
+			<TextView
+				android:id="@+id/details_account"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="right"
+				android:layout_marginTop="32dp"
+				android:text="@string/using_account"
+				android:textColor="@color/secondarytext"
+				android:textSize="?attr/TextSizeInfo"/>
+		</LinearLayout>
+
+		<LinearLayout
+			android:id="@+id/muc_more_details"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginLeft="@dimen/activity_horizontal_margin"
+			android:layout_marginRight="@dimen/activity_horizontal_margin"
+			android:layout_marginTop="@dimen/activity_vertical_margin"
+			android:layout_marginBottom="@dimen/activity_vertical_margin"
+			android:background="@drawable/infocard_border"
+			android:orientation="vertical"
+			android:padding="@dimen/infocard_padding">
+
+
+			<LinearLayout
+				android:id="@+id/muc_members"
+				android:layout_width="fill_parent"
+				android:layout_height="0dp"
+				android:layout_weight="1"
+				android:divider="?android:dividerHorizontal"
+				android:orientation="vertical"
+				android:showDividers="middle">
+			</LinearLayout>
+
+			<Button
+				android:id="@+id/invite"
+				style="?android:attr/buttonStyleSmall"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center_horizontal"
+				android:layout_marginTop="24dp"
+				android:text="@string/invite_contact"/>
+		</LinearLayout>
+
+	</LinearLayout>
 </ScrollView>
\ No newline at end of file