Permalink
Browse files

Fixed Gradle(w) build and Travis errors

  • Loading branch information...
smarek committed Apr 28, 2014
1 parent 447dc41 commit 48427bff9bb1a408cfebf6697aa019c0788ded76
View
@@ -17,9 +17,9 @@ before_install:
# for gradle output style
- export TERM=dumb
# newer version of gradle
- - wget http://services.gradle.org/distributions/gradle-1.10-bin.zip
- - unzip -qq gradle-1.10-bin.zip
- - export GRADLE_HOME=$PWD/gradle-1.10
+ - wget http://services.gradle.org/distributions/gradle-1.11-bin.zip
+ - unzip -qq gradle-1.11-bin.zip
+ - export GRADLE_HOME=$PWD/gradle-1.11
- export PATH=$GRADLE_HOME/bin:$PATH
# just to test gradle version, against our provided one
- gradle -v
@@ -31,5 +31,3 @@ before_install:
# manually set sdk.dir variable, according to local paths
- echo "sdk.dir=$ANDROID_HOME" > local.properties
- echo yes | android update sdk -a -t tools,platform-tools,extra-android-support,extra-android-m2repository,android-19,build-tools-19.0.3 --force --no-ui
- # Compatibility for release cycle
- - mvn clean test install
@@ -49,6 +49,7 @@
* Sets the Display Matrix of the currently displayed Drawable. The Rectangle is considered
* relative to this View and includes all scaling and translations.
*
+ * @param finalMatrix target matrix to set PhotoView to
* @return - true if rectangle was applied successfully
*/
boolean setDisplayMatrix(Matrix finalMatrix);
@@ -115,59 +116,75 @@
/**
* Return the current scale type in use by the ImageView.
+ *
+ * @return current ImageView.ScaleType
*/
ImageView.ScaleType getScaleType();
/**
* Whether to allow the ImageView's parent to intercept the touch event when the photo is scroll
* to it's horizontal edge.
+ *
+ * @param allow whether to allow intercepting by parent element or not
*/
void setAllowParentInterceptOnEdge(boolean allow);
/**
* Use {@link #setMinimumScale(float minimumScale)} instead, this will be removed in future
* release
- * <p/>
+ * <p>&nbsp;</p>
* Sets the minimum scale level. What this value represents depends on the current {@link
* android.widget.ImageView.ScaleType}.
+ *
+ * @param minScale minimum allowed scale
*/
@Deprecated
void setMinScale(float minScale);
/**
* Sets the minimum scale level. What this value represents depends on the current {@link
* android.widget.ImageView.ScaleType}.
+ *
+ * @param minimumScale minimum allowed scale
*/
void setMinimumScale(float minimumScale);
/**
* Use {@link #setMediumScale(float mediumScale)} instead, this will be removed in future
* release
- * <p/>
+ * <p>&nbsp;</p>
* Sets the middle scale level. What this value represents depends on the current {@link
* android.widget.ImageView.ScaleType}.
+ *
+ * @param midScale medium scale preset
*/
@Deprecated
void setMidScale(float midScale);
/*
* Sets the medium scale level. What this value represents depends on the current {@link android.widget.ImageView.ScaleType}.
+ *
+ * @param mediumScale medium scale preset
*/
void setMediumScale(float mediumScale);
/**
* Use {@link #setMaximumScale(float maximumScale)} instead, this will be removed in future
* release
- * <p/>
+ * <p>&nbsp;</p>
* Sets the maximum scale level. What this value represents depends on the current {@link
* android.widget.ImageView.ScaleType}.
+ *
+ * @param maxScale maximum allowed scale preset
*/
@Deprecated
void setMaxScale(float maxScale);
/**
* Sets the maximum scale level. What this value represents depends on the current {@link
* android.widget.ImageView.ScaleType}.
+ *
+ * @param maximumScale maximum allowed scale preset
*/
void setMaximumScale(float maximumScale);

1 comment on commit 48427bf

@agehua

This comment has been minimized.

Show comment
Hide comment
@agehua

agehua Jan 14, 2015

Hi, can I ask a question? Why I always get this log, "ImageView no longer exists. You should not use this PhotoViewAttacher any more." .

agehua commented on 48427bf Jan 14, 2015

Hi, can I ask a question? Why I always get this log, "ImageView no longer exists. You should not use this PhotoViewAttacher any more." .

Please sign in to comment.