Merge pull request #12 from droidekas/master

Fix for #7 when enableDismissAfterShown is enabled
29jitender · Aug 2, 2016 · a02a2e1 · a02a2e1
2 parents 2321e27 + ac0e31d
commit a02a2e1
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/Spotlight-library/src/main/java/com/wooplr/spotlight/SpotlightView.java b/Spotlight-library/src/main/java/com/wooplr/spotlight/SpotlightView.java
@@ -599,6 +599,7 @@ public void onAnimationStart(Animation animation) {
                     public void onAnimationEnd(Animation animation) {
                         dismissOnTouch = true;
                         dismissOnBackPress = true;
+                        enableDismissOnBackPress();
                     }
 
                     @Override
@@ -628,6 +629,12 @@ public void onAnimationRepeat(Animator animator) {
 
     }
 
+    private void enableDismissOnBackPress() {
+        setFocusableInTouchMode(true);
+        setFocusable(true);
+        requestFocus();
+    }
+
     private List<AnimPoint> checkLinePoint() {
 
         //Screen Height
@@ -1041,9 +1048,7 @@ public SpotlightView build() {
                     spotlightView.padding);
             spotlightView.setCircleShape(circle);
             if (spotlightView.dismissOnBackPress) {
-                spotlightView.setFocusableInTouchMode(true);
-                spotlightView.setFocusable(true);
-                spotlightView.requestFocus();
+                spotlightView.enableDismissOnBackPress();
             }
             return spotlightView;
         }