Upgrade Android support & PhotoView lib

1. upgraded Android support from 25.0.3 -> 26.0.1 2. upgraded PhotoView from 1.3.0 -> 2.1.3 3. upgraded glide from 4.0.0-RC1 -> 4.0.0 4. restored the BaseSlideView.bindEventShowGlide() method Signed-off-by: Jack Cheung <[email protected]>
101medialab · Sep 5, 2017 · f6e8f3d · f6e8f3d
1 parent 2c30672
commit f6e8f3d
Show file tree

Hide file tree

Showing 2 changed files with 73 additions and 2 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 # Project-wide Gradle settings.
-VERSION_NAME=1.13.0
-VERSION_CODE=110
+VERSION_NAME=1.13.1
+VERSION_CODE=111
 GROUP=com.hkm.loyalslider
 SUPPORT_LIBRARY=26.0.1
 FITKIT=0.4.1

diff --git a/library/src/main/java/com/hkm/slider/SliderTypes/BaseSliderView.java b/library/src/main/java/com/hkm/slider/SliderTypes/BaseSliderView.java
@@ -27,7 +27,15 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.bumptech.glide.Glide;
 import com.bumptech.glide.RequestBuilder;
+import com.bumptech.glide.RequestManager;
+import com.bumptech.glide.load.DataSource;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
+import com.bumptech.glide.load.engine.GlideException;
+import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions;
+import com.bumptech.glide.request.RequestListener;
+import com.bumptech.glide.request.RequestOptions;
 import com.hkm.slider.BuildConfig;
 import com.hkm.slider.CapturePhotoUtils;
 import com.hkm.slider.LoyalUtil;
@@ -351,6 +359,69 @@ public BaseSliderView enableImageLocalStorage() {
         return this;
     }
 
+    protected void bindEventShowGlide(final View v, final ImageView targetImageView) {
+        RequestOptions requestOptions = new RequestOptions();
+
+        v.setOnClickListener(click_triggered);
+        RequestManager glideRM = Glide.with(mContext);
+        RequestBuilder rq;
+        if (mUrl != null) {
+            rq = glideRM.load(mUrl);
+        } else if (mFile != null) {
+            rq = glideRM.load(mFile);
+        } else if (mRes != 0) {
+            rq = glideRM.load(mRes);
+        } else {
+            return;
+        }
+
+        if (getEmpty() != 0) {
+            requestOptions.placeholder(getEmpty());
+        }
+        if (getError() != 0) {
+            requestOptions.error(getError());
+        }
+
+        switch (mScaleType) {
+            case Fit:
+                requestOptions.fitCenter();
+                break;
+            case CenterCrop:
+                requestOptions.centerCrop();
+                break;
+            case CenterInside:
+                requestOptions.fitCenter();
+                break;
+        }
+
+        requestOptions.diskCacheStrategy(DiskCacheStrategy.ALL);
+        if (mTargetWidth > 0 || mTargetHeight > 0) {
+            requestOptions.override(mTargetWidth, mTargetHeight);
+        }
+
+        rq.apply(requestOptions);
+
+        rq.listener(new RequestListener() {
+            @Override
+            public boolean onLoadFailed(@Nullable GlideException e, Object model, com.bumptech.glide.request.target.Target target, boolean isFirstResource) {
+                reportStatusEnd(false);
+                return false;
+            }
+
+            @Override
+            public boolean onResourceReady(Object resource, Object model, com.bumptech.glide.request.target.Target target, DataSource dataSource, boolean isFirstResource) {
+                hideLoadingProgress(v);
+                triggerOnLongClick(v);
+                reportStatusEnd(true);
+                return false;
+            }
+        });
+        rq.transition(DrawableTransitionOptions.withCrossFade());
+
+        additionalGlideModifier(rq);
+        rq.into(targetImageView);
+    }
+
     protected void additionalGlideModifier(RequestBuilder requestBuilder) {
 
     }