Merge pull request #357 from friederbluemle/update-project
Minor file cleanups + remove support binary
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 15a0542..cb19537 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -7,4 +7,4 @@
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 c685a1a..486f387 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -39,7 +39,7 @@
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 ab1402d..d6e07af 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 ac50571..91d2b02 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 a4f4a5f..e0f8289 100644
--- a/library/res/values/attrs.xml
+++ b/library/res/values/attrs.xml
@@ -25,4 +25,4 @@
<attr name="tileBackgroundColor" format="color"/>
</declare-styleable>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/library/src/com/davemorrissey/labs/subscaleview/SubsamplingScaleImageView.java b/library/src/com/davemorrissey/labs/subscaleview/SubsamplingScaleImageView.java
index 2f4bb8f..a8a5fee 100644
--- a/library/src/com/davemorrissey/labs/subscaleview/SubsamplingScaleImageView.java
+++ b/library/src/com/davemorrissey/labs/subscaleview/SubsamplingScaleImageView.java
@@ -828,7 +828,7 @@
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
Binary files differ
diff --git a/sample/build.gradle b/sample/build.gradle
index ed2fc3c..78c374c 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -40,6 +40,7 @@
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 9056828..0000000
--- a/sample/libs/android-support-v4.jar
+++ /dev/null
Binary files differ
diff --git a/sample/project.properties b/sample/project.properties
index e2d4d7f..a6cf15d 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 25114b0..dfcefb4 100644
--- a/sample/res/drawable-nodpi/button_standout_inactive.xml
+++ b/sample/res/drawable-nodpi/button_standout_inactive.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<solid android:color="#333333" />
-</shape>
\ No newline at end of file
+</shape>
diff --git a/sample/res/drawable-nodpi/button_standout_pressed.xml b/sample/res/drawable-nodpi/button_standout_pressed.xml
index 231d2e6..857646a 100644
--- a/sample/res/drawable-nodpi/button_standout_pressed.xml
+++ b/sample/res/drawable-nodpi/button_standout_pressed.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<solid android:color="#0099CC" />
-</shape>
\ No newline at end of file
+</shape>
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 ab24d85..e2ed965
--- a/sample/res/drawable-nodpi/button_transparent_pressed.xml
+++ b/sample/res/drawable-nodpi/button_transparent_pressed.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<solid android:color="#770099cc" />
-</shape>
\ No newline at end of file
+</shape>
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 f88f921..71cfcd3
--- a/sample/res/drawable-nodpi/buttonstate_standout.xml
+++ b/sample/res/drawable-nodpi/buttonstate_standout.xml
@@ -7,4 +7,4 @@
<item android:state_focused="false" android:state_pressed="true"
android:drawable="@drawable/button_standout_pressed" />
<item android:drawable="@drawable/button_standout_inactive"/>
-</selector>
\ No newline at end of file
+</selector>
diff --git a/sample/res/drawable-nodpi/buttonstate_transparent.xml b/sample/res/drawable-nodpi/buttonstate_transparent.xml
index 104f17c..8ca5594 100644
--- a/sample/res/drawable-nodpi/buttonstate_transparent.xml
+++ b/sample/res/drawable-nodpi/buttonstate_transparent.xml
@@ -7,4 +7,4 @@
<item android:state_focused="false" android:state_pressed="true"
android:drawable="@drawable/button_transparent_pressed" />
<item android:drawable="@drawable/transparent"/>
-</selector>
\ No newline at end of file
+</selector>
diff --git a/sample/res/drawable-nodpi/transparent.xml b/sample/res/drawable-nodpi/transparent.xml
old mode 100755
new mode 100644
index 72da5aa..f4f33d9
--- a/sample/res/drawable-nodpi/transparent.xml
+++ b/sample/res/drawable-nodpi/transparent.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<solid android:color="#00000000" />
-</shape>
\ No newline at end of file
+</shape>
diff --git a/sample/res/drawable-xhdpi/next.png b/sample/res/drawable-xhdpi/next.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/sample/res/drawable-xhdpi/play.png b/sample/res/drawable-xhdpi/play.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/sample/res/drawable-xhdpi/previous.png b/sample/res/drawable-xhdpi/previous.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/sample/res/drawable-xhdpi/reset.png b/sample/res/drawable-xhdpi/reset.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/sample/res/drawable-xhdpi/rotate.png b/sample/res/drawable-xhdpi/rotate.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/sample/res/layout/animation_activity.xml b/sample/res/layout/animation_activity.xml
index 85e9837..2f61c2a 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"/>
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/sample/res/layout/extension_activity.xml b/sample/res/layout/extension_activity.xml
index fc2aa95..0f4d200 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"/>
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/sample/res/layout/extension_circle_fragment.xml b/sample/res/layout/extension_circle_fragment.xml
index 5b70783..876e70b 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"/>
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/sample/res/layout/extension_freehand_fragment.xml b/sample/res/layout/extension_freehand_fragment.xml
index c87da2a..3dbab67 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"/>
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/sample/res/layout/extension_pin_fragment.xml b/sample/res/layout/extension_pin_fragment.xml
index d758503..982e96f 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"/>
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/sample/res/layout/imagedisplay_large_fragment.xml b/sample/res/layout/imagedisplay_large_fragment.xml
index 1a88716..ed09b9c 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"/>
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/sample/res/layout/imagedisplay_region_fragment.xml b/sample/res/layout/imagedisplay_region_fragment.xml
index b9367ba..bb0ec2b 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"/>
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/sample/res/layout/imagedisplay_rotate_fragment.xml b/sample/res/layout/imagedisplay_rotate_fragment.xml
index f84524a..296dc5d 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"/>
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/sample/res/layout/main.xml b/sample/res/layout/main.xml
index 5a7ae1f..90d81b9 100644
--- a/sample/res/layout/main.xml
+++ b/sample/res/layout/main.xml
@@ -178,4 +178,4 @@
android:text="View on GitHub"/>
</LinearLayout>
-</ScrollView>
\ No newline at end of file
+</ScrollView>
diff --git a/sample/res/layout/notes_activity.xml b/sample/res/layout/notes_activity.xml
index ecc8baf..ef4aef0 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"/>
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/sample/res/layout/view_pager.xml b/sample/res/layout/view_pager.xml
index ffe014b..76584e0 100644
--- a/sample/res/layout/view_pager.xml
+++ b/sample/res/layout/view_pager.xml
@@ -66,4 +66,3 @@
android:layout_height="match_parent" />
</RelativeLayout>
-
diff --git a/sample/res/layout/view_pager_page.xml b/sample/res/layout/view_pager_page.xml
index 4018602..71c8f31 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"/>
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/sample/res/values/colors.xml b/sample/res/values/colors.xml
index 5066583..2f29f49 100644
--- a/sample/res/values/colors.xml
+++ b/sample/res/values/colors.xml
@@ -2,4 +2,4 @@
<resources>
<color name="background">#111111</color>
<color name="actionBarBackground">#282828</color>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/sample/res/values/style.xml b/sample/res/values/style.xml
index ea0f320..a9489ff 100644
--- a/sample/res/values/style.xml
+++ b/sample/res/values/style.xml
@@ -10,4 +10,4 @@
<item name="android:background">@color/actionBarBackground</item>
</style>
-</resources>
\ No newline at end of file
+</resources>
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 8db6668..86d2e85 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 @@
return super.onTouchEvent(swapXY(ev));
}
-}
\ No newline at end of file
+}
diff --git a/settings.gradle b/settings.gradle
index e6209ef..612d9e4 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,2 +1,2 @@
include ':library'
-include ':sample'
\ No newline at end of file
+include ':sample'
