refactor PtrIndicator

examine928 · Jan 21, 2015 · bb8d9be · bb8d9be
1 parent dd0971f
commit bb8d9be
Show file tree

Hide file tree

Showing 14 changed files with 305 additions and 215 deletions.
diff --git a/ptr-demo/src/in/srain/cube/views/ptr/demo/ui/storehouse/StoreHouseUsingString.java b/ptr-demo/src/in/srain/cube/views/ptr/demo/ui/storehouse/StoreHouseUsingString.java
@@ -15,6 +15,7 @@
 import in.srain.cube.views.ptr.PtrUIHandler;
 import in.srain.cube.views.ptr.demo.R;
 import in.srain.cube.views.ptr.header.StoreHouseHeader;
+import in.srain.cube.views.ptr.indicator.PtrIndicator;
 
 public class StoreHouseUsingString extends TitleBaseFragment {
 
@@ -74,7 +75,7 @@ public void onUIRefreshComplete(PtrFrameLayout frame) {
             }
 
             @Override
-            public void onUIPositionChange(PtrFrameLayout frame, boolean isUnderTouch, byte status, int oldPosition, int currentPosition, float oldPercent, float currentPercent) {
+            public void onUIPositionChange(PtrFrameLayout frame, boolean isUnderTouch, byte status, PtrIndicator ptrIndicator) {
 
             }
         });

diff --git a/ptr-demo/src/in/srain/cube/views/ptr/demo/ui/storehouse/StoreHouseUsingStringArray.java b/ptr-demo/src/in/srain/cube/views/ptr/demo/ui/storehouse/StoreHouseUsingStringArray.java
@@ -15,6 +15,7 @@
 import in.srain.cube.views.ptr.PtrUIHandler;
 import in.srain.cube.views.ptr.demo.R;
 import in.srain.cube.views.ptr.header.StoreHouseHeader;
+import in.srain.cube.views.ptr.indicator.PtrIndicator;
 
 public class StoreHouseUsingStringArray extends TitleBaseFragment {
 
@@ -91,7 +92,7 @@ public void onUIRefreshComplete(PtrFrameLayout frame) {
             }
 
             @Override
-            public void onUIPositionChange(PtrFrameLayout frame, boolean isUnderTouch, byte status, int oldPosition, int currentPosition, float oldPercent, float currentPercent) {
+            public void onUIPositionChange(PtrFrameLayout frame, boolean isUnderTouch, byte status, PtrIndicator ptrIndicator) {
 
             }
         });

diff --git a/ptr-lib/src/in/srain/cube/views/ptr/PtrClassicDefaultHeader.java b/ptr-lib/src/in/srain/cube/views/ptr/PtrClassicDefaultHeader.java
@@ -11,6 +11,7 @@
 import android.view.animation.RotateAnimation;
 import android.widget.FrameLayout;
 import android.widget.TextView;
+import in.srain.cube.views.ptr.indicator.PtrIndicator;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -223,8 +224,12 @@ private String getLastUpdateTime() {
     }
 
     @Override
-    public void onUIPositionChange(PtrFrameLayout frame, boolean isUnderTouch, byte status, int lastPos, int currentPos, float oldPercent, float currentPercent) {
+    public void onUIPositionChange(PtrFrameLayout frame, boolean isUnderTouch, byte status, PtrIndicator ptrIndicator) {
+
         final int mOffsetToRefresh = frame.getOffsetToRefresh();
+        final int currentPos = ptrIndicator.getCurrentPosY();
+        final int lastPos = ptrIndicator.getLastPosY();
+
         if (currentPos < mOffsetToRefresh && lastPos >= mOffsetToRefresh) {
             if (isUnderTouch && status == PtrFrameLayout.PTR_STATUS_PREPARE) {
                 crossRotateLineFromBottomUnderTouch(frame);

diff --git a/ptr-lib/src/in/srain/cube/views/ptr/PtrFrameLayout.java b/ptr-lib/src/in/srain/cube/views/ptr/PtrFrameLayout.java
diff --git a/ptr-lib/src/in/srain/cube/views/ptr/PtrResistanceSlider.java b/ptr-lib/src/in/srain/cube/views/ptr/PtrResistanceSlider.java
diff --git a/ptr-lib/src/in/srain/cube/views/ptr/PtrSlider.java b/ptr-lib/src/in/srain/cube/views/ptr/PtrSlider.java
diff --git a/ptr-lib/src/in/srain/cube/views/ptr/PtrTensionSlider.java b/ptr-lib/src/in/srain/cube/views/ptr/PtrTensionSlider.java
diff --git a/ptr-lib/src/in/srain/cube/views/ptr/PtrUIHandler.java b/ptr-lib/src/in/srain/cube/views/ptr/PtrUIHandler.java
@@ -1,5 +1,7 @@
 package in.srain.cube.views.ptr;
 
+import in.srain.cube.views.ptr.indicator.PtrIndicator;
+
 /**
  *
  */
@@ -29,5 +31,5 @@ public interface PtrUIHandler {
      */
     public void onUIRefreshComplete(PtrFrameLayout frame);
 
-    public void onUIPositionChange(PtrFrameLayout frame, boolean isUnderTouch, byte status, int oldPosition, int currentPosition, float oldPercent, float currentPercent);
+    public void onUIPositionChange(PtrFrameLayout frame, boolean isUnderTouch, byte status, PtrIndicator ptrIndicator);
 }
diff --git a/ptr-lib/src/in/srain/cube/views/ptr/PtrUIHandlerHolder.java b/ptr-lib/src/in/srain/cube/views/ptr/PtrUIHandlerHolder.java
@@ -1,8 +1,6 @@
 package in.srain.cube.views.ptr;
 
-import in.srain.cube.util.CLog;
-
-import java.lang.ref.WeakReference;
+import in.srain.cube.views.ptr.indicator.PtrIndicator;
 
 /**
  * A single linked list to wrap PtrUIHandler
@@ -146,12 +144,12 @@ public void onUIRefreshComplete(PtrFrameLayout frame) {
     }
 
     @Override
-    public void onUIPositionChange(PtrFrameLayout frame, boolean isUnderTouch, byte status, int oldPosition, int currentPosition, float oldPercent, float currentPercent) {
+    public void onUIPositionChange(PtrFrameLayout frame, boolean isUnderTouch, byte status, PtrIndicator ptrIndicator) {
         PtrUIHandlerHolder current = this;
         do {
             final PtrUIHandler handler = current.getHandler();
             if (null != handler) {
-                handler.onUIPositionChange(frame, isUnderTouch, status, oldPosition, currentPosition, oldPercent, currentPercent);
+                handler.onUIPositionChange(frame, isUnderTouch, status, ptrIndicator);
             }
         } while ((current = current.mNext) != null);
     }

diff --git a/ptr-lib/src/in/srain/cube/views/ptr/header/MaterialHeader.java b/ptr-lib/src/in/srain/cube/views/ptr/header/MaterialHeader.java
@@ -12,6 +12,7 @@
 import in.srain.cube.views.ptr.PtrFrameLayout;
 import in.srain.cube.views.ptr.PtrUIHandlerHook;
 import in.srain.cube.views.ptr.PtrUIHandler;
+import in.srain.cube.views.ptr.indicator.PtrIndicator;
 
 public class MaterialHeader extends View implements PtrUIHandler {
 
@@ -160,8 +161,9 @@ public void onUIRefreshComplete(PtrFrameLayout frame) {
     }
 
     @Override
-    public void onUIPositionChange(PtrFrameLayout frame, boolean isUnderTouch, byte status, int oldPosition, int currentPosition, float oldPercent, float currentPercent) {
-        float percent = Math.min(1f, currentPercent);
+    public void onUIPositionChange(PtrFrameLayout frame, boolean isUnderTouch, byte status, PtrIndicator ptrIndicator) {
+
+        float percent = Math.min(1f, ptrIndicator.getCurrentPercent());
 
         if (status == PtrFrameLayout.PTR_STATUS_PREPARE) {
             mDrawable.setAlpha((int) (255 * percent));

diff --git a/ptr-lib/src/in/srain/cube/views/ptr/header/RentalsSunHeaderView.java b/ptr-lib/src/in/srain/cube/views/ptr/header/RentalsSunHeaderView.java
@@ -6,8 +6,9 @@
 import android.util.AttributeSet;
 import android.view.View;
 import in.srain.cube.views.ptr.PtrFrameLayout;
-import in.srain.cube.views.ptr.PtrTensionSlider;
+import in.srain.cube.views.ptr.indicator.PtrTensionIndicator;
 import in.srain.cube.views.ptr.PtrUIHandler;
+import in.srain.cube.views.ptr.indicator.PtrIndicator;
 import in.srain.cube.views.ptr.util.PtrLocalDisplay;
 
 public class RentalsSunHeaderView extends View implements PtrUIHandler {
@@ -32,8 +33,8 @@ public RentalsSunHeaderView(Context context, AttributeSet attrs) {
 
     public void setUp(PtrFrameLayout ptrFrameLayout) {
         mPtrFrameLayout = ptrFrameLayout;
-        PtrTensionSlider slider = new PtrTensionSlider();
-        mPtrFrameLayout.setPtrSlider(slider);
+        PtrTensionIndicator slider = new PtrTensionIndicator();
+        mPtrFrameLayout.setPtrIndicator(slider);
     }
 
     private void init() {
@@ -81,11 +82,12 @@ public void onUIRefreshComplete(PtrFrameLayout frame) {
     }
 
     @Override
-    public void onUIPositionChange(PtrFrameLayout frame, boolean isUnderTouch, byte status, int oldPosition, int currentPosition, float oldPercent, float currentPercent) {
-        float percent = Math.min(1f, currentPercent);
+    public void onUIPositionChange(PtrFrameLayout frame, boolean isUnderTouch, byte status, PtrIndicator ptrIndicator) {
+
+        float percent = Math.min(1f, ptrIndicator.getCurrentPercent());
 
         if (status == PtrFrameLayout.PTR_STATUS_PREPARE) {
-            mDrawable.offsetTopAndBottom(currentPosition);
+            mDrawable.offsetTopAndBottom(ptrIndicator.getCurrentPosY());
             mDrawable.setPercent(percent);
             invalidate();
         }

diff --git a/ptr-lib/src/in/srain/cube/views/ptr/header/StoreHouseHeader.java b/ptr-lib/src/in/srain/cube/views/ptr/header/StoreHouseHeader.java
@@ -10,6 +10,7 @@
 import android.view.animation.Transformation;
 import in.srain.cube.views.ptr.PtrFrameLayout;
 import in.srain.cube.views.ptr.PtrUIHandler;
+import in.srain.cube.views.ptr.indicator.PtrIndicator;
 import in.srain.cube.views.ptr.util.PtrLocalDisplay;
 
 import java.util.ArrayList;
@@ -266,8 +267,9 @@ public void onUIRefreshComplete(PtrFrameLayout frame) {
     }
 
     @Override
-    public void onUIPositionChange(PtrFrameLayout frame, boolean isUnderTouch, byte status, int oldPosition, int currentPosition, float oldPercent, float currentPercent) {
-        currentPercent = Math.min(1f, currentPercent);
+    public void onUIPositionChange(PtrFrameLayout frame, boolean isUnderTouch, byte status, PtrIndicator ptrIndicator) {
+
+        float currentPercent = Math.min(1f, ptrIndicator.getCurrentPercent());
         setProgress(currentPercent);
         invalidate();
     }