Skip to content

Commit 2a6211a

Browse files
committed
emergency fix
1 parent 5a26e30 commit 2a6211a

File tree

6 files changed

+21
-20
lines changed

6 files changed

+21
-20
lines changed

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
22

33
android {
44
compileSdkVersion 23
5-
buildToolsVersion '25.0.2'
5+
buildToolsVersion '23.0.2'
66
defaultConfig {
77
applicationId 'com.lcodecore.twinklingrefreshlayout'
88
minSdkVersion 14

app/src/main/java/com/lcodecore/twinklingrefreshlayout/ScienceActivity.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,10 @@ public void onClick(View v) {
3232

3333
private void setupGridView(GridView gridView) {
3434
final TwinklingRefreshLayout refreshLayout = (TwinklingRefreshLayout) findViewById(R.id.refresh);
35-
SinaRefreshView headerView = new SinaRefreshView(this);
36-
headerView.setArrowResource(R.drawable.arrow);
37-
headerView.setTextColor(0xff745D5C);
35+
// SinaRefreshView headerView = new SinaRefreshView(this);
36+
// headerView.setArrowResource(R.drawable.arrow);
37+
// headerView.setTextColor(0xff745D5C);
38+
TextHeaderView headerView = (TextHeaderView) View.inflate(this,R.layout.header_tv,null);
3839
refreshLayout.setHeaderView(headerView);
3940

4041
LoadingView loadingView = new LoadingView(this);

app/src/main/java/com/lcodecore/twinklingrefreshlayout/adapter/ScienceAdapter.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,12 @@ public void refreshCard() {
6868
cards.add(new Card("globe", "", R.drawable.science2));
6969
cards.add(new Card("lab-flask-leaf", "", R.drawable.science3));
7070
cards.add(new Card("magnet", "", R.drawable.science4));
71-
// cards.add(new Card("microscope", "", R.drawable.science5));
72-
// cards.add(new Card("moon", "", R.drawable.science6));
73-
// cards.add(new Card("telescope", "", R.drawable.science7));
74-
// cards.add(new Card("satellite", "", R.drawable.science8));
75-
// cards.add(new Card("Newtons-cradle", "", R.drawable.science9));
76-
// cards.add(new Card("nuclear-symbol", "", R.drawable.science10));
71+
cards.add(new Card("microscope", "", R.drawable.science5));
72+
cards.add(new Card("moon", "", R.drawable.science6));
73+
cards.add(new Card("telescope", "", R.drawable.science7));
74+
cards.add(new Card("satellite", "", R.drawable.science8));
75+
cards.add(new Card("Newtons-cradle", "", R.drawable.science9));
76+
cards.add(new Card("nuclear-symbol", "", R.drawable.science10));
7777
notifyDataSetChanged();
7878
}
7979

@@ -82,12 +82,12 @@ public void loadMoreCard() {
8282
cards.add(new Card("globe", "", R.drawable.science2));
8383
cards.add(new Card("lab-flask-leaf", "", R.drawable.science3));
8484
cards.add(new Card("magnet", "", R.drawable.science4));
85-
// cards.add(new Card("microscope", "", R.drawable.science5));
86-
// cards.add(new Card("moon", "", R.drawable.science6));
87-
// cards.add(new Card("telescope", "", R.drawable.science7));
88-
// cards.add(new Card("satellite", "", R.drawable.science8));
89-
// cards.add(new Card("Newtons-cradle", "", R.drawable.science9));
90-
// cards.add(new Card("nuclear-symbol", "", R.drawable.science10));
85+
cards.add(new Card("microscope", "", R.drawable.science5));
86+
cards.add(new Card("moon", "", R.drawable.science6));
87+
cards.add(new Card("telescope", "", R.drawable.science7));
88+
cards.add(new Card("satellite", "", R.drawable.science8));
89+
cards.add(new Card("Newtons-cradle", "", R.drawable.science9));
90+
cards.add(new Card("nuclear-symbol", "", R.drawable.science10));
9191
notifyDataSetChanged();
9292
}
9393
}

app/src/main/java/com/lcodecore/twinklingrefreshlayout/adapter/base/BaseRecyclerAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int position
3838
}
3939
@Override
4040
public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
41-
runEnterAnimation(holder.itemView, position);
41+
// runEnterAnimation(holder.itemView, position);
4242
//数据绑定
4343
if (enableHead) {
4444
if (position == 0) {

app/src/main/res/layout/header_tv.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<com.lcodecore.twinklingrefreshlayout.TextHeaderView xmlns:android="http://schemas.android.com/apk/res/android"
33
android:id="@+id/tv"
4-
android:layout_width="match_parent"
5-
android:layout_height="match_parent"
4+
android:layout_width="wrap_content"
5+
android:layout_height="wrap_content"
66
android:layout_gravity="center"
77
android:gravity="center"
88
android:textSize="20sp"

library/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ publish{
1111

1212
android {
1313
compileSdkVersion 23
14-
buildToolsVersion '25.0.2'
14+
buildToolsVersion '23.0.2'
1515

1616
defaultConfig {
1717
minSdkVersion 14

0 commit comments

Comments
 (0)