Skip to content

Commit 8bc91b6

Browse files
daimajiadaimajia
committed
more elegant demo
1 parent c93c764 commit 8bc91b6

File tree

11 files changed

+138
-15
lines changed

11 files changed

+138
-15
lines changed

‎demo/src/main/java/com/daimajia/swipedemo/GridViewExample.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import android.widget.AdapterView;
88
import android.widget.GridView;
99

10-
import com.daimajia.swipe.SwipeAdapter;
1110
import com.daimajia.swipedemo.adapter.GridViewAdapter;
1211

1312
public class GridViewExample extends Activity{
@@ -18,7 +17,7 @@ protected void onCreate(Bundle savedInstanceState) {
1817
setContentView(R.layout.gridview);
1918
final GridView gridView = (GridView)findViewById(R.id.gridview);
2019
final GridViewAdapter adapter = new GridViewAdapter(this);
21-
adapter.setMode(SwipeAdapter.Mode.Multiple);
20+
2221
gridView.setAdapter(adapter);
2322
gridView.setSelected(false);
2423
gridView.setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() {

‎demo/src/main/java/com/daimajia/swipedemo/ListViewExample.java‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import android.widget.AdapterView;
1313
import android.widget.ListView;
1414

15-
import com.daimajia.swipe.SwipeAdapter;
15+
import com.daimajia.swipe.implments.SwipeItemMangerImpl;
1616
import com.daimajia.swipedemo.adapter.ListViewAdapter;
1717

1818
public class ListViewExample extends Activity {
@@ -25,9 +25,19 @@ protected void onCreate(Bundle savedInstanceState) {
2525
super.onCreate(savedInstanceState);
2626
setContentView(R.layout.listview);
2727
mListView = (ListView)findViewById(R.id.listview);
28+
29+
/**
30+
* The following comment is the sample usage of ArraySwipeAdapter.
31+
*/
32+
// String[] adapterData = new String[]{"Activity", "Service", "Content Provider", "Intent", "BroadcastReceiver", "ADT", "Sqlite3", "HttpClient",
33+
// "DDMS", "Android Studio", "Fragment", "Loader", "Activity", "Service", "Content Provider", "Intent",
34+
// "BroadcastReceiver", "ADT", "Sqlite3", "HttpClient", "Activity", "Service", "Content Provider", "Intent",
35+
// "BroadcastReceiver", "ADT", "Sqlite3", "HttpClient"};
36+
// mListView.setAdapter(new ArraySwipeAdapterSample<String>(this, R.layout.listview_item, R.id.position, adapterData));
37+
2838
mAdapter = new ListViewAdapter(this);
2939
mListView.setAdapter(mAdapter);
30-
mAdapter.setMode(SwipeAdapter.Mode.Single);
40+
mAdapter.setMode(SwipeItemMangerImpl.Mode.Single);
3141
mListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
3242
@Override
3343
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {

‎demo/src/main/java/com/daimajia/swipedemo/NestedExample.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public class NestedExample extends Activity{
99
@Override
1010
protected void onCreate(Bundle savedInstanceState) {
1111
super.onCreate(savedInstanceState);
12-
setContentView(R.layout.nested);
12+
setContentView(R.layout.complicate_layout);
1313
findViewById(R.id.hhhhh).setOnClickListener(new View.OnClickListener() {
1414
@Override
1515
public void onClick(View v) {

‎demo/src/main/java/com/daimajia/swipedemo/adapter/ArraySwipeAdapterSample.java‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
package com.daimajia.swipedemo.adapter;
2+
3+
import android.content.Context;
4+
5+
import com.daimajia.swipe.adapters.ArraySwipeAdapter;
6+
import com.daimajia.swipedemo.R;
7+
8+
import java.util.List;
9+
10+
/**
11+
* Sample usage of ArraySwipeAdapter.
12+
* @param <T>
13+
*/
14+
public class ArraySwipeAdapterSample<T> extends ArraySwipeAdapter {
15+
public ArraySwipeAdapterSample(Context context, int resource) {
16+
super(context, resource);
17+
}
18+
19+
public ArraySwipeAdapterSample(Context context, int resource, int textViewResourceId) {
20+
super(context, resource, textViewResourceId);
21+
}
22+
23+
public ArraySwipeAdapterSample(Context context, int resource, Object[] objects) {
24+
super(context, resource, objects);
25+
}
26+
27+
public ArraySwipeAdapterSample(Context context, int resource, int textViewResourceId, Object[] objects) {
28+
super(context, resource, textViewResourceId, objects);
29+
}
30+
31+
public ArraySwipeAdapterSample(Context context, int resource, List objects) {
32+
super(context, resource, objects);
33+
}
34+
35+
public ArraySwipeAdapterSample(Context context, int resource, int textViewResourceId, List objects) {
36+
super(context, resource, textViewResourceId, objects);
37+
}
38+
39+
@Override
40+
public int getSwipeLayoutResourceId(int position) {
41+
return R.id.swipe;
42+
}
43+
}

‎demo/src/main/java/com/daimajia/swipedemo/adapter/GridViewAdapter.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
import android.view.ViewGroup;
77
import android.widget.TextView;
88

9-
import com.daimajia.swipe.SwipeAdapter;
9+
import com.daimajia.swipe.adapters.BaseSwipeAdapter;
1010
import com.daimajia.swipedemo.R;
1111

12-
public class GridViewAdapter extends SwipeAdapter {
12+
public class GridViewAdapter extends BaseSwipeAdapter {
1313

1414
private Context mContext;
1515

‎demo/src/main/java/com/daimajia/swipedemo/adapter/ListViewAdapter.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88

99
import com.daimajia.androidanimations.library.Techniques;
1010
import com.daimajia.androidanimations.library.YoYo;
11+
import com.daimajia.swipe.adapters.BaseSwipeAdapter;
1112
import com.daimajia.swipe.SimpleSwipeListener;
12-
import com.daimajia.swipe.SwipeAdapter;
1313
import com.daimajia.swipe.SwipeLayout;
1414
import com.daimajia.swipedemo.R;
1515

16-
public class ListViewAdapter extends SwipeAdapter {
16+
public class ListViewAdapter extends BaseSwipeAdapter {
1717

1818
private Context mContext;
1919

‎demo/src/main/res/layout/complicate_layout.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
3+
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
4+
android:orientation="vertical"
5+
android:layout_width="match_parent" android:layout_height="match_parent">
6+
<include layout="@layout/sampe_nested_scrollview" android:layout_height="80dp" android:layout_width="match_parent"/>
7+
<include layout="@layout/sampe_nested_seekbar" android:layout_height="80dp" android:layout_width="match_parent" android:layout_marginTop="20dp"/>
8+
<include layout="@layout/sampe_nested_edittext" android:layout_height="80dp" android:layout_width="match_parent" android:layout_marginTop="20dp"/>
9+
</LinearLayout>

‎demo/src/main/res/layout/sampe_nested_edittext.xml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
3+
<com.daimajia.swipe.SwipeLayout xmlns:android="http://schemas.android.com/apk/res/android"
4+
android:layout_width="match_parent" android:layout_height="match_parent">
5+
<LinearLayout
6+
android:layout_width="80dp"
7+
android:layout_height="match_parent">
8+
<ImageView
9+
android:id="@+id/trash"
10+
android:src="@drawable/trash"
11+
android:layout_width="match_parent"
12+
android:background="#FF3B30"
13+
android:paddingLeft="25dp"
14+
android:paddingRight="25dp"
15+
android:layout_height="match_parent" />
16+
</LinearLayout>
17+
18+
<LinearLayout
19+
android:padding="10dp"
20+
android:background="#ffffff"
21+
android:layout_width="match_parent"
22+
android:layout_height="match_parent">
23+
<TextView
24+
android:text="EditText"
25+
android:layout_width="wrap_content"
26+
android:layout_height="wrap_content" />
27+
<EditText
28+
android:layout_gravity="right"
29+
android:layout_width="200dp"
30+
android:layout_height="wrap_content" />
31+
</LinearLayout>
32+
</com.daimajia.swipe.SwipeLayout>

‎demo/src/main/res/layout/nested.xml‎ renamed to ‎demo/src/main/res/layout/sampe_nested_scrollview.xml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22

33
<com.daimajia.swipe.SwipeLayout xmlns:android="http://schemas.android.com/apk/res/android"
4-
android:layout_width="match_parent" android:layout_height="80dp">
5-
4+
android:layout_width="match_parent" android:layout_height="match_parent">
65
<LinearLayout
7-
android:tag="Bottom3"
86
android:layout_width="80dp"
97
android:layout_height="match_parent">
108
<ScrollView
@@ -25,7 +23,7 @@
2523
android:layout_width="match_parent"
2624
android:layout_height="match_parent">
2725
<TextView
28-
android:text="Test ScrollView"
26+
android:text="ScrollView"
2927
android:layout_width="wrap_content"
3028
android:layout_height="wrap_content" />
3129
<ScrollView
@@ -47,7 +45,7 @@
4745
android:text="HelloWorld"
4846
android:layout_width="wrap_content"
4947
android:layout_height="wrap_content" />
50-
</LinearLayout>
48+
</LinearLayout>
5149

5250
</ScrollView>
5351
</LinearLayout>

‎demo/src/main/res/layout/sampe_nested_seekbar.xml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
3+
<com.daimajia.swipe.SwipeLayout xmlns:android="http://schemas.android.com/apk/res/android"
4+
android:layout_width="match_parent" android:layout_height="match_parent">
5+
<LinearLayout
6+
android:layout_width="80dp"
7+
android:layout_height="match_parent">
8+
<ImageView
9+
android:id="@+id/trash"
10+
android:src="@drawable/trash"
11+
android:layout_width="match_parent"
12+
android:background="#FF3B30"
13+
android:paddingLeft="25dp"
14+
android:paddingRight="25dp"
15+
android:layout_height="match_parent" />
16+
</LinearLayout>
17+
18+
<LinearLayout
19+
android:padding="10dp"
20+
android:background="#ffffff"
21+
android:layout_width="match_parent"
22+
android:layout_height="match_parent">
23+
<TextView
24+
android:text="SeekBar"
25+
android:layout_width="wrap_content"
26+
android:layout_height="wrap_content" />
27+
<SeekBar
28+
android:layout_gravity="center"
29+
android:layout_width="200dp"
30+
android:layout_height="wrap_content" />
31+
</LinearLayout>
32+
</com.daimajia.swipe.SwipeLayout>

0 commit comments

Comments
 (0)