Create dimension for screen vertical margins

10 files changed, 14 insertions, 14 deletions

diff --git a/android/src/main/res/layout/account.xml b/android/src/main/res/layout/account.xml
index 5173010d94..bf374b2ebb 100644
--- a/android/src/main/res/layout/account.xml
+++ b/android/src/main/res/layout/account.xml
@@ -34,7 +34,6 @@
             <LinearLayout android:layout_width="match_parent"
                           android:layout_height="match_parent"
                           android:layout_marginTop="4dp"
-                          android:layout_marginBottom="24dp"
                           android:orientation="vertical">
                 <TextView android:id="@+id/expanded_title"
                           android:layout_width="wrap_content"
@@ -80,7 +79,7 @@
                                                          android:layout_width="match_parent"
                                                          android:layout_height="wrap_content"
                                                          android:layout_marginHorizontal="@dimen/side_margin"
-                                                         android:layout_marginBottom="24dp"
+                                                         android:layout_marginBottom="@dimen/screen_vertical_margin"
                                                          mullvad:text="@string/log_out"
                                                          mullvad:buttonColor="red" />
             </LinearLayout>
diff --git a/android/src/main/res/layout/advanced.xml b/android/src/main/res/layout/advanced.xml
index 61c9efc717..f9cb370089 100644
--- a/android/src/main/res/layout/advanced.xml
+++ b/android/src/main/res/layout/advanced.xml
@@ -33,7 +33,7 @@
 
             <LinearLayout android:layout_width="match_parent"
                           android:layout_height="match_parent"
-                          android:paddingBottom="24dp"
+                          android:paddingBottom="@dimen/screen_vertical_margin"
                           android:orientation="vertical">
                 <TextView android:id="@+id/expanded_title"
                           android:layout_width="wrap_content"
diff --git a/android/src/main/res/layout/connect.xml b/android/src/main/res/layout/connect.xml
index b5f909f6f9..a2602dc028 100644
--- a/android/src/main/res/layout/connect.xml
+++ b/android/src/main/res/layout/connect.xml
@@ -117,7 +117,7 @@
                               android:orientation="vertical"
                               android:paddingHorizontal="@dimen/side_margin"
                               android:paddingTop="@dimen/vertical_space"
-                              android:paddingBottom="24dp">
+                              android:paddingBottom="@dimen/screen_vertical_margin">
                     <Button android:id="@+id/switch_location"
                             android:layout_marginTop="20dp"
                             android:layout_marginBottom="16dp"
diff --git a/android/src/main/res/layout/login.xml b/android/src/main/res/layout/login.xml
index 5413e927d4..a067831296 100644
--- a/android/src/main/res/layout/login.xml
+++ b/android/src/main/res/layout/login.xml
@@ -107,7 +107,7 @@
                       android:layout_weight="0"
                       android:orientation="vertical"
                       android:paddingHorizontal="@dimen/side_margin"
-                      android:paddingBottom="24dp"
+                      android:paddingBottom="@dimen/screen_vertical_margin"
                       android:paddingTop="16dp"
                       android:background="@color/darkBlue">
             <TextView android:layout_width="match_parent"
diff --git a/android/src/main/res/layout/out_of_time.xml b/android/src/main/res/layout/out_of_time.xml
index f5b47bb767..544413d22c 100644
--- a/android/src/main/res/layout/out_of_time.xml
+++ b/android/src/main/res/layout/out_of_time.xml
@@ -16,7 +16,7 @@
             <ImageView android:layout_width="60dp"
                        android:layout_height="60dp"
                        android:layout_gravity="center"
-                       android:layout_marginTop="24dp"
+                       android:layout_marginTop="@dimen/screen_vertical_margin"
                        android:layout_marginBottom="18dp"
                        android:src="@drawable/icon_fail" />
             <TextView android:layout_width="wrap_content"
@@ -42,18 +42,19 @@
                           android:layout_weight="0"
                           android:orientation="vertical"
                           android:paddingHorizontal="@dimen/side_margin"
-                          android:paddingVertical="24dp"
+                          android:paddingBottom="@dimen/screen_vertical_margin"
                           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="@dimen/button_separation"
+                                                         android:layout_marginTop="@dimen/button_separation"
                                                          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"
+                                                            android:layout_marginVertical="@dimen/button_separation"
                                                             mullvad:buttonColor="green"
                                                             mullvad:text="@string/buy_more_credit"
                                                             mullvad:url="@string/account_url"
@@ -61,7 +62,6 @@
                 <net.mullvad.mullvadvpn.ui.widget.Button android:id="@+id/redeem_voucher"
                                                          android:layout_width="match_parent"
                                                          android:layout_height="wrap_content"
-                                                         android:layout_marginTop="@dimen/button_separation"
                                                          mullvad:buttonColor="green"
                                                          mullvad:text="@string/redeem_voucher" />
             </LinearLayout>
diff --git a/android/src/main/res/layout/preferences.xml b/android/src/main/res/layout/preferences.xml
index c0153b239d..05b9702a5e 100644
--- a/android/src/main/res/layout/preferences.xml
+++ b/android/src/main/res/layout/preferences.xml
@@ -33,7 +33,7 @@
 
             <LinearLayout android:layout_width="match_parent"
                           android:layout_height="match_parent"
-                          android:paddingBottom="24dp"
+                          android:paddingBottom="@dimen/screen_vertical_margin"
                           android:orientation="vertical">
                 <TextView android:id="@+id/expanded_title"
                           android:layout_width="wrap_content"
diff --git a/android/src/main/res/layout/settings.xml b/android/src/main/res/layout/settings.xml
index 4b9109093a..72fd6195db 100644
--- a/android/src/main/res/layout/settings.xml
+++ b/android/src/main/res/layout/settings.xml
@@ -72,7 +72,7 @@
                 <Button android:id="@+id/quit_button"
                         android:layout_marginHorizontal="@dimen/side_margin"
                         android:layout_marginTop="@dimen/vertical_space"
-                        android:layout_marginBottom="24dp"
+                        android:layout_marginBottom="@dimen/screen_vertical_margin"
                         android:text="@string/quit"
                         style="@style/RedButton" />
             </LinearLayout>
diff --git a/android/src/main/res/layout/welcome.xml b/android/src/main/res/layout/welcome.xml
index 24deb7ed22..359ecb88c3 100644
--- a/android/src/main/res/layout/welcome.xml
+++ b/android/src/main/res/layout/welcome.xml
@@ -16,7 +16,7 @@
             <TextView android:layout_width="wrap_content"
                       android:layout_height="wrap_content"
                       android:layout_marginHorizontal="@dimen/side_margin"
-                      android:layout_marginTop="24dp"
+                      android:layout_marginTop="@dimen/screen_vertical_margin"
                       android:textColor="@color/white"
                       android:textSize="@dimen/text_huge"
                       android:textStyle="bold"
@@ -56,7 +56,7 @@
                           android:layout_marginTop="16dp"
                           android:orientation="vertical"
                           android:paddingHorizontal="@dimen/side_margin"
-                          android:paddingBottom="24dp"
+                          android:paddingBottom="@dimen/screen_vertical_margin"
                           android:background="@color/darkBlue">
                 <net.mullvad.mullvadvpn.ui.widget.UrlButton android:id="@+id/buy_credit"
                                                             android:layout_width="match_parent"
diff --git a/android/src/main/res/layout/wireguard_key.xml b/android/src/main/res/layout/wireguard_key.xml
index 3e38d0a212..389b0a1695 100644
--- a/android/src/main/res/layout/wireguard_key.xml
+++ b/android/src/main/res/layout/wireguard_key.xml
@@ -108,7 +108,7 @@
                                                             android:layout_height="wrap_content"
                                                             android:layout_weight="0"
                                                             android:layout_marginTop="@dimen/button_separation"
-                                                            android:layout_marginBottom="24dp"
+                                                            android:layout_marginBottom="@dimen/screen_vertical_margin"
                                                             android:layout_marginHorizontal="@dimen/side_margin"
                                                             mullvad:text="@string/wireguard_manage_keys"
                                                             mullvad:buttonColor="blue"
diff --git a/android/src/main/res/values/dimensions.xml b/android/src/main/res/values/dimensions.xml
index 2cba21e704..b1112955db 100644
--- a/android/src/main/res/values/dimensions.xml
+++ b/android/src/main/res/values/dimensions.xml
@@ -33,4 +33,5 @@
     <dimen name="vertical_space">20dp</dimen>
     <dimen name="half_vertical_space">10dp</dimen>
     <dimen name="button_separation">18dp</dimen>
+    <dimen name="screen_vertical_margin">24dp</dimen>
 </resources>