refactored ConferenceDetails layout

2 files changed, 113 insertions, 96 deletions

diff --git a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
index c806a03e4..0ddc8b3d8 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
@@ -20,6 +20,7 @@ import android.widget.Button;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
 import android.widget.TableLayout;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -64,7 +65,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
 	private LinearLayout membersView;
 	private LinearLayout mMoreDetails;
 	private TextView mConferenceType;
-	private TableLayout mConferenceInfoTable;
+	private LinearLayout mConferenceInfoTable;
 	private TextView mConferenceInfoMam;
 	private TextView mNotifyStatusText;
 	private ImageButton mChangeConferenceSettingsButton;
@@ -264,7 +265,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
 			}
 		});
 		this.mAdvancedMode = getPreferences().getBoolean("advanced_muc_mode", false);
-		this.mConferenceInfoTable = (TableLayout) findViewById(R.id.muc_info_more);
+		this.mConferenceInfoTable = (LinearLayout) findViewById(R.id.muc_info_more);
 		mConferenceInfoTable.setVisibility(this.mAdvancedMode ? View.VISIBLE : View.GONE);
 		this.mConferenceInfoMam = (TextView) findViewById(R.id.muc_info_mam);
 		this.mNotifyStatusButton = (ImageButton) findViewById(R.id.notification_status_button);
diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index 13550a6c1..7a13da48e 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -22,69 +22,6 @@
             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/black87"
-                android:textSize="?attr/TextSizeHeadline"
-                android:textStyle="bold"
-                android:textIsSelectable="true" />
-
-            <RelativeLayout
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="32dp">
-
-                <com.makeramen.roundedimageview.RoundedImageView
-                    android:id="@+id/your_photo"
-                    android:layout_width="72dp"
-                    android:layout_height="72dp"
-                    android:layout_alignParentEnd="false"
-                    android:layout_alignParentLeft="true"
-                    android:background="@drawable/message_border"
-                    android:padding="1dp"
-                    android:src="@drawable/ic_profile"
-                    app:riv_corner_radius="5dp" />
-
-                <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/black87"
-                        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/black87"
-                        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="@dimen/image_button_padding"
-                    android:src="?attr/icon_edit_dark" />
-            </RelativeLayout>
-
             <RelativeLayout
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content">
@@ -112,7 +49,7 @@
                     android:padding="@dimen/image_button_padding"
                     android:src="?attr/icon_settings" />
             </RelativeLayout>
-            
+
             <RelativeLayout
                android:layout_width="fill_parent"
                android:layout_height="wrap_content">
@@ -139,35 +76,6 @@
              	    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/black87"
-                                   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/black87"
-                                   android:textSize="?attr/TextSizeBody" />
-                   </TableRow>
-
-            </TableLayout>
 
             <TextView
                 android:id="@+id/details_account"
@@ -179,6 +87,18 @@
                 android:textColor="@color/black54"
                 android:textSize="?attr/TextSizeInfo"
                 android:visibility="gone" />
+
+            <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/black87"
+                android:textSize="?attr/TextSizeHeadline"
+                android:textStyle="bold"
+                android:textIsSelectable="true"
+                android:visibility="gone" />
         </LinearLayout>
 
         <LinearLayout
@@ -194,6 +114,58 @@
             android:padding="@dimen/infocard_padding">
 
 
+            <RelativeLayout
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="32dp">
+
+                <com.makeramen.roundedimageview.RoundedImageView
+                    android:id="@+id/your_photo"
+                    android:layout_width="72dp"
+                    android:layout_height="72dp"
+                    android:layout_alignParentEnd="false"
+                    android:layout_alignParentLeft="true"
+                    android:background="@drawable/message_border"
+                    android:padding="1dp"
+                    android:src="@drawable/ic_profile"
+                    app:riv_corner_radius="5dp" />
+
+                <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/black87"
+                        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/black87"
+                        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="@dimen/image_button_padding"
+                    android:src="?attr/icon_edit_dark" />
+            </RelativeLayout>
+
             <LinearLayout
                 android:id="@+id/muc_members"
                 android:layout_width="fill_parent"
@@ -201,7 +173,8 @@
                 android:layout_weight="1"
                 android:divider="?android:dividerHorizontal"
                 android:orientation="vertical"
-                android:showDividers="middle"></LinearLayout>
+                android:showDividers="middle">
+            </LinearLayout>
 
             <Button
                 android:id="@+id/invite"
@@ -211,7 +184,50 @@
                 android:layout_gravity="center_horizontal"
                 android:layout_marginTop="24dp"
                 android:text="@string/invite_contact" />
+
         </LinearLayout>
 
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/activity_vertical_margin"
+        android:layout_marginLeft="@dimen/activity_horizontal_margin"
+        android:layout_marginRight="@dimen/activity_horizontal_margin"
+        android:layout_marginTop="@dimen/activity_vertical_margin"
+        android:background="@drawable/infocard_border"
+        android:orientation="vertical"
+        android:padding="@dimen/infocard_padding"
+        android:id="@+id/muc_info_more"
+        android:visibility="gone">
+
+
+        <TableLayout
+               android:layout_width="match_parent"
+               android:layout_height="wrap_content"
+               android:stretchColumns="1">
+
+               <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/black87"
+                               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/black87"
+                               android:textSize="?attr/TextSizeBody" />
+               </TableRow>
+
+        </TableLayout>
+    </LinearLayout>
+
     </LinearLayout>
 </ScrollView>
\ No newline at end of file