modified publish avatar layout

1 files changed, 94 insertions, 65 deletions

diff --git a/src/main/res/layout/activity_publish_profile_picture.xml b/src/main/res/layout/activity_publish_profile_picture.xml
index d7321ae13..e5113dab9 100644
--- a/src/main/res/layout/activity_publish_profile_picture.xml
+++ b/src/main/res/layout/activity_publish_profile_picture.xml
@@ -1,48 +1,107 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/grey50" >
-
+    android:background="@color/grey200">
+    <ScrollView
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_above="@+id/button_bar"
+        android:layout_alignParentTop="true" >
     <LinearLayout
-        android:id="@+id/account_image_wrapper"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_centerHorizontal="true"
-        android:layout_marginBottom="8dp"
-        android:layout_marginTop="24dp"
-        android:background="@drawable/account_image_border" >
-
-        <ImageView
-            android:id="@+id/account_image"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:maxHeight="384dp"
-            android:maxWidth="384dp"
-            android:adjustViewBounds="true"
-            android:padding="1dp"
-            android:background="@drawable/message_border" />
-    </LinearLayout>
+        android:orientation="vertical"
+        android:gravity="center_horizontal">
 
-    <TextView
-        android:id="@+id/hint"
-        android:layout_width="wrap_content"
+        <LinearLayout
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@id/account_image_wrapper"
-        android:layout_centerHorizontal="true"
-        android:text="@string/touch_to_choose_picture"
-        android:textColor="@color/black54" />
+        android:layout_above="@+id/button_bar"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentRight="true"
+        android:layout_below="@+id/secondary_hint"
+        android:gravity="center_vertical"
+        android:orientation="vertical"
+        android:paddingLeft="8dp"
+        android:paddingRight="8dp"
+        android:layout_marginRight="@dimen/activity_horizontal_margin"
+        android:layout_marginLeft="@dimen/activity_horizontal_margin"
+        android:layout_marginTop="@dimen/activity_vertical_margin"
+        android:layout_marginBottom="@dimen/activity_vertical_margin"
+            android:background="@drawable/infocard_border">
 
-    <TextView
-        android:id="@+id/secondary_hint"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/hint"
-        android:layout_centerHorizontal="true"
-        android:text="@string/or_long_press_for_default"
-        android:textColor="@color/black54" />
+            <LinearLayout
+                android:id="@+id/account_image_wrapper"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
+                android:layout_centerHorizontal="true"
+                android:layout_marginBottom="8dp"
+                android:layout_marginTop="24dp"
+                android:background="@drawable/account_image_border"
+                android:layout_gravity="center_horizontal">
+
+                <ImageView
+                    android:id="@+id/account_image"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:maxHeight="384dp"
+                    android:maxWidth="384dp"
+                    android:adjustViewBounds="true"
+                    android:padding="1dp"
+                    android:background="@drawable/message_border" />
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/hint"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/account_image_wrapper"
+                android:layout_centerHorizontal="true"
+                android:text="@string/touch_to_choose_picture"
+                android:textColor="@color/black54"
+                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:layout_gravity="center_horizontal" />
+
+            <TextView
+                android:id="@+id/secondary_hint"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/hint"
+                android:layout_centerHorizontal="true"
+                android:text="@string/or_long_press_for_default"
+                android:textColor="@color/black54"
+                android:layout_marginBottom="@dimen/activity_vertical_margin"
+                android:layout_marginTop="@dimen/activity_vertical_margin"
+                android:layout_marginLeft="@dimen/activity_horizontal_margin"
+                android:layout_marginRight="@dimen/activity_horizontal_margin"
+                android:layout_gravity="center_horizontal" />
+
+            <TextView
+            android:id="@+id/account"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/black87"
+            android:textSize="?attr/TextSizeHeadline" />
 
+        <TextView
+            android:id="@+id/hint_or_warning"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:minLines="3"
+            android:text="@string/publish_avatar_explanation"
+            android:textColor="@color/black87"
+            android:textSize="?attr/TextSizeBody" />
+    </LinearLayout>
+</LinearLayout>
+    </ScrollView>
     <LinearLayout
         android:id="@+id/button_bar"
         android:layout_width="wrap_content"
@@ -78,34 +137,4 @@
             android:textColor="@color/black54" />
     </LinearLayout>
 
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="fill_parent"
-        android:layout_above="@+id/button_bar"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentRight="true"
-        android:layout_below="@+id/secondary_hint"
-        android:gravity="center_vertical"
-        android:orientation="vertical"
-        android:paddingLeft="8dp"
-        android:paddingRight="8dp" >
-
-        <TextView
-            android:id="@+id/account"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/black87"
-            android:textSize="?attr/TextSizeHeadline" />
-
-        <TextView
-            android:id="@+id/hint_or_warning"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:minLines="3"
-            android:text="@string/publish_avatar_explanation"
-            android:textColor="@color/black87"
-            android:textSize="?attr/TextSizeBody" />
-    </LinearLayout>
-
 </RelativeLayout>