reworked muc details and contact details a bit

1 files changed, 83 insertions, 79 deletions

diff --git a/res/layout/activity_contact_details.xml b/res/layout/activity_contact_details.xml
index 1dceab53..f7cb2198 100644
--- a/res/layout/activity_contact_details.xml
+++ b/res/layout/activity_contact_details.xml
@@ -1,110 +1,114 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/secondarybackground"
-    android:orientation="vertical" >
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:background="@color/secondarybackground" >
 
-    <RelativeLayout
+    <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="8dp"
-        android:background="@drawable/infocard_border"
-        android:padding="8dp" >
-
-        <QuickContactBadge
-            android:id="@+id/details_contact_badge"
-            android:layout_width="72dp"
-            android:layout_height="72dp"
-            android:layout_alignParentTop="true"
-            android:scaleType="centerCrop" />
+        android:orientation="vertical" >
 
-        <LinearLayout
-            android:id="@+id/details_jidbox"
-            android:layout_width="wrap_content"
+        <RelativeLayout
+            android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="16dp"
-            android:layout_toRightOf="@+id/details_contact_badge"
-            android:orientation="vertical" >
+            android:layout_margin="8dp"
+            android:background="@drawable/infocard_border"
+            android:padding="16dp" >
 
-            <TextView
-                android:id="@+id/details_contactjid"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:singleLine="true"
-                android:text="@string/account_settings_example_jabber_id"
-                android:textColor="@color/primarytext"
-                android:textSize="?attr/TextSizeHeadline"
-                android:textStyle="bold" />
+            <QuickContactBadge
+                android:id="@+id/details_contact_badge"
+                android:layout_width="72dp"
+                android:layout_height="72dp"
+                android:layout_alignParentTop="true"
+                android:scaleType="centerCrop" />
 
             <LinearLayout
+                android:id="@+id/details_jidbox"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal" >
+                android:layout_marginLeft="16dp"
+                android:layout_toRightOf="@+id/details_contact_badge"
+                android:orientation="vertical" >
 
                 <TextView
-                    android:id="@+id/details_contactstatus"
+                    android:id="@+id/details_contactjid"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textColor="@color/secondarytext"
-                    android:textSize="?attr/TextSizeBody" />
+                    android:text="@string/account_settings_example_jabber_id"
+                    android:textColor="@color/primarytext"
+                    android:textSize="?attr/TextSizeHeadline"
+                    android:textStyle="bold" />
 
-                <TextView
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal" >
+
+                    <TextView
+                        android:id="@+id/details_contactstatus"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textColor="@color/secondarytext"
+                        android:textSize="?attr/TextSizeBody" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text=" · "
+                        android:textColor="@color/secondarytext"
+                        android:textSize="?attr/TextSizeBody" />
+
+                    <TextView
+                        android:id="@+id/details_lastseen"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:singleLine="true"
+                        android:textColor="@color/secondarytext"
+                        android:textSize="?attr/TextSizeBody" />
+                </LinearLayout>
+
+                <CheckBox
+                    android:id="@+id/details_send_presence"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text=" · "
-                    android:textColor="@color/secondarytext"
+                    android:layout_marginTop="8dp"
+                    android:text="@string/send_presence_updates"
+                    android:textColor="@color/primarytext"
                     android:textSize="?attr/TextSizeBody" />
 
-                <TextView
-                    android:id="@+id/details_lastseen"
+                <CheckBox
+                    android:id="@+id/details_receive_presence"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:singleLine="true"
-                    android:textColor="@color/secondarytext"
+                    android:text="@string/receive_presence_updates"
+                    android:textColor="@color/primarytext"
                     android:textSize="?attr/TextSizeBody" />
             </LinearLayout>
 
-            <CheckBox
-                android:id="@+id/details_send_presence"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:text="@string/send_presence_updates"
-                android:textColor="@color/primarytext"
-                android:textSize="?attr/TextSizeBody" />
-
-            <CheckBox
-                android:id="@+id/details_receive_presence"
+            <TextView
+                android:id="@+id/details_account"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/receive_presence_updates"
-                android:textColor="@color/primarytext"
-                android:textSize="?attr/TextSizeBody" />
-        </LinearLayout>
+                android:layout_alignParentRight="true"
+                android:layout_below="@+id/details_jidbox"
+                android:layout_marginTop="32dp"
+                android:text="@string/using_account"
+                android:textColor="@color/secondarytext"
+                android:textSize="?attr/TextSizeInfo" />
+        </RelativeLayout>
 
-        <TextView
-            android:id="@+id/details_account"
-            android:layout_width="wrap_content"
+        <LinearLayout
+            android:id="@+id/details_contact_keys"
+            android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_below="@+id/details_jidbox"
-            android:layout_marginTop="32dp"
-            android:text="@string/using_account"
-            android:textColor="@color/secondarytext"
-            android:textSize="?attr/TextSizeInfo" />
-    </RelativeLayout>
-
-    <LinearLayout
-        android:id="@+id/details_contact_keys"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="8dp"
-        android:background="@drawable/infocard_border"
-        android:divider="?android:dividerHorizontal"
-        android:orientation="vertical"
-        android:padding="8dp"
-        android:showDividers="middle" >
+            android:layout_margin="8dp"
+            android:background="@drawable/infocard_border"
+            android:divider="?android:dividerHorizontal"
+            android:orientation="vertical"
+            android:padding="8dp"
+            android:showDividers="middle" >
+        </LinearLayout>
     </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file