Merge branch 'create-account-login-widget'

3 files changed, 35 insertions, 28 deletions

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" />