From 015152c274b71c54dcdf8208a8d6b7578e74d315 Mon Sep 17 00:00:00 2001 From: Youngchan Date: Tue, 10 May 2016 15:26:11 +0900 Subject: [PATCH 01/14] Bug fit --- .../java/za/co/riggaroo/materialhelptutorial/TutorialItem.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/materialhelptutorial/src/main/java/za/co/riggaroo/materialhelptutorial/TutorialItem.java b/materialhelptutorial/src/main/java/za/co/riggaroo/materialhelptutorial/TutorialItem.java index b3c0742..032124f 100644 --- a/materialhelptutorial/src/main/java/za/co/riggaroo/materialhelptutorial/TutorialItem.java +++ b/materialhelptutorial/src/main/java/za/co/riggaroo/materialhelptutorial/TutorialItem.java @@ -42,7 +42,7 @@ public TutorialItem(@StringRes int titleTextRes, @StringRes int subTitleTextRes, } public TutorialItem(@StringRes int titleTextRes, @StringRes int subTitleTextRes, @ColorRes int backgroundColor, @DrawableRes int foregroundImageRes) { - this.subTitleTextRes = titleTextRes; + this.titleTextRes = titleTextRes; this.subTitleTextRes = subTitleTextRes; this.backgroundColor = backgroundColor; this.foregroundImageRes = foregroundImageRes; From 04263d56b8cb27e72ced235ccd63e4749213ab5b Mon Sep 17 00:00:00 2001 From: Rebecca Franks Date: Wed, 11 May 2016 08:53:35 +0200 Subject: [PATCH 02/14] Up'ed to version 1.2.1 --- build.gradle | 2 +- gradle.properties | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 4 ++-- materialhelptutorial/build.gradle | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 67a3f2f..530965f 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:1.3.0' + classpath 'com.android.tools.build:gradle:2.1.0' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.4' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3' // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle.properties b/gradle.properties index b6b9adc..bd04927 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,6 +12,6 @@ # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true -#Sun Apr 17 13:50:43 SAST 2016 -systemProp.http.proxyHost= +#Wed May 11 08:23:46 SAST 2016 +systemProp.http.proxyHost=127.0.0.1 systemProp.http.proxyPort=8080 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1fd7470..0cb9b7f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Nov 09 22:44:17 SAST 2015 +#Wed May 11 08:28:41 SAST 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip diff --git a/materialhelptutorial/build.gradle b/materialhelptutorial/build.gradle index fcccfba..066a2c7 100644 --- a/materialhelptutorial/build.gradle +++ b/materialhelptutorial/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.library' apply plugin: 'com.github.dcendents.android-maven' apply plugin: 'com.jfrog.bintray' -version = "1.2.0" +version = "1.2.1" group = "za.co.riggaroo" def siteUrl = 'https://github.com/spongebobrf/MaterialIntroTutorial' @@ -15,7 +15,7 @@ android { defaultConfig { minSdkVersion 11 targetSdkVersion 23 - versionCode 6 + versionCode 7 versionName version } buildTypes { From 028da561998be1e542b79835fc1d3876a81850b3 Mon Sep 17 00:00:00 2001 From: Rebecca Franks Date: Sun, 15 May 2016 06:58:21 -0700 Subject: [PATCH 03/14] Changed read to include 1.+ --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2efab73..567df66 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Example: Add the following into your build.gradle: ```groovy - compile 'za.co.riggaroo:materialhelptutorial:1.1.0' + compile 'za.co.riggaroo:materialhelptutorial:1.+' ``` In your activity, create a list of TutorialItems (set the title, subtitle, background colour and image drawable int). Pass them onto the MaterialTutorialActivity and start the activity for result. ```java From db992d09134ddbe848a0a451b3028c7789440a82 Mon Sep 17 00:00:00 2001 From: Laurent Meyer Date: Mon, 23 May 2016 18:44:19 +0200 Subject: [PATCH 04/14] Updated glide lib to get the best possible gif support --- materialhelptutorial/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/materialhelptutorial/build.gradle b/materialhelptutorial/build.gradle index 066a2c7..bf52854 100644 --- 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' } From 1e035de2e912732ba57a59413aa17a2a9f51e377 Mon Sep 17 00:00:00 2001 From: Laurent Meyer Date: Mon, 23 May 2016 18:48:48 +0200 Subject: [PATCH 05/14] Added a Beta GIF Support --- .../MaterialTutorialFragment.java | 6 +++++- .../materialhelptutorial/TutorialItem.java | 15 +++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/materialhelptutorial/src/main/java/za/co/riggaroo/materialhelptutorial/MaterialTutorialFragment.java b/materialhelptutorial/src/main/java/za/co/riggaroo/materialhelptutorial/MaterialTutorialFragment.java index 73154a0..98e237b 100644 --- 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 index 032124f..5e6587a 100644 --- 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 CREATOR = new Parcelable.Creator() { From eaabd09c221efbdc2e2464b4696a68aa70ac90d0 Mon Sep 17 00:00:00 2001 From: Laurent Meyer Date: Mon, 23 May 2016 18:52:31 +0200 Subject: [PATCH 06/14] Modified README --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 2efab73..36759e8 100644 --- 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 tutorialItems = new ArrayList<>(); From 3b23efd86ed1f1ebfdc7a2bf93e73317fd870add Mon Sep 17 00:00:00 2001 From: Rebecca Franks Date: Wed, 25 May 2016 08:01:19 +0200 Subject: [PATCH 07/14] Made release 1.3.0 --- materialhelptutorial/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/materialhelptutorial/build.gradle b/materialhelptutorial/build.gradle index bf52854..a3e8288 100644 --- a/materialhelptutorial/build.gradle +++ b/materialhelptutorial/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.library' apply plugin: 'com.github.dcendents.android-maven' apply plugin: 'com.jfrog.bintray' -version = "1.2.1" +version = "1.3.0" group = "za.co.riggaroo" def siteUrl = 'https://github.com/spongebobrf/MaterialIntroTutorial' @@ -15,7 +15,7 @@ android { defaultConfig { minSdkVersion 11 targetSdkVersion 23 - versionCode 7 + versionCode 8 versionName version } buildTypes { From 3e0c5c32005d6f571263fcee90079e78ac8e5fbd Mon Sep 17 00:00:00 2001 From: Rebecca Franks Date: Mon, 10 Oct 2016 19:27:28 +0200 Subject: [PATCH 08/14] chore: updated gradle build tools etc. --- app/build.gradle | 8 ++++---- build.gradle | 6 +++--- gradle/wrapper/gradle-wrapper.properties | 4 ++-- materialhelptutorial/build.gradle | 8 ++++---- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c9c59c5..2b12065 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 23 - buildToolsVersion "23.0.2" + compileSdkVersion 24 + buildToolsVersion "24.0.2" defaultConfig { applicationId "za.co.riggaroo.helptut.helptutorialexample" minSdkVersion 11 - targetSdkVersion 23 + targetSdkVersion 24 versionCode 1 versionName "1.0" } @@ -23,5 +23,5 @@ dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) testCompile 'junit:junit:4.12' compile project(':materialhelptutorial') - compile 'com.android.support:appcompat-v7:23.1.1' + compile 'com.android.support:appcompat-v7:24.2.1' } diff --git a/build.gradle b/build.gradle index 530965f..ccb84d4 100644 --- a/build.gradle +++ b/build.gradle @@ -5,9 +5,9 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.0' - classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.4' - classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3' + classpath 'com.android.tools.build:gradle:2.2.0' + classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7' + classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0cb9b7f..380e3c7 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed May 11 08:28:41 SAST 2016 +#Sun Oct 09 10:46:48 SAST 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip diff --git a/materialhelptutorial/build.gradle b/materialhelptutorial/build.gradle index a3e8288..865e982 100644 --- a/materialhelptutorial/build.gradle +++ b/materialhelptutorial/build.gradle @@ -9,12 +9,12 @@ def siteUrl = 'https://github.com/spongebobrf/MaterialIntroTutorial' def gitUrl = 'https://github.com/spongebobrf/MaterialIntroTutorial.git' android { - compileSdkVersion 23 - buildToolsVersion "23.0.2" + compileSdkVersion 24 + buildToolsVersion "24.0.2" defaultConfig { minSdkVersion 11 - targetSdkVersion 23 + targetSdkVersion 24 versionCode 8 versionName version } @@ -27,7 +27,7 @@ android { } dependencies { - final SUPPORT_LIBRARY_VERSION = '23.1.1' + final SUPPORT_LIBRARY_VERSION = '24.2.1' compile fileTree(dir: 'libs', include: ['*.jar']) testCompile 'junit:junit:4.12' From 87fce1e4aa79b4fee1dc098fa30d109a3b141e7a Mon Sep 17 00:00:00 2001 From: Rebecca Franks Date: Thu, 13 Oct 2016 15:12:52 +0200 Subject: [PATCH 09/14] chore: Up'ed version number. --- materialhelptutorial/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/materialhelptutorial/build.gradle b/materialhelptutorial/build.gradle index 865e982..e2eb28d 100644 --- a/materialhelptutorial/build.gradle +++ b/materialhelptutorial/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.library' apply plugin: 'com.github.dcendents.android-maven' apply plugin: 'com.jfrog.bintray' -version = "1.3.0" +version = "1.4.0" group = "za.co.riggaroo" def siteUrl = 'https://github.com/spongebobrf/MaterialIntroTutorial' @@ -15,7 +15,7 @@ android { defaultConfig { minSdkVersion 11 targetSdkVersion 24 - versionCode 8 + versionCode 9 versionName version } buildTypes { From e0acf4693fbf023238d75c5e4766c6d77e47eb92 Mon Sep 17 00:00:00 2001 From: Rebecca Franks Date: Thu, 13 Oct 2016 15:38:32 +0200 Subject: [PATCH 10/14] chore: up'ed gradle version. --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index ccb84d4..a0ab9e2 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.0' + classpath 'com.android.tools.build:gradle:2.2.1' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' // NOTE: Do not place your application dependencies here; they belong From 42b05173b94b1cc95ac42e10ef90f62717c52d54 Mon Sep 17 00:00:00 2001 From: Kai Winter Date: Thu, 7 Dec 2017 20:08:29 +0100 Subject: [PATCH 11/14] Check whether skip or done button must be shown initially This fixes #25, where the done button isn't shown if only one TutorialItem is used. --- .../tutorial/MaterialTutorialPresenter.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/materialhelptutorial/src/main/java/za/co/riggaroo/materialhelptutorial/tutorial/MaterialTutorialPresenter.java b/materialhelptutorial/src/main/java/za/co/riggaroo/materialhelptutorial/tutorial/MaterialTutorialPresenter.java index 330d9fb..98d90fe 100644 --- a/materialhelptutorial/src/main/java/za/co/riggaroo/materialhelptutorial/tutorial/MaterialTutorialPresenter.java +++ b/materialhelptutorial/src/main/java/za/co/riggaroo/materialhelptutorial/tutorial/MaterialTutorialPresenter.java @@ -40,6 +40,12 @@ public void loadViewPagerFragments(List tutorialItems) { fragments.add(helpTutorialImageFragment); } tutorialView.setViewPagerFragments(fragments); + + if (tutorialItems.size() == 1) { + tutorialView.showDoneButton(); + } else { + tutorialView.showSkipButton(); + } } @Override From 493d25a5aa4f7bcf2be51bb19609d2d98cd74d25 Mon Sep 17 00:00:00 2001 From: Rebecca Franks Date: Wed, 3 Jan 2018 12:48:03 +0200 Subject: [PATCH 12/14] Updated versions of support lib, gradle etc --- app/build.gradle | 10 +++++----- build.gradle | 6 ++++-- gradle/wrapper/gradle-wrapper.properties | 4 ++-- materialhelptutorial/build.gradle | 20 ++++++++++---------- 4 files changed, 21 insertions(+), 19 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 2b12065..3f2b062 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 24 - buildToolsVersion "24.0.2" + compileSdkVersion 27 + buildToolsVersion "27.0.3" defaultConfig { applicationId "za.co.riggaroo.helptut.helptutorialexample" - minSdkVersion 11 - targetSdkVersion 24 + minSdkVersion 14 + targetSdkVersion 27 versionCode 1 versionName "1.0" } @@ -23,5 +23,5 @@ dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) testCompile 'junit:junit:4.12' compile project(':materialhelptutorial') - compile 'com.android.support:appcompat-v7:24.2.1' + compile 'com.android.support:appcompat-v7:27.0.2' } diff --git a/build.gradle b/build.gradle index a0ab9e2..79b3d02 100644 --- a/build.gradle +++ b/build.gradle @@ -3,10 +3,11 @@ buildscript { repositories { jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.1' - classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7' + classpath 'com.android.tools.build:gradle:3.0.1' + classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -16,6 +17,7 @@ buildscript { allprojects { repositories { jcenter() + google() } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 380e3c7..83e685a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Oct 09 10:46:48 SAST 2016 +#Wed Jan 03 12:39:22 SAST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip diff --git a/materialhelptutorial/build.gradle b/materialhelptutorial/build.gradle index e2eb28d..0118b18 100644 --- a/materialhelptutorial/build.gradle +++ b/materialhelptutorial/build.gradle @@ -2,20 +2,20 @@ apply plugin: 'com.android.library' apply plugin: 'com.github.dcendents.android-maven' apply plugin: 'com.jfrog.bintray' -version = "1.4.0" +version = "1.5.0" group = "za.co.riggaroo" -def siteUrl = 'https://github.com/spongebobrf/MaterialIntroTutorial' -def gitUrl = 'https://github.com/spongebobrf/MaterialIntroTutorial.git' +def siteUrl = 'https://github.com/riggaroo/MaterialIntroTutorial' +def gitUrl = 'https://github.com/riggaroo/MaterialIntroTutorial.git' android { - compileSdkVersion 24 - buildToolsVersion "24.0.2" + compileSdkVersion 27 + buildToolsVersion "27.0.3" defaultConfig { - minSdkVersion 11 - targetSdkVersion 24 - versionCode 9 + minSdkVersion 14 + targetSdkVersion 27 + versionCode 10 versionName version } buildTypes { @@ -27,14 +27,14 @@ android { } dependencies { - final SUPPORT_LIBRARY_VERSION = '24.2.1' + final SUPPORT_LIBRARY_VERSION = '27.0.2' compile fileTree(dir: 'libs', include: ['*.jar']) testCompile 'junit:junit:4.12' 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.7.0' + compile 'com.github.bumptech.glide:glide:3.8.0' } From b55ad9c485fffadd115d9fe03d513c547a9d3551 Mon Sep 17 00:00:00 2001 From: Rebecca Franks Date: Wed, 3 Jan 2018 13:16:23 +0200 Subject: [PATCH 13/14] Added check for if no tutorial items are passed --- .../tutorial/MaterialTutorialActivity.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/materialhelptutorial/src/main/java/za/co/riggaroo/materialhelptutorial/tutorial/MaterialTutorialActivity.java b/materialhelptutorial/src/main/java/za/co/riggaroo/materialhelptutorial/tutorial/MaterialTutorialActivity.java index 58c75ce..ebb674f 100644 --- a/materialhelptutorial/src/main/java/za/co/riggaroo/materialhelptutorial/tutorial/MaterialTutorialActivity.java +++ b/materialhelptutorial/src/main/java/za/co/riggaroo/materialhelptutorial/tutorial/MaterialTutorialActivity.java @@ -23,8 +23,8 @@ public class MaterialTutorialActivity extends AppCompatActivity implements MaterialTutorialContract.View { - private static final String TAG = "MaterialTutActivity"; public static final String MATERIAL_TUTORIAL_ARG_TUTORIAL_ITEMS = "tutorial_items"; + private static final String TAG = "MaterialTutActivity"; private ViewPager mHelpTutorialViewPager; private View mRootView; private TextView mTextViewSkip; @@ -63,7 +63,6 @@ protected void onCreate(Bundle savedInstanceState) { mDoneButton.setOnClickListener(finishTutorialClickListener); - mNextButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -73,7 +72,11 @@ public void onClick(View v) { } }); List tutorialItems = getIntent().getParcelableArrayListExtra(MATERIAL_TUTORIAL_ARG_TUTORIAL_ITEMS); - materialTutorialPresenter.loadViewPagerFragments(tutorialItems); + if (tutorialItems == null) { + showEndTutorial(); + } else { + materialTutorialPresenter.loadViewPagerFragments(tutorialItems); + } } private void setStatusBarColor() { From 66ec189fd44e361dc1f1e5d3fc2df81c27b682ac Mon Sep 17 00:00:00 2001 From: Rebecca Franks Date: Wed, 3 Jan 2018 13:39:41 +0200 Subject: [PATCH 14/14] Removed proxy information and updated build.gradle - uploaded version 1.6.0 to bintray https://bintray.com/spongebobrf/maven/MaterialIntroTutorial/1.6.0 --- gradle.properties | 2 -- materialhelptutorial/build.gradle | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index bd04927..ee4e755 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,5 +13,3 @@ # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true #Wed May 11 08:23:46 SAST 2016 -systemProp.http.proxyHost=127.0.0.1 -systemProp.http.proxyPort=8080 diff --git a/materialhelptutorial/build.gradle b/materialhelptutorial/build.gradle index 0118b18..9f492b3 100644 --- a/materialhelptutorial/build.gradle +++ b/materialhelptutorial/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.library' apply plugin: 'com.github.dcendents.android-maven' apply plugin: 'com.jfrog.bintray' -version = "1.5.0" +version = "1.6.0" group = "za.co.riggaroo" def siteUrl = 'https://github.com/riggaroo/MaterialIntroTutorial' @@ -15,7 +15,7 @@ android { defaultConfig { minSdkVersion 14 targetSdkVersion 27 - versionCode 10 + versionCode 11 versionName version } buildTypes {