From 3d7d69da36c2d35288f6dc79ea68156150660687 Mon Sep 17 00:00:00 2001
From: Karim Abou Zeid <karim23697@gmail.com>
Date: Sat, 30 Jan 2016 17:59:31 +0100
Subject: [PATCH] Fixed tag editor coloring bugs.

---
 .../gramophone/ui/activities/base/AbsThemeActivity.java  | 2 +-
 .../ui/activities/tageditor/AbsTagEditorActivity.java    | 9 ++-------
 .../ui/activities/tageditor/AlbumTagEditorActivity.java  | 7 +++++++
 .../ui/activities/tageditor/SongTagEditorActivity.java   | 9 +++++++++
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsThemeActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsThemeActivity.java
index 65b5cea7..8dc90b8e 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsThemeActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsThemeActivity.java
@@ -59,7 +59,7 @@ public abstract class AbsThemeActivity extends ATHToolbarActivity {
                     statusBar.setBackgroundColor(color);
                 }
             } else if (Build.VERSION.SDK_INT >= 21) {
-                getWindow().setStatusBarColor(color);
+                getWindow().setStatusBarColor(ColorUtil.darkenColor(color));
                 setLightStatusbarAuto(color);
             }
         }
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 cf536dd2..a13a3939 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
@@ -235,13 +235,8 @@ public abstract class AbsTagEditorActivity extends AbsBaseActivity {
         observableScrollView.setPadding(0, Util.getActionBarSize(this), 0, 0);
         observableScrollViewCallbacks.onScrollChanged(observableScrollView.getCurrentScrollY(), false, false);
 
-        paletteColorPrimary = getIntent().getIntExtra(EXTRA_PALETTE, ThemeStore.primaryColor(this));
+        setColors(getIntent().getIntExtra(EXTRA_PALETTE, ThemeStore.primaryColor(this)));
         toolbar.setBackgroundColor(paletteColorPrimary);
-        header.setBackgroundColor(paletteColorPrimary);
-
-        setStatusbarColor(paletteColorPrimary);
-        setNavigationbarColor(paletteColorPrimary);
-        setTaskDescriptionColor(paletteColorPrimary);
     }
 
     protected void dataChanged() {
@@ -267,7 +262,7 @@ public abstract class AbsTagEditorActivity extends AbsBaseActivity {
         setColors(bgColor);
     }
 
-    private void setColors(int color) {
+    protected void setColors(int color) {
         paletteColorPrimary = color;
         observableScrollViewCallbacks.onScrollChanged(observableScrollView.getCurrentScrollY(), false, false);
         header.setBackgroundColor(paletteColorPrimary);
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AlbumTagEditorActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AlbumTagEditorActivity.java
index f402e1fb..667a7763 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AlbumTagEditorActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AlbumTagEditorActivity.java
@@ -19,6 +19,7 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.request.animation.GlideAnimation;
 import com.bumptech.glide.request.target.SimpleTarget;
 import com.kabouzeid.appthemehelper.util.ATHUtil;
+import com.kabouzeid.appthemehelper.util.ToolbarContentTintHelper;
 import com.kabouzeid.gramophone.R;
 import com.kabouzeid.gramophone.glide.palette.BitmapPaletteTranscoder;
 import com.kabouzeid.gramophone.glide.palette.BitmapPaletteWrapper;
@@ -278,4 +279,10 @@ public class AlbumTagEditorActivity extends AbsTagEditorActivity implements Text
         }
         return scaledBitmap;
     }
+
+    @Override
+    protected void setColors(int color) {
+        super.setColors(color);
+        albumTitle.setTextColor(ToolbarContentTintHelper.toolbarTitleColor(this, color));
+    }
 }
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/SongTagEditorActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/SongTagEditorActivity.java
index 9186d2c7..7f3b470e 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/SongTagEditorActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/SongTagEditorActivity.java
@@ -7,6 +7,7 @@ import android.text.Editable;
 import android.text.TextWatcher;
 import android.widget.EditText;
 
+import com.kabouzeid.appthemehelper.util.ToolbarContentTintHelper;
 import com.kabouzeid.gramophone.R;
 import com.kabouzeid.gramophone.loader.SongLoader;
 
@@ -132,4 +133,12 @@ public class SongTagEditorActivity extends AbsTagEditorActivity implements TextW
     public void afterTextChanged(Editable s) {
         dataChanged();
     }
+
+    @Override
+    protected void setColors(int color) {
+        super.setColors(color);
+        int toolbarTitleColor = ToolbarContentTintHelper.toolbarTitleColor(this, color);
+        songTitle.setTextColor(toolbarTitleColor);
+        albumTitle.setTextColor(toolbarTitleColor);
+    }
 }