Use custom Button widget in Account screen

2 files changed, 14 insertions, 9 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 3787d2bafe..dc7e5a42c3 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountFragment.kt
@@ -7,6 +7,7 @@ import android.view.View
 import android.view.ViewGroup
 import java.text.DateFormat
 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 org.joda.time.DateTime
@@ -30,7 +31,9 @@ class AccountFragment : ServiceDependentFragment(OnNoService.GoBack) {
             parentActivity.onBackPressed()
         }
 
-        view.findViewById<View>(R.id.logout).setOnClickListener { logout() }
+        view.findViewById<Button>(R.id.logout).setOnClickAction("logout", jobTracker) {
+            logout()
+        }
 
         accountNumberView = view.findViewById<CopyableInformationView>(R.id.account_number).apply {
             displayFormatter = { rawAccountNumber -> addSpacesToAccountNumber(rawAccountNumber) }
@@ -69,14 +72,14 @@ class AccountFragment : ServiceDependentFragment(OnNoService.GoBack) {
         }
     }
 
-    private fun logout() {
+    private suspend fun logout() {
         clearAccountNumber()
         clearBackStack()
         goToLoginScreen()
     }
 
-    private fun clearAccountNumber() {
-        jobTracker.newBackgroundJob("clearAccountNumber") {
+    private suspend fun clearAccountNumber() {
+        jobTracker.runOnBackground {
             daemon.setAccount(null)
         }
     }
diff --git a/android/src/main/res/layout/account.xml b/android/src/main/res/layout/account.xml
index fb18b09c04..64ad12bd07 100644
--- a/android/src/main/res/layout/account.xml
+++ b/android/src/main/res/layout/account.xml
@@ -54,10 +54,12 @@
                                                           android:paddingVertical="12dp"
                                                           mullvad:description="@string/paid_until"
                                                           mullvad:whenMissing="hide" />
-        <Button android:id="@+id/logout"
-                android:layout_marginTop="12dp"
-                android:layout_marginHorizontal="24dp"
-                android:text="@string/log_out"
-                style="@style/RedButton" />
+        <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_marginHorizontal="24dp"
+                                                 mullvad:text="@string/log_out"
+                                                 mullvad:buttonColor="red" />
     </LinearLayout>
 </LinearLayout>