Extend AppCompatImageView instead

Jawnnypoo · Jawnnypoo · commit d69cc122f698 · 2018-07-01T23:13:59.000-05:00
diff --git a/build.gradle b/build.gradle
@@ -1,26 +1,23 @@
 buildscript {
     repositories {
-        jcenter()
         google()
-        mavenCentral()
+        jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.2'
+        classpath 'com.android.tools.build:gradle:3.1.3'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
     }
 }
 
 allprojects {
-
     repositories {
-        jcenter()
         google()
+        jcenter()
     }
 }
 
 ext {
     sdkVersion = 27
-    buildToolsVersion = '27.0.3'
     supportLibVersion = '27.1.1'
 }
diff --git a/photoview/build.gradle b/photoview/build.gradle
@@ -3,7 +3,6 @@ apply plugin: 'com.github.dcendents.android-maven'
 
 android {
     compileSdkVersion rootProject.ext.sdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
 
     defaultConfig {
         minSdkVersion 14
@@ -13,4 +12,8 @@ android {
     }
 }
 
+dependencies {
+    implementation "com.android.support:appcompat-v7:$supportLibVersion"
+}
+
 apply from: 'https://raw.githubusercontent.com/Commit451/gradle-android-javadocs/1.0.0/gradle-android-javadocs.gradle'
diff --git a/photoview/src/main/java/com/github/chrisbanes/photoview/PhotoView.java b/photoview/src/main/java/com/github/chrisbanes/photoview/PhotoView.java
@@ -15,21 +15,20 @@
  *******************************************************************************/
 package com.github.chrisbanes.photoview;
 
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.graphics.Matrix;
 import android.graphics.RectF;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
+import android.support.v7.widget.AppCompatImageView;
 import android.util.AttributeSet;
 import android.view.GestureDetector;
-import android.widget.ImageView;
 
 /**
- * A zoomable {@link ImageView}. See {@link PhotoViewAttacher} for most of the details on how the zooming
+ * A zoomable ImageView. See {@link PhotoViewAttacher} for most of the details on how the zooming
  * is accomplished
  */
-public class PhotoView extends ImageView {
+public class PhotoView extends AppCompatImageView {
 
     private PhotoViewAttacher attacher;
     private ScaleType pendingScaleType;
@@ -47,12 +46,6 @@ public PhotoView(Context context, AttributeSet attr, int defStyle) {
         init();
     }
 
-    @TargetApi(21)
-    public PhotoView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
-        super(context, attrs, defStyleAttr, defStyleRes);
-        init();
-    }
-
     private void init() {
         attacher = new PhotoViewAttacher(this);
         //We always pose as a Matrix scale type, though we can change to another scale type
diff --git a/photoview/src/main/java/com/github/chrisbanes/photoview/PhotoViewAttacher.java b/photoview/src/main/java/com/github/chrisbanes/photoview/PhotoViewAttacher.java
@@ -33,7 +33,7 @@
 
 /**
  * The component of {@link PhotoView} which does the work allowing for zooming, scaling, panning, etc.
- * It is made public in case you need to subclass something other than {@link ImageView} and still
+ * It is made public in case you need to subclass something other than AppCompatImageView and still
  * gain the functionality that {@link PhotoView} offers
  */
 public class PhotoViewAttacher implements View.OnTouchListener,
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -2,7 +2,6 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion rootProject.ext.sdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
 
     defaultConfig {
         applicationId "uk.co.senab.photoview.sample"

Original file line number	Diff line number	Diff line change
`@@ -1,26 +1,23 @@`
`1`	`1`	`buildscript {`
`2`	`2`	`repositories {`
`3`		`- jcenter()`
`4`	`3`	`google()`
`5`		`- mavenCentral()`
	`4`	`+ jcenter()`
`6`	`5`	`}`
`7`	`6`
`8`	`7`	`dependencies {`
`9`		`- classpath 'com.android.tools.build:gradle:3.1.2'`
	`8`	`+ classpath 'com.android.tools.build:gradle:3.1.3'`
`10`	`9`	`classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'`
`11`	`10`	`}`
`12`	`11`	`}`
`13`	`12`
`14`	`13`	`allprojects {`
`15`		`-`
`16`	`14`	`repositories {`
`17`		`- jcenter()`
`18`	`15`	`google()`
	`16`	`+ jcenter()`
`19`	`17`	`}`
`20`	`18`	`}`
`21`	`19`
`22`	`20`	`ext {`
`23`	`21`	`sdkVersion = 27`
`24`		`- buildToolsVersion = '27.0.3'`
`25`	`22`	`supportLibVersion = '27.1.1'`
`26`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@ apply plugin: 'com.github.dcendents.android-maven'`
`3`	`3`
`4`	`4`	`android {`
`5`	`5`	`compileSdkVersion rootProject.ext.sdkVersion`
`6`		`- buildToolsVersion rootProject.ext.buildToolsVersion`
`7`	`6`
`8`	`7`	`defaultConfig {`
`9`	`8`	`minSdkVersion 14`
`@@ -13,4 +12,8 @@ android {`
`13`	`12`	`}`
`14`	`13`	`}`
`15`	`14`
	`15`	`+dependencies {`
	`16`	`+ implementation "com.android.support:appcompat-v7:$supportLibVersion"`
	`17`	`+}`
	`18`	`+`
`16`	`19`	`apply from: 'https://raw.githubusercontent.com/Commit451/gradle-android-javadocs/1.0.0/gradle-android-javadocs.gradle'`