Use `SitePaymentButton` widget

6 files changed, 27 insertions, 33 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 f3eda255ac..659e12b047 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountFragment.kt
@@ -12,7 +12,7 @@ import net.mullvad.mullvadvpn.ui.widget.Button
 import net.mullvad.mullvadvpn.ui.widget.CopyableInformationView
 import net.mullvad.mullvadvpn.ui.widget.InformationView
 import net.mullvad.mullvadvpn.ui.widget.RedeemVoucherButton
-import net.mullvad.mullvadvpn.ui.widget.UrlButton
+import net.mullvad.mullvadvpn.ui.widget.SitePaymentButton
 import org.joda.time.DateTime
 
 class AccountFragment : ServiceDependentFragment(OnNoService.GoBack) {
@@ -59,7 +59,9 @@ class AccountFragment : ServiceDependentFragment(OnNoService.GoBack) {
             parentActivity.onBackPressed()
         }
 
-        buyCreditButton = view.findViewById<UrlButton>(R.id.buy_credit).apply {
+        buyCreditButton = view.findViewById<SitePaymentButton>(R.id.site_payment).apply {
+            newAccount = false
+
             prepare(daemon, jobTracker) {
                 checkForAddedTime()
             }
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 49dbd8e710..ab7ffa6c2a 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt
@@ -12,14 +12,14 @@ import net.mullvad.mullvadvpn.model.TunnelState
 import net.mullvad.mullvadvpn.ui.widget.Button
 import net.mullvad.mullvadvpn.ui.widget.HeaderBar
 import net.mullvad.mullvadvpn.ui.widget.RedeemVoucherButton
-import net.mullvad.mullvadvpn.ui.widget.UrlButton
+import net.mullvad.mullvadvpn.ui.widget.SitePaymentButton
 import net.mullvad.talpid.tunnel.ActionAfterDisconnect
 import org.joda.time.DateTime
 
 class OutOfTimeFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) {
     private lateinit var headerBar: HeaderBar
 
-    private lateinit var buyCreditButton: UrlButton
+    private lateinit var buyCreditButton: SitePaymentButton
     private lateinit var disconnectButton: Button
     private lateinit var redeemButton: RedeemVoucherButton
 
@@ -50,7 +50,8 @@ class OutOfTimeFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen)
             }
         }
 
-        buyCreditButton = view.findViewById<UrlButton>(R.id.buy_credit).apply {
+        buyCreditButton = view.findViewById<SitePaymentButton>(R.id.site_payment).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 7afed7a532..e357be1f68 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt
@@ -14,7 +14,7 @@ import net.mullvad.mullvadvpn.R
 import net.mullvad.mullvadvpn.model.TunnelState
 import net.mullvad.mullvadvpn.ui.widget.HeaderBar
 import net.mullvad.mullvadvpn.ui.widget.RedeemVoucherButton
-import net.mullvad.mullvadvpn.ui.widget.UrlButton
+import net.mullvad.mullvadvpn.ui.widget.SitePaymentButton
 import org.joda.time.DateTime
 
 val POLL_INTERVAL: Long = 15 /* s */ * 1000 /* ms */
@@ -41,7 +41,8 @@ class WelcomeFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) {
             parentActivity.getString(R.string.pay_to_start_using) + " " +
             parentActivity.getString(R.string.add_time_to_account)
 
-        view.findViewById<UrlButton>(R.id.buy_credit).apply {
+        view.findViewById<SitePaymentButton>(R.id.site_payment).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 304e887ddc..db78c1a6bd 100644
--- a/android/src/main/res/layout/account.xml
+++ b/android/src/main/res/layout/account.xml
@@ -58,16 +58,12 @@
                                                                   android:paddingVertical="@dimen/half_vertical_space"
                                                                   mullvad:description="@string/paid_until"
                                                                   mullvad:whenMissing="hide" />
-                <net.mullvad.mullvadvpn.ui.widget.UrlButton android:id="@+id/buy_credit"
-                                                            android:layout_width="match_parent"
-                                                            android:layout_height="wrap_content"
-                                                            android:layout_marginTop="@dimen/half_vertical_space"
-                                                            android:layout_marginHorizontal="@dimen/side_margin"
-                                                            mullvad:showSpinner="true"
-                                                            mullvad:url="@string/account_url"
-                                                            mullvad:withToken="true"
-                                                            mullvad:text="@string/buy_more_credit"
-                                                            mullvad:buttonColor="green" />
+                <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"
diff --git a/android/src/main/res/layout/out_of_time.xml b/android/src/main/res/layout/out_of_time.xml
index dacfcff569..127a9d836e 100644
--- a/android/src/main/res/layout/out_of_time.xml
+++ b/android/src/main/res/layout/out_of_time.xml
@@ -51,14 +51,11 @@
                                                          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"
-                                                            mullvad:withToken="true" />
+                <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"
diff --git a/android/src/main/res/layout/welcome.xml b/android/src/main/res/layout/welcome.xml
index 881c63cd51..31e8a5cbc7 100644
--- a/android/src/main/res/layout/welcome.xml
+++ b/android/src/main/res/layout/welcome.xml
@@ -58,14 +58,11 @@
                           android:paddingHorizontal="@dimen/side_margin"
                           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"
-                                                            android:layout_height="wrap_content"
-                                                            android:layout_marginVertical="@dimen/button_separation"
-                                                            mullvad:buttonColor="green"
-                                                            mullvad:text="@string/buy_credit"
-                                                            mullvad:url="@string/account_url"
-                                                            mullvad:withToken="true" />
+                <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"