Use `RedeemVoucherButton`

6 files changed, 28 insertions, 48 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 d24478cb98..f3eda255ac 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountFragment.kt
@@ -11,6 +11,7 @@ import net.mullvad.mullvadvpn.model.TunnelState
 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 org.joda.time.DateTime
 
@@ -44,7 +45,7 @@ class AccountFragment : ServiceDependentFragment(OnNoService.GoBack) {
     private lateinit var accountExpiryView: InformationView
     private lateinit var accountNumberView: CopyableInformationView
     private lateinit var buyCreditButton: Button
-    private lateinit var redeemVoucherButton: Button
+    private lateinit var redeemVoucherButton: RedeemVoucherButton
     private lateinit var titleController: CollapsibleTitleController
 
     override fun onSafelyCreateView(
@@ -64,10 +65,8 @@ class AccountFragment : ServiceDependentFragment(OnNoService.GoBack) {
             }
         }
 
-        redeemVoucherButton = view.findViewById<Button>(R.id.redeem_voucher).apply {
-            setOnClickAction("redeem", jobTracker) {
-                showRedeemVoucherDialog()
-            }
+        redeemVoucherButton = view.findViewById<RedeemVoucherButton>(R.id.redeem_voucher).apply {
+            prepare(fragmentManager, jobTracker)
         }
 
         view.findViewById<Button>(R.id.logout).setOnClickAction("logout", 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 5fd14b5cd6..49dbd8e710 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt
@@ -11,6 +11,7 @@ import net.mullvad.mullvadvpn.R
 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.talpid.tunnel.ActionAfterDisconnect
 import org.joda.time.DateTime
@@ -20,7 +21,7 @@ class OutOfTimeFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen)
 
     private lateinit var buyCreditButton: UrlButton
     private lateinit var disconnectButton: Button
-    private lateinit var redeemButton: Button
+    private lateinit var redeemButton: RedeemVoucherButton
 
     private var tunnelState by observable<TunnelState>(TunnelState.Disconnected()) { _, _, state ->
         updateDisconnectButton()
@@ -53,10 +54,8 @@ class OutOfTimeFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen)
             prepare(daemon, jobTracker)
         }
 
-        redeemButton = view.findViewById<Button>(R.id.redeem_voucher).apply {
-            setOnClickAction("openRedeemVoucherDialog", jobTracker) {
-                showRedeemVoucherDialog()
-            }
+        redeemButton = view.findViewById<RedeemVoucherButton>(R.id.redeem_voucher).apply {
+            prepare(fragmentManager, jobTracker)
         }
 
         connectionProxy.onStateChange.subscribe(this) { newState ->
@@ -90,14 +89,6 @@ class OutOfTimeFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen)
         connectionProxy.onStateChange.unsubscribe(this)
     }
 
-    private fun showRedeemVoucherDialog() {
-        val transaction = fragmentManager?.beginTransaction()
-
-        transaction?.addToBackStack(null)
-
-        RedeemVoucherDialogFragment().show(transaction, null)
-    }
-
     private fun updateDisconnectButton() {
         val state = tunnelState
 
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 28851a8641..7afed7a532 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt
@@ -12,8 +12,8 @@ import android.widget.Toast
 import kotlinx.coroutines.delay
 import net.mullvad.mullvadvpn.R
 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 org.joda.time.DateTime
 
@@ -45,10 +45,8 @@ class WelcomeFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) {
             prepare(daemon, jobTracker)
         }
 
-        view.findViewById<Button>(R.id.redeem_voucher).apply {
-            setOnClickAction("openRedeemVoucherDialog", jobTracker) {
-                showRedeemVoucherDialog()
-            }
+        view.findViewById<RedeemVoucherButton>(R.id.redeem_voucher).apply {
+            prepare(fragmentManager, jobTracker)
         }
 
         return view
@@ -139,12 +137,4 @@ class WelcomeFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) {
 
         Toast.makeText(context, toastMessage, Toast.LENGTH_SHORT).show()
     }
-
-    private fun showRedeemVoucherDialog() {
-        val transaction = fragmentManager?.beginTransaction()
-
-        transaction?.addToBackStack(null)
-
-        RedeemVoucherDialogFragment().show(transaction, null)
-    }
 }
diff --git a/android/src/main/res/layout/account.xml b/android/src/main/res/layout/account.xml
index d6e9819e6a..304e887ddc 100644
--- a/android/src/main/res/layout/account.xml
+++ b/android/src/main/res/layout/account.xml
@@ -68,13 +68,13 @@
                                                             mullvad:withToken="true"
                                                             mullvad:text="@string/buy_more_credit"
                                                             mullvad:buttonColor="green" />
-                <net.mullvad.mullvadvpn.ui.widget.Button 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" />
+                <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" />
                 <net.mullvad.mullvadvpn.ui.widget.Button android:id="@+id/logout"
                                                          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 cc5cb1af5e..dacfcff569 100644
--- a/android/src/main/res/layout/out_of_time.xml
+++ b/android/src/main/res/layout/out_of_time.xml
@@ -59,11 +59,11 @@
                                                             mullvad:text="@string/buy_more_credit"
                                                             mullvad:url="@string/account_url"
                                                             mullvad:withToken="true" />
-                <net.mullvad.mullvadvpn.ui.widget.Button android:id="@+id/redeem_voucher"
-                                                         android:layout_width="match_parent"
-                                                         android:layout_height="wrap_content"
-                                                         mullvad:buttonColor="green"
-                                                         mullvad:text="@string/redeem_voucher" />
+                <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" />
             </LinearLayout>
         </LinearLayout>
     </ScrollView>
diff --git a/android/src/main/res/layout/welcome.xml b/android/src/main/res/layout/welcome.xml
index 359ecb88c3..881c63cd51 100644
--- a/android/src/main/res/layout/welcome.xml
+++ b/android/src/main/res/layout/welcome.xml
@@ -66,11 +66,11 @@
                                                             mullvad:text="@string/buy_credit"
                                                             mullvad:url="@string/account_url"
                                                             mullvad:withToken="true" />
-                <net.mullvad.mullvadvpn.ui.widget.Button android:id="@+id/redeem_voucher"
-                                                         android:layout_width="match_parent"
-                                                         android:layout_height="wrap_content"
-                                                         mullvad:buttonColor="green"
-                                                         mullvad:text="@string/redeem_voucher" />
+                <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" />
             </LinearLayout>
         </LinearLayout>
     </ScrollView>