Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab

diff --git a/res/layout/list_item.xml b/res/layout/list_item.xml
index 17b098a..ee1f26a 100644 (file)
--- a/res/layout/list_item.xml
+++ b/res/layout/list_item.xml
@@ -92,7 +92,7 @@
                 android:orientation="horizontal">\r
 \r
                 <TextView\r
-                    android:id="@+id/last_size"\r
+                    android:id="@+id/file_size"\r
                     android:layout_width="wrap_content"\r
                     android:layout_height="wrap_content"\r
                     android:text="Size MB"\r
@@ -109,7 +109,7 @@
                     android:textSize="@dimen/two_line_secondary_text_size"/>\r
 \r
                 <TextView\r
-                    android:id="@+id/file_mod"\r
+                    android:id="@+id/last_mod"\r
                     android:layout_width="wrap_content"\r
                     android:layout_height="wrap_content"\r
                     android:gravity="right"\r

diff --git a/res/values/colors.xml b/res/values/colors.xml
index 694e231..b3c2d54 100644 (file)
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -32,7 +32,7 @@
     <color name="black_semi_transparent">#B2000000</color>
     <color name="textColor">@color/black</color>
     <color name="drawerMenuTextColor">#000000</color>
-    <color name="list_divider_background">#eee</color>
+    <color name="list_divider_background">#f8f8f8</color>
     <color name="filelist_icon_backgorund">#DDDDDD</color>
     <color name="dark_background_text_color">#EEEEEE</color>
     <color name="login_text_color">#757575</color>

diff --git a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index e9e9614..a41e4fe 100644 (file)
--- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@ -193,9 +193,9 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
 \r
             switch (viewType){\r
                 case LIST_ITEM:\r
-                    TextView fileSizeV = (TextView) view.findViewById(R.id.last_size);\r
+                    TextView fileSizeV = (TextView) view.findViewById(R.id.file_size);\r
                     TextView fileSizeSeparatorV = (TextView) view.findViewById(R.id.file_separator);\r
-                    TextView lastModV = (TextView) view.findViewById(R.id.file_mod);\r
+                    TextView lastModV = (TextView) view.findViewById(R.id.last_mod);\r
                     ImageView checkBoxV = (ImageView) view.findViewById(R.id.custom_checkbox);\r
 \r
                     lastModV.setVisibility(View.VISIBLE);\r
@@ -225,8 +225,8 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
                         }\r
 \r
                     } else { //Folder\r
-                        fileSizeSeparatorV.setVisibility(View.INVISIBLE);\r
-                        fileSizeV.setVisibility(View.INVISIBLE);\r
+                        fileSizeSeparatorV.setVisibility(View.GONE);\r
+                        fileSizeV.setVisibility(View.GONE);\r
                     }\r
 \r
                 case GRID_ITEM:\r

diff --git a/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java b/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
index 54705da..a6839e5 100644 (file)
--- a/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
@@ -120,9 +120,9 @@ public class LocalFileListAdapter extends BaseAdapter implements ListAdapter {
             }
             fileIcon.setTag(file.hashCode());
 
-            TextView fileSizeV = (TextView) view.findViewById(R.id.last_size);
+            TextView fileSizeV = (TextView) view.findViewById(R.id.file_size);
             TextView fileSizeSeparatorV = (TextView) view.findViewById(R.id.file_separator);
-            TextView lastModV = (TextView) view.findViewById(R.id.file_mod);
+            TextView lastModV = (TextView) view.findViewById(R.id.last_mod);
             ImageView checkBoxV = (ImageView) view.findViewById(R.id.custom_checkbox);
             if (!file.isDirectory()) {
                 fileSizeSeparatorV.setVisibility(View.VISIBLE);