diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-03-19 10:33:48 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-03-22 07:05:13 -0300 |
| commit | c0490ef44c32d85c57720be9121a02ea20805c57 (patch) | |
| tree | b7098d2e6c7fedf5e584ccbf61209343e276e8e1 /android/src/main/res | |
| parent | bac359cdbe0adb693a5a6325bdc6f93897716592 (diff) | |
| download | mullvadvpn-c0490ef44c32d85c57720be9121a02ea20805c57.tar.xz mullvadvpn-c0490ef44c32d85c57720be9121a02ea20805c57.zip | |
Implement account input border colors
Diffstat (limited to 'android/src/main/res')
5 files changed, 78 insertions, 7 deletions
diff --git a/android/src/main/res/drawable/account_input_background.xml b/android/src/main/res/drawable/account_input_background.xml new file mode 100644 index 0000000000..506f6ae64e --- /dev/null +++ b/android/src/main/res/drawable/account_input_background.xml @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="utf-8"?> +<selector + xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="rectangle" + > + <item android:state_enabled="false"> + <inset + android:insetTop="1dp" + android:insetBottom="1dp" + android:insetLeft="1dp" + android:insetRight="1dp" + > + <shape android:shape="rectangle"> + <corners android:radius="@dimen/account_input_corner_radius"/> + <solid android:color="@color/white20"/> + </shape> + </inset> + </item> + + <item android:state_enabled="true"> + <inset + android:insetTop="1dp" + android:insetBottom="1dp" + android:insetLeft="1dp" + > + <shape android:shape="rectangle"> + <corners + android:bottomLeftRadius="@dimen/account_input_corner_radius" + android:topLeftRadius="@dimen/account_input_corner_radius" + /> + <solid android:color="@color/white"/> + </shape> + </inset> + </item> +</selector> diff --git a/android/src/main/res/drawable/account_input_border_error.xml b/android/src/main/res/drawable/account_input_border_error.xml new file mode 100644 index 0000000000..33afc1d30c --- /dev/null +++ b/android/src/main/res/drawable/account_input_border_error.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<shape + xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="rectangle" + > + <corners android:radius="@dimen/account_input_corner_radius"/> + <stroke android:width="2dp" android:color="@color/red"/> +</shape> diff --git a/android/src/main/res/drawable/account_input_border_focused.xml b/android/src/main/res/drawable/account_input_border_focused.xml new file mode 100644 index 0000000000..2bab472ac1 --- /dev/null +++ b/android/src/main/res/drawable/account_input_border_focused.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<shape + xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="rectangle" + > + <corners android:radius="@dimen/account_input_corner_radius"/> + <stroke android:width="2dp" android:color="@color/darkBlue"/> +</shape> diff --git a/android/src/main/res/drawable/login_button_background.xml b/android/src/main/res/drawable/login_button_background.xml index 8622392653..1fa396c74b 100644 --- a/android/src/main/res/drawable/login_button_background.xml +++ b/android/src/main/res/drawable/login_button_background.xml @@ -4,14 +4,34 @@ android:shape="rectangle" > <item android:state_enabled="false"> - <shape> - <solid android:color="@color/white"/> - </shape> + <inset + android:insetTop="1dp" + android:insetBottom="1dp" + android:insetRight="1dp" + > + <shape android:shape="rectangle"> + <corners + android:bottomRightRadius="@dimen/account_input_corner_radius" + android:topRightRadius="@dimen/account_input_corner_radius" + /> + <solid android:color="@color/white"/> + </shape> + </inset> </item> <item android:state_enabled="true"> - <shape> - <solid android:color="@color/green"/> - </shape> + <inset + android:insetTop="1dp" + android:insetBottom="1dp" + android:insetRight="1dp" + > + <shape android:shape="rectangle"> + <corners + android:bottomRightRadius="@dimen/account_input_corner_radius" + android:topRightRadius="@dimen/account_input_corner_radius" + /> + <solid android:color="@color/green"/> + </shape> + </inset> </item> </selector> diff --git a/android/src/main/res/layout/login.xml b/android/src/main/res/layout/login.xml index 9c8896024b..c5e59ee407 100644 --- a/android/src/main/res/layout/login.xml +++ b/android/src/main/res/layout/login.xml @@ -106,7 +106,7 @@ android:layout_height="match_parent" android:layout_weight="1" android:paddingHorizontal="12dp" - android:background="@color/white" + android:background="@drawable/account_input_background" android:inputType="number" android:singleLine="true" android:imeOptions="flagNoPersonalizedLearning" |