diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-06-03 20:00:18 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-06-04 14:00:10 +0000 |
| commit | 6ba47802fc9fc0f86ac7481fdf7d8fa94afe4e67 (patch) | |
| tree | bea669bfd871a7e5a1bb35fad3c65eece8f07848 | |
| parent | d9df7a72e068e6e4a5546a9f3dfc44c48b1bc400 (diff) | |
| download | mullvadvpn-6ba47802fc9fc0f86ac7481fdf7d8fa94afe4e67.tar.xz mullvadvpn-6ba47802fc9fc0f86ac7481fdf7d8fa94afe4e67.zip | |
Make Out Of Time screen scrollable
| -rw-r--r-- | android/src/main/res/layout/out_of_time.xml | 123 |
1 files changed, 66 insertions, 57 deletions
diff --git a/android/src/main/res/layout/out_of_time.xml b/android/src/main/res/layout/out_of_time.xml index 604b9674fd..bb4380bc44 100644 --- a/android/src/main/res/layout/out_of_time.xml +++ b/android/src/main/res/layout/out_of_time.xml @@ -1,8 +1,7 @@ -<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" @@ -35,55 +34,65 @@ android:background="?android:attr/selectableItemBackground" android:src="@drawable/icon_settings" /> </LinearLayout> - <ImageView android:layout_width="60dp" - android:layout_height="60dp" - android:layout_gravity="center" - android:layout_marginTop="24dp" - android:layout_marginBottom="18dp" - android:src="@drawable/icon_fail" /> - <TextView android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginHorizontal="24dp" - android:textColor="@color/white" - android:textSize="32sp" - android:textStyle="bold" - android:text="@string/out_of_time" /> - <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/no_more_vpn_time_left" /> - <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.Button android:id="@+id/disconnect" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="24dp" - android:visibility="gone" - mullvad:buttonColor="red" - mullvad:text="@string/disconnect" /> - <net.mullvad.mullvadvpn.ui.widget.UrlButton android:id="@+id/buy_credit" - android:layout_width="match_parent" - android:layout_height="wrap_content" - mullvad:buttonColor="green" - mullvad:text="@string/buy_more_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" - android:layout_marginTop="24dp" - 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"> + <ImageView android:layout_width="60dp" + android:layout_height="60dp" + android:layout_gravity="center" + android:layout_marginTop="24dp" + android:layout_marginBottom="18dp" + android:src="@drawable/icon_fail" /> + <TextView android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginHorizontal="24dp" + android:textColor="@color/white" + android:textSize="32sp" + android:textStyle="bold" + android:text="@string/out_of_time" /> + <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/no_more_vpn_time_left" /> + <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.Button android:id="@+id/disconnect" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="24dp" + android:visibility="gone" + mullvad:buttonColor="red" + mullvad:text="@string/disconnect" /> + <net.mullvad.mullvadvpn.ui.widget.UrlButton android:id="@+id/buy_credit" + android:layout_width="match_parent" + android:layout_height="wrap_content" + mullvad:buttonColor="green" + mullvad:text="@string/buy_more_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" + android:layout_marginTop="24dp" + mullvad:buttonColor="green" + mullvad:text="@string/redeem_voucher" /> + </LinearLayout> + </LinearLayout> + </ScrollView> +</RelativeLayout> |