Skip to content

Commit d4a99ef

Browse files
committed
update version
1 parent fd5cb7e commit d4a99ef

File tree

6 files changed

+36
-24
lines changed

6 files changed

+36
-24
lines changed

README-cn.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ Github: https://github.com/liaohuqiu
1919
<groupId>in.srain.cube</groupId>
2020
<artifactId>grid-view-with-header-footer</artifactId>
2121
<type>jar</type>
22-
<version>1.0.11</version>
22+
<version>1.0.12</version>
2323
</dependency>
2424
```
2525

2626
#### Gradle
2727

2828
``` groovy
29-
compile 'in.srain.cube:grid-view-with-header-footer:1.0.11'
29+
compile 'in.srain.cube:grid-view-with-header-footer:1.0.12'
3030
```
3131

3232
### 使用示例

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ This library is contained by `CUBE-SDK`: https://github.com/etao-open-source/cub
2121
<groupId>in.srain.cube</groupId>
2222
<artifactId>grid-view-with-header-footer</artifactId>
2323
<type>jar</type>
24-
<version>1.0.11</version>
24+
<version>1.0.12</version>
2525
</dependency>
2626
```
2727

2828
#### Gradle
2929

3030
``` groovy
31-
compile 'in.srain.cube:grid-view-with-header-footer:1.0.11'
31+
compile 'in.srain.cube:grid-view-with-header-footer:1.0.12'
3232
```
3333

3434
### Usage

gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION_NAME=1.0.11
1+
VERSION_NAME=1.0.12
22

33
ANDROID_BUILD_MIN_SDK_VERSION=8
44
ANDROID_BUILD_TARGET_SDK_VERSION=16

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<artifactId>grid-view-with-header-footer</artifactId>
1414
<packaging>jar</packaging>
1515
<name>GridViewWithHeaderAndFooter</name>
16-
<version>1.0.11</version>
16+
<version>1.0.12</version>
1717

1818
<description>GridView with Header and Footer</description>
1919
<url>https://github.com/liaohuqiu/android-GridViewWithHeaderAndFooter</url>

src/in/srain/cube/views/GridViewWithHeaderAndFooter.java

+29-17
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
* See {@link GridViewWithHeaderAndFooter#addHeaderView(View, Object, boolean)}
3636
* See {@link GridViewWithHeaderAndFooter#addFooterView(View, Object, boolean)}
3737
*/
38-
public class GridViewWithHeaderAndFooter extends GridView implements android.widget.AdapterView.OnItemClickListener, AdapterView.OnItemLongClickListener {
38+
public class GridViewWithHeaderAndFooter extends GridView {
3939

4040
public static boolean DEBUG = false;
4141
private OnItemClickListener mOnItemClickListener;
@@ -70,6 +70,7 @@ private static class FixedViewInfo {
7070
private ArrayList<FixedViewInfo> mHeaderViewInfos = new ArrayList<FixedViewInfo>();
7171
private ArrayList<FixedViewInfo> mFooterViewInfos = new ArrayList<FixedViewInfo>();
7272
private ListAdapter mOriginalAdapter;
73+
private ItemClickHandler mItemClickHandler;
7374

7475
private void initHeaderGridView() {
7576
}
@@ -418,6 +419,7 @@ public void setAdapter(ListAdapter adapter) {
418419

419420
/**
420421
* Return original adapter for convenience.
422+
*
421423
* @return
422424
*/
423425
public ListAdapter getOriginalAdapter() {
@@ -844,33 +846,43 @@ public void notifyDataSetChanged() {
844846
@Override
845847
public void setOnItemClickListener(OnItemClickListener l) {
846848
mOnItemClickListener = l;
847-
super.setOnItemClickListener(this);
849+
super.setOnItemClickListener(getItemClickHandler());
848850
}
849851

850852
@Override
851853
public void setOnItemLongClickListener(OnItemLongClickListener listener) {
852854
mOnItemLongClickListener = listener;
853-
super.setOnItemLongClickListener(this);
855+
super.setOnItemLongClickListener(getItemClickHandler());
854856
}
855857

856-
@Override
857-
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
858-
if (mOnItemClickListener != null) {
859-
int resPos = position - getHeaderViewCount() * getNumColumnsCompatible();
860-
if (resPos >= 0) {
861-
mOnItemClickListener.onItemClick(parent, view, resPos, id);
862-
}
858+
private ItemClickHandler getItemClickHandler() {
859+
if (mItemClickHandler == null) {
860+
mItemClickHandler = new ItemClickHandler();
863861
}
862+
return mItemClickHandler;
864863
}
865864

866-
@Override
867-
public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) {
868-
if (mOnItemLongClickListener != null) {
869-
int resPos = position - getHeaderViewCount() * getNumColumnsCompatible();
870-
if (resPos >= 0) {
871-
mOnItemLongClickListener.onItemLongClick(parent, view, resPos, id);
865+
private class ItemClickHandler implements android.widget.AdapterView.OnItemClickListener, AdapterView.OnItemLongClickListener {
866+
867+
@Override
868+
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
869+
if (mOnItemClickListener != null) {
870+
int resPos = position - getHeaderViewCount() * getNumColumnsCompatible();
871+
if (resPos >= 0) {
872+
mOnItemClickListener.onItemClick(parent, view, resPos, id);
873+
}
872874
}
873875
}
874-
return true;
876+
877+
@Override
878+
public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) {
879+
if (mOnItemLongClickListener != null) {
880+
int resPos = position - getHeaderViewCount() * getNumColumnsCompatible();
881+
if (resPos >= 0) {
882+
mOnItemLongClickListener.onItemLongClick(parent, view, resPos, id);
883+
}
884+
}
885+
return true;
886+
}
875887
}
876888
}

update-project.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import os
22
vars = {
3-
'lib_version': '1.0.11'
3+
'lib_version': '1.0.12'
44
}
55

66
files = [

0 commit comments

Comments
 (0)