Skip to content

Commit c59f084

Browse files
zzz40500zzz40500
authored
Merge pull request zzz40500#18 from kingwang666/wxj-2
fix zzz40500#17, 去除无用资源，优化布局， 优化dialog，修复当圆到方的一瞬间的颜色bug
2 parents e33cb37 + 3565bbf commit c59f084

23 files changed

+313
-349
lines changed

‎.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
.gradle
22
/local.properties
3-
/.idea/workspace.xml
4-
/.idea/libraries
3+
/.idea
54
.DS_Store
65
/build

‎.idea/.name

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎.idea/compiler.xml

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

‎.idea/copyright/profiles_settings.xml

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

‎.idea/encodings.xml

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

‎.idea/gradle.xml

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

‎.idea/misc.xml

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

‎.idea/modules.xml

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

‎.idea/scopes/scope_settings.xml

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

‎.idea/vcs.xml

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

‎app/app.iml

Lines changed: 48 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,9 @@
99
<facet type="android" name="Android">
1010
<configuration>
1111
<option name="SELECTED_BUILD_VARIANT" value="debug" />
12-
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
1312
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1413
<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" />
1714
<afterSyncTasks>
18-
<task>generateDebugAndroidTestSources</task>
1915
<task>generateDebugSources</task>
2016
</afterSyncTasks>
2117
<option name="ALLOW_USER_CONFIGURATION" value="false" />
@@ -28,72 +24,95 @@
2824
</component>
2925
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
3026
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
31-
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
27+
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
3228
<exclude-output />
3329
<content url="file://$MODULE_DIR$">
3430
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
3531
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
3632
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3733
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
34+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
3835
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
39-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
36+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
4037
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
4138
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
4239
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
4340
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
41+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
4442
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
45-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
43+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
4644
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
4745
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
4846
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
4947
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
5048
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
51-
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
5249
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
50+
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
51+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
52+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
53+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
54+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
55+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
56+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
57+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
5358
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
5459
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
5560
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
5661
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
5762
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
58-
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
5963
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
64+
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
6065
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
6166
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
6267
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
6368
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
6469
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
65-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
6670
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
71+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
72+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
73+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
74+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
6779
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
68-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
80+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
81+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
6982
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
70-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
71-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
72-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
73-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
74-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.0.0/jars" />
75-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.0.0/jars" />
7683
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
77-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
78-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
79-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
80-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
84+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
85+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
86+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
87+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
88+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
89+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
90+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
8191
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
82-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
83-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
84-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
92+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
8593
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
94+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
8695
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
96+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
97+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
8798
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
99+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
88100
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
89101
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
90102
</content>
91-
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
103+
<orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
92104
<orderEntry type="sourceFolder" forTests="false" />
93-
<orderEntry type="library" exported="" name="support-v4-22.0.0" level="project" />
94-
<orderEntry type="library" exported="" name="support-annotations-22.0.0" level="project" />
95-
<orderEntry type="library" exported="" name="appcompat-v7-22.0.0" level="project" />
96-
<orderEntry type="library" exported="" name="library-2.4.0" level="project" />
105+
<orderEntry type="library" exported="" name="support-core-ui-25.3.1" level="project" />
106+
<orderEntry type="library" exported="" name="support-v4-25.3.1" level="project" />
107+
<orderEntry type="library" exported="" name="support-media-compat-25.3.1" level="project" />
108+
<orderEntry type="library" exported="" name="support-annotations-25.3.1" level="project" />
109+
<orderEntry type="library" exported="" name="appcompat-v7-25.3.1" level="project" />
110+
<orderEntry type="library" exported="" name="support-vector-drawable-25.3.1" level="project" />
111+
<orderEntry type="library" exported="" name="support-compat-25.3.1" level="project" />
112+
<orderEntry type="library" exported="" name="support-core-utils-25.3.1" level="project" />
113+
<orderEntry type="library" exported="" name="support-fragment-25.3.1" level="project" />
114+
<orderEntry type="library" exported="" name="animated-vector-drawable-25.3.1" level="project" />
97115
<orderEntry type="module" module-name="shapeloading" exported="" />
116+
<orderEntry type="library" exported="" name="library-2.4.0" level="project" />
98117
</component>
99118
</module>

‎app/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 21
5-
buildToolsVersion "21.1.2"
4+
compileSdkVersion 25
5+
buildToolsVersion '25.0.0'
66

77
defaultConfig {
88
applicationId "com.mingle"
99
minSdkVersion 9
10-
targetSdkVersion 21
10+
targetSdkVersion 25
1111
versionCode 1
1212
versionName "1.0"
1313
}
@@ -21,6 +21,6 @@ android {
2121

2222
dependencies {
2323
compile fileTree(dir: 'libs', include: ['*.jar'])
24-
compile 'com.android.support:appcompat-v7:22.0.0'
24+
compile 'com.android.support:appcompat-v7:25.3.1'
2525
compile project(':shapeloading')
2626
}

‎app/src/main/java/com/mingle/DialogDemoActivity.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@ public class DialogDemoActivity extends ActionBarActivity {
1616
protected void onCreate(Bundle savedInstanceState) {
1717
super.onCreate(savedInstanceState);
1818
setContentView(R.layout.activity_dialog_demo);
19-
shapeLoadingDialog=new ShapeLoadingDialog(this);
20-
shapeLoadingDialog.setLoadingText("加载中...");
19+
shapeLoadingDialog = new ShapeLoadingDialog.Builder(this)
20+
.loadText("加载中...")
21+
.build();
2122

2223

2324
findViewById(R.id.button1).setOnClickListener(new View.OnClickListener() {

‎build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:1.2.3'
8+
classpath 'com.android.tools.build:gradle:2.3.1'
99

1010
// NOTE: Do not place your application dependencies here; they belong
1111
// in the individual module build.gradle files

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Apr 10 15:27:10 PDT 2013
1+
#Fri May 05 11:08:53 CST 2017
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

‎shapeloading/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
apply plugin: 'com.android.library'
22

33
android {
4-
compileSdkVersion 21
5-
buildToolsVersion "21.1.2"
4+
compileSdkVersion 25
5+
buildToolsVersion '25.0.0'
66

77
defaultConfig {
88
minSdkVersion 9
9-
targetSdkVersion 21
9+
targetSdkVersion 25
1010
versionCode 1
1111
versionName "1.0.3"
1212
}

0 commit comments

Comments
 (0)