diff options
Diffstat (limited to 'android/src')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountInputController.kt | 6 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountLoginBorder.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountInputContainer.kt) | 4 | ||||
| -rw-r--r-- | android/src/main/res/layout/account_login_border.xml (renamed from android/src/main/res/layout/account_input_container.xml) | 0 | ||||
| -rw-r--r-- | android/src/main/res/layout/login.xml | 8 |
4 files changed, 9 insertions, 9 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 7487d19911..7bd35bbc35 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountInputController.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountInputController.kt @@ -7,8 +7,8 @@ import android.widget.ListView import kotlin.properties.Delegates.observable import net.mullvad.mullvadvpn.R import net.mullvad.mullvadvpn.ui.widget.AccountInput -import net.mullvad.mullvadvpn.ui.widget.AccountInputContainer -import net.mullvad.mullvadvpn.ui.widget.AccountInputContainer.BorderState +import net.mullvad.mullvadvpn.ui.widget.AccountLoginBorder +import net.mullvad.mullvadvpn.ui.widget.AccountLoginBorder.BorderState class AccountInputController(val parentView: View, context: Context) { private var inputHasFocus by observable(false) { _, _, hasFocus -> @@ -32,7 +32,7 @@ class AccountInputController(val parentView: View, context: Context) { } } - val container: AccountInputContainer = parentView.findViewById(R.id.account_input_container) + val container: AccountLoginBorder = parentView.findViewById(R.id.account_input_container) val accountHistoryList: ListView = parentView.findViewById(R.id.account_history_list) val input = parentView.findViewById<AccountInput>(R.id.account_input).apply { diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountInputContainer.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountLoginBorder.kt index 2680ca87ac..4690119129 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountInputContainer.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountLoginBorder.kt @@ -8,7 +8,7 @@ import android.widget.ImageView import android.widget.RelativeLayout import net.mullvad.mullvadvpn.R -class AccountInputContainer : RelativeLayout { +class AccountLoginBorder : RelativeLayout { enum class BorderState { UNFOCUSED, FOCUSED, @@ -48,7 +48,7 @@ class AccountInputContainer : RelativeLayout { context.getSystemService(Context.LAYOUT_INFLATER_SERVICE).let { service -> val inflater = service as LayoutInflater - inflater.inflate(R.layout.account_input_container, this) + inflater.inflate(R.layout.account_login_border, this) } private val topLeftCorner: ImageView = container.findViewById(R.id.top_left_corner) diff --git a/android/src/main/res/layout/account_input_container.xml b/android/src/main/res/layout/account_login_border.xml index 43e0fbea8b..43e0fbea8b 100644 --- a/android/src/main/res/layout/account_input_container.xml +++ b/android/src/main/res/layout/account_login_border.xml diff --git a/android/src/main/res/layout/login.xml b/android/src/main/res/layout/login.xml index 1b4626785c..37882d8958 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.widget.AccountInputContainer android:id="@+id/account_input_container" - android:layout_width="match_parent" - android:layout_height="48dp"> + <net.mullvad.mullvadvpn.ui.widget.AccountLoginBorder 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.widget.AccountInputContainer> + </net.mullvad.mullvadvpn.ui.widget.AccountLoginBorder> <ListView android:id="@+id/account_history_list" android:layout_width="fill_parent" android:layout_height="wrap_content" |