Drag2d cleanup (#815)

* clean up drag2d

* fine tune 2d

Author: jafu888

demoProjects/Drag2D/app/src/main/java/android/support/drag2d/DragCardActivity.java

@@ -28,6 +28,8 @@
 import android.support.drag2d.lib.MaterialVelocity;
 import android.support.drag2d.lib.Velocity2D;
 import android.util.AttributeSet;
+import android.util.Log;
+
 import android.view.MotionEvent;
 import android.view.VelocityTracker;
 import android.view.View;
@@ -84,6 +86,9 @@ public class DragCardActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        int orientation = getResources().getConfiguration().orientation;
+        Log.v("MAIN","orientation =  "+orientation);
+
         requestWindowFeature(Window.FEATURE_ACTION_BAR);
         LinearLayout topCol = new LinearLayout(this);
         LinearLayout row = new LinearLayout(this);
@@ -92,7 +97,8 @@ protected void onCreate(Bundle savedInstanceState) {
         col.setOrientation(LinearLayout.VERTICAL);
         ScrollView scrollView = new ScrollView(this);
         CardMover m = new CardMover(this);
-        AppCompatButton[]buttons = new AppCompatButton[sEasingNames.length];
+        AppCompatButton[] buttons = new AppCompatButton[sEasingNames.length];
+
         for (int i = 0; i < sEasingNames.length; i++) {
             AppCompatButton b = new AppCompatButton(this);
             buttons[i] = b;
@@ -108,7 +114,8 @@ protected void onCreate(Bundle savedInstanceState) {
                 for (int j = 0; j < buttons.length; j++) {
                     Drawable draw = buttons[j].getBackground();
                     draw = draw.mutate();
-                    draw.setTint((mode == j)?0xff328855:0xffAA88AA);
+                    draw.setTint((mode == j) ? 0xff328855 : 0xffAA88AA);
+
                     buttons[j].setBackgroundDrawable(draw);
                 }
 
@@ -179,6 +186,9 @@ static class CardMover extends View {
         Paint mCardPaint = new Paint();
         MaterialVelocity.Easing easing = null;
         float[] points = new float[10000];
+        float[] mSegTime1 = new float[4];
+        float[] mSegTime2 = new float[4];
+
         Paint paint = new Paint();
         Paint paintDot = new Paint();
         private float mDuration;
@@ -230,6 +240,29 @@ protected void onDraw(Canvas canvas) {
                     startAnimationTime = 0;
                 }
                 canvas.drawLines(points, paint);
+
+
+                for (int i = 0; i < mSegTime1.length; i++) {
+                    float t = mSegTime1[i];
+                    if (Float.isNaN(t)) {
+                        break;
+                    }
+                    int mark = velocity2D.getPointOffsetX(points.length, t / mDuration);
+                    float x = points[mark], y = points[mark + 1];
+                    canvas.drawRoundRect(x - 10, y - 10, x + 10, y + 10, 20, 20, paint);
+                }
+
+                for (int i = 0; i < mSegTime2.length; i++) {
+                    float t = mSegTime2[i];
+                    if (Float.isNaN(t)) {
+                        break;
+                    }
+
+                    int mark = velocity2D.getPointOffsetY(points.length, t / mDuration);
+                    float x = points[mark], y = points[mark + 1];
+                    canvas.drawRoundRect(x - 10, y - 10, x + 10, y + 10, 20, 20, paint);
+                }
+
                 int xPos = velocity2D.getPointOffsetX(points.length, time / mDuration);
                 int yPos = velocity2D.getPointOffsetY(points.length, time / mDuration);
                 float x = points[xPos], y = points[xPos + 1];
@@ -242,8 +275,10 @@ protected void onDraw(Canvas canvas) {
 
             canvas.drawRoundRect(mCardX, mCardY, mCardX + getWidth() / 2, getHeight() + mCardY, rounding, rounding, mCardPaint);
             int scale = 128;
-            int ballX = mCardX + getWidth() / 4 - scale/2;
-            int ballY = mCardY + getHeight() / 2 - scale/2;
+
+            int ballX = mCardX + getWidth() / 4 - scale / 2;
+            int ballY = mCardY + getHeight() / 2 - scale / 2;
+
             ball.setBounds(ballX, ballY, ballX + scale, ballY + scale);
             ball.setTint(Color.CYAN);
             ball.draw(canvas);
@@ -294,6 +329,7 @@ public boolean onTouchEvent(MotionEvent event) {
                             duration, maxV, maxA,
                             easing);
                     velocity2D.getCurves(points, getWidth(), getHeight(), mGraphMode);
+                    velocity2D.getCurvesSegments(mSegTime1, mSegTime2);
                     mDuration = velocity2D.getDuration();
                     invalidate();
                     break;