diff --git a/README.md b/README.md index 1beda16..a07896e 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ ![PatternLockView](https://github.com/aritraroy/PatternLockView/blob/master/screenshots/pattern-lock-view-banner.png?raw=true) # PatternLockView -An easy-to-use, customizable, Material Design complaint Pattern Lock view for Android. +An easy-to-use, customizable, Material Design ready Pattern Lock view for Android. ### Specs [ ![Download](https://api.bintray.com/packages/aritraroy/maven/patternlockview/images/download.svg) ](https://bintray.com/aritraroy/maven/patternlockview/_latestVersion) [![API](https://img.shields.io/badge/API-14%2B-orange.svg?style=flat)](https://android-arsenal.com/api?level=14) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) [![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-PatternLockView-brightgreen.svg?style=flat)](https://android-arsenal.com/details/1/5515) @@ -31,7 +31,7 @@ dependencies { ### Spread Some :heart: [![GitHub stars](https://img.shields.io/github/stars/aritraroy/PatternLockView.svg?style=social&label=Star)](https://github.com/aritraroy) [![GitHub followers](https://img.shields.io/github/followers/aritraroy.svg?style=social&label=Follow)](https://github.com/aritraroy) -[![Twitter Follow](https://img.shields.io/twitter/follow/aritraroy93.svg?style=social)](https://twitter.com/aritraroy93) +[![Twitter Follow](https://img.shields.io/twitter/follow/aritraroy.svg?style=social)](https://twitter.com/aritraroy) # Usage @@ -175,7 +175,8 @@ Android & Backend Developer. Blogger. Designer. Fitness Enthusiast. - + + # License diff --git a/patternlockview-reactive/src/main/java/com/andrognito/rxpatternlockview/observables/PatternLockViewCompleteObservable.java b/patternlockview-reactive/src/main/java/com/andrognito/rxpatternlockview/observables/PatternLockViewCompleteObservable.java index 26ae6f3..85fab78 100644 --- a/patternlockview-reactive/src/main/java/com/andrognito/rxpatternlockview/observables/PatternLockViewCompleteObservable.java +++ b/patternlockview-reactive/src/main/java/com/andrognito/rxpatternlockview/observables/PatternLockViewCompleteObservable.java @@ -22,17 +22,17 @@ public PatternLockViewCompleteObservable(PatternLockView patternLockView, boolea @Override protected void subscribeListener(Observer observer) { - subscribeListener(observer); - if (mEmitInitialValue) { - observer.onNext(new PatternLockCompleteEvent(mPatternLockView.getPattern())); - } + InternalListener internalListener = new InternalListener(mPatternLockView, observer); + observer.onSubscribe(internalListener); + mPatternLockView.addPatternLockListener(internalListener); } @Override protected void subscribeActual(Observer observer) { - InternalListener internalListener = new InternalListener(mPatternLockView, observer); - observer.onSubscribe(internalListener); - mPatternLockView.addPatternLockListener(internalListener); + subscribeListener(observer); + if (mEmitInitialValue) { + observer.onNext(new PatternLockCompleteEvent(mPatternLockView.getPattern())); + } } private static final class InternalListener extends MainThreadDisposable diff --git a/patternlockview-reactive/src/main/java/com/andrognito/rxpatternlockview/observables/PatternLockViewProgressObservable.java b/patternlockview-reactive/src/main/java/com/andrognito/rxpatternlockview/observables/PatternLockViewProgressObservable.java index bd1e598..8597ab8 100644 --- a/patternlockview-reactive/src/main/java/com/andrognito/rxpatternlockview/observables/PatternLockViewProgressObservable.java +++ b/patternlockview-reactive/src/main/java/com/andrognito/rxpatternlockview/observables/PatternLockViewProgressObservable.java @@ -22,17 +22,17 @@ public PatternLockViewProgressObservable(PatternLockView patternLockView, boolea @Override protected void subscribeListener(Observer observer) { - subscribeListener(observer); - if (mEmitInitialValue) { - observer.onNext(new PatternLockProgressEvent(mPatternLockView.getPattern())); - } + InternalListener internalListener = new InternalListener(mPatternLockView, observer); + observer.onSubscribe(internalListener); + mPatternLockView.addPatternLockListener(internalListener); } @Override protected void subscribeActual(Observer observer) { - InternalListener internalListener = new InternalListener(mPatternLockView, observer); - observer.onSubscribe(internalListener); - mPatternLockView.addPatternLockListener(internalListener); + subscribeListener(observer); + if (mEmitInitialValue) { + observer.onNext(new PatternLockProgressEvent(mPatternLockView.getPattern())); + } } private static final class InternalListener extends MainThreadDisposable diff --git a/screenshots/pattern-lock-view-banner.png b/screenshots/pattern-lock-view-banner.png index 88ec46e..2aa1e38 100644 Binary files a/screenshots/pattern-lock-view-banner.png and b/screenshots/pattern-lock-view-banner.png differ