Use the `AccountCell` widget

3 files changed, 11 insertions, 42 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/RemainingTimeLabel.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/RemainingTimeLabel.kt
index 0a21cd5394..c24bf4ed48 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/RemainingTimeLabel.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/RemainingTimeLabel.kt
@@ -15,7 +15,7 @@ class RemainingTimeLabel(val context: Context, val view: View) {
     private val expiredColor = context.getColor(R.color.red)
     private val normalColor = context.getColor(R.color.white60)
 
-    private val label = view.findViewById<TextView>(R.id.remaining_time)
+    private val label = view.findViewById<TextView>(R.id.label)
 
     var accountExpiry: DateTime? = null
         set(value) {
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SettingsFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SettingsFragment.kt
index b2b50894b7..1ddd72a57a 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SettingsFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SettingsFragment.kt
@@ -13,16 +13,16 @@ import android.widget.TextView
 import net.mullvad.mullvadvpn.R
 import net.mullvad.mullvadvpn.dataproxy.AppVersionInfoCache
 import net.mullvad.mullvadvpn.service.AccountCache
+import net.mullvad.mullvadvpn.ui.widget.AccountCell
 import net.mullvad.mullvadvpn.ui.widget.Cell
 
 class SettingsFragment : ServiceAwareFragment() {
-    private lateinit var accountMenu: View
+    private lateinit var accountMenu: AccountCell
     private lateinit var appVersionWarning: View
     private lateinit var appVersionLabel: TextView
     private lateinit var appVersionFooter: View
     private lateinit var preferencesMenu: View
     private lateinit var advancedMenu: View
-    private lateinit var remainingTimeLabel: RemainingTimeLabel
     private lateinit var titleController: CollapsibleTitleController
 
     private var active = false
@@ -59,8 +59,8 @@ class SettingsFragment : ServiceAwareFragment() {
             parentActivity.quit()
         }
 
-        accountMenu = view.findViewById<View>(R.id.account).apply {
-            setOnClickListener {
+        accountMenu = view.findViewById<AccountCell>(R.id.account).apply {
+            onClickListener = {
                 openSubFragment(AccountFragment())
             }
         }
@@ -88,7 +88,6 @@ class SettingsFragment : ServiceAwareFragment() {
         appVersionWarning = view.findViewById(R.id.app_version_warning)
         appVersionLabel = view.findViewById<TextView>(R.id.app_version_label)
         appVersionFooter = view.findViewById(R.id.app_version_footer)
-        remainingTimeLabel = RemainingTimeLabel(parentActivity, view)
         titleController = CollapsibleTitleController(view)
 
         return view
@@ -128,7 +127,7 @@ class SettingsFragment : ServiceAwareFragment() {
 
             onAccountExpiryChange.subscribe(this@SettingsFragment) { expiry ->
                 jobTracker.newUiJob("updateAccountInfo") {
-                    remainingTimeLabel.accountExpiry = expiry
+                    accountMenu.accountExpiry = expiry
                 }
             }
 
diff --git a/android/src/main/res/layout/settings.xml b/android/src/main/res/layout/settings.xml
index 085ab1bfcf..2acefa2157 100644
--- a/android/src/main/res/layout/settings.xml
+++ b/android/src/main/res/layout/settings.xml
@@ -43,41 +43,11 @@
                           android:layout_marginLeft="24dp"
                           android:text="@string/settings"
                           style="@style/SettingsExpandedHeader" />
-                <LinearLayout android:id="@+id/account"
-                              android:layout_width="match_parent"
-                              android:layout_height="wrap_content"
-                              android:layout_marginTop="24dp"
-                              android:paddingHorizontal="16dp"
-                              android:background="@drawable/cell_button_background"
-                              android:clickable="true"
-                              android:gravity="center"
-                              android:visibility="gone">
-                    <TextView android:layout_width="wrap_content"
-                              android:layout_height="wrap_content"
-                              android:layout_weight="1"
-                              android:paddingHorizontal="8dp"
-                              android:paddingVertical="17dp"
-                              android:textColor="@color/white"
-                              android:textSize="20sp"
-                              android:textStyle="bold"
-                              android:text="@string/settings_account" />
-                    <TextView android:id="@+id/remaining_time"
-                              android:layout_width="wrap_content"
-                              android:layout_height="wrap_content"
-                              android:layout_weight="1"
-                              android:paddingHorizontal="8dp"
-                              android:gravity="right"
-                              android:textColor="@color/white60"
-                              android:textSize="13sp"
-                              android:textStyle="bold"
-                              android:text=""
-                              android:textAllCaps="true" />
-                    <ImageView android:layout_width="14dp"
-                               android:layout_height="24dp"
-                               android:layout_weight="0"
-                               android:alpha="0.6"
-                               android:src="@drawable/icon_chevron" />
-                </LinearLayout>
+                <net.mullvad.mullvadvpn.ui.widget.AccountCell android:id="@+id/account"
+                                                              android:layout_width="match_parent"
+                                                              android:layout_height="wrap_content"
+                                                              android:layout_marginTop="24dp"
+                                                              mullvad:text="@string/settings_account" />
                 <net.mullvad.mullvadvpn.ui.widget.NavigateCell android:id="@+id/preferences"
                                                                android:layout_width="match_parent"
                                                                android:layout_height="wrap_content"