Change payment button ID and rename properties

4 files changed, 8 insertions, 8 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 d656c58e8c..d5644ae72f 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountFragment.kt
@@ -38,13 +38,13 @@ class AccountFragment : ServiceDependentFragment(OnNoService.GoBack) {
     private var hasConnectivity = true
         set(value) {
             field = value
-            buyCreditButton.setEnabled(value)
+            sitePaymentButton.setEnabled(value)
             redeemVoucherButton.setEnabled(value)
         }
 
     private lateinit var accountExpiryView: InformationView
     private lateinit var accountNumberView: CopyableInformationView
-    private lateinit var buyCreditButton: SitePaymentButton
+    private lateinit var sitePaymentButton: 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.buy_credit).apply {
+        sitePaymentButton = view.findViewById<SitePaymentButton>(R.id.site_payment).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 de93c21573..cec00f842b 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt
@@ -19,7 +19,7 @@ import org.joda.time.DateTime
 class OutOfTimeFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) {
     private lateinit var headerBar: HeaderBar
 
-    private lateinit var buyCreditButton: SitePaymentButton
+    private lateinit var sitePaymentButton: SitePaymentButton
     private lateinit var disconnectButton: Button
     private lateinit var redeemButton: RedeemVoucherButton
 
@@ -50,7 +50,7 @@ class OutOfTimeFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen)
             }
         }
 
-        buyCreditButton = view.findViewById<SitePaymentButton>(R.id.buy_credit).apply {
+        sitePaymentButton = view.findViewById<SitePaymentButton>(R.id.site_payment).apply {
             newAccount = false
             prepare(daemon, jobTracker)
         }
@@ -116,7 +116,7 @@ class OutOfTimeFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen)
     private fun updateBuyButtons() {
         val hasConnectivity = tunnelState is TunnelState.Disconnected
 
-        buyCreditButton.setEnabled(hasConnectivity)
+        sitePaymentButton.setEnabled(hasConnectivity)
         redeemButton.setEnabled(hasConnectivity)
     }
 
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 de5d9c4bc7..e357be1f68 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.buy_credit).apply {
+        view.findViewById<SitePaymentButton>(R.id.site_payment).apply {
             newAccount = true
             prepare(daemon, jobTracker)
         }
diff --git a/android/src/main/res/layout/payment_buttons.xml b/android/src/main/res/layout/payment_buttons.xml
index f7a66cdcd2..c617bb1571 100644
--- a/android/src/main/res/layout/payment_buttons.xml
+++ b/android/src/main/res/layout/payment_buttons.xml
@@ -1,6 +1,6 @@
 <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"
+    <net.mullvad.mullvadvpn.ui.widget.SitePaymentButton android:id="@+id/site_payment"
                                                         android:layout_width="match_parent"
                                                         android:layout_height="wrap_content"
                                                         android:layout_marginHorizontal="@dimen/side_margin"