Skip to content

Synchronize updateColorForLines and updateDrawableState #79

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

Open
Will5 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Synchronize updateColorForLines and updateDrawableState #79

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
26 changes: 17 additions & 9 deletions pinentryedittext/src/main/java/com/alimuzaffar/lib/pin/PinEntryEditText.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ protected void onDraw(Canvas canvas) {
}
//The lines should be in front of the text (because that's how I want it).
if (mPinBackground == null) {
updateColorForLines(i <= textLength);
updateColorForLines(i < textLength, i == textLength);
canvas.drawLine(mLineCoords[i].left, mLineCoords[i].top, mLineCoords[i].right, mLineCoords[i].bottom, mLinesPaint);
}
}
Expand Down Expand Up @@ -416,33 +416,41 @@ private int getColorForState(int... states) {
}

/**
* @param hasTextOrIsNext Is the color for a character that has been typed or is
* the next character to be typed?
* @param hasText Whether this position has text
* @param isNext Whether this position is the next to be typed
*/
protected void updateColorForLines(boolean hasTextOrIsNext) {
protected void updateColorForLines(boolean hasText, boolean isNext) {
if (mHasError) {
mLinesPaint.setColor(getColorForState(android.R.attr.state_active));
} else if (isFocused()) {
mLinesPaint.setStrokeWidth(mLineStrokeSelected);
mLinesPaint.setColor(getColorForState(android.R.attr.state_focused));
if (hasTextOrIsNext) {
mLinesPaint.setColor(getColorForState(android.R.attr.state_selected));
if (isNext) {
mLinesPaint.setColor(getColorForState(android.R.attr.state_focused, android.R.attr.state_selected));
} else if (hasText) {
mLinesPaint.setColor(getColorForState(android.R.attr.state_focused, android.R.attr.state_checked));
} else {
mLinesPaint.setColor(getColorForState(android.R.attr.state_focused));
}
} else {
mLinesPaint.setStrokeWidth(mLineStroke);
mLinesPaint.setColor(getColorForState(-android.R.attr.state_focused));
if (hasText) {
mLinesPaint.setColor(getColorForState(-android.R.attr.state_focused, android.R.attr.state_checked));
} else {
mLinesPaint.setColor(getColorForState(-android.R.attr.state_focused));
}
}
}

protected void updateDrawableState(boolean hasText, boolean isNext) {
if (mHasError) {
mPinBackground.setState(new int[]{android.R.attr.state_active});
} else if (isFocused()) {
mPinBackground.setState(new int[]{android.R.attr.state_focused});
if (isNext) {
mPinBackground.setState(new int[]{android.R.attr.state_focused, android.R.attr.state_selected});
} else if (hasText) {
mPinBackground.setState(new int[]{android.R.attr.state_focused, android.R.attr.state_checked});
} else {
mPinBackground.setState(new int[]{android.R.attr.state_focused});
}
} else {
if (hasText) {
Expand Down