improve uploads UI

app/src/main/res/layout/activity_upload.xml

@@ -41,16 +41,6 @@
             android:focusableInTouchMode="true"
             android:orientation="vertical">
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="6dp"
-                android:layout_marginTop="6dp"
-                android:gravity="center"
-                android:text="@string/upload_category_pre_text"
-                android:textAlignment="center"
-                android:textColor="@color/accent" />
-
             <LinearLayout
                 android:id="@+id/upload_spinners"
                 android:layout_width="match_parent"
@@ -68,25 +58,6 @@
                     android:prompt="@string/upload_spinners_hint" />
             </LinearLayout>
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="6dp"
-                android:gravity="center"
-                android:text="@string/upload_title_description_pre_text"
-                android:textAlignment="center"
-                android:textColor="@color/accent" />
-
-            <android.support.v7.widget.AppCompatButton
-                android:id="@+id/upload_title_description_builder"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="6dp"
-                android:gravity="center"
-                android:text="@string/upload_title_description_builder"
-                android:textAlignment="center"
-                android:textColor="@color/accent" />
-
             <android.support.design.widget.TextInputLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -117,6 +88,16 @@
                     android:maxLines="3" />
             </android.support.design.widget.TextInputLayout>
 
+            <android.support.v7.widget.AppCompatButton
+                android:id="@+id/upload_title_description_builder"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="6dp"
+                android:gravity="center"
+                android:text="@string/upload_title_description_builder"
+                android:textAlignment="center"
+                android:textColor="@color/accent" />
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
@@ -129,6 +110,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="end"
+                    android:layout_marginEnd="16dp"
                     android:drawablePadding="5dp"
                     android:gravity="center_vertical"
                     android:text="@string/upload_select_file"

app/src/main/res/values/strings.xml

@@ -109,12 +109,10 @@
     <string name="upload_button">Upload</string>
 
     <!--Upload Activity-->
-    <string name="upload_category_pre_text">Select the correct category for the file</string>
-    <string name="upload_title_description_pre_text">Fill in the title and description\nor</string>
-    <string name="upload_title_description_builder">build them automatically</string>
+    <string name="upload_title_description_builder">Generate title and description</string>
     <string name="upload_title_hint">Title</string>
     <string name="upload_description_hint">Description</string>
-    <string name="upload_select_file">Select file to upload</string>
+    <string name="upload_select_file">Select file</string>
     <string name="upload_upload_button">Upload</string>
     <string name="upload_spinners_hint">Select a category</string>