color toolbar, part 2

src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java

@@ -50,6 +50,7 @@ import android.support.v4.content.ContextCompat;
 import android.support.v4.view.MenuItemCompat;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.SearchView;
+import android.support.v7.widget.Toolbar;
 import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -381,6 +382,10 @@ public class FileDisplayActivity extends HookActivity
                 setupDrawer();
             }
 
+            // update toolbar
+            Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+            toolbar.setBackgroundColor(DisplayUtils.primaryColor());
+
             if (!stateWasRecovered) {
                 Log_OC.d(TAG, "Initializing Fragments in onAccountChanged..");
                 initFragmentsWithFile();

src/main/java/com/owncloud/android/ui/activity/ToolbarActivity.java

@@ -23,7 +23,6 @@
 package com.owncloud.android.ui.activity;
 
 import android.graphics.PorterDuff;
-import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.support.annotation.ColorInt;
 import android.support.v4.content.ContextCompat;
@@ -60,6 +59,10 @@ public abstract class ToolbarActivity extends BaseActivity {
             mProgressBar.setIndeterminateDrawable(
                     ContextCompat.getDrawable(this, R.drawable.actionbar_progress_indeterminate_horizontal));
         }
+
+        if (toolbar.getOverflowIcon() != null) {
+            DisplayUtils.tintDrawable(toolbar.getOverflowIcon(), DisplayUtils.fontColor());
+        }
     }
 
     /**
@@ -101,16 +104,15 @@ public abstract class ToolbarActivity extends BaseActivity {
 
         toolbar.setBackgroundColor(DisplayUtils.primaryColor());
 
-        Drawable icon = toolbar.getNavigationIcon();
-        if (icon != null) {
-            icon.setColorFilter(DisplayUtils.fontColor(), PorterDuff.Mode.SRC_ATOP);
-        }
-
         // set home button properties
         if (actionBar != null) {
             actionBar.setDisplayHomeAsUpEnabled(true);
             actionBar.setDisplayShowTitleEnabled(true);
         }
+
+        if (toolbar.getNavigationIcon() != null) {
+            DisplayUtils.tintDrawable(toolbar.getNavigationIcon(), DisplayUtils.fontColor());
+        }
     }
 
     /**

src/main/java/com/owncloud/android/utils/DisplayUtils.java

@@ -709,8 +709,14 @@ public class DisplayUtils {
 
     public static Drawable tintDrawable(@DrawableRes int id, int color) {
         Drawable drawable = ResourcesCompat.getDrawable(MainApp.getAppContext().getResources(), id, null);
+
+        return tintDrawable(drawable, color);
+    }
+
+    public static Drawable tintDrawable(Drawable drawable, int color) {
         drawable = DrawableCompat.wrap(drawable);
         DrawableCompat.setTint(drawable, color);
+
         return drawable;
     }
 
@@ -762,6 +768,10 @@ public class DisplayUtils {
         }
     }
 
+    public static String colorToHexString(int color) {
+        return String.format("#%06X", 0xFFFFFF & color);
+    }
+
     public static int primaryDarkColor() {
         OCCapability capability = getCapability();