소스 검색

rename icon work that isn't a menu icon

AndyScherzinger 7 년 전
부모
커밋
29ff68bb79

+ 3 - 3
src/main/java/com/owncloud/android/utils/MimeTypeUtil.java

@@ -147,7 +147,7 @@ public class MimeTypeUtil {
         } else if (isSharedViaUsers) {
             drawableId = R.drawable.shared_with_me_folder;
         } else {
-            drawableId = R.drawable.ic_menu_archive;
+            drawableId = R.drawable.folder;
         }
 
         return ThemeUtils.tintDrawable(drawableId, ThemeUtils.primaryColor(account));
@@ -442,7 +442,7 @@ public class MimeTypeUtil {
         MIMETYPE_TO_ICON_MAPPING.put("application/yaml", R.drawable.file_code);
         MIMETYPE_TO_ICON_MAPPING.put("application/zip", R.drawable.file_zip);
         MIMETYPE_TO_ICON_MAPPING.put("database", R.drawable.file);
-        MIMETYPE_TO_ICON_MAPPING.put("httpd/unix-directory", R.drawable.ic_menu_archive);
+        MIMETYPE_TO_ICON_MAPPING.put("httpd/unix-directory", R.drawable.folder);
         MIMETYPE_TO_ICON_MAPPING.put("image/svg+xml", R.drawable.file_image);
         MIMETYPE_TO_ICON_MAPPING.put("image/vector", R.drawable.file_image);
         MIMETYPE_TO_ICON_MAPPING.put("text/calendar", R.drawable.file_calendar);
@@ -456,7 +456,7 @@ public class MimeTypeUtil {
         MIMETYPE_TO_ICON_MAPPING.put("text/x-python", R.drawable.file_code);
         MIMETYPE_TO_ICON_MAPPING.put("text/x-shellscript", R.drawable.file_code);
         MIMETYPE_TO_ICON_MAPPING.put("web", R.drawable.file_code);
-        MIMETYPE_TO_ICON_MAPPING.put(MimeType.DIRECTORY, R.drawable.ic_menu_archive);
+        MIMETYPE_TO_ICON_MAPPING.put(MimeType.DIRECTORY, R.drawable.folder);
     }
 
     /**

+ 0 - 0
src/main/res/drawable-hdpi/ic_menu_archive.png → src/main/res/drawable-hdpi/folder.png


+ 0 - 0
src/main/res/drawable-mdpi/ic_menu_archive.png → src/main/res/drawable-mdpi/folder.png


+ 0 - 0
src/main/res/drawable-xhdpi/ic_menu_archive.png → src/main/res/drawable-xhdpi/folder.png


+ 0 - 0
src/main/res/drawable-xxhdpi/ic_menu_archive.png → src/main/res/drawable-xxhdpi/folder.png


BIN
src/main/res/drawable-xxhdpi/owncloud_progress_bg_light.9.png


BIN
src/main/res/drawable-xxhdpi/owncloud_progress_primary_light.9.png


BIN
src/main/res/drawable-xxhdpi/owncloud_progress_secondary_light.9.png


+ 1 - 1
src/main/res/layout/account_item.xml

@@ -43,7 +43,7 @@
             android:layout_marginLeft="12dp"
             android:layout_marginRight="1dp"
             android:layout_marginTop="1dp"
-            android:src="@drawable/ic_menu_archive"/>
+            android:src="@drawable/folder"/>
 
         <ImageView
             android:id="@+id/ticker"

+ 0 - 1
src/main/res/layout/files.xml

@@ -34,7 +34,6 @@
             layout="@layout/toolbar_standard" />
 
         <LinearLayout
-            xmlns:android="http://schemas.android.com/apk/res/android"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="@color/background_color"

+ 1 - 1
src/main/res/layout/grid_image.xml

@@ -36,7 +36,7 @@
             android:paddingLeft="@dimen/alternate_padding"
             android:paddingRight="@dimen/alternate_padding"
             android:scaleType="centerCrop"
-            android:src="@drawable/ic_menu_archive"/>
+            android:src="@drawable/folder"/>
 
 
         <ImageView

+ 1 - 1
src/main/res/layout/grid_item.xml

@@ -34,7 +34,7 @@
             android:layout_width="@dimen/standard_list_item_size"
             android:layout_height="@dimen/standard_list_item_size"
             android:layout_gravity="center"
-            android:src="@drawable/ic_menu_archive"/>
+            android:src="@drawable/folder"/>
 
         <ImageView
             android:id="@+id/favorite_action"

+ 1 - 1
src/main/res/layout/grid_sync_item.xml

@@ -36,7 +36,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:scaleType="centerCrop"
-            android:src="@drawable/ic_menu_archive"/>
+            android:src="@drawable/folder"/>
 
         <ImageView
             android:id="@+id/thumbnailDarkener"

+ 1 - 1
src/main/res/layout/list_item.xml

@@ -44,7 +44,7 @@
                 android:layout_height="@dimen/file_icon_size"
                 android:layout_centerInParent="true"
                 android:layout_marginLeft="8dp"
-                android:src="@drawable/ic_menu_archive" />
+                android:src="@drawable/folder" />
 
             <ImageView
                 android:id="@+id/favorite_action"

+ 1 - 1
src/main/res/layout/upload_list_item.xml

@@ -19,7 +19,7 @@
             android:layout_width="@dimen/file_icon_size"
             android:layout_height="@dimen/file_icon_size"
             android:layout_gravity="center"
-            android:src="@drawable/ic_menu_archive" />
+            android:src="@drawable/folder" />
   
     </FrameLayout>
 

+ 1 - 1
src/main/res/layout/uploader_list_item_layout.xml

@@ -29,7 +29,7 @@
         android:layout_height="@dimen/file_icon_size"
         android:layout_gravity="center_vertical"
         android:layout_margin="@dimen/uploader_list_item_layout_image_margin"
-        android:src="@drawable/ic_menu_archive" />
+        android:src="@drawable/folder" />
 
     <LinearLayout
         android:layout_width="@dimen/zero"