Skip to content

Add support for absolute color values #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xiphirx merged 1 commit into from
Nov 20, 2016
Merged

Add support for absolute color values #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
96 changes: 89 additions & 7 deletions taptargetview/src/main/java/com/getkeepsafe/taptargetview/TapTarget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import android.graphics.Rect;
import android.graphics.Typeface;
import android.graphics.drawable.Drawable;
import android.support.annotation.ColorInt;
import android.support.annotation.ColorRes;
import android.support.annotation.DimenRes;
import android.support.annotation.IdRes;
Expand All @@ -45,11 +46,17 @@ public class TapTarget {
Drawable icon;
Typeface typeface;

@ColorRes int outerCircleColor = -1;
@ColorRes int targetCircleColor = -1;
@ColorRes int dimColor = -1;
@ColorRes int titleTextColor = -1;
@ColorRes int descriptionTextColor = -1;
@ColorRes private int outerCircleColorRes = -1;
@ColorRes private int targetCircleColorRes = -1;
@ColorRes private int dimColorRes = -1;
@ColorRes private int titleTextColorRes = -1;
@ColorRes private int descriptionTextColorRes = -1;

private int outerCircleColor = -1;
private int targetCircleColor = -1;
private int dimColor = -1;
private int titleTextColor = -1;
private int descriptionTextColor = -1;

@DimenRes private int titleTextDimen = -1;
@DimenRes private int descriptionTextDimen = -1;
Expand Down Expand Up @@ -190,32 +197,68 @@ public TapTarget transparentTarget(boolean transparent) {

/** Specify the color resource for the outer circle **/
public TapTarget outerCircleColor(@ColorRes int color) {
this.outerCircleColorRes = color;
return this;
}

/** Specify the color value for the outer circle **/
// TODO(Hilal): In v2, this API should be cleaned up / torched
public TapTarget outerCircleColorInt(@ColorInt int color) {
this.outerCircleColor = color;
return this;
}

/** Specify the color resource for the target circle **/
public TapTarget targetCircleColor(@ColorRes int color) {
this.targetCircleColorRes = color;
return this;
}

/** Specify the color value for the target circle **/
// TODO(Hilal): In v2, this API should be cleaned up / torched
public TapTarget targetCircleColorInt(@ColorInt int color) {
this.targetCircleColor = color;
return this;
}

/** Specify the color resource for all text **/
public TapTarget textColor(@ColorRes int color) {
this.titleTextColorRes = color;
this.descriptionTextColorRes = color;
return this;
}

/** Specify the color value for all text **/
// TODO(Hilal): In v2, this API should be cleaned up / torched
public TapTarget textColorInt(@ColorInt int color) {
this.titleTextColor = color;
this.descriptionTextColor = color;
return this;
}

/** Specify the color resource for the title text **/
public TapTarget titleTextColor(@ColorRes int color) {
this.titleTextColorRes = color;
return this;
}

/** Specify the color value for the title text **/
// TODO(Hilal): In v2, this API should be cleaned up / torched
public TapTarget titleTextColorInt(@ColorInt int color) {
this.titleTextColor = color;
return this;
}

/** Specify the color resource for the description text **/
public TapTarget descriptionTextColor(@ColorRes int color) {
this.descriptionTextColor= color;
this.descriptionTextColorRes = color;
return this;
}

/** Specify the color value for the description text **/
// TODO(Hilal): In v2, this API should be cleaned up / torched
public TapTarget descriptionTextColorInt(@ColorInt int color) {
this.descriptionTextColor = color;
return this;
}

Expand Down Expand Up @@ -266,6 +309,17 @@ public TapTarget descriptionTextDimen(@DimenRes int dimen) {
* <b>Note:</b> The given color will have its opacity modified to 30% automatically
*/
public TapTarget dimColor(@ColorRes int color) {
this.dimColorRes = color;
return this;
}

/**
* Specify the color value to use as a dim effect
* <p>
* <b>Note:</b> The given color will have its opacity modified to 30% automatically
*/
// TODO(Hilal): In v2, this API should be cleaned up / torched
public TapTarget dimColorInt(@ColorInt int color) {
this.dimColor = color;
return this;
}
Expand Down Expand Up @@ -343,6 +397,26 @@ public Rect bounds() {
return bounds;
}

int outerCircleColorInt(Context context) {
return colorResOrInt(context, outerCircleColor, outerCircleColorRes);
}

int targetCircleColorInt(Context context) {
return colorResOrInt(context, targetCircleColor, targetCircleColorRes);
}

int dimColorInt(Context context) {
return colorResOrInt(context, dimColor, dimColorRes);
}

int titleTextColorInt(Context context) {
return colorResOrInt(context, titleTextColor, titleTextColorRes);
}

int descriptionTextColorInt(Context context) {
return colorResOrInt(context, descriptionTextColor, descriptionTextColorRes);
}

int titleTextSizePx(Context context) {
return dimenOrSize(context, titleTextSize, titleTextDimen);
}
Expand All @@ -351,9 +425,17 @@ int descriptionTextSizePx(Context context) {
return dimenOrSize(context, descriptionTextSize, descriptionTextDimen);
}

private int colorResOrInt(Context context, int value, @ColorRes int resource) {
if (resource != -1) {
return UiUtil.color(context, resource);
}

return value;
}

private int dimenOrSize(Context context, int size, @DimenRes int dimen) {
if (dimen != -1) {
return (int) context.getResources().getDimension(dimen);
return UiUtil.dimen(context, dimen);
}

return UiUtil.sp(context, size);
Expand Down
25 changes: 15 additions & 10 deletions taptargetview/src/main/java/com/getkeepsafe/taptargetview/TapTargetView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,16 +491,18 @@ public void getOutline(View view, Outline outline) {
final Resources.Theme theme = context.getTheme();
isDark = UiUtil.themeIntAttr(context, "isLightTheme") == 0;

if (target.outerCircleColor != UNSET_COLOR) {
outerCirclePaint.setColor(UiUtil.getColor(context, target.outerCircleColor));
final int outerCircleColor = target.outerCircleColorInt(context);
if (outerCircleColor != UNSET_COLOR) {
outerCirclePaint.setColor(outerCircleColor);
} else if (theme != null) {
outerCirclePaint.setColor(UiUtil.themeIntAttr(context, "colorPrimary"));
} else {
outerCirclePaint.setColor(Color.WHITE);
}

if (target.targetCircleColor != UNSET_COLOR) {
targetCirclePaint.setColor(UiUtil.getColor(context, target.targetCircleColor));
final int targetCircleColor = target.targetCircleColorInt(context);
if (targetCircleColor != UNSET_COLOR) {
targetCirclePaint.setColor(targetCircleColor);
} else {
targetCirclePaint.setColor(isDark ? Color.BLACK : Color.WHITE);
}
Expand All @@ -511,20 +513,23 @@ public void getOutline(View view, Outline outline) {

targetCirclePulsePaint.setColor(targetCirclePaint.getColor());

if (target.dimColor != UNSET_COLOR) {
dimColor = UiUtil.setAlpha(UiUtil.getColor(context, target.dimColor), 0.3f);
final int targetDimColor = target.dimColorInt(context);
if (targetDimColor != UNSET_COLOR) {
dimColor = UiUtil.setAlpha(targetDimColor, 0.3f);
} else {
dimColor = -1;
}

if (target.titleTextColor != UNSET_COLOR) {
titlePaint.setColor(UiUtil.getColor(context, target.titleTextColor));
final int titleTextColor = target.titleTextColorInt(context);
if (titleTextColor != UNSET_COLOR) {
titlePaint.setColor(titleTextColor);
} else {
titlePaint.setColor(isDark ? Color.BLACK : Color.WHITE);
}

if (target.descriptionTextColor != UNSET_COLOR) {
descriptionPaint.setColor(UiUtil.getColor(context, target.descriptionTextColor));
final int descriptionTextColor = target.descriptionTextColorInt(context);
if (descriptionTextColor != UNSET_COLOR) {
descriptionPaint.setColor(descriptionTextColor);
} else {
descriptionPaint.setColor(titlePaint.getColor());
}
Expand Down
9 changes: 8 additions & 1 deletion taptargetview/src/main/java/com/getkeepsafe/taptargetview/UiUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
import android.content.Context;
import android.content.res.Resources;
import android.os.Build;
import android.support.annotation.ColorRes;
import android.support.annotation.DimenRes;
import android.util.TypedValue;

class UiUtil {
Expand Down Expand Up @@ -66,12 +68,17 @@ static int setAlpha(int argb, float alpha) {
}

/** Compatibility wrapper for getting a color resource value **/
static int getColor(Context context, int id) {
static int color(Context context, @ColorRes int id) {
if (Build.VERSION.SDK_INT >= 23) {
return context.getColor(id);
}

//noinspection deprecation
return context.getResources().getColor(id);
}

/** Returns the given dimension id in pixels **/
static int dimen(Context context, @DimenRes int id) {
return (int) context.getResources().getDimension(id);
}
}