Merge branch 'develop' into release-1.5.8

diff --git a/res/drawable-hdpi/folder_public.png b/res/drawable-hdpi/folder_public.png
new file mode 100644 (file)
index 0000000..00f71c2
Binary files /dev/null and b/res/drawable-hdpi/folder_public.png differ

diff --git a/res/drawable-mdpi/folder_public.png b/res/drawable-mdpi/folder_public.png
new file mode 100644 (file)
index 0000000..bffdace
Binary files /dev/null and b/res/drawable-mdpi/folder_public.png differ

diff --git a/res/layout/list_item.xml b/res/layout/list_item.xml
index 9c47aa6..459f4f1 100644 (file)
--- a/res/layout/list_item.xml
+++ b/res/layout/list_item.xml
@@ -38,8 +38,8 @@
 \r
         <ImageView\r
             android:id="@+id/imageView1"\r
-            android:layout_width="20dp"\r
-            android:layout_height="20dp"\r
+            android:layout_width="32dp"\r
+            android:layout_height="32dp"\r
             android:layout_gravity="center_vertical|center"\r
             android:layout_margin="4dp"\r
             android:src="@drawable/ic_menu_archive" />\r

diff --git a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index 408154a..4a30be6 100644 (file)
--- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@ -119,6 +119,7 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
             sharedWithMeIconV.setVisibility(View.GONE);\r
 \r
             ImageView localStateView = (ImageView) view.findViewById(R.id.imageView2);\r
+            localStateView.bringToFront();\r
             FileDownloaderBinder downloaderBinder = mTransferServiceGetter.getFileDownloaderBinder();\r
             FileUploaderBinder uploaderBinder = mTransferServiceGetter.getFileUploaderBinder();\r
             if (downloaderBinder != null && downloaderBinder.isDownloading(mAccount, file)) {\r
@@ -184,6 +185,12 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
                 } else {\r
                     fileIcon.setImageResource(DisplayUtils.getResourceId(file.getMimetype(), file.getFileName()));\r
                 }\r
+\r
+                // If folder is sharedByLink, icon folder must be changed to\r
+                // folder-public one\r
+                if (file.isShareByLink()) {\r
+                    fileIcon.setImageResource(R.drawable.folder_public);\r
+                }\r
             }\r
 \r
             if (file.isShareByLink()) {\r