Skip to content

Commit 5e60c60

Browse files
ReginaldLiuReginaldLiu
committed
add corroct and error line color
1 parent 520242f commit 5e60c60

6 files changed

Lines changed: 108 additions & 41 deletions

File tree

‎README.md‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,17 @@ properties:
5454
| attr | required/optional(default value) | meaning |
5555
|:-----------: |:---------: |:----------------------------------------------------: |
5656
| lock_nodeSize | required | the size of the node |
57+
| lock_nodeSrc | required | the resource id of the node |
58+
| lock_spacing | if given, SpacingPadding Mode is applied,otherwise, Identical-Area Mode is applied | the spacing between adjacent nodes |
5759
| lock_size | optional, default is 3 | n, where it's an n * n lock view. |
5860
| lock_enableVibrate | optional, default is false | enable vibration when a node is linked |
5961
| lock_vibrateTime | optional, default is 20ms | time the vibration lasting |
6062
| lock_lineWidth | optional, default is 5dp | the width of the link line |
6163
| lock_lineColor | optional, default is #FFFFFF | the color of the link line |
62-
| lock_spacing | if given, SpacingPadding Mode is applied,otherwise, Identical-Area Mode is applied | the spacing between adjacent nodes |
64+
| lock_lineCorrectColor | optional, default is lock_lineColor | the color of the link line when the password is correct |
65+
| lock_lineErrorColor | optional, default is lock_lineColor | the color of the link line when the password is error |
6366
| lock_padding | optional, default is 0 | the padding of the lockview |
6467
| lock_nodeTouchExpand | optional, default is 0 | the expanded area of the node which receive touch action. |
65-
| lock_nodeSrc | required | the resource id of the node |
6668
| lock_nodeHighlightSrc | optional, default is null | the resource id of the node when it's in highlighted state, e.g. node is linked. |
6769
| lock_nodeCorrectSrc | optional, default is null | the resource id of the node when it's in correct state, e.g. password correct. |
6870
| lock_nodeErrorSrc | optional, default is null | the resource id of the node when it's in error state, e.g. password error. |

‎patternlock/src/main/java/com/reginald/patternlockview/PatternLockView.java‎

Lines changed: 56 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -25,30 +25,28 @@
2525
/**
2626
* PatternLockView support two layout mode:
2727
* PatternLockView 支持两种布局模式：
28-
*
28+
* <p>
2929
* 1. SpacingPadding mode:
30-
* If lock_spacing is given, PatternLockView use lock_nodeSize, lock_spacing and lock_padding to layout the view.
31-
* Detail Rules:
32-
* a. Use exactly lock_nodeSize, spacing and lock_padding to layout. If insufficient space, try b.
33-
* b. Keep lock_nodeSize, reduce lock_spacing and lock_padding with equal proportion. If insufficient space, try c.
34-
* c. Keep lock_spacing and lock_padding, reduce lock_nodeSize. If insufficient space, try d.
35-
* d. Apply Identical-Area mode.
36-
*
37-
* 如果设置了lock_spacing时，PatternLockView会使用lock_nodeSize, lock_spacing, lock_padding去布局
38-
* 具体布局规则如下：
39-
* a.精确按照lock_nodeSize, lock_spacing, lock_padding去布局进行布局，如果空间不足采用b规则；
40-
* b.保持lock_nodeSize大小不变，按比例缩小lock_spacing与lock_padding去布局，如果spacing与padding空间小于0，采用c规则；
41-
* c.保持lock_spacing与lock_padding，缩小lock_nodeSize，如果lock_nodeSize小于0，采用d规则；
42-
* d.采用Identical-Area mode；
43-
*
30+
* If lock_spacing is given, PatternLockView use lock_nodeSize, lock_spacing and lock_padding to layout the view.
31+
* Detail Rules:
32+
* a. Use exactly lock_nodeSize, spacing and lock_padding to layout. If insufficient space, try b.
33+
* b. Keep lock_nodeSize, reduce lock_spacing and lock_padding with equal proportion. If insufficient space, try c.
34+
* c. Keep lock_spacing and lock_padding, reduce lock_nodeSize. If insufficient space, try d.
35+
* d. Apply Identical-Area mode.
36+
* <p>
37+
* 如果设置了lock_spacing时，PatternLockView会使用lock_nodeSize, lock_spacing, lock_padding去布局
38+
* 具体布局规则如下：
39+
* a.精确按照lock_nodeSize, lock_spacing, lock_padding去布局进行布局，如果空间不足采用b规则；
40+
* b.保持lock_nodeSize大小不变，按比例缩小lock_spacing与lock_padding去布局，如果spacing与padding空间小于0，采用c规则；
41+
* c.保持lock_spacing与lock_padding，缩小lock_nodeSize，如果lock_nodeSize小于0，采用d规则；
42+
* d.采用Identical-Area mode；
43+
* <p>
4444
* 2. Identical-Area mode:
45-
* If lock_spacing is NOT given, PatternLockView only use lock_nodeSize to layout the view(lock_spacing and lock_padding are ignored).
46-
* It divides the whole area into n * n identical cells, and layout the node in the center of each cell
47-
*
48-
* 如果未设置lock_spacing时，PatternLockView将只使用lock_nodeSize，而无视lock_spacing与lock_padding去布局。
49-
* 其会将空间等分为n * n个空间，并将节点居中放置
50-
*
51-
45+
* If lock_spacing is NOT given, PatternLockView only use lock_nodeSize to layout the view(lock_spacing and lock_padding are ignored).
46+
* It divides the whole area into n * n identical cells, and layout the node in the center of each cell
47+
* <p>
48+
* 如果未设置lock_spacing时，PatternLockView将只使用lock_nodeSize，而无视lock_spacing与lock_padding去布局。
49+
* 其会将空间等分为n * n个空间，并将节点居中放置
5250
*
5351
* @author xyxyLiu
5452
* @version 1.0
@@ -88,9 +86,12 @@ public class PatternLockView extends ViewGroup {
8886

8987
private float mNodeAreaExpand;
9088
private int mNodeOnAnim;
91-
private int mLineColor;
9289
private float mLineWidth;
9390

91+
private int mLineColor;
92+
private int mLineCorrectColor;
93+
private int mLineErrorColor;
94+
9495
private float mNodeSize;
9596
// only used in Identical-Area mode, whether to keep each square
9697
private boolean mIsSquareArea = true;
@@ -151,6 +152,7 @@ public void setTouchEnabled(boolean isEnabled) {
151152

152153
/**
153154
* time delayed of the lock view resetting after user finish input password
155+
*
154156
* @param timeout timeout
155157
*/
156158
public void setFinishTimeout(long timeout) {
@@ -161,16 +163,18 @@ public void setFinishTimeout(long timeout) {
161163

162164
/**
163165
* whether user can start a new password input in the period of FinishTimeout
164-
* @see #setFinishTimeout(long)
166+
*
165167
* @param isInterruptable if true, the lock view will be reset when user touch a new node.
166168
* if false, the lock view will be reset only when the finish timeout expires
169+
* @see #setFinishTimeout(long)
167170
*/
168171
public void setFinishInterruptable(boolean isInterruptable) {
169172
mIsFinishInterruptable = isInterruptable;
170173
}
171174

172175
/**
173176
* whether the nodes in the path of two selected nodes will be automatic linked
177+
*
174178
* @param isEnabled enabled
175179
*/
176180
public void setAutoLinkEnabled(boolean isEnabled) {
@@ -214,6 +218,8 @@ private void initFromAttributes(Context context, AttributeSet attrs, int defStyl
214218
mNodeAreaExpand = a.getDimension(R.styleable.PatternLockView_lock_nodeTouchExpand, 0);
215219
mNodeOnAnim = a.getResourceId(R.styleable.PatternLockView_lock_nodeOnAnim, 0);
216220
mLineColor = a.getColor(R.styleable.PatternLockView_lock_lineColor, Color.argb(0xb2, 0xff, 0xff, 0xff));
221+
mLineCorrectColor = a.getColor(R.styleable.PatternLockView_lock_lineCorrectColor, mLineColor);
222+
mLineErrorColor = a.getColor(R.styleable.PatternLockView_lock_lineErrorColor, mLineColor);
217223
mLineWidth = a.getDimension(R.styleable.PatternLockView_lock_lineWidth, (int) TypedValue.applyDimension(
218224
TypedValue.COMPLEX_UNIT_DIP, 5, getResources().getDisplayMetrics()));
219225
mPadding = a.getDimension(R.styleable.PatternLockView_lock_padding, 0);
@@ -455,14 +461,7 @@ public boolean onTouchEvent(MotionEvent event) {
455461

456462
if (mCallBack != null) {
457463
int result = mCallBack.onFinish(new Password(mNodeList));
458-
switch (result) {
459-
case CODE_PASSWORD_CORRECT:
460-
setFinishState(NodeView.STATE_CORRECT);
461-
break;
462-
case CODE_PASSWORD_ERROR:
463-
setFinishState(NodeView.STATE_ERROR);
464-
break;
465-
}
464+
setFinishState(result);
466465
}
467466

468467
currentNode = null;
@@ -475,17 +474,34 @@ public boolean onTouchEvent(MotionEvent event) {
475474
return true;
476475
}
477476

478-
private void setupNodes(int size){
477+
private void setupNodes(int size) {
479478
removeAllViews();
480479
for (int n = 0; n < size * size; n++) {
481480
NodeView node = new NodeView(getContext(), n);
482481
addView(node);
483482
}
484483
}
485484

486-
private void setFinishState(int state) {
487-
for (NodeView nodeView : mNodeList) {
488-
nodeView.setState(state);
485+
private void setFinishState(int result) {
486+
int nodeState = -1;
487+
int lineColor = mLineColor;
488+
489+
if (result == CODE_PASSWORD_CORRECT) {
490+
nodeState = NodeView.STATE_CORRECT;
491+
lineColor = mLineCorrectColor;
492+
} else if (result == CODE_PASSWORD_ERROR) {
493+
nodeState = NodeView.STATE_ERROR;
494+
lineColor = mLineErrorColor;
495+
}
496+
497+
if (nodeState >= 0) {
498+
for (NodeView nodeView : mNodeList) {
499+
nodeView.setState(nodeState);
500+
}
501+
}
502+
503+
if (lineColor != mLineColor) {
504+
mPaint.setColor(lineColor);
489505
}
490506
}
491507

@@ -499,6 +515,7 @@ private void addNodeToList(NodeView nodeView) {
499515
/**
500516
* auto link the nodes between first and second
501517
* 检测两个节点间的中间检点是否未连接，否则按顺序连接。
518+
*
502519
* @param first
503520
* @param second
504521
*/
@@ -594,10 +611,10 @@ private boolean isMeasureModeExactly(int measureMode) {
594611
public interface CallBack {
595612
/**
596613
* @param password password
597-
* @see com.reginald.patternlockview.PatternLockView.Password
598614
* @return return value 解锁结果返回值：
599615
* {@link #CODE_PASSWORD_CORRECT},
600616
* {@link #CODE_PASSWORD_ERROR},
617+
* @see com.reginald.patternlockview.PatternLockView.Password
601618
*/
602619
int onFinish(Password password);
603620
}
@@ -701,11 +718,11 @@ public String toString() {
701718
}
702719
}
703720

704-
public static class Password{
721+
public static class Password {
705722
public final List<Integer> list;
706723
public final String string;
707724

708-
public Password(List<NodeView> nodeViewList){
725+
public Password(List<NodeView> nodeViewList) {
709726
// build password id list
710727
list = new ArrayList<>();
711728
for (NodeView node : nodeViewList) {

‎patternlock/src/main/res/values/attrs.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
<attr name="lock_nodeCorrectSrc" format="color|reference" />
1414
<attr name="lock_nodeErrorSrc" format="color|reference" />
1515
<attr name="lock_lineColor" format="color" />
16+
<attr name="lock_lineCorrectColor" format="color" />
17+
<attr name="lock_lineErrorColor" format="color" />
1618
<attr name="lock_lineWidth" format="dimension" />
1719
<attr name="lock_nodeTouchExpand" format="dimension" />
1820
<attr name="lock_autoLink" format="boolean" />

‎sample/src/main/res/drawable/pattern_lock_circle_node_correct.xml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
3+
<item
4+
android:bottom="10dp"
5+
android:left="10dp"
6+
android:right="10dp"
7+
android:top="10dp">"
8+
<shape
9+
android:shape="oval">
10+
<solid android:color="#008800" />
11+
</shape>
12+
</item>
13+
<item>
14+
<shape
15+
android:shape="oval">
16+
<stroke android:width="2dp"
17+
android:color="#b2008800" />
18+
<solid android:color="#00000000" />
19+
</shape>
20+
</item>
21+
</layer-list>

‎sample/src/main/res/drawable/pattern_lock_circle_node_error.xml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
3+
<item
4+
android:bottom="10dp"
5+
android:left="10dp"
6+
android:right="10dp"
7+
android:top="10dp">"
8+
<shape
9+
android:shape="oval">
10+
<solid android:color="#880000" />
11+
</shape>
12+
</item>
13+
<item>
14+
<shape
15+
android:shape="oval">
16+
<stroke android:width="2dp"
17+
android:color="#b2880000" />
18+
<solid android:color="#00000000" />
19+
</shape>
20+
</item>
21+
</layer-list>

‎sample/src/main/res/layout/activity_demo_layout.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,15 @@
3131
app:lock_enableVibrate="true"
3232
app:lock_vibrateTime="100"
3333
app:lock_lineColor="#a2ffffff"
34+
app:lock_lineCorrectColor="#a2008800"
35+
app:lock_lineErrorColor="#a2880000"
3436
app:lock_lineWidth="8dp"
3537
app:lock_nodeSize="40dp"
3638
app:lock_nodeTouchExpand="15dp"
3739
app:lock_nodeSrc="@drawable/pattern_lock_circle_node_normal"
3840
app:lock_nodeHighlightSrc="@drawable/pattern_lock_circle_node_highlighted"
41+
app:lock_nodeCorrectSrc="@drawable/pattern_lock_circle_node_correct"
42+
app:lock_nodeErrorSrc="@drawable/pattern_lock_circle_node_error"
3943
app:lock_nodeOnAnim="@anim/pattern_lock_node_anim_larger"
4044
app:lock_autoLink="true"
4145
/>

0 commit comments

Comments
 (0)