diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-09-03 11:48:57 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-09-04 11:54:35 +0000 |
| commit | 8f126e0cbb32845f116185f3ef8b4464e5260a1d (patch) | |
| tree | 317187d902505bd47308544ac26800fea1024767 /android/src | |
| parent | a40b6d37a8c604190c45a64ffce733f9b07f953b (diff) | |
| download | mullvadvpn-8f126e0cbb32845f116185f3ef8b4464e5260a1d.tar.xz mullvadvpn-8f126e0cbb32845f116185f3ef8b4464e5260a1d.zip | |
Move `AccountInputContainer` into `widget` package
Diffstat (limited to 'android/src')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountInputController.kt | 3 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountInputContainer.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountInputContainer.kt) | 2 | ||||
| -rw-r--r-- | android/src/main/res/layout/login.xml | 8 |
3 files changed, 7 insertions, 6 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountInputController.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountInputController.kt index 4c690537ba..7487d19911 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountInputController.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountInputController.kt @@ -6,8 +6,9 @@ import android.widget.ArrayAdapter import android.widget.ListView import kotlin.properties.Delegates.observable import net.mullvad.mullvadvpn.R -import net.mullvad.mullvadvpn.ui.AccountInputContainer.BorderState import net.mullvad.mullvadvpn.ui.widget.AccountInput +import net.mullvad.mullvadvpn.ui.widget.AccountInputContainer +import net.mullvad.mullvadvpn.ui.widget.AccountInputContainer.BorderState class AccountInputController(val parentView: View, context: Context) { private var inputHasFocus by observable(false) { _, _, hasFocus -> diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountInputContainer.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountInputContainer.kt index 4ef365e876..2680ca87ac 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountInputContainer.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountInputContainer.kt @@ -1,4 +1,4 @@ -package net.mullvad.mullvadvpn.ui +package net.mullvad.mullvadvpn.ui.widget import android.content.Context import android.graphics.drawable.Drawable diff --git a/android/src/main/res/layout/login.xml b/android/src/main/res/layout/login.xml index de5f6d0f2d..1b4626785c 100644 --- a/android/src/main/res/layout/login.xml +++ b/android/src/main/res/layout/login.xml @@ -64,15 +64,15 @@ android:textColor="@color/white80" android:textSize="@dimen/text_small" 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"> + <net.mullvad.mullvadvpn.ui.widget.AccountInputContainer android:id="@+id/account_input_container" + android:layout_width="match_parent" + android:layout_height="48dp"> <net.mullvad.mullvadvpn.ui.widget.AccountInput android:id="@+id/account_input" android:layout_width="match_parent" android:layout_height="48dp" android:layout_alignParentTop="true" android:orientation="horizontal" /> - </net.mullvad.mullvadvpn.ui.AccountInputContainer> + </net.mullvad.mullvadvpn.ui.widget.AccountInputContainer> <ListView android:id="@+id/account_history_list" android:layout_width="fill_parent" android:layout_height="wrap_content" |