Rename account input resources into account login

10 files changed, 31 insertions, 31 deletions

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 4690119129..ee29ef9be0 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
@@ -27,21 +27,21 @@ class AccountLoginBorder : RelativeLayout {
     )
 
     private val unfocusedDrawables = StateDrawables(
-        resources.getDrawable(R.drawable.account_input_corner, null),
-        resources.getDrawable(R.drawable.account_input_border, null),
-        resources.getDrawable(R.drawable.account_input_border, null)
+        resources.getDrawable(R.drawable.account_login_corner, null),
+        resources.getDrawable(R.drawable.account_login_border, null),
+        resources.getDrawable(R.drawable.account_login_border, null)
     )
 
     private val focusedDrawables = StateDrawables(
-        resources.getDrawable(R.drawable.account_input_corner_focused, null),
-        resources.getDrawable(R.drawable.account_input_border_focused, null),
-        resources.getDrawable(R.drawable.account_input_border_focused, null)
+        resources.getDrawable(R.drawable.account_login_corner_focused, null),
+        resources.getDrawable(R.drawable.account_login_border_focused, null),
+        resources.getDrawable(R.drawable.account_login_border_focused, null)
     )
 
     private val errorDrawables = StateDrawables(
-        resources.getDrawable(R.drawable.account_input_corner_error, null),
-        resources.getDrawable(R.drawable.account_input_border_error, null),
-        resources.getDrawable(R.drawable.account_input_border_error, null)
+        resources.getDrawable(R.drawable.account_login_corner_error, null),
+        resources.getDrawable(R.drawable.account_login_border_error, null),
+        resources.getDrawable(R.drawable.account_login_border_error, null)
     )
 
     private val container =
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_border.xml b/android/src/main/res/layout/account_login_border.xml
index 43e0fbea8b..73f17980e3 100644
--- a/android/src/main/res/layout/account_login_border.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/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>