diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-05-19 19:29:42 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-05-28 18:40:11 +0000 |
| commit | 4986cb14d85b418ea7cde635884e6dd9b31a36d6 (patch) | |
| tree | 2d2e2f2853b68f14dfdb17f38bdfac5eca7f3b3e /android | |
| parent | 2526b60c61ceedafb80117a6ebd434e7e638f2ae (diff) | |
| download | mullvadvpn-4986cb14d85b418ea7cde635884e6dd9b31a36d6.tar.xz mullvadvpn-4986cb14d85b418ea7cde635884e6dd9b31a36d6.zip | |
Add Buy More Time button
Diffstat (limited to 'android')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountFragment.kt | 3 | ||||
| -rw-r--r-- | android/src/main/res/layout/account.xml | 12 |
2 files changed, 14 insertions, 1 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 dc7e5a42c3..9ae06e1a49 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountFragment.kt @@ -10,6 +10,7 @@ import net.mullvad.mullvadvpn.R 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.UrlButton import org.joda.time.DateTime class AccountFragment : ServiceDependentFragment(OnNoService.GoBack) { @@ -31,6 +32,8 @@ class AccountFragment : ServiceDependentFragment(OnNoService.GoBack) { parentActivity.onBackPressed() } + view.findViewById<UrlButton>(R.id.buy_credit).prepare(daemon, jobTracker) + view.findViewById<Button>(R.id.logout).setOnClickAction("logout", jobTracker) { logout() } diff --git a/android/src/main/res/layout/account.xml b/android/src/main/res/layout/account.xml index 64ad12bd07..69f4cc6e7a 100644 --- a/android/src/main/res/layout/account.xml +++ b/android/src/main/res/layout/account.xml @@ -54,10 +54,20 @@ android:paddingVertical="12dp" 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="12dp" + android:layout_marginHorizontal="24dp" + 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.Button android:id="@+id/logout" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="12dp" + android:layout_marginTop="24dp" android:layout_marginHorizontal="24dp" mullvad:text="@string/log_out" mullvad:buttonColor="red" /> |