Răsfoiți Sursa

New 'move' icon; fixed hdpi, mdpi icons

David A. Velasco 8 ani în urmă
părinte
comite
25f623be8f
62 a modificat fișierele cu 12 adăugiri și 13 ștergeri
  1. BIN
      res/drawable-hdpi/ic_action_cancel_grey.png
  2. BIN
      res/drawable-hdpi/ic_action_cancel_white.png
  3. BIN
      res/drawable-hdpi/ic_action_copy.png
  4. 0 0
      res/drawable-hdpi/ic_action_delete_grey.png
  5. BIN
      res/drawable-hdpi/ic_action_delete_white.png
  6. BIN
      res/drawable-hdpi/ic_action_download.png
  7. BIN
      res/drawable-hdpi/ic_action_move.png
  8. BIN
      res/drawable-hdpi/ic_action_refresh.png
  9. BIN
      res/drawable-hdpi/ic_action_refresh_grey.png
  10. BIN
      res/drawable-hdpi/ic_action_refresh_white.png
  11. BIN
      res/drawable-hdpi/ic_action_share.png
  12. BIN
      res/drawable-hdpi/ic_cancel.png
  13. BIN
      res/drawable-hdpi/ic_copy.png
  14. BIN
      res/drawable-hdpi/ic_delete.png
  15. BIN
      res/drawable-hdpi/ic_export.png
  16. BIN
      res/drawable-hdpi/ic_share.png
  17. BIN
      res/drawable-mdpi/ic_action_cancel_grey.png
  18. BIN
      res/drawable-mdpi/ic_action_cancel_white.png
  19. BIN
      res/drawable-mdpi/ic_action_copy.png
  20. 0 0
      res/drawable-mdpi/ic_action_delete_grey.png
  21. BIN
      res/drawable-mdpi/ic_action_delete_white.png
  22. BIN
      res/drawable-mdpi/ic_action_download.png
  23. BIN
      res/drawable-mdpi/ic_action_move.png
  24. BIN
      res/drawable-mdpi/ic_action_refresh.png
  25. BIN
      res/drawable-mdpi/ic_action_refresh_black.png
  26. BIN
      res/drawable-mdpi/ic_action_refresh_grey.png
  27. BIN
      res/drawable-mdpi/ic_action_refresh_white.png
  28. BIN
      res/drawable-mdpi/ic_action_share.png
  29. BIN
      res/drawable-mdpi/ic_cancel.png
  30. BIN
      res/drawable-mdpi/ic_delete.png
  31. BIN
      res/drawable-mdpi/ic_export.png
  32. 0 0
      res/drawable-xhdpi/ic_action_cancel_grey.png
  33. BIN
      res/drawable-xhdpi/ic_action_cancel_white.png
  34. 0 0
      res/drawable-xhdpi/ic_action_copy.png
  35. 0 0
      res/drawable-xhdpi/ic_action_delete_grey.png
  36. BIN
      res/drawable-xhdpi/ic_action_delete_white.png
  37. BIN
      res/drawable-xhdpi/ic_action_move.png
  38. BIN
      res/drawable-xhdpi/ic_action_refresh_grey.png
  39. 0 0
      res/drawable-xhdpi/ic_action_refresh_white.png
  40. 0 0
      res/drawable-xhdpi/ic_action_share.png
  41. BIN
      res/drawable-xhdpi/ic_copy.png
  42. BIN
      res/drawable-xhdpi/ic_delete.png
  43. BIN
      res/drawable-xhdpi/ic_export.png
  44. BIN
      res/drawable-xhdpi/ic_share.png
  45. 0 0
      res/drawable-xxhdpi/ic_action_cancel_grey.png
  46. BIN
      res/drawable-xxhdpi/ic_action_cancel_white.png
  47. 0 0
      res/drawable-xxhdpi/ic_action_copy.png
  48. 0 0
      res/drawable-xxhdpi/ic_action_delete_grey.png
  49. BIN
      res/drawable-xxhdpi/ic_action_delete_white.png
  50. BIN
      res/drawable-xxhdpi/ic_action_move.png
  51. 0 0
      res/drawable-xxhdpi/ic_action_refresh_white.png
  52. 0 0
      res/drawable-xxhdpi/ic_action_share.png
  53. BIN
      res/drawable-xxhdpi/ic_delete.png
  54. BIN
      res/drawable-xxhdpi/ic_export.png
  55. BIN
      res/drawable-xxhdpi/ic_open_in_app.png
  56. 0 0
      res/drawable-xxxhdpi/ic_action_delete_grey.png
  57. 1 1
      res/layout/file_details_fragment.xml
  58. 1 1
      res/layout/file_download_fragment.xml
  59. 1 1
      res/layout/share_user_item.xml
  60. 6 7
      res/menu/file_actions_menu.xml
  61. 1 1
      res/menu/main_menu.xml
  62. 2 2
      src/com/owncloud/android/ui/adapter/ExpandableUploadListAdapter.java

BIN
res/drawable-hdpi/ic_action_cancel_grey.png


BIN
res/drawable-hdpi/ic_action_cancel_white.png


BIN
res/drawable-hdpi/ic_action_copy.png


+ 0 - 0
res/drawable-hdpi/ic_action_delete.png → res/drawable-hdpi/ic_action_delete_grey.png


BIN
res/drawable-hdpi/ic_action_delete_white.png


BIN
res/drawable-hdpi/ic_action_download.png


BIN
res/drawable-hdpi/ic_action_move.png


BIN
res/drawable-hdpi/ic_action_refresh.png


BIN
res/drawable-hdpi/ic_action_refresh_grey.png


BIN
res/drawable-hdpi/ic_action_refresh_white.png


BIN
res/drawable-hdpi/ic_action_share.png


BIN
res/drawable-hdpi/ic_cancel.png


BIN
res/drawable-hdpi/ic_copy.png


BIN
res/drawable-hdpi/ic_delete.png


BIN
res/drawable-hdpi/ic_export.png


BIN
res/drawable-hdpi/ic_share.png


BIN
res/drawable-mdpi/ic_action_cancel_grey.png


BIN
res/drawable-mdpi/ic_action_cancel_white.png


BIN
res/drawable-mdpi/ic_action_copy.png


+ 0 - 0
res/drawable-mdpi/ic_action_delete.png → res/drawable-mdpi/ic_action_delete_grey.png


BIN
res/drawable-mdpi/ic_action_delete_white.png


BIN
res/drawable-mdpi/ic_action_download.png


BIN
res/drawable-mdpi/ic_action_move.png


BIN
res/drawable-mdpi/ic_action_refresh.png


BIN
res/drawable-mdpi/ic_action_refresh_black.png


BIN
res/drawable-mdpi/ic_action_refresh_grey.png


BIN
res/drawable-mdpi/ic_action_refresh_white.png


BIN
res/drawable-mdpi/ic_action_share.png


BIN
res/drawable-mdpi/ic_cancel.png


BIN
res/drawable-mdpi/ic_delete.png


BIN
res/drawable-mdpi/ic_export.png


+ 0 - 0
res/drawable-xhdpi/ic_cancel.png → res/drawable-xhdpi/ic_action_cancel_grey.png


BIN
res/drawable-xhdpi/ic_action_cancel_white.png


+ 0 - 0
res/drawable-mdpi/ic_copy.png → res/drawable-xhdpi/ic_action_copy.png


+ 0 - 0
res/drawable-xhdpi/ic_action_delete.png → res/drawable-xhdpi/ic_action_delete_grey.png


BIN
res/drawable-xhdpi/ic_action_delete_white.png


BIN
res/drawable-xhdpi/ic_action_move.png


BIN
res/drawable-xhdpi/ic_action_refresh_grey.png


+ 0 - 0
res/drawable-xhdpi/ic_action_refresh.png → res/drawable-xhdpi/ic_action_refresh_white.png


+ 0 - 0
res/drawable-mdpi/ic_share.png → res/drawable-xhdpi/ic_action_share.png


BIN
res/drawable-xhdpi/ic_copy.png


BIN
res/drawable-xhdpi/ic_delete.png


BIN
res/drawable-xhdpi/ic_export.png


BIN
res/drawable-xhdpi/ic_share.png


+ 0 - 0
res/drawable-xxhdpi/ic_cancel.png → res/drawable-xxhdpi/ic_action_cancel_grey.png


BIN
res/drawable-xxhdpi/ic_action_cancel_white.png


+ 0 - 0
res/drawable-xxhdpi/ic_copy.png → res/drawable-xxhdpi/ic_action_copy.png


+ 0 - 0
res/drawable-xxhdpi/ic_action_delete.png → res/drawable-xxhdpi/ic_action_delete_grey.png


BIN
res/drawable-xxhdpi/ic_action_delete_white.png


BIN
res/drawable-xxhdpi/ic_action_move.png


+ 0 - 0
res/drawable-xxhdpi/ic_action_refresh.png → res/drawable-xxhdpi/ic_action_refresh_white.png


+ 0 - 0
res/drawable-xxhdpi/ic_share.png → res/drawable-xxhdpi/ic_action_share.png


BIN
res/drawable-xxhdpi/ic_delete.png


BIN
res/drawable-xxhdpi/ic_export.png


BIN
res/drawable-xxhdpi/ic_open_in_app.png


+ 0 - 0
res/drawable-xxxhdpi/ic_action_delete.png → res/drawable-xxxhdpi/ic_action_delete_grey.png


+ 1 - 1
res/layout/file_details_fragment.xml

@@ -207,7 +207,7 @@
 						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
 						android:layout_marginLeft="12dp"
-						android:src="@drawable/ic_cancel"
+						android:src="@drawable/ic_action_cancel_grey"
 						android:background="@android:color/transparent"
 						/>
 						

+ 1 - 1
res/layout/file_download_fragment.xml

@@ -60,7 +60,7 @@
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_marginLeft="12dp"
-			android:src="@drawable/ic_cancel"
+			android:src="@drawable/ic_action_cancel_grey"
 			android:background="@android:color/transparent"
 		/>
 

+ 1 - 1
res/layout/share_user_item.xml

@@ -52,7 +52,7 @@
             android:layout_width="36dp"
             android:layout_height="36dp"
             android:id="@+id/unshareButton"
-            android:src="@drawable/ic_action_delete"
+            android:src="@drawable/ic_action_delete_grey"
             android:layout_gravity="center_vertical"
             android:padding="@dimen/standard_half_padding"/>
 

+ 6 - 7
res/menu/file_actions_menu.xml

@@ -22,7 +22,7 @@
     <item
         android:id="@+id/action_share_file"
         android:title="@string/action_share"
-        android:icon="@drawable/ic_share"
+        android:icon="@drawable/ic_action_share"
         android:orderInCategory="1" />
 
     <item
@@ -38,12 +38,12 @@
     <item
         android:id="@+id/action_sync_file"
         android:title="@string/filedetails_sync_file"
-        android:icon="@drawable/ic_action_refresh"
+        android:icon="@drawable/ic_action_refresh_white"
         android:orderInCategory="1" />
     <item
         android:id="@+id/action_cancel_sync"
         android:title="@string/common_cancel_sync"
-        android:icon="@android:drawable/ic_menu_close_clear_cancel"
+        android:icon="@drawable/ic_action_cancel_white"
         android:orderInCategory="1" />
     <item
         android:id="@+id/action_rename_file"
@@ -53,17 +53,17 @@
     <item
         android:id="@+id/action_move"
         android:title="@string/actionbar_move"
-        android:icon="@drawable/ic_export"
+        android:icon="@drawable/ic_action_move"
         android:orderInCategory="1" />
     <item
         android:id="@+id/action_copy"
         android:title="@android:string/copy"
-        android:icon="@drawable/ic_copy"
+        android:icon="@drawable/ic_action_copy"
         android:orderInCategory="1" />
     <item
         android:id="@+id/action_remove_file"
         android:title="@string/common_remove"
-        android:icon="@drawable/ic_delete"
+        android:icon="@drawable/ic_action_delete_white"
         android:orderInCategory="1" />
     <item
         android:id="@+id/action_send_file"
@@ -83,7 +83,6 @@
     <item
         android:id="@+id/action_see_details"
         android:title="@string/actionbar_see_details"
-        android:icon="@android:drawable/ic_menu_info_details"
         android:orderInCategory="1" />
 
 </menu>

+ 1 - 1
res/menu/main_menu.xml

@@ -35,7 +35,7 @@
         android:title="@string/action_switch_grid_view" />
     <item
         android:id="@+id/action_sync_account"
-        android:icon="@drawable/ic_action_refresh"
+        android:icon="@drawable/ic_action_refresh_white"
         android:orderInCategory="1"
         app:showAsAction="never"
         android:title="@string/actionbar_sync"

+ 2 - 2
src/com/owncloud/android/ui/adapter/ExpandableUploadListAdapter.java

@@ -328,7 +328,7 @@ public class ExpandableUploadListAdapter extends BaseExpandableListAdapter imple
             ImageButton rightButton = (ImageButton) view.findViewById(R.id.upload_right_button);
             if (upload.getUploadStatus() == UploadStatus.UPLOAD_IN_PROGRESS) {
                 //Cancel
-                rightButton.setImageResource(R.drawable.ic_cancel);
+                rightButton.setImageResource(R.drawable.ic_action_cancel_grey);
                 rightButton.setVisibility(View.VISIBLE);
                 rightButton.setOnClickListener(new OnClickListener() {
                     @Override
@@ -343,7 +343,7 @@ public class ExpandableUploadListAdapter extends BaseExpandableListAdapter imple
 
             } else if (upload.getUploadStatus() == UploadStatus.UPLOAD_FAILED) {
                 //Delete
-                rightButton.setImageResource(R.drawable.ic_action_delete);
+                rightButton.setImageResource(R.drawable.ic_action_delete_grey);
                 rightButton.setVisibility(View.VISIBLE);
                 rightButton.setOnClickListener(new OnClickListener() {
                     @Override