improvements after rebase

TrevinAvery · Nov 24, 2018 · 7e7cade · 7e7cade
1 parent a6e38aa
commit 7e7cade
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -18,6 +18,5 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.0.1'
     implementation project(':touchview')
 }
diff --git a/touchview/build.gradle b/touchview/build.gradle
@@ -23,5 +23,5 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.0.1'
+    api 'androidx.appcompat:appcompat:1.0.2'
 }
diff --git a/touchview/src/main/java/com/ortiz/touchview/TouchImageView.java b/touchview/src/main/java/com/ortiz/touchview/TouchImageView.java
@@ -41,16 +41,16 @@
 import androidx.appcompat.widget.AppCompatImageView;
 
 public class TouchImageView extends AppCompatImageView {
-	
-	private static final String DEBUG = "DEBUG";
-	
-	//
-	// SuperMin and SuperMax multipliers. Determine how much the image can be
-	// zoomed below or above the zoom boundaries, before animating back to the
-	// min/max zoom boundary.
-	//
-	private static final float SUPER_MIN_MULTIPLIER = .75f;
-	private static final float SUPER_MAX_MULTIPLIER = 1.25f;
+
+    private static final String DEBUG = "DEBUG";
+
+    //
+    // SuperMin and SuperMax multipliers. Determine how much the image can be
+    // zoomed below or above the zoom boundaries, before animating back to the
+    // min/max zoom boundary.
+    //
+    private static final float SUPER_MIN_MULTIPLIER = .75f;
+    private static final float SUPER_MAX_MULTIPLIER = 1.25f;
 
     //
     // Scale of image ranges from minScale to maxScale, where minScale == 1
@@ -66,6 +66,7 @@ public class TouchImageView extends AppCompatImageView {
     private Matrix matrix, prevMatrix;
 
     public enum FixedPixel {CENTER, TOP_LEFT, BOTTOM_RIGHT}
+
     private FixedPixel orientationChangeFixedPixel = FixedPixel.CENTER;
     private FixedPixel viewSizeChangeFixedPixel = FixedPixel.CENTER;
     private boolean orientationJustChanged = false;