Browse Source

improve layouting and texts for upload behavior #26

Andy Scherzinger 8 years ago
parent
commit
db291cdf87
2 changed files with 19 additions and 7 deletions
  1. 15 4
      res/layout/upload_files_layout.xml
  2. 4 3
      res/values/strings.xml

+ 15 - 4
res/layout/upload_files_layout.xml

@@ -45,14 +45,25 @@
     </LinearLayout>
 
     <LinearLayout
-        android:orientation="horizontal"
+        android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="@dimen/standard_padding">
+        android:paddingTop="@dimen/standard_half_padding"
+        android:paddingBottom="@dimen/standard_padding"
+        android:paddingLeft="@dimen/standard_padding"
+        android:paddingRight="@dimen/standard_padding">
 
-        <Spinner
-            android:layout_width="0dp"
+        <TextView
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:text="@string/uploader_upload_files_behaviour"
+            android:textColor="@color/black"
+            android:textStyle="bold"
+            android:paddingBottom="@dimen/standard_half_padding"/>
+
+        <Spinner
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
             android:id="@+id/upload_files_spinner_behaviour"
             android:layout_weight="1"/>
     </LinearLayout>

+ 4 - 3
res/values/strings.xml

@@ -69,9 +69,10 @@
     <string name="uploader_error_message_read_permission_not_granted">%1$s is not allowed to read a received file</string>
     <string name="uploader_error_message_source_file_not_found">File to upload was not found in its location. Please check whether the file exists.</string>
     <string name="uploader_error_message_source_file_not_copied">An error occurred while copying the file to a temporary folder. Please try to send again.</string>
-    <string name="uploader_upload_files_behaviour_move_to_nextcloud_folder">move to nextcloud folder</string>
-    <string name="uploader_upload_files_behaviour_only_upload">only upload</string>
-    <string name="uploader_upload_files_behaviour_upload_and_delete_from_source">upload and delete from source</string>
+    <string name="uploader_upload_files_behaviour">Upload option:</string>
+    <string name="uploader_upload_files_behaviour_move_to_nextcloud_folder">Move file to Nextcloud folder</string>
+    <string name="uploader_upload_files_behaviour_only_upload">Keep file in source directory</string>
+    <string name="uploader_upload_files_behaviour_upload_and_delete_from_source">Delete file from source directory</string>
     <string name="file_list_seconds_ago">seconds ago</string>
     <string name="file_list_empty">Nothing in here. Upload something!</string>
     <string name="file_list_loading">Loading&#8230;</string>