From f1f11d99d8fc5090e41dd95c6ef6bb09e445a447 Mon Sep 17 00:00:00 2001 From: daimajia Date: Mon, 25 Aug 2014 17:29:40 +0800 Subject: [PATCH] fix #1 --- demo/build.gradle | 7 +- .../com/daimajia/swipedemo/MyActivity.java | 55 +++--------- demo/src/main/res/layout/sample_together.xml | 85 +++---------------- demo/src/main/res/values/styles.xml | 2 +- library/build.gradle | 4 +- library/gradle-mvn-push.gradle | 5 -- 6 files changed, 33 insertions(+), 125 deletions(-) diff --git a/demo/build.gradle b/demo/build.gradle index 5af1de8..8aff86a 100644 --- a/demo/build.gradle +++ b/demo/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 18 + compileSdkVersion 20 buildToolsVersion "20.0.0" defaultConfig { applicationId "com.daimajia.swipedemo" - minSdkVersion 18 - targetSdkVersion 18 + minSdkVersion 8 + targetSdkVersion 20 versionCode 1 versionName "1.0" } @@ -25,4 +25,5 @@ dependencies { compile 'com.nineoldandroids:library:2.4.0' compile 'com.daimajia.easing:library:1.0.0@aar' compile 'com.daimajia.androidanimations:library:1.1.2@aar' + compile 'com.nineoldandroids:library:2.4.0' } diff --git a/demo/src/main/java/com/daimajia/swipedemo/MyActivity.java b/demo/src/main/java/com/daimajia/swipedemo/MyActivity.java index 0f40be4..685929d 100644 --- a/demo/src/main/java/com/daimajia/swipedemo/MyActivity.java +++ b/demo/src/main/java/com/daimajia/swipedemo/MyActivity.java @@ -10,6 +10,7 @@ import android.view.View; import android.widget.Toast; import com.daimajia.swipe.SwipeLayout; +import com.nineoldandroids.view.ViewHelper; public class MyActivity extends Activity { @@ -23,7 +24,8 @@ public class MyActivity extends Activity { SwipeLayout swipeLayout = (SwipeLayout)findViewById(R.id.godfather); swipeLayout.setDragEdge(SwipeLayout.DragEdge.Bottom); - // + //sample1 + sample1 = (SwipeLayout)findViewById(R.id.sample1); sample1.setShowMode(SwipeLayout.ShowMode.LayDown); sample1.setDragEdge(SwipeLayout.DragEdge.Left); @@ -34,6 +36,8 @@ public class MyActivity extends Activity { } }); + //sample2 + sample2 = (SwipeLayout)findViewById(R.id.sample2); sample2.setShowMode(SwipeLayout.ShowMode.LayDown); sample2.setShowMode(SwipeLayout.ShowMode.PullOut); @@ -57,12 +61,6 @@ public class MyActivity extends Activity { Toast.makeText(MyActivity.this, "Magnifier", Toast.LENGTH_SHORT).show(); } }); -// sample2.addRevealListener(new int[]{R.id.magnifier, R.id.star, R.id.trash}, new SwipeLayout.OnRevealListener() { -// @Override -// public void onReveal(View child, SwipeLayout.DragEdge edge, float fraction, int distance) { -// child.setScaleX(fraction); -// } -// }); sample2.findViewById(R.id.click).setOnClickListener(new View.OnClickListener() { @Override @@ -71,6 +69,7 @@ public class MyActivity extends Activity { } }); + //sample3 sample3 = (SwipeLayout)findViewById(R.id.sample3); sample3.setDragEdge(SwipeLayout.DragEdge.Top); @@ -79,9 +78,9 @@ public class MyActivity extends Activity { public void onReveal(View child, SwipeLayout.DragEdge edge, float fraction, int distance) { View star = child.findViewById(R.id.star); float d = child.getHeight() / 2 - star.getHeight() / 2; - star.setTranslationY(d * fraction); - star.setScaleX(fraction+0.6f); - star.setScaleY(fraction+0.6f); + ViewHelper.setTranslationY(star, d * fraction); + ViewHelper.setScaleX(star, fraction + 0.6f); + ViewHelper.setScaleY(star, fraction + 0.6f); int c = (Integer)evaluate(fraction, Color.parseColor("#dddddd"), Color.parseColor("#4C535B")); child.setBackgroundColor(c); } @@ -93,39 +92,6 @@ public class MyActivity extends Activity { } }); -// final int[] res = new int[]{R.id.changeLeft, R.id.changeRight, R.id.changeTop, R.id.changeBottom}; -// final SwipeLayout.DragEdge[] edges = new SwipeLayout.DragEdge[]{SwipeLayout.DragEdge.Left, SwipeLayout.DragEdge.Right, SwipeLayout.DragEdge.Top, SwipeLayout.DragEdge.Bottom}; -// final SwipeLayout[] layouts = new SwipeLayout[]{sample1,sample2,sample3}; -// for(int i = 0; i < res.length; i++){ -// findViewById(res[i]).setTag(edges[i]); -// findViewById(res[i]).setOnClickListener(new View.OnClickListener() { -// @Override -// public void onClick(View v) { -// for (SwipeLayout l : layouts) { -// l.setDragEdge((SwipeLayout.DragEdge) v.getTag()); -// } -// } -// }); -// } -// -// findViewById(R.id.pullout).setOnClickListener(new View.OnClickListener() { -// @Override -// public void onClick(View v) { -// for (SwipeLayout l : layouts) { -// l.setShowMode(SwipeLayout.ShowMode.PullOut); -// } -// } -// }); -// -// findViewById(R.id.laydown).setOnClickListener(new View.OnClickListener() { -// @Override -// public void onClick(View v) { -// for(SwipeLayout l : layouts){ -// l.setShowMode(SwipeLayout.ShowMode.LayDown); -// } -// } -// }); - } @Override @@ -151,6 +117,9 @@ public class MyActivity extends Activity { return super.onOptionsItemSelected(item); } + /* + Color transition method. + */ public Object evaluate(float fraction, Object startValue, Object endValue) { int startInt = (Integer) startValue; int startA = (startInt >> 24) & 0xff; diff --git a/demo/src/main/res/layout/sample_together.xml b/demo/src/main/res/layout/sample_together.xml index 629d3e7..7b3daaf 100644 --- a/demo/src/main/res/layout/sample_together.xml +++ b/demo/src/main/res/layout/sample_together.xml @@ -1,77 +1,20 @@ - - + android:orientation="vertical" + android:layout_height="match_parent" + android:padding="10dp"> - + - + - + - -