diff --git a/demo/build.gradle b/demo/build.gradle index b71424c..783aa73 100644 --- a/demo/build.gradle +++ b/demo/build.gradle @@ -1,5 +1,9 @@ apply plugin: 'com.android.application' +repositories { + jcenter() +} + android { compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION) buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION @@ -20,8 +24,10 @@ android { dependencies { compile project(":library") - compile 'com.nineoldandroids:library:2.4.0' + compile 'com.android.support:recyclerview-v7:21.0.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' + // This dude gave a shoutout to you (daimajia) on his github page: + compile 'jp.wasabeef:recyclerview-animators:1.0.3@aar' } diff --git a/demo/src/main/AndroidManifest.xml b/demo/src/main/AndroidManifest.xml index 3415667..0f57bf1 100644 --- a/demo/src/main/AndroidManifest.xml +++ b/demo/src/main/AndroidManifest.xml @@ -1,24 +1,28 @@ + xmlns:tools="http://schemas.android.com/tools" + package="com.daimajia.swipedemo"> + + + android:theme="@style/AppTheme"> + android:label="@string/app_name"> - - - + + + + diff --git a/demo/src/main/java/com/daimajia/swipedemo/GridViewExample.java b/demo/src/main/java/com/daimajia/swipedemo/GridViewExample.java index 8e79c45..ff46588 100644 --- a/demo/src/main/java/com/daimajia/swipedemo/GridViewExample.java +++ b/demo/src/main/java/com/daimajia/swipedemo/GridViewExample.java @@ -8,6 +8,7 @@ import android.widget.AdapterView; import android.widget.GridView; import com.daimajia.swipe.implments.SwipeItemMangerImpl; +import com.daimajia.swipe.util.Attributes; import com.daimajia.swipedemo.adapter.GridViewAdapter; public class GridViewExample extends Activity{ @@ -18,7 +19,7 @@ public class GridViewExample extends Activity{ setContentView(R.layout.gridview); final GridView gridView = (GridView)findViewById(R.id.gridview); final GridViewAdapter adapter = new GridViewAdapter(this); - adapter.setMode(SwipeItemMangerImpl.Mode.Multiple); + adapter.setMode(Attributes.Mode.Multiple); gridView.setAdapter(adapter); gridView.setSelected(false); gridView.setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() { diff --git a/demo/src/main/java/com/daimajia/swipedemo/ListViewExample.java b/demo/src/main/java/com/daimajia/swipedemo/ListViewExample.java index a811b28..ab6edf4 100644 --- a/demo/src/main/java/com/daimajia/swipedemo/ListViewExample.java +++ b/demo/src/main/java/com/daimajia/swipedemo/ListViewExample.java @@ -1,8 +1,10 @@ package com.daimajia.swipedemo; +import android.app.ActionBar; import android.app.Activity; import android.content.Context; import android.content.Intent; +import android.os.Build; import android.os.Bundle; import android.util.Log; import android.view.Menu; @@ -16,6 +18,7 @@ import android.widget.Toast; import com.daimajia.swipe.SwipeLayout; import com.daimajia.swipe.implments.SwipeItemMangerImpl; +import com.daimajia.swipe.util.Attributes; import com.daimajia.swipedemo.adapter.ListViewAdapter; public class ListViewExample extends Activity { @@ -23,11 +26,18 @@ public class ListViewExample extends Activity { private ListView mListView; private ListViewAdapter mAdapter; private Context mContext = this; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.listview); - mListView = (ListView)findViewById(R.id.listview); + mListView = (ListView) findViewById(R.id.listview); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) { + ActionBar actionBar = getActionBar(); + if (actionBar != null) { + actionBar.setTitle("ListView"); + } + } /** * The following comment is the sample usage of ArraySwipeAdapter. @@ -40,7 +50,7 @@ public class ListViewExample extends Activity { mAdapter = new ListViewAdapter(this); mListView.setAdapter(mAdapter); - mAdapter.setMode(SwipeItemMangerImpl.Mode.Single); + mAdapter.setMode(Attributes.Mode.Single); mListView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override public void onItemClick(AdapterView parent, View view, int position, long id) { @@ -50,7 +60,7 @@ public class ListViewExample extends Activity { mListView.setOnTouchListener(new View.OnTouchListener() { @Override public boolean onTouch(View v, MotionEvent event) { - Log.e("ListView","OnTouch"); + Log.e("ListView", "OnTouch"); return false; } }); @@ -64,7 +74,7 @@ public class ListViewExample extends Activity { mListView.setOnScrollListener(new AbsListView.OnScrollListener() { @Override public void onScrollStateChanged(AbsListView view, int scrollState) { - Log.e("ListView","onScrollStateChanged"); + Log.e("ListView", "onScrollStateChanged"); } @Override @@ -105,10 +115,14 @@ public class ListViewExample extends Activity { startActivity(new Intent(this, ListViewExample.class)); finish(); return true; - }else if(id == R.id.action_gridview){ + } else if (id == R.id.action_gridview) { startActivity(new Intent(this, GridViewExample.class)); finish(); return true; + } else if (id == R.id.action_recycler) { + startActivity(new Intent(this, RecyclerViewExample.class)); + finish(); + return true; } return super.onOptionsItemSelected(item); } diff --git a/demo/src/main/java/com/daimajia/swipedemo/MyActivity.java b/demo/src/main/java/com/daimajia/swipedemo/MyActivity.java index 18fb36f..f2aaff7 100644 --- a/demo/src/main/java/com/daimajia/swipedemo/MyActivity.java +++ b/demo/src/main/java/com/daimajia/swipedemo/MyActivity.java @@ -113,9 +113,11 @@ public class MyActivity extends Activity { } else if (id == R.id.action_gridview) { startActivity(new Intent(this, GridViewExample.class)); return true; - } else if(id == R.id.action_nexted){ + } else if (id == R.id.action_nested) { startActivity(new Intent(this, NestedExample.class)); return true; + } else if (id == R.id.action_recycler) { + startActivity(new Intent(this, RecyclerViewExample.class)); } return super.onOptionsItemSelected(item); } diff --git a/demo/src/main/java/com/daimajia/swipedemo/RecyclerViewExample.java b/demo/src/main/java/com/daimajia/swipedemo/RecyclerViewExample.java new file mode 100644 index 0000000..2c34426 --- /dev/null +++ b/demo/src/main/java/com/daimajia/swipedemo/RecyclerViewExample.java @@ -0,0 +1,112 @@ +package com.daimajia.swipedemo; + +import android.app.ActionBar; +import android.app.Activity; +import android.content.Context; +import android.content.Intent; +import android.os.Build; +import android.os.Bundle; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; +import android.util.Log; +import android.view.Menu; +import android.view.MenuItem; + +import com.daimajia.swipe.util.Attributes; +import com.daimajia.swipedemo.adapter.RecyclerViewAdapter; +import com.daimajia.swipedemo.adapter.util.DividerItemDecoration; + +import java.util.ArrayList; +import java.util.Arrays; + +import jp.wasabeef.recyclerview.animators.FadeInLeftAnimator; + +public class RecyclerViewExample extends Activity { + + /** + * RecyclerView: The new recycler view replaces the list view. Its more modular and therefore we + * must implement some of the functionality ourselves and attach it to our recyclerview. + *

+ * 1) Position items on the screen: This is done with LayoutManagers + * 2) Animate & Decorate views: This is done with ItemAnimators & ItemDecorators + * 3) Handle any touch events apart from scrolling: This is now done in our adapter's ViewHolder + */ + + private RecyclerView recyclerView; + private RecyclerView.Adapter mAdapter; + + private ArrayList mDataSet; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.recyclerview); + recyclerView = (RecyclerView) findViewById(R.id.recycler_view); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) { + ActionBar actionBar = getActionBar(); + if (actionBar != null) { + actionBar.setTitle("RecyclerView"); + } + } + + // Layout Managers: + recyclerView.setLayoutManager(new LinearLayoutManager(this)); + + // Item Decorator: + recyclerView.addItemDecoration(new DividerItemDecoration(getResources().getDrawable(R.drawable.divider))); + recyclerView.setItemAnimator(new FadeInLeftAnimator()); + + // Adapter: + String[] adapterData = new String[]{"Alabama", "Alaska", "Arizona", "Arkansas", "California", "Colorado", "Connecticut", "Delaware", "Florida", "Georgia", "Hawaii", "Idaho", "Illinois", "Indiana", "Iowa", "Kansas", "Kentucky", "Louisiana", "Maine", "Maryland", "Massachusetts", "Michigan", "Minnesota", "Mississippi", "Missouri", "Montana", "Nebraska", "Nevada", "New Hampshire", "New Jersey", "New Mexico", "New York", "North Carolina", "North Dakota", "Ohio", "Oklahoma", "Oregon", "Pennsylvania", "Rhode Island", "South Carolina", "South Dakota", "Tennessee", "Texas", "Utah", "Vermont", "Virginia", "Washington", "West Virginia", "Wisconsin", "Wyoming"}; + mDataSet = new ArrayList(Arrays.asList(adapterData)); + mAdapter = new RecyclerViewAdapter(this, mDataSet); + ((RecyclerViewAdapter) mAdapter).setMode(Attributes.Mode.Single); + recyclerView.setAdapter(mAdapter); + + /* Listeners */ + recyclerView.setOnScrollListener(onScrollListener); + } + + /** + * Substitute for our onScrollListener for RecyclerView + */ + RecyclerView.OnScrollListener onScrollListener = new RecyclerView.OnScrollListener() { + @Override + public void onScrollStateChanged(RecyclerView recyclerView, int newState) { + super.onScrollStateChanged(recyclerView, newState); + Log.e("ListView", "onScrollStateChanged"); + } + + @Override + public void onScrolled(RecyclerView recyclerView, int dx, int dy) { + super.onScrolled(recyclerView, dx, dy); + // Could hide open views here if you wanted. // + } + }; + + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + // Inflate the menu; this adds items to the action bar if it is present. + getMenuInflater().inflate(R.menu.my, menu); + return true; + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + // Handle action bar item clicks here. The action bar will + // automatically handle clicks on the Home/Up button, so long + // as you specify a parent activity in AndroidManifest.xml. + int id = item.getItemId(); + if (id == R.id.action_listview) { + startActivity(new Intent(this, ListViewExample.class)); + finish(); + return true; + } else if (id == R.id.action_gridview) { + startActivity(new Intent(this, GridViewExample.class)); + finish(); + return true; + } + return super.onOptionsItemSelected(item); + } +} diff --git a/demo/src/main/java/com/daimajia/swipedemo/adapter/RecyclerViewAdapter.java b/demo/src/main/java/com/daimajia/swipedemo/adapter/RecyclerViewAdapter.java new file mode 100644 index 0000000..206733b --- /dev/null +++ b/demo/src/main/java/com/daimajia/swipedemo/adapter/RecyclerViewAdapter.java @@ -0,0 +1,105 @@ +package com.daimajia.swipedemo.adapter; + +import android.content.Context; +import android.support.v7.widget.RecyclerView; +import android.util.Log; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.Button; +import android.widget.TextView; +import android.widget.Toast; + +import com.daimajia.androidanimations.library.Techniques; +import com.daimajia.androidanimations.library.YoYo; +import com.daimajia.swipe.SimpleSwipeListener; +import com.daimajia.swipe.SwipeLayout; +import com.daimajia.swipe.adapters.RecyclerSwipeAdapter; +import com.daimajia.swipe.implments.SwipeItemRecyclerMangerImpl; +import com.daimajia.swipedemo.R; + +import java.util.ArrayList; + +public class RecyclerViewAdapter extends RecyclerSwipeAdapter { + + public static class SimpleViewHolder extends RecyclerView.ViewHolder { + SwipeLayout swipeLayout; + TextView textViewPos; + TextView textViewData; + Button buttonDelete; + + public SimpleViewHolder(View itemView) { + super(itemView); + swipeLayout = (SwipeLayout) itemView.findViewById(R.id.swipe); + textViewPos = (TextView) itemView.findViewById(R.id.position); + textViewData = (TextView) itemView.findViewById(R.id.text_data); + buttonDelete = (Button) itemView.findViewById(R.id.delete); + + itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + Log.d(getClass().getSimpleName(), "onItemSelected: " + textViewData.getText().toString()); + Toast.makeText(view.getContext(), "onItemSelected: " + textViewData.getText().toString(), Toast.LENGTH_SHORT).show(); + } + }); + } + } + + private Context mContext; + private ArrayList mDataset; + + //protected SwipeItemRecyclerMangerImpl mItemManger = new SwipeItemRecyclerMangerImpl(this); + + public RecyclerViewAdapter(Context context, ArrayList objects) { + this.mContext = context; + this.mDataset = objects; + } + + @Override + public SimpleViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { + View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.recyclerview_item, parent, false); + return new SimpleViewHolder(view); + } + + @Override + public void onBindViewHolder(final SimpleViewHolder viewHolder, final int position) { + String item = mDataset.get(position); + viewHolder.swipeLayout.setShowMode(SwipeLayout.ShowMode.LayDown); + viewHolder.swipeLayout.addSwipeListener(new SimpleSwipeListener() { + @Override + public void onOpen(SwipeLayout layout) { + YoYo.with(Techniques.Tada).duration(500).delay(100).playOn(layout.findViewById(R.id.trash)); + } + }); + viewHolder.swipeLayout.setOnDoubleClickListener(new SwipeLayout.DoubleClickListener() { + @Override + public void onDoubleClick(SwipeLayout layout, boolean surface) { + Toast.makeText(mContext, "DoubleClick", Toast.LENGTH_SHORT).show(); + } + }); + viewHolder.buttonDelete.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + mItemManger.removeShownLayouts(viewHolder.swipeLayout); + mDataset.remove(position); + notifyItemRemoved(position); + notifyItemRangeChanged(position, mDataset.size()); + mItemManger.closeAllItems(); + Toast.makeText(view.getContext(), "Deleted " + viewHolder.textViewData.getText().toString() + "!", Toast.LENGTH_SHORT).show(); + } + }); + viewHolder.textViewPos.setText((position + 1) + "."); + viewHolder.textViewData.setText(item); + mItemManger.bindView(viewHolder.itemView, position); + } + + @Override + public int getItemCount() { + return mDataset.size(); + } + + @Override + public int getSwipeLayoutResourceId(int position) { + return R.id.swipe; + } +} diff --git a/demo/src/main/java/com/daimajia/swipedemo/adapter/util/DividerItemDecoration.java b/demo/src/main/java/com/daimajia/swipedemo/adapter/util/DividerItemDecoration.java new file mode 100644 index 0000000..85b5b3d --- /dev/null +++ b/demo/src/main/java/com/daimajia/swipedemo/adapter/util/DividerItemDecoration.java @@ -0,0 +1,125 @@ +package com.daimajia.swipedemo.adapter.util; + +import android.content.Context; +import android.content.res.TypedArray; +import android.graphics.Canvas; +import android.graphics.Rect; +import android.graphics.drawable.Drawable; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; +import android.util.AttributeSet; +import android.view.View; + +public class DividerItemDecoration extends RecyclerView.ItemDecoration { + + private Drawable mDivider; + private boolean mShowFirstDivider = false; + private boolean mShowLastDivider = false; + + + public DividerItemDecoration(Context context, AttributeSet attrs) { + final TypedArray a = context + .obtainStyledAttributes(attrs, new int[]{android.R.attr.listDivider}); + mDivider = a.getDrawable(0); + a.recycle(); + } + + public DividerItemDecoration(Context context, AttributeSet attrs, boolean showFirstDivider, + boolean showLastDivider) { + this(context, attrs); + mShowFirstDivider = showFirstDivider; + mShowLastDivider = showLastDivider; + } + + public DividerItemDecoration(Drawable divider) { + mDivider = divider; + } + + public DividerItemDecoration(Drawable divider, boolean showFirstDivider, + boolean showLastDivider) { + this(divider); + mShowFirstDivider = showFirstDivider; + mShowLastDivider = showLastDivider; + } + + @Override + public void getItemOffsets(Rect outRect, View view, RecyclerView parent, + RecyclerView.State state) { + super.getItemOffsets(outRect, view, parent, state); + if (mDivider == null) { + return; + } + if (parent.getChildPosition(view) < 1) { + return; + } + + if (getOrientation(parent) == LinearLayoutManager.VERTICAL) { + outRect.top = mDivider.getIntrinsicHeight(); + } else { + outRect.left = mDivider.getIntrinsicWidth(); + } + } + + @Override + public void onDrawOver(Canvas c, RecyclerView parent, RecyclerView.State state) { + if (mDivider == null) { + super.onDrawOver(c, parent, state); + return; + } + + // Initialization needed to avoid compiler warning + int left = 0, right = 0, top = 0, bottom = 0, size; + int orientation = getOrientation(parent); + int childCount = parent.getChildCount(); + + if (orientation == LinearLayoutManager.VERTICAL) { + size = mDivider.getIntrinsicHeight(); + left = parent.getPaddingLeft(); + right = parent.getWidth() - parent.getPaddingRight(); + } else { //horizontal + size = mDivider.getIntrinsicWidth(); + top = parent.getPaddingTop(); + bottom = parent.getHeight() - parent.getPaddingBottom(); + } + + for (int i = mShowFirstDivider ? 0 : 1; i < childCount; i++) { + View child = parent.getChildAt(i); + RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) child.getLayoutParams(); + + if (orientation == LinearLayoutManager.VERTICAL) { + top = child.getTop() - params.topMargin; + bottom = top + size; + } else { //horizontal + left = child.getLeft() - params.leftMargin; + right = left + size; + } + mDivider.setBounds(left, top, right, bottom); + mDivider.draw(c); + } + + // show last divider + if (mShowLastDivider && childCount > 0) { + View child = parent.getChildAt(childCount - 1); + RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) child.getLayoutParams(); + if (orientation == LinearLayoutManager.VERTICAL) { + top = child.getBottom() + params.bottomMargin; + bottom = top + size; + } else { // horizontal + left = child.getRight() + params.rightMargin; + right = left + size; + } + mDivider.setBounds(left, top, right, bottom); + mDivider.draw(c); + } + } + + private int getOrientation(RecyclerView parent) { + if (parent.getLayoutManager() instanceof LinearLayoutManager) { + LinearLayoutManager layoutManager = (LinearLayoutManager) parent.getLayoutManager(); + return layoutManager.getOrientation(); + } else { + throw new IllegalStateException( + "DividerItemDecoration can only be used with a LinearLayoutManager."); + } + } +} \ No newline at end of file diff --git a/demo/src/main/java/com/daimajia/swipedemo/adapter/util/RecyclerItemClickListener.java b/demo/src/main/java/com/daimajia/swipedemo/adapter/util/RecyclerItemClickListener.java new file mode 100644 index 0000000..af4021b --- /dev/null +++ b/demo/src/main/java/com/daimajia/swipedemo/adapter/util/RecyclerItemClickListener.java @@ -0,0 +1,40 @@ +package com.daimajia.swipedemo.adapter.util; + +import android.content.Context; +import android.support.v7.widget.RecyclerView; +import android.view.GestureDetector; +import android.view.MotionEvent; +import android.view.View; + +public class RecyclerItemClickListener implements RecyclerView.OnItemTouchListener { + private OnItemClickListener mListener; + + public interface OnItemClickListener { + public void onItemClick(View view, int position); + } + + GestureDetector mGestureDetector; + + public RecyclerItemClickListener(Context context, OnItemClickListener listener) { + mListener = listener; + mGestureDetector = new GestureDetector(context, new GestureDetector.SimpleOnGestureListener() { + @Override + public boolean onSingleTapUp(MotionEvent e) { + return true; + } + }); + } + + @Override + public boolean onInterceptTouchEvent(RecyclerView view, MotionEvent e) { + View childView = view.findChildViewUnder(e.getX(), e.getY()); + if (childView != null && mListener != null && mGestureDetector.onTouchEvent(e)) { + mListener.onItemClick(childView, view.getChildPosition(childView)); + } + return false; + } + + @Override + public void onTouchEvent(RecyclerView view, MotionEvent motionEvent) { + } +} diff --git a/demo/src/main/res/drawable/divider.xml b/demo/src/main/res/drawable/divider.xml new file mode 100644 index 0000000..111d79d --- /dev/null +++ b/demo/src/main/res/drawable/divider.xml @@ -0,0 +1,24 @@ + + + + + + + + \ No newline at end of file diff --git a/demo/src/main/res/layout/listview_item.xml b/demo/src/main/res/layout/listview_item.xml index f95def7..092f786 100644 --- a/demo/src/main/res/layout/listview_item.xml +++ b/demo/src/main/res/layout/listview_item.xml @@ -1,53 +1,61 @@ + android:layout_height="wrap_content" + swipe:horizontalSwipeOffset="0dp"> + android:layout_height="80dp" + android:background="#FF5534" + android:gravity="center" + android:tag="Bottom3" + android:weightSum="10"> + + android:layout_height="30dp" + android:layout_weight="1" + android:src="@drawable/trash" /> + + android:layout_height="wrap_content" + android:layout_weight="5" + android:text="Delete Item?" + android:textColor="#fff" + android:textSize="17sp" /> +