From 9ce4a757b072667851c9ab1fe5e00c0c27682e3b Mon Sep 17 00:00:00 2001 From: Karim Abou Zeid Date: Tue, 25 Aug 2015 15:51:56 +0200 Subject: [PATCH] Fixed the SelectableColorView gap color to match the dialogs background color --- .../kabouzeid/gramophone/views/SelectableColorView.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/kabouzeid/gramophone/views/SelectableColorView.java b/app/src/main/java/com/kabouzeid/gramophone/views/SelectableColorView.java index 9bb7a151..2343b2d0 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/views/SelectableColorView.java +++ b/app/src/main/java/com/kabouzeid/gramophone/views/SelectableColorView.java @@ -4,6 +4,7 @@ import android.content.Context; import android.content.res.ColorStateList; import android.content.res.Resources; import android.graphics.Canvas; +import android.graphics.Color; import android.graphics.Paint; import android.graphics.drawable.Drawable; import android.graphics.drawable.RippleDrawable; @@ -16,7 +17,7 @@ import android.util.AttributeSet; import android.util.TypedValue; import android.widget.FrameLayout; -import com.kabouzeid.gramophone.R; +import com.afollestad.materialdialogs.ThemeSingleton; import com.kabouzeid.gramophone.util.ColorUtil; @@ -49,7 +50,7 @@ public class SelectableColorView extends FrameLayout { gapPaint = new Paint(); gapPaint.setAntiAlias(true); - resetGapColor(); + gapPaint.setColor(ThemeSingleton.get().darkTheme ? Color.parseColor("#444444") : Color.WHITE); innerPaint = new Paint(); innerPaint.setAntiAlias(true); @@ -60,10 +61,6 @@ public class SelectableColorView extends FrameLayout { setWillNotDraw(false); } - private void resetGapColor() { - gapPaint.setColor(ColorUtil.resolveColor(getContext(), R.attr.cardBackgroundColor)); - } - private void updateColor(@ColorInt int color) { innerPaint.setColor(color); outerPaint.setColor(ColorUtil.shiftColorDown(color));