summaryrefslogtreecommitdiffhomepage
path: root/android/src
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2021-03-06 22:20:11 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2021-03-08 14:54:14 +0000
commit895f2b329d67db6a9e7d1f85cf01b9df473430f4 (patch)
tree88054dd29023b189650ee9361bff8d167d0cab75 /android/src
parente42ede6e9be37b5beacd850bdbbf987ccfb89aea (diff)
downloadmullvadvpn-895f2b329d67db6a9e7d1f85cf01b9df473430f4.tar.xz
mullvadvpn-895f2b329d67db6a9e7d1f85cf01b9df473430f4.zip
Don't assign initial value to `historyHeight`
Diffstat (limited to 'android/src')
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountLogin.kt4
1 files changed, 2 insertions, 2 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountLogin.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountLogin.kt
index 7e1ee0e6bc..9b2178b0b2 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountLogin.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountLogin.kt
@@ -59,9 +59,9 @@ class AccountLogin : RelativeLayout {
get() = MAX_ACCOUNT_HISTORY_ENTRIES * (historyEntryHeight + dividerHeight)
private val expandedHeight: Int
- get() = collapsedHeight + historyHeight
+ get() = collapsedHeight + (historyHeight ?: 0)
- private var historyHeight by observable(0) { _, oldHistoryHeight, newHistoryHeight ->
+ private var historyHeight by observable<Int?>(null) { _, oldHistoryHeight, newHistoryHeight ->
if (newHistoryHeight != oldHistoryHeight) {
historyAnimation.setIntValues(collapsedHeight, expandedHeight)
reposition()