Overall continuation of development

1 files changed, 27 insertions, 6 deletions

diff --git a/app/src/main/java/com/camilstaps/common/DisablableViewPager.java b/app/src/main/java/com/camilstaps/common/DisablableViewPager.java
index 1d39b0a..c2c033a 100644
--- a/app/src/main/java/com/camilstaps/common/DisablableViewPager.java
+++ b/app/src/main/java/com/camilstaps/common/DisablableViewPager.java
@@ -3,14 +3,16 @@ package com.camilstaps.common;
 import android.content.Context;
 import android.support.v4.view.ViewPager;
 import android.util.AttributeSet;
+import android.util.Log;
 import android.view.MotionEvent;
+import android.view.View;
 
 /**
  * Created by camilstaps on 15-4-15.
  */
 public class DisablableViewPager extends ViewPager {
 
-    private boolean enabled = true;
+    private boolean pagingEnabled = true;
 
     public DisablableViewPager(Context context) {
         super(context);
@@ -20,17 +22,36 @@ public class DisablableViewPager extends ViewPager {
         super(context, attrs);
     }
 
-    @Override
+    /*@Override
     public boolean onTouchEvent(MotionEvent event) {
-        return this.enabled && super.onTouchEvent(event);
-    }
+        int eventType = isRightSwipeTouchEvent(event);
+        Log.i("DVP", "Event: " + eventType);
+        switch (eventType) {
+            case SWIPE_LEFT:
+                if (pagingLeftEnabled) {
+                    return super.onTouchEvent(event);
+                } else {
+                    setCurrentItem(getCurrentItem());
+                    return false;
+                }
+            case SWIPE_RIGHT:
+                if (pagingRightEnabled) {
+                    return super.onTouchEvent(event);
+                } else {
+                    setCurrentItem(getCurrentItem());
+                    return false;
+                }
+            default:
+                return super.onTouchEvent(event);
+        }
+    }*/
 
     @Override
     public boolean onInterceptTouchEvent(MotionEvent event) {
-        return this.enabled && super.onInterceptTouchEvent(event);
+        return pagingEnabled && super.onInterceptTouchEvent(event);
     }
 
     public void setPagingEnabled(boolean set) {
-        enabled = set;
+        pagingEnabled = set;
     }
 }