From c47235613b9665e6513b4ef1feae645fdc4fe7a6 Mon Sep 17 00:00:00 2001
From: David Ganster <david.ganster@wirecube.at>
Date: Wed, 9 May 2018 11:57:14 +0200
Subject: [PATCH] Fixed a bug where 'switchDuration' would not work correctly
 when used in combination with 'targets'

---
 README.md                                                   | 2 +-
 additive_animations/build.gradle                            | 6 +++---
 .../additive_animator/BaseAdditiveAnimator.java             | 4 ++--
 gradle.properties                                           | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 1d3a45f..87b6b9a 100644
--- a/README.md
+++ b/README.md
@@ -122,7 +122,7 @@ Both versions don't require a lot of code, and the few lines you have to write a
 To use `AdditiveAnimator` in your project, add the following lines to your `build.gradle`:
 ```
 dependencies {
-    compile 'at.wirecube:additive_animations:1.6.1'
+    compile 'at.wirecube:additive_animations:1.6.2'
 }
 ...
 repositories {
diff --git a/additive_animations/build.gradle b/additive_animations/build.gradle
index 3842b56..308230e 100644
--- a/additive_animations/build.gradle
+++ b/additive_animations/build.gradle
@@ -30,7 +30,7 @@ ext {
     siteUrl = 'https://github.com/davidganster/android_additive_animations'
     gitUrl = 'https://github.com/davidganster/android_additive_animations.git'
 
-    libraryVersion = '1.6.1'
+    libraryVersion = '1.6.2'
 
     developerId = 'davidganster'
     developerName = 'David Ganster'
@@ -48,8 +48,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 27
-        versionCode 16
-        versionName "1.6.1"
+        versionCode 17
+        versionName "1.6.2"
     }
     buildTypes {
         release {
diff --git a/additive_animations/src/main/java/at/wirecube/additiveanimations/additive_animator/BaseAdditiveAnimator.java b/additive_animations/src/main/java/at/wirecube/additiveanimations/additive_animator/BaseAdditiveAnimator.java
index 6ddcd86..a53cd45 100644
--- a/additive_animations/src/main/java/at/wirecube/additiveanimations/additive_animator/BaseAdditiveAnimator.java
+++ b/additive_animations/src/main/java/at/wirecube/additiveanimations/additive_animator/BaseAdditiveAnimator.java
@@ -491,7 +491,7 @@ public void run() {
     }
 
     public T switchDuration(long durationMillis) {
-        T child = createChildWithDelayAfterParentStart(0);
+        T child = thenWithDelay(0);
         child.setDuration(durationMillis);
         return child;
     }
@@ -652,7 +652,7 @@ protected T createChildWithDelayAfterParentStart(long delay) {
 
     // package-private on purpose
     long getTotalDuration() {
-        if (getValueAnimator().getRepeatCount()== ValueAnimator.INFINITE) {
+        if (getValueAnimator().getRepeatCount() == ValueAnimator.INFINITE) {
             if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
                 return ValueAnimator.DURATION_INFINITE;
             } else {
diff --git a/gradle.properties b/gradle.properties
index 9c9d3b3..fc56bae 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
-VERSION_NAME=1.6.1
-VERSION_CODE=16
+VERSION_NAME=1.6.2
+VERSION_CODE=17
 GROUP=at.wirecube
 
 POM_DESCRIPTION=Additive animations for Android, along with many convenience methods for clean animation code.