From e885c78dc77c9909e5d7c3ce0acf612ea94aa0cd Mon Sep 17 00:00:00 2001 From: "David A. Velasco" Date: Tue, 14 Jul 2015 11:28:47 +0200 Subject: [PATCH] Added icon for files synchronizing; folders use it whenever downloading or uploading any file inside --- res/drawable/synchronizing_file_indicator.png | Bin 0 -> 3177 bytes .../android/ui/adapter/FileListListAdapter.java | 30 +++++++++++++++------ 2 files changed, 22 insertions(+), 8 deletions(-) create mode 100644 res/drawable/synchronizing_file_indicator.png diff --git a/res/drawable/synchronizing_file_indicator.png b/res/drawable/synchronizing_file_indicator.png new file mode 100644 index 0000000000000000000000000000000000000000..947cba73bfacf3997a4c0ad0411b3a89eaa10e2d GIT binary patch literal 3177 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

%yd81upteqL zz{Y$he>j3U01q7w7Y?;rz4yU#r<&ePQy3j@v+(iGN|YFdR9+i>>L*XwweTMght)uQ zcHZK+m#+&J3o2Oe%-@QM+Ll?)dsF)aw$cE?o1>Dy4a)vk8vjou|KA>ze88nUw2qqS TvadUQ3IL3S4XV!E=kC7%JmBfn literal 0 HcmV?d00001 diff --git a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java index 5e94e0f2..8d057146 100644 --- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java +++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java @@ -249,24 +249,38 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter { mTransferServiceGetter.getFileDownloaderBinder(); FileUploaderBinder uploaderBinder = mTransferServiceGetter.getFileUploaderBinder(); - boolean downloading = (downloaderBinder != null && - downloaderBinder.isDownloading(mAccount, file)); OperationsServiceBinder opsBinder = mTransferServiceGetter.getOperationsServiceBinder(); - downloading |= (opsBinder != null && + boolean downloading = (downloaderBinder != null && + downloaderBinder.isDownloading(mAccount, file)); + boolean uploading = (uploaderBinder != null && + uploaderBinder.isUploading(mAccount, file)); + boolean synchronizing = (opsBinder != null && opsBinder.isSynchronizing(mAccount, file.getRemotePath())); - if (downloading) { + + localStateView.setVisibility(View.INVISIBLE); // default first + + if (file.isFolder()) { + if (synchronizing || downloading || uploading) { + localStateView.setImageResource(R.drawable.synchronizing_file_indicator); + localStateView.setVisibility(View.VISIBLE); + } + + } else if (synchronizing) { + localStateView.setImageResource(R.drawable.synchronizing_file_indicator); + localStateView.setVisibility(View.VISIBLE); + + } else if (downloading) { localStateView.setImageResource(R.drawable.downloading_file_indicator); localStateView.setVisibility(View.VISIBLE); - } else if (uploaderBinder != null && - uploaderBinder.isUploading(mAccount, file)) { + + } else if (uploading) { localStateView.setImageResource(R.drawable.uploading_file_indicator); localStateView.setVisibility(View.VISIBLE); + } else if (file.isDown()) { localStateView.setImageResource(R.drawable.local_file_indicator); localStateView.setVisibility(View.VISIBLE); - } else { - localStateView.setVisibility(View.INVISIBLE); } // share with me icon -- 2.11.0