Use Glide instead of Picasso

alilotfi · alilotfi · commit a3f0e7d0376f · 2016-05-06T00:43:26.000+04:30
diff --git a/demo/src/main/java/com/daimajia/slider/demo/MainActivity.java b/demo/src/main/java/com/daimajia/slider/demo/MainActivity.java
@@ -52,7 +52,7 @@ protected void onCreate(Bundle savedInstanceState) {
             textSliderView
                     .description(name)
                     .image(file_maps.get(name))
-                    .setScaleType(BaseSliderView.ScaleType.Fit)
+                    .setScaleType(BaseSliderView.ScaleType.FitCenter)
                     .setOnSliderClickListener(this);
 
             //add your extra information
diff --git a/library/build.gradle b/library/build.gradle
@@ -48,7 +48,7 @@ dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'com.android.support:appcompat-v7:22.1.1'
     compile "com.android.support:support-v4:22.1.1"
-    compile 'com.squareup.picasso:picasso:2.5.2'
+    compile 'com.github.bumptech.glide:glide:3.7.0'
     compile 'com.nineoldandroids:library:2.4.0'
 }
 apply from: './gradle-mvn-push.gradle'
diff --git a/library/src/main/java/com/daimajia/slider/library/SliderTypes/BaseSliderView.java b/library/src/main/java/com/daimajia/slider/library/SliderTypes/BaseSliderView.java
@@ -5,10 +5,10 @@
 import android.view.View;
 import android.widget.ImageView;
 
+import com.bumptech.glide.DrawableTypeRequest;
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.RequestManager;
 import com.daimajia.slider.library.R;
-import com.squareup.picasso.Callback;
-import com.squareup.picasso.Picasso;
-import com.squareup.picasso.RequestCreator;
 
 import java.io.File;
 
@@ -50,10 +50,10 @@ public abstract class BaseSliderView {
     /**
      * Scale type of the image.
      */
-    private ScaleType mScaleType = ScaleType.Fit;
+    private ScaleType mScaleType = ScaleType.FitCenter;
 
     public enum ScaleType{
-        CenterCrop, CenterInside, Fit, FitCenterCrop
+        CenterCrop, FitCenter
     }
 
     protected BaseSliderView(Context context) {
@@ -205,14 +205,14 @@ public void onClick(View v) {
             mLoadListener.onStart(me);
         }
 
-        Picasso p = Picasso.with(mContext);
-        RequestCreator rq = null;
+        RequestManager g = Glide.with(mContext);
+        DrawableTypeRequest rq;
         if(mUrl!=null){
-            rq = p.load(mUrl);
+            rq = g.load(mUrl);
         }else if(mFile != null){
-            rq = p.load(mFile);
+            rq = g.load(mFile);
         }else if(mRes != 0){
-            rq = p.load(mRes);
+            rq = g.load(mRes);
         }else{
             return;
         }
@@ -230,35 +230,18 @@ public void onClick(View v) {
         }
 
         switch (mScaleType){
-            case Fit:
-                rq.fit();
+            case FitCenter:
+                rq.fitCenter();
                 break;
             case CenterCrop:
-                rq.fit().centerCrop();
-                break;
-            case CenterInside:
-                rq.fit().centerInside();
+                rq.centerCrop();
                 break;
         }
 
-        rq.into(targetImageView,new Callback() {
-            @Override
-            public void onSuccess() {
-                if(v.findViewById(R.id.loading_bar) != null){
-                    v.findViewById(R.id.loading_bar).setVisibility(View.INVISIBLE);
-                }
-            }
-
-            @Override
-            public void onError() {
-                if(mLoadListener != null){
-                    mLoadListener.onEnd(false,me);
-                }
-                if(v.findViewById(R.id.loading_bar) != null){
-                    v.findViewById(R.id.loading_bar).setVisibility(View.INVISIBLE);
-                }
-            }
-        });
+        rq.into(targetImageView);
+        if(v.findViewById(R.id.loading_bar) != null){
+            v.findViewById(R.id.loading_bar).setVisibility(View.INVISIBLE);
+        }
    }
 
 

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ dependencies {`
`48`	`48`	`compile fileTree(dir: 'libs', include: ['*.jar'])`
`49`	`49`	`compile 'com.android.support:appcompat-v7:22.1.1'`
`50`	`50`	`compile "com.android.support:support-v4:22.1.1"`
`51`		`- compile 'com.squareup.picasso:picasso:2.5.2'`
	`51`	`+ compile 'com.github.bumptech.glide:glide:3.7.0'`
`52`	`52`	`compile 'com.nineoldandroids:library:2.4.0'`
`53`	`53`	`}`
`54`	`54`	`apply from: './gradle-mvn-push.gradle'`