diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-08-27 22:22:18 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-09-01 09:53:48 +0000 |
| commit | 81288ad20ef589937c1a6dc5075a6d6b240a8804 (patch) | |
| tree | f1e2c0659d63ee1765ba25be2f49a02705ca58e8 /android/src | |
| parent | b54b094b5b4934329727b125c98de283b2e71b99 (diff) | |
| download | mullvadvpn-81288ad20ef589937c1a6dc5075a6d6b240a8804.tar.xz mullvadvpn-81288ad20ef589937c1a6dc5075a6d6b240a8804.zip | |
Build border sides using image views
Diffstat (limited to 'android/src')
3 files changed, 41 insertions, 0 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 58a71eb651..b45f7b8880 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountInputContainer.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountInputContainer.kt @@ -34,6 +34,11 @@ class AccountInputContainer : RelativeLayout { private val bottomLeftCorner: ImageView = container.findViewById(R.id.bottom_left_corner) private val bottomRightCorner: ImageView = container.findViewById(R.id.bottom_right_corner) + private val topBorder: ImageView = container.findViewById(R.id.top_border) + private val leftBorder: ImageView = container.findViewById(R.id.left_border) + private val rightBorder: ImageView = container.findViewById(R.id.right_border) + private val bottomBorder: ImageView = container.findViewById(R.id.bottom_border) + var borderState = BorderState.UNFOCUSED set(value) { field = value @@ -60,6 +65,11 @@ class AccountInputContainer : RelativeLayout { 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) {} diff --git a/android/src/main/res/layout/account_input_container.xml b/android/src/main/res/layout/account_input_container.xml index f872bd1bf6..43e0fbea8b 100644 --- a/android/src/main/res/layout/account_input_container.xml +++ b/android/src/main/res/layout/account_input_container.xml @@ -1,4 +1,5 @@ <merge xmlns:android="http://schemas.android.com/apk/res/android"> + <!-- corners --> <ImageView android:id="@+id/top_left_corner" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -26,4 +27,33 @@ android:layout_alignParentLeft="true" android:rotation="270" android:src="@drawable/account_input_corner" /> + <!-- sides --> + <ImageView android:id="@+id/left_border" + android:layout_width="@dimen/account_input_border_width" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:layout_below="@id/top_left_corner" + android:layout_above="@id/bottom_left_corner" + android:src="@drawable/account_input_border" /> + <ImageView android:id="@+id/right_border" + android:layout_width="@dimen/account_input_border_width" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:layout_below="@id/top_right_corner" + android:layout_above="@id/bottom_right_corner" + android:src="@drawable/account_input_border" /> + <ImageView android:id="@+id/top_border" + android:layout_width="wrap_content" + android:layout_height="@dimen/account_input_border_width" + android:layout_toLeftOf="@id/top_right_corner" + android:layout_toRightOf="@id/top_left_corner" + android:layout_alignParentTop="true" + android:src="@drawable/account_input_border" /> + <ImageView android:id="@+id/bottom_border" + android:layout_width="wrap_content" + android:layout_height="@dimen/account_input_border_width" + android:layout_toLeftOf="@id/bottom_right_corner" + android:layout_toRightOf="@id/bottom_left_corner" + android:layout_alignParentBottom="true" + android:src="@drawable/account_input_border" /> </merge> diff --git a/android/src/main/res/values/dimensions.xml b/android/src/main/res/values/dimensions.xml index d06f80e517..1d87dc8350 100644 --- a/android/src/main/res/values/dimensions.xml +++ b/android/src/main/res/values/dimensions.xml @@ -5,6 +5,7 @@ <dimen name="list_item_divider">1dp</dimen> <dimen name="dialog_margin">14dp</dimen> <dimen name="account_input_corner_radius">4dp</dimen> + <dimen name="account_input_border_width">2dp</dimen> <dimen name="edit_text_corner_radius">4dp</dimen> <dimen name="normal_button_height">44dp</dimen> <dimen name="tall_button_height">64dp</dimen> |