allow for very basic muc configuration

3 files changed, 160 insertions, 118 deletions

diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index f689f10d..8299e832 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -1,119 +1,146 @@
 <?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_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: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="@drawable/ic_action_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"
+				/>
+			<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="@drawable/ic_action_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_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>
 </ScrollView>
\ No newline at end of file
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index c9876d01..1240da79 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -390,8 +390,16 @@
     <string name="grant_admin_privileges">Administratorrechte gewähren</string>
     <string name="remove_admin_privileges">Administratorrechte entziehen</string>
     <string name="remove_from_room">Aus Konferenz entfernen</string>
-    <string name="could_not_change_affiliation">Zugehörigkeit kann nicht geändert werden</string>
+    <string name="could_not_change_affiliation">Zugehörigkeit von %s konnte nicht verändernd werden</string>
     <string name="ban_from_conference">Von Konferenz ausschließen.</string>
     <string name="removing_from_public_conference">Du versuchst %s aus einer öffentlichen Konferenz zu entfernen. Die einzige Möglichkeit, dies dauerhaft zu tun, ist den Kontakt aus dieser Konferenz zu verbannen.</string>
     <string name="ban_now">Kontakt ausschließen</string>
+	<string name="could_not_change_role">Rolle von %s konnte nicht geändert werden</string>
+	<string name="public_conference">Das ist eine öffentlich zugängliche Konferenz</string>
+	<string name="private_conference">Das ist eine private Konferenz nur für Mitglieder</string>
+	<string name="conference_options">Konferenzoptionen</string>
+	<string name="members_only">Privat (Nur für Mitglieder)</string>
+	<string name="non_anonymous">De-anonymisiert</string>
+	<string name="modified_conference_options">Konferenzoptionen wurden modifiziert!</string>
+	<string name="could_not_modify_conference_options">Konferenzoptionen konnten nicht modifiziert werden</string>
 </resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index bbac0c7c..fdc211e4 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -416,9 +416,16 @@
 	<string name="grant_admin_privileges">Grant admin privileges</string>
 	<string name="remove_admin_privileges">Revoke admin privileges</string>
 	<string name="remove_from_room">Remove from conference</string>
-	<string name="could_not_change_affiliation">Could not change affiliation</string>
+	<string name="could_not_change_affiliation">Could not change affiliation of %s</string>
 	<string name="ban_from_conference">Ban from conference</string>
 	<string name="removing_from_public_conference">You are trying to remove %s from a public conference. The only way to do that is to ban that user for ever.</string>
 	<string name="ban_now">Ban now</string>
-	<string name="could_not_change_role">Could not change role</string>
+	<string name="could_not_change_role">Could not change role of %s</string>
+	<string name="public_conference">This is a publicly accessible conference</string>
+	<string name="private_conference">This is a private, members only conference</string>
+	<string name="conference_options">Conference options</string>
+	<string name="members_only">Private (Members only)</string>
+	<string name="non_anonymous">Non-anonymous</string>
+	<string name="modified_conference_options">Modified conference options!</string>
+	<string name="could_not_modify_conference_options">Could not modify conference options</string>
 </resources>