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

Fixed the SelectableColorView gap color to match the dialogs background color

Browse source
This commit is contained in:
Karim Abou Zeid 2015-08-25 15:51:56 +02:00
commit 9ce4a757b0
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/java/com/kabouzeid/gramophone/views/SelectableColorView.java
View file

@ -4,6 +4,7 @@ import android.content.Context;
import android.content.res.ColorStateList; import android.content.res.ColorStateList;
import android.content.res.Resources; import android.content.res.Resources;
import android.graphics.Canvas; import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.Paint; import android.graphics.Paint;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.graphics.drawable.RippleDrawable; import android.graphics.drawable.RippleDrawable;
@ -16,7 +17,7 @@ import android.util.AttributeSet;
import android.util.TypedValue; import android.util.TypedValue;
import android.widget.FrameLayout; import android.widget.FrameLayout;
import com.kabouzeid.gramophone.R; import com.afollestad.materialdialogs.ThemeSingleton;
import com.kabouzeid.gramophone.util.ColorUtil; import com.kabouzeid.gramophone.util.ColorUtil;
@ -49,7 +50,7 @@ public class SelectableColorView extends FrameLayout {
gapPaint = new Paint(); gapPaint = new Paint();
gapPaint.setAntiAlias(true); gapPaint.setAntiAlias(true);
resetGapColor(); gapPaint.setColor(ThemeSingleton.get().darkTheme ? Color.parseColor("#444444") : Color.WHITE);
innerPaint = new Paint(); innerPaint = new Paint();
innerPaint.setAntiAlias(true); innerPaint.setAntiAlias(true);
@ -60,10 +61,6 @@ public class SelectableColorView extends FrameLayout {
setWillNotDraw(false); setWillNotDraw(false);
} }
private void resetGapColor() {
gapPaint.setColor(ColorUtil.resolveColor(getContext(), R.attr.cardBackgroundColor));
}
private void updateColor(@ColorInt int color) { private void updateColor(@ColorInt int color) {
innerPaint.setColor(color); innerPaint.setColor(color);
outerPaint.setColor(ColorUtil.shiftColorDown(color)); outerPaint.setColor(ColorUtil.shiftColorDown(color));