tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed Android Marshmallows dark statusbar icons not showing up in the search.

Browse source
This commit is contained in:
Karim Abou Zeid 2015-12-29 15:40:04 +01:00
commit 0ca3ec2ad8
1 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

28
app/src/main/java/com/kabouzeid/gramophone/ui/activities/SearchActivity.java
View file

@ -2,7 +2,6 @@ package com.kabouzeid.gramophone.ui.activities;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.graphics.PorterDuff; import android.graphics.PorterDuff;
import android.graphics.drawable.Drawable;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.LinearLayoutManager;
@ -11,6 +10,7 @@ import android.support.v7.widget.Toolbar;
import android.text.Editable; import android.text.Editable;
import android.text.TextWatcher; import android.text.TextWatcher;
import android.view.KeyEvent; import android.view.KeyEvent;
import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View; import android.view.View;
@ -61,8 +61,7 @@ public class SearchActivity extends AbsMusicServiceActivity {
recyclerView.setOnTouchListener(new View.OnTouchListener() { recyclerView.setOnTouchListener(new View.OnTouchListener() {
@Override @Override
public boolean onTouch(View v, MotionEvent event) { public boolean onTouch(View v, MotionEvent event) {
Util.hideSoftKeyboard(SearchActivity.this); hideSoftKeyboard();
searchSrcText.clearFocus();
return false; return false;
} }
}); });
@ -75,18 +74,19 @@ public class SearchActivity extends AbsMusicServiceActivity {
setStatusBarThemeColor(); 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() { private void setUpToolBar() {
toolbar.setBackgroundColor(getThemeColorPrimary());
setSupportActionBar(toolbar); setSupportActionBar(toolbar);
//noinspection ConstantConditions //noinspection ConstantConditions
getSupportActionBar().setDisplayHomeAsUpEnabled(true); 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() { private void setUpSearchBar() {
@ -124,6 +124,7 @@ public class SearchActivity extends AbsMusicServiceActivity {
public boolean onEditorAction(TextView v, int actionId, KeyEvent event) { public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
if (actionId == EditorInfo.IME_ACTION_SEARCH) { if (actionId == EditorInfo.IME_ACTION_SEARCH) {
search(searchSrcText.getText().toString()); search(searchSrcText.getText().toString());
hideSoftKeyboard();
return true; return true;
} }
return false; return false;
@ -131,6 +132,11 @@ public class SearchActivity extends AbsMusicServiceActivity {
}); });
} }
private void hideSoftKeyboard() {
Util.hideSoftKeyboard(SearchActivity.this);
searchSrcText.clearFocus();
}
@Override @Override
public void enableViews() { public void enableViews() {
super.enableViews(); super.enableViews();