Folders now use volume color

Folders within a volume now use the color which represents that volume
for icons.

Change-Id: I11dec343e0f7951ab3ea6f90cd1bad83f51fcc78

3 files changed, 29 insertions, 6 deletions

diff --git a/src/com/cyanogenmod/filemanager/adapters/FileSystemObjectAdapter.java b/src/com/cyanogenmod/filemanager/adapters/FileSystemObjectAdapter.java
index e9f11c6e..6e91c14d 100644
--- a/src/com/cyanogenmod/filemanager/adapters/FileSystemObjectAdapter.java
+++ b/src/com/cyanogenmod/filemanager/adapters/FileSystemObjectAdapter.java
@@ -109,6 +109,8 @@ public class FileSystemObjectAdapter
     private OnSelectionChangedListener mOnSelectionChangedListener;
     private final ViewOutlineProvider mIconViewOutlineProvider;
 
+    private int mPrimaryColor;
+
     //The resource of the item icon
     private static final int RESOURCE_ITEM_ICON = R.id.navigation_view_item_icon;
     //The resource of the item name
@@ -144,6 +146,7 @@ public class FileSystemObjectAdapter
         this.mRequests = new WeakHashMap<ImageView, GetProviderIconTask>();
         this.mPickable = pickable;
         mRes = context.getResources();
+        mPrimaryColor = mRes.getColor(R.color.default_primary);
 
         mIconViewOutlineProvider = new ViewOutlineProvider() {
             @Override
@@ -489,6 +492,15 @@ public class FileSystemObjectAdapter
         }
     }
 
+    /**
+     * Method that sets the primary color for the current volume
+     *
+     * @param color hex color of to be used as primary color for the current volume
+     */
+    public void setPrimaryColor(int color) {
+        mPrimaryColor = color;
+    }
+
     private void setIcon(ImageView view, FileSystemObject fso) {
         // Cancel any previous loads to view
         mIconHolder.cancel(view);
@@ -522,13 +534,12 @@ public class FileSystemObjectAdapter
     // TODO: change folder colors depending on current volume (root, local, sdcard, usb, etc.)
     private void setFolderIcon(ImageView view, int iconId) {
         float opacity = mRes.getFloat(R.float_type.navigation_view_icon_circle_opacity);
-        int folderPrimaryColor = mRes.getColor(R.color.default_primary);
         int transparentColor = Color.argb(
                 Math.round(((float) 0xFF) * opacity),
-                Color.red(folderPrimaryColor),
-                Color.green(folderPrimaryColor),
-                Color.blue(folderPrimaryColor));
-        setIcon(mRes, view, mRes.getDrawable(iconId), folderPrimaryColor,
+                Color.red(mPrimaryColor),
+                Color.green(mPrimaryColor),
+                Color.blue(mPrimaryColor));
+        setIcon(mRes, view, mRes.getDrawable(iconId), mPrimaryColor,
                 R.drawable.ic_icon_background, transparentColor);
     }
 
diff --git a/src/com/cyanogenmod/filemanager/ui/fragments/NavigationFragment.java b/src/com/cyanogenmod/filemanager/ui/fragments/NavigationFragment.java
index 826f1aed..b75d0934 100644
--- a/src/com/cyanogenmod/filemanager/ui/fragments/NavigationFragment.java
+++ b/src/com/cyanogenmod/filemanager/ui/fragments/NavigationFragment.java
@@ -2279,6 +2279,7 @@ public class NavigationFragment extends Fragment
         mainActivity.getWindow().setStatusBarColor(statusBarColor);
 
         mToolBar.setBackgroundColor(backgroundColor);
+        getCurrentNavigationView().setPrimaryColor(backgroundColor);
 
         if (mOnDirectoryChangedListener != null) {
             mOnDirectoryChangedListener.onDirectoryChanged(item);
diff --git a/src/com/cyanogenmod/filemanager/ui/widgets/NavigationView.java b/src/com/cyanogenmod/filemanager/ui/widgets/NavigationView.java
index 318b1430..215a2e5d 100644
--- a/src/com/cyanogenmod/filemanager/ui/widgets/NavigationView.java
+++ b/src/com/cyanogenmod/filemanager/ui/widgets/NavigationView.java
@@ -1399,7 +1399,7 @@ BreadcrumbListener, OnSelectionChangedListener, OnSelectionListener, OnRequestRe
     @Override
     public void onRequestRemove(Object o, boolean clearSelection) {
         if (o != null && o instanceof FileSystemObject) {
-            removeItem((FileSystemObject)o);
+            removeItem((FileSystemObject) o);
         } else {
             onRequestRefresh(null, clearSelection);
         }
@@ -1516,6 +1516,17 @@ BreadcrumbListener, OnSelectionChangedListener, OnSelectionListener, OnRequestRe
     }
 
     /**
+     * Method that sets the primary color for the current volume
+     *
+     * @param color hex color of to be used as primary color for the current volume
+     */
+    public void setPrimaryColor(int color) {
+        if (this.mAdapter != null) {
+            this.mAdapter.setPrimaryColor(color);
+        }
+    }
+
+    /**
      * Method that creates a ChRooted environment, protecting the user to break anything
      * in the device
      * @hide