diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 15a0542c..cb195374 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -7,4 +7,4 @@ Before raising a new issue, please check the following places for an answer to y If you get stuck adding the view in your project or need help extending it for your requirements, please consider asking for help on StackOverflow instead of raising an issue. This issue tracker is intended for reporting bugs and raising feature requests. -Thanks for reading! \ No newline at end of file +Thanks for reading! diff --git a/library/build.gradle b/library/build.gradle index c685a1ae..486f387c 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -39,7 +39,7 @@ android { dependencies { compile fileTree(dir: 'libs', include: '*.jar') - compile 'com.android.support:support-annotations:25.3.0' + compile 'com.android.support:support-annotations:25.3.1' } apply from: rootProject.file('release.gradle') diff --git a/library/proguard-rules.txt b/library/proguard-rules.txt index ab1402d7..d6e07af5 100644 --- a/library/proguard-rules.txt +++ b/library/proguard-rules.txt @@ -1 +1 @@ --keep class com.davemorrissey.labs.subscaleview.** { *; } \ No newline at end of file +-keep class com.davemorrissey.labs.subscaleview.** { *; } diff --git a/library/project.properties b/library/project.properties index ac505718..91d2b024 100644 --- a/library/project.properties +++ b/library/project.properties @@ -12,4 +12,4 @@ # Project target. target=android-19 -android.library=true \ No newline at end of file +android.library=true diff --git a/library/res/values/attrs.xml b/library/res/values/attrs.xml index a4f4a5fd..e0f82898 100644 --- a/library/res/values/attrs.xml +++ b/library/res/values/attrs.xml @@ -25,4 +25,4 @@ limitations under the License. - \ No newline at end of file + diff --git a/library/src/com/davemorrissey/labs/subscaleview/SubsamplingScaleImageView.java b/library/src/com/davemorrissey/labs/subscaleview/SubsamplingScaleImageView.java index 2f4bb8f3..a8a5fee3 100644 --- a/library/src/com/davemorrissey/labs/subscaleview/SubsamplingScaleImageView.java +++ b/library/src/com/davemorrissey/labs/subscaleview/SubsamplingScaleImageView.java @@ -828,7 +828,7 @@ private boolean onTouchEventInternal(@NonNull MotionEvent event) { maxTouchCount = 0; handler.removeMessages(MESSAGE_LONG_CLICK); requestDisallowInterceptTouchEvent(false); - } + } if (!panEnabled) { vTranslate.x = vTranslateStart.x; vTranslate.y = vTranslateStart.y; diff --git a/sample/assets/ness.jpg b/sample/assets/ness.jpg old mode 100755 new mode 100644 diff --git a/sample/build.gradle b/sample/build.gradle index ed2fc3cb..78c374c7 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -40,6 +40,7 @@ android { dependencies { compile fileTree(dir: 'libs', include: '*.jar') compile project(':library') + compile 'com.android.support:support-v4:25.3.1' compile 'rapid.decoder:library:0.3.0' compile 'rapid.decoder:jpeg-decoder:0.3.0' compile 'rapid.decoder:png-decoder:0.3.0' diff --git a/sample/libs/android-support-v4.jar b/sample/libs/android-support-v4.jar deleted file mode 100644 index 9056828a..00000000 Binary files a/sample/libs/android-support-v4.jar and /dev/null differ diff --git a/sample/project.properties b/sample/project.properties index e2d4d7fe..a6cf15da 100644 --- a/sample/project.properties +++ b/sample/project.properties @@ -12,4 +12,4 @@ # Project target. target=android-19 -android.library.reference.1=../library \ No newline at end of file +android.library.reference.1=../library diff --git a/sample/res/drawable-nodpi/button_standout_inactive.xml b/sample/res/drawable-nodpi/button_standout_inactive.xml index 25114b0f..dfcefb43 100644 --- a/sample/res/drawable-nodpi/button_standout_inactive.xml +++ b/sample/res/drawable-nodpi/button_standout_inactive.xml @@ -1,4 +1,4 @@ - \ No newline at end of file + diff --git a/sample/res/drawable-nodpi/button_standout_pressed.xml b/sample/res/drawable-nodpi/button_standout_pressed.xml index 231d2e66..857646a6 100644 --- a/sample/res/drawable-nodpi/button_standout_pressed.xml +++ b/sample/res/drawable-nodpi/button_standout_pressed.xml @@ -1,4 +1,4 @@ - \ No newline at end of file + diff --git a/sample/res/drawable-nodpi/button_transparent_pressed.xml b/sample/res/drawable-nodpi/button_transparent_pressed.xml old mode 100755 new mode 100644 index ab24d855..e2ed965e --- a/sample/res/drawable-nodpi/button_transparent_pressed.xml +++ b/sample/res/drawable-nodpi/button_transparent_pressed.xml @@ -1,4 +1,4 @@ - \ No newline at end of file + diff --git a/sample/res/drawable-nodpi/buttonstate_standout.xml b/sample/res/drawable-nodpi/buttonstate_standout.xml old mode 100755 new mode 100644 index f88f921c..71cfcd3a --- a/sample/res/drawable-nodpi/buttonstate_standout.xml +++ b/sample/res/drawable-nodpi/buttonstate_standout.xml @@ -7,4 +7,4 @@ - \ No newline at end of file + diff --git a/sample/res/drawable-nodpi/buttonstate_transparent.xml b/sample/res/drawable-nodpi/buttonstate_transparent.xml index 104f17c3..8ca55944 100644 --- a/sample/res/drawable-nodpi/buttonstate_transparent.xml +++ b/sample/res/drawable-nodpi/buttonstate_transparent.xml @@ -7,4 +7,4 @@ - \ No newline at end of file + diff --git a/sample/res/drawable-nodpi/transparent.xml b/sample/res/drawable-nodpi/transparent.xml old mode 100755 new mode 100644 index 72da5aa7..f4f33d92 --- a/sample/res/drawable-nodpi/transparent.xml +++ b/sample/res/drawable-nodpi/transparent.xml @@ -1,4 +1,4 @@ - \ No newline at end of file + diff --git a/sample/res/drawable-xhdpi/next.png b/sample/res/drawable-xhdpi/next.png old mode 100755 new mode 100644 diff --git a/sample/res/drawable-xhdpi/play.png b/sample/res/drawable-xhdpi/play.png old mode 100755 new mode 100644 diff --git a/sample/res/drawable-xhdpi/previous.png b/sample/res/drawable-xhdpi/previous.png old mode 100755 new mode 100644 diff --git a/sample/res/drawable-xhdpi/reset.png b/sample/res/drawable-xhdpi/reset.png old mode 100755 new mode 100644 diff --git a/sample/res/drawable-xhdpi/rotate.png b/sample/res/drawable-xhdpi/rotate.png old mode 100755 new mode 100644 diff --git a/sample/res/layout/animation_activity.xml b/sample/res/layout/animation_activity.xml index 85e98372..2f61c2a5 100644 --- a/sample/res/layout/animation_activity.xml +++ b/sample/res/layout/animation_activity.xml @@ -69,4 +69,4 @@ android:layout_width="match_parent" android:layout_height="match_parent"/> - \ No newline at end of file + diff --git a/sample/res/layout/extension_activity.xml b/sample/res/layout/extension_activity.xml index fc2aa95f..0f4d200f 100644 --- a/sample/res/layout/extension_activity.xml +++ b/sample/res/layout/extension_activity.xml @@ -7,4 +7,4 @@ android:layout_width="match_parent" android:layout_height="match_parent"/> - \ No newline at end of file + diff --git a/sample/res/layout/extension_circle_fragment.xml b/sample/res/layout/extension_circle_fragment.xml index 5b70783b..876e70bd 100644 --- a/sample/res/layout/extension_circle_fragment.xml +++ b/sample/res/layout/extension_circle_fragment.xml @@ -56,4 +56,4 @@ android:layout_width="match_parent" android:layout_height="match_parent"/> - \ No newline at end of file + diff --git a/sample/res/layout/extension_freehand_fragment.xml b/sample/res/layout/extension_freehand_fragment.xml index c87da2a8..3dbab67a 100644 --- a/sample/res/layout/extension_freehand_fragment.xml +++ b/sample/res/layout/extension_freehand_fragment.xml @@ -70,4 +70,4 @@ android:layout_width="match_parent" android:layout_height="match_parent"/> - \ No newline at end of file + diff --git a/sample/res/layout/extension_pin_fragment.xml b/sample/res/layout/extension_pin_fragment.xml index d758503b..982e96f3 100644 --- a/sample/res/layout/extension_pin_fragment.xml +++ b/sample/res/layout/extension_pin_fragment.xml @@ -57,4 +57,4 @@ android:layout_width="match_parent" android:layout_height="match_parent"/> - \ No newline at end of file + diff --git a/sample/res/layout/imagedisplay_large_fragment.xml b/sample/res/layout/imagedisplay_large_fragment.xml index 1a887164..ed09b9cf 100644 --- a/sample/res/layout/imagedisplay_large_fragment.xml +++ b/sample/res/layout/imagedisplay_large_fragment.xml @@ -57,4 +57,4 @@ android:layout_width="match_parent" android:layout_height="match_parent"/> - \ No newline at end of file + diff --git a/sample/res/layout/imagedisplay_region_fragment.xml b/sample/res/layout/imagedisplay_region_fragment.xml index b9367ba7..bb0ec2b1 100644 --- a/sample/res/layout/imagedisplay_region_fragment.xml +++ b/sample/res/layout/imagedisplay_region_fragment.xml @@ -70,4 +70,4 @@ android:layout_width="match_parent" android:layout_height="match_parent"/> - \ No newline at end of file + diff --git a/sample/res/layout/imagedisplay_rotate_fragment.xml b/sample/res/layout/imagedisplay_rotate_fragment.xml index f84524ab..296dc5dc 100644 --- a/sample/res/layout/imagedisplay_rotate_fragment.xml +++ b/sample/res/layout/imagedisplay_rotate_fragment.xml @@ -69,4 +69,4 @@ android:layout_width="match_parent" android:layout_height="match_parent"/> - \ No newline at end of file + diff --git a/sample/res/layout/main.xml b/sample/res/layout/main.xml index 5a7ae1fa..90d81b9c 100644 --- a/sample/res/layout/main.xml +++ b/sample/res/layout/main.xml @@ -178,4 +178,4 @@ android:text="View on GitHub"/> - \ No newline at end of file + diff --git a/sample/res/layout/notes_activity.xml b/sample/res/layout/notes_activity.xml index ecc8baf7..ef4aef03 100644 --- a/sample/res/layout/notes_activity.xml +++ b/sample/res/layout/notes_activity.xml @@ -56,4 +56,4 @@ android:layout_width="match_parent" android:layout_height="match_parent"/> - \ No newline at end of file + diff --git a/sample/res/layout/view_pager.xml b/sample/res/layout/view_pager.xml index ffe014bb..76584e0f 100644 --- a/sample/res/layout/view_pager.xml +++ b/sample/res/layout/view_pager.xml @@ -66,4 +66,3 @@ android:layout_height="match_parent" /> - diff --git a/sample/res/layout/view_pager_page.xml b/sample/res/layout/view_pager_page.xml index 40186024..71c8f313 100644 --- a/sample/res/layout/view_pager_page.xml +++ b/sample/res/layout/view_pager_page.xml @@ -7,4 +7,4 @@ android:layout_width="match_parent" android:layout_height="match_parent"/> - \ No newline at end of file + diff --git a/sample/res/values/colors.xml b/sample/res/values/colors.xml index 50665837..2f29f497 100644 --- a/sample/res/values/colors.xml +++ b/sample/res/values/colors.xml @@ -2,4 +2,4 @@ #111111 #282828 - \ No newline at end of file + diff --git a/sample/res/values/style.xml b/sample/res/values/style.xml index ea0f3203..a9489ff7 100644 --- a/sample/res/values/style.xml +++ b/sample/res/values/style.xml @@ -10,4 +10,4 @@ @color/actionBarBackground - \ No newline at end of file + diff --git a/sample/src/com/davemorrissey/labs/subscaleview/sample/viewpager/VerticalViewPager.java b/sample/src/com/davemorrissey/labs/subscaleview/sample/viewpager/VerticalViewPager.java index 8db66688..86d2e85a 100644 --- a/sample/src/com/davemorrissey/labs/subscaleview/sample/viewpager/VerticalViewPager.java +++ b/sample/src/com/davemorrissey/labs/subscaleview/sample/viewpager/VerticalViewPager.java @@ -64,4 +64,4 @@ public boolean onTouchEvent(MotionEvent ev) { return super.onTouchEvent(swapXY(ev)); } -} \ No newline at end of file +} diff --git a/settings.gradle b/settings.gradle index e6209efa..612d9e44 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,2 @@ include ':library' -include ':sample' \ No newline at end of file +include ':sample'