Consolidate repeated payment buttons layout

7 files changed, 28 insertions, 40 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountFragment.kt
index 659e12b047..d656c58e8c 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountFragment.kt
@@ -44,7 +44,7 @@ class AccountFragment : ServiceDependentFragment(OnNoService.GoBack) {
 
     private lateinit var accountExpiryView: InformationView
     private lateinit var accountNumberView: CopyableInformationView
-    private lateinit var buyCreditButton: Button
+    private lateinit var buyCreditButton: SitePaymentButton
     private lateinit var redeemVoucherButton: RedeemVoucherButton
     private lateinit var titleController: CollapsibleTitleController
 
@@ -59,7 +59,7 @@ class AccountFragment : ServiceDependentFragment(OnNoService.GoBack) {
             parentActivity.onBackPressed()
         }
 
-        buyCreditButton = view.findViewById<SitePaymentButton>(R.id.site_payment).apply {
+        buyCreditButton = view.findViewById<SitePaymentButton>(R.id.buy_credit).apply {
             newAccount = false
 
             prepare(daemon, jobTracker) {
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt
index ab7ffa6c2a..de93c21573 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt
@@ -50,7 +50,7 @@ class OutOfTimeFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen)
             }
         }
 
-        buyCreditButton = view.findViewById<SitePaymentButton>(R.id.site_payment).apply {
+        buyCreditButton = view.findViewById<SitePaymentButton>(R.id.buy_credit).apply {
             newAccount = false
             prepare(daemon, jobTracker)
         }
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt
index e357be1f68..de5d9c4bc7 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt
@@ -41,7 +41,7 @@ class WelcomeFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) {
             parentActivity.getString(R.string.pay_to_start_using) + " " +
             parentActivity.getString(R.string.add_time_to_account)
 
-        view.findViewById<SitePaymentButton>(R.id.site_payment).apply {
+        view.findViewById<SitePaymentButton>(R.id.buy_credit).apply {
             newAccount = true
             prepare(daemon, jobTracker)
         }
diff --git a/android/src/main/res/layout/account.xml b/android/src/main/res/layout/account.xml
index db78c1a6bd..87cea450b4 100644
--- a/android/src/main/res/layout/account.xml
+++ b/android/src/main/res/layout/account.xml
@@ -54,27 +54,17 @@
                 <net.mullvad.mullvadvpn.ui.widget.InformationView android:id="@+id/account_expiry"
                                                                   android:layout_width="match_parent"
                                                                   android:layout_height="wrap_content"
+                                                                  android:layout_marginBottom="@dimen/half_vertical_space"
                                                                   android:paddingHorizontal="@dimen/side_margin"
                                                                   android:paddingVertical="@dimen/half_vertical_space"
                                                                   mullvad:description="@string/paid_until"
                                                                   mullvad:whenMissing="hide" />
-                <net.mullvad.mullvadvpn.ui.widget.SitePaymentButton android:id="@+id/site_payment"
-                                                                    android:layout_width="match_parent"
-                                                                    android:layout_height="wrap_content"
-                                                                    android:layout_marginTop="@dimen/half_vertical_space"
-                                                                    android:layout_marginHorizontal="@dimen/side_margin"
-                                                                    mullvad:buttonColor="green" />
-                <net.mullvad.mullvadvpn.ui.widget.RedeemVoucherButton android:id="@+id/redeem_voucher"
-                                                                      android:layout_width="match_parent"
-                                                                      android:layout_height="wrap_content"
-                                                                      android:layout_marginVertical="@dimen/button_separation"
-                                                                      android:layout_marginHorizontal="@dimen/side_margin"
-                                                                      mullvad:text="@string/redeem_voucher"
-                                                                      mullvad:buttonColor="green" />
+                <include layout="@layout/payment_buttons" />
                 <net.mullvad.mullvadvpn.ui.widget.Button android:id="@+id/logout"
                                                          android:layout_width="match_parent"
                                                          android:layout_height="wrap_content"
                                                          android:layout_marginHorizontal="@dimen/side_margin"
+                                                         android:layout_marginTop="@dimen/button_separation"
                                                          android:layout_marginBottom="@dimen/screen_vertical_margin"
                                                          mullvad:text="@string/log_out"
                                                          mullvad:buttonColor="red" />
diff --git a/android/src/main/res/layout/out_of_time.xml b/android/src/main/res/layout/out_of_time.xml
index 127a9d836e..791b2d8a77 100644
--- a/android/src/main/res/layout/out_of_time.xml
+++ b/android/src/main/res/layout/out_of_time.xml
@@ -41,26 +41,18 @@
                           android:layout_height="wrap_content"
                           android:layout_weight="0"
                           android:orientation="vertical"
-                          android:paddingHorizontal="@dimen/side_margin"
+                          android:paddingTop="@dimen/button_separation"
                           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_marginTop="@dimen/button_separation"
+                                                         android:layout_marginHorizontal="@dimen/side_margin"
+                                                         android:layout_marginBottom="@dimen/button_separation"
                                                          android:visibility="gone"
                                                          mullvad:buttonColor="red"
                                                          mullvad:text="@string/disconnect" />
-                <net.mullvad.mullvadvpn.ui.widget.SitePaymentButton android:id="@+id/site_payment"
-                                                                    android:layout_width="match_parent"
-                                                                    android:layout_height="wrap_content"
-                                                                    android:layout_marginVertical="@dimen/button_separation"
-                                                                    mullvad:buttonColor="green" />
-                <net.mullvad.mullvadvpn.ui.widget.RedeemVoucherButton android:id="@+id/redeem_voucher"
-                                                                      android:layout_width="match_parent"
-                                                                      android:layout_height="wrap_content"
-                                                                      mullvad:buttonColor="green"
-                                                                      mullvad:text="@string/redeem_voucher" />
+                <include layout="@layout/payment_buttons" />
             </LinearLayout>
         </LinearLayout>
     </ScrollView>
diff --git a/android/src/main/res/layout/payment_buttons.xml b/android/src/main/res/layout/payment_buttons.xml
new file mode 100644
index 0000000000..f7a66cdcd2
--- /dev/null
+++ b/android/src/main/res/layout/payment_buttons.xml
@@ -0,0 +1,15 @@
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+       xmlns:mullvad="http://schemas.android.com/apk/res-auto">
+    <net.mullvad.mullvadvpn.ui.widget.SitePaymentButton android:id="@+id/buy_credit"
+                                                        android:layout_width="match_parent"
+                                                        android:layout_height="wrap_content"
+                                                        android:layout_marginHorizontal="@dimen/side_margin"
+                                                        mullvad:buttonColor="green" />
+    <net.mullvad.mullvadvpn.ui.widget.RedeemVoucherButton android:id="@+id/redeem_voucher"
+                                                          android:layout_width="match_parent"
+                                                          android:layout_height="wrap_content"
+                                                          android:layout_marginTop="@dimen/button_separation"
+                                                          android:layout_marginHorizontal="@dimen/side_margin"
+                                                          mullvad:buttonColor="green"
+                                                          mullvad:text="@string/redeem_voucher" />
+</merge>
diff --git a/android/src/main/res/layout/welcome.xml b/android/src/main/res/layout/welcome.xml
index 31e8a5cbc7..43348fd11d 100644
--- a/android/src/main/res/layout/welcome.xml
+++ b/android/src/main/res/layout/welcome.xml
@@ -55,19 +55,10 @@
                           android:layout_height="wrap_content"
                           android:layout_marginTop="16dp"
                           android:orientation="vertical"
-                          android:paddingHorizontal="@dimen/side_margin"
+                          android:paddingTop="@dimen/button_separation"
                           android:paddingBottom="@dimen/screen_vertical_margin"
                           android:background="@color/darkBlue">
-                <net.mullvad.mullvadvpn.ui.widget.SitePaymentButton android:id="@+id/site_payment"
-                                                                    android:layout_width="match_parent"
-                                                                    android:layout_height="wrap_content"
-                                                                    android:layout_marginVertical="@dimen/button_separation"
-                                                                    mullvad:buttonColor="green" />
-                <net.mullvad.mullvadvpn.ui.widget.RedeemVoucherButton android:id="@+id/redeem_voucher"
-                                                                      android:layout_width="match_parent"
-                                                                      android:layout_height="wrap_content"
-                                                                      mullvad:buttonColor="green"
-                                                                      mullvad:text="@string/redeem_voucher" />
+                <include layout="@layout/payment_buttons" />
             </LinearLayout>
         </LinearLayout>
     </ScrollView>