FIX : dispatch accessibility events only if needed, cleaned up code a bit

Author: matpag

library/src/main/java/com/matpag/clickdrawabletextview/CsDrawableViewManager.java

@@ -291,7 +291,7 @@ private void setViewOnTouchListener(){
             switch (e.getAction()) {
                 case MotionEvent.ACTION_DOWN: {
                     //if the user clicked on one of the drawables, save some datas about it
-                    if (isOneOfDrawablesTouched(e)) {
+                    if (isOneDrawableTouched(e)) {
                         pressedX = e.getX();
                         pressedY = e.getY();
                         stayedWithinClickDistance = true;
@@ -304,30 +304,27 @@ private void setViewOnTouchListener(){
                 case MotionEvent.ACTION_MOVE: {
                     //if the user moved the finger to much far from the initial tap point,
                     //we cancel the touch on the drawable
-                    if (stayedWithinClickDistance && distance(pressedX, pressedY, e.getX(),
-                                    e.getY()) > MAX_CLICK_DISTANCE) {
+                    if (stayedWithinClickDistance &&
+                            distance(pressedX, pressedY, e.getX(), e.getY()) > MAX_CLICK_DISTANCE) {
                         stayedWithinClickDistance = false;
                     }
                     break;
                 }
                 case MotionEvent.ACTION_UP: {
-                    // dispatch accessibility events even if the touch didn't hit the drawable
-                    // (the lint checker is still complaining about this and the suppress warning
-                    // is ignored).
-                    // if enableTouchOnText is false should we call this?
-                    view.performClick();
                     // proceed with the drawable touch logic
                     long eventDuration = e.getEventTime() - e.getDownTime();
-                    if (mTouchedPosition != null){
+                    if (isOneDrawableTouching()){
                         if ((eventDuration < MAX_CLICK_DURATION) && stayedWithinClickDistance) {
+                            //dispatch accessibility events
+                            view.performClick();
                             dispatchDrawableClickEvent();
                         }
                         resetTouchedDrawable();
                         return true;
                     }
                 }
             }
-            return false;
+            return view.onTouchEvent(e);
         });
     }
 
@@ -336,7 +333,7 @@ private void setViewOnTouchListener(){
      * the bounds of one of the showing drawables, if true set {@link #mTouchedPosition}
      * with one of correct values of {@link DrawablePosition}
      */
-    private boolean isOneOfDrawablesTouched(MotionEvent event){
+    private boolean isOneDrawableTouched(MotionEvent event){
         CsDrawableTouchUtils cdu = new CsDrawableTouchUtils(event, view, isLayoutRTL());
         if (mEndDrawable != null && mEndDrawable.isVisible()
                 && cdu.isEndDrawableTouched(mEndDrawable)){
@@ -367,6 +364,10 @@ private void resetTouchedDrawable(){
         mTouchedPosition = null;
     }
 
+    private boolean isOneDrawableTouching(){
+        return mTouchedPosition != null;
+    }
+
 
     @Override
     public void setOnDrawableClickListener(OnDrawableClickListener listener){