浏览代码

Added and changed synchronizing, sync error and successfully synced icons

jabarros 9 年之前
父节点
当前提交
a9a944799e

二进制
res/drawable/conflict_file_indicator.png


二进制
res/drawable/downloading_file_indicator.png


二进制
res/drawable/ic_synced.png


二进制
res/drawable/ic_synchronizing.png


二进制
res/drawable/ic_synchronizing_error.png


二进制
res/drawable/local_file_indicator.png


二进制
res/drawable/synchronizing_file_indicator.png


二进制
res/drawable/uploading_file_indicator.png


+ 1 - 1
res/layout/grid_image.xml

@@ -54,7 +54,7 @@
             android:layout_marginTop="4dp"
             android:layout_marginBottom="4dp"
             android:layout_marginRight="4dp"
-            android:src="@drawable/local_file_indicator" />
+            android:src="@drawable/ic_synced" />
 
         <ImageView
             android:id="@+id/favoriteIcon"

+ 1 - 1
res/layout/grid_item.xml

@@ -54,7 +54,7 @@
             android:layout_gravity="bottom|right"
             android:layout_marginTop="2dp"
             android:layout_marginRight="2dp"
-            android:src="@drawable/local_file_indicator" />
+            android:src="@drawable/ic_synced" />
 
         <ImageView
             android:id="@+id/favoriteIcon"

+ 1 - 1
res/layout/list_item.xml

@@ -45,7 +45,7 @@
                 android:layout_height="@dimen/file_icon_size"
                 android:layout_gravity="top|right"
                 android:layout_marginRight="4dp"
-                android:src="@drawable/local_file_indicator" />
+                android:src="@drawable/ic_synced" />
 
             <ImageView
                 android:id="@+id/thumbnail"

+ 5 - 13
src/com/owncloud/android/ui/adapter/FileListListAdapter.java

@@ -269,37 +269,29 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
                                 opsBinder != null &&
                                 opsBinder.isSynchronizing(mAccount, file.getRemotePath())
                             ) {
-                        localStateView.setImageResource(R.drawable.synchronizing_file_indicator);
+                        localStateView.setImageResource(R.drawable.ic_synchronizing);
                         localStateView.setVisibility(View.VISIBLE);
 
                     } else if ( // downloading
                                 downloaderBinder != null &&
                                 downloaderBinder.isDownloading(mAccount, file)
                             ) {
-                        localStateView.setImageResource(
-                                file.isFolder() ?
-                                        R.drawable.synchronizing_file_indicator :
-                                        R.drawable.downloading_file_indicator
-                        );
+                        localStateView.setImageResource(R.drawable.ic_synchronizing);
                         localStateView.setVisibility(View.VISIBLE);
 
                     } else if ( //uploading
                                 uploaderBinder != null &&
                                 uploaderBinder.isUploading(mAccount, file)
                             ) {
-                        localStateView.setImageResource(
-                                file.isFolder() ?
-                                        R.drawable.synchronizing_file_indicator :
-                                        R.drawable.uploading_file_indicator
-                        );
+                        localStateView.setImageResource(R.drawable.ic_synchronizing);
                         localStateView.setVisibility(View.VISIBLE);
 
                     } else if (file.getEtagInConflict() != null) {   // conflict
-                        localStateView.setImageResource(R.drawable.conflict_file_indicator);
+                        localStateView.setImageResource(R.drawable.ic_synchronizing_error);
                         localStateView.setVisibility(View.VISIBLE);
 
                     } else if (file.isDown()) {
-                        localStateView.setImageResource(R.drawable.local_file_indicator);
+                        localStateView.setImageResource(R.drawable.ic_synced);
                         localStateView.setVisibility(View.VISIBLE);
                     }