Merge pull request #1685 from owncloud/change_overlay_synced_icons

Change overlay synced icons

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"
@@ -63,7 +63,7 @@
             android:layout_gravity="bottom|right"
             android:layout_marginBottom="4dp"
             android:layout_marginRight="4dp"
-            android:src="@drawable/ic_favorite" />
+            android:src="@drawable/ic_available_offline" />
     </FrameLayout>
 
 </LinearLayout>

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"
@@ -63,7 +63,7 @@
             android:layout_gravity="bottom|right"
             android:layout_marginBottom="2dp"
             android:layout_marginRight="2dp"
-            android:src="@drawable/ic_favorite" />
+            android:src="@drawable/ic_available_offline" />
 
 
 

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"
@@ -60,7 +60,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="bottom|right"
                 android:layout_marginRight="4dp"
-                android:src="@drawable/ic_favorite" />
+                android:src="@drawable/ic_available_offline" />
         </FrameLayout>
 
         <LinearLayout

res/values/strings.xml

@@ -230,8 +230,8 @@
 	<string name="auth_can_not_auth_against_server">Cannot authenticate to this server</string>
     <string name="auth_account_does_not_exist">Account does not exist in the device yet</string>
     
-    <string name="favorite">Favorite</string>
-    <string name="unfavorite">Unfavorite</string>
+    <string name="favorite">Set as available offline</string>
+    <string name="unfavorite">Unset as available offline</string>
     <string name="common_rename">Rename</string>
     <string name="common_remove">Remove</string>
     <string name="confirmation_remove_alert">"Do you really want to remove %1$s?"</string>

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);
                     }