diff --git a/README.md b/README.md index 2d75df5..5b29cfe 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ Add the dependency ```gradle dependencies { compile 'com.google.code.gson:gson:2.8.1' - compile 'com.github.deckyfx:simpleadapter:0.21@aar' + compile 'com.github.deckyfx:simpleadapter:0.22@aar' } ``` diff --git a/simpleadapter/gradle.properties b/simpleadapter/gradle.properties index 06edfe0..6cae103 100644 --- a/simpleadapter/gradle.properties +++ b/simpleadapter/gradle.properties @@ -1,2 +1,2 @@ -versionName=0.0.21 +versionName=0.0.22 versionCode=1 \ No newline at end of file diff --git a/simpleadapter/src/main/java/com/github/deckyfx/simpleadapter/AdapterItem.java b/simpleadapter/src/main/java/com/github/deckyfx/simpleadapter/AdapterItem.java index 801b778..acf14a7 100644 --- a/simpleadapter/src/main/java/com/github/deckyfx/simpleadapter/AdapterItem.java +++ b/simpleadapter/src/main/java/com/github/deckyfx/simpleadapter/AdapterItem.java @@ -93,11 +93,11 @@ public void setupView(Context ctx, int groupPosition, int childPosition, BaseIte } } - public void setClickListener(ClickListener clickListener) { + public void setOnClickListener(ClickListener clickListener) { this.mClickListener = clickListener; } - public void setTouchListener(TouchListener touchListener) { + public void setOnTouchListener(TouchListener touchListener) { this.mTouchListener = touchListener; } @@ -159,11 +159,11 @@ public void setupView(Context ctx, int groupPosition, int childPosition, BaseIte } } - public void setClickListener(AdapterItem.ViewHolder.ClickListener clickListener) { + public void setOnClickListener(AdapterItem.ViewHolder.ClickListener clickListener) { this.mClickListener = clickListener; } - public void setTouchListener(AdapterItem.ViewHolder.TouchListener touchListener) { + public void setOnTouchListener(AdapterItem.ViewHolder.TouchListener touchListener) { this.mTouchListener = touchListener; } diff --git a/simpleadapter/src/main/java/com/github/deckyfx/simpleadapter/ExpandableAdapter.java b/simpleadapter/src/main/java/com/github/deckyfx/simpleadapter/ExpandableAdapter.java index 0105855..834eb77 100644 --- a/simpleadapter/src/main/java/com/github/deckyfx/simpleadapter/ExpandableAdapter.java +++ b/simpleadapter/src/main/java/com/github/deckyfx/simpleadapter/ExpandableAdapter.java @@ -202,10 +202,10 @@ public View getGroupView(int groupPosition, boolean isExpanded, View convertView } } if (this.mClickListener != null) { - viewHolder.setClickListener(this.mClickListener); + viewHolder.setOnClickListener(this.mClickListener); } if (this.mTouchListener != null) { - viewHolder.setTouchListener(this.mTouchListener); + viewHolder.setOnTouchListener(this.mTouchListener); } if (groupPosition < this.getGroupCount()) { AdapterItem item = this.getGroup(groupPosition); @@ -238,10 +238,10 @@ public View getChildView(int groupPosition, int childPosition, boolean isLastChi } } if (this.mClickListener != null) { - viewHolder.setClickListener(this.mClickListener); + viewHolder.setOnClickListener(this.mClickListener); } if (this.mTouchListener != null) { - viewHolder.setTouchListener(this.mTouchListener); + viewHolder.setOnTouchListener(this.mTouchListener); } if (groupPosition < this.getGroupCount() && childPosition < this.getChildrenCount(groupPosition)) { BaseItem item = this.getChild(groupPosition, childPosition); @@ -282,14 +282,18 @@ public Filter getFilter() { return this.mFilter; } - public void setClickListener(SimpleAdapter.ClickListener listener) { + public void setOnClickListener(SimpleAdapter.ClickListener listener) { this.mClickListener = listener; } - public void setTouchListener(SimpleAdapter.TouchListener listener) { + public void setOnTouchListener(SimpleAdapter.TouchListener listener) { this.mTouchListener = listener; } + public void setOnViewBindListener(ViewBindListener listener) { + this.mViewBindListener = listener; + } + public interface ViewBindListener { public boolean onViewBind(int groupPosition, int childPosition); } diff --git a/simpleadapter/src/main/java/com/github/deckyfx/simpleadapter/RecycleAdapter.java b/simpleadapter/src/main/java/com/github/deckyfx/simpleadapter/RecycleAdapter.java index d823f4c..6403d93 100644 --- a/simpleadapter/src/main/java/com/github/deckyfx/simpleadapter/RecycleAdapter.java +++ b/simpleadapter/src/main/java/com/github/deckyfx/simpleadapter/RecycleAdapter.java @@ -69,14 +69,18 @@ public void setGroupScrollAnimation(AnimationSet scrollAnimation) { this.mScrollAnimation = scrollAnimation; } - public void setClickListener(SimpleAdapter.ClickListener listener) { + public void setOnClickListener(SimpleAdapter.ClickListener listener) { this.mClickListener = listener; } - public void setTouchListener(SimpleAdapter.TouchListener listener) { + public void setOnTouchListener(SimpleAdapter.TouchListener listener) { this.mTouchListener = listener; } + public void setOnViewBindListener(SimpleAdapter.ViewBindListener listener) { + this.mViewBindListener = listener; + } + // Create new views (invoked by the layout manager) @Override public AdapterItem.RecycleViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { @@ -107,10 +111,10 @@ public AdapterItem.RecycleViewHolder onCreateViewHolder(ViewGroup parent, int vi public void onBindViewHolder(AdapterItem.RecycleViewHolder viewHolder, int position) { viewHolder.setLayoutTag(position); if (this.mClickListener != null) { - viewHolder.setClickListener(this.mClickListener); + viewHolder.setOnClickListener(this.mClickListener); } if (this.mTouchListener != null) { - viewHolder.setTouchListener(this.mTouchListener); + viewHolder.setOnTouchListener(this.mTouchListener); } if (position < this.mItemsList.size()) { BaseItem item = this.mItemsList.get(position); diff --git a/simpleadapter/src/main/java/com/github/deckyfx/simpleadapter/SimpleAdapter.java b/simpleadapter/src/main/java/com/github/deckyfx/simpleadapter/SimpleAdapter.java index fba8da3..b11bbc3 100644 --- a/simpleadapter/src/main/java/com/github/deckyfx/simpleadapter/SimpleAdapter.java +++ b/simpleadapter/src/main/java/com/github/deckyfx/simpleadapter/SimpleAdapter.java @@ -143,10 +143,10 @@ public View getView(int position, View convertView, ViewGroup parent) { } } if (this.mClickListener != null) { - viewHolder.setClickListener(this.mClickListener); + viewHolder.setOnClickListener(this.mClickListener); } if (this.mTouchListener != null) { - viewHolder.setTouchListener(this.mTouchListener); + viewHolder.setOnTouchListener(this.mTouchListener); } if (position < this.mItemsList.size()) { BaseItem item = this.mItemsList.get(position); @@ -182,14 +182,18 @@ public Filter getFilter() { return this.mFilter; } - public void setClickListener(ClickListener listener) { + public void setOnClickListener(ClickListener listener) { this.mClickListener = listener; } - public void setTouchListener(TouchListener listener) { + public void setOnTouchListener(TouchListener listener) { this.mTouchListener = listener; } + public void setOnViewBindListener(ViewBindListener listener) { + this.mViewBindListener = listener; + } + public interface ClickListener extends AdapterItem.ViewHolder.ClickListener { @Override public void onClick(View view);