From 0ca3ec2ad8ca4da353ad58f9c833f5566bb6a6e0 Mon Sep 17 00:00:00 2001
From: Karim Abou Zeid <karim23697@gmail.com>
Date: Tue, 29 Dec 2015 15:40:04 +0100
Subject: [PATCH] Fixed Android Marshmallows dark statusbar icons not showing
 up in the search.

---
 .../ui/activities/SearchActivity.java         | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SearchActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SearchActivity.java
index e8092fde..19e4844d 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SearchActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SearchActivity.java
@@ -2,7 +2,6 @@ package com.kabouzeid.gramophone.ui.activities;
 
 import android.annotation.SuppressLint;
 import android.graphics.PorterDuff;
-import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.v7.widget.LinearLayoutManager;
@@ -11,6 +10,7 @@ import android.support.v7.widget.Toolbar;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.KeyEvent;
+import android.view.Menu;
 import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
@@ -61,8 +61,7 @@ public class SearchActivity extends AbsMusicServiceActivity {
         recyclerView.setOnTouchListener(new View.OnTouchListener() {
             @Override
             public boolean onTouch(View v, MotionEvent event) {
-                Util.hideSoftKeyboard(SearchActivity.this);
-                searchSrcText.clearFocus();
+                hideSoftKeyboard();
                 return false;
             }
         });
@@ -75,18 +74,19 @@ public class SearchActivity extends AbsMusicServiceActivity {
         setStatusBarThemeColor();
     }
 
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        boolean darkContent = ColorUtil.useDarkTextColorOnBackground(getThemeColorPrimary());
+        ViewUtil.setToolbarContentDark(this, toolbar, darkContent);
+        setUseDarkStatusBarIcons(darkContent);
+        return super.onCreateOptionsMenu(menu);
+    }
+
     private void setUpToolBar() {
+        toolbar.setBackgroundColor(getThemeColorPrimary());
         setSupportActionBar(toolbar);
         //noinspection ConstantConditions
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-
-        toolbar.setBackgroundColor(getThemeColorPrimary());
-        Drawable navigationIcon = toolbar.getNavigationIcon();
-        if (navigationIcon != null) {
-            navigationIcon = navigationIcon.mutate();
-            navigationIcon.setColorFilter(ViewUtil.getToolbarIconColor(this, ColorUtil.useDarkTextColorOnBackground(getThemeColorPrimary())), PorterDuff.Mode.SRC_IN);
-            toolbar.setNavigationIcon(navigationIcon);
-        }
     }
 
     private void setUpSearchBar() {
@@ -124,6 +124,7 @@ public class SearchActivity extends AbsMusicServiceActivity {
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
                 if (actionId == EditorInfo.IME_ACTION_SEARCH) {
                     search(searchSrcText.getText().toString());
+                    hideSoftKeyboard();
                     return true;
                 }
                 return false;
@@ -131,6 +132,11 @@ public class SearchActivity extends AbsMusicServiceActivity {
         });
     }
 
+    private void hideSoftKeyboard() {
+        Util.hideSoftKeyboard(SearchActivity.this);
+        searchSrcText.clearFocus();
+    }
+
     @Override
     public void enableViews() {
         super.enableViews();