From 9e306b3f913f88e9204ae2791e79a8ce763238a3 Mon Sep 17 00:00:00 2001
From: Karim Abou Zeid <karim23697@gmail.com>
Date: Tue, 25 Aug 2015 16:40:29 +0200
Subject: [PATCH] Fixed status bar coloring and cleaned up some code.

---
 app/src/main/assets/changelog.html                          | 6 +++++-
 .../gramophone/ui/activities/AlbumDetailActivity.java       | 3 +--
 .../gramophone/ui/activities/ArtistDetailActivity.java      | 2 +-
 .../ui/activities/tageditor/AbsTagEditorActivity.java       | 3 +--
 .../main/java/com/kabouzeid/gramophone/util/ColorUtil.java  | 3 ++-
 .../main/java/com/kabouzeid/gramophone/util/ViewUtil.java   | 6 ------
 6 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/app/src/main/assets/changelog.html b/app/src/main/assets/changelog.html
index 9fc0d21a..9fdfbe4a 100644
--- a/app/src/main/assets/changelog.html
+++ b/app/src/main/assets/changelog.html
@@ -25,7 +25,11 @@
 
 <p>You can view the changelog dialog again at any time from the <i>about</i> section.</p>
 
-<h3>Version 0.9.44 beta1</h3>
+<h3>Version 0.9.44 beta2</h3>
+
+<ol>
+    <li><b>FIX:</b> Fixed status bar coloring for Lollipop and Marshmallow.</li>
+</ol>
 
 <ol>
     <li><b>IMPROVEMENT:</b> Completely rewritten color chooser. Had great help from <a
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java
index d1660f78..1f1be7ff 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java
@@ -44,7 +44,6 @@ import com.kabouzeid.gramophone.util.ColorUtil;
 import com.kabouzeid.gramophone.util.MusicUtil;
 import com.kabouzeid.gramophone.util.NavigationUtil;
 import com.kabouzeid.gramophone.util.Util;
-import com.kabouzeid.gramophone.util.ViewUtil;
 import com.nostra13.universalimageloader.core.DisplayImageOptions;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.nostra13.universalimageloader.core.assist.FailReason;
@@ -156,7 +155,7 @@ public class AlbumDetailActivity extends AbsSlidingMusicPanelActivity implements
 
             // Change alpha of overlay
             toolbarAlpha = Math.max(0, Math.min(1, (float) scrollY / flexibleRange));
-            ViewUtil.setBackgroundAlpha(toolbar, toolbarAlpha, toolbarColor);
+            toolbar.setBackgroundColor(ColorUtil.getColorWithAlpha(toolbarAlpha, toolbarColor));
             setStatusBarColor(ColorUtil.getColorWithAlpha(cab != null && cab.isActive() ? 1 : toolbarAlpha, toolbarColor));
 
             // Translate name text
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java
index f0d14a75..cc5b6ceb 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java
@@ -172,7 +172,7 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement
 
             // Change alpha of overlay
             toolbarAlpha = Math.max(0, Math.min(1, (float) scrollY / flexibleRange));
-            ViewUtil.setBackgroundAlpha(toolbar, toolbarAlpha, toolbarColor);
+            toolbar.setBackgroundColor(ColorUtil.getColorWithAlpha(toolbarAlpha, toolbarColor));
             setStatusBarColor(ColorUtil.getColorWithAlpha(cab != null && cab.isActive() ? 1 : toolbarAlpha, toolbarColor));
 
             // Translate name text
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 0b824f63..3a084a19 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
@@ -32,7 +32,6 @@ import com.kabouzeid.gramophone.ui.activities.base.AbsBaseActivity;
 import com.kabouzeid.gramophone.util.ColorUtil;
 import com.kabouzeid.gramophone.util.MusicUtil;
 import com.kabouzeid.gramophone.util.Util;
-import com.kabouzeid.gramophone.util.ViewUtil;
 import com.nostra13.universalimageloader.core.ImageLoader;
 
 import org.jaudiotagger.audio.AudioFile;
@@ -88,7 +87,7 @@ public abstract class AbsTagEditorActivity extends AbsBaseActivity {
                 header.setTranslationY(scrollY);
                 alpha = 1;
             }
-            ViewUtil.setBackgroundAlpha(toolbar, alpha, paletteColorPrimary);
+            toolbar.setBackgroundColor(ColorUtil.getColorWithAlpha(alpha, paletteColorPrimary));
             image.setTranslationY(scrollY / 2);
         }
     };
diff --git a/app/src/main/java/com/kabouzeid/gramophone/util/ColorUtil.java b/app/src/main/java/com/kabouzeid/gramophone/util/ColorUtil.java
index 93b932e3..bb355b83 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/util/ColorUtil.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/util/ColorUtil.java
@@ -78,7 +78,8 @@ public class ColorUtil {
         float[] hsv = new float[3];
         Color.colorToHSV(color, hsv);
         hsv[2] *= by; // value component
-        return getColorWithAlpha(alpha, Color.HSVToColor(hsv));
+        // don't use  getColorWithAlpha(float alpha, int baseColor) here
+        return (alpha << 24) + (0x00ffffff & Color.HSVToColor(hsv));
     }
 
     @SuppressWarnings("ResourceType")
diff --git a/app/src/main/java/com/kabouzeid/gramophone/util/ViewUtil.java b/app/src/main/java/com/kabouzeid/gramophone/util/ViewUtil.java
index edc514ca..c718f670 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/util/ViewUtil.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/util/ViewUtil.java
@@ -57,12 +57,6 @@ public class ViewUtil {
         return animator;
     }
 
-    public static void setBackgroundAlpha(@NonNull View view, float alpha, int baseColor) {
-        int a = Math.min(255, Math.max(0, (int) (alpha * 255))) << 24;
-        int rgb = 0x00ffffff & baseColor;
-        view.setBackgroundColor(a + rgb);
-    }
-
     /**
      * Should be called in {@link android.app.Activity#onPrepareOptionsMenu(Menu)} and {@link android.app.Activity#onOptionsItemSelected(MenuItem)}
      *