Change fields order in server edition dialog

vlc-android/res/layout/network_server_dialog.xml

@@ -54,9 +54,8 @@
         </EditText>
     </android.support.design.widget.TextInputLayout>
 
-
     <android.support.design.widget.TextInputLayout
-        android:id="@+id/server_folder"
+        android:id="@+id/server_username"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@+id/server_domain"
@@ -65,23 +64,24 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:minWidth="400dp"
-            android:hint="@string/server_folder_hint"
-            android:inputType="textUri"
+            android:hint="@string/server_username_hint"
+            android:inputType="text"
             android:singleLine="true" />
     </android.support.design.widget.TextInputLayout>
 
+
     <android.support.design.widget.TextInputLayout
-        android:id="@+id/server_username"
+        android:id="@+id/server_folder"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/server_folder"
+        android:layout_below="@+id/server_username"
         android:layout_alignParentLeft="true" >
         <EditText
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:minWidth="400dp"
-            android:hint="@string/server_username_hint"
-            android:inputType="text"
+            android:hint="@string/server_folder_hint"
+            android:inputType="textUri"
             android:singleLine="true" />
     </android.support.design.widget.TextInputLayout>
 
@@ -89,7 +89,7 @@
         android:id="@+id/server_url"
         android:layout_width="match_parent"
         android:layout_height="20dp"
-        android:layout_below="@+id/server_username"
+        android:layout_below="@+id/server_folder"
         android:layout_margin="5dp"
        android:gravity="center_horizontal"/>