diff --git a/ultraviewpager/build.gradle b/ultraviewpager/build.gradle index d99741c..bbe2b7c 100644 --- a/ultraviewpager/build.gradle +++ b/ultraviewpager/build.gradle @@ -94,8 +94,10 @@ android { dependencies { compile fileTree(include: ['*.jar'], dir: 'libs') testCompile 'junit:junit:4.12' - compile 'com.android.support:support-v4:23.1.1@aar' - compile 'com.android.support:recyclerview-v7:23.1.1@aar' + compile 'androidx.legacy:legacy-support-v4:1.0.0@aar' + compile 'androidx.recyclerview:recyclerview:1.0.0@aar' + implementation 'androidx.viewpager:viewpager:1.0.0' + implementation 'com.android.support:appcompat-v7' } File deployConfig = rootProject.file('jcenterInstall.gradle') diff --git a/ultraviewpager/src/main/java/com/tmall/ultraviewpager/UltraViewPager.java b/ultraviewpager/src/main/java/com/tmall/ultraviewpager/UltraViewPager.java index 70f4674..36ed73f 100644 --- a/ultraviewpager/src/main/java/com/tmall/ultraviewpager/UltraViewPager.java +++ b/ultraviewpager/src/main/java/com/tmall/ultraviewpager/UltraViewPager.java @@ -31,16 +31,16 @@ import android.graphics.Bitmap; import android.graphics.Point; import android.os.Build; -import android.support.v4.view.PagerAdapter; -import android.support.v4.view.ViewPager; import android.util.AttributeSet; -import android.util.Log; import android.util.SparseIntArray; import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; import android.widget.RelativeLayout; +import androidx.viewpager.widget.PagerAdapter; +import androidx.viewpager.widget.ViewPager; + /** * Created by mikeafc on 15/10/26.
* UltraViewPager is a super extension for ViewPager.
diff --git a/ultraviewpager/src/main/java/com/tmall/ultraviewpager/UltraViewPagerAdapter.java b/ultraviewpager/src/main/java/com/tmall/ultraviewpager/UltraViewPagerAdapter.java index c2a82d5..0a3732d 100644 --- a/ultraviewpager/src/main/java/com/tmall/ultraviewpager/UltraViewPagerAdapter.java +++ b/ultraviewpager/src/main/java/com/tmall/ultraviewpager/UltraViewPagerAdapter.java @@ -28,17 +28,15 @@ import android.database.DataSetObserver; import android.os.Parcelable; -import android.support.v4.view.PagerAdapter; -import android.support.v4.view.ViewPager; -import android.support.v7.widget.RecyclerView; + +import androidx.recyclerview.widget.RecyclerView; +import androidx.viewpager.widget.PagerAdapter; + import android.util.SparseArray; import android.view.View; import android.view.ViewGroup; import android.widget.RelativeLayout; -import java.util.HashMap; -import java.util.Map; - /** * Created by mikeafc on 15/11/25. */ diff --git a/ultraviewpager/src/main/java/com/tmall/ultraviewpager/UltraViewPagerIndicator.java b/ultraviewpager/src/main/java/com/tmall/ultraviewpager/UltraViewPagerIndicator.java index cff89d2..63a11e0 100644 --- a/ultraviewpager/src/main/java/com/tmall/ultraviewpager/UltraViewPagerIndicator.java +++ b/ultraviewpager/src/main/java/com/tmall/ultraviewpager/UltraViewPagerIndicator.java @@ -31,12 +31,13 @@ import android.graphics.BitmapFactory; import android.graphics.Canvas; import android.graphics.Paint; -import android.support.v4.view.ViewPager; import android.util.AttributeSet; import android.util.TypedValue; import android.view.Gravity; import android.view.View; +import androidx.viewpager.widget.ViewPager; + /** * Created by mikeafc on 15/11/25. */ diff --git a/ultraviewpager/src/main/java/com/tmall/ultraviewpager/UltraViewPagerView.java b/ultraviewpager/src/main/java/com/tmall/ultraviewpager/UltraViewPagerView.java index 1d7d759..9eaa553 100644 --- a/ultraviewpager/src/main/java/com/tmall/ultraviewpager/UltraViewPagerView.java +++ b/ultraviewpager/src/main/java/com/tmall/ultraviewpager/UltraViewPagerView.java @@ -27,14 +27,14 @@ package com.tmall.ultraviewpager; import android.content.Context; -import android.support.v4.view.PagerAdapter; -import android.support.v4.view.ViewPager; import android.util.AttributeSet; -import android.util.TypedValue; import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; +import androidx.viewpager.widget.PagerAdapter; +import androidx.viewpager.widget.ViewPager; + import com.tmall.ultraviewpager.transformer.UltraVerticalTransformer; /** diff --git a/ultraviewpager/src/main/java/com/tmall/ultraviewpager/transformer/UltraDepthScaleTransformer.java b/ultraviewpager/src/main/java/com/tmall/ultraviewpager/transformer/UltraDepthScaleTransformer.java index bb0db2a..dad675b 100644 --- a/ultraviewpager/src/main/java/com/tmall/ultraviewpager/transformer/UltraDepthScaleTransformer.java +++ b/ultraviewpager/src/main/java/com/tmall/ultraviewpager/transformer/UltraDepthScaleTransformer.java @@ -26,9 +26,10 @@ package com.tmall.ultraviewpager.transformer; -import android.support.v4.view.ViewPager; import android.view.View; +import androidx.viewpager.widget.ViewPager; + /** * Created by mikeafc on 15/12/3. */ diff --git a/ultraviewpager/src/main/java/com/tmall/ultraviewpager/transformer/UltraScaleTransformer.java b/ultraviewpager/src/main/java/com/tmall/ultraviewpager/transformer/UltraScaleTransformer.java index cdea434..bc65e3d 100644 --- a/ultraviewpager/src/main/java/com/tmall/ultraviewpager/transformer/UltraScaleTransformer.java +++ b/ultraviewpager/src/main/java/com/tmall/ultraviewpager/transformer/UltraScaleTransformer.java @@ -26,9 +26,10 @@ package com.tmall.ultraviewpager.transformer; -import android.support.v4.view.ViewPager; import android.view.View; +import androidx.viewpager.widget.ViewPager; + /** * Created by mikeafc on 15/12/3. */ diff --git a/ultraviewpager/src/main/java/com/tmall/ultraviewpager/transformer/UltraVerticalTransformer.java b/ultraviewpager/src/main/java/com/tmall/ultraviewpager/transformer/UltraVerticalTransformer.java index 1cbfdf4..f827d65 100644 --- a/ultraviewpager/src/main/java/com/tmall/ultraviewpager/transformer/UltraVerticalTransformer.java +++ b/ultraviewpager/src/main/java/com/tmall/ultraviewpager/transformer/UltraVerticalTransformer.java @@ -26,9 +26,10 @@ package com.tmall.ultraviewpager.transformer; -import android.support.v4.view.ViewPager; import android.view.View; +import androidx.viewpager.widget.ViewPager; + /** * Created by mikeafc on 15/11/26. */