Skip to content
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

Do not set content text alpha when sets the title #85

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+35 −14
Open

Do not set content text alpha when sets the title #85

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6dcef56
Do not set content text alpha
sandrocsimas Mar 19, 2016
4426cdd
Adding methods to change the title and content size
sandrocsimas Mar 20, 2016
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
49 changes: 35 additions & 14 deletions library/src/main/java/uk/co/deanwild/materialshowcaseview/MaterialShowcaseView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,8 +356,7 @@ void setPosition(int x, int y) {
}

private void setTitleText(CharSequence contentText) {
if (mTitleTextView != null && !contentText.equals("")) {
mContentTextView.setAlpha(0.5F);
if (mTitleTextView != null) {
mTitleTextView.setText(contentText);
}
}
Expand All @@ -376,21 +375,33 @@ private void setDismissText(CharSequence dismissText) {
}
}

private void setTitleTextColor(int textColour) {
private void setTitleTextColor(int textColor) {
if (mTitleTextView != null) {
mTitleTextView.setTextColor(textColour);
mTitleTextView.setTextColor(textColor);
}
}

private void setContentTextColor(int textColour) {
private void setContentTextColor(int textColor) {
if (mContentTextView != null) {
mContentTextView.setTextColor(textColour);
mContentTextView.setTextColor(textColor);
}
}

private void setDismissTextColor(int textColour) {
private void setDismissTextColor(int textColor) {
if (mDismissButton != null) {
mDismissButton.setTextColor(textColour);
mDismissButton.setTextColor(textColor);
}
}

private void setTitleTextSize(float textSize) {
if (mTitleTextView != null) {
mTitleTextView.setTextSize(textSize);
}
}

private void setContentTextSize(float textSize) {
if (mContentTextView != null) {
mContentTextView.setTextSize(textSize);
}
}

Expand Down Expand Up @@ -592,18 +603,28 @@ public Builder setMaskColour(int maskColour) {
return this;
}

public Builder setTitleTextColor(int textColour) {
showcaseView.setTitleTextColor(textColour);
public Builder setTitleTextColor(int textColor) {
showcaseView.setTitleTextColor(textColor);
return this;
}

public Builder setContentTextColor(int textColor) {
showcaseView.setContentTextColor(textColor);
return this;
}

public Builder setDismissTextColor(int textColor) {
showcaseView.setDismissTextColor(textColor);
return this;
}

public Builder setContentTextColor(int textColour) {
showcaseView.setContentTextColor(textColour);
public Builder setTitleTextSize(float textSize) {
showcaseView.setTitleTextSize(textSize);
return this;
}

public Builder setDismissTextColor(int textColour) {
showcaseView.setDismissTextColor(textColour);
public Builder setContentTextSize(float textSize) {
showcaseView.setContentTextSize(textSize);
return this;
}

Expand Down