AndroidX

README.md

@@ -19,7 +19,9 @@ allprojects {
 ```
 ```Gradle
 dependencies {
-    implementation 'com.github.hannesa2:TouchImageView:1.2.3'
+    implementation 'com.github.hannesa2:TouchImageView:1.4.0' // Support Lib
+    // or
+    implementation 'com.github.hannesa2:TouchImageView:2.0.0' // Android X
 }
 
 ```

app/build.gradle

@@ -18,6 +18,6 @@ android {
 }
 
 dependencies {
-    implementation "com.android.support:support-v4:$supportLib"
+    implementation "androidx.legacy:legacy-support-v4:$supportLib"
     implementation project(':touchview')
 }

app/src/main/java/com/ortiz/touchdemo/ExtendedViewPager.java

@@ -1,7 +1,7 @@
 package com.ortiz.touchdemo;
 
 import android.content.Context;
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
 import android.util.AttributeSet;
 import android.view.View;
 

app/src/main/java/com/ortiz/touchdemo/ViewPagerExampleActivity.java

@@ -2,7 +2,9 @@
 
 import android.app.Activity;
 import android.os.Bundle;
-import android.support.v4.view.PagerAdapter;
+
+import androidx.annotation.NonNull;
+import androidx.viewpager.widget.PagerAdapter;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
@@ -24,7 +26,7 @@ public class ViewPagerExampleActivity extends Activity {
 	public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_viewpager_example);
-        ExtendedViewPager mViewPager = (ExtendedViewPager) findViewById(R.id.view_pager);
+        ExtendedViewPager mViewPager = findViewById(R.id.view_pager);
         mViewPager.setAdapter(new TouchImageAdapter());
     }
 
@@ -37,21 +39,22 @@ public int getCount() {
         	return images.length;
         }
 
+        @NonNull
         @Override
-        public View instantiateItem(ViewGroup container, int position) {
+        public View instantiateItem(@NonNull ViewGroup container, int position) {
             TouchImageView img = new TouchImageView(container.getContext());
             img.setImageResource(images[position]);
             container.addView(img, LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT);
             return img;
         }
 
         @Override
-        public void destroyItem(ViewGroup container, int position, Object object) {
+        public void destroyItem(@NonNull ViewGroup container, int position, @NonNull Object object) {
             container.removeView((View) object);
         }
 
         @Override
-        public boolean isViewFromObject(View view, Object object) {
+        public boolean isViewFromObject(@NonNull View view, @NonNull Object object) {
             return view == object;
         }
 

build.gradle

@@ -12,7 +12,7 @@ buildscript {
 ext {
     defaultTargetSdkVersion = 28
     defaultCompileSdkVersion = 28
-    supportLib = "28.0.0"
+    supportLib = "1.0.0"
 }
 
 allprojects {

gradle.properties

@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true