Skip to content

Commit 5e44ece

Browse files
smartdnsmartdn
authored
Merge pull request #1 from liuling07/master
update from oirgin
2 parents bb8f7f4 + c279fb2 commit 5e44ece

18 files changed

Lines changed: 202 additions & 36 deletions

‎.gitignore‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
*.iml
21
.gradle
2+
33
/local.properties
4-
/gradle.properties
5-
/.idea/workspace.xml
6-
/.idea/libraries
4+
5+
/.idea
6+
77
.DS_Store
88
/build
99
/captures

‎.idea/encodings.xml‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎.idea/gradle.xml‎

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

‎.idea/misc.xml‎

Lines changed: 16 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/vcs.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.

‎SimpleNews.apk‎

-1.42 KB
Binary file not shown.

‎SimpleNews.iml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module external.linked.project.id="SimpleNews" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
3+
<component name="FacetManager">
4+
<facet type="java-gradle" name="Java-Gradle">
5+
<configuration>
6+
<option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
7+
<option name="BUILDABLE" value="false" />
8+
</configuration>
9+
</facet>
10+
</component>
11+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
12+
<exclude-output />
13+
<content url="file://$MODULE_DIR$">
14+
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
15+
</content>
16+
<orderEntry type="inheritedJdk" />
17+
<orderEntry type="sourceFolder" forTests="false" />
18+
</component>
19+
</module>

‎app/app.iml‎

Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,109 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="SimpleNews" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
3+
<component name="FacetManager">
4+
<facet type="android-gradle" name="Android-Gradle">
5+
<configuration>
6+
<option name="GRADLE_PROJECT_PATH" value=":app" />
7+
</configuration>
8+
</facet>
9+
<facet type="android" name="Android">
10+
<configuration>
11+
<option name="SELECTED_BUILD_VARIANT" value="debug" />
12+
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
13+
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
14+
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
15+
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
16+
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
17+
<afterSyncTasks>
18+
<task>generateDebugAndroidTestSources</task>
19+
<task>generateDebugSources</task>
20+
</afterSyncTasks>
21+
<option name="ALLOW_USER_CONFIGURATION" value="false" />
22+
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
23+
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
24+
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
25+
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
26+
</configuration>
27+
</facet>
28+
</component>
29+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
30+
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
31+
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
32+
<exclude-output />
33+
<content url="file://$MODULE_DIR$">
34+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
35+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
36+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
37+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
38+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
39+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
40+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
41+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
42+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
43+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
44+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
45+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
46+
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
47+
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
48+
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
49+
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
50+
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
51+
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
52+
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
53+
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
54+
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
55+
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
56+
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
57+
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
58+
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
59+
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
60+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
61+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
62+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
63+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
64+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
65+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
66+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
67+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
68+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
69+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
70+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
71+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
72+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.1/jars" />
73+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/cardview-v7/23.1.1/jars" />
74+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/23.1.1/jars" />
75+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.1.1/jars" />
76+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.1/jars" />
77+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/de.hdodenhof/circleimageview/1.3.0/jars" />
78+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/org.sufficientlysecure/html-textview/1.3/jars" />
79+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
80+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
81+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
82+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
83+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
84+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
85+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
86+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
87+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
88+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
89+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
90+
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
91+
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
92+
</content>
93+
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
94+
<orderEntry type="sourceFolder" forTests="false" />
95+
<orderEntry type="library" exported="" name="gson-2.2.4" level="project" />
96+
<orderEntry type="library" exported="" name="html-textview-1.3" level="project" />
97+
<orderEntry type="library" exported="" name="recyclerview-v7-23.1.1" level="project" />
98+
<orderEntry type="library" exported="" name="circleimageview-1.3.0" level="project" />
99+
<orderEntry type="library" exported="" name="okio-1.6.0" level="project" />
100+
<orderEntry type="library" exported="" name="support-v4-23.1.1" level="project" />
101+
<orderEntry type="library" exported="" name="cardview-v7-23.1.1" level="project" />
102+
<orderEntry type="library" exported="" name="okhttp-2.7.0" level="project" />
103+
<orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
104+
<orderEntry type="library" exported="" name="glide-3.6.1" level="project" />
105+
<orderEntry type="library" exported="" name="appcompat-v7-23.1.1" level="project" />
106+
<orderEntry type="library" exported="" name="design-23.1.1" level="project" />
107+
<orderEntry type="module" module-name="swipeback" exported="" />
108+
</component>
109+
</module>

‎app/src/main/java/com/lauren/simplenews/images/widget/ImageFragment.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -93,17 +93,15 @@ public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
9393

9494
@Override
9595
public void onRefresh() {
96-
if(mData != null) {
97-
mData.clear();
98-
}
9996
mImagePresenter.loadImageList();
10097
}
10198

10299
@Override
103100
public void addImages(List<ImageBean> list) {
104101
if(mData == null) {
105-
mData = new ArrayList<ImageBean>();
102+
mData = new ArrayList<>();
106103
}
104+
mData.clear();
107105
mData.addAll(list);
108106
mAdapter.setmDate(mData);
109107
}
@@ -120,7 +118,9 @@ public void hideProgress() {
120118

121119
@Override
122120
public void showLoadFailMsg() {
123-
View view = getActivity() == null ? mRecyclerView.getRootView() : getActivity().findViewById(R.id.drawer_layout);
124-
Snackbar.make(view, getString(R.string.load_fail), Snackbar.LENGTH_SHORT).show();
121+
if (isAdded()) {
122+
View view = getActivity() == null ? mRecyclerView.getRootView() : getActivity().findViewById(R.id.drawer_layout);
123+
Snackbar.make(view, getString(R.string.load_fail), Snackbar.LENGTH_SHORT).show();
124+
}
125125
}
126126
}

‎app/src/main/java/com/lauren/simplenews/news/model/NewsModel.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
*/
1010
public interface NewsModel {
1111

12-
void loadNews(String url, int type, NewsModelImpl.OnLoadNewsListListener listener);
12+
void loadNews(String url, int type, OnLoadNewsListListener listener);
1313

14-
void loadNewsDetail(String docid, NewsModelImpl.OnLoadNewsDetailListener listener);
14+
void loadNewsDetail(String docid, OnLoadNewsDetailListener listener);
1515

1616
}

0 commit comments

Comments
 (0)