From a457d88da852a43af69b3c71ecfa2a3bdc895835 Mon Sep 17 00:00:00 2001 From: Karim Abou Zeid Date: Sat, 18 Apr 2015 12:35:08 +0200 Subject: [PATCH] Fix for Tag editor coloring bugs --- .../ui/activities/tageditor/AbsTagEditorActivity.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AbsTagEditorActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AbsTagEditorActivity.java index 3e2c577b..e2630488 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AbsTagEditorActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AbsTagEditorActivity.java @@ -200,7 +200,7 @@ public abstract class AbsTagEditorActivity extends AbsBaseActivity { protected abstract void save(); private void restoreStandardColors() { - final int vibrantColor = DialogUtils.resolveColor(this, R.attr.colorPrimary); + final int vibrantColor = PreferenceUtils.getInstance(this).getThemeColorPrimary(); paletteColorPrimary = vibrantColor; observableScrollViewCallbacks.onScrollChanged(scrollView.getCurrentScrollY(), false, false); setStatusBarColor(ColorChooserDialog.shiftColorDown(vibrantColor), false); @@ -249,12 +249,12 @@ public abstract class AbsTagEditorActivity extends AbsBaseActivity { scrollView.setPadding(0, Util.getActionBarSize(this), 0, 0); observableScrollViewCallbacks.onScrollChanged(scrollView.getCurrentScrollY(), false, false); - int primary = getIntent().getIntExtra(AppKeys.E_PALETTE, + paletteColorPrimary = getIntent().getIntExtra(AppKeys.E_PALETTE, PreferenceUtils.getInstance(this).getThemeColorPrimary()); - toolBar.setBackgroundColor(primary); - header.setBackgroundColor(primary); + toolBar.setBackgroundColor(paletteColorPrimary); + header.setBackgroundColor(paletteColorPrimary); - int primaryDark = ColorChooserDialog.shiftColorDown(primary); + int primaryDark = ColorChooserDialog.shiftColorDown(paletteColorPrimary); setStatusBarColor(primaryDark, false); if (Util.hasLollipopSDK()) getWindow().setNavigationBarColor(primaryDark);