summaryrefslogtreecommitdiffhomepage
path: root/android/src/main/res
diff options
context:
space:
mode:
Diffstat (limited to 'android/src/main/res')
-rw-r--r--android/src/main/res/drawable/account_history_background.xml4
-rw-r--r--android/src/main/res/drawable/account_login_border.xml (renamed from android/src/main/res/drawable/account_input_border.xml)0
-rw-r--r--android/src/main/res/drawable/account_login_border_error.xml (renamed from android/src/main/res/drawable/account_input_border_error.xml)0
-rw-r--r--android/src/main/res/drawable/account_login_border_focused.xml (renamed from android/src/main/res/drawable/account_input_border_focused.xml)0
-rw-r--r--android/src/main/res/drawable/account_login_corner.xml (renamed from android/src/main/res/drawable/account_input_corner.xml)4
-rw-r--r--android/src/main/res/drawable/account_login_corner_error.xml (renamed from android/src/main/res/drawable/account_input_corner_error.xml)4
-rw-r--r--android/src/main/res/drawable/account_login_corner_focused.xml (renamed from android/src/main/res/drawable/account_input_corner_focused.xml)4
-rw-r--r--android/src/main/res/layout/account_login.xml20
-rw-r--r--android/src/main/res/layout/account_login_border.xml (renamed from android/src/main/res/layout/account_input_container.xml)24
-rw-r--r--android/src/main/res/layout/login.xml19
-rw-r--r--android/src/main/res/values/dimensions.xml4
11 files changed, 45 insertions, 38 deletions
diff --git a/android/src/main/res/drawable/account_history_background.xml b/android/src/main/res/drawable/account_history_background.xml
index b596284ace..596eb2d43d 100644
--- a/android/src/main/res/drawable/account_history_background.xml
+++ b/android/src/main/res/drawable/account_history_background.xml
@@ -2,7 +2,7 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
- <corners android:radius="@dimen/account_input_corner_radius" />
+ <corners android:radius="@dimen/account_login_corner_radius" />
<solid android:color="@color/darkBlue" />
</shape>
</item>
@@ -11,7 +11,7 @@
android:bottom="1dp"
android:left="1dp">
<shape xmlns:android="http://schemas.android.com/apk/res/android">
- <corners android:radius="@dimen/account_input_corner_radius" />
+ <corners android:radius="@dimen/account_login_corner_radius" />
<solid android:color="@color/white" />
</shape>
</item>
diff --git a/android/src/main/res/drawable/account_input_border.xml b/android/src/main/res/drawable/account_login_border.xml
index 7aa3362f35..7aa3362f35 100644
--- a/android/src/main/res/drawable/account_input_border.xml
+++ b/android/src/main/res/drawable/account_login_border.xml
diff --git a/android/src/main/res/drawable/account_input_border_error.xml b/android/src/main/res/drawable/account_login_border_error.xml
index 7b0b225c85..7b0b225c85 100644
--- a/android/src/main/res/drawable/account_input_border_error.xml
+++ b/android/src/main/res/drawable/account_login_border_error.xml
diff --git a/android/src/main/res/drawable/account_input_border_focused.xml b/android/src/main/res/drawable/account_login_border_focused.xml
index fa32039e1d..fa32039e1d 100644
--- a/android/src/main/res/drawable/account_input_border_focused.xml
+++ b/android/src/main/res/drawable/account_login_border_focused.xml
diff --git a/android/src/main/res/drawable/account_input_corner.xml b/android/src/main/res/drawable/account_login_corner.xml
index aed002b4ec..e4640e498d 100644
--- a/android/src/main/res/drawable/account_input_corner.xml
+++ b/android/src/main/res/drawable/account_login_corner.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="@dimen/account_input_corner_radius"
- android:height="@dimen/account_input_corner_radius"
+ android:width="@dimen/account_login_corner_radius"
+ android:height="@dimen/account_login_corner_radius"
android:viewportWidth="4.0"
android:viewportHeight="4.0">
<path android:fillColor="@color/blue"
diff --git a/android/src/main/res/drawable/account_input_corner_error.xml b/android/src/main/res/drawable/account_login_corner_error.xml
index c3acb16404..c19e1be609 100644
--- a/android/src/main/res/drawable/account_input_corner_error.xml
+++ b/android/src/main/res/drawable/account_login_corner_error.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="@dimen/account_input_corner_radius"
- android:height="@dimen/account_input_corner_radius"
+ android:width="@dimen/account_login_corner_radius"
+ android:height="@dimen/account_login_corner_radius"
android:viewportWidth="4.0"
android:viewportHeight="4.0">
<path android:fillColor="@color/blue"
diff --git a/android/src/main/res/drawable/account_input_corner_focused.xml b/android/src/main/res/drawable/account_login_corner_focused.xml
index 1370463d49..a02110b51d 100644
--- a/android/src/main/res/drawable/account_input_corner_focused.xml
+++ b/android/src/main/res/drawable/account_login_corner_focused.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="@dimen/account_input_corner_radius"
- android:height="@dimen/account_input_corner_radius"
+ android:width="@dimen/account_login_corner_radius"
+ android:height="@dimen/account_login_corner_radius"
android:viewportWidth="4.0"
android:viewportHeight="4.0">
<path android:fillColor="@color/blue"
diff --git a/android/src/main/res/layout/account_login.xml b/android/src/main/res/layout/account_login.xml
new file mode 100644
index 0000000000..b64a52d6e6
--- /dev/null
+++ b/android/src/main/res/layout/account_login.xml
@@ -0,0 +1,20 @@
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+ <net.mullvad.mullvadvpn.ui.widget.AccountLoginBorder android:id="@+id/border"
+ android:layout_width="match_parent"
+ android:layout_height="48dp"
+ android:layout_alignParentTop="true">
+ <net.mullvad.mullvadvpn.ui.widget.AccountInput android:id="@+id/input"
+ android:layout_width="match_parent"
+ android:layout_height="48dp"
+ android:layout_alignParentTop="true"
+ android:orientation="horizontal" />
+ </net.mullvad.mullvadvpn.ui.widget.AccountLoginBorder>
+ <ListView android:id="@+id/history"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/border"
+ android:divider="@drawable/account_history_list_divider"
+ android:dividerHeight="1dp"
+ android:visibility="invisible"
+ android:background="@drawable/account_history_background" />
+</merge>
diff --git a/android/src/main/res/layout/account_input_container.xml b/android/src/main/res/layout/account_login_border.xml
index 43e0fbea8b..73f17980e3 100644
--- a/android/src/main/res/layout/account_input_container.xml
+++ b/android/src/main/res/layout/account_login_border.xml
@@ -5,55 +5,55 @@
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
- android:src="@drawable/account_input_corner" />
+ android:src="@drawable/account_login_corner" />
<ImageView android:id="@+id/top_right_corner"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
android:rotation="90"
- android:src="@drawable/account_input_corner" />
+ android:src="@drawable/account_login_corner" />
<ImageView android:id="@+id/bottom_right_corner"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:rotation="180"
- android:src="@drawable/account_input_corner" />
+ android:src="@drawable/account_login_corner" />
<ImageView android:id="@+id/bottom_left_corner"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true"
android:rotation="270"
- android:src="@drawable/account_input_corner" />
+ android:src="@drawable/account_login_corner" />
<!-- sides -->
<ImageView android:id="@+id/left_border"
- android:layout_width="@dimen/account_input_border_width"
+ android:layout_width="@dimen/account_login_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" />
+ android:src="@drawable/account_login_border" />
<ImageView android:id="@+id/right_border"
- android:layout_width="@dimen/account_input_border_width"
+ android:layout_width="@dimen/account_login_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" />
+ android:src="@drawable/account_login_border" />
<ImageView android:id="@+id/top_border"
android:layout_width="wrap_content"
- android:layout_height="@dimen/account_input_border_width"
+ android:layout_height="@dimen/account_login_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" />
+ android:src="@drawable/account_login_border" />
<ImageView android:id="@+id/bottom_border"
android:layout_width="wrap_content"
- android:layout_height="@dimen/account_input_border_width"
+ android:layout_height="@dimen/account_login_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" />
+ android:src="@drawable/account_login_border" />
</merge>
diff --git a/android/src/main/res/layout/login.xml b/android/src/main/res/layout/login.xml
index de5f6d0f2d..4510d0c627 100644
--- a/android/src/main/res/layout/login.xml
+++ b/android/src/main/res/layout/login.xml
@@ -64,22 +64,9 @@
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.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>
- <ListView android:id="@+id/account_history_list"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:divider="@drawable/account_history_list_divider"
- android:dividerHeight="1dp"
- android:visibility="invisible"
- android:background="@drawable/account_history_background" />
+ <net.mullvad.mullvadvpn.ui.widget.AccountLogin android:id="@+id/account_login"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
<Space android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="3" />
diff --git a/android/src/main/res/values/dimensions.xml b/android/src/main/res/values/dimensions.xml
index 0e4240ef36..692fba86e4 100644
--- a/android/src/main/res/values/dimensions.xml
+++ b/android/src/main/res/values/dimensions.xml
@@ -4,8 +4,8 @@
<dimen name="relay_row_padding">50dp</dimen>
<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="account_login_corner_radius">4dp</dimen>
+ <dimen name="account_login_border_width">2dp</dimen>
<dimen name="edit_text_corner_radius">4dp</dimen>
<dimen name="button_height">44dp</dimen>
<dimen name="cell_switch_border_radius">16dp</dimen>
Copyright © 2025 - 2026 Wayne Cole. WTFPL. Attribution appreciated. No warranty. Not liable for bodily damages.