Merge pull request riggaroo#11 from lolobosse/pr

riggaroo · riggaroo · commit e17f5d443b9c · 2016-05-25T07:04:43.000+02:00
Added a beta gif support
diff --git a/README.md b/README.md
@@ -31,6 +31,10 @@ In your activity, create a list of TutorialItems (set the title, subtitle, backg
         TutorialItem tutorialItem1 = new TutorialItem(context.getString(R.string.slide_1_african_story_books), context.getString(R.string.slide_1_african_story_books_subtitle),
                 R.color.slide_1, R.drawable.tut_page_1_front,  R.drawable.tut_page_1_background);
 
+	// You can also add gifs, [IN BETA YET] (because Glide is awesome!)
+	TutorialItem tutorialItem1 = new TutorialItem(context.getString(R.string.slide_1_african_story_books), context.getString(R.string.slide_1_african_story_books_subtitle),
+                R.color.slide_1, R.drawable.gif_drawable, true);
+
         ...
 
         ArrayList<TutorialItem> tutorialItems = new ArrayList<>();
diff --git a/materialhelptutorial/build.gradle b/materialhelptutorial/build.gradle
@@ -34,7 +34,7 @@ dependencies {
     compile "com.android.support:appcompat-v7:$SUPPORT_LIBRARY_VERSION"
     compile "com.android.support:percent:$SUPPORT_LIBRARY_VERSION"
     compile "com.android.support:support-annotations:$SUPPORT_LIBRARY_VERSION"
-    compile 'com.github.bumptech.glide:glide:3.6.0'
+    compile 'com.github.bumptech.glide:glide:3.7.0'
 }
 
 
diff --git a/materialhelptutorial/src/main/java/za/co/riggaroo/materialhelptutorial/MaterialTutorialFragment.java b/materialhelptutorial/src/main/java/za/co/riggaroo/materialhelptutorial/MaterialTutorialFragment.java
@@ -10,6 +10,7 @@
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
 
 /**
  * @author rebeccafranks
@@ -65,9 +66,12 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
         if (tutorialItem.getBackgroundImageRes() != -1) {
             Glide.with(this).load(tutorialItem.getBackgroundImageRes()).into(imageViewBack);
         }
-        if (tutorialItem.getForegroundImageRes() != -1) {
+        if (tutorialItem.getForegroundImageRes() != -1 && !tutorialItem.isGif()) {
             Glide.with(this).load(tutorialItem.getForegroundImageRes()).into(imageViewFront);
         }
+        if (tutorialItem.getForegroundImageRes() != -1 && tutorialItem.isGif()){
+            Glide.with(this).load(tutorialItem.getForegroundImageRes()).asGif().diskCacheStrategy(DiskCacheStrategy.SOURCE).into(imageViewFront);
+        }
         return v;
     }
 
diff --git a/materialhelptutorial/src/main/java/za/co/riggaroo/materialhelptutorial/TutorialItem.java b/materialhelptutorial/src/main/java/za/co/riggaroo/materialhelptutorial/TutorialItem.java
@@ -17,6 +17,7 @@ public class TutorialItem implements Parcelable {
     private int backgroundImageRes = -1;
     private int titleTextRes = -1;
     private int subTitleTextRes = -1;
+    private boolean isGif = false;
 
     public TutorialItem(@NonNull String titleText, @Nullable String subTitleText, @ColorRes int backgroundColor, @DrawableRes int foregroundImageRes, @DrawableRes int backgroundImageRes) {
         this.titleText = titleText;
@@ -33,6 +34,14 @@ public TutorialItem(@NonNull String titleText, @Nullable String subTitleText, @C
         this.foregroundImageRes = foregroundImageRes;
     }
 
+    public TutorialItem(@NonNull String titleText, @Nullable String subTitleText, @ColorRes int backgroundColor, @DrawableRes int foregroundImageRes, boolean isGif) {
+        this.titleText = titleText;
+        this.subTitleText = subTitleText;
+        this.backgroundColor = backgroundColor;
+        this.foregroundImageRes = foregroundImageRes;
+        this.isGif = isGif;
+    }
+
     public TutorialItem(@StringRes int titleTextRes, @StringRes int subTitleTextRes, @ColorRes int backgroundColor, @DrawableRes int foregroundImageRes, @DrawableRes int backgroundImageRes) {
         this.titleTextRes = titleTextRes;
         this.subTitleTextRes = subTitleTextRes;
@@ -76,6 +85,10 @@ public int getSubTitleTextRes() {
         return subTitleTextRes;
     }
 
+    public boolean isGif() {
+        return isGif;
+    }
+
     @Override
     public int describeContents() {
         return 0;
@@ -90,6 +103,7 @@ public void writeToParcel(Parcel dest, int flags) {
         dest.writeInt(this.backgroundImageRes);
         dest.writeInt(this.titleTextRes);
         dest.writeInt(this.subTitleTextRes);
+        dest.writeInt(this.isGif ? 1:0);
     }
 
     protected TutorialItem(Parcel in) {
@@ -100,6 +114,7 @@ protected TutorialItem(Parcel in) {
         this.backgroundImageRes = in.readInt();
         this.titleTextRes = in.readInt();
         this.subTitleTextRes = in.readInt();
+        this.isGif = in.readInt() == 1;
     }
 
     public static final Parcelable.Creator<TutorialItem> CREATOR = new Parcelable.Creator<TutorialItem>() {

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ dependencies {`
`34`	`34`	`compile "com.android.support:appcompat-v7:$SUPPORT_LIBRARY_VERSION"`
`35`	`35`	`compile "com.android.support:percent:$SUPPORT_LIBRARY_VERSION"`
`36`	`36`	`compile "com.android.support:support-annotations:$SUPPORT_LIBRARY_VERSION"`
`37`		`- compile 'com.github.bumptech.glide:glide:3.6.0'`
	`37`	`+ compile 'com.github.bumptech.glide:glide:3.7.0'`
`38`	`38`	`}`
`39`	`39`
`40`	`40`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`	`import android.widget.TextView;`
`11`	`11`
`12`	`12`	`import com.bumptech.glide.Glide;`
	`13`	`+import com.bumptech.glide.load.engine.DiskCacheStrategy;`
`13`	`14`
`14`	`15`	`/**`
`15`	`16`	`* @author rebeccafranks`
`@@ -65,9 +66,12 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa`
`65`	`66`	`if (tutorialItem.getBackgroundImageRes() != -1) {`
`66`	`67`	`Glide.with(this).load(tutorialItem.getBackgroundImageRes()).into(imageViewBack);`
`67`	`68`	`}`
`68`		`- if (tutorialItem.getForegroundImageRes() != -1) {`
	`69`	`+ if (tutorialItem.getForegroundImageRes() != -1 && !tutorialItem.isGif()) {`
`69`	`70`	`Glide.with(this).load(tutorialItem.getForegroundImageRes()).into(imageViewFront);`
`70`	`71`	`}`
	`72`	`+ if (tutorialItem.getForegroundImageRes() != -1 && tutorialItem.isGif()){`
	`73`	`+ Glide.with(this).load(tutorialItem.getForegroundImageRes()).asGif().diskCacheStrategy(DiskCacheStrategy.SOURCE).into(imageViewFront);`
	`74`	`+ }`
`71`	`75`	`return v;`
`72`	`76`	`}`
`73`	`77`