Skip to content

Commit 35ff703

Browse files
wutongkewutongke
committed
fix list item click crash
1 parent 415891e commit 35ff703

4 files changed

Lines changed: 15 additions & 13 deletions

File tree

‎.idea/misc.xml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/app.iml‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,6 @@
6565
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6666
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
6767
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
68-
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
69-
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
70-
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
71-
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
72-
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
75-
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
7668
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
7769
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
7870
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -81,9 +73,16 @@
8173
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
8274
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
8375
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
8484
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8585
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
86-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
8786
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
8887
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
8988
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
@@ -107,8 +106,6 @@
107106
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
108107
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
109108
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
110-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
111-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
112109
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
113110
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
114111
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />

‎app/src/main/java/com/aswifter/material/news/NewsAdapter.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import com.bumptech.glide.Glide;
1515

1616
import java.util.List;
17+
import java.util.Objects;
1718

1819
/**
1920
* Created by erfli on 6/15/16.
@@ -79,6 +80,10 @@ public int getItemCount() {
7980
return mDataset.size();
8081
}
8182

83+
public Story getItem(int position){
84+
return mDataset.get(position);
85+
}
86+
8287
public void updateData(List<Story> stories) {
8388
mDataset.clear();
8489
mDataset.addAll(stories);

‎app/src/main/java/com/aswifter/material/news/NewsListActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ public void onItemClick(View view, int position) {
125125
ActivityOptionsCompat options =
126126
ActivityOptionsCompat.makeSceneTransitionAnimation(NewsListActivity.this,
127127
view.findViewById(R.id.news_image), getString(R.string.transition_news_img));
128-
intent.putExtra(NewsDetailActivity.NEWS, repository.get().get().get(position));
128+
intent.putExtra(NewsDetailActivity.NEWS, mAdapter.getItem(position));
129129
ActivityCompat.startActivity(NewsListActivity.this,intent, options.toBundle());
130130
}
131131
}));

0 commit comments

Comments
 (0)