diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-05-19 19:37:15 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-05-28 18:40:36 +0000 |
| commit | de06f0b8a83adcab742a4344c310a3aca5448a16 (patch) | |
| tree | 0af833ca624ea8331a1208175a20d5bc5e4a62a9 /android | |
| parent | 4986cb14d85b418ea7cde635884e6dd9b31a36d6 (diff) | |
| download | mullvadvpn-de06f0b8a83adcab742a4344c310a3aca5448a16.tar.xz mullvadvpn-de06f0b8a83adcab742a4344c310a3aca5448a16.zip | |
Add Redeem Voucher button
Diffstat (limited to 'android')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountFragment.kt | 12 | ||||
| -rw-r--r-- | android/src/main/res/layout/account.xml | 7 |
2 files changed, 19 insertions, 0 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 9ae06e1a49..eeff02575c 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountFragment.kt @@ -34,6 +34,10 @@ class AccountFragment : ServiceDependentFragment(OnNoService.GoBack) { view.findViewById<UrlButton>(R.id.buy_credit).prepare(daemon, jobTracker) + view.findViewById<Button>(R.id.redeem_voucher).setOnClickAction("redeem", jobTracker) { + showRedeemVoucherDialog() + } + view.findViewById<Button>(R.id.logout).setOnClickAction("logout", jobTracker) { logout() } @@ -75,6 +79,14 @@ class AccountFragment : ServiceDependentFragment(OnNoService.GoBack) { } } + private fun showRedeemVoucherDialog() { + val transaction = fragmentManager?.beginTransaction() + + transaction?.addToBackStack(null) + + RedeemVoucherDialogFragment().show(transaction, null) + } + private suspend fun logout() { clearAccountNumber() clearBackStack() diff --git a/android/src/main/res/layout/account.xml b/android/src/main/res/layout/account.xml index 69f4cc6e7a..6356d3ae70 100644 --- a/android/src/main/res/layout/account.xml +++ b/android/src/main/res/layout/account.xml @@ -64,6 +64,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_marginTop="24dp" + android:layout_marginHorizontal="24dp" + 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" |