diff options
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountLogin.kt | 14 | ||||
| -rw-r--r-- | android/src/main/res/layout/account_login.xml | 2 | ||||
| -rw-r--r-- | android/src/main/res/values/dimensions.xml | 1 |
3 files changed, 3 insertions, 14 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 4f02715f7e..7d21f0298b 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 @@ -6,7 +6,6 @@ import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater import android.view.View -import android.view.View.MeasureSpec import android.view.View.OnLayoutChangeListener import android.view.inputmethod.InputMethodManager import android.widget.RelativeLayout @@ -70,7 +69,7 @@ class AccountLogin : RelativeLayout { } private var collapsedHeight by observable( - calculateInitialInputHeight() + resources.getDimensionPixelSize(R.dimen.account_login_input_height) ) { _, oldCollapsedHeight, newCollapsedHeight -> if (newCollapsedHeight != oldCollapsedHeight) { historyAnimation.setIntValues(newCollapsedHeight, expandedHeight) @@ -181,17 +180,6 @@ class AccountLogin : RelativeLayout { input.onTextChanged.unsubscribe(this) } - private fun calculateInitialInputHeight(): Int { - if (input.height == 0) { - val widthMeasureSpec = MeasureSpec.makeMeasureSpec(0, MeasureSpec.EXACTLY) - val heightMeasureSpec = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED) - - input.measure(widthMeasureSpec, heightMeasureSpec) - } - - return input.height - } - private fun updateBorder() { if (state == LoginState.Failure) { border.borderState = BorderState.ERROR diff --git a/android/src/main/res/layout/account_login.xml b/android/src/main/res/layout/account_login.xml index 8a57930721..5ada635027 100644 --- a/android/src/main/res/layout/account_login.xml +++ b/android/src/main/res/layout/account_login.xml @@ -6,7 +6,7 @@ android:layout_alignParentBottom="true" /> <net.mullvad.mullvadvpn.ui.widget.AccountInput android:id="@+id/input" android:layout_width="match_parent" - android:layout_height="48dp" + android:layout_height="@dimen/account_login_input_height" android:layout_alignParentTop="true" android:orientation="horizontal" /> <androidx.recyclerview.widget.RecyclerView android:id="@+id/history" diff --git a/android/src/main/res/values/dimensions.xml b/android/src/main/res/values/dimensions.xml index cce4a34a3f..0f0bd9ad43 100644 --- a/android/src/main/res/values/dimensions.xml +++ b/android/src/main/res/values/dimensions.xml @@ -4,6 +4,7 @@ <dimen name="relay_row_padding">50dp</dimen> <dimen name="list_item_divider">1dp</dimen> <dimen name="dialog_margin">14dp</dimen> + <dimen name="account_login_input_height">48dp</dimen> <dimen name="account_login_corner_radius">4dp</dimen> <dimen name="account_login_border_width">2dp</dimen> <dimen name="account_history_divider">1dp</dimen> |