summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGELOG.md4
-rw-r--r--android/src/main/res/layout/confirm_no_email.xml50
-rw-r--r--android/src/main/res/layout/connect.xml1
-rw-r--r--android/src/main/res/layout/out_of_time.xml124
-rw-r--r--android/src/main/res/layout/redeem_voucher.xml114
-rw-r--r--android/src/main/res/layout/relay_list_item.xml1
-rw-r--r--android/src/main/res/layout/select_location.xml1
-rw-r--r--android/src/main/res/layout/welcome.xml138
8 files changed, 226 insertions, 207 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ad4e91b642..8be0c1bcdb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,9 +31,7 @@ Line wrap the file at 100 chars. Th
#### Android
- Show the remaining account time in the Settings screen in days if it's less than 3 months.
- Prevent commands to connect or disconnect to be sent when the device is locked.
-- Make settings screens scrollable.
-- Make connect screen scrollable.
-- Make Login screen scrollable.
+- Make all screens scrollable to better handle small screens and split-screen mode.
#### Linux
- Send an ICMP reject message or TCP reset packet when blocking outgoing packets to prevent
diff --git a/android/src/main/res/layout/confirm_no_email.xml b/android/src/main/res/layout/confirm_no_email.xml
index 7ae862302f..09e554bcf1 100644
--- a/android/src/main/res/layout/confirm_no_email.xml
+++ b/android/src/main/res/layout/confirm_no_email.xml
@@ -1,23 +1,27 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="wrap_content"
- 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/confirm_no_email" />
- <Button android:id="@+id/send_button"
- android:text="@string/send_anyway"
- style="@style/RedButton" />
- <Button android:id="@+id/back_button"
- android:layout_marginTop="16dp"
- android:text="@string/back"
- style="@style/BlueButton" />
-</LinearLayout>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:scrollbars="none">
+ <LinearLayout android:layout_width="wrap_content"
+ 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/confirm_no_email" />
+ <Button android:id="@+id/send_button"
+ android:text="@string/send_anyway"
+ style="@style/RedButton" />
+ <Button android:id="@+id/back_button"
+ android:layout_marginTop="16dp"
+ android:text="@string/back"
+ style="@style/BlueButton" />
+ </LinearLayout>
+</ScrollView>
diff --git a/android/src/main/res/layout/connect.xml b/android/src/main/res/layout/connect.xml
index 46b4283157..c1daa9f950 100644
--- a/android/src/main/res/layout/connect.xml
+++ b/android/src/main/res/layout/connect.xml
@@ -1,5 +1,4 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/main_fragment"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout android:id="@+id/header_bar"
diff --git a/android/src/main/res/layout/out_of_time.xml b/android/src/main/res/layout/out_of_time.xml
index f1ae5b06a6..bb4380bc44 100644
--- a/android/src/main/res/layout/out_of_time.xml
+++ b/android/src/main/res/layout/out_of_time.xml
@@ -1,9 +1,7 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:mullvad="http://schemas.android.com/apk/res-auto"
- android:id="@+id/main_fragment"
- 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"
@@ -36,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>
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>
diff --git a/android/src/main/res/layout/relay_list_item.xml b/android/src/main/res/layout/relay_list_item.xml
index 35fc39e1d9..1d8d95642b 100644
--- a/android/src/main/res/layout/relay_list_item.xml
+++ b/android/src/main/res/layout/relay_list_item.xml
@@ -1,5 +1,4 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/main_fragment"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/country_row_padding"
diff --git a/android/src/main/res/layout/select_location.xml b/android/src/main/res/layout/select_location.xml
index 5bb1ef7d14..50c1d10643 100644
--- a/android/src/main/res/layout/select_location.xml
+++ b/android/src/main/res/layout/select_location.xml
@@ -1,5 +1,4 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/main_fragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/darkBlue"
diff --git a/android/src/main/res/layout/welcome.xml b/android/src/main/res/layout/welcome.xml
index 34fe031622..5c13b11837 100644
--- a/android/src/main/res/layout/welcome.xml
+++ b/android/src/main/res/layout/welcome.xml
@@ -1,13 +1,11 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:mullvad="http://schemas.android.com/apk/res-auto"
- android:id="@+id/main_fragment"
- 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"
@@ -36,61 +34,71 @@
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:layout_marginTop="16dp"
+ 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>
Copyright © 2025 - 2026 Wayne Cole. WTFPL. Attribution appreciated. No warranty. Not liable for bodily damages.