diff --git a/build.gradle b/build.gradle
index 8cd235c..c7955ef 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.4.2'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 599d4a6..0811263 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Apr 30 21:23:45 EEST 2018
+#Thu Sep 19 23:09:27 EET 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
diff --git a/pageindicatorview/build.gradle b/pageindicatorview/build.gradle
index cd97610..103dca0 100644
--- a/pageindicatorview/build.gradle
+++ b/pageindicatorview/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: 'com.android.library'
-
 ext {
     bintrayRepo = 'maven'
     bintrayName = 'pageindicatorview'
@@ -49,8 +48,8 @@ dependencies {
     repositories {
         maven { url "https://maven.google.com" }
     }
-    implementation 'androidx.annotation:annotation:1.0.0'
-    implementation 'androidx.core:core:1.0.0'
+    implementation 'androidx.annotation:annotation:1.1.0'
+    implementation 'androidx.core:core:1.1.0'
     implementation 'androidx.viewpager:viewpager:1.0.0'
 }
 
diff --git a/pageindicatorview/src/main/java/com/rd/PageIndicatorView.java b/pageindicatorview/src/main/java/com/rd/PageIndicatorView.java
index 6d99352..a6c4e62 100644
--- a/pageindicatorview/src/main/java/com/rd/PageIndicatorView.java
+++ b/pageindicatorview/src/main/java/com/rd/PageIndicatorView.java
@@ -9,19 +9,25 @@
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Parcelable;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.text.TextUtilsCompat;
-import androidx.viewpager.widget.PagerAdapter;
-import androidx.core.view.ViewCompat;
-import androidx.viewpager.widget.ViewPager;
 import android.util.AttributeSet;
 import android.util.Pair;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewParent;
-import com.rd.animation.type.*;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.text.TextUtilsCompat;
+import androidx.core.view.ViewCompat;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+
+import com.rd.animation.type.AnimationType;
+import com.rd.animation.type.BaseAnimation;
+import com.rd.animation.type.ColorAnimation;
+import com.rd.animation.type.FillAnimation;
+import com.rd.animation.type.ScaleAnimation;
 import com.rd.draw.controller.DrawController;
 import com.rd.draw.data.Indicator;
 import com.rd.draw.data.Orientation;
@@ -207,7 +213,7 @@ public void setDynamicCount(boolean dynamicCount) {
 
     /**
      * Fade on idle will make {@link PageIndicatorView} {@link View#INVISIBLE} if {@link ViewPager} is not interacted
-     * in time equal to {@link Indicator#idleDuration}. Take care when setting {@link PageIndicatorView} alpha
+     * in time equal to {@link Indicator#getIdleDuration()}. Take care when setting {@link PageIndicatorView} alpha
      * manually if this is true. Alpha is used to manage fading and appearance of {@link PageIndicatorView} and value you provide
      * will be overridden when {@link PageIndicatorView} enters or leaves idle state.
      *
@@ -455,7 +461,7 @@ public void setAnimationDuration(long duration) {
 
     /**
      * Sets time in millis after which {@link ViewPager} is considered idle.
-     * If {@link Indicator#fadeOnIdle} is true, {@link PageIndicatorView} will
+     * If {@link Indicator#isFadeOnIdle()} is true, {@link PageIndicatorView} will
      * fade away after entering idle state and appear when it is left.
      *
      * @param duration time in millis after which {@link ViewPager} is considered idle