Merge pull request #4 from shadowfaxtech/v1.1

v1.1

Author: ishaangarg

proswipebutton/build.gradle

@@ -13,7 +13,7 @@ ext {
     siteUrl = 'https://github.com/shadowfaxtech/proSwipeButton'
     gitUrl = 'https://github.com/shadowfaxtech/proSwipeButton.git'
 
-    libraryVersion = '1.0.2'
+    libraryVersion = '1.1'
 
     developerId = 'developerId'
     developerName = 'Ishaan Garg'
@@ -30,8 +30,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 26
-        versionCode 3
-        versionName "1.0.2"
+        versionCode 4
+        versionName "1.1"
         vectorDrawables.useSupportLibrary = true
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

proswipebutton/src/main/java/in/shadowfax/proswipebutton/ProSwipeButton.java

@@ -172,10 +172,7 @@ public boolean onTouch(View v, MotionEvent event) {
                         //Release logic here
                         if (arrowHintContainer.getX() + arrowHintContainer.getWidth() > getWidth() * swipeDistance) {
                             // swipe completed, fly the hint away!
-                            animateFadeHide(context, arrowHintContainer);
-                            if (swipeListener != null)
-                                swipeListener.onSwipeConfirm();
-                            morphToCircle();
+                            performSuccessfulSwipe();
                         } else if (arrowHintContainer.getX() <= 0) {
                             // upon click without swipe
                             startFwdAnim();
@@ -191,6 +188,12 @@ public boolean onTouch(View v, MotionEvent event) {
         });
     }
 
+    private void performSuccessfulSwipe() {
+        if (swipeListener != null)
+            swipeListener.onSwipeConfirm();
+        morphToCircle();
+    }
+
     @Override
     protected void onSizeChanged(int w, int h, int oldw, int oldh) {
         super.onSizeChanged(w, h, oldw, oldh);
@@ -245,7 +248,17 @@ private void startHintInitAnim() {
         arrowHintContainer.startAnimation(anim);
     }
 
-    private void morphToCircle() {
+    /**
+     * Just like performOnClick() in a standard button,
+     * this will call the attached OnSwipeListener
+     * and morph the btn to a circle
+     */
+    public void performOnSwipe() {
+        performSuccessfulSwipe();
+    }
+
+    public void morphToCircle() {
+        animateFadeHide(context, arrowHintContainer);
         setOnTouchListener(null);
         ObjectAnimator cornerAnimation =
                 ObjectAnimator.ofFloat(gradientDrawable, "cornerRadius", BTN_INIT_RADIUS, BTN_MORPHED_RADIUS);