diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-06-03 20:02:58 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-06-04 14:00:10 +0000 |
| commit | b376ff700265d462fbecc217f34aa7e9edb1f3b8 (patch) | |
| tree | 5abe9836453937d810906d3d41c67b8745c09cd1 /android/src/main/res/layout | |
| parent | 6ba47802fc9fc0f86ac7481fdf7d8fa94afe4e67 (diff) | |
| download | mullvadvpn-b376ff700265d462fbecc217f34aa7e9edb1f3b8.tar.xz mullvadvpn-b376ff700265d462fbecc217f34aa7e9edb1f3b8.zip | |
Make Redeem Voucher scrollable
Diffstat (limited to 'android/src/main/res/layout')
| -rw-r--r-- | android/src/main/res/layout/redeem_voucher.xml | 114 |
1 files changed, 59 insertions, 55 deletions
diff --git a/android/src/main/res/layout/redeem_voucher.xml b/android/src/main/res/layout/redeem_voucher.xml index 2728d543d3..cf6c898ee7 100644 --- a/android/src/main/res/layout/redeem_voucher.xml +++ b/android/src/main/res/layout/redeem_voucher.xml @@ -1,55 +1,59 @@ -<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="wrap_content" - android:padding="30dp" - android:background="@drawable/dialog_background" - android:orientation="vertical" - android:gravity="left" - android:elevation="2dp"> - <TextView android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="0" - android:layout_marginBottom="12dp" - android:textColor="@color/white80" - android:textSize="16sp" - android:text="@string/enter_voucher_code" /> - <EditText android:id="@+id/voucher_code" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:padding="14dp" - android:background="@drawable/edit_text_background" - android:singleLine="true" - android:imeActionLabel="@string/redeem" - android:imeOptions="flagNoPersonalizedLearning" - android:inputType="textCapCharacters" - android:textCursorDrawable="@drawable/text_input_cursor" - android:hint="@string/voucher_hint" - android:maxLength="19" - android:digits="0123456789-ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz" - android:textAllCaps="true" - android:textColorHint="@color/blue40" - android:textColor="@color/blue" - android:textSize="13sp" - android:textStyle="bold" /> - <TextView android:id="@+id/error" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="8dp" - android:textColor="@color/red" - android:textSize="13sp" - android:textStyle="bold" - android:visibility="invisible" /> - <net.mullvad.mullvadvpn.ui.widget.Button android:id="@+id/redeem" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginVertical="16dp" - mullvad:showSpinner="true" - mullvad:buttonColor="green" - mullvad:text="@string/redeem" /> - <net.mullvad.mullvadvpn.ui.widget.Button android:id="@+id/cancel" - android:layout_width="match_parent" - android:layout_height="wrap_content" - mullvad:buttonColor="blue" - mullvad:text="@string/cancel" /> -</LinearLayout> +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:mullvad="http://schemas.android.com/apk/res-auto" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:scrollbars="none"> + <LinearLayout android:layout_width="match_parent" + android:layout_height="wrap_content" + android:padding="30dp" + android:background="@drawable/dialog_background" + android:orientation="vertical" + android:gravity="left" + android:elevation="2dp"> + <TextView android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="0" + android:layout_marginBottom="12dp" + android:textColor="@color/white80" + android:textSize="16sp" + android:text="@string/enter_voucher_code" /> + <EditText android:id="@+id/voucher_code" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:padding="14dp" + android:background="@drawable/edit_text_background" + android:singleLine="true" + android:imeActionLabel="@string/redeem" + android:imeOptions="flagNoPersonalizedLearning" + android:inputType="textCapCharacters" + android:textCursorDrawable="@drawable/text_input_cursor" + android:hint="@string/voucher_hint" + android:maxLength="19" + android:digits="0123456789-ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz" + android:textAllCaps="true" + android:textColorHint="@color/blue40" + android:textColor="@color/blue" + android:textSize="13sp" + android:textStyle="bold" /> + <TextView android:id="@+id/error" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:textColor="@color/red" + android:textSize="13sp" + android:textStyle="bold" + android:visibility="invisible" /> + <net.mullvad.mullvadvpn.ui.widget.Button android:id="@+id/redeem" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginVertical="16dp" + mullvad:showSpinner="true" + mullvad:buttonColor="green" + mullvad:text="@string/redeem" /> + <net.mullvad.mullvadvpn.ui.widget.Button android:id="@+id/cancel" + android:layout_width="match_parent" + android:layout_height="wrap_content" + mullvad:buttonColor="blue" + mullvad:text="@string/cancel" /> + </LinearLayout> +</ScrollView> |