summaryrefslogtreecommitdiffhomepage
path: root/android/src
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-09-03 21:42:00 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-09-21 15:28:40 +0000
commitdac962b421638ef9c9bb50db4da18daca2527386 (patch)
tree9ccfe52a586495e3819b436cb66bb3e9117157ec /android/src
parenta31ac533685a71847d2e0d3c020ace8df11c3db1 (diff)
downloadmullvadvpn-dac962b421638ef9c9bb50db4da18daca2527386.tar.xz
mullvadvpn-dac962b421638ef9c9bb50db4da18daca2527386.zip
Change where border elevation is configured
Diffstat (limited to 'android/src')
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountLogin.kt2
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountLoginBorder.kt14
2 files changed, 2 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 c2acd6a924..7a62b2839e 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
@@ -81,6 +81,8 @@ class AccountLogin : RelativeLayout {
}
init {
+ border.elevation = elevation + 0.1f
+
input.apply {
onFocusChanged.subscribe(this) { hasFocus ->
inputHasFocus = hasFocus
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountLoginBorder.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountLoginBorder.kt
index ee29ef9be0..e5ee732e08 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountLoginBorder.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountLoginBorder.kt
@@ -72,20 +72,6 @@ class AccountLoginBorder : RelativeLayout {
}
}
- init {
- val borderElevation = elevation + 0.1f
-
- topLeftCorner.elevation = borderElevation
- topRightCorner.elevation = borderElevation
- bottomLeftCorner.elevation = borderElevation
- bottomRightCorner.elevation = borderElevation
-
- topBorder.elevation = borderElevation
- leftBorder.elevation = borderElevation
- rightBorder.elevation = borderElevation
- bottomBorder.elevation = borderElevation
- }
-
constructor(context: Context) : super(context) {}
constructor(context: Context, attributes: AttributeSet) : super(context, attributes) {}