Fix issue 16

.gitignore

@@ -8,6 +8,9 @@ local.properties
 /captures
 
 # Gradle files
+gradle/
+gradlew
+gradlew.bat
 .gradle/
 build/
 

build.gradle

@@ -3,11 +3,12 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.1.2'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2'
-        classpath 'com.github.dcendents:android-maven-plugin:1.2'
+        classpath 'com.android.tools.build:gradle:3.4.0'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -16,5 +17,6 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        google()
     }
 }

gradle.properties

@@ -15,4 +15,6 @@
 # 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
+# org.gradle.parallel=true
+android.enableJetifier=true
+android.useAndroidX=true

library/build.gradle

@@ -2,23 +2,22 @@ apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
 
-version = '1.1.0'
+version = '1.2.0'
 group = 'com.reginald.swiperefresh' // Maven Group ID for the artifact
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:22.0.0'
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'androidx.appcompat:appcompat:1.0.2'
 }
 
 android {
-    compileSdkVersion 21
-    buildToolsVersion "21.1.2"
+    compileSdkVersion 28
 
     defaultConfig {
-        minSdkVersion 9
-        targetSdkVersion 21
+        minSdkVersion 14
+        targetSdkVersion 28
         versionCode 1
-        versionName "1.0"
+        versionName "1.2.0"
     }
     buildTypes {
         release {

library/src/main/java/com/reginald/swiperefresh/CustomSwipeProgressBar.java

@@ -8,11 +8,13 @@
 import android.graphics.Paint;
 import android.graphics.Rect;
 import android.graphics.RectF;
-import android.support.v4.view.ViewCompat;
+import androidx.core.view.ViewCompat;
 import android.view.View;
 import android.view.animation.AnimationUtils;
 import android.view.animation.Interpolator;
 
+import static android.graphics.Canvas.ALL_SAVE_FLAG;
+
 
 /**
  * Custom progress bar that shows a cycle of colors as widening circles that
@@ -155,7 +157,7 @@ void draw(Canvas canvas) {
                 // Radius of the circle is half of the screen.
                 float clearRadius = width / 2 * INTERPOLATOR.getInterpolation(pct);
                 mClipRect.set(cx - clearRadius, mBounds.top, cx + clearRadius, mBounds.bottom);
-                canvas.saveLayerAlpha(mClipRect, 0, 0);
+                canvas.saveLayerAlpha(mClipRect, 0, ALL_SAVE_FLAG);
                 // Only draw the trigger if there is a space in the center of
                 // this refreshing view that needs to be filled in by the
                 // trigger. If the progress view is just still animating, let it

library/src/main/java/com/reginald/swiperefresh/CustomSwipeRefreshLayout.java

@@ -8,8 +8,8 @@
 import android.content.res.TypedArray;
 import android.graphics.Canvas;
 import android.graphics.Rect;
-import android.support.v4.view.ViewCompat;
-import android.support.v4.view.ViewPager;
+import androidx.core.view.ViewCompat;
+import androidx.viewpager.widget.ViewPager;
 import android.util.AttributeSet;
 import android.util.DisplayMetrics;
 import android.util.Log;

sample/build.gradle

@@ -1,13 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 21
-    buildToolsVersion "21.1.2"
+    compileSdkVersion 28
 
     defaultConfig {
         applicationId "com.reginald.swiperefresh.sample"
-        minSdkVersion 9
-        targetSdkVersion 21
+        minSdkVersion 14
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
     }
@@ -25,10 +24,8 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:22.0.0'
-    compile 'com.android.support:recyclerview-v7:21.0.3'
-    compile 'com.astuetz:pagerslidingtabstrip:1.0.1'
-    compile project(':library')
-    //compile 'com.reginald.swiperefresh:library:1.1.0'
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    implementation project(':library')
 }

sample/src/main/AndroidManifest.xml

@@ -1,8 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.reginald.swiperefresh.sample">
 
-    <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="17" />
-
     <application
         android:noHistory="true"
         android:label="@string/app_name"

sample/src/main/java/com/reginald/swiperefresh/sample/ViewPagerDemoActivity.java

@@ -22,18 +22,17 @@
 import android.graphics.drawable.Drawable;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
 
-import com.astuetz.PagerSlidingTabStrip;
 import com.reginald.swiperefresh.CustomSwipeRefreshLayout;
 import com.reginald.swiperefresh.sample.dummydata.Cheeses;
 
@@ -85,10 +84,6 @@ protected void setupViews() {
         setupViewPagerViews();
         mViewPager = (ViewPager) findViewById(R.id.viewpager);
         mViewPager.setAdapter(new ViewPagerAdapter(viewPagerTitles, viewPagerViews));
-
-        PagerSlidingTabStrip tabs = (PagerSlidingTabStrip) findViewById(R.id.tabs);
-        tabs.setViewPager(mViewPager);
-        tabs.setAllCaps(false);
     }
 
     protected void setupCustomSwipeRefreshLayout() {

sample/src/main/java/com/reginald/swiperefresh/sample/dummydata/DummyBackgroundTask.java

@@ -1,13 +1,5 @@
 package com.reginald.swiperefresh.sample.dummydata;
 
-import android.os.AsyncTask;
-import android.support.v4.widget.SwipeRefreshLayout;
-
-import com.reginald.swiperefresh.CustomSwipeRefreshLayout;
-import com.reginald.swiperefresh.sample.ListViewDemoActivity;
-
-import java.util.List;
-
 /**
  * Created by lxy on 15/8/6.
  */