Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit 48427bf

Browse files
committed
Fixed Gradle(w) build and Travis errors
1 parent 447dc41 commit 48427bf

3 files changed

Lines changed: 23 additions & 8 deletions

File tree

‎.travis.yml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ before_install:
1717
# for gradle output style
1818
- export TERM=dumb
1919
# newer version of gradle
20-
- wget http://services.gradle.org/distributions/gradle-1.10-bin.zip
21-
- unzip -qq gradle-1.10-bin.zip
22-
- export GRADLE_HOME=$PWD/gradle-1.10
20+
- wget http://services.gradle.org/distributions/gradle-1.11-bin.zip
21+
- unzip -qq gradle-1.11-bin.zip
22+
- export GRADLE_HOME=$PWD/gradle-1.11
2323
- export PATH=$GRADLE_HOME/bin:$PATH
2424
# just to test gradle version, against our provided one
2525
- gradle -v
@@ -31,5 +31,3 @@ before_install:
3131
# manually set sdk.dir variable, according to local paths
3232
- echo "sdk.dir=$ANDROID_HOME" > local.properties
3333
- 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
34-
# Compatibility for release cycle
35-
- mvn clean test install

‎library/src/main/java/uk/co/senab/photoview/IPhotoView.java‎

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ public interface IPhotoView {
4949
* Sets the Display Matrix of the currently displayed Drawable. The Rectangle is considered
5050
* relative to this View and includes all scaling and translations.
5151
*
52+
* @param finalMatrix target matrix to set PhotoView to
5253
* @return - true if rectangle was applied successfully
5354
*/
5455
boolean setDisplayMatrix(Matrix finalMatrix);
@@ -115,59 +116,75 @@ public interface IPhotoView {
115116

116117
/**
117118
* Return the current scale type in use by the ImageView.
119+
*
120+
* @return current ImageView.ScaleType
118121
*/
119122
ImageView.ScaleType getScaleType();
120123

121124
/**
122125
* Whether to allow the ImageView's parent to intercept the touch event when the photo is scroll
123126
* to it's horizontal edge.
127+
*
128+
* @param allow whether to allow intercepting by parent element or not
124129
*/
125130
void setAllowParentInterceptOnEdge(boolean allow);
126131

127132
/**
128133
* Use {@link #setMinimumScale(float minimumScale)} instead, this will be removed in future
129134
* release
130-
* <p/>
135+
* <p>&nbsp;</p>
131136
* Sets the minimum scale level. What this value represents depends on the current {@link
132137
* android.widget.ImageView.ScaleType}.
138+
*
139+
* @param minScale minimum allowed scale
133140
*/
134141
@Deprecated
135142
void setMinScale(float minScale);
136143

137144
/**
138145
* Sets the minimum scale level. What this value represents depends on the current {@link
139146
* android.widget.ImageView.ScaleType}.
147+
*
148+
* @param minimumScale minimum allowed scale
140149
*/
141150
void setMinimumScale(float minimumScale);
142151

143152
/**
144153
* Use {@link #setMediumScale(float mediumScale)} instead, this will be removed in future
145154
* release
146-
* <p/>
155+
* <p>&nbsp;</p>
147156
* Sets the middle scale level. What this value represents depends on the current {@link
148157
* android.widget.ImageView.ScaleType}.
158+
*
159+
* @param midScale medium scale preset
149160
*/
150161
@Deprecated
151162
void setMidScale(float midScale);
152163

153164
/*
154165
* Sets the medium scale level. What this value represents depends on the current {@link android.widget.ImageView.ScaleType}.
166+
*
167+
* @param mediumScale medium scale preset
155168
*/
156169
void setMediumScale(float mediumScale);
157170

158171
/**
159172
* Use {@link #setMaximumScale(float maximumScale)} instead, this will be removed in future
160173
* release
161-
* <p/>
174+
* <p>&nbsp;</p>
162175
* Sets the maximum scale level. What this value represents depends on the current {@link
163176
* android.widget.ImageView.ScaleType}.
177+
*
178+
* @param maxScale maximum allowed scale preset
164179
*/
165180
@Deprecated
166181
void setMaxScale(float maxScale);
167182

168183
/**
169184
* Sets the maximum scale level. What this value represents depends on the current {@link
170185
* android.widget.ImageView.ScaleType}.
186+
*
187+
* @param maximumScale maximum allowed scale preset
171188
*/
172189
void setMaximumScale(float maximumScale);
173190

File renamed without changes.

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /