Merge pull request #357 from friederbluemle/update-project

davemorrissey · web-flow · commit 7f76a8d05d92 · 2017-10-30T13:01:26.000Z
Minor file cleanups + remove support binary
diff --git 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!
+Thanks for reading!
diff --git 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
@@ -1 +1 @@
--keep class com.davemorrissey.labs.subscaleview.** { *; }
+-keep class com.davemorrissey.labs.subscaleview.** { *; }
diff --git a/library/project.properties b/library/project.properties
@@ -12,4 +12,4 @@
 
 # Project target.
 target=android-19
-android.library=true
+android.library=true
diff --git a/library/res/values/attrs.xml b/library/res/values/attrs.xml
@@ -25,4 +25,4 @@ limitations under the License.
         <attr name="tileBackgroundColor" format="color"/>
     </declare-styleable>
 
-</resources>
+</resources>
diff --git 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
diff --git 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
diff --git a/sample/project.properties b/sample/project.properties
@@ -12,4 +12,4 @@
 
 # Project target.
 target=android-19
-android.library.reference.1=../library
+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
@@ -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>
+</shape>
diff --git 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>
+</shape>
diff --git 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>
+</shape>
diff --git 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>
+</selector>
diff --git 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>
+</selector>
diff --git 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>
+</shape>
diff --git a/sample/res/drawable-xhdpi/next.png b/sample/res/drawable-xhdpi/next.png
diff --git a/sample/res/drawable-xhdpi/play.png b/sample/res/drawable-xhdpi/play.png
diff --git a/sample/res/drawable-xhdpi/previous.png b/sample/res/drawable-xhdpi/previous.png
diff --git a/sample/res/drawable-xhdpi/reset.png b/sample/res/drawable-xhdpi/reset.png
diff --git a/sample/res/drawable-xhdpi/rotate.png b/sample/res/drawable-xhdpi/rotate.png
diff --git 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>
+</RelativeLayout>
diff --git 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>
+</RelativeLayout>
diff --git 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>
+</RelativeLayout>
diff --git 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>
+</RelativeLayout>
diff --git 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>
+</RelativeLayout>
diff --git 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>
+</RelativeLayout>
diff --git 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>
+</RelativeLayout>
diff --git 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>
+</RelativeLayout>
diff --git a/sample/res/layout/main.xml b/sample/res/layout/main.xml
@@ -178,4 +178,4 @@
                 android:text="View on GitHub"/>
 
     </LinearLayout>
-</ScrollView>
+</ScrollView>
diff --git 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>
+</RelativeLayout>
diff --git 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
@@ -7,4 +7,4 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"/>
 
-</RelativeLayout>
+</RelativeLayout>
diff --git 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>
+</resources>
diff --git 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>
+</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
@@ -64,4 +64,4 @@ public boolean onTouchEvent(MotionEvent ev) {
         return super.onTouchEvent(swapXY(ev));
     }
 
-}
+}
diff --git a/settings.gradle b/settings.gradle
@@ -1,2 +1,2 @@
 include ':library'
-include ':sample'
+include ':sample'

Original file line number	Diff line number	Diff line change
`@@ -7,4 +7,4 @@ Before raising a new issue, please check the following places for an answer to y`
`7`	`7`
`8`	`8`	`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.`
`9`	`9`
`10`		`-Thanks for reading!`
	`10`	`+Thanks for reading!`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ android {`
`39`	`39`
`40`	`40`	`dependencies {`
`41`	`41`	`compile fileTree(dir: 'libs', include: '*.jar')`
`42`		`- compile 'com.android.support:support-annotations:25.3.0'`
	`42`	`+ compile 'com.android.support:support-annotations:25.3.1'`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`apply from: rootProject.file('release.gradle')`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`--keep class com.davemorrissey.labs.subscaleview.** { *; }`
	`1`	`+-keep class com.davemorrissey.labs.subscaleview.** { *; }`
Original file line number	Diff line number	Diff line change
`@@ -66,4 +66,3 @@`
`66`	`66`	`android:layout_height="match_parent" />`
`67`	`67`
`68`	`68`	`</RelativeLayout>`
`69`		`-`
Original file line number	Diff line number	Diff line change
`@@ -64,4 +64,4 @@ public boolean onTouchEvent(MotionEvent ev) {`
`64`	`64`	`return super.onTouchEvent(swapXY(ev));`
`65`	`65`	`}`
`66`	`66`
`67`		`-}`
	`67`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`include ':library'`
`2`		`-include ':sample'`
	`2`	`+include ':sample'`