From b1262f05d89be865e4c051be595c6c0898c6bd20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=BE=E4=BC=9F=E6=98=8E?= <zengweiming@dkhs.com>
Date: Fri, 29 May 2015 10:01:17 +0800
Subject: [PATCH 01/16] update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

向下支持2.3 ,  添加license,
---
 .idea/gradle.xml                              |   3 +-
 .idea/misc.xml                                | 101 ---------
 LICENSE                                       | 201 ++++++++++++++++++
 app/app.iml                                   |   1 +
 app/build.gradle                              |   2 +-
 app/src/main/res/layout/activity_main.xml     |   5 +-
 shapeloading/build.gradle                     |  23 +-
 shapeloading/shapeloading.iml                 |   4 +-
 .../java/com/mingle/widget/LoadingView.java   |  20 +-
 .../com/mingle/widget/ShapeLoadingView.java   |   4 -
 .../src/main/res/layout/load_view.xml         |   1 -
 11 files changed, 236 insertions(+), 129 deletions(-)
 create mode 100644 LICENSE

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 590dfa8..a0f355d 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -3,8 +3,9 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleHome" value="F:\AndroidStudio\gradle\gradle-2.2.1" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index fdbc761..58ff01f 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,112 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="DaemonCodeAnalyzer">
-    <disable_hints />
-  </component>
   <component name="EntryPointsManager">
     <entry_points version="2.0" />
   </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
-  <component name="RunManager">
-    <configuration default="true" type="Remote" factoryName="Remote">
-      <option name="USE_SOCKET_TRANSPORT" value="true" />
-      <option name="SERVER_MODE" value="false" />
-      <option name="SHMEM_ADDRESS" value="javadebug" />
-      <option name="HOST" value="localhost" />
-      <option name="PORT" value="5005" />
-      <method />
-    </configuration>
-    <configuration default="true" type="TestNG" factoryName="TestNG">
-      <module name="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="SUITE_NAME" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="GROUP_NAME" />
-      <option name="TEST_OBJECT" value="CLASS" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="OUTPUT_DIRECTORY" />
-      <option name="ANNOTATION_TYPE" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="moduleWithDependencies" />
-      </option>
-      <option name="USE_DEFAULT_REPORTERS" value="false" />
-      <option name="PROPERTIES_FILE" />
-      <envs />
-      <properties />
-      <listeners />
-      <method />
-    </configuration>
-    <configuration default="true" type="Application" factoryName="Application">
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="JUnit" factoryName="JUnit">
-      <module name="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="TEST_OBJECT" value="class" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="moduleWithDependencies" />
-      </option>
-      <envs />
-      <patterns />
-      <method />
-    </configuration>
-    <list size="0" />
-    <configuration name="&lt;template&gt;" type="Applet" default="true" selected="false">
-      <option name="MAIN_CLASS_NAME" />
-      <option name="HTML_FILE_NAME" />
-      <option name="HTML_USED" value="false" />
-      <option name="WIDTH" value="400" />
-      <option name="HEIGHT" value="300" />
-      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
-      <option name="VM_PARAMETERS" />
-    </configuration>
-    <configuration name="&lt;template&gt;" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" default="true" selected="false">
-      <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
-    </configuration>
-    <configuration name="&lt;template&gt;" type="WebApp" default="true" selected="false">
-      <Host>localhost</Host>
-      <Port>5050</Port>
-    </configuration>
-  </component>
   <component name="masterDetails">
     <states>
       <state key="ProjectJDKs.UI">
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..261eeb9
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/app/app.iml b/app/app.iml
index 4ef1cce..a0bfe83 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -88,6 +88,7 @@
     <orderEntry type="library" exported="" name="support-v4-22.0.0" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-22.0.0" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-22.0.0" level="project" />
+    <orderEntry type="library" exported="" name="library-2.4.0" level="project" />
     <orderEntry type="module" module-name="shapeloading" exported="" />
   </component>
 </module>
diff --git a/app/build.gradle b/app/build.gradle
index 19fe604..4bcc3c3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,7 +6,7 @@ android {
 
     defaultConfig {
         applicationId "com.mingle"
-        minSdkVersion 14
+        minSdkVersion 9
         targetSdkVersion 21
         versionCode 1
         versionName "1.0"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 4a1c0c1..ddd5637 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -8,11 +8,8 @@
     android:paddingBottom="@dimen/activity_vertical_margin" tools:context=".MainActivity">
 
 
-
-
-
     <com.mingle.widget.LoadingView
-        app:loadingText="加薪中..."
+        app:loadingText="加载中..."
         android:id="@+id/loadView"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"/>
diff --git a/shapeloading/build.gradle b/shapeloading/build.gradle
index 0dea4fa..12df98a 100644
--- a/shapeloading/build.gradle
+++ b/shapeloading/build.gradle
@@ -5,10 +5,10 @@ android {
     buildToolsVersion "21.1.2"
 
     defaultConfig {
-        minSdkVersion 14
+        minSdkVersion 9
         targetSdkVersion 21
         versionCode 1
-        versionName "1.0"
+        versionName "1.0.1"
     }
     buildTypes {
         release {
@@ -18,7 +18,24 @@ android {
     }
 }
 
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.novoda:bintray-release:0.2.10'
+    }
+}
+apply plugin: 'bintray-release'
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:22.0.0'
+    compile 'com.nineoldandroids:library:2.4.0'
 }
+
+publish {
+    groupId = 'com.mingle.widget'
+    artifactId = 'shapeLoadingView'
+    publishVersion = '1.0.1'
+    description='Loading view with pretty animation.'
+    website = 'https://github.com/zzz40500/android-shapeLoadingView'
+}
\ No newline at end of file
diff --git a/shapeloading/shapeloading.iml b/shapeloading/shapeloading.iml
index 50b82b2..7a32944 100644
--- a/shapeloading/shapeloading.iml
+++ b/shapeloading/shapeloading.iml
@@ -86,9 +86,7 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="support-v4-22.0.0" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-22.0.0" level="project" />
-    <orderEntry type="library" exported="" name="appcompat-v7-22.0.0" level="project" />
+    <orderEntry type="library" exported="" name="library-2.4.0" level="project" />
   </component>
 </module>
 
diff --git a/shapeloading/src/main/java/com/mingle/widget/LoadingView.java b/shapeloading/src/main/java/com/mingle/widget/LoadingView.java
index 881276c..4251190 100644
--- a/shapeloading/src/main/java/com/mingle/widget/LoadingView.java
+++ b/shapeloading/src/main/java/com/mingle/widget/LoadingView.java
@@ -1,8 +1,5 @@
 package com.mingle.widget;
 
-import android.animation.Animator;
-import android.animation.AnimatorSet;
-import android.animation.ObjectAnimator;
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -19,7 +16,9 @@
 import android.widget.TextView;
 
 import com.mingle.shapeloading.R;
-
+import com.nineoldandroids.animation.Animator;
+import com.nineoldandroids.animation.AnimatorSet;
+import com.nineoldandroids.animation.ObjectAnimator;
 
 
 /**
@@ -77,14 +76,11 @@ public  int dip2px( float dipValue){
     }
 
 
-
-
     @Override
     protected void onFinishInflate() {
         super.onFinishInflate();
 
-
-      View view=  LayoutInflater.from(getContext()).inflate(R.layout.load_view,null);
+       View view=  LayoutInflater.from(getContext()).inflate(R.layout.load_view,null);
 
         mDistance =dip2px(54f);
 
@@ -145,8 +141,8 @@ public void upThrow( ){
 
         objectAnimator.setDuration(ANIMATION_DURATION);
         objectAnimator1.setDuration(ANIMATION_DURATION);
-        objectAnimator.setInterpolator(new DecelerateInterpolator());
-        objectAnimator1.setInterpolator(new DecelerateInterpolator());
+        objectAnimator.setInterpolator(new DecelerateInterpolator(factor));
+        objectAnimator1.setInterpolator(new DecelerateInterpolator(factor));
         AnimatorSet animatorSet=new AnimatorSet();
         animatorSet.setDuration(ANIMATION_DURATION);
         animatorSet.playTogether(objectAnimator,objectAnimator1,scaleIndication);
@@ -180,6 +176,8 @@ public void onAnimationRepeat(Animator animation) {
 
     }
 
+    public float factor =1.2f;
+
     /**
      * 下落
      */
@@ -190,7 +188,7 @@ public void freeFall(){
 
 
         objectAnimator.setDuration(ANIMATION_DURATION);
-        objectAnimator.setInterpolator(new AccelerateInterpolator());
+        objectAnimator.setInterpolator(new AccelerateInterpolator(factor));
         AnimatorSet animatorSet=new AnimatorSet();
         animatorSet.setDuration(ANIMATION_DURATION);
         animatorSet.playTogether(objectAnimator,scaleIndication);
diff --git a/shapeloading/src/main/java/com/mingle/widget/ShapeLoadingView.java b/shapeloading/src/main/java/com/mingle/widget/ShapeLoadingView.java
index 36b3a40..20da9ff 100644
--- a/shapeloading/src/main/java/com/mingle/widget/ShapeLoadingView.java
+++ b/shapeloading/src/main/java/com/mingle/widget/ShapeLoadingView.java
@@ -100,7 +100,6 @@ protected void onDraw(Canvas canvas) {
 
                     invalidate();
 
-
                 } else {
                     Path path = new Path();
                     mPaint.setColor(getResources().getColor(R.color.triangle));
@@ -121,10 +120,7 @@ protected void onDraw(Canvas canvas) {
 
 
                 if (mIsLoading) {
-
-
                     float magicNumber = mMagicNumber + mAnimPercent;
-
                     mAnimPercent += 0.12;
                     if (magicNumber + mAnimPercent >= 1.9f) {
                         mShape = Shape.SHAPE_RECT;
diff --git a/shapeloading/src/main/res/layout/load_view.xml b/shapeloading/src/main/res/layout/load_view.xml
index cbd79b6..99027a5 100644
--- a/shapeloading/src/main/res/layout/load_view.xml
+++ b/shapeloading/src/main/res/layout/load_view.xml
@@ -20,7 +20,6 @@
         android:layout_below="@+id/indication"
         android:layout_centerHorizontal="true"
         android:layout_marginTop="18dp"
-        android:text="text"
         android:layout_height="wrap_content" />
 
     <com.mingle.widget.ShapeLoadingView

From c0177ca56fc10d8c61ab5572ff5dcb95c919ff44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=BE=E4=BC=9F=E6=98=8E?= <zengweiming@dkhs.com>
Date: Fri, 29 May 2015 12:27:21 +0800
Subject: [PATCH 02/16] update

update
---
 shapeloading/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shapeloading/build.gradle b/shapeloading/build.gradle
index 12df98a..59749c9 100644
--- a/shapeloading/build.gradle
+++ b/shapeloading/build.gradle
@@ -33,7 +33,7 @@ dependencies {
 }
 
 publish {
-    groupId = 'com.mingle.widget'
+    groupId = 'com.mingle.zzz40500'
     artifactId = 'shapeLoadingView'
     publishVersion = '1.0.1'
     description='Loading view with pretty animation.'

From 0e94e3c01580f840f9f43317f029dde132582052 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BD=BB=E5=BE=AE?= <wyh405003836@126.com>
Date: Fri, 29 May 2015 13:26:52 +0800
Subject: [PATCH 03/16] Update README.markdown

---
 README.markdown | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.markdown b/README.markdown
index 3e66528..8c460b5 100644
--- a/README.markdown
+++ b/README.markdown
@@ -10,6 +10,8 @@
 
 #地址:#
 [github 直达](https://github.com/zzz40500/android-shapeLoadingView)
+[![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-Shape%20Loading%20View-brightgreen.svg?style=flat)](http://android-arsenal.com/details/1/1897)
+
 #usage#
 
 布局上

From 64e0c033217584b0f73c98fc3fc9392bd12a6230 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BD=BB=E5=BE=AE?= <wyh405003836@126.com>
Date: Fri, 29 May 2015 13:27:22 +0800
Subject: [PATCH 04/16] Update README.markdown

---
 README.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.markdown b/README.markdown
index 8c460b5..9d6e132 100644
--- a/README.markdown
+++ b/README.markdown
@@ -10,6 +10,7 @@
 
 #地址:#
 [github 直达](https://github.com/zzz40500/android-shapeLoadingView)
+
 [![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-Shape%20Loading%20View-brightgreen.svg?style=flat)](http://android-arsenal.com/details/1/1897)
 
 #usage#

From 38bd4d19c8f21380084a2c2b23adc77bf588d2cd Mon Sep 17 00:00:00 2001
From: zzz40500 <wyh405003836@126.com>
Date: Mon, 15 Jun 2015 02:12:11 +0800
Subject: [PATCH 05/16] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A2=9C=E8=89=B2?=
 =?UTF-8?q?=E5=80=BC=E7=9A=84=E9=80=8F=E6=98=8E=E5=BA=A6.=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E9=98=B4=E5=BD=B1=E7=9A=84=E9=A2=9C=E8=89=B2=E5=80=BC?=
 =?UTF-8?q?,=20=E5=A2=9E=E5=8A=A0=20ShapeLoadingDialog=20=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/gradle.xml                              |   4 +-
 .idea/misc.xml                                |  27 ++++-
 .idea/vcs.xml                                 |   2 +-
 android-shapeLoadingView.iml                  |   8 +-
 app/app.iml                                   |  14 ++-
 app/src/main/AndroidManifest.xml              |   8 ++
 .../java/com/mingle/DialogDemoActivity.java   |  53 +++++++++
 .../main/java/com/mingle/MainActivity.java    |  22 +++-
 .../java/com/mingle/ViewDemoActivity.java     |  37 ++++++
 .../main/res/layout/activity_dialog_demo.xml  |  16 +++
 app/src/main/res/layout/activity_main.xml     |  23 +++-
 .../main/res/layout/activity_view_demo.xml    |  19 +++
 app/src/main/res/values/strings.xml           |   2 +
 shapeloading/shapeloading.iml                 |  14 ++-
 .../java/com/mingle/widget/LoadingView.java   | 109 ++++++++++--------
 .../com/mingle/widget/ShapeLoadingDialog.java |  63 ++++++++++
 .../com/mingle/widget/ShapeLoadingView.java   |  25 +++-
 shapeloading/src/main/res/drawable/shadow.xml |   2 -
 .../src/main/res/layout/layout_dialog.xml     |  19 +++
 .../src/main/res/layout/load_view.xml         |  56 +++++----
 .../src/main/res/values/loading_arrt.xml      |   1 +
 .../src/main/res/values/loading_color.xml     |   9 +-
 shapeloading/src/main/res/values/styles.xml   |  20 ++++
 23 files changed, 441 insertions(+), 112 deletions(-)
 create mode 100644 app/src/main/java/com/mingle/DialogDemoActivity.java
 create mode 100644 app/src/main/java/com/mingle/ViewDemoActivity.java
 create mode 100644 app/src/main/res/layout/activity_dialog_demo.xml
 create mode 100644 app/src/main/res/layout/activity_view_demo.xml
 create mode 100644 shapeloading/src/main/java/com/mingle/widget/ShapeLoadingDialog.java
 create mode 100644 shapeloading/src/main/res/layout/layout_dialog.xml
 create mode 100644 shapeloading/src/main/res/values/styles.xml

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index a0f355d..b6351a7 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -6,6 +6,7 @@
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleHome" value="F:\AndroidStudio\gradle\gradle-2.2.1" />
+        <option name="gradleJvm" value="1.7" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
@@ -16,5 +17,4 @@
       </GradleProjectSettings>
     </option>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 58ff01f..a2cdff1 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,6 +3,30 @@
   <component name="EntryPointsManager">
     <entry_points version="2.0" />
   </component>
+  <component name="NullableNotNullManager">
+    <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
+    <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
+    <option name="myNullables">
+      <value>
+        <list size="4">
+          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
+          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
+          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
+          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+        </list>
+      </value>
+    </option>
+    <option name="myNotNulls">
+      <value>
+        <list size="4">
+          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
+          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
+          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
+          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
+        </list>
+      </value>
+    </option>
+  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
@@ -22,5 +46,4 @@
       </state>
     </states>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index def6a6a..275077f 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="" />
+    <mapping directory="" vcs="Git" />
   </component>
 </project>
 
diff --git a/android-shapeLoadingView.iml b/android-shapeLoadingView.iml
index 0bb6048..27d504e 100644
--- a/android-shapeLoadingView.iml
+++ b/android-shapeLoadingView.iml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module 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">
+<module external.linked.project.id="android-shapeLoadingView" 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">
   <component name="FacetManager">
     <facet type="java-gradle" name="Java-Gradle">
       <configuration>
         <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
+        <option name="BUILDABLE" value="false" />
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
@@ -15,5 +16,4 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/app/app.iml b/app/app.iml
index a0bfe83..73564b3 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="android-shapeLoadingView" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<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="android-shapeLoadingView" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
@@ -13,8 +13,11 @@
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
         <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
-        <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
-        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
+        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
+        <afterSyncTasks>
+          <task>generateDebugAndroidTestSources</task>
+          <task>generateDebugSources</task>
+        </afterSyncTasks>
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
@@ -23,7 +26,7 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
     <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
     <exclude-output />
@@ -91,5 +94,4 @@
     <orderEntry type="library" exported="" name="library-2.4.0" level="project" />
     <orderEntry type="module" module-name="shapeloading" exported="" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 341be5f..f798f0d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -16,6 +16,14 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity
+            android:name=".ViewDemoActivity"
+            android:label="@string/title_activity_view_demo" >
+        </activity>
+        <activity
+            android:name=".DialogDemoActivity"
+            android:label="@string/title_activity_dialog_demo" >
+        </activity>
     </application>
 
 </manifest>
diff --git a/app/src/main/java/com/mingle/DialogDemoActivity.java b/app/src/main/java/com/mingle/DialogDemoActivity.java
new file mode 100644
index 0000000..44ea227
--- /dev/null
+++ b/app/src/main/java/com/mingle/DialogDemoActivity.java
@@ -0,0 +1,53 @@
+package com.mingle;
+
+import android.support.v7.app.ActionBarActivity;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+
+import com.mingle.widget.ShapeLoadingDialog;
+
+public class DialogDemoActivity extends ActionBarActivity {
+
+    private ShapeLoadingDialog shapeLoadingDialog;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_dialog_demo);
+         shapeLoadingDialog=new ShapeLoadingDialog(this);
+        shapeLoadingDialog.setLoadingText("加载中...");
+
+
+        findViewById(R.id.button1).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+
+                shapeLoadingDialog.show();
+            }
+        });
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        // Inflate the menu; this adds items to the action bar if it is present.
+//        getMenuInflater().inflate(R.menu.menu_dialog_demo, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        // Handle action bar item clicks here. The action bar will
+        // automatically handle clicks on the Home/Up button, so long
+        // as you specify a parent activity in AndroidManifest.xml.
+        int id = item.getItemId();
+
+        //noinspection SimplifiableIfStatement
+        if (id == R.id.action_settings) {
+            return true;
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+}
diff --git a/app/src/main/java/com/mingle/MainActivity.java b/app/src/main/java/com/mingle/MainActivity.java
index ad4afaa..5e86b3f 100644
--- a/app/src/main/java/com/mingle/MainActivity.java
+++ b/app/src/main/java/com/mingle/MainActivity.java
@@ -1,22 +1,40 @@
 package com.mingle;
 
+import android.content.Intent;
 import android.support.v7.app.ActionBarActivity;
 import android.os.Bundle;
+import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.View;
 
+import com.mingle.widget.ShapeLoadingDialog;
 
 
 public class MainActivity extends ActionBarActivity {
 
 
 
+
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-
-
+        findViewById(R.id.button1).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+
+                MainActivity.this.startActivity(new Intent(MainActivity.this,ViewDemoActivity.class));
+            }
+        });
+        findViewById(R.id.button2).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+
+                MainActivity.this.startActivity(new Intent(MainActivity.this,DialogDemoActivity.class));
+            }
+        });
 
     }
 
diff --git a/app/src/main/java/com/mingle/ViewDemoActivity.java b/app/src/main/java/com/mingle/ViewDemoActivity.java
new file mode 100644
index 0000000..7840521
--- /dev/null
+++ b/app/src/main/java/com/mingle/ViewDemoActivity.java
@@ -0,0 +1,37 @@
+package com.mingle;
+
+import android.support.v7.app.ActionBarActivity;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+
+public class ViewDemoActivity extends ActionBarActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_view_demo);
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        // Inflate the menu; this adds items to the action bar if it is present.
+//        getMenuInflater().inflate(R.menu.menu_view_demo, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        // Handle action bar item clicks here. The action bar will
+        // automatically handle clicks on the Home/Up button, so long
+        // as you specify a parent activity in AndroidManifest.xml.
+        int id = item.getItemId();
+
+        //noinspection SimplifiableIfStatement
+        if (id == R.id.action_settings) {
+            return true;
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+}
diff --git a/app/src/main/res/layout/activity_dialog_demo.xml b/app/src/main/res/layout/activity_dialog_demo.xml
new file mode 100644
index 0000000..cb55816
--- /dev/null
+++ b/app/src/main/res/layout/activity_dialog_demo.xml
@@ -0,0 +1,16 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
+    android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    tools:context="com.mingle.DialogDemoActivity">
+
+    <Button
+        android:id="@+id/button1"
+        android:text="show"
+        android:layout_centerInParent="true"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content" />
+
+</RelativeLayout>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index ddd5637..6ee2dcf 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,6 +1,7 @@
-<RelativeLayout
+<LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
     xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
     android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
@@ -8,11 +9,21 @@
     android:paddingBottom="@dimen/activity_vertical_margin" tools:context=".MainActivity">
 
 
-    <com.mingle.widget.LoadingView
-        app:loadingText="加载中..."
-        android:id="@+id/loadView"
+
+
+    <Button
+        android:id="@+id/button1"
+        android:text="View"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content" />
+    <Button
+        android:id="@+id/button2"
+        android:text="Dialog"
         android:layout_width="fill_parent"
-        android:layout_height="fill_parent"/>
+        android:layout_height="wrap_content" />
+
+
+
 
 
-</RelativeLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_view_demo.xml b/app/src/main/res/layout/activity_view_demo.xml
new file mode 100644
index 0000000..cce2d83
--- /dev/null
+++ b/app/src/main/res/layout/activity_view_demo.xml
@@ -0,0 +1,19 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    tools:context="com.mingle.ViewDemoActivity">
+
+    <com.mingle.widget.LoadingView
+        android:id="@+id/loadView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        app:loadingText="加载中..." />
+
+</RelativeLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 407885f..00cd798 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,4 +3,6 @@
 
     <string name="hello_world">Hello world!</string>
     <string name="action_settings">Settings</string>
+    <string name="title_activity_view_demo">ViewDemoActivity</string>
+    <string name="title_activity_dialog_demo">DialogDemoActivity</string>
 </resources>
diff --git a/shapeloading/shapeloading.iml b/shapeloading/shapeloading.iml
index 7a32944..12361cf 100644
--- a/shapeloading/shapeloading.iml
+++ b/shapeloading/shapeloading.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="android-shapeLoadingView" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":shapeloading" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="android-shapeLoadingView" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
@@ -13,8 +13,11 @@
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
         <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
-        <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
-        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
+        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
+        <afterSyncTasks>
+          <task>generateDebugAndroidTestSources</task>
+          <task>generateDebugSources</task>
+        </afterSyncTasks>
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
@@ -24,7 +27,7 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
     <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
     <exclude-output />
@@ -88,5 +91,4 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="library-2.4.0" level="project" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/shapeloading/src/main/java/com/mingle/widget/LoadingView.java b/shapeloading/src/main/java/com/mingle/widget/LoadingView.java
index 4251190..77ed33d 100644
--- a/shapeloading/src/main/java/com/mingle/widget/LoadingView.java
+++ b/shapeloading/src/main/java/com/mingle/widget/LoadingView.java
@@ -4,6 +4,7 @@
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.os.Build;
+import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@@ -24,37 +25,38 @@
 /**
  * Created by zzz40500 on 15/4/6.
  */
-public class LoadingView  extends FrameLayout {
+public class LoadingView extends FrameLayout {
 
+    private static final int ANIMATION_DURATION = 500;
 
-    private ShapeLoadingView shapeLoadingView;
+    private static  float mDistance = 200;
 
-    private ImageView indicationIm;
+    private ShapeLoadingView mShapeLoadingView;
 
-    private TextView loadTextView;
+    private ImageView mIndicationIm;
 
+    private TextView mLoadTextView;
+    private int mTextAppearance;
 
-    private   static  final int ANIMATION_DURATION=500;
+    private String mLoadText;
 
-    private String loadText;
 
-
-    private     float mDistance =200;
     public LoadingView(Context context) {
         super(context);
     }
 
     public LoadingView(Context context, AttributeSet attrs) {
-        super(context, attrs,0);
-        init(context,attrs);
+        super(context, attrs, 0);
+        init(context, attrs);
 
     }
 
-    private void init(Context context,AttributeSet attrs) {
+    private void init(Context context, AttributeSet attrs) {
 
-        TypedArray typedArray= context
+        TypedArray typedArray = context
                 .obtainStyledAttributes(attrs, R.styleable.LoadingView);
-        loadText=  typedArray.getString(R.styleable.LoadingView_loadingText);
+        mLoadText = typedArray.getString(R.styleable.LoadingView_loadingText);
+        mTextAppearance = typedArray.getResourceId(R.styleable.LoadingView_loadingTextAppearance, -1);
 
         typedArray.recycle();
     }
@@ -62,17 +64,18 @@ private void init(Context context,AttributeSet attrs) {
 
     public LoadingView(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
-        init(context,attrs);
+        init(context, attrs);
     }
 
     @TargetApi(Build.VERSION_CODES.LOLLIPOP)
     public LoadingView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
         super(context, attrs, defStyleAttr, defStyleRes);
-        init(context,attrs);
+        init(context, attrs);
     }
-    public  int dip2px( float dipValue){
+
+    public int dip2px(float dipValue) {
         final float scale = getContext().getResources().getDisplayMetrics().density;
-        return (int)(dipValue * scale + 0.5f);
+        return (int) (dipValue * scale + 0.5f);
     }
 
 
@@ -80,60 +83,72 @@ public  int dip2px( float dipValue){
     protected void onFinishInflate() {
         super.onFinishInflate();
 
-       View view=  LayoutInflater.from(getContext()).inflate(R.layout.load_view,null);
+        View view = LayoutInflater.from(getContext()).inflate(R.layout.load_view, null);
 
-        mDistance =dip2px(54f);
+        mDistance = dip2px(54f);
 
-        LayoutParams layoutParams=new LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+        LayoutParams layoutParams = new LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
 
-        layoutParams.gravity= Gravity.CENTER;
+        layoutParams.gravity = Gravity.CENTER;
 
-        shapeLoadingView= (ShapeLoadingView) view.findViewById(R.id.shapeLoadingView);
+        mShapeLoadingView = (ShapeLoadingView) view.findViewById(R.id.shapeLoadingView);
 
-        indicationIm= (ImageView) view.findViewById(R.id.indication);
-        loadTextView= (TextView) view.findViewById(R.id.promptTV);
+        mIndicationIm = (ImageView) view.findViewById(R.id.indication);
+        mLoadTextView = (TextView) view.findViewById(R.id.promptTV);
 
-        setLoadingText(loadText);
+        if (mTextAppearance != -1) {
+            mLoadTextView.setTextAppearance(getContext(), mTextAppearance);
+        }
+        setLoadingText(mLoadText);
 
-        addView(view,layoutParams);
+        addView(view, layoutParams);
 
         this.postDelayed(new Runnable() {
             @Override
             public void run() {
                 freeFall();
             }
-        },900);
+        }, 900);
 
 
     }
 
-    public void setLoadingText(CharSequence loadingText){
-        loadTextView.setText(loadingText);
+    public void setLoadingText(CharSequence loadingText) {
+
+
+        if (TextUtils.isEmpty(loadingText)) {
+            mLoadTextView.setVisibility(GONE);
+        } else {
+            mLoadTextView.setVisibility(VISIBLE);
+        }
+
+        mLoadTextView.setText(loadingText);
     }
+
     /**
      * 上抛
      */
-    public void upThrow( ){
+    public void upThrow() {
 
-        ObjectAnimator objectAnimator=ObjectAnimator.ofFloat(shapeLoadingView,"translationY", mDistance,0);
-        ObjectAnimator scaleIndication=ObjectAnimator.ofFloat(indicationIm,"scaleX",0.2f,1);
+        ObjectAnimator objectAnimator = ObjectAnimator.ofFloat(mShapeLoadingView, "translationY", mDistance, 0);
+        ObjectAnimator scaleIndication = ObjectAnimator.ofFloat(mIndicationIm, "scaleX", 0.2f, 1);
 
 
-        ObjectAnimator objectAnimator1=null;
-        switch (shapeLoadingView.getShape()){
+        ObjectAnimator objectAnimator1 = null;
+        switch (mShapeLoadingView.getShape()) {
             case SHAPE_RECT:
 
 
-                objectAnimator1 = ObjectAnimator.ofFloat(shapeLoadingView, "rotation", 0, -120);
+                objectAnimator1 = ObjectAnimator.ofFloat(mShapeLoadingView, "rotation", 0, -120);
 
                 break;
             case SHAPE_CIRCLE:
-                objectAnimator1=   ObjectAnimator.ofFloat(shapeLoadingView,"rotation",0,180);
+                objectAnimator1 = ObjectAnimator.ofFloat(mShapeLoadingView, "rotation", 0, 180);
 
                 break;
             case SHAPE_TRIANGLE:
 
-                objectAnimator1 = ObjectAnimator.ofFloat(shapeLoadingView, "rotation", 0, 180);
+                objectAnimator1 = ObjectAnimator.ofFloat(mShapeLoadingView, "rotation", 0, 180);
 
                 break;
         }
@@ -143,9 +158,9 @@ public void upThrow( ){
         objectAnimator1.setDuration(ANIMATION_DURATION);
         objectAnimator.setInterpolator(new DecelerateInterpolator(factor));
         objectAnimator1.setInterpolator(new DecelerateInterpolator(factor));
-        AnimatorSet animatorSet=new AnimatorSet();
+        AnimatorSet animatorSet = new AnimatorSet();
         animatorSet.setDuration(ANIMATION_DURATION);
-        animatorSet.playTogether(objectAnimator,objectAnimator1,scaleIndication);
+        animatorSet.playTogether(objectAnimator, objectAnimator1, scaleIndication);
 
 
         animatorSet.addListener(new Animator.AnimatorListener() {
@@ -176,22 +191,22 @@ public void onAnimationRepeat(Animator animation) {
 
     }
 
-    public float factor =1.2f;
+    public float factor = 1.2f;
 
     /**
      * 下落
      */
-    public void freeFall(){
+    public void freeFall() {
 
-        ObjectAnimator objectAnimator=ObjectAnimator.ofFloat(shapeLoadingView,"translationY",0, mDistance);
-        ObjectAnimator scaleIndication=ObjectAnimator.ofFloat(indicationIm,"scaleX",1,0.2f);
+        ObjectAnimator objectAnimator = ObjectAnimator.ofFloat(mShapeLoadingView, "translationY", 0, mDistance);
+        ObjectAnimator scaleIndication = ObjectAnimator.ofFloat(mIndicationIm, "scaleX", 1, 0.2f);
 
 
         objectAnimator.setDuration(ANIMATION_DURATION);
         objectAnimator.setInterpolator(new AccelerateInterpolator(factor));
-        AnimatorSet animatorSet=new AnimatorSet();
+        AnimatorSet animatorSet = new AnimatorSet();
         animatorSet.setDuration(ANIMATION_DURATION);
-        animatorSet.playTogether(objectAnimator,scaleIndication);
+        animatorSet.playTogether(objectAnimator, scaleIndication);
         animatorSet.addListener(new Animator.AnimatorListener() {
             @Override
             public void onAnimationStart(Animator animation) {
@@ -202,8 +217,7 @@ public void onAnimationStart(Animator animation) {
             public void onAnimationEnd(Animator animation) {
 
 
-
-                shapeLoadingView.changeShape();
+                mShapeLoadingView.changeShape();
                 upThrow();
             }
 
@@ -220,7 +234,6 @@ public void onAnimationRepeat(Animator animation) {
         animatorSet.start();
 
 
-
     }
 
 }
diff --git a/shapeloading/src/main/java/com/mingle/widget/ShapeLoadingDialog.java b/shapeloading/src/main/java/com/mingle/widget/ShapeLoadingDialog.java
new file mode 100644
index 0000000..5e8f91a
--- /dev/null
+++ b/shapeloading/src/main/java/com/mingle/widget/ShapeLoadingDialog.java
@@ -0,0 +1,63 @@
+package com.mingle.widget;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.graphics.drawable.GradientDrawable;
+import android.view.LayoutInflater;
+import android.view.View;
+
+import com.mingle.shapeloading.R;
+
+/**
+ * Created by zzz40500 on 15/6/15.
+ */
+public class ShapeLoadingDialog {
+
+
+
+    private Context mContext;
+    private Dialog mDialog;
+    private LoadingView mLoadingView;
+    private View mDialogContentView;
+
+
+    public ShapeLoadingDialog(Context context) {
+        this.mContext=context;
+        init();
+    }
+
+    private void init() {
+        mDialog = new Dialog(mContext, R.style.custom_dialog);
+        mDialogContentView= LayoutInflater.from(mContext).inflate(R.layout.layout_dialog,null);
+
+
+        mLoadingView= (LoadingView) mDialogContentView.findViewById(R.id.loadView);
+        mDialog.setContentView(mDialogContentView);
+    }
+
+    public void setBackground(int color){
+        GradientDrawable gradientDrawable= (GradientDrawable) mDialogContentView.getBackground();
+        gradientDrawable.setColor(color);
+    }
+
+    public void setLoadingText(CharSequence charSequence){
+        mLoadingView.setLoadingText(charSequence);
+    }
+
+    public void show(){
+        mDialog.show();
+
+    }
+
+    public void dismiss(){
+        mDialog.dismiss();
+    }
+
+    public Dialog getDialog(){
+        return  mDialog;
+    }
+
+    public void setCanceledOnTouchOutside(boolean cancel){
+        mDialog.setCanceledOnTouchOutside(cancel);
+    }
+}
diff --git a/shapeloading/src/main/java/com/mingle/widget/ShapeLoadingView.java b/shapeloading/src/main/java/com/mingle/widget/ShapeLoadingView.java
index 20da9ff..cda96dc 100644
--- a/shapeloading/src/main/java/com/mingle/widget/ShapeLoadingView.java
+++ b/shapeloading/src/main/java/com/mingle/widget/ShapeLoadingView.java
@@ -17,8 +17,8 @@
 public class ShapeLoadingView extends View {
 
 
-    private float genhao3 = 1.7320508075689f;
-
+    private static final float genhao3 = 1.7320508075689f;
+    private static  final  float mTriangle2Circle =0.25555555f;
 
     private Shape mShape = Shape.SHAPE_CIRCLE;
 
@@ -64,11 +64,15 @@ private void init() {
     private float mControlY = 0;
 
     private float mAnimPercent;
-    private float triangle2Circle=0.25555555f;
+
 
     @Override
     protected void onDraw(Canvas canvas) {
         super.onDraw(canvas);
+
+        if(getVisibility()==GONE){
+            return;
+        }
         switch (mShape) {
             case SHAPE_TRIANGLE:
 
@@ -83,16 +87,16 @@ protected void onDraw(Canvas canvas) {
                         mIsLoading = false;
                         mAnimPercent=1;
                     }
-                    float controlX = mControlX - relativeXFromView(mAnimPercent*triangle2Circle)
+                    float controlX = mControlX - relativeXFromView(mAnimPercent* mTriangle2Circle)
                             * genhao3;
 
-                    float controlY = mControlY - relativeYFromView(mAnimPercent*triangle2Circle);
+                    float controlY = mControlY - relativeYFromView(mAnimPercent* mTriangle2Circle);
 
 
                     path.quadTo(relativeXFromView(1) - controlX, controlY, relativeXFromView(0.5f + genhao3 / 4), relativeYFromView(0.75f));
 
 
-                    path.quadTo(relativeXFromView(0.5f), relativeYFromView(0.75f + 2 * mAnimPercent*triangle2Circle), relativeXFromView(0.5f - genhao3 / 4), relativeYFromView(0.75f));
+                    path.quadTo(relativeXFromView(0.5f), relativeYFromView(0.75f + 2 * mAnimPercent* mTriangle2Circle), relativeXFromView(0.5f - genhao3 / 4), relativeYFromView(0.75f));
 
                     path.quadTo(controlX, controlY, relativeXFromView(0.5f), relativeYFromView(0f));
                     path.close();
@@ -251,6 +255,15 @@ public enum Shape {
     }
 
 
+    @Override
+    public void setVisibility(int visibility) {
+        super.setVisibility(visibility);
+
+        if(visibility==VISIBLE){
+            invalidate();
+        }
+    }
+
     public Shape getShape() {
         return mShape;
     }
diff --git a/shapeloading/src/main/res/drawable/shadow.xml b/shapeloading/src/main/res/drawable/shadow.xml
index 2e5bcc6..b5ef634 100644
--- a/shapeloading/src/main/res/drawable/shadow.xml
+++ b/shapeloading/src/main/res/drawable/shadow.xml
@@ -5,6 +5,4 @@
     >
     <solid android:color="@color/shadow"/>
 
-
-
 </shape>
\ No newline at end of file
diff --git a/shapeloading/src/main/res/layout/layout_dialog.xml b/shapeloading/src/main/res/layout/layout_dialog.xml
new file mode 100644
index 0000000..7f1f0a1
--- /dev/null
+++ b/shapeloading/src/main/res/layout/layout_dialog.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:background="@drawable/aa_dialog_bg"
+    android:paddingLeft="64dp"
+    android:paddingRight="64dp"
+    android:paddingTop="36dp"
+    android:paddingBottom="36dp"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+
+    <com.mingle.widget.LoadingView
+        android:id="@+id/loadView"
+        android:layout_centerInParent="true"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/shapeloading/src/main/res/layout/load_view.xml b/shapeloading/src/main/res/layout/load_view.xml
index 99027a5..9143066 100644
--- a/shapeloading/src/main/res/layout/load_view.xml
+++ b/shapeloading/src/main/res/layout/load_view.xml
@@ -1,33 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
 
-    <ImageView
+    android:orientation="vertical">
 
-        android:id="@+id/indication"
-        android:layout_width="23dp"
-        android:src="http://github.com/@drawable/shadow"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="82dp"
-        android:layout_height="3dp" />
-    <TextView
+    <RelativeLayout
         android:layout_width="wrap_content"
-        android:id="@+id/promptTV"
-        android:textColor="#757575"
+        android:layout_height="wrap_content"
         android:minWidth="44dp"
-        android:textSize="16sp"
-        android:layout_below="@+id/indication"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="18dp"
-        android:layout_height="wrap_content" />
+        android:orientation="vertical">
 
-    <com.mingle.widget.ShapeLoadingView
-        android:id="@+id/shapeLoadingView"
-        android:layout_width="27dp"
-        android:layout_marginTop="2dp"
-        android:layout_centerHorizontal="true"
-        android:layout_height="27dp" />
+        <ImageView
 
+            android:id="@+id/indication"
+            android:layout_width="23dp"
+            android:layout_height="3dp"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="82dp"
+            android:src="http://github.com/@drawable/shadow" />
 
+        <TextView
+            android:id="@+id/promptTV"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/indication"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="18dp"
+            android:minWidth="44dp"
+            android:textColor="#757575"
+            android:textSize="14sp"
+            android:visibility="gone" />
+
+        <com.mingle.widget.ShapeLoadingView
+            android:id="@+id/shapeLoadingView"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="2dp" />
+
+    </RelativeLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/shapeloading/src/main/res/values/loading_arrt.xml b/shapeloading/src/main/res/values/loading_arrt.xml
index 5fbf9a1..3107042 100644
--- a/shapeloading/src/main/res/values/loading_arrt.xml
+++ b/shapeloading/src/main/res/values/loading_arrt.xml
@@ -4,5 +4,6 @@
     <declare-styleable name="LoadingView">
 
         <attr name="loadingText" format="string"/>
+        <attr name="loadingTextAppearance" format="reference"/>
     </declare-styleable>
 </resources>
\ No newline at end of file
diff --git a/shapeloading/src/main/res/values/loading_color.xml b/shapeloading/src/main/res/values/loading_color.xml
index 690b8cf..0a3b404 100644
--- a/shapeloading/src/main/res/values/loading_color.xml
+++ b/shapeloading/src/main/res/values/loading_color.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <color name="triangle">#72d572</color>
-    <color name="circle">#738ffe</color>
-    <color name="rect">#e84e40</color>
+    <color name="triangle">#aa72d572</color>
+    <color name="circle">#aa738ffe</color>
+    <color name="rect">#aae84e40</color>
     <color name="view_bg">#00000000</color>
-    <color name="shadow">#bdbdbd</color>
+    <color name="shadow">#25808080</color>
+    <color name="dialog_bg">#f5f5f5</color>
 
 </resources>
\ No newline at end of file
diff --git a/shapeloading/src/main/res/values/styles.xml b/shapeloading/src/main/res/values/styles.xml
new file mode 100644
index 0000000..4780689
--- /dev/null
+++ b/shapeloading/src/main/res/values/styles.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="custom_dialog" parent="@android:style/Theme.Dialog">
+        <item name="android:windowFrame">@null</item>
+        <!-- Dialog的windowFrame框为无 -->
+        <item name="android:windowIsFloating">true</item>
+        <!-- 是否漂现在activity上 -->
+        <item name="android:windowIsTranslucent">true</item>
+        <!-- 是否半透明 -->
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:background">@android:color/transparent</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <!-- 去除黑色边框的关键设置项 -->
+        <item name="android:backgroundDimEnabled">true</item>
+        <!-- 屏幕背景是否变暗 -->
+        <item name="android:backgroundDimAmount">0.6</item>
+    </style>
+</resources>
\ No newline at end of file

From 983064c2b7e916682a243e445ef2efb1c0b87bf6 Mon Sep 17 00:00:00 2001
From: zzz40500 <wyh405003836@126.com>
Date: Mon, 15 Jun 2015 02:13:26 +0800
Subject: [PATCH 06/16] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A2=9C=E8=89=B2?=
 =?UTF-8?q?=E5=80=BC=E7=9A=84=E9=80=8F=E6=98=8E=E5=BA=A6.=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E9=98=B4=E5=BD=B1=E7=9A=84=E9=A2=9C=E8=89=B2=E5=80=BC?=
 =?UTF-8?q?,=20=E5=A2=9E=E5=8A=A0=20ShapeLoadingDialog=20=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/mingle/widget/ShapeLoadingView.java        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/shapeloading/src/main/java/com/mingle/widget/ShapeLoadingView.java b/shapeloading/src/main/java/com/mingle/widget/ShapeLoadingView.java
index cda96dc..1d22600 100644
--- a/shapeloading/src/main/java/com/mingle/widget/ShapeLoadingView.java
+++ b/shapeloading/src/main/java/com/mingle/widget/ShapeLoadingView.java
@@ -73,6 +73,7 @@ protected void onDraw(Canvas canvas) {
         if(getVisibility()==GONE){
             return;
         }
+        // FIXME: 15/6/15  动画待优化
         switch (mShape) {
             case SHAPE_TRIANGLE:
 

From 2e02de9e1d09d28326fde9c1b4b77014e618d2a1 Mon Sep 17 00:00:00 2001
From: zzz40500 <wyh405003836@126.com>
Date: Mon, 15 Jun 2015 02:38:25 +0800
Subject: [PATCH 07/16] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=20jcenter?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/app.iml                                   |   2 +
 build.gradle                                  |   5 +-
 shapeloading/build.gradle                     | 102 +++++++++++++++---
 shapeloading/shapeloading.iml                 |   5 +-
 shapeloading/src/main/AndroidManifest.xml     |   2 -
 .../src/main/res/layout/layout_dialog.xml     |   4 +-
 6 files changed, 98 insertions(+), 22 deletions(-)

diff --git a/app/app.iml b/app/app.iml
index 73564b3..cf6f2d7 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -71,6 +71,8 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.0.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.0.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
diff --git a/build.gradle b/build.gradle
index d3ff69d..64a2967 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,10 +5,13 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.1.0'
+        classpath 'com.android.tools.build:gradle:1.2.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
+
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0'
+        classpath 'com.github.dcendents:android-maven-plugin:1.2'
     }
 }
 
diff --git a/shapeloading/build.gradle b/shapeloading/build.gradle
index 59749c9..b3d2967 100644
--- a/shapeloading/build.gradle
+++ b/shapeloading/build.gradle
@@ -1,4 +1,7 @@
 apply plugin: 'com.android.library'
+apply plugin: 'com.github.dcendents.android-maven'
+apply plugin: 'com.jfrog.bintray'
+version = "1.0.3"
 
 android {
     compileSdkVersion 21
@@ -8,7 +11,7 @@ android {
         minSdkVersion 9
         targetSdkVersion 21
         versionCode 1
-        versionName "1.0.1"
+        versionName "1.0.3"
     }
     buildTypes {
         release {
@@ -18,24 +21,91 @@ android {
     }
 }
 
-buildscript {
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.novoda:bintray-release:0.2.10'
-    }
-}
-apply plugin: 'bintray-release'
+
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'com.nineoldandroids:library:2.4.0'
 }
 
-publish {
-    groupId = 'com.mingle.zzz40500'
-    artifactId = 'shapeLoadingView'
-    publishVersion = '1.0.1'
-    description='Loading view with pretty animation.'
-    website = 'https://github.com/zzz40500/android-shapeLoadingView'
+//publish {
+//    groupId = 'com.mingle.zzz40500'
+//    artifactId = 'shapeLoadingView'
+//    publishVersion = '1.0.3'
+//    description='Loading view with pretty animation.'
+//    website = 'https://github.com/zzz40500/android-shapeLoadingView'
+//}
+
+def siteUrl = 'https://github.com/zzz40500/android-shapeLoadingView'
+def gitUrl = 'https://github.com/zzz40500/android-shapeLoadingView.git'
+
+group = "com.mingle.zzz40500"
+
+install {
+    repositories.mavenInstaller {
+        // This generates POM.xml with proper parameters
+        pom {
+            project {
+                packaging 'aar'
+                name 'ShapeLoadingView'
+                url siteUrl
+                licenses {
+                    license {
+                        name 'The Apache Software License, Version 2.0'
+                        url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                    }
+                }
+                developers {
+                    developer {
+                        id 'zzz40500'
+                        name 'qingwei'
+                        email 'wyh405003836@126.com'
+                    }
+                }
+                scm {
+                    connection gitUrl
+                    developerConnection gitUrl
+                    url siteUrl
+                }
+            }
+        }
+    }
+}
+
+
+
+task sourcesJar(type: Jar) {
+    from android.sourceSets.main.java.srcDirs
+    classifier = 'sources'
+}
+
+task javadoc(type: Javadoc) {
+    source = android.sourceSets.main.java.srcDirs
+    classpath += project.files( android.getBootClasspath().join(File.pathSeparator))
+}
+
+task javadocJar(type: Jar, dependsOn: javadoc) {
+    classifier = 'javadoc'
+    from javadoc.destinationDir
+}
+
+artifacts {
+    archives javadocJar
+    archives sourcesJar
+}
+
+Properties properties = new Properties()
+properties.load(project.rootProject.file('local.properties').newDataInputStream())
+bintray {
+    user = properties.getProperty("bintray.user")
+    key = properties.getProperty("bintray.apikey")
+    configurations = ['archives']
+    pkg {
+        repo = "maven"
+        name = "ShapeLoadingView"
+        // #CONFIG# project name in jcenter
+        websiteUrl = siteUrl
+        vcsUrl = gitUrl
+        licenses = ["Apache-2.0"]
+        publish = true
+    }
 }
\ No newline at end of file
diff --git a/shapeloading/shapeloading.iml b/shapeloading/shapeloading.iml
index 12361cf..b64b0ff 100644
--- a/shapeloading/shapeloading.iml
+++ b/shapeloading/shapeloading.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":shapeloading" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="android-shapeLoadingView" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":shapeloading" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.mingle.zzz40500" external.system.module.version="1.0.3" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
@@ -65,6 +65,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build/docs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
@@ -84,7 +85,9 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/libs" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/poms" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
diff --git a/shapeloading/src/main/AndroidManifest.xml b/shapeloading/src/main/AndroidManifest.xml
index d486576..7968ddc 100644
--- a/shapeloading/src/main/AndroidManifest.xml
+++ b/shapeloading/src/main/AndroidManifest.xml
@@ -1,8 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.mingle.shapeloading">
 
-    <application android:allowBackup="true" android:label="@string/app_name">
 
-    </application>
 
 </manifest>
diff --git a/shapeloading/src/main/res/layout/layout_dialog.xml b/shapeloading/src/main/res/layout/layout_dialog.xml
index 7f1f0a1..b9fb2cc 100644
--- a/shapeloading/src/main/res/layout/layout_dialog.xml
+++ b/shapeloading/src/main/res/layout/layout_dialog.xml
@@ -2,8 +2,8 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:background="@drawable/aa_dialog_bg"
-    android:paddingLeft="64dp"
-    android:paddingRight="64dp"
+    android:paddingLeft="72dp"
+    android:paddingRight="72dp"
     android:paddingTop="36dp"
     android:paddingBottom="36dp"
     android:layout_width="match_parent"

From c4a5c8da436fe09a11f3ff3cdf56df3f1f5208e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=BE=E4=BC=9F=E6=98=8E?= <zengweiming@dkhs.com>
Date: Mon, 10 Aug 2015 18:35:50 +0800
Subject: [PATCH 08/16] fix bug

---
 .idea/vcs.xml                                 |   5 +-
 gradle.properties                             |  17 +-
 shapeloading/shapeloading.iml                 | 208 +++++++++++++++++-
 .../java/com/mingle/widget/LoadingView.java   |  50 ++++-
 .../com/mingle/widget/ShapeLoadingView.java   |  31 ++-
 .../src/main/res/drawable/aa_dialog_bg.xml    |   7 +
 shapeloading/src/main/res/values/strings.xml  |   2 +-
 shapeloading/src/main/res/values/styles.xml   |   5 -
 8 files changed, 285 insertions(+), 40 deletions(-)
 create mode 100644 shapeloading/src/main/res/drawable/aa_dialog_bg.xml

diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 275077f..6564d52 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
+    <mapping directory="" vcs="" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 1d3591c..c536318 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,18 +1,17 @@
-# Project-wide Gradle settings.
-
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-
+## Project-wide Gradle settings.
+#
 # For more details on how to configure your build environment visit
 # http://www.gradle.org/docs/current/userguide/build_environment.html
-
+#
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx10248m -XX:MaxPermSize=256m
 # org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
-
+#
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
\ No newline at end of file
+# org.gradle.parallel=true
+#Mon Aug 10 17:54:37 CST 2015
+systemProp.http.proxyHost=127.0.0.1
+systemProp.http.proxyPort=1080
diff --git a/shapeloading/shapeloading.iml b/shapeloading/shapeloading.iml
index b64b0ff..44a6011 100644
--- a/shapeloading/shapeloading.iml
+++ b/shapeloading/shapeloading.iml
@@ -65,7 +65,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build/docs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
@@ -85,13 +84,216 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
-      <excludeFolder url="file://$MODULE_DIR$/build/libs" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/poms" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="library-2.4.0" level="project" />
   </component>
+  <component name="org.twodividedbyzero.idea.findbugs">
+    <option name="_basePreferences">
+      <map>
+        <entry key="property.analysisEffortLevel" value="default" />
+        <entry key="property.analyzeAfterAutoMake" value="false" />
+        <entry key="property.analyzeAfterCompile" value="false" />
+        <entry key="property.annotationGutterIconEnabled" value="true" />
+        <entry key="property.annotationSuppressWarningsClass" value="edu.umd.cs.findbugs.annotations.SuppressFBWarnings" />
+        <entry key="property.annotationTextRangeMarkupEnabled" value="true" />
+        <entry key="property.exportAsHtml" value="true" />
+        <entry key="property.exportAsXml" value="true" />
+        <entry key="property.exportBaseDir" value="" />
+        <entry key="property.exportCreateArchiveDir" value="false" />
+        <entry key="property.exportOpenBrowser" value="true" />
+        <entry key="property.minPriorityToReport" value="Medium" />
+        <entry key="property.runAnalysisInBackground" value="false" />
+        <entry key="property.showHiddenDetectors" value="false" />
+        <entry key="property.toolWindowToFront" value="true" />
+      </map>
+    </option>
+    <option name="_detectors">
+      <map>
+        <entry key="AppendingToAnObjectOutputStream" value="true" />
+        <entry key="AtomicityProblem" value="true" />
+        <entry key="BadAppletConstructor" value="false" />
+        <entry key="BadResultSetAccess" value="true" />
+        <entry key="BadSyntaxForRegularExpression" value="true" />
+        <entry key="BadUseOfReturnValue" value="true" />
+        <entry key="BadlyOverriddenAdapter" value="true" />
+        <entry key="BooleanReturnNull" value="true" />
+        <entry key="BuildInterproceduralCallGraph" value="false" />
+        <entry key="BuildObligationPolicyDatabase" value="true" />
+        <entry key="BuildStringPassthruGraph" value="true" />
+        <entry key="CallToUnsupportedMethod" value="false" />
+        <entry key="CalledMethods" value="true" />
+        <entry key="CheckCalls" value="false" />
+        <entry key="CheckExpectedWarnings" value="false" />
+        <entry key="CheckImmutableAnnotation" value="true" />
+        <entry key="CheckRelaxingNullnessAnnotation" value="true" />
+        <entry key="CheckTypeQualifiers" value="true" />
+        <entry key="CloneIdiom" value="true" />
+        <entry key="ComparatorIdiom" value="true" />
+        <entry key="ConfusedInheritance" value="true" />
+        <entry key="ConfusionBetweenInheritedAndOuterMethod" value="true" />
+        <entry key="CovariantArrayAssignment" value="false" />
+        <entry key="CrossSiteScripting" value="true" />
+        <entry key="DefaultEncodingDetector" value="true" />
+        <entry key="DoInsideDoPrivileged" value="true" />
+        <entry key="DontCatchIllegalMonitorStateException" value="true" />
+        <entry key="DontIgnoreResultOfPutIfAbsent" value="true" />
+        <entry key="DontUseEnum" value="true" />
+        <entry key="DroppedException" value="true" />
+        <entry key="DumbMethodInvocations" value="true" />
+        <entry key="DumbMethods" value="true" />
+        <entry key="DuplicateBranches" value="true" />
+        <entry key="EmptyZipFileEntry" value="false" />
+        <entry key="EqualsOperandShouldHaveClassCompatibleWithThis" value="true" />
+        <entry key="ExplicitSerialization" value="true" />
+        <entry key="FieldItemSummary" value="true" />
+        <entry key="FinalizerNullsFields" value="true" />
+        <entry key="FindBadCast2" value="true" />
+        <entry key="FindBadForLoop" value="true" />
+        <entry key="FindBugsSummaryStats" value="true" />
+        <entry key="FindCircularDependencies" value="false" />
+        <entry key="FindComparatorProblems" value="true" />
+        <entry key="FindDeadLocalStores" value="true" />
+        <entry key="FindDoubleCheck" value="true" />
+        <entry key="FindEmptySynchronizedBlock" value="true" />
+        <entry key="FindFieldSelfAssignment" value="true" />
+        <entry key="FindFinalizeInvocations" value="true" />
+        <entry key="FindFloatEquality" value="true" />
+        <entry key="FindFloatMath" value="false" />
+        <entry key="FindHEmismatch" value="true" />
+        <entry key="FindInconsistentSync2" value="true" />
+        <entry key="FindJSR166LockMonitorenter" value="true" />
+        <entry key="FindLocalSelfAssignment2" value="true" />
+        <entry key="FindMaskedFields" value="true" />
+        <entry key="FindMismatchedWaitOrNotify" value="true" />
+        <entry key="FindNakedNotify" value="true" />
+        <entry key="FindNoSideEffectMethods" value="true" />
+        <entry key="FindNonSerializableStoreIntoSession" value="false" />
+        <entry key="FindNonSerializableValuePassedToWriteObject" value="false" />
+        <entry key="FindNonShortCircuit" value="true" />
+        <entry key="FindNullDeref" value="true" />
+        <entry key="FindNullDerefsInvolvingNonShortCircuitEvaluation" value="true" />
+        <entry key="FindOpenStream" value="true" />
+        <entry key="FindPuzzlers" value="true" />
+        <entry key="FindRefComparison" value="true" />
+        <entry key="FindReturnRef" value="true" />
+        <entry key="FindRoughConstants" value="true" />
+        <entry key="FindRunInvocations" value="true" />
+        <entry key="FindSelfComparison" value="true" />
+        <entry key="FindSelfComparison2" value="true" />
+        <entry key="FindSleepWithLockHeld" value="true" />
+        <entry key="FindSpinLoop" value="true" />
+        <entry key="FindSqlInjection" value="true" />
+        <entry key="FindTwoLockWait" value="true" />
+        <entry key="FindUncalledPrivateMethods" value="true" />
+        <entry key="FindUnconditionalWait" value="true" />
+        <entry key="FindUninitializedGet" value="true" />
+        <entry key="FindUnrelatedTypesInGenericContainer" value="true" />
+        <entry key="FindUnreleasedLock" value="true" />
+        <entry key="FindUnsatisfiedObligation" value="true" />
+        <entry key="FindUnsyncGet" value="true" />
+        <entry key="FindUseOfNonSerializableValue" value="true" />
+        <entry key="FindUselessControlFlow" value="true" />
+        <entry key="FindUselessObjects" value="true" />
+        <entry key="FormatStringChecker" value="true" />
+        <entry key="FunctionsThatMightBeMistakenForProcedures" value="true" />
+        <entry key="HugeSharedStringConstants" value="true" />
+        <entry key="IDivResultCastToDouble" value="true" />
+        <entry key="IncompatMask" value="true" />
+        <entry key="InconsistentAnnotations" value="true" />
+        <entry key="InefficientIndexOf" value="false" />
+        <entry key="InefficientInitializationInsideLoop" value="false" />
+        <entry key="InefficientMemberAccess" value="false" />
+        <entry key="InefficientToArray" value="false" />
+        <entry key="InfiniteLoop" value="true" />
+        <entry key="InfiniteRecursiveLoop" value="true" />
+        <entry key="InheritanceUnsafeGetResource" value="true" />
+        <entry key="InitializationChain" value="true" />
+        <entry key="InitializeNonnullFieldsInConstructor" value="true" />
+        <entry key="InstantiateStaticClass" value="true" />
+        <entry key="IntCast2LongAsInstant" value="true" />
+        <entry key="InvalidJUnitTest" value="true" />
+        <entry key="IteratorIdioms" value="true" />
+        <entry key="LazyInit" value="true" />
+        <entry key="LoadOfKnownNullValue" value="true" />
+        <entry key="LostLoggerDueToWeakReference" value="true" />
+        <entry key="MethodReturnCheck" value="true" />
+        <entry key="Methods" value="true" />
+        <entry key="MultithreadedInstanceAccess" value="true" />
+        <entry key="MutableEnum" value="true" />
+        <entry key="MutableLock" value="true" />
+        <entry key="MutableStaticFields" value="true" />
+        <entry key="Naming" value="true" />
+        <entry key="Noise" value="false" />
+        <entry key="NoiseNullDeref" value="false" />
+        <entry key="NoteAnnotationRetention" value="true" />
+        <entry key="NoteCheckReturnValueAnnotations" value="true" />
+        <entry key="NoteDirectlyRelevantTypeQualifiers" value="true" />
+        <entry key="NoteJCIPAnnotation" value="true" />
+        <entry key="NoteNonNullAnnotations" value="false" />
+        <entry key="NoteNonnullReturnValues" value="false" />
+        <entry key="NoteSuppressedWarnings" value="true" />
+        <entry key="NoteUnconditionalParamDerefs" value="true" />
+        <entry key="NumberConstructor" value="true" />
+        <entry key="OptionalReturnNull" value="true" />
+        <entry key="OverridingEqualsNotSymmetrical" value="true" />
+        <entry key="PreferZeroLengthArrays" value="true" />
+        <entry key="PublicSemaphores" value="false" />
+        <entry key="QuestionableBooleanAssignment" value="true" />
+        <entry key="ReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass" value="true" />
+        <entry key="ReadReturnShouldBeChecked" value="true" />
+        <entry key="RedundantConditions" value="true" />
+        <entry key="RedundantInterfaces" value="true" />
+        <entry key="ReflectiveClasses" value="true" />
+        <entry key="RepeatedConditionals" value="true" />
+        <entry key="ResolveAllReferences" value="false" />
+        <entry key="RuntimeExceptionCapture" value="true" />
+        <entry key="SerializableIdiom" value="true" />
+        <entry key="StartInConstructor" value="true" />
+        <entry key="StaticCalendarDetector" value="true" />
+        <entry key="StringConcatenation" value="true" />
+        <entry key="SuperfluousInstanceOf" value="true" />
+        <entry key="SuspiciousThreadInterrupted" value="true" />
+        <entry key="SwitchFallthrough" value="true" />
+        <entry key="SynchronizationOnSharedBuiltinConstant" value="true" />
+        <entry key="SynchronizeAndNullCheckField" value="true" />
+        <entry key="SynchronizeOnClassLiteralNotGetClass" value="true" />
+        <entry key="SynchronizingOnContentsOfFieldToProtectField" value="true" />
+        <entry key="TestASM" value="false" />
+        <entry key="TestDataflowAnalysis" value="false" />
+        <entry key="TestingGround" value="false" />
+        <entry key="TestingGround2" value="false" />
+        <entry key="TrainFieldStoreTypes" value="true" />
+        <entry key="TrainLongInstantfParams" value="true" />
+        <entry key="TrainNonNullAnnotations" value="true" />
+        <entry key="TrainUnconditionalDerefParams" value="true" />
+        <entry key="URLProblems" value="true" />
+        <entry key="UncallableMethodOfAnonymousClass" value="true" />
+        <entry key="UnnecessaryMath" value="true" />
+        <entry key="UnreadFields" value="true" />
+        <entry key="UselessSubclassMethod" value="false" />
+        <entry key="VarArgsProblems" value="true" />
+        <entry key="VolatileUsage" value="true" />
+        <entry key="WaitInLoop" value="true" />
+        <entry key="WrongMapIterator" value="true" />
+        <entry key="XMLFactoryBypass" value="true" />
+      </map>
+    </option>
+    <option name="_reportCategories">
+      <map>
+        <entry key="BAD_PRACTICE" value="true" />
+        <entry key="CORRECTNESS" value="true" />
+        <entry key="EXPERIMENTAL" value="true" />
+        <entry key="I18N" value="true" />
+        <entry key="MALICIOUS_CODE" value="true" />
+        <entry key="MT_CORRECTNESS" value="true" />
+        <entry key="PERFORMANCE" value="true" />
+        <entry key="SECURITY" value="true" />
+        <entry key="STYLE" value="true" />
+      </map>
+    </option>
+  </component>
 </module>
\ No newline at end of file
diff --git a/shapeloading/src/main/java/com/mingle/widget/LoadingView.java b/shapeloading/src/main/java/com/mingle/widget/LoadingView.java
index 77ed33d..463bcfb 100644
--- a/shapeloading/src/main/java/com/mingle/widget/LoadingView.java
+++ b/shapeloading/src/main/java/com/mingle/widget/LoadingView.java
@@ -29,7 +29,7 @@ public class LoadingView extends FrameLayout {
 
     private static final int ANIMATION_DURATION = 500;
 
-    private static  float mDistance = 200;
+    private static float mDistance = 200;
 
     private ShapeLoadingView mShapeLoadingView;
 
@@ -103,14 +103,50 @@ protected void onFinishInflate() {
 
         addView(view, layoutParams);
 
-        this.postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                freeFall();
-            }
-        }, 900);
 
+        startLoading(900);
+    }
+
+
+    private AnimatorSet mAnimatorSet = null;
+
+    private Runnable mFreeFallRunnable = new Runnable() {
+        @Override
+        public void run() {
+            freeFall();
+        }
+    };
+
+    private void startLoading(long delay) {
+        if (mAnimatorSet != null && mAnimatorSet.isRunning()) {
+            return;
+        }
+        this.removeCallbacks(mFreeFallRunnable);
+        if (delay > 0) {
+            this.postDelayed(mFreeFallRunnable, delay);
+        } else {
+            this.post(mFreeFallRunnable);
+        }
+    }
+
+    private void stopLoading() {
+        if (mAnimatorSet != null) {
+            if (mAnimatorSet.isRunning()) {
+                mAnimatorSet.cancel();
+            }
+            mAnimatorSet = null;
+        }
+        this.removeCallbacks(mFreeFallRunnable);
+    }
 
+    @Override
+    public void setVisibility(int visibility) {
+        super.setVisibility(visibility);
+        if (visibility == View.VISIBLE) {
+            startLoading(200);
+        } else {
+            stopLoading();
+        }
     }
 
     public void setLoadingText(CharSequence loadingText) {
diff --git a/shapeloading/src/main/java/com/mingle/widget/ShapeLoadingView.java b/shapeloading/src/main/java/com/mingle/widget/ShapeLoadingView.java
index 1d22600..7c47fa1 100644
--- a/shapeloading/src/main/java/com/mingle/widget/ShapeLoadingView.java
+++ b/shapeloading/src/main/java/com/mingle/widget/ShapeLoadingView.java
@@ -8,8 +8,12 @@
 import android.os.Build;
 import android.util.AttributeSet;
 import android.view.View;
+import android.view.animation.DecelerateInterpolator;
+import android.view.animation.Interpolator;
 
 import com.mingle.shapeloading.R;
+import com.nineoldandroids.animation.ArgbEvaluator;
+
 
 /**
  * Created by zzz40500 on 15/4/4.
@@ -21,6 +25,12 @@ public class ShapeLoadingView extends View {
     private static  final  float mTriangle2Circle =0.25555555f;
 
     private Shape mShape = Shape.SHAPE_CIRCLE;
+    private Interpolator mInterpolator=new DecelerateInterpolator();
+    private ArgbEvaluator mArgbEvaluator=new ArgbEvaluator();
+
+    private int mTriangleColor ;
+    private int mCircleColor  ;
+    private int mRectColor ;
 
     /**
      * 用赛贝尔曲线画圆
@@ -53,16 +63,15 @@ private void init() {
         mPaint.setAntiAlias(true);
         mPaint.setStyle(Paint.Style.FILL_AND_STROKE);
         setBackgroundColor(getResources().getColor(R.color.view_bg));
+          mTriangleColor = getResources().getColor(R.color.triangle);
+          mCircleColor = getResources().getColor(R.color.circle);
+          mRectColor = getResources().getColor(R.color.triangle);
     }
 
     public boolean mIsLoading = false;
-
-
     private Paint mPaint;
-
     private float mControlX = 0;
     private float mControlY = 0;
-
     private float mAnimPercent;
 
 
@@ -79,6 +88,8 @@ protected void onDraw(Canvas canvas) {
 
                 if (mIsLoading) {
                     mAnimPercent += 0.1611113;
+                    int color= (int) mArgbEvaluator.evaluate(mAnimPercent,mTriangleColor,mCircleColor);
+                    mPaint.setColor(color);
                     // triangle to circle
                     Path path = new Path();
                     path.moveTo(relativeXFromView(0.5f), relativeYFromView(0f));
@@ -90,15 +101,9 @@ protected void onDraw(Canvas canvas) {
                     }
                     float controlX = mControlX - relativeXFromView(mAnimPercent* mTriangle2Circle)
                             * genhao3;
-
                     float controlY = mControlY - relativeYFromView(mAnimPercent* mTriangle2Circle);
-
-
                     path.quadTo(relativeXFromView(1) - controlX, controlY, relativeXFromView(0.5f + genhao3 / 4), relativeYFromView(0.75f));
-
-
                     path.quadTo(relativeXFromView(0.5f), relativeYFromView(0.75f + 2 * mAnimPercent* mTriangle2Circle), relativeXFromView(0.5f - genhao3 / 4), relativeYFromView(0.75f));
-
                     path.quadTo(controlX, controlY, relativeXFromView(0.5f), relativeYFromView(0f));
                     path.close();
                     canvas.drawPath(path, mPaint);
@@ -108,11 +113,9 @@ protected void onDraw(Canvas canvas) {
                 } else {
                     Path path = new Path();
                     mPaint.setColor(getResources().getColor(R.color.triangle));
-
                     path.moveTo(relativeXFromView(0.5f), relativeYFromView(0f));
                     path.lineTo(relativeXFromView(1), relativeYFromView(genhao3 / 2f));
                     path.lineTo(relativeXFromView(0), relativeYFromView(genhao3/2f));
-
                     mControlX = relativeXFromView(0.5f - genhao3 / 8.0f);
                     mControlY = relativeYFromView(3 / 8.0f);
                     mAnimPercent = 0;
@@ -131,6 +134,8 @@ protected void onDraw(Canvas canvas) {
                         mShape = Shape.SHAPE_RECT;
                         mIsLoading = false;
                     }
+                    int color= (int) mArgbEvaluator.evaluate(mAnimPercent,mCircleColor,mRectColor);
+                    mPaint.setColor(color);
 
                     Path path = new Path();
 
@@ -196,6 +201,8 @@ protected void onDraw(Canvas canvas) {
                         mIsLoading = false;
                         mAnimPercent = 1;
                     }
+                    int color= (int) mArgbEvaluator.evaluate(mAnimPercent,mRectColor,mTriangleColor);
+                    mPaint.setColor(color);
                     Path path = new Path();
                     path.moveTo(relativeXFromView(0.5f * mAnimPercent), 0);
                     path.lineTo(relativeYFromView(1 - 0.5f * mAnimPercent), 0);
diff --git a/shapeloading/src/main/res/drawable/aa_dialog_bg.xml b/shapeloading/src/main/res/drawable/aa_dialog_bg.xml
new file mode 100644
index 0000000..a785252
--- /dev/null
+++ b/shapeloading/src/main/res/drawable/aa_dialog_bg.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners
+        android:radius="2dp"
+        />
+    <solid android:color="@color/dialog_bg" />
+</shape>
\ No newline at end of file
diff --git a/shapeloading/src/main/res/values/strings.xml b/shapeloading/src/main/res/values/strings.xml
index 1f502fa..f11f745 100644
--- a/shapeloading/src/main/res/values/strings.xml
+++ b/shapeloading/src/main/res/values/strings.xml
@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">ShapeLoading</string>
+
 </resources>
diff --git a/shapeloading/src/main/res/values/styles.xml b/shapeloading/src/main/res/values/styles.xml
index 4780689..4e434de 100644
--- a/shapeloading/src/main/res/values/styles.xml
+++ b/shapeloading/src/main/res/values/styles.xml
@@ -3,18 +3,13 @@
 
     <style name="custom_dialog" parent="@android:style/Theme.Dialog">
         <item name="android:windowFrame">@null</item>
-        <!-- Dialog的windowFrame框为无 -->
         <item name="android:windowIsFloating">true</item>
-        <!-- 是否漂现在activity上 -->
         <item name="android:windowIsTranslucent">true</item>
-        <!-- 是否半透明 -->
         <item name="android:windowNoTitle">true</item>
         <item name="android:background">@android:color/transparent</item>
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:windowContentOverlay">@null</item>
-        <!-- 去除黑色边框的关键设置项 -->
         <item name="android:backgroundDimEnabled">true</item>
-        <!-- 屏幕背景是否变暗 -->
         <item name="android:backgroundDimAmount">0.6</item>
     </style>
 </resources>
\ No newline at end of file

From 3c766183c7029c04ef5de18d5c60aae51275ec8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BD=BB=E5=BE=AE?= <wyh405003836@126.com>
Date: Tue, 11 Aug 2015 10:36:28 +0800
Subject: [PATCH 09/16] Update README.markdown

---
 README.markdown | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/README.markdown b/README.markdown
index 9d6e132..588b6f2 100644
--- a/README.markdown
+++ b/README.markdown
@@ -12,7 +12,19 @@
 [github 直达](https://github.com/zzz40500/android-shapeLoadingView)
 
 [![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-Shape%20Loading%20View-brightgreen.svg?style=flat)](http://android-arsenal.com/details/1/1897)
-
+###gradle      
+/build.gradle
+~~~
+repositories {
+    maven {
+        url "https://jitpack.io/"
+    }
+}
+~~~
+/app/build.gradle
+~~~
+compile 'com.github.zzz40500:android-shapeLoadingView:1.0.3'
+~~~
 #usage#
 
 布局上

From 09d01e8106ace7cbadae6465c84e09bbd98f929a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=BE=E4=BC=9F=E6=98=8E?= <wyh405003836@126.com>
Date: Mon, 31 Aug 2015 11:06:09 +0800
Subject: [PATCH 10/16] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E4=BB=93=E5=BA=93=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

删除上传仓库代码
---
 shapeloading/build.gradle | 85 ---------------------------------------
 1 file changed, 85 deletions(-)

diff --git a/shapeloading/build.gradle b/shapeloading/build.gradle
index b3d2967..0086ed7 100644
--- a/shapeloading/build.gradle
+++ b/shapeloading/build.gradle
@@ -1,7 +1,4 @@
 apply plugin: 'com.android.library'
-apply plugin: 'com.github.dcendents.android-maven'
-apply plugin: 'com.jfrog.bintray'
-version = "1.0.3"
 
 android {
     compileSdkVersion 21
@@ -27,85 +24,3 @@ dependencies {
     compile 'com.nineoldandroids:library:2.4.0'
 }
 
-//publish {
-//    groupId = 'com.mingle.zzz40500'
-//    artifactId = 'shapeLoadingView'
-//    publishVersion = '1.0.3'
-//    description='Loading view with pretty animation.'
-//    website = 'https://github.com/zzz40500/android-shapeLoadingView'
-//}
-
-def siteUrl = 'https://github.com/zzz40500/android-shapeLoadingView'
-def gitUrl = 'https://github.com/zzz40500/android-shapeLoadingView.git'
-
-group = "com.mingle.zzz40500"
-
-install {
-    repositories.mavenInstaller {
-        // This generates POM.xml with proper parameters
-        pom {
-            project {
-                packaging 'aar'
-                name 'ShapeLoadingView'
-                url siteUrl
-                licenses {
-                    license {
-                        name 'The Apache Software License, Version 2.0'
-                        url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-                    }
-                }
-                developers {
-                    developer {
-                        id 'zzz40500'
-                        name 'qingwei'
-                        email 'wyh405003836@126.com'
-                    }
-                }
-                scm {
-                    connection gitUrl
-                    developerConnection gitUrl
-                    url siteUrl
-                }
-            }
-        }
-    }
-}
-
-
-
-task sourcesJar(type: Jar) {
-    from android.sourceSets.main.java.srcDirs
-    classifier = 'sources'
-}
-
-task javadoc(type: Javadoc) {
-    source = android.sourceSets.main.java.srcDirs
-    classpath += project.files( android.getBootClasspath().join(File.pathSeparator))
-}
-
-task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
-    from javadoc.destinationDir
-}
-
-artifacts {
-    archives javadocJar
-    archives sourcesJar
-}
-
-Properties properties = new Properties()
-properties.load(project.rootProject.file('local.properties').newDataInputStream())
-bintray {
-    user = properties.getProperty("bintray.user")
-    key = properties.getProperty("bintray.apikey")
-    configurations = ['archives']
-    pkg {
-        repo = "maven"
-        name = "ShapeLoadingView"
-        // #CONFIG# project name in jcenter
-        websiteUrl = siteUrl
-        vcsUrl = gitUrl
-        licenses = ["Apache-2.0"]
-        publish = true
-    }
-}
\ No newline at end of file

From cbabf91a3c19538addb4cf25e4df19e44ebebbea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BD=BB=E5=BE=AE?= <wyh405003836@126.com>
Date: Mon, 31 Aug 2015 11:12:20 +0800
Subject: [PATCH 11/16] Update README.markdown

---
 README.markdown | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.markdown b/README.markdown
index 588b6f2..9c45e6d 100644
--- a/README.markdown
+++ b/README.markdown
@@ -23,7 +23,9 @@ repositories {
 ~~~
 /app/build.gradle
 ~~~
-compile 'com.github.zzz40500:android-shapeLoadingView:1.0.3'
+dependencies {
+	        compile 'com.github.zzz40500:android-shapeLoadingView:1.0.3.2'
+	}
 ~~~
 #usage#
 

From 188b66299c8fd635f77c17f292fe96f4468ce726 Mon Sep 17 00:00:00 2001
From: yanglw <weigeku8@gmail.com>
Date: Thu, 30 Jun 2016 18:14:07 +0800
Subject: [PATCH 12/16] fix #11

---
 .../java/com/mingle/widget/LoadingView.java   | 49 ++++++++++++++-----
 1 file changed, 37 insertions(+), 12 deletions(-)

diff --git a/shapeloading/src/main/java/com/mingle/widget/LoadingView.java b/shapeloading/src/main/java/com/mingle/widget/LoadingView.java
index 463bcfb..8dc1498 100644
--- a/shapeloading/src/main/java/com/mingle/widget/LoadingView.java
+++ b/shapeloading/src/main/java/com/mingle/widget/LoadingView.java
@@ -39,7 +39,8 @@ public class LoadingView extends FrameLayout {
     private int mTextAppearance;
 
     private String mLoadText;
-
+    private AnimatorSet mUpAnimatorSet;
+    private AnimatorSet mDownAnimatorSet;
 
     public LoadingView(Context context) {
         super(context);
@@ -118,7 +119,7 @@ public void run() {
     };
 
     private void startLoading(long delay) {
-        if (mAnimatorSet != null && mAnimatorSet.isRunning()) {
+        if (mDownAnimatorSet != null && mDownAnimatorSet.isRunning()) {
             return;
         }
         this.removeCallbacks(mFreeFallRunnable);
@@ -129,6 +130,12 @@ private void startLoading(long delay) {
         }
     }
 
+    @Override
+    protected void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+        stopLoading();
+    }
+
     private void stopLoading() {
         if (mAnimatorSet != null) {
             if (mAnimatorSet.isRunning()) {
@@ -136,6 +143,24 @@ private void stopLoading() {
             }
             mAnimatorSet = null;
         }
+        if (mUpAnimatorSet != null) {
+            if (mUpAnimatorSet.isRunning()) {
+                mUpAnimatorSet.cancel();
+            }
+            mUpAnimatorSet.removeAllListeners();
+            for (Animator animator : mUpAnimatorSet.getChildAnimations()) {
+                animator.removeAllListeners();
+            }
+        }
+        if (mDownAnimatorSet != null) {
+            if (mDownAnimatorSet.isRunning()) {
+                mDownAnimatorSet.cancel();
+            }
+            mDownAnimatorSet.removeAllListeners();
+            for (Animator animator : mDownAnimatorSet.getChildAnimations()) {
+                animator.removeAllListeners();
+            }
+        }
         this.removeCallbacks(mFreeFallRunnable);
     }
 
@@ -194,12 +219,12 @@ public void upThrow() {
         objectAnimator1.setDuration(ANIMATION_DURATION);
         objectAnimator.setInterpolator(new DecelerateInterpolator(factor));
         objectAnimator1.setInterpolator(new DecelerateInterpolator(factor));
-        AnimatorSet animatorSet = new AnimatorSet();
-        animatorSet.setDuration(ANIMATION_DURATION);
-        animatorSet.playTogether(objectAnimator, objectAnimator1, scaleIndication);
+        mUpAnimatorSet = new AnimatorSet();
+        mUpAnimatorSet.setDuration(ANIMATION_DURATION);
+        mUpAnimatorSet.playTogether(objectAnimator, objectAnimator1, scaleIndication);
 
 
-        animatorSet.addListener(new Animator.AnimatorListener() {
+        mUpAnimatorSet.addListener(new Animator.AnimatorListener() {
             @Override
             public void onAnimationStart(Animator animation) {
 
@@ -222,7 +247,7 @@ public void onAnimationRepeat(Animator animation) {
 
             }
         });
-        animatorSet.start();
+        mUpAnimatorSet.start();
 
 
     }
@@ -240,10 +265,10 @@ public void freeFall() {
 
         objectAnimator.setDuration(ANIMATION_DURATION);
         objectAnimator.setInterpolator(new AccelerateInterpolator(factor));
-        AnimatorSet animatorSet = new AnimatorSet();
-        animatorSet.setDuration(ANIMATION_DURATION);
-        animatorSet.playTogether(objectAnimator, scaleIndication);
-        animatorSet.addListener(new Animator.AnimatorListener() {
+        mDownAnimatorSet = new AnimatorSet();
+        mDownAnimatorSet.setDuration(ANIMATION_DURATION);
+        mDownAnimatorSet.playTogether(objectAnimator, scaleIndication);
+        mDownAnimatorSet.addListener(new Animator.AnimatorListener() {
             @Override
             public void onAnimationStart(Animator animation) {
 
@@ -267,7 +292,7 @@ public void onAnimationRepeat(Animator animation) {
 
             }
         });
-        animatorSet.start();
+        mDownAnimatorSet.start();
 
 
     }

From 4fccc67365468524dc6f5612f0612c0ba3c03a5f Mon Sep 17 00:00:00 2001
From: yanglw <weigeku8@gmail.com>
Date: Sat, 1 Apr 2017 18:04:15 +0800
Subject: [PATCH 13/16] fix #14
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复上下移动的滑动因为每次都创建新的动画对象而导致的内存泄露。
---
 .../java/com/mingle/widget/LoadingView.java   | 129 +++++++++---------
 1 file changed, 63 insertions(+), 66 deletions(-)

diff --git a/shapeloading/src/main/java/com/mingle/widget/LoadingView.java b/shapeloading/src/main/java/com/mingle/widget/LoadingView.java
index 8dc1498..a7b5c72 100644
--- a/shapeloading/src/main/java/com/mingle/widget/LoadingView.java
+++ b/shapeloading/src/main/java/com/mingle/widget/LoadingView.java
@@ -191,62 +191,59 @@ public void setLoadingText(CharSequence loadingText) {
      */
     public void upThrow() {
 
-        ObjectAnimator objectAnimator = ObjectAnimator.ofFloat(mShapeLoadingView, "translationY", mDistance, 0);
-        ObjectAnimator scaleIndication = ObjectAnimator.ofFloat(mIndicationIm, "scaleX", 0.2f, 1);
+        if (mUpAnimatorSet == null) {
+            ObjectAnimator objectAnimator = ObjectAnimator.ofFloat(mShapeLoadingView, "translationY", mDistance, 0);
+            ObjectAnimator scaleIndication = ObjectAnimator.ofFloat(mIndicationIm, "scaleX", 0.2f, 1);
 
+            ObjectAnimator objectAnimator1 = null;
+            switch (mShapeLoadingView.getShape()) {
+                case SHAPE_RECT:
 
-        ObjectAnimator objectAnimator1 = null;
-        switch (mShapeLoadingView.getShape()) {
-            case SHAPE_RECT:
+                    objectAnimator1 = ObjectAnimator.ofFloat(mShapeLoadingView, "rotation", 0, -120);
 
+                    break;
+                case SHAPE_CIRCLE:
+                    objectAnimator1 = ObjectAnimator.ofFloat(mShapeLoadingView, "rotation", 0, 180);
 
-                objectAnimator1 = ObjectAnimator.ofFloat(mShapeLoadingView, "rotation", 0, -120);
+                    break;
+                case SHAPE_TRIANGLE:
 
-                break;
-            case SHAPE_CIRCLE:
-                objectAnimator1 = ObjectAnimator.ofFloat(mShapeLoadingView, "rotation", 0, 180);
+                    objectAnimator1 = ObjectAnimator.ofFloat(mShapeLoadingView, "rotation", 0, 180);
 
-                break;
-            case SHAPE_TRIANGLE:
-
-                objectAnimator1 = ObjectAnimator.ofFloat(mShapeLoadingView, "rotation", 0, 180);
-
-                break;
-        }
-
-
-        objectAnimator.setDuration(ANIMATION_DURATION);
-        objectAnimator1.setDuration(ANIMATION_DURATION);
-        objectAnimator.setInterpolator(new DecelerateInterpolator(factor));
-        objectAnimator1.setInterpolator(new DecelerateInterpolator(factor));
-        mUpAnimatorSet = new AnimatorSet();
-        mUpAnimatorSet.setDuration(ANIMATION_DURATION);
-        mUpAnimatorSet.playTogether(objectAnimator, objectAnimator1, scaleIndication);
+                    break;
+            }
 
+            objectAnimator.setDuration(ANIMATION_DURATION);
+            objectAnimator1.setDuration(ANIMATION_DURATION);
+            objectAnimator.setInterpolator(new DecelerateInterpolator(factor));
+            objectAnimator1.setInterpolator(new DecelerateInterpolator(factor));
+            mUpAnimatorSet = new AnimatorSet();
+            mUpAnimatorSet.setDuration(ANIMATION_DURATION);
+            mUpAnimatorSet.playTogether(objectAnimator, objectAnimator1, scaleIndication);
 
-        mUpAnimatorSet.addListener(new Animator.AnimatorListener() {
-            @Override
-            public void onAnimationStart(Animator animation) {
+            mUpAnimatorSet.addListener(new Animator.AnimatorListener() {
+                @Override
+                public void onAnimationStart(Animator animation) {
 
-            }
+                }
 
-            @Override
-            public void onAnimationEnd(Animator animation) {
-                freeFall();
+                @Override
+                public void onAnimationEnd(Animator animation) {
+                    freeFall();
 
+                }
 
-            }
+                @Override
+                public void onAnimationCancel(Animator animation) {
 
-            @Override
-            public void onAnimationCancel(Animator animation) {
-
-            }
+                }
 
-            @Override
-            public void onAnimationRepeat(Animator animation) {
+                @Override
+                public void onAnimationRepeat(Animator animation) {
 
-            }
-        });
+                }
+            });
+        }
         mUpAnimatorSet.start();
 
 
@@ -259,39 +256,39 @@ public void onAnimationRepeat(Animator animation) {
      */
     public void freeFall() {
 
-        ObjectAnimator objectAnimator = ObjectAnimator.ofFloat(mShapeLoadingView, "translationY", 0, mDistance);
-        ObjectAnimator scaleIndication = ObjectAnimator.ofFloat(mIndicationIm, "scaleX", 1, 0.2f);
+        if (mDownAnimatorSet == null) {
+            ObjectAnimator objectAnimator = ObjectAnimator.ofFloat(mShapeLoadingView, "translationY", 0, mDistance);
+            ObjectAnimator scaleIndication = ObjectAnimator.ofFloat(mIndicationIm, "scaleX", 1, 0.2f);
 
+            objectAnimator.setDuration(ANIMATION_DURATION);
+            objectAnimator.setInterpolator(new AccelerateInterpolator(factor));
+            mDownAnimatorSet = new AnimatorSet();
+            mDownAnimatorSet.setDuration(ANIMATION_DURATION);
+            mDownAnimatorSet.playTogether(objectAnimator, scaleIndication);
+            mDownAnimatorSet.addListener(new Animator.AnimatorListener() {
+                @Override
+                public void onAnimationStart(Animator animation) {
 
-        objectAnimator.setDuration(ANIMATION_DURATION);
-        objectAnimator.setInterpolator(new AccelerateInterpolator(factor));
-        mDownAnimatorSet = new AnimatorSet();
-        mDownAnimatorSet.setDuration(ANIMATION_DURATION);
-        mDownAnimatorSet.playTogether(objectAnimator, scaleIndication);
-        mDownAnimatorSet.addListener(new Animator.AnimatorListener() {
-            @Override
-            public void onAnimationStart(Animator animation) {
+                }
 
-            }
+                @Override
+                public void onAnimationEnd(Animator animation) {
 
-            @Override
-            public void onAnimationEnd(Animator animation) {
+                    mShapeLoadingView.changeShape();
+                    upThrow();
+                }
 
+                @Override
+                public void onAnimationCancel(Animator animation) {
 
-                mShapeLoadingView.changeShape();
-                upThrow();
-            }
+                }
 
-            @Override
-            public void onAnimationCancel(Animator animation) {
+                @Override
+                public void onAnimationRepeat(Animator animation) {
 
-            }
-
-            @Override
-            public void onAnimationRepeat(Animator animation) {
-
-            }
-        });
+                }
+            });
+        }
         mDownAnimatorSet.start();
 
 

From 1480aa329b630b41fc61310c77d8ed4fa66f914b Mon Sep 17 00:00:00 2001
From: wxj <986798656@qq.com>
Date: Fri, 5 May 2017 11:10:33 +0800
Subject: [PATCH 14/16] update gradle

---
 .gitignore                                    |  3 +-
 .idea/gradle.xml                              | 20 ------
 .idea/misc.xml                                | 49 --------------
 .idea/vcs.xml                                 |  6 --
 app/app.iml                                   | 64 +++++++++++--------
 app/build.gradle                              |  2 +-
 build.gradle                                  |  2 +-
 gradle/wrapper/gradle-wrapper.properties      |  4 +-
 shapeloading/build.gradle                     |  2 +-
 shapeloading/shapeloading.iml                 | 51 ++++++++-------
 .../{loading_arrt.xml => loading_attr.xml}    |  0
 11 files changed, 73 insertions(+), 130 deletions(-)
 delete mode 100644 .idea/gradle.xml
 delete mode 100644 .idea/misc.xml
 delete mode 100644 .idea/vcs.xml
 rename shapeloading/src/main/res/values/{loading_arrt.xml => loading_attr.xml} (100%)

diff --git a/.gitignore b/.gitignore
index afbdab3..cfb7164 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 .gradle
 /local.properties
-/.idea/workspace.xml
-/.idea/libraries
+/.idea
 .DS_Store
 /build
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
deleted file mode 100644
index b6351a7..0000000
--- a/.idea/gradle.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="distributionType" value="LOCAL" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="F:\AndroidStudio\gradle\gradle-2.2.1" />
-        <option name="gradleJvm" value="1.7" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/app" />
-            <option value="$PROJECT_DIR$/shapeloading" />
-          </set>
-        </option>
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index a2cdff1..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
-  <component name="NullableNotNullManager">
-    <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
-    <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
-    <option name="myNullables">
-      <value>
-        <list size="4">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
-          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
-        </list>
-      </value>
-    </option>
-    <option name="myNotNulls">
-      <value>
-        <list size="4">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
-          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
-        </list>
-      </value>
-    </option>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ProjectJDKs.UI">
-        <settings>
-          <last-edited>1.7</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 6564d52..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/app/app.iml b/app/app.iml
index cf6f2d7..1f992c3 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -9,13 +9,9 @@
     <facet type="android" name="Android">
       <configuration>
         <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
-        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
         <afterSyncTasks>
-          <task>generateDebugAndroidTestSources</task>
           <task>generateDebugSources</task>
         </afterSyncTasks>
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
@@ -28,72 +24,88 @@
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.0.0/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.0.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" exported="" name="appcompat-v7-22.0.0" level="project" />
     <orderEntry type="library" exported="" name="support-v4-22.0.0" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-22.0.0" level="project" />
-    <orderEntry type="library" exported="" name="appcompat-v7-22.0.0" level="project" />
-    <orderEntry type="library" exported="" name="library-2.4.0" level="project" />
     <orderEntry type="module" module-name="shapeloading" exported="" />
+    <orderEntry type="library" exported="" name="library-2.4.0" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 4bcc3c3..82c9d80 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.2"
+    buildToolsVersion '25.0.0'
 
     defaultConfig {
         applicationId "com.mingle"
diff --git a/build.gradle b/build.gradle
index 64a2967..150656d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.3'
+        classpath 'com.android.tools.build:gradle:2.3.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0c71e76..1c09fa9 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Apr 10 15:27:10 PDT 2013
+#Fri May 05 11:08:53 CST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
diff --git a/shapeloading/build.gradle b/shapeloading/build.gradle
index 0086ed7..44fc68d 100644
--- a/shapeloading/build.gradle
+++ b/shapeloading/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.2"
+    buildToolsVersion '25.0.0'
 
     defaultConfig {
         minSdkVersion 9
diff --git a/shapeloading/shapeloading.iml b/shapeloading/shapeloading.iml
index 44a6011..d427cf8 100644
--- a/shapeloading/shapeloading.iml
+++ b/shapeloading/shapeloading.iml
@@ -9,13 +9,9 @@
     <facet type="android" name="Android">
       <configuration>
         <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
-        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
         <afterSyncTasks>
-          <task>generateDebugAndroidTestSources</task>
           <task>generateDebugSources</task>
         </afterSyncTasks>
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
@@ -23,67 +19,78 @@
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
         <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
-        <option name="LIBRARY_PROJECT" value="true" />
+        <option name="PROJECT_TYPE" value="1" />
       </configuration>
     </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
diff --git a/shapeloading/src/main/res/values/loading_arrt.xml b/shapeloading/src/main/res/values/loading_attr.xml
similarity index 100%
rename from shapeloading/src/main/res/values/loading_arrt.xml
rename to shapeloading/src/main/res/values/loading_attr.xml

From 7594d24f47d57de8755e231bff327e8c12a88a8b Mon Sep 17 00:00:00 2001
From: wxj <986798656@qq.com>
Date: Fri, 5 May 2017 13:45:47 +0800
Subject: [PATCH 15/16] =?UTF-8?q?fix=20#17,=20=E5=8E=BB=E9=99=A4=E6=97=A0?=
 =?UTF-8?q?=E7=94=A8=E8=B5=84=E6=BA=90=EF=BC=8C=E4=BC=98=E5=8C=96=E5=B8=83?=
 =?UTF-8?q?=E5=B1=80=EF=BC=8C=20=20=E4=BC=98=E5=8C=96dialog=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BD=93=E5=9C=86=E5=88=B0=E6=96=B9=E7=9A=84?=
 =?UTF-8?q?=E4=B8=80=E7=9E=AC=E9=97=B4=E7=9A=84=E9=A2=9C=E8=89=B2bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/copyright/profiles_settings.xml         |   3 -
 app/app.iml                                   |  15 +-
 app/build.gradle                              |   6 +-
 .../java/com/mingle/DialogDemoActivity.java   |   5 +-
 shapeloading/build.gradle                     |   4 +-
 shapeloading/shapeloading.iml                 |   2 +-
 .../java/com/mingle/widget/LoadingView.java   | 145 ++++++++++--------
 .../com/mingle/widget/ShapeLoadingDialog.java | 106 +++++++++----
 .../com/mingle/widget/ShapeLoadingView.java   |  53 ++++---
 .../src/main/res/layout/layout_dialog.xml     |  10 +-
 .../src/main/res/layout/load_view.xml         |  63 ++++----
 .../src/main/res/values/loading_attr.xml      |   4 +-
 12 files changed, 241 insertions(+), 175 deletions(-)
 delete mode 100644 .idea/copyright/profiles_settings.xml

diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/app/app.iml b/app/app.iml
index 1f992c3..2ffb599 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -100,11 +100,18 @@
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="appcompat-v7-22.0.0" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-22.0.0" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-22.0.0" level="project" />
+    <orderEntry type="library" exported="" name="support-core-ui-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="support-media-compat-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="appcompat-v7-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="support-vector-drawable-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="support-compat-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="support-core-utils-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="support-fragment-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="animated-vector-drawable-25.3.1" level="project" />
     <orderEntry type="module" module-name="shapeloading" exported="" />
     <orderEntry type="library" exported="" name="library-2.4.0" level="project" />
   </component>
diff --git a/app/build.gradle b/app/build.gradle
index 82c9d80..2b4202a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 21
+    compileSdkVersion 25
     buildToolsVersion '25.0.0'
 
     defaultConfig {
         applicationId "com.mingle"
         minSdkVersion 9
-        targetSdkVersion 21
+        targetSdkVersion 25
         versionCode 1
         versionName "1.0"
     }
@@ -21,6 +21,6 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:22.0.0'
+    compile 'com.android.support:appcompat-v7:25.3.1'
     compile project(':shapeloading')
 }
diff --git a/app/src/main/java/com/mingle/DialogDemoActivity.java b/app/src/main/java/com/mingle/DialogDemoActivity.java
index 44ea227..2181790 100644
--- a/app/src/main/java/com/mingle/DialogDemoActivity.java
+++ b/app/src/main/java/com/mingle/DialogDemoActivity.java
@@ -16,8 +16,9 @@ public class DialogDemoActivity extends ActionBarActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_dialog_demo);
-         shapeLoadingDialog=new ShapeLoadingDialog(this);
-        shapeLoadingDialog.setLoadingText("加载中...");
+        shapeLoadingDialog = new ShapeLoadingDialog.Builder(this)
+                .loadText("加载中...")
+                .build();
 
 
         findViewById(R.id.button1).setOnClickListener(new View.OnClickListener() {
diff --git a/shapeloading/build.gradle b/shapeloading/build.gradle
index 44fc68d..dd5cbf4 100644
--- a/shapeloading/build.gradle
+++ b/shapeloading/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 21
+    compileSdkVersion 25
     buildToolsVersion '25.0.0'
 
     defaultConfig {
         minSdkVersion 9
-        targetSdkVersion 21
+        targetSdkVersion 25
         versionCode 1
         versionName "1.0.3"
     }
diff --git a/shapeloading/shapeloading.iml b/shapeloading/shapeloading.iml
index d427cf8..44a74e6 100644
--- a/shapeloading/shapeloading.iml
+++ b/shapeloading/shapeloading.iml
@@ -94,7 +94,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="library-2.4.0" level="project" />
   </component>
diff --git a/shapeloading/src/main/java/com/mingle/widget/LoadingView.java b/shapeloading/src/main/java/com/mingle/widget/LoadingView.java
index a7b5c72..db6b5c0 100644
--- a/shapeloading/src/main/java/com/mingle/widget/LoadingView.java
+++ b/shapeloading/src/main/java/com/mingle/widget/LoadingView.java
@@ -12,23 +12,26 @@
 import android.view.ViewGroup;
 import android.view.animation.AccelerateInterpolator;
 import android.view.animation.DecelerateInterpolator;
-import android.widget.FrameLayout;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.mingle.shapeloading.R;
 import com.nineoldandroids.animation.Animator;
 import com.nineoldandroids.animation.AnimatorSet;
 import com.nineoldandroids.animation.ObjectAnimator;
+import com.nineoldandroids.view.ViewHelper;
 
 
 /**
  * Created by zzz40500 on 15/4/6.
  */
-public class LoadingView extends FrameLayout {
+public class LoadingView extends LinearLayout {
 
     private static final int ANIMATION_DURATION = 500;
 
+    private static final float FACTOR = 1.2f;
+
     private static float mDistance = 200;
 
     private ShapeLoadingView mShapeLoadingView;
@@ -42,27 +45,23 @@ public class LoadingView extends FrameLayout {
     private AnimatorSet mUpAnimatorSet;
     private AnimatorSet mDownAnimatorSet;
 
+    private boolean mStopped = false;
+
+    private int mDelay;
+
     public LoadingView(Context context) {
         super(context);
+        init(context, null);
     }
 
     public LoadingView(Context context, AttributeSet attrs) {
-        super(context, attrs, 0);
+        super(context, attrs);
         init(context, attrs);
 
     }
 
-    private void init(Context context, AttributeSet attrs) {
-
-        TypedArray typedArray = context
-                .obtainStyledAttributes(attrs, R.styleable.LoadingView);
-        mLoadText = typedArray.getString(R.styleable.LoadingView_loadingText);
-        mTextAppearance = typedArray.getResourceId(R.styleable.LoadingView_loadingTextAppearance, -1);
-
-        typedArray.recycle();
-    }
-
 
+    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
     public LoadingView(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
         init(context, attrs);
@@ -74,8 +73,34 @@ public LoadingView(Context context, AttributeSet attrs, int defStyleAttr, int de
         init(context, attrs);
     }
 
-    public int dip2px(float dipValue) {
-        final float scale = getContext().getResources().getDisplayMetrics().density;
+    private void init(Context context, AttributeSet attrs) {
+
+        setOrientation(VERTICAL);
+        mDistance = dip2px(context, 54f);
+        LayoutInflater.from(context).inflate(R.layout.load_view, this, true);
+        mShapeLoadingView = (ShapeLoadingView) findViewById(R.id.shapeLoadingView);
+        mIndicationIm = (ImageView) findViewById(R.id.indication);
+        mLoadTextView = (TextView) findViewById(R.id.promptTV);
+        ViewHelper.setScaleX(mIndicationIm, 0.2f);
+
+        TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.LoadingView);
+        String loadText = typedArray.getString(R.styleable.LoadingView_loadingText);
+        int textAppearance = typedArray.getResourceId(R.styleable.LoadingView_loadingText, -1);
+        mDelay = typedArray.getInteger(R.styleable.LoadingView_delay, 80);
+        typedArray.recycle();
+
+        if (textAppearance != -1) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                mLoadTextView.setTextAppearance(textAppearance);
+            } else {
+                mLoadTextView.setTextAppearance(getContext(), textAppearance);
+            }
+        }
+        setLoadingText(loadText);
+    }
+
+    private int dip2px(Context context, float dipValue) {
+        final float scale = context.getResources().getDisplayMetrics().density;
         return (int) (dipValue * scale + 0.5f);
     }
 
@@ -83,37 +108,18 @@ public int dip2px(float dipValue) {
     @Override
     protected void onFinishInflate() {
         super.onFinishInflate();
-
-        View view = LayoutInflater.from(getContext()).inflate(R.layout.load_view, null);
-
-        mDistance = dip2px(54f);
-
-        LayoutParams layoutParams = new LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-
-        layoutParams.gravity = Gravity.CENTER;
-
-        mShapeLoadingView = (ShapeLoadingView) view.findViewById(R.id.shapeLoadingView);
-
-        mIndicationIm = (ImageView) view.findViewById(R.id.indication);
-        mLoadTextView = (TextView) view.findViewById(R.id.promptTV);
-
-        if (mTextAppearance != -1) {
-            mLoadTextView.setTextAppearance(getContext(), mTextAppearance);
+        if (getVisibility() == VISIBLE) {
+            startLoading(mDelay);
         }
-        setLoadingText(mLoadText);
-
-        addView(view, layoutParams);
-
-
-        startLoading(900);
     }
 
-
-    private AnimatorSet mAnimatorSet = null;
-
     private Runnable mFreeFallRunnable = new Runnable() {
         @Override
         public void run() {
+            ViewHelper.setRotation(mShapeLoadingView, 180f);
+            ViewHelper.setTranslationY(mShapeLoadingView, 0f);
+            ViewHelper.setScaleX(mIndicationIm, 0.2f);
+            mStopped = false;
             freeFall();
         }
     };
@@ -137,12 +143,7 @@ protected void onDetachedFromWindow() {
     }
 
     private void stopLoading() {
-        if (mAnimatorSet != null) {
-            if (mAnimatorSet.isRunning()) {
-                mAnimatorSet.cancel();
-            }
-            mAnimatorSet = null;
-        }
+        mStopped = true;
         if (mUpAnimatorSet != null) {
             if (mUpAnimatorSet.isRunning()) {
                 mUpAnimatorSet.cancel();
@@ -151,6 +152,7 @@ private void stopLoading() {
             for (Animator animator : mUpAnimatorSet.getChildAnimations()) {
                 animator.removeAllListeners();
             }
+            mUpAnimatorSet = null;
         }
         if (mDownAnimatorSet != null) {
             if (mDownAnimatorSet.isRunning()) {
@@ -160,23 +162,34 @@ private void stopLoading() {
             for (Animator animator : mDownAnimatorSet.getChildAnimations()) {
                 animator.removeAllListeners();
             }
+            mDownAnimatorSet = null;
         }
         this.removeCallbacks(mFreeFallRunnable);
     }
 
     @Override
     public void setVisibility(int visibility) {
+        this.setVisibility(visibility, mDelay);
+    }
+
+    public void setVisibility(int visibility, int delay) {
         super.setVisibility(visibility);
         if (visibility == View.VISIBLE) {
-            startLoading(200);
+            startLoading(delay);
         } else {
             stopLoading();
         }
     }
 
-    public void setLoadingText(CharSequence loadingText) {
+    public void setDelay(int delay) {
+        mDelay = delay;
+    }
 
+    public int getDelay() {
+        return mDelay;
+    }
 
+    public void setLoadingText(CharSequence loadingText) {
         if (TextUtils.isEmpty(loadingText)) {
             mLoadTextView.setVisibility(GONE);
         } else {
@@ -186,6 +199,10 @@ public void setLoadingText(CharSequence loadingText) {
         mLoadTextView.setText(loadingText);
     }
 
+    public CharSequence getLoadingText(){
+        return mLoadTextView.getText();
+    }
+
     /**
      * 上抛
      */
@@ -193,13 +210,13 @@ public void upThrow() {
 
         if (mUpAnimatorSet == null) {
             ObjectAnimator objectAnimator = ObjectAnimator.ofFloat(mShapeLoadingView, "translationY", mDistance, 0);
-            ObjectAnimator scaleIndication = ObjectAnimator.ofFloat(mIndicationIm, "scaleX", 0.2f, 1);
+            ObjectAnimator scaleIndication = ObjectAnimator.ofFloat(mIndicationIm, "scaleX", 1f, 0.2f);
 
             ObjectAnimator objectAnimator1 = null;
             switch (mShapeLoadingView.getShape()) {
                 case SHAPE_RECT:
 
-                    objectAnimator1 = ObjectAnimator.ofFloat(mShapeLoadingView, "rotation", 0, -120);
+                    objectAnimator1 = ObjectAnimator.ofFloat(mShapeLoadingView, "rotation", 0, 180);
 
                     break;
                 case SHAPE_CIRCLE:
@@ -213,14 +230,12 @@ public void upThrow() {
                     break;
             }
 
-            objectAnimator.setDuration(ANIMATION_DURATION);
-            objectAnimator1.setDuration(ANIMATION_DURATION);
-            objectAnimator.setInterpolator(new DecelerateInterpolator(factor));
-            objectAnimator1.setInterpolator(new DecelerateInterpolator(factor));
             mUpAnimatorSet = new AnimatorSet();
-            mUpAnimatorSet.setDuration(ANIMATION_DURATION);
             mUpAnimatorSet.playTogether(objectAnimator, objectAnimator1, scaleIndication);
 
+            mUpAnimatorSet.setDuration(ANIMATION_DURATION);
+            mUpAnimatorSet.setInterpolator(new DecelerateInterpolator(FACTOR));
+
             mUpAnimatorSet.addListener(new Animator.AnimatorListener() {
                 @Override
                 public void onAnimationStart(Animator animation) {
@@ -229,7 +244,9 @@ public void onAnimationStart(Animator animation) {
 
                 @Override
                 public void onAnimationEnd(Animator animation) {
-                    freeFall();
+                    if (!mStopped) {
+                        freeFall();
+                    }
 
                 }
 
@@ -249,8 +266,6 @@ public void onAnimationRepeat(Animator animation) {
 
     }
 
-    public float factor = 1.2f;
-
     /**
      * 下落
      */
@@ -258,13 +273,12 @@ public void freeFall() {
 
         if (mDownAnimatorSet == null) {
             ObjectAnimator objectAnimator = ObjectAnimator.ofFloat(mShapeLoadingView, "translationY", 0, mDistance);
-            ObjectAnimator scaleIndication = ObjectAnimator.ofFloat(mIndicationIm, "scaleX", 1, 0.2f);
+            ObjectAnimator scaleIndication = ObjectAnimator.ofFloat(mIndicationIm, "scaleX", 0.2f, 1f);
 
-            objectAnimator.setDuration(ANIMATION_DURATION);
-            objectAnimator.setInterpolator(new AccelerateInterpolator(factor));
             mDownAnimatorSet = new AnimatorSet();
-            mDownAnimatorSet.setDuration(ANIMATION_DURATION);
             mDownAnimatorSet.playTogether(objectAnimator, scaleIndication);
+            mDownAnimatorSet.setDuration(ANIMATION_DURATION);
+            mDownAnimatorSet.setInterpolator(new AccelerateInterpolator(FACTOR));
             mDownAnimatorSet.addListener(new Animator.AnimatorListener() {
                 @Override
                 public void onAnimationStart(Animator animation) {
@@ -273,9 +287,10 @@ public void onAnimationStart(Animator animation) {
 
                 @Override
                 public void onAnimationEnd(Animator animation) {
-
-                    mShapeLoadingView.changeShape();
-                    upThrow();
+                    if (!mStopped) {
+                        mShapeLoadingView.changeShape();
+                        upThrow();
+                    }
                 }
 
                 @Override
diff --git a/shapeloading/src/main/java/com/mingle/widget/ShapeLoadingDialog.java b/shapeloading/src/main/java/com/mingle/widget/ShapeLoadingDialog.java
index 5e8f91a..dd7b2b8 100644
--- a/shapeloading/src/main/java/com/mingle/widget/ShapeLoadingDialog.java
+++ b/shapeloading/src/main/java/com/mingle/widget/ShapeLoadingDialog.java
@@ -2,7 +2,9 @@
 
 import android.app.Dialog;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.graphics.drawable.GradientDrawable;
+import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 
@@ -11,53 +13,97 @@
 /**
  * Created by zzz40500 on 15/6/15.
  */
-public class ShapeLoadingDialog {
+public class ShapeLoadingDialog extends Dialog{
 
-
-
-    private Context mContext;
-    private Dialog mDialog;
     private LoadingView mLoadingView;
-    private View mDialogContentView;
 
+    private Builder mBuilder;
 
-    public ShapeLoadingDialog(Context context) {
-        this.mContext=context;
-        init();
+    private ShapeLoadingDialog(Builder builder) {
+        super(builder.mContext, R.style.custom_dialog);
+        mBuilder = builder;
+        setCancelable(mBuilder.mCancelable);
+        setCanceledOnTouchOutside(mBuilder.mCanceledOnTouchOutside);
     }
 
-    private void init() {
-        mDialog = new Dialog(mContext, R.style.custom_dialog);
-        mDialogContentView= LayoutInflater.from(mContext).inflate(R.layout.layout_dialog,null);
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.layout_dialog);
 
+        mLoadingView = (LoadingView) findViewById(R.id.loadView);
 
-        mLoadingView= (LoadingView) mDialogContentView.findViewById(R.id.loadView);
-        mDialog.setContentView(mDialogContentView);
+        mLoadingView.setDelay(mBuilder.mDelay);
+        mLoadingView.setLoadingText(mBuilder.mLoadText);
+
+        setOnDismissListener(new DialogInterface.OnDismissListener() {
+            @Override
+            public void onDismiss(DialogInterface dialog) {
+                mLoadingView.setVisibility(View.GONE);
+            }
+        });
     }
 
-    public void setBackground(int color){
-        GradientDrawable gradientDrawable= (GradientDrawable) mDialogContentView.getBackground();
-        gradientDrawable.setColor(color);
+    @Override
+    public void show() {
+        super.show();
+        mLoadingView.setVisibility(View.VISIBLE);
     }
 
-    public void setLoadingText(CharSequence charSequence){
-        mLoadingView.setLoadingText(charSequence);
+    public Builder getBuilder() {
+        return mBuilder;
     }
 
-    public void show(){
-        mDialog.show();
+    public static class Builder{
 
-    }
+        private Context mContext;
 
-    public void dismiss(){
-        mDialog.dismiss();
-    }
+        private int mDelay = 80;
 
-    public Dialog getDialog(){
-        return  mDialog;
-    }
+        private CharSequence mLoadText;
+
+        private boolean mCancelable = true;
+
+        private boolean mCanceledOnTouchOutside = true;
+
+        public Builder(Context context) {
+            mContext = context;
+        }
+
+        public Builder delay(int delay) {
+            mDelay = delay;
+            return this;
+        }
+
+        public Builder loadText(CharSequence loadText) {
+            mLoadText = loadText;
+            return this;
+        }
+
+        public Builder loadText(int resId) {
+            mLoadText = mContext.getString(resId);
+            return this;
+        }
+
+        public Builder cancelable(boolean cancelable) {
+            mCancelable = cancelable;
+            mCanceledOnTouchOutside = cancelable;
+            return this;
+        }
+
+        public Builder canceledOnTouchOutside(boolean canceledOnTouchOutside) {
+            mCanceledOnTouchOutside = canceledOnTouchOutside;
+            return this;
+        }
+
+        public ShapeLoadingDialog build(){
+            return new ShapeLoadingDialog(this);
+        }
 
-    public void setCanceledOnTouchOutside(boolean cancel){
-        mDialog.setCanceledOnTouchOutside(cancel);
+        public ShapeLoadingDialog show(){
+            ShapeLoadingDialog dialog = build();
+            dialog.show();
+            return dialog;
+        }
     }
 }
diff --git a/shapeloading/src/main/java/com/mingle/widget/ShapeLoadingView.java b/shapeloading/src/main/java/com/mingle/widget/ShapeLoadingView.java
index 7c47fa1..77c2bf1 100644
--- a/shapeloading/src/main/java/com/mingle/widget/ShapeLoadingView.java
+++ b/shapeloading/src/main/java/com/mingle/widget/ShapeLoadingView.java
@@ -8,8 +8,6 @@
 import android.os.Build;
 import android.util.AttributeSet;
 import android.view.View;
-import android.view.animation.DecelerateInterpolator;
-import android.view.animation.Interpolator;
 
 import com.mingle.shapeloading.R;
 import com.nineoldandroids.animation.ArgbEvaluator;
@@ -19,53 +17,52 @@
  * Created by zzz40500 on 15/4/4.
  */
 public class ShapeLoadingView extends View {
-
-
+    /**
+     * 用赛贝尔曲线画圆
+     */
+    private static final float mMagicNumber = 0.55228475f;
     private static final float genhao3 = 1.7320508075689f;
     private static  final  float mTriangle2Circle =0.25555555f;
 
     private Shape mShape = Shape.SHAPE_CIRCLE;
-    private Interpolator mInterpolator=new DecelerateInterpolator();
+
     private ArgbEvaluator mArgbEvaluator=new ArgbEvaluator();
 
     private int mTriangleColor ;
     private int mCircleColor  ;
     private int mRectColor ;
 
-    /**
-     * 用赛贝尔曲线画圆
-     */
-    private float mMagicNumber = 0.55228475f;
 
     public ShapeLoadingView(Context context) {
         super(context);
-        init();
+        init(context);
     }
 
     public ShapeLoadingView(Context context, AttributeSet attrs) {
         super(context, attrs);
-        init();
+        init(context);
     }
 
     public ShapeLoadingView(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
+        init(context);
     }
 
     @TargetApi(Build.VERSION_CODES.LOLLIPOP)
     public ShapeLoadingView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
         super(context, attrs, defStyleAttr, defStyleRes);
-        init();
+        init(context);
     }
 
-    private void init() {
+    private void init(Context context) {
+        mTriangleColor = getColor(context, R.color.triangle);
+        mCircleColor =getColor(context, R.color.circle);
+        mRectColor = getColor(context, R.color.rect);
         mPaint = new Paint();
-        mPaint.setColor(getResources().getColor(R.color.triangle));
+        mPaint.setColor(mTriangleColor);
         mPaint.setAntiAlias(true);
         mPaint.setStyle(Paint.Style.FILL_AND_STROKE);
-        setBackgroundColor(getResources().getColor(R.color.view_bg));
-          mTriangleColor = getResources().getColor(R.color.triangle);
-          mCircleColor = getResources().getColor(R.color.circle);
-          mRectColor = getResources().getColor(R.color.triangle);
+
     }
 
     public boolean mIsLoading = false;
@@ -112,7 +109,7 @@ protected void onDraw(Canvas canvas) {
 
                 } else {
                     Path path = new Path();
-                    mPaint.setColor(getResources().getColor(R.color.triangle));
+                    mPaint.setColor(mTriangleColor);
                     path.moveTo(relativeXFromView(0.5f), relativeYFromView(0f));
                     path.lineTo(relativeXFromView(1), relativeYFromView(genhao3 / 2f));
                     path.lineTo(relativeXFromView(0), relativeYFromView(genhao3/2f));
@@ -162,7 +159,7 @@ protected void onDraw(Canvas canvas) {
                     invalidate();
                 } else {
 
-                    mPaint.setColor(getResources().getColor(R.color.circle));
+                    mPaint.setColor(mCircleColor);
                     Path path = new Path();
 
                     float magicNumber = mMagicNumber;
@@ -219,7 +216,7 @@ protected void onDraw(Canvas canvas) {
                     invalidate();
 
                 } else {
-                    mPaint.setColor(getResources().getColor(R.color.rect));
+                    mPaint.setColor(mRectColor);
                     mControlX = relativeXFromView(0.5f - genhao3 / 4);
                     mControlY = relativeYFromView(0.75f);
                     Path path = new Path();
@@ -253,8 +250,12 @@ private float relativeYFromView(float percent) {
 
     public void changeShape() {
         mIsLoading = true;
+        invalidate();
+    }
 
-
+    public void setShape(Shape shape){
+        mIsLoading = true;
+        mShape = shape;
         invalidate();
     }
 
@@ -275,4 +276,12 @@ public void setVisibility(int visibility) {
     public Shape getShape() {
         return mShape;
     }
+
+    private int getColor(Context context, int id) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            return context.getColor(id);
+        } else {
+            return context.getResources().getColor(id);
+        }
+    }
 }
diff --git a/shapeloading/src/main/res/layout/layout_dialog.xml b/shapeloading/src/main/res/layout/layout_dialog.xml
index b9fb2cc..62e73dc 100644
--- a/shapeloading/src/main/res/layout/layout_dialog.xml
+++ b/shapeloading/src/main/res/layout/layout_dialog.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:background="@drawable/aa_dialog_bg"
     android:paddingLeft="72dp"
@@ -7,13 +7,15 @@
     android:paddingTop="36dp"
     android:paddingBottom="36dp"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:clipChildren="false"
+    android:clipToPadding="false">
 
 
     <com.mingle.widget.LoadingView
         android:id="@+id/loadView"
-        android:layout_centerInParent="true"
+        android:layout_gravity="center"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
 
-</RelativeLayout>
\ No newline at end of file
+</FrameLayout>
\ No newline at end of file
diff --git a/shapeloading/src/main/res/layout/load_view.xml b/shapeloading/src/main/res/layout/load_view.xml
index 9143066..77849ba 100644
--- a/shapeloading/src/main/res/layout/load_view.xml
+++ b/shapeloading/src/main/res/layout/load_view.xml
@@ -1,43 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
+<merge
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tool="http://schemas.android.com/tools">
 
-    android:orientation="vertical">
+    <com.mingle.widget.ShapeLoadingView
+        android:id="@+id/shapeLoadingView"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="2dp"/>
 
-    <RelativeLayout
+    <ImageView
+        android:id="@+id/indication"
+        android:layout_width="23dp"
+        android:layout_height="3dp"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="56dp"
+        android:src="http://github.com/@drawable/shadow"/>
+
+    <TextView
+        android:id="@+id/promptTV"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:minWidth="44dp"
-        android:orientation="vertical">
-
-        <ImageView
-
-            android:id="@+id/indication"
-            android:layout_width="23dp"
-            android:layout_height="3dp"
-            android:layout_centerHorizontal="true"
-            android:layout_marginTop="82dp"
-            android:src="http://github.com/@drawable/shadow" />
-
-        <TextView
-            android:id="@+id/promptTV"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/indication"
-            android:layout_centerHorizontal="true"
-            android:layout_marginTop="18dp"
-            android:minWidth="44dp"
-            android:textColor="#757575"
-            android:textSize="14sp"
-            android:visibility="gone" />
-
-        <com.mingle.widget.ShapeLoadingView
-            android:id="@+id/shapeLoadingView"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:layout_centerHorizontal="true"
-            android:layout_marginTop="2dp" />
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="18dp"
+        android:textColor="#757575"
+        android:textSize="14sp"
+        android:visibility="gone"
+        tool:visibility="visible"/>
 
-    </RelativeLayout>
-</RelativeLayout>
\ No newline at end of file
+</merge>
\ No newline at end of file
diff --git a/shapeloading/src/main/res/values/loading_attr.xml b/shapeloading/src/main/res/values/loading_attr.xml
index 3107042..20b4d48 100644
--- a/shapeloading/src/main/res/values/loading_attr.xml
+++ b/shapeloading/src/main/res/values/loading_attr.xml
@@ -2,8 +2,8 @@
 <resources>
 
     <declare-styleable name="LoadingView">
-
-        <attr name="loadingText" format="string"/>
+        <attr name="loadingText" format="string|reference"/>
         <attr name="loadingTextAppearance" format="reference"/>
+        <attr name="delay" format="integer|reference"/>
     </declare-styleable>
 </resources>
\ No newline at end of file

From 3565bbf6d03fe46de914f58aa1402ad7fd27fd44 Mon Sep 17 00:00:00 2001
From: wxj <986798656@qq.com>
Date: Mon, 8 May 2017 09:15:02 +0800
Subject: [PATCH 16/16] remove .idea

---
 .idea/.name                     |  1 -
 .idea/compiler.xml              | 23 -----------------------
 .idea/encodings.xml             |  5 -----
 .idea/modules.xml               | 11 -----------
 .idea/scopes/scope_settings.xml |  5 -----
 5 files changed, 45 deletions(-)
 delete mode 100644 .idea/.name
 delete mode 100644 .idea/compiler.xml
 delete mode 100644 .idea/encodings.xml
 delete mode 100644 .idea/modules.xml
 delete mode 100644 .idea/scopes/scope_settings.xml

diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index d32c242..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-android-shapeLoadingView
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
deleted file mode 100644
index 217af47..0000000
--- a/.idea/compiler.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-    <resourceExtensions />
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-    </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
-  </component>
-</project>
-
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
deleted file mode 100644
index e206d70..0000000
--- a/.idea/encodings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
-</project>
-
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index edd4752..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/android-shapeLoadingView.iml" filepath="$PROJECT_DIR$/android-shapeLoadingView.iml" />
-      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
-      <module fileurl="file://$PROJECT_DIR$/shapeloading/shapeloading.iml" filepath="$PROJECT_DIR$/shapeloading/shapeloading.iml" />
-    </modules>
-  </component>
-</project>
-
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
deleted file mode 100644
index 922003b..0000000
--- a/.idea/scopes/scope_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>
\ No newline at end of file