Merge pull request #555 from owncloud/update_shared_folder_icon

Updated icon for folder publicly shared.
This commit is contained in:
David A. Velasco 2014-07-08 12:57:19 +02:00
commit 4c4a0cb023
4 changed files with 9 additions and 2 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

View file

@ -38,8 +38,8 @@
<ImageView
android:id="@+id/imageView1"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_gravity="center_vertical|center"
android:layout_margin="4dp"
android:src="@drawable/ic_menu_archive" />

View file

@ -119,6 +119,7 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
sharedWithMeIconV.setVisibility(View.GONE);
ImageView localStateView = (ImageView) view.findViewById(R.id.imageView2);
localStateView.bringToFront();
FileDownloaderBinder downloaderBinder = mTransferServiceGetter.getFileDownloaderBinder();
FileUploaderBinder uploaderBinder = mTransferServiceGetter.getFileUploaderBinder();
if (downloaderBinder != null && downloaderBinder.isDownloading(mAccount, file)) {
@ -184,6 +185,12 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
} else {
fileIcon.setImageResource(DisplayUtils.getResourceId(file.getMimetype(), file.getFileName()));
}
// If folder is sharedByLink, icon folder must be changed to
// folder-public one
if (file.isShareByLink()) {
fileIcon.setImageResource(R.drawable.folder_public);
}
}
if (file.isShareByLink()) {