Make Welcome screen scrollable

1 files changed, 72 insertions, 64 deletions

diff --git a/android/src/main/res/layout/welcome.xml b/android/src/main/res/layout/welcome.xml
index b3387051a5..e76ce2bb94 100644
--- a/android/src/main/res/layout/welcome.xml
+++ b/android/src/main/res/layout/welcome.xml
@@ -1,12 +1,11 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:mullvad="http://schemas.android.com/apk/res-auto"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:orientation="vertical">
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                xmlns:mullvad="http://schemas.android.com/apk/res-auto"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
     <LinearLayout android:id="@+id/header_bar"
                   android:layout_width="match_parent"
                   android:layout_height="wrap_content"
-                  android:layout_weight="0"
+                  android:layout_alignParentTop="true"
                   android:orientation="horizontal"
                   android:gravity="center_vertical"
                   android:background="@color/red"
@@ -35,61 +34,70 @@
                      android:background="?android:attr/selectableItemBackground"
                      android:src="@drawable/icon_settings" />
     </LinearLayout>
-    <TextView android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:layout_marginHorizontal="24dp"
-              android:layout_marginTop="24dp"
-              android:textColor="@color/white"
-              android:textSize="32sp"
-              android:textStyle="bold"
-              android:text="@string/congrats" />
-    <TextView android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:layout_marginHorizontal="24dp"
-              android:layout_marginTop="8dp"
-              android:layout_marginBottom="11dp"
-              android:textColor="@color/white"
-              android:textSize="13sp"
-              android:text="@string/here_is_your_account_number" />
-    <TextView android:id="@+id/account_number"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:paddingHorizontal="24dp"
-              android:paddingVertical="11dp"
-              android:clickable="true"
-              android:background="?android:attr/selectableItemBackground"
-              android:textColor="@color/white"
-              android:textSize="24sp"
-              android:textStyle="bold"
-              android:text="" />
-    <TextView android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:layout_marginHorizontal="24dp"
-              android:layout_marginTop="11dp"
-              android:textColor="@color/white"
-              android:textSize="13sp"
-              android:text="@string/pay_to_start_using" />
-    <Space android:layout_width="match_parent"
-           android:layout_height="0dp"
-           android:layout_weight="1" />
-    <LinearLayout android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:layout_weight="0"
-                  android:orientation="vertical"
-                  android:padding="24dp"
-                  android:background="@color/darkBlue">
-        <net.mullvad.mullvadvpn.ui.widget.UrlButton android:id="@+id/buy_credit"
-                                                    android:layout_width="match_parent"
-                                                    android:layout_height="wrap_content"
-                                                    android:layout_marginBottom="24dp"
-                                                    mullvad:buttonColor="green"
-                                                    mullvad:text="@string/buy_credit"
-                                                    mullvad:url="@string/account_url"
-                                                    mullvad:withToken="true" />
-        <net.mullvad.mullvadvpn.ui.widget.Button android:id="@+id/redeem_voucher"
-                                                 android:layout_width="match_parent"
-                                                 android:layout_height="wrap_content"
-                                                 mullvad:buttonColor="green"
-                                                 mullvad:text="@string/redeem_voucher" />
-    </LinearLayout>
-</LinearLayout>
+    <ScrollView android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_alignParentBottom="true"
+                android:layout_below="@id/header_bar"
+                android:fillViewport="true">
+        <LinearLayout android:layout_width="match_parent"
+                      android:layout_height="match_parent"
+                      android:orientation="vertical">
+            <TextView android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:layout_marginHorizontal="24dp"
+                      android:layout_marginTop="24dp"
+                      android:textColor="@color/white"
+                      android:textSize="32sp"
+                      android:textStyle="bold"
+                      android:text="@string/congrats" />
+            <TextView android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:layout_marginHorizontal="24dp"
+                      android:layout_marginTop="8dp"
+                      android:layout_marginBottom="11dp"
+                      android:textColor="@color/white"
+                      android:textSize="13sp"
+                      android:text="@string/here_is_your_account_number" />
+            <TextView android:id="@+id/account_number"
+                      android:layout_width="match_parent"
+                      android:layout_height="wrap_content"
+                      android:paddingHorizontal="24dp"
+                      android:paddingVertical="11dp"
+                      android:clickable="true"
+                      android:background="?android:attr/selectableItemBackground"
+                      android:textColor="@color/white"
+                      android:textSize="24sp"
+                      android:textStyle="bold"
+                      android:text="" />
+            <TextView android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:layout_marginHorizontal="24dp"
+                      android:layout_marginTop="11dp"
+                      android:textColor="@color/white"
+                      android:textSize="13sp"
+                      android:text="@string/pay_to_start_using" />
+            <Space android:layout_width="match_parent"
+                   android:layout_height="0dp"
+                   android:layout_weight="1" />
+            <LinearLayout android:layout_width="match_parent"
+                          android:layout_height="wrap_content"
+                          android:orientation="vertical"
+                          android:padding="24dp"
+                          android:background="@color/darkBlue">
+                <net.mullvad.mullvadvpn.ui.widget.UrlButton android:id="@+id/buy_credit"
+                                                            android:layout_width="match_parent"
+                                                            android:layout_height="wrap_content"
+                                                            android:layout_marginBottom="24dp"
+                                                            mullvad:buttonColor="green"
+                                                            mullvad:text="@string/buy_credit"
+                                                            mullvad:url="@string/account_url"
+                                                            mullvad:withToken="true" />
+                <net.mullvad.mullvadvpn.ui.widget.Button android:id="@+id/redeem_voucher"
+                                                         android:layout_width="match_parent"
+                                                         android:layout_height="wrap_content"
+                                                         mullvad:buttonColor="green"
+                                                         mullvad:text="@string/redeem_voucher" />
+            </LinearLayout>
+        </LinearLayout>
+    </ScrollView>
+</RelativeLayout>