diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-08-27 18:58:12 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-09-01 09:53:48 +0000 |
| commit | 39941ebafe2af4ed89710746fd2d262f6f845927 (patch) | |
| tree | a8984f4dff4327e56224648d69bc4d0dea094a9d /android/src/main | |
| parent | 8334f1ca8dcf1e5fb4e062fd45c0e96ad3759c70 (diff) | |
| download | mullvadvpn-39941ebafe2af4ed89710746fd2d262f6f845927.tar.xz mullvadvpn-39941ebafe2af4ed89710746fd2d262f6f845927.zip | |
Make `AccountInputContainer` a `RelativeLayout`
Diffstat (limited to 'android/src/main')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountInputContainer.kt | 4 | ||||
| -rw-r--r-- | android/src/main/res/layout/login.xml | 51 |
2 files changed, 29 insertions, 26 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountInputContainer.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountInputContainer.kt index 22aa7d3234..a18da9216a 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountInputContainer.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountInputContainer.kt @@ -2,10 +2,10 @@ package net.mullvad.mullvadvpn.ui import android.content.Context import android.util.AttributeSet -import android.widget.LinearLayout +import android.widget.RelativeLayout import net.mullvad.mullvadvpn.R -class AccountInputContainer : LinearLayout { +class AccountInputContainer : RelativeLayout { enum class BorderState { UNFOCUSED, FOCUSED, diff --git a/android/src/main/res/layout/login.xml b/android/src/main/res/layout/login.xml index bfa0d88e23..5a25eca5c5 100644 --- a/android/src/main/res/layout/login.xml +++ b/android/src/main/res/layout/login.xml @@ -66,30 +66,33 @@ android:text="@string/login_description" /> <net.mullvad.mullvadvpn.ui.AccountInputContainer android:id="@+id/account_input_container" android:layout_width="match_parent" - android:layout_height="48dp" - android:orientation="horizontal"> - <EditText android:id="@+id/account_input" - android:digits="0123456789" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_weight="1" - android:paddingHorizontal="12dp" - android:background="@drawable/account_input_background" - android:inputType="number" - android:singleLine="true" - android:imeOptions="flagNoPersonalizedLearning" - android:textCursorDrawable="@drawable/text_input_cursor" - android:hint="@string/login_hint" - android:textColorHint="@color/blue40" - android:textColor="@color/blue" - android:textSize="@dimen/text_medium_plus" - android:textStyle="bold" /> - <ImageButton android:id="@+id/login_button" - android:layout_width="48dp" - android:layout_height="match_parent" - android:layout_weight="0" - android:background="@drawable/login_button_background" - android:src="@drawable/login_button_arrow" /> + android:layout_height="wrap_content"> + <LinearLayout android:layout_width="match_parent" + android:layout_height="48dp" + android:orientation="horizontal"> + <EditText android:id="@+id/account_input" + android:digits="0123456789" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_weight="1" + android:paddingHorizontal="12dp" + android:background="@drawable/account_input_background" + android:inputType="number" + android:singleLine="true" + android:imeOptions="flagNoPersonalizedLearning" + android:textCursorDrawable="@drawable/text_input_cursor" + android:hint="@string/login_hint" + android:textColorHint="@color/blue40" + android:textColor="@color/blue" + android:textSize="@dimen/text_medium_plus" + android:textStyle="bold" /> + <ImageButton android:id="@+id/login_button" + android:layout_width="48dp" + android:layout_height="match_parent" + android:layout_weight="0" + android:background="@drawable/login_button_background" + android:src="@drawable/login_button_arrow" /> + </LinearLayout> </net.mullvad.mullvadvpn.ui.AccountInputContainer> <ListView android:id="@+id/account_history_list" android:layout_width="fill_parent" |