Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@tibbi
tibbi committed Mar 30, 2018
2 parents 6587cd2 + b61c59e commit b5ae924
Show file tree
Hide file tree
Showing 48 changed files with 374 additions and 195 deletions.
8 changes: 6 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,11 @@ Versions 3.9.0, 3.8.0 and 3.0.0 contain breaking changes. Migration instructions

## Quick start

**1)** Add `com.davemorrissey.labs:subsampling-scale-image-view:3.9.0` as a dependency in your build.gradle file.
**1)** Add this library as a dependency in your app's build.gradle file.

dependencies {
implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.10.0'
}

**2)** Add the view to your layout XML.

Expand Down Expand Up @@ -118,4 +122,4 @@ Versions 3.9.0, 3.8.0 and 3.0.0 contain breaking changes. Migration instructions

## About

Copyright 2017 David Morrissey, and licensed under the Apache License, Version 2.0. No attribution is necessary but it's very much appreciated. Star this project if you like it!
Copyright 2018 David Morrissey, and licensed under the Apache License, Version 2.0. No attribution is necessary but it's very much appreciated. Star this project if you like it!
2 changes: 1 addition & 1 deletion docs/javadoc/allclasses-frame.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<html lang="en">
<head>
<!-- Generated by javadoc -->
<title>All Classes (library 3.9.0 API)</title>
<title>All Classes (library 3.10.0 API)</title>
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
<script type="text/javascript" src="script.js"></script>
</head>
Expand Down
2 changes: 1 addition & 1 deletion docs/javadoc/allclasses-noframe.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<html lang="en">
<head>
<!-- Generated by javadoc -->
<title>All Classes (library 3.9.0 API)</title>
<title>All Classes (library 3.10.0 API)</title>
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
<script type="text/javascript" src="script.js"></script>
</head>
Expand Down
44 changes: 30 additions & 14 deletions docs/javadoc/com/davemorrissey/labs/subscaleview/ImageSource.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
<html lang="en">
<head>
<!-- Generated by javadoc -->
<title>ImageSource (library 3.9.0 API)</title>
<title>ImageSource (library 3.10.0 API)</title>
<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
<script type="text/javascript" src="../../../../script.js"></script>
</head>
<body>
<script type="text/javascript"><!--
try {
if (location.href.indexOf('is-external=true') == -1) {
parent.document.title="ImageSource (library 3.9.0 API)";
parent.document.title="ImageSource (library 3.10.0 API)";
}
}
catch(err) {
Expand Down Expand Up @@ -259,7 +259,8 @@ <h3>Method Detail</h3>
<ul class="blockList">
<li class="blockList">
<h4>resource</h4>
<pre>public static&nbsp;<a href="../../../../com/davemorrissey/labs/subscaleview/ImageSource.html" title="class in com.davemorrissey.labs.subscaleview">ImageSource</a>&nbsp;resource(int&nbsp;resId)</pre>
<pre><a href="https://developer.android.com/reference/android/support.annotation.NonNull.html?is-external=true" title="class or interface in android">@NonNull</a>
public static&nbsp;<a href="../../../../com/davemorrissey/labs/subscaleview/ImageSource.html" title="class in com.davemorrissey.labs.subscaleview">ImageSource</a>&nbsp;resource(int&nbsp;resId)</pre>
<div class="block">Create an instance from a resource. The correct resource for the device screen resolution will be used.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
Expand All @@ -275,7 +276,9 @@ <h4>resource</h4>
<ul class="blockList">
<li class="blockList">
<h4>asset</h4>
<pre>public static&nbsp;<a href="../../../../com/davemorrissey/labs/subscaleview/ImageSource.html" title="class in com.davemorrissey.labs.subscaleview">ImageSource</a>&nbsp;asset(<a href="https://developer.android.com/reference/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;assetName)</pre>
<pre><a href="https://developer.android.com/reference/android/support.annotation.NonNull.html?is-external=true" title="class or interface in android">@NonNull</a>
public static&nbsp;<a href="../../../../com/davemorrissey/labs/subscaleview/ImageSource.html" title="class in com.davemorrissey.labs.subscaleview">ImageSource</a>&nbsp;asset(<a href="https://developer.android.com/reference/android/support.annotation.NonNull.html?is-external=true" title="class or interface in android">@NonNull</a>
<a href="https://developer.android.com/reference/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;assetName)</pre>
<div class="block">Create an instance from an asset name.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
Expand All @@ -291,7 +294,9 @@ <h4>asset</h4>
<ul class="blockList">
<li class="blockList">
<h4>uri</h4>
<pre>public static&nbsp;<a href="../../../../com/davemorrissey/labs/subscaleview/ImageSource.html" title="class in com.davemorrissey.labs.subscaleview">ImageSource</a>&nbsp;uri(<a href="https://developer.android.com/reference/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;uri)</pre>
<pre><a href="https://developer.android.com/reference/android/support.annotation.NonNull.html?is-external=true" title="class or interface in android">@NonNull</a>
public static&nbsp;<a href="../../../../com/davemorrissey/labs/subscaleview/ImageSource.html" title="class in com.davemorrissey.labs.subscaleview">ImageSource</a>&nbsp;uri(<a href="https://developer.android.com/reference/android/support.annotation.NonNull.html?is-external=true" title="class or interface in android">@NonNull</a>
<a href="https://developer.android.com/reference/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;uri)</pre>
<div class="block">Create an instance from a URI. If the URI does not start with a scheme, it's assumed to be the URI
of a file.</div>
<dl>
Expand All @@ -308,7 +313,9 @@ <h4>uri</h4>
<ul class="blockList">
<li class="blockList">
<h4>uri</h4>
<pre>public static&nbsp;<a href="../../../../com/davemorrissey/labs/subscaleview/ImageSource.html" title="class in com.davemorrissey.labs.subscaleview">ImageSource</a>&nbsp;uri(<a href="https://developer.android.com/reference/android/net/Uri.html?is-external=true" title="class or interface in android.net">Uri</a>&nbsp;uri)</pre>
<pre><a href="https://developer.android.com/reference/android/support.annotation.NonNull.html?is-external=true" title="class or interface in android">@NonNull</a>
public static&nbsp;<a href="../../../../com/davemorrissey/labs/subscaleview/ImageSource.html" title="class in com.davemorrissey.labs.subscaleview">ImageSource</a>&nbsp;uri(<a href="https://developer.android.com/reference/android/support.annotation.NonNull.html?is-external=true" title="class or interface in android">@NonNull</a>
<a href="https://developer.android.com/reference/android/net/Uri.html?is-external=true" title="class or interface in android.net">Uri</a>&nbsp;uri)</pre>
<div class="block">Create an instance from a URI.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
Expand All @@ -324,7 +331,9 @@ <h4>uri</h4>
<ul class="blockList">
<li class="blockList">
<h4>bitmap</h4>
<pre>public static&nbsp;<a href="../../../../com/davemorrissey/labs/subscaleview/ImageSource.html" title="class in com.davemorrissey.labs.subscaleview">ImageSource</a>&nbsp;bitmap(<a href="https://developer.android.com/reference/android/graphics/Bitmap.html?is-external=true" title="class or interface in android.graphics">Bitmap</a>&nbsp;bitmap)</pre>
<pre><a href="https://developer.android.com/reference/android/support.annotation.NonNull.html?is-external=true" title="class or interface in android">@NonNull</a>
public static&nbsp;<a href="../../../../com/davemorrissey/labs/subscaleview/ImageSource.html" title="class in com.davemorrissey.labs.subscaleview">ImageSource</a>&nbsp;bitmap(<a href="https://developer.android.com/reference/android/support.annotation.NonNull.html?is-external=true" title="class or interface in android">@NonNull</a>
<a href="https://developer.android.com/reference/android/graphics/Bitmap.html?is-external=true" title="class or interface in android.graphics">Bitmap</a>&nbsp;bitmap)</pre>
<div class="block">Provide a loaded bitmap for display.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
Expand All @@ -340,7 +349,9 @@ <h4>bitmap</h4>
<ul class="blockList">
<li class="blockList">
<h4>cachedBitmap</h4>
<pre>public static&nbsp;<a href="../../../../com/davemorrissey/labs/subscaleview/ImageSource.html" title="class in com.davemorrissey.labs.subscaleview">ImageSource</a>&nbsp;cachedBitmap(<a href="https://developer.android.com/reference/android/graphics/Bitmap.html?is-external=true" title="class or interface in android.graphics">Bitmap</a>&nbsp;bitmap)</pre>
<pre><a href="https://developer.android.com/reference/android/support.annotation.NonNull.html?is-external=true" title="class or interface in android">@NonNull</a>
public static&nbsp;<a href="../../../../com/davemorrissey/labs/subscaleview/ImageSource.html" title="class in com.davemorrissey.labs.subscaleview">ImageSource</a>&nbsp;cachedBitmap(<a href="https://developer.android.com/reference/android/support.annotation.NonNull.html?is-external=true" title="class or interface in android">@NonNull</a>
<a href="https://developer.android.com/reference/android/graphics/Bitmap.html?is-external=true" title="class or interface in android.graphics">Bitmap</a>&nbsp;bitmap)</pre>
<div class="block">Provide a loaded and cached bitmap for display. This bitmap will not be recycled when it is no
longer needed. Use this method if you loaded the bitmap with an image loader such as Picasso
or Volley.</div>
Expand All @@ -358,7 +369,8 @@ <h4>cachedBitmap</h4>
<ul class="blockList">
<li class="blockList">
<h4>tilingEnabled</h4>
<pre>public&nbsp;<a href="../../../../com/davemorrissey/labs/subscaleview/ImageSource.html" title="class in com.davemorrissey.labs.subscaleview">ImageSource</a>&nbsp;tilingEnabled()</pre>
<pre><a href="https://developer.android.com/reference/android/support.annotation.NonNull.html?is-external=true" title="class or interface in android">@NonNull</a>
public&nbsp;<a href="../../../../com/davemorrissey/labs/subscaleview/ImageSource.html" title="class in com.davemorrissey.labs.subscaleview">ImageSource</a>&nbsp;tilingEnabled()</pre>
<div class="block">Enable tiling of the image. This does not apply to preview images which are always loaded as a single bitmap.,
and tiling cannot be disabled when displaying a region of the source image.</div>
<dl>
Expand All @@ -373,7 +385,8 @@ <h4>tilingEnabled</h4>
<ul class="blockList">
<li class="blockList">
<h4>tilingDisabled</h4>
<pre>public&nbsp;<a href="../../../../com/davemorrissey/labs/subscaleview/ImageSource.html" title="class in com.davemorrissey.labs.subscaleview">ImageSource</a>&nbsp;tilingDisabled()</pre>
<pre><a href="https://developer.android.com/reference/android/support.annotation.NonNull.html?is-external=true" title="class or interface in android">@NonNull</a>
public&nbsp;<a href="../../../../com/davemorrissey/labs/subscaleview/ImageSource.html" title="class in com.davemorrissey.labs.subscaleview">ImageSource</a>&nbsp;tilingDisabled()</pre>
<div class="block">Disable tiling of the image. This does not apply to preview images which are always loaded as a single bitmap,
and tiling cannot be disabled when displaying a region of the source image.</div>
<dl>
Expand All @@ -388,7 +401,8 @@ <h4>tilingDisabled</h4>
<ul class="blockList">
<li class="blockList">
<h4>tiling</h4>
<pre>public&nbsp;<a href="../../../../com/davemorrissey/labs/subscaleview/ImageSource.html" title="class in com.davemorrissey.labs.subscaleview">ImageSource</a>&nbsp;tiling(boolean&nbsp;tile)</pre>
<pre><a href="https://developer.android.com/reference/android/support.annotation.NonNull.html?is-external=true" title="class or interface in android">@NonNull</a>
public&nbsp;<a href="../../../../com/davemorrissey/labs/subscaleview/ImageSource.html" title="class in com.davemorrissey.labs.subscaleview">ImageSource</a>&nbsp;tiling(boolean&nbsp;tile)</pre>
<div class="block">Enable or disable tiling of the image. This does not apply to preview images which are always loaded as a single bitmap,
and tiling cannot be disabled when displaying a region of the source image.</div>
<dl>
Expand All @@ -405,7 +419,8 @@ <h4>tiling</h4>
<ul class="blockList">
<li class="blockList">
<h4>region</h4>
<pre>public&nbsp;<a href="../../../../com/davemorrissey/labs/subscaleview/ImageSource.html" title="class in com.davemorrissey.labs.subscaleview">ImageSource</a>&nbsp;region(<a href="https://developer.android.com/reference/android/graphics/Rect.html?is-external=true" title="class or interface in android.graphics">Rect</a>&nbsp;sRegion)</pre>
<pre><a href="https://developer.android.com/reference/android/support.annotation.NonNull.html?is-external=true" title="class or interface in android">@NonNull</a>
public&nbsp;<a href="../../../../com/davemorrissey/labs/subscaleview/ImageSource.html" title="class in com.davemorrissey.labs.subscaleview">ImageSource</a>&nbsp;region(<a href="https://developer.android.com/reference/android/graphics/Rect.html?is-external=true" title="class or interface in android.graphics">Rect</a>&nbsp;sRegion)</pre>
<div class="block">Use a region of the source image. Region must be set independently for the full size image and the preview if
you are using one.</div>
<dl>
Expand All @@ -422,8 +437,9 @@ <h4>region</h4>
<ul class="blockList">
<li class="blockList">
<h4>dimensions</h4>
<pre>public&nbsp;<a href="../../../../com/davemorrissey/labs/subscaleview/ImageSource.html" title="class in com.davemorrissey.labs.subscaleview">ImageSource</a>&nbsp;dimensions(int&nbsp;sWidth,
int&nbsp;sHeight)</pre>
<pre><a href="https://developer.android.com/reference/android/support.annotation.NonNull.html?is-external=true" title="class or interface in android">@NonNull</a>
public&nbsp;<a href="../../../../com/davemorrissey/labs/subscaleview/ImageSource.html" title="class in com.davemorrissey.labs.subscaleview">ImageSource</a>&nbsp;dimensions(int&nbsp;sWidth,
int&nbsp;sHeight)</pre>
<div class="block">Declare the dimensions of the image. This is only required for a full size image, when you are specifying a URI
and also a preview image. When displaying a bitmap object, or not using a preview, you do not need to declare
the image dimensions. Note if the declared dimensions are found to be incorrect, the view will reset.</div>
Expand Down
8 changes: 5 additions & 3 deletions docs/javadoc/com/davemorrissey/labs/subscaleview/ImageViewState.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
<html lang="en">
<head>
<!-- Generated by javadoc -->
<title>ImageViewState (library 3.9.0 API)</title>
<title>ImageViewState (library 3.10.0 API)</title>
<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
<script type="text/javascript" src="../../../../script.js"></script>
</head>
<body>
<script type="text/javascript"><!--
try {
if (location.href.indexOf('is-external=true') == -1) {
parent.document.title="ImageViewState (library 3.9.0 API)";
parent.document.title="ImageViewState (library 3.10.0 API)";
}
}
catch(err) {
Expand Down Expand Up @@ -197,6 +197,7 @@ <h3>Constructor Detail</h3>
<li class="blockList">
<h4>ImageViewState</h4>
<pre>public&nbsp;ImageViewState(float&nbsp;scale,
<a href="https://developer.android.com/reference/android/support.annotation.NonNull.html?is-external=true" title="class or interface in android">@NonNull</a>
<a href="https://developer.android.com/reference/android/graphics/PointF.html?is-external=true" title="class or interface in android.graphics">PointF</a>&nbsp;center,
int&nbsp;orientation)</pre>
</li>
Expand Down Expand Up @@ -224,7 +225,8 @@ <h4>getScale</h4>
<ul class="blockList">
<li class="blockList">
<h4>getCenter</h4>
<pre>public&nbsp;<a href="https://developer.android.com/reference/android/graphics/PointF.html?is-external=true" title="class or interface in android.graphics">PointF</a>&nbsp;getCenter()</pre>
<pre><a href="https://developer.android.com/reference/android/support.annotation.NonNull.html?is-external=true" title="class or interface in android">@NonNull</a>
public&nbsp;<a href="https://developer.android.com/reference/android/graphics/PointF.html?is-external=true" title="class or interface in android.graphics">PointF</a>&nbsp;getCenter()</pre>
</li>
</ul>
<a name="getOrientation--">
Expand Down
Loading

0 comments on commit b5ae924

Please sign in to comment.