- minor design changes

diff --git a/res/layout/list_footer.xml b/res/layout/list_footer.xml
index b20f9e9..a49874d 100644 (file)
--- a/res/layout/list_footer.xml
+++ b/res/layout/list_footer.xml
@@ -1,28 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>

-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

     android:layout_width="wrap_content"
     android:layout_width="wrap_content"

-    android:layout_height="wrap_content"
-    android:paddingTop="7dip"
-    android:paddingBottom="7dip"
-    android:orientation="horizontal"
-    android:gravity="center">
-
-    <LinearLayout 
-        android:id="@+id/footer_layout" 
-        android:layout_width="wrap_content" 
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:gravity="center"
-        android:layout_gravity="center">
-
-    
-    </LinearLayout>
+    android:layout_height="56dp"
+    android:layout_gravity="center_horizontal"
+    android:gravity="center_horizontal"
+    android:orientation="vertical"
+    android:showDividers="none" >

 
     <TextView
         android:id="@+id/footerText"
 
     <TextView
         android:id="@+id/footerText"

-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:layout_height="56dp"
+        android:layout_gravity="center"
+        android:gravity="center"

         android:textColor="@color/setup_text_hint" />
 
 </LinearLayout> 
\ No newline at end of file
         android:textColor="@color/setup_text_hint" />
 
 </LinearLayout> 
\ No newline at end of file

diff --git a/res/layout/list_fragment.xml b/res/layout/list_fragment.xml
index 00e6b41..56e869c 100644 (file)
--- a/res/layout/list_fragment.xml
+++ b/res/layout/list_fragment.xml
@@ -27,7 +27,8 @@
         android:id="@+id/list_root"
         android:layout_width="match_parent"
         android:layout_height="0dip"
         android:id="@+id/list_root"
         android:layout_width="match_parent"
         android:layout_height="0dip"

-        android:layout_weight="1" 
+        android:layout_weight="1"
+        android:footerDividersEnabled="false" 

        />
     
     <TextView
        />
     
     <TextView

diff --git a/res/values/strings.xml b/res/values/strings.xml
index e95f262..30f6b4f 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -51,8 +51,8 @@
     <string name="uploader_error_forbidden_content">%1$s is not allowed to access the shared content</string>
     <string name="uploader_info_uploading">Uploading</string>
     <string name="file_list_empty">There are no files in this folder.\nNew files can be added with the \"Upload\" menu option.</string>
     <string name="uploader_error_forbidden_content">%1$s is not allowed to access the shared content</string>
     <string name="uploader_info_uploading">Uploading</string>
     <string name="file_list_empty">There are no files in this folder.\nNew files can be added with the \"Upload\" menu option.</string>

-    <string name="file_list_folder">folder and</string>
-    <string name="file_list_folders">folders and</string>
+    <string name="file_list_folder">folder</string>
+    <string name="file_list_folders">folders</string>

     <string name="file_list_file">file</string>
     <string name="file_list_files">files</string>
     <string name="filedetails_select_file">Tap on a file to display additional information.</string>
     <string name="file_list_file">file</string>
     <string name="file_list_files">files</string>
     <string name="filedetails_select_file">Tap on a file to display additional information.</string>

diff --git a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
index 45fe0b0..5b9be47 100644 (file)
--- a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@ -453,14 +453,14 @@ public class OCFileListFragment extends ExtendedListFragment implements EditName
         String output = "";
 
         if (folders == 1) {
         String output = "";
 
         if (folders == 1) {

-            output = folders.toString() + " " + getResources().getString(R.string.file_list_folder);
+            output = folders.toString() + " " + getResources().getString(R.string.file_list_folder) + ", ";

         } else if (folders > 1) {
         } else if (folders > 1) {

-            output = folders.toString() + " " + getResources().getString(R.string.file_list_folders);
+            output = folders.toString() + " " + getResources().getString(R.string.file_list_folders) + ", ";

         }
         if (files == 1) {
         }
         if (files == 1) {

-            output = output + " " + files.toString() + " " + getResources().getString(R.string.file_list_file);
+            output = output + files.toString() + " " + getResources().getString(R.string.file_list_file);

         } else {
         } else {

-            output = output + " " + files.toString() + " " + getResources().getString(R.string.file_list_files);
+            output = output + files.toString() + " " + getResources().getString(R.string.file_list_files);

         }
         return output;
     }
         }
         return output;
     }