diff --git a/.gradle/2.8/taskArtifacts/cache.properties.lock b/.gradle/2.8/taskArtifacts/cache.properties.lock index 27bb845..dfd93b0 100644 Binary files a/.gradle/2.8/taskArtifacts/cache.properties.lock and b/.gradle/2.8/taskArtifacts/cache.properties.lock differ diff --git a/.gradle/2.8/taskArtifacts/fileHashes.bin b/.gradle/2.8/taskArtifacts/fileHashes.bin index e8c2bac..c301cd2 100644 Binary files a/.gradle/2.8/taskArtifacts/fileHashes.bin and b/.gradle/2.8/taskArtifacts/fileHashes.bin differ diff --git a/.gradle/2.8/taskArtifacts/fileSnapshots.bin b/.gradle/2.8/taskArtifacts/fileSnapshots.bin index a879796..91840f6 100644 Binary files a/.gradle/2.8/taskArtifacts/fileSnapshots.bin and b/.gradle/2.8/taskArtifacts/fileSnapshots.bin differ diff --git a/.gradle/2.8/taskArtifacts/outputFileStates.bin b/.gradle/2.8/taskArtifacts/outputFileStates.bin index 26a53fe..73175c0 100644 Binary files a/.gradle/2.8/taskArtifacts/outputFileStates.bin and b/.gradle/2.8/taskArtifacts/outputFileStates.bin differ diff --git a/.gradle/2.8/taskArtifacts/taskArtifacts.bin b/.gradle/2.8/taskArtifacts/taskArtifacts.bin index 66050d8..bf8f952 100644 Binary files a/.gradle/2.8/taskArtifacts/taskArtifacts.bin and b/.gradle/2.8/taskArtifacts/taskArtifacts.bin differ diff --git a/.idea/misc.xml b/.idea/misc.xml index 7158618..cca2cda 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -37,7 +37,7 @@ - + diff --git a/.idea/workspace.xml b/.idea/workspace.xml index b5e697c..172c48d 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,5 +1,20 @@ + + + + + + + + @style/AppTheme.NoActionBar + + + + + + @@ -21,31 +36,110 @@ - + - - + + - - + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/app.iml b/app/app.iml index aaed178..cc85eb8 100644 --- a/app/app.iml +++ b/app/app.iml @@ -65,16 +65,28 @@ + + + + + + + + + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a1dd37c..0166d61 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -3,6 +3,7 @@ xmlns:android="http://schemas.android.com/apk/res/android"> + * Copyright (c), 2009 深圳孔方兄金融信息服务有限公司(Shenzhen kfxiong + * Financial Information Service Co. Ltd.) + *

+ * 著作权人保留一切权利,任何使用需经授权。 + */ +package z.sye.space.loadingview; + +import android.app.Application; + +import z.sye.space.library.PageStateLayout; + +/** + * Created by Syehunter on 2016/1/11. + */ +public class AppApplication extends Application { + + @Override + public void onCreate() { + super.onCreate(); + +// PageStateLayout.Builder.setLoadingView(R.layout.custom_layout_loading) +// .setEmptyView(R.layout.custom_layout_empty) +// .setErrorView(R.layout.custom_layout_error); + } +} diff --git a/app/src/main/res/layout/custom_layout_empty.xml b/app/src/main/res/layout/custom_layout_empty.xml new file mode 100644 index 0000000..bfb0b08 --- /dev/null +++ b/app/src/main/res/layout/custom_layout_empty.xml @@ -0,0 +1,13 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/custom_layout_error.xml b/app/src/main/res/layout/custom_layout_error.xml new file mode 100644 index 0000000..29984c5 --- /dev/null +++ b/app/src/main/res/layout/custom_layout_error.xml @@ -0,0 +1,13 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/custom_layout_loading.xml b/app/src/main/res/layout/custom_layout_loading.xml new file mode 100644 index 0000000..9f6ce0f --- /dev/null +++ b/app/src/main/res/layout/custom_layout_loading.xml @@ -0,0 +1,13 @@ + + + + + + \ No newline at end of file diff --git a/build/intermediates/dex-cache/cache.xml b/build/intermediates/dex-cache/cache.xml index 0b53585..207f4b7 100644 --- a/build/intermediates/dex-cache/cache.xml +++ b/build/intermediates/dex-cache/cache.xml @@ -1,61 +1,3 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/library/build.gradle b/library/build.gradle index d1c8fd0..63116b3 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -7,8 +7,8 @@ android { defaultConfig { minSdkVersion 15 targetSdkVersion 23 - versionCode 2 - versionName "0.1.1" + versionCode 3 + versionName "0.1.2" } buildTypes { release { diff --git a/library/library.iml b/library/library.iml index 2f93287..8efe902 100644 --- a/library/library.iml +++ b/library/library.iml @@ -74,6 +74,7 @@ + diff --git a/library/src/main/java/z/sye/space/library/PageStateLayout.java b/library/src/main/java/z/sye/space/library/PageStateLayout.java index 77871ad..f5007a5 100644 --- a/library/src/main/java/z/sye/space/library/PageStateLayout.java +++ b/library/src/main/java/z/sye/space/library/PageStateLayout.java @@ -84,7 +84,9 @@ private void show(PageState state) { mLoadingView = getLoadingView(); addView(mLoadingView); } else { - mLoading.reset(); + if (mLoading instanceof MaterialProgress) { + mLoading.reset(); + } } if (null == mErrorView) {