Feature/#66 pan while zoom

app/build.gradle

@@ -10,6 +10,8 @@ android {
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
         versionName "1.0"
+
+        setProperty("archivesBaseName", "ZoomLayout_v${versionName}_(${versionCode})")
     }
 
     buildTypes {
@@ -21,6 +23,6 @@ android {
 }
 
 dependencies {
-    implementation "androidx.appcompat:appcompat:$supportLibVersion"
+    implementation "androidx.appcompat:appcompat:1.0.2"
     implementation project(':library')
 }

build.gradle

@@ -26,7 +26,6 @@ allprojects {
 ext {
     // Updating? Update travis.yml.
     compileSdkVersion = 28
-    supportLibVersion = '1.0.0'
     minSdkVersion = 16
     targetSdkVersion = 28
 }

library/build.gradle

@@ -31,8 +31,11 @@ android {
 }
 
 dependencies {
-    api "androidx.annotation:annotation:$supportLibVersion"
+    api "androidx.annotation:annotation:1.0.1"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+
+    testImplementation "org.junit.jupiter:junit-jupiter-api:5.3.1"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.3.1"
 }
 
 

library/src/main/java/com/otaliastudios/zoom/AbsolutePoint.kt

@@ -0,0 +1,75 @@
+package com.otaliastudios.zoom
+
+/**
+ * This class represents an absolute point on the ZoomEngine canvas (or beyond it's bounds)
+ */
+data class AbsolutePoint(
+        @ZoomApi.AbsolutePan var x: Float = 0F,
+        @ZoomApi.AbsolutePan var y: Float = 0F) {
+
+    /**
+     * Copy constructor
+     *
+     * @param point point to duplicate
+     */
+    constructor(point: AbsolutePoint) : this(point.x, point.y)
+
+    /**
+     * Set new coordinates
+     *
+     * @param x x-axis value
+     * @param y y-axis value
+     */
+    @JvmOverloads
+    fun set(@ZoomApi.AbsolutePan x: Number = this.x, @ZoomApi.AbsolutePan y: Number = this.y) {
+        this.x = x.toFloat()
+        this.y = y.toFloat()
+    }
+
+    /**
+     * Set new coordinates
+     *
+     * @param p the [AbsolutePoint] to copy values from
+     */
+    fun set(p: AbsolutePoint) {
+        set(p.x, p.y)
+    }
+
+    /**
+     * Substract a point from another point
+     *
+     * @param absolutePoint the point to substract
+     */
+    operator fun minus(absolutePoint: AbsolutePoint): AbsolutePoint {
+        return AbsolutePoint(this.x - absolutePoint.x, this.y - absolutePoint.y)
+    }
+
+    /**
+     * Negate a point
+     *
+     * @return the negative value of this point
+     */
+    operator fun unaryMinus(): AbsolutePoint {
+        return AbsolutePoint(-this.x, -this.y)
+    }
+
+    /**
+     * Add a point to another point
+     *
+     * @param absolutePoint the point to add
+     */
+    operator fun plus(absolutePoint: AbsolutePoint): AbsolutePoint {
+        return AbsolutePoint(this.x + absolutePoint.x, this.y + absolutePoint.y)
+    }
+
+    /**
+     * Multiply every value in the point by a given factor
+     *
+     * @param factor the factor to use
+     * @return the multiplied point
+     */
+    operator fun times(factor: Number): AbsolutePoint {
+        return AbsolutePoint(factor.toFloat() * this.x, factor.toFloat() * this.y)
+    }
+
+}

library/src/main/java/com/otaliastudios/zoom/ScaledPoint.kt

@@ -0,0 +1,77 @@
+package com.otaliastudios.zoom
+
+/**
+ * This class represents a scaled point on the ZoomEngine canvas (or beyond it's bounds)
+ *
+ * Note that these values depend on the current zoomlevel
+ */
+data class ScaledPoint(
+        @ZoomApi.ScaledPan var x: Float = 0F,
+        @ZoomApi.ScaledPan var y: Float = 0F) {
+
+    /**
+     * Copy constructor
+     *
+     * @param point point to duplicate
+     */
+    constructor(point: ScaledPoint) : this(point.x, point.y)
+
+    /**
+     * Set new coordinates
+     *
+     * @param x x-axis value
+     * @param y y-axis value
+     */
+    @JvmOverloads
+    fun set(@ZoomApi.ScaledPan x: Number = this.x, @ZoomApi.ScaledPan y: Number = this.y) {
+        this.x = x.toFloat()
+        this.y = y.toFloat()
+    }
+
+    /**
+     * Set new coordinates
+     *
+     * @param p the [ScaledPoint] to copy values from
+     */
+    fun set(p: ScaledPoint) {
+        set(p.x, p.y)
+    }
+
+    /**
+     * Substract a point from another point
+     *
+     * @param scaledPoint the point to substract
+     */
+    operator fun minus(scaledPoint: ScaledPoint): ScaledPoint {
+        return ScaledPoint(this.x - scaledPoint.x, this.y - scaledPoint.y)
+    }
+
+    /**
+     * Negate a point
+     *
+     * @return the negative value of this point
+     */
+    operator fun unaryMinus(): ScaledPoint {
+        return ScaledPoint(-this.x, -this.y)
+    }
+
+    /**
+     * Add a point to another point
+     *
+     * @param scaledPoint the point to add
+     */
+    operator fun plus(scaledPoint: ScaledPoint): ScaledPoint {
+        return ScaledPoint(this.x + scaledPoint.x, this.y + scaledPoint.y)
+    }
+
+    /**
+     * Multiply every value in the point by a given factor
+     *
+     * @param factor the factor to use
+     * @return the multiplied point
+     */
+    operator fun times(factor: Number): ScaledPoint {
+        return ScaledPoint(factor.toFloat() * this.x, factor.toFloat() * this.y)
+    }
+
+}

library/src/main/java/com/otaliastudios/zoom/ZoomApi.kt

@@ -37,6 +37,13 @@ interface ZoomApi {
     @RealZoom
     val realZoom: Float
 
+
+    /**
+     * The current pan as an [AbsolutePoint].
+     * This field will be updated according to current pan when accessed.
+     */
+    val pan: AbsolutePoint
+
     /**
      * Returns the current horizontal pan value, in content coordinates
      * (that is, as if there was no zoom at all).
@@ -60,6 +67,7 @@ interface ZoomApi {
      *
      * @see realZoom
      */
+    @Target(AnnotationTarget.FIELD, AnnotationTarget.FUNCTION, AnnotationTarget.LOCAL_VARIABLE, AnnotationTarget.PROPERTY, AnnotationTarget.VALUE_PARAMETER)
     @Retention(AnnotationRetention.SOURCE)
     annotation class RealZoom
 
@@ -68,6 +76,7 @@ interface ZoomApi {
      *
      * @see zoom
      */
+    @Target(AnnotationTarget.FIELD, AnnotationTarget.FUNCTION, AnnotationTarget.LOCAL_VARIABLE, AnnotationTarget.PROPERTY, AnnotationTarget.VALUE_PARAMETER)
     @Retention(AnnotationRetention.SOURCE)
     annotation class Zoom
 
@@ -78,6 +87,7 @@ interface ZoomApi {
      * @see panY
      * @see ScaledPan
      */
+    @Target(AnnotationTarget.FIELD, AnnotationTarget.FUNCTION, AnnotationTarget.LOCAL_VARIABLE, AnnotationTarget.PROPERTY, AnnotationTarget.VALUE_PARAMETER)
     @Retention(AnnotationRetention.SOURCE)
     annotation class AbsolutePan
 
@@ -88,6 +98,7 @@ interface ZoomApi {
      * @see panY
      * @see AbsolutePan
      */
+    @Target(AnnotationTarget.FIELD, AnnotationTarget.FUNCTION, AnnotationTarget.LOCAL_VARIABLE, AnnotationTarget.PROPERTY, AnnotationTarget.VALUE_PARAMETER)
     @Retention(AnnotationRetention.SOURCE)
     annotation class ScaledPan
 
@@ -97,6 +108,7 @@ interface ZoomApi {
      * @see zoom
      * @see realZoom
      */
+    @Target(AnnotationTarget.FIELD, AnnotationTarget.FUNCTION, AnnotationTarget.LOCAL_VARIABLE, AnnotationTarget.PROPERTY, AnnotationTarget.VALUE_PARAMETER)
     @Retention(AnnotationRetention.SOURCE)
     @IntDef(TYPE_ZOOM, TYPE_REAL_ZOOM)
     annotation class ZoomType
@@ -249,7 +261,7 @@ interface ZoomApi {
      * @param realZoom the new real zoom value
      * @param animate  whether to animate the transition
      */
-    fun realZoomTo(realZoom: Float, animate: Boolean)
+    fun realZoomTo(@RealZoom realZoom: Float, animate: Boolean)
 
     /**
      * Which is the max zoom that should be allowed.