diff options
Diffstat (limited to 'android/src')
| -rw-r--r-- | android/src/main/res/layout/account.xml | 4 | ||||
| -rw-r--r-- | android/src/main/res/layout/out_of_time.xml | 4 | ||||
| -rw-r--r-- | android/src/main/res/layout/redeem_voucher.xml | 2 | ||||
| -rw-r--r-- | android/src/main/res/layout/welcome.xml | 4 | ||||
| -rw-r--r-- | android/src/main/res/layout/wireguard_key.xml | 4 | ||||
| -rw-r--r-- | android/src/main/res/values/dimensions.xml | 1 |
6 files changed, 10 insertions, 9 deletions
diff --git a/android/src/main/res/layout/account.xml b/android/src/main/res/layout/account.xml index c11e699ecc..5173010d94 100644 --- a/android/src/main/res/layout/account.xml +++ b/android/src/main/res/layout/account.xml @@ -72,7 +72,7 @@ <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" + android:layout_marginVertical="@dimen/button_separation" android:layout_marginHorizontal="@dimen/side_margin" mullvad:text="@string/redeem_voucher" mullvad:buttonColor="green" /> @@ -80,7 +80,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/side_margin" - android:layout_marginVertical="24dp" + android:layout_marginBottom="24dp" mullvad:text="@string/log_out" mullvad:buttonColor="red" /> </LinearLayout> diff --git a/android/src/main/res/layout/out_of_time.xml b/android/src/main/res/layout/out_of_time.xml index 568c75d408..f5b47bb767 100644 --- a/android/src/main/res/layout/out_of_time.xml +++ b/android/src/main/res/layout/out_of_time.xml @@ -47,7 +47,7 @@ <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:layout_marginBottom="@dimen/button_separation" android:visibility="gone" mullvad:buttonColor="red" mullvad:text="@string/disconnect" /> @@ -61,7 +61,7 @@ <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" + android:layout_marginTop="@dimen/button_separation" mullvad:buttonColor="green" mullvad:text="@string/redeem_voucher" /> </LinearLayout> diff --git a/android/src/main/res/layout/redeem_voucher.xml b/android/src/main/res/layout/redeem_voucher.xml index 1594f5e3fe..aa0b360aa8 100644 --- a/android/src/main/res/layout/redeem_voucher.xml +++ b/android/src/main/res/layout/redeem_voucher.xml @@ -46,7 +46,7 @@ <net.mullvad.mullvadvpn.ui.widget.Button android:id="@+id/redeem" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginVertical="16dp" + android:layout_marginVertical="@dimen/button_separation" mullvad:showSpinner="true" mullvad:buttonColor="green" mullvad:text="@string/redeem" /> diff --git a/android/src/main/res/layout/welcome.xml b/android/src/main/res/layout/welcome.xml index 4ae507bd2d..24deb7ed22 100644 --- a/android/src/main/res/layout/welcome.xml +++ b/android/src/main/res/layout/welcome.xml @@ -56,12 +56,12 @@ android:layout_marginTop="16dp" android:orientation="vertical" android:paddingHorizontal="@dimen/side_margin" - android:paddingVertical="24dp" + android:paddingBottom="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" + android:layout_marginVertical="@dimen/button_separation" mullvad:buttonColor="green" mullvad:text="@string/buy_credit" mullvad:url="@string/account_url" diff --git a/android/src/main/res/layout/wireguard_key.xml b/android/src/main/res/layout/wireguard_key.xml index 1d3065fece..3e38d0a212 100644 --- a/android/src/main/res/layout/wireguard_key.xml +++ b/android/src/main/res/layout/wireguard_key.xml @@ -98,7 +98,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="0" - android:layout_marginTop="24dp" + android:layout_marginTop="@dimen/button_separation" android:layout_marginHorizontal="@dimen/side_margin" mullvad:buttonColor="blue" mullvad:text="@string/wireguard_verify_key" @@ -107,7 +107,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="0" - android:layout_marginTop="24dp" + android:layout_marginTop="@dimen/button_separation" android:layout_marginBottom="24dp" android:layout_marginHorizontal="@dimen/side_margin" mullvad:text="@string/wireguard_manage_keys" diff --git a/android/src/main/res/values/dimensions.xml b/android/src/main/res/values/dimensions.xml index e78be8b1ea..77b1bb91dc 100644 --- a/android/src/main/res/values/dimensions.xml +++ b/android/src/main/res/values/dimensions.xml @@ -32,4 +32,5 @@ <dimen name="side_margin">22dp</dimen> <dimen name="vertical_space">20dp</dimen> <dimen name="half_vertical_space">10dp</dimen> + <dimen name="button_separation">24dp</dimen> </resources> |