Fix Scroll problem and add option to enable zooming

Author: Kevin Ménager

library/src/main/java/com/alamkanak/weekview/WeekView.java

@@ -56,6 +56,7 @@ public class WeekView extends View {
     private int mHeaderSeparator = 12;
     private int mHeaderSeparatorColor;
     private Paint mDaySeparatorPaint;
+    private boolean mZoomEnabled = true;
 
     private enum Direction {
         NONE, LEFT, RIGHT, VERTICAL
@@ -203,6 +204,7 @@ public void setSpanEvent(MetricAffectingSpan typefaceEvent) {
 
         @Override
         public boolean onDown(MotionEvent e) {
+            mScroller.forceFinished(true);
             goToNearestOrigin();
             return true;
         }
@@ -413,6 +415,7 @@ public WeekView(Context context, AttributeSet attrs, int defStyleAttr) {
             mBorderEventThickness = a.getDimensionPixelSize(R.styleable.WeekView_borderEventThickness, mBorderEventThickness);
             mBorderEventPosition = a.getInteger(R.styleable.WeekView_borderEventPosition, mBorderEventPosition);
             mShowBorderEvent = a.getBoolean(R.styleable.WeekView_showBorderEvent, mShowBorderEvent);
+            mZoomEnabled = a.getBoolean(R.styleable.WeekView_enableZoom, mZoomEnabled);
         } finally {
             a.recycle();
         }
@@ -1944,7 +1947,9 @@ public void setScrollDuration(int scrollDuration) {
 
     @Override
     public boolean onTouchEvent(MotionEvent event) {
-        mScaleDetector.onTouchEvent(event);
+        if (mZoomEnabled) {
+            mScaleDetector.onTouchEvent(event);
+        }
         boolean val = mGestureDetector.onTouchEvent(event);
 
         // Check after call of mGestureDetector, so mCurrentFlingDirection and mCurrentScrollDirection are set.

library/src/main/res/values/attrs.xml

@@ -71,5 +71,7 @@
             <enum name="left" value="40"/>
             <enum name="right" value="80"/>
         </attr>
+
+        <attr name="enableZoom" format="boolean"/>
     </declare-styleable>
 </resources>

sample/src/main/res/layout/activity_base.xml

@@ -28,6 +28,7 @@
         app:todayHeaderTextColor="@color/accent"
         app:showBorderEvent="true"
         app:borderEventColor="@color/event_color_border"
-        app:borderEventThickness="5dp"/>
+        app:borderEventThickness="5dp"
+        app:enableZoom="false"/>
 
 </RelativeLayout>