aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Morrissey <davemorrissey@gmail.com>2017-11-02 18:59:25 +0000
committerDavid Morrissey <davemorrissey@gmail.com>2017-11-02 18:59:26 +0000
commit0cae9eb5b2b68ad2bea9586036500925018e8c8b (patch)
tree1361e0dce27fc9a2cdc40594c982032e38ec20ea
parentc930ef77f57c0619c10893696452b94e75e0dd23 (diff)
downloadsubsampling-scale-image-view-0cae9eb5b2b68ad2bea9586036500925018e8c8b.tar.gz
Updated to current standard project structure
-rw-r--r--build.gradle8
-rw-r--r--library/build.gradle28
-rw-r--r--library/src/main/AndroidManifest.xml (renamed from library/AndroidManifest.xml)0
-rw-r--r--library/src/main/java/com/davemorrissey/labs/subscaleview/ImageSource.java (renamed from library/src/com/davemorrissey/labs/subscaleview/ImageSource.java)0
-rw-r--r--library/src/main/java/com/davemorrissey/labs/subscaleview/ImageViewState.java (renamed from library/src/com/davemorrissey/labs/subscaleview/ImageViewState.java)0
-rw-r--r--library/src/main/java/com/davemorrissey/labs/subscaleview/SubsamplingScaleImageView.java (renamed from library/src/com/davemorrissey/labs/subscaleview/SubsamplingScaleImageView.java)0
-rw-r--r--library/src/main/java/com/davemorrissey/labs/subscaleview/decoder/CompatDecoderFactory.java (renamed from library/src/com/davemorrissey/labs/subscaleview/decoder/CompatDecoderFactory.java)0
-rw-r--r--library/src/main/java/com/davemorrissey/labs/subscaleview/decoder/DecoderFactory.java (renamed from library/src/com/davemorrissey/labs/subscaleview/decoder/DecoderFactory.java)0
-rw-r--r--library/src/main/java/com/davemorrissey/labs/subscaleview/decoder/ImageDecoder.java (renamed from library/src/com/davemorrissey/labs/subscaleview/decoder/ImageDecoder.java)0
-rw-r--r--library/src/main/java/com/davemorrissey/labs/subscaleview/decoder/ImageRegionDecoder.java (renamed from library/src/com/davemorrissey/labs/subscaleview/decoder/ImageRegionDecoder.java)0
-rw-r--r--library/src/main/java/com/davemorrissey/labs/subscaleview/decoder/SkiaImageDecoder.java (renamed from library/src/com/davemorrissey/labs/subscaleview/decoder/SkiaImageDecoder.java)0
-rw-r--r--library/src/main/java/com/davemorrissey/labs/subscaleview/decoder/SkiaImageRegionDecoder.java (renamed from library/src/com/davemorrissey/labs/subscaleview/decoder/SkiaImageRegionDecoder.java)0
-rw-r--r--library/src/main/res/values/attrs.xml (renamed from library/res/values/attrs.xml)0
-rw-r--r--sample/build.gradle24
-rw-r--r--sample/src/main/AndroidManifest.xml (renamed from sample/AndroidManifest.xml)0
-rw-r--r--sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/AbstractFragmentsActivity.java (renamed from sample/src/com/davemorrissey/labs/subscaleview/sample/AbstractFragmentsActivity.java)0
-rw-r--r--sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/AbstractPagesActivity.java (renamed from sample/src/com/davemorrissey/labs/subscaleview/sample/AbstractPagesActivity.java)0
-rw-r--r--sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/MainActivity.java (renamed from sample/src/com/davemorrissey/labs/subscaleview/sample/MainActivity.java)0
-rw-r--r--sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/Page.java (renamed from sample/src/com/davemorrissey/labs/subscaleview/sample/Page.java)0
-rw-r--r--sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/animation/AnimationActivity.java (renamed from sample/src/com/davemorrissey/labs/subscaleview/sample/animation/AnimationActivity.java)0
-rw-r--r--sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/basicfeatures/BasicFeaturesActivity.java (renamed from sample/src/com/davemorrissey/labs/subscaleview/sample/basicfeatures/BasicFeaturesActivity.java)0
-rw-r--r--sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/configuration/ConfigurationActivity.java (renamed from sample/src/com/davemorrissey/labs/subscaleview/sample/configuration/ConfigurationActivity.java)0
-rw-r--r--sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/eventhandling/EventHandlingActivity.java (renamed from sample/src/com/davemorrissey/labs/subscaleview/sample/eventhandling/EventHandlingActivity.java)0
-rw-r--r--sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/eventhandlingadvanced/AdvancedEventHandlingActivity.java (renamed from sample/src/com/davemorrissey/labs/subscaleview/sample/eventhandlingadvanced/AdvancedEventHandlingActivity.java)0
-rw-r--r--sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/extension/ExtensionActivity.java (renamed from sample/src/com/davemorrissey/labs/subscaleview/sample/extension/ExtensionActivity.java)0
-rw-r--r--sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/extension/ExtensionCircleFragment.java (renamed from sample/src/com/davemorrissey/labs/subscaleview/sample/extension/ExtensionCircleFragment.java)0
-rw-r--r--sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/extension/ExtensionFreehandFragment.java (renamed from sample/src/com/davemorrissey/labs/subscaleview/sample/extension/ExtensionFreehandFragment.java)0
-rw-r--r--sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/extension/ExtensionPinFragment.java (renamed from sample/src/com/davemorrissey/labs/subscaleview/sample/extension/ExtensionPinFragment.java)0
-rw-r--r--sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/extension/views/CircleView.java (renamed from sample/src/com/davemorrissey/labs/subscaleview/sample/extension/views/CircleView.java)0
-rw-r--r--sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/extension/views/FreehandView.java (renamed from sample/src/com/davemorrissey/labs/subscaleview/sample/extension/views/FreehandView.java)0
-rw-r--r--sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/extension/views/PinView.java (renamed from sample/src/com/davemorrissey/labs/subscaleview/sample/extension/views/PinView.java)0
-rw-r--r--sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/imagedisplay/ImageDisplayActivity.java (renamed from sample/src/com/davemorrissey/labs/subscaleview/sample/imagedisplay/ImageDisplayActivity.java)0
-rw-r--r--sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/imagedisplay/ImageDisplayLargeFragment.java (renamed from sample/src/com/davemorrissey/labs/subscaleview/sample/imagedisplay/ImageDisplayLargeFragment.java)0
-rw-r--r--sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/imagedisplay/ImageDisplayRegionFragment.java (renamed from sample/src/com/davemorrissey/labs/subscaleview/sample/imagedisplay/ImageDisplayRegionFragment.java)0
-rw-r--r--sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/imagedisplay/ImageDisplayRotateFragment.java (renamed from sample/src/com/davemorrissey/labs/subscaleview/sample/imagedisplay/ImageDisplayRotateFragment.java)0
-rw-r--r--sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/viewpager/VerticalViewPager.java (renamed from sample/src/com/davemorrissey/labs/subscaleview/sample/viewpager/VerticalViewPager.java)0
-rw-r--r--sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/viewpager/ViewPagerActivity.java (renamed from sample/src/com/davemorrissey/labs/subscaleview/sample/viewpager/ViewPagerActivity.java)0
-rw-r--r--sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/viewpager/ViewPagerFragment.java (renamed from sample/src/com/davemorrissey/labs/subscaleview/sample/viewpager/ViewPagerFragment.java)0
-rw-r--r--sample/src/main/res/drawable-hdpi/launcher.png (renamed from sample/res/drawable-hdpi/launcher.png)bin3019 -> 3019 bytes
-rw-r--r--sample/src/main/res/drawable-nodpi/button_standout_inactive.xml (renamed from sample/res/drawable-nodpi/button_standout_inactive.xml)0
-rw-r--r--sample/src/main/res/drawable-nodpi/button_standout_pressed.xml (renamed from sample/res/drawable-nodpi/button_standout_pressed.xml)0
-rw-r--r--sample/src/main/res/drawable-nodpi/button_transparent_pressed.xml (renamed from sample/res/drawable-nodpi/button_transparent_pressed.xml)0
-rw-r--r--sample/src/main/res/drawable-nodpi/buttonstate_standout.xml (renamed from sample/res/drawable-nodpi/buttonstate_standout.xml)0
-rw-r--r--sample/src/main/res/drawable-nodpi/buttonstate_transparent.xml (renamed from sample/res/drawable-nodpi/buttonstate_transparent.xml)0
-rw-r--r--sample/src/main/res/drawable-nodpi/pushpin_blue.png (renamed from sample/res/drawable-nodpi/pushpin_blue.png)bin8102 -> 8102 bytes
-rw-r--r--sample/src/main/res/drawable-nodpi/transparent.xml (renamed from sample/res/drawable-nodpi/transparent.xml)0
-rw-r--r--sample/src/main/res/drawable-xhdpi/daffy.gif (renamed from sample/res/drawable-xhdpi/daffy.gif)bin4533 -> 4533 bytes
-rw-r--r--sample/src/main/res/drawable-xhdpi/launcher.png (renamed from sample/res/drawable-xhdpi/launcher.png)bin4796 -> 4796 bytes
-rw-r--r--sample/src/main/res/drawable-xhdpi/next.png (renamed from sample/res/drawable-xhdpi/next.png)bin1737 -> 1737 bytes
-rw-r--r--sample/src/main/res/drawable-xhdpi/play.png (renamed from sample/res/drawable-xhdpi/play.png)bin1620 -> 1620 bytes
-rw-r--r--sample/src/main/res/drawable-xhdpi/previous.png (renamed from sample/res/drawable-xhdpi/previous.png)bin1734 -> 1734 bytes
-rw-r--r--sample/src/main/res/drawable-xhdpi/reset.png (renamed from sample/res/drawable-xhdpi/reset.png)bin2335 -> 2335 bytes
-rw-r--r--sample/src/main/res/drawable-xhdpi/rotate.png (renamed from sample/res/drawable-xhdpi/rotate.png)bin2432 -> 2432 bytes
-rw-r--r--sample/src/main/res/drawable-xxhdpi/launcher.png (renamed from sample/res/drawable-xxhdpi/launcher.png)bin6605 -> 6605 bytes
-rw-r--r--sample/src/main/res/layout/animation_activity.xml (renamed from sample/res/layout/animation_activity.xml)0
-rw-r--r--sample/src/main/res/layout/extension_circle_fragment.xml (renamed from sample/res/layout/extension_circle_fragment.xml)0
-rw-r--r--sample/src/main/res/layout/extension_freehand_fragment.xml (renamed from sample/res/layout/extension_freehand_fragment.xml)0
-rw-r--r--sample/src/main/res/layout/extension_pin_fragment.xml (renamed from sample/res/layout/extension_pin_fragment.xml)0
-rw-r--r--sample/src/main/res/layout/fragments_activity.xml (renamed from sample/res/layout/fragments_activity.xml)0
-rw-r--r--sample/src/main/res/layout/imagedisplay_large_fragment.xml (renamed from sample/res/layout/imagedisplay_large_fragment.xml)0
-rw-r--r--sample/src/main/res/layout/imagedisplay_region_fragment.xml (renamed from sample/res/layout/imagedisplay_region_fragment.xml)0
-rw-r--r--sample/src/main/res/layout/imagedisplay_rotate_fragment.xml (renamed from sample/res/layout/imagedisplay_rotate_fragment.xml)0
-rw-r--r--sample/src/main/res/layout/main.xml (renamed from sample/res/layout/main.xml)0
-rw-r--r--sample/src/main/res/layout/pages_activity.xml (renamed from sample/res/layout/pages_activity.xml)0
-rw-r--r--sample/src/main/res/layout/view_pager.xml (renamed from sample/res/layout/view_pager.xml)0
-rw-r--r--sample/src/main/res/layout/view_pager_page.xml (renamed from sample/res/layout/view_pager_page.xml)0
-rw-r--r--sample/src/main/res/values/colors.xml (renamed from sample/res/values/colors.xml)0
-rw-r--r--sample/src/main/res/values/strings.xml (renamed from sample/res/values/strings.xml)0
-rw-r--r--sample/src/main/res/values/style.xml (renamed from sample/res/values/style.xml)0
69 files changed, 8 insertions, 52 deletions
diff --git a/build.gradle b/build.gradle
index 6db2e7b..b0dc15f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,4 +1,12 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
+allprojects {
+ repositories {
+ mavenCentral()
+ jcenter()
+ google()
+ }
+}
+
buildscript {
repositories {
mavenCentral()
diff --git a/library/build.gradle b/library/build.gradle
index 636e34b..529c201 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -10,30 +10,6 @@ android {
defaultConfig {
consumerProguardFiles 'proguard-rules.txt'
}
-
- sourceSets {
- main {
- manifest.srcFile 'AndroidManifest.xml'
- java.srcDirs = ['src']
- resources.srcDirs = ['src']
- aidl.srcDirs = ['src']
- renderscript.srcDirs = ['src']
- res.srcDirs = ['res']
- assets.srcDirs = ['assets']
- }
-
- // Move the tests to tests/java, tests/res, etc...
- instrumentTest.setRoot('tests')
-
- // Move the build types to build-types/<type>
- // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...
- // This moves them out of them default location under src/<type>/... which would
- // conflict with src/ being used by the main source set.
- // Adding new build types or product flavors should be accompanied
- // by a similar customization.
- debug.setRoot('build-types/debug')
- release.setRoot('build-types/release')
- }
}
dependencies {
@@ -41,7 +17,3 @@ dependencies {
}
apply from: rootProject.file('release.gradle')
-
-repositories {
- google()
-} \ No newline at end of file
diff --git a/library/AndroidManifest.xml b/library/src/main/AndroidManifest.xml
index 1d519cd..1d519cd 100644
--- a/library/AndroidManifest.xml
+++ b/library/src/main/AndroidManifest.xml
diff --git a/library/src/com/davemorrissey/labs/subscaleview/ImageSource.java b/library/src/main/java/com/davemorrissey/labs/subscaleview/ImageSource.java
index 97a626d..97a626d 100644
--- a/library/src/com/davemorrissey/labs/subscaleview/ImageSource.java
+++ b/library/src/main/java/com/davemorrissey/labs/subscaleview/ImageSource.java
diff --git a/library/src/com/davemorrissey/labs/subscaleview/ImageViewState.java b/library/src/main/java/com/davemorrissey/labs/subscaleview/ImageViewState.java
index b36c36f..b36c36f 100644
--- a/library/src/com/davemorrissey/labs/subscaleview/ImageViewState.java
+++ b/library/src/main/java/com/davemorrissey/labs/subscaleview/ImageViewState.java
diff --git a/library/src/com/davemorrissey/labs/subscaleview/SubsamplingScaleImageView.java b/library/src/main/java/com/davemorrissey/labs/subscaleview/SubsamplingScaleImageView.java
index e4f885a..e4f885a 100644
--- a/library/src/com/davemorrissey/labs/subscaleview/SubsamplingScaleImageView.java
+++ b/library/src/main/java/com/davemorrissey/labs/subscaleview/SubsamplingScaleImageView.java
diff --git a/library/src/com/davemorrissey/labs/subscaleview/decoder/CompatDecoderFactory.java b/library/src/main/java/com/davemorrissey/labs/subscaleview/decoder/CompatDecoderFactory.java
index d8f3d1f..d8f3d1f 100644
--- a/library/src/com/davemorrissey/labs/subscaleview/decoder/CompatDecoderFactory.java
+++ b/library/src/main/java/com/davemorrissey/labs/subscaleview/decoder/CompatDecoderFactory.java
diff --git a/library/src/com/davemorrissey/labs/subscaleview/decoder/DecoderFactory.java b/library/src/main/java/com/davemorrissey/labs/subscaleview/decoder/DecoderFactory.java
index f15d283..f15d283 100644
--- a/library/src/com/davemorrissey/labs/subscaleview/decoder/DecoderFactory.java
+++ b/library/src/main/java/com/davemorrissey/labs/subscaleview/decoder/DecoderFactory.java
diff --git a/library/src/com/davemorrissey/labs/subscaleview/decoder/ImageDecoder.java b/library/src/main/java/com/davemorrissey/labs/subscaleview/decoder/ImageDecoder.java
index 371b87d..371b87d 100644
--- a/library/src/com/davemorrissey/labs/subscaleview/decoder/ImageDecoder.java
+++ b/library/src/main/java/com/davemorrissey/labs/subscaleview/decoder/ImageDecoder.java
diff --git a/library/src/com/davemorrissey/labs/subscaleview/decoder/ImageRegionDecoder.java b/library/src/main/java/com/davemorrissey/labs/subscaleview/decoder/ImageRegionDecoder.java
index 347a6f4..347a6f4 100644
--- a/library/src/com/davemorrissey/labs/subscaleview/decoder/ImageRegionDecoder.java
+++ b/library/src/main/java/com/davemorrissey/labs/subscaleview/decoder/ImageRegionDecoder.java
diff --git a/library/src/com/davemorrissey/labs/subscaleview/decoder/SkiaImageDecoder.java b/library/src/main/java/com/davemorrissey/labs/subscaleview/decoder/SkiaImageDecoder.java
index d72ccdf..d72ccdf 100644
--- a/library/src/com/davemorrissey/labs/subscaleview/decoder/SkiaImageDecoder.java
+++ b/library/src/main/java/com/davemorrissey/labs/subscaleview/decoder/SkiaImageDecoder.java
diff --git a/library/src/com/davemorrissey/labs/subscaleview/decoder/SkiaImageRegionDecoder.java b/library/src/main/java/com/davemorrissey/labs/subscaleview/decoder/SkiaImageRegionDecoder.java
index b9b808f..b9b808f 100644
--- a/library/src/com/davemorrissey/labs/subscaleview/decoder/SkiaImageRegionDecoder.java
+++ b/library/src/main/java/com/davemorrissey/labs/subscaleview/decoder/SkiaImageRegionDecoder.java
diff --git a/library/res/values/attrs.xml b/library/src/main/res/values/attrs.xml
index e0f8289..e0f8289 100644
--- a/library/res/values/attrs.xml
+++ b/library/src/main/res/values/attrs.xml
diff --git a/sample/build.gradle b/sample/build.gradle
index 6dccc7b..eaa8019 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -1,36 +1,12 @@
apply plugin: 'com.android.application'
-allprojects {
- repositories {
- google()
- }
-}
-
android {
compileSdkVersion 26
sourceSets {
main {
- manifest.srcFile 'AndroidManifest.xml'
- java.srcDirs = ['src']
- resources.srcDirs = ['src']
- aidl.srcDirs = ['src']
- renderscript.srcDirs = ['src']
- res.srcDirs = ['res']
assets.srcDirs = ['assets']
}
-
- // Move the tests to tests/java, tests/res, etc...
- instrumentTest.setRoot('tests')
-
- // Move the build types to build-types/<type>
- // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...
- // This moves them out of them default location under src/<type>/... which would
- // conflict with src/ being used by the main source set.
- // Adding new build types or product flavors should be accompanied
- // by a similar customization.
- debug.setRoot('build-types/debug')
- release.setRoot('build-types/release')
}
}
diff --git a/sample/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
index db9d4e6..db9d4e6 100644
--- a/sample/AndroidManifest.xml
+++ b/sample/src/main/AndroidManifest.xml
diff --git a/sample/src/com/davemorrissey/labs/subscaleview/sample/AbstractFragmentsActivity.java b/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/AbstractFragmentsActivity.java
index 1bbe522..1bbe522 100644
--- a/sample/src/com/davemorrissey/labs/subscaleview/sample/AbstractFragmentsActivity.java
+++ b/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/AbstractFragmentsActivity.java
diff --git a/sample/src/com/davemorrissey/labs/subscaleview/sample/AbstractPagesActivity.java b/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/AbstractPagesActivity.java
index de0711f..de0711f 100644
--- a/sample/src/com/davemorrissey/labs/subscaleview/sample/AbstractPagesActivity.java
+++ b/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/AbstractPagesActivity.java
diff --git a/sample/src/com/davemorrissey/labs/subscaleview/sample/MainActivity.java b/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/MainActivity.java
index f49bf8f..f49bf8f 100644
--- a/sample/src/com/davemorrissey/labs/subscaleview/sample/MainActivity.java
+++ b/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/MainActivity.java
diff --git a/sample/src/com/davemorrissey/labs/subscaleview/sample/Page.java b/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/Page.java
index f489f6e..f489f6e 100644
--- a/sample/src/com/davemorrissey/labs/subscaleview/sample/Page.java
+++ b/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/Page.java
diff --git a/sample/src/com/davemorrissey/labs/subscaleview/sample/animation/AnimationActivity.java b/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/animation/AnimationActivity.java
index 008691d..008691d 100644
--- a/sample/src/com/davemorrissey/labs/subscaleview/sample/animation/AnimationActivity.java
+++ b/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/animation/AnimationActivity.java
diff --git a/sample/src/com/davemorrissey/labs/subscaleview/sample/basicfeatures/BasicFeaturesActivity.java b/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/basicfeatures/BasicFeaturesActivity.java
index a89619a..a89619a 100644
--- a/sample/src/com/davemorrissey/labs/subscaleview/sample/basicfeatures/BasicFeaturesActivity.java
+++ b/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/basicfeatures/BasicFeaturesActivity.java
diff --git a/sample/src/com/davemorrissey/labs/subscaleview/sample/configuration/ConfigurationActivity.java b/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/configuration/ConfigurationActivity.java
index 39c4b24..39c4b24 100644
--- a/sample/src/com/davemorrissey/labs/subscaleview/sample/configuration/ConfigurationActivity.java
+++ b/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/configuration/ConfigurationActivity.java
diff --git a/sample/src/com/davemorrissey/labs/subscaleview/sample/eventhandling/EventHandlingActivity.java b/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/eventhandling/EventHandlingActivity.java
index bd5613a..bd5613a 100644
--- a/sample/src/com/davemorrissey/labs/subscaleview/sample/eventhandling/EventHandlingActivity.java
+++ b/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/eventhandling/EventHandlingActivity.java
diff --git a/sample/src/com/davemorrissey/labs/subscaleview/sample/eventhandlingadvanced/AdvancedEventHandlingActivity.java b/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/eventhandlingadvanced/AdvancedEventHandlingActivity.java
index e2c34fd..e2c34fd 100644
--- a/sample/src/com/davemorrissey/labs/subscaleview/sample/eventhandlingadvanced/AdvancedEventHandlingActivity.java
+++ b/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/eventhandlingadvanced/AdvancedEventHandlingActivity.java
diff --git a/sample/src/com/davemorrissey/labs/subscaleview/sample/extension/ExtensionActivity.java b/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/extension/ExtensionActivity.java
index 1b143d7..1b143d7 100644
--- a/sample/src/com/davemorrissey/labs/subscaleview/sample/extension/ExtensionActivity.java
+++ b/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/extension/ExtensionActivity.java
diff --git a/sample/src/com/davemorrissey/labs/subscaleview/sample/extension/ExtensionCircleFragment.java b/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/extension/ExtensionCircleFragment.java
index 3cb3866..3cb3866 100644
--- a/sample/src/com/davemorrissey/labs/subscaleview/sample/extension/ExtensionCircleFragment.java
+++ b/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/extension/ExtensionCircleFragment.java
diff --git a/sample/src/com/davemorrissey/labs/subscaleview/sample/extension/ExtensionFreehandFragment.java b/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/extension/ExtensionFreehandFragment.java
index e77f882..e77f882 100644
--- a/sample/src/com/davemorrissey/labs/subscaleview/sample/extension/ExtensionFreehandFragment.java
+++ b/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/extension/ExtensionFreehandFragment.java
diff --git a/sample/src/com/davemorrissey/labs/subscaleview/sample/extension/ExtensionPinFragment.java b/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/extension/ExtensionPinFragment.java
index d8e4e71..d8e4e71 100644
--- a/sample/src/com/davemorrissey/labs/subscaleview/sample/extension/ExtensionPinFragment.java
+++ b/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/extension/ExtensionPinFragment.java
diff --git a/sample/src/com/davemorrissey/labs/subscaleview/sample/extension/views/CircleView.java b/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/extension/views/CircleView.java
index 9a7a6aa..9a7a6aa 100644
--- a/sample/src/com/davemorrissey/labs/subscaleview/sample/extension/views/CircleView.java
+++ b/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/extension/views/CircleView.java
diff --git a/sample/src/com/davemorrissey/labs/subscaleview/sample/extension/views/FreehandView.java b/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/extension/views/FreehandView.java
index 6d49aca..6d49aca 100644
--- a/sample/src/com/davemorrissey/labs/subscaleview/sample/extension/views/FreehandView.java
+++ b/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/extension/views/FreehandView.java
diff --git a/sample/src/com/davemorrissey/labs/subscaleview/sample/extension/views/PinView.java b/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/extension/views/PinView.java
index fda8f73..fda8f73 100644
--- a/sample/src/com/davemorrissey/labs/subscaleview/sample/extension/views/PinView.java
+++ b/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/extension/views/PinView.java
diff --git a/sample/src/com/davemorrissey/labs/subscaleview/sample/imagedisplay/ImageDisplayActivity.java b/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/imagedisplay/ImageDisplayActivity.java
index 7d0df3b..7d0df3b 100644
--- a/sample/src/com/davemorrissey/labs/subscaleview/sample/imagedisplay/ImageDisplayActivity.java
+++ b/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/imagedisplay/ImageDisplayActivity.java
diff --git a/sample/src/com/davemorrissey/labs/subscaleview/sample/imagedisplay/ImageDisplayLargeFragment.java b/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/imagedisplay/ImageDisplayLargeFragment.java
index 7e8542f..7e8542f 100644
--- a/sample/src/com/davemorrissey/labs/subscaleview/sample/imagedisplay/ImageDisplayLargeFragment.java
+++ b/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/imagedisplay/ImageDisplayLargeFragment.java
diff --git a/sample/src/com/davemorrissey/labs/subscaleview/sample/imagedisplay/ImageDisplayRegionFragment.java b/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/imagedisplay/ImageDisplayRegionFragment.java
index 517948f..517948f 100644
--- a/sample/src/com/davemorrissey/labs/subscaleview/sample/imagedisplay/ImageDisplayRegionFragment.java
+++ b/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/imagedisplay/ImageDisplayRegionFragment.java
diff --git a/sample/src/com/davemorrissey/labs/subscaleview/sample/imagedisplay/ImageDisplayRotateFragment.java b/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/imagedisplay/ImageDisplayRotateFragment.java
index 1ec199a..1ec199a 100644
--- a/sample/src/com/davemorrissey/labs/subscaleview/sample/imagedisplay/ImageDisplayRotateFragment.java
+++ b/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/imagedisplay/ImageDisplayRotateFragment.java
diff --git a/sample/src/com/davemorrissey/labs/subscaleview/sample/viewpager/VerticalViewPager.java b/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/viewpager/VerticalViewPager.java
index 86d2e85..86d2e85 100644
--- a/sample/src/com/davemorrissey/labs/subscaleview/sample/viewpager/VerticalViewPager.java
+++ b/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/viewpager/VerticalViewPager.java
diff --git a/sample/src/com/davemorrissey/labs/subscaleview/sample/viewpager/ViewPagerActivity.java b/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/viewpager/ViewPagerActivity.java
index ba7fb7f..ba7fb7f 100644
--- a/sample/src/com/davemorrissey/labs/subscaleview/sample/viewpager/ViewPagerActivity.java
+++ b/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/viewpager/ViewPagerActivity.java
diff --git a/sample/src/com/davemorrissey/labs/subscaleview/sample/viewpager/ViewPagerFragment.java b/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/viewpager/ViewPagerFragment.java
index 442c84b..442c84b 100644
--- a/sample/src/com/davemorrissey/labs/subscaleview/sample/viewpager/ViewPagerFragment.java
+++ b/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/viewpager/ViewPagerFragment.java
diff --git a/sample/res/drawable-hdpi/launcher.png b/sample/src/main/res/drawable-hdpi/launcher.png
index 2ba1cba..2ba1cba 100644
--- a/sample/res/drawable-hdpi/launcher.png
+++ b/sample/src/main/res/drawable-hdpi/launcher.png
Binary files differ
diff --git a/sample/res/drawable-nodpi/button_standout_inactive.xml b/sample/src/main/res/drawable-nodpi/button_standout_inactive.xml
index dfcefb4..dfcefb4 100644
--- a/sample/res/drawable-nodpi/button_standout_inactive.xml
+++ b/sample/src/main/res/drawable-nodpi/button_standout_inactive.xml
diff --git a/sample/res/drawable-nodpi/button_standout_pressed.xml b/sample/src/main/res/drawable-nodpi/button_standout_pressed.xml
index 857646a..857646a 100644
--- a/sample/res/drawable-nodpi/button_standout_pressed.xml
+++ b/sample/src/main/res/drawable-nodpi/button_standout_pressed.xml
diff --git a/sample/res/drawable-nodpi/button_transparent_pressed.xml b/sample/src/main/res/drawable-nodpi/button_transparent_pressed.xml
index e2ed965..e2ed965 100644
--- a/sample/res/drawable-nodpi/button_transparent_pressed.xml
+++ b/sample/src/main/res/drawable-nodpi/button_transparent_pressed.xml
diff --git a/sample/res/drawable-nodpi/buttonstate_standout.xml b/sample/src/main/res/drawable-nodpi/buttonstate_standout.xml
index 71cfcd3..71cfcd3 100644
--- a/sample/res/drawable-nodpi/buttonstate_standout.xml
+++ b/sample/src/main/res/drawable-nodpi/buttonstate_standout.xml
diff --git a/sample/res/drawable-nodpi/buttonstate_transparent.xml b/sample/src/main/res/drawable-nodpi/buttonstate_transparent.xml
index 8ca5594..8ca5594 100644
--- a/sample/res/drawable-nodpi/buttonstate_transparent.xml
+++ b/sample/src/main/res/drawable-nodpi/buttonstate_transparent.xml
diff --git a/sample/res/drawable-nodpi/pushpin_blue.png b/sample/src/main/res/drawable-nodpi/pushpin_blue.png
index bb6d1ff..bb6d1ff 100644
--- a/sample/res/drawable-nodpi/pushpin_blue.png
+++ b/sample/src/main/res/drawable-nodpi/pushpin_blue.png
Binary files differ
diff --git a/sample/res/drawable-nodpi/transparent.xml b/sample/src/main/res/drawable-nodpi/transparent.xml
index f4f33d9..f4f33d9 100644
--- a/sample/res/drawable-nodpi/transparent.xml
+++ b/sample/src/main/res/drawable-nodpi/transparent.xml
diff --git a/sample/res/drawable-xhdpi/daffy.gif b/sample/src/main/res/drawable-xhdpi/daffy.gif
index 7fab6be..7fab6be 100644
--- a/sample/res/drawable-xhdpi/daffy.gif
+++ b/sample/src/main/res/drawable-xhdpi/daffy.gif
Binary files differ
diff --git a/sample/res/drawable-xhdpi/launcher.png b/sample/src/main/res/drawable-xhdpi/launcher.png
index fdfae89..fdfae89 100644
--- a/sample/res/drawable-xhdpi/launcher.png
+++ b/sample/src/main/res/drawable-xhdpi/launcher.png
Binary files differ
diff --git a/sample/res/drawable-xhdpi/next.png b/sample/src/main/res/drawable-xhdpi/next.png
index 7dc45c0..7dc45c0 100644
--- a/sample/res/drawable-xhdpi/next.png
+++ b/sample/src/main/res/drawable-xhdpi/next.png
Binary files differ
diff --git a/sample/res/drawable-xhdpi/play.png b/sample/src/main/res/drawable-xhdpi/play.png
index 5112499..5112499 100644
--- a/sample/res/drawable-xhdpi/play.png
+++ b/sample/src/main/res/drawable-xhdpi/play.png
Binary files differ
diff --git a/sample/res/drawable-xhdpi/previous.png b/sample/src/main/res/drawable-xhdpi/previous.png
index e97e910..e97e910 100644
--- a/sample/res/drawable-xhdpi/previous.png
+++ b/sample/src/main/res/drawable-xhdpi/previous.png
Binary files differ
diff --git a/sample/res/drawable-xhdpi/reset.png b/sample/src/main/res/drawable-xhdpi/reset.png
index e1082da..e1082da 100644
--- a/sample/res/drawable-xhdpi/reset.png
+++ b/sample/src/main/res/drawable-xhdpi/reset.png
Binary files differ
diff --git a/sample/res/drawable-xhdpi/rotate.png b/sample/src/main/res/drawable-xhdpi/rotate.png
index 1ba064f..1ba064f 100644
--- a/sample/res/drawable-xhdpi/rotate.png
+++ b/sample/src/main/res/drawable-xhdpi/rotate.png
Binary files differ
diff --git a/sample/res/drawable-xxhdpi/launcher.png b/sample/src/main/res/drawable-xxhdpi/launcher.png
index 87f0e25..87f0e25 100644
--- a/sample/res/drawable-xxhdpi/launcher.png
+++ b/sample/src/main/res/drawable-xxhdpi/launcher.png
Binary files differ
diff --git a/sample/res/layout/animation_activity.xml b/sample/src/main/res/layout/animation_activity.xml
index 5416a88..5416a88 100644
--- a/sample/res/layout/animation_activity.xml
+++ b/sample/src/main/res/layout/animation_activity.xml
diff --git a/sample/res/layout/extension_circle_fragment.xml b/sample/src/main/res/layout/extension_circle_fragment.xml
index b1bcd76..b1bcd76 100644
--- a/sample/res/layout/extension_circle_fragment.xml
+++ b/sample/src/main/res/layout/extension_circle_fragment.xml
diff --git a/sample/res/layout/extension_freehand_fragment.xml b/sample/src/main/res/layout/extension_freehand_fragment.xml
index 006aa0f..006aa0f 100644
--- a/sample/res/layout/extension_freehand_fragment.xml
+++ b/sample/src/main/res/layout/extension_freehand_fragment.xml
diff --git a/sample/res/layout/extension_pin_fragment.xml b/sample/src/main/res/layout/extension_pin_fragment.xml
index fd67b84..fd67b84 100644
--- a/sample/res/layout/extension_pin_fragment.xml
+++ b/sample/src/main/res/layout/extension_pin_fragment.xml
diff --git a/sample/res/layout/fragments_activity.xml b/sample/src/main/res/layout/fragments_activity.xml
index 5624f75..5624f75 100644
--- a/sample/res/layout/fragments_activity.xml
+++ b/sample/src/main/res/layout/fragments_activity.xml
diff --git a/sample/res/layout/imagedisplay_large_fragment.xml b/sample/src/main/res/layout/imagedisplay_large_fragment.xml
index 442fc67..442fc67 100644
--- a/sample/res/layout/imagedisplay_large_fragment.xml
+++ b/sample/src/main/res/layout/imagedisplay_large_fragment.xml
diff --git a/sample/res/layout/imagedisplay_region_fragment.xml b/sample/src/main/res/layout/imagedisplay_region_fragment.xml
index 6c8b3d2..6c8b3d2 100644
--- a/sample/res/layout/imagedisplay_region_fragment.xml
+++ b/sample/src/main/res/layout/imagedisplay_region_fragment.xml
diff --git a/sample/res/layout/imagedisplay_rotate_fragment.xml b/sample/src/main/res/layout/imagedisplay_rotate_fragment.xml
index 9dbf50a..9dbf50a 100644
--- a/sample/res/layout/imagedisplay_rotate_fragment.xml
+++ b/sample/src/main/res/layout/imagedisplay_rotate_fragment.xml
diff --git a/sample/res/layout/main.xml b/sample/src/main/res/layout/main.xml
index 05146e9..05146e9 100644
--- a/sample/res/layout/main.xml
+++ b/sample/src/main/res/layout/main.xml
diff --git a/sample/res/layout/pages_activity.xml b/sample/src/main/res/layout/pages_activity.xml
index 46014bb..46014bb 100644
--- a/sample/res/layout/pages_activity.xml
+++ b/sample/src/main/res/layout/pages_activity.xml
diff --git a/sample/res/layout/view_pager.xml b/sample/src/main/res/layout/view_pager.xml
index c6c7bfc..c6c7bfc 100644
--- a/sample/res/layout/view_pager.xml
+++ b/sample/src/main/res/layout/view_pager.xml
diff --git a/sample/res/layout/view_pager_page.xml b/sample/src/main/res/layout/view_pager_page.xml
index 0f1ede4..0f1ede4 100644
--- a/sample/res/layout/view_pager_page.xml
+++ b/sample/src/main/res/layout/view_pager_page.xml
diff --git a/sample/res/values/colors.xml b/sample/src/main/res/values/colors.xml
index 2f29f49..2f29f49 100644
--- a/sample/res/values/colors.xml
+++ b/sample/src/main/res/values/colors.xml
diff --git a/sample/res/values/strings.xml b/sample/src/main/res/values/strings.xml
index 3c5a1f4..3c5a1f4 100644
--- a/sample/res/values/strings.xml
+++ b/sample/src/main/res/values/strings.xml
diff --git a/sample/res/values/style.xml b/sample/src/main/res/values/style.xml
index 023db6e..023db6e 100644
--- a/sample/res/values/style.xml
+++ b/sample/src/main/res/values/style.xml