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

Fixed wrong NavigationBar- and TaskDescription colors

Browse source
This commit is contained in:
Karim Abou Zeid 2015-08-14 21:07:28 +02:00
commit 9ab4cde93c
2 changed files with 36 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

39
app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsSlidingMusicPanelActivity.java
View file

@ -12,6 +12,7 @@ import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.os.Message; import android.os.Message;
import android.support.annotation.ColorInt;
import android.support.annotation.LayoutRes; import android.support.annotation.LayoutRes;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
@ -139,6 +140,9 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
private int lastTitleTextColor = -2; private int lastTitleTextColor = -2;
private int lastCaptionTextColor = -2; private int lastCaptionTextColor = -2;
private int navigationBarColor;
private int taskColor;
private Handler progressViewsUpdateHandler; private Handler progressViewsUpdateHandler;
private boolean opaqueStatusBar; private boolean opaqueStatusBar;
@ -373,6 +377,10 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
@Override @Override
public void onPanelCollapsed(View view) { public void onPanelCollapsed(View view) {
super.notifyTaskColorChange(taskColor);
if (shouldColorNavigationBar()) {
super.setNavigationBarColor(navigationBarColor);
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
mediaControllerContainer.setVisibility(View.INVISIBLE); mediaControllerContainer.setVisibility(View.INVISIBLE);
} }
@ -380,7 +388,10 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
@Override @Override
public void onPanelExpanded(View view) { public void onPanelExpanded(View view) {
onPanelSlide(view, 1); super.notifyTaskColorChange(lastFooterColor);
if (shouldColorNavigationBar()) {
super.setNavigationBarColor(lastFooterColor);
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
if (mediaControllerContainer.getVisibility() == View.INVISIBLE) { if (mediaControllerContainer.getVisibility() == View.INVISIBLE) {
int cx = (dummyFab.getLeft() + dummyFab.getRight()) / 2; int cx = (dummyFab.getLeft() + dummyFab.getRight()) / 2;
@ -770,6 +781,13 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
private void setColors(int color) { private void setColors(int color) {
animateColorChange(color); animateColorChange(color);
animateTextColorChange(ColorUtil.getPrimaryTextColorForBackground(this, color), ColorUtil.getSecondaryTextColorForBackground(this, color)); animateTextColorChange(ColorUtil.getPrimaryTextColorForBackground(this, color), ColorUtil.getSecondaryTextColorForBackground(this, color));
if (slidingUpPanelLayout.getPanelState() == SlidingUpPanelLayout.PanelState.EXPANDED) {
super.notifyTaskColorChange(color);
if (shouldColorNavigationBar()) {
super.setNavigationBarColor(color);
}
}
} }
private void animateColorChange(final int newColor) { private void animateColorChange(final int newColor) {
@ -812,9 +830,6 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
playerStatusbar.setBackgroundColor(Color.TRANSPARENT); playerStatusbar.setBackgroundColor(Color.TRANSPARENT);
} }
} }
if (shouldColorNavigationBar())
setNavigationBarColor(newColor);
lastFooterColor = newColor; lastFooterColor = newColor;
} }
@ -972,4 +987,20 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
}) })
.start(); .start();
} }
@Override
protected void setNavigationBarColor(@ColorInt int color) {
this.navigationBarColor = color;
if (slidingUpPanelLayout == null || slidingUpPanelLayout.getPanelState() == SlidingUpPanelLayout.PanelState.COLLAPSED) {
super.setNavigationBarColor(color);
}
}
@Override
protected void notifyTaskColorChange(@ColorInt int color) {
this.taskColor = color;
if (slidingUpPanelLayout == null || slidingUpPanelLayout.getPanelState() == SlidingUpPanelLayout.PanelState.COLLAPSED) {
super.notifyTaskColorChange(color);
}
}
} }

2
app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsThemeActivity.java
View file

@ -127,7 +127,7 @@ public abstract class AbsThemeActivity extends AppCompatActivity implements KabV
Util.setStatusBarTranslucent(getWindow()); Util.setStatusBarTranslucent(getWindow());
} }
protected final void setNavigationBarColor(@ColorInt int color) { protected void setNavigationBarColor(@ColorInt int color) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)
getWindow().setNavigationBarColor(ColorUtil.shiftColorDown(color)); getWindow().setNavigationBarColor(ColorUtil.shiftColorDown(color));
} }