diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-09-03 17:54:33 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-09-04 11:54:35 +0000 |
| commit | d156324a9868c6c9389a9a33f38cda06861990fe (patch) | |
| tree | 4d53e84218a16b813982cadba59de7a508e2408c /android | |
| parent | 6468f8944047383a4a2dd722f9145b4fb78fde77 (diff) | |
| download | mullvadvpn-d156324a9868c6c9389a9a33f38cda06861990fe.tar.xz mullvadvpn-d156324a9868c6c9389a9a33f38cda06861990fe.zip | |
Shorten layout IDs inside the widget
Diffstat (limited to 'android')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountLogin.kt | 6 | ||||
| -rw-r--r-- | android/src/main/res/layout/account_login.xml | 8 |
2 files changed, 7 insertions, 7 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 b767ec78da..c2acd6a924 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 @@ -20,9 +20,9 @@ class AccountLogin : RelativeLayout { inflater.inflate(R.layout.account_login, this) } - private val border: AccountLoginBorder = container.findViewById(R.id.account_input_container) - private val accountHistoryList: ListView = container.findViewById(R.id.account_history_list) - private val input: AccountInput = container.findViewById(R.id.account_input) + private val border: AccountLoginBorder = container.findViewById(R.id.border) + private val accountHistoryList: ListView = container.findViewById(R.id.history) + private val input: AccountInput = container.findViewById(R.id.input) private var shouldShowAccountHistory = false set(value) { diff --git a/android/src/main/res/layout/account_login.xml b/android/src/main/res/layout/account_login.xml index 7798620057..b64a52d6e6 100644 --- a/android/src/main/res/layout/account_login.xml +++ b/android/src/main/res/layout/account_login.xml @@ -1,18 +1,18 @@ <merge xmlns:android="http://schemas.android.com/apk/res/android"> - <net.mullvad.mullvadvpn.ui.widget.AccountLoginBorder android:id="@+id/account_input_container" + <net.mullvad.mullvadvpn.ui.widget.AccountLoginBorder android:id="@+id/border" android:layout_width="match_parent" android:layout_height="48dp" android:layout_alignParentTop="true"> - <net.mullvad.mullvadvpn.ui.widget.AccountInput android:id="@+id/account_input" + <net.mullvad.mullvadvpn.ui.widget.AccountInput android:id="@+id/input" android:layout_width="match_parent" android:layout_height="48dp" android:layout_alignParentTop="true" android:orientation="horizontal" /> </net.mullvad.mullvadvpn.ui.widget.AccountLoginBorder> - <ListView android:id="@+id/account_history_list" + <ListView android:id="@+id/history" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:layout_below="@id/account_input_container" + android:layout_below="@id/border" android:divider="@drawable/account_history_list_divider" android:dividerHeight="1dp" android:visibility="invisible" |