1.12.1

fix single slide that lose touch detection
use library from github christbane the lastest version for imageviewattacher

README.md

@@ -21,7 +21,7 @@ For the most comprehensive collection of artifacts, point your Maven at: `http:/
 
 ```gradle
 dependencies {
-    compile 'com.hkm.loyalslider:library:1.11.0'
+    compile 'com.hkm.loyalslider:library:1.12.1'
 }
 ```
 

build.gradle

@@ -1,13 +1,12 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
-
 buildscript {
     repositories {
         jcenter()
         mavenCentral()
     }
     dependencies {
         classpath 'com.github.dcendents:android-maven-plugin:1.2'
-        classpath 'com.android.tools.build:gradle:2.3.2'
+        classpath 'com.android.tools.build:gradle:2.3.3'
         classpath 'com.novoda:bintray-release:0.5.0'
     }
 }
@@ -19,62 +18,4 @@ allprojects {
         maven { url "https://jitpack.io" }
     }
 }
-
-ext {
-    //Support Libraries dependencies
-    supportDependencies = [
-            percent               : "com.android.support:percent:${SUPPORT_LIBRARY}",
-            annotation            : "com.android.support:support-annotations:${SUPPORT_LIBRARY}",
-            support               : "com.android.support:support-v13:${SUPPORT_LIBRARY}",
-            appCompat             : "com.android.support:appcompat-v7:${SUPPORT_LIBRARY}",
-            recycler              : "com.android.support:recyclerview-v7:${SUPPORT_LIBRARY}",
-            design                : "com.android.support:design:${SUPPORT_LIBRARY}",
-            cardView              : "com.android.support:cardview-v7:${SUPPORT_LIBRARY}",
-            mediarouter           : "com.android.support:mediarouter-v7:${SUPPORT_LIBRARY}",
-            palette               : "com.android.support:palette-v7:${SUPPORT_LIBRARY}",
-
-            retrofitAdapter       : "com.squareup.retrofit2:retrofit-adapters:${RETROFIT_LIBRARY}",
-            retrofitCore          : "com.squareup.retrofit2:retrofit:${RETROFIT_LIBRARY}",
-            retrofitRXJava        : "com.squareup.retrofit2:adapter-rxjava:${RETROFIT_LIBRARY}",
-            retrofitConverterGson : "com.squareup.retrofit2:converter-gson:${RETROFIT_LIBRARY}",
-            retrofitParent        : "com.squareup.retrofit2:parent:${RETROFIT_LIBRARY}",
-
-            okhttpLogger          : "com.squareup.okhttp3:logging-interceptor:${OKHTTP_LIBRARY}",
-            okhttpWebsocket       : "com.squareup.okhttp3:okhttp-ws:${OKHTTP_LIBRARY}",
-            okhttpCore            : "com.squareup.okhttp3:okhttp:${OKHTTP_LIBRARY}",
-
-            icepick               : "frankiesardo:icepick:${FRANKIES_ICEPICK}",
-            icepickProcessor      : "frankiesardo:icepick-processor:${FRANKIES_ICEPICK}",
-
-            smartTabLayoutUtilsV13: "com.ogaclejapan.smarttablayout:utils-v13:${SMARTTABLAYOUT}@aar",
-            smartTabLayoutUtilsV4 : "com.ogaclejapan.smarttablayout:utils-v4:${SMARTTABLAYOUT}@aar",
-            smartTabLayoutCore    : "com.ogaclejapan.smarttablayout:library:${SMARTTABLAYOUT}@aar",
-
-            leakcanary            : "com.squareup.leakcanary:leakcanary-android:${LEAKCANARY}",
-            leakcanarynoop        : "com.squareup.leakcanary:leakcanary-android-no-op:${LEAKCANARY}",
-
-            gms_facial            : "com.google.android.gms:play-services-vision:9.8.0",
-            gms_anayltics         : "com.google.android.gms:play-services-analytics:${GOOGLE_PLAY_SERVICE}",
-
-            dagger                : "com.google.dagger:dagger:${DAGGER_2}",
-            daggerapt             : "com.google.dagger:dagger-compiler:${DAGGER_2}",
-
-
-            fishglassannotation   : "org.glassfish:javax.annotation:10.0-b28",
-            pretty_time           : "org.ocpsoft.prettytime:prettytime:4.0.1.Final",
-            gson                  : "com.google.code.gson:gson:2.6.2",
-            jsoup                 : "org.jsoup:jsoup:1.9.2",
-
-            firebasecore          : "com.google.firebase:firebase-core:${FIREBASE}",
-            database              : "com.google.firebase:firebase-database:${FIREBASE}",
-            storage               : "com.google.firebase:firebase-storage:${FIREBASE}",
-            crash                 : "com.google.firebase:firebase-crash:${FIREBASE}",
-            auth                  : "com.google.firebase:firebase-auth:${FIREBASE}",
-            messaging             : "com.google.firebase:firebase-messaging:${FIREBASE}",
-            config                : "com.google.firebase:firebase-config:${FIREBASE}",
-            invites               : "com.google.firebase:firebase-invites:${FIREBASE}",
-            ads                   : "com.google.firebase:firebase-ads:${FIREBASE}",
-            appindexing           : "com.google.firebase:firebase-appindexing:${FIREBASE}"
-
-    ]
-}
+apply from: "$rootDir/deps.gradle"

deps.gradle

@@ -0,0 +1,56 @@
+rootProject.ext.supportDependencies = [
+
+        percent               : "com.android.support:percent:${SUPPORT_LIBRARY}",
+        annotation            : "com.android.support:support-annotations:${SUPPORT_LIBRARY}",
+        support               : "com.android.support:support-v13:${SUPPORT_LIBRARY}",
+        appCompat             : "com.android.support:appcompat-v7:${SUPPORT_LIBRARY}",
+        recycler              : "com.android.support:recyclerview-v7:${SUPPORT_LIBRARY}",
+        design                : "com.android.support:design:${SUPPORT_LIBRARY}",
+        cardView              : "com.android.support:cardview-v7:${SUPPORT_LIBRARY}",
+        mediarouter           : "com.android.support:mediarouter-v7:${SUPPORT_LIBRARY}",
+        palette               : "com.android.support:palette-v7:${SUPPORT_LIBRARY}",
+
+        retrofitAdapter       : "com.squareup.retrofit2:retrofit-adapters:${RETROFIT_LIBRARY}",
+        retrofitCore          : "com.squareup.retrofit2:retrofit:${RETROFIT_LIBRARY}",
+        retrofitRXJava        : "com.squareup.retrofit2:adapter-rxjava:${RETROFIT_LIBRARY}",
+        retrofitConverterGson : "com.squareup.retrofit2:converter-gson:${RETROFIT_LIBRARY}",
+        retrofitParent        : "com.squareup.retrofit2:parent:${RETROFIT_LIBRARY}",
+
+        okhttpLogger          : "com.squareup.okhttp3:logging-interceptor:${OKHTTP_LIBRARY}",
+        okhttpWebsocket       : "com.squareup.okhttp3:okhttp-ws:${OKHTTP_LIBRARY}",
+        okhttpCore            : "com.squareup.okhttp3:okhttp:${OKHTTP_LIBRARY}",
+
+        icepick               : "frankiesardo:icepick:${FRANKIES_ICEPICK}",
+        icepickProcessor      : "frankiesardo:icepick-processor:${FRANKIES_ICEPICK}",
+
+        smartTabLayoutUtilsV13: "com.ogaclejapan.smarttablayout:utils-v13:${SMARTTABLAYOUT}@aar",
+        smartTabLayoutUtilsV4 : "com.ogaclejapan.smarttablayout:utils-v4:${SMARTTABLAYOUT}@aar",
+        smartTabLayoutCore    : "com.ogaclejapan.smarttablayout:library:${SMARTTABLAYOUT}@aar",
+
+        leakcanary            : "com.squareup.leakcanary:leakcanary-android:${LEAKCANARY}",
+        leakcanarynoop        : "com.squareup.leakcanary:leakcanary-android-no-op:${LEAKCANARY}",
+
+        gms_facial            : "com.google.android.gms:play-services-vision:9.8.0",
+        gms_anayltics         : "com.google.android.gms:play-services-analytics:${GOOGLE_PLAY_SERVICE}",
+
+        dagger                : "com.google.dagger:dagger:${DAGGER_2}",
+        daggerapt             : "com.google.dagger:dagger-compiler:${DAGGER_2}",
+
+
+        fishglassannotation   : "org.glassfish:javax.annotation:10.0-b28",
+        pretty_time           : "org.ocpsoft.prettytime:prettytime:4.0.1.Final",
+        gson                  : "com.google.code.gson:gson:2.6.2",
+        jsoup                 : "org.jsoup:jsoup:1.9.2",
+
+        firebasecore          : "com.google.firebase:firebase-core:${FIREBASE}",
+        database              : "com.google.firebase:firebase-database:${FIREBASE}",
+        storage               : "com.google.firebase:firebase-storage:${FIREBASE}",
+        crash                 : "com.google.firebase:firebase-crash:${FIREBASE}",
+        auth                  : "com.google.firebase:firebase-auth:${FIREBASE}",
+        messaging             : "com.google.firebase:firebase-messaging:${FIREBASE}",
+        config                : "com.google.firebase:firebase-config:${FIREBASE}",
+        invites               : "com.google.firebase:firebase-invites:${FIREBASE}",
+        ads                   : "com.google.firebase:firebase-ads:${FIREBASE}",
+        appindexing           : "com.google.firebase:firebase-appindexing:${FIREBASE}"
+
+]

gradle.properties

@@ -1,6 +1,6 @@
 # Project-wide Gradle settings.
-VERSION_NAME=1.11.0
-VERSION_CODE=111
+VERSION_NAME=1.12.1
+VERSION_CODE=122
 GROUP=com.hkm.loyalslider
 PUBLISH_GROUP_ID=com.hkm.loyalslider
 POM_DESCRIPTION=This is the slider for JAVA android use. Thanks to Android Image Slider. This will make it even a better one!

library/build.gradle

@@ -25,9 +25,13 @@ dependencies {
     compile supportDependencies.appCompat
     compile supportDependencies.support
     compile 'com.squareup.picasso:picasso:2.5.2'
-    compile 'com.github.bumptech.glide:glide:4.0.0'
+    compile('com.github.bumptech.glide:glide:4.0.0') {
+        exclude group: 'com.android.support'
+    }
     annotationProcessor 'com.github.bumptech.glide:compiler:4.0.0'
-    compile 'com.github.chrisbanes.photoview:library:1.2.4'
+    compile('com.github.chrisbanes:PhotoView:2.1.3') {
+        exclude group: 'com.squareup.picasso'
+    }
     //compile 'com.github.chrisbanes:PhotoView:2.0.0'
     compile 'jp.wasabeef:glide-transformations:2.0.2'
     // If you want to use the GPU Filters

library/src/main/java/com/hkm/slider/SliderLayout.java

@@ -36,6 +36,8 @@
 import com.hkm.slider.Tricks.MultiViewPager;
 import com.hkm.slider.Tricks.ViewPagerEx;
 
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -71,7 +73,7 @@ public class SliderLayout extends RelativeLayout {
     public static final int
             ZOOMABLE = 1, NONZOOMABLE = 0;
 
-
+    @Retention(RetentionPolicy.SOURCE)
     @IntDef({ZOOMABLE, NONZOOMABLE})
     public @interface SliderLayoutType {
     }
@@ -510,6 +512,11 @@ public void setDisablePageIndicator() {
         mDisabledSlider = true;
     }
 
+    /**
+     * boardcast the height changes from the slider layout
+     *
+     * @param setFinal OnViewConfigurationFinalized
+     */
     public final void setEnableMaxHeightFromAllSliders(final OnViewConfigurationFinalized setFinal) {
 
         mViewSizeMonitor = new OnViewConfigurationDetected() {
@@ -537,16 +544,14 @@ public final void setRemoveItemOnFailureToLoad(boolean enabled) {
     }
 
     private void autoDetermineLayoutDecoration() {
-        final boolean overlimit = mSliderAdapter.getCount() > slideDotLimit;
+        final boolean over_limit = mSliderAdapter.getCount() > slideDotLimit;
         switch (byVal(mSliderIndicatorPresentations)) {
             case Smart:
-                presentation(overlimit ? Numbers : Dots);
+                presentation(over_limit ? Numbers : Dots);
                 break;
             case Dots:
-
                 break;
             case Numbers:
-
                 break;
         }
     }
@@ -781,7 +786,7 @@ public void setSliderTransformDuration(int period, Interpolator interpolator) {
             final FixedSpeedScroller scroller = new FixedSpeedScroller(mViewPager.getContext(), interpolator, period);
             mScroller.set(mViewPager, scroller);
         } catch (Exception e) {
-
+            e.printStackTrace();
         }
     }
 

library/src/main/java/com/hkm/slider/SliderTypes/ZoomableView.java

@@ -2,7 +2,6 @@
 
 import android.animation.LayoutTransition;
 import android.app.Activity;
-import android.content.Context;
 import android.graphics.RectF;
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
@@ -14,16 +13,19 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.ImageButton;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
+import com.github.chrisbanes.photoview.OnMatrixChangedListener;
+import com.github.chrisbanes.photoview.OnPhotoTapListener;
+import com.github.chrisbanes.photoview.PhotoView;
+import com.github.chrisbanes.photoview.PhotoViewAttacher;
 import com.hkm.slider.R;
 import com.squareup.picasso.Callback;
 import com.squareup.picasso.Picasso;
 
-import uk.co.senab.photoview.PhotoView;
-import uk.co.senab.photoview.PhotoViewAttacher;
 
 /**
  * Created by hesk on 15/12/15.
@@ -216,17 +218,16 @@ protected void setDebugTextAdvance(final TextView debugfield, final BaseSliderVi
     }
 
 
-    public class PhotoTapListener implements PhotoViewAttacher.OnPhotoTapListener {
-
+    public class PhotoTapListener implements OnPhotoTapListener {
         @Override
-        public void onPhotoTap(View view, float x, float y) {
+        public void onPhotoTap(ImageView imageView, float x, float y) {
             float xPercentage = x * 100f;
             float yPercentage = y * 100f;
             //    Tool.trace(zoomimage.this,  String.format(PHOTO_TAP_TOAST_STRING, xPercentage, yPercentage, view == null ? 0 : view.getId()));
         }
     }
 
-    public class MatrixChangeListener implements PhotoViewAttacher.OnMatrixChangedListener {
+    public class MatrixChangeListener implements OnMatrixChangedListener {
         private final PhotoViewAttacher mAttacher;
         private final LinearLayout cover;
         private final ImageButton button;