diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-04-01 14:07:29 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-04-27 16:21:51 +0000 |
| commit | f688c78377ca14f2045c7f32fcd9e70601c394c5 (patch) | |
| tree | 0b8a8c565ea4dc1c2defbbf50e696d00ade7421c | |
| parent | 3e96aaf1dc900beef7139912673729fcf37c6626 (diff) | |
| download | mullvadvpn-f688c78377ca14f2045c7f32fcd9e70601c394c5.tar.xz mullvadvpn-f688c78377ca14f2045c7f32fcd9e70601c394c5.zip | |
Use `whenMissing` attribute in account layout
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountFragment.kt | 15 | ||||
| -rw-r--r-- | android/src/main/res/layout/account.xml | 6 |
2 files changed, 6 insertions, 15 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 807ebd4f81..b0616a3abc 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountFragment.kt @@ -50,19 +50,8 @@ class AccountFragment : ServiceDependentFragment(OnNoService.GoBack) { private fun updateView(accountNumber: String?, accountExpiry: DateTime?) = GlobalScope.launch(Dispatchers.Main) { - if (accountNumber != null) { - accountNumberView.information = accountNumber - accountNumberView.visibility = View.VISIBLE - } else { - accountNumberView.visibility = View.INVISIBLE - } - - if (accountExpiry != null) { - accountExpiryView.information = formatExpiry(accountExpiry) - accountExpiryView.visibility = View.VISIBLE - } else { - accountExpiryView.visibility = View.INVISIBLE - } + accountNumberView.information = accountNumber + accountExpiryView.information = accountExpiry?.let { expiry -> formatExpiry(expiry) } } private fun formatExpiry(expiry: DateTime): String { diff --git a/android/src/main/res/layout/account.xml b/android/src/main/res/layout/account.xml index 5f275a3f42..146b9ed7d3 100644 --- a/android/src/main/res/layout/account.xml +++ b/android/src/main/res/layout/account.xml @@ -46,13 +46,15 @@ android:paddingVertical="12dp" mullvad:clipboardLabel="@string/mullvad_account_number" mullvad:copiedToast="@string/copied_mullvad_account_number" - mullvad:description="@string/account_number" /> + mullvad:description="@string/account_number" + mullvad:whenMissing="hide"/> <net.mullvad.mullvadvpn.ui.InformationView android:id="@+id/account_expiry" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingHorizontal="24dp" android:paddingVertical="12dp" - mullvad:description="@string/paid_until" /> + mullvad:description="@string/paid_until" + mullvad:whenMissing="hide"/> <Button android:id="@+id/logout" android:layout_marginTop="12dp" android:layout_marginHorizontal="24dp" |