diff --git a/android_app/app/build.gradle b/android_app/app/build.gradle index 7edf8d97..c87ef125 100644 --- a/android_app/app/build.gradle +++ b/android_app/app/build.gradle @@ -73,7 +73,8 @@ dependencies { // CustomActivityOnCrash implementation 'cat.ereza:customactivityoncrash:2.2.0' // AppIntro - implementation 'com.github.AppIntro:AppIntro:5.1.0' + implementation 'com.github.AppIntro:AppIntro:6.0.0-alpha3' + implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.3.50' // Room implementation 'androidx.room:room-runtime:2.2.3' annotationProcessor 'androidx.room:room-compiler:2.2.3' diff --git a/android_app/app/src/main/java/com/health/openscale/gui/activities/AppIntroActivity.java b/android_app/app/src/main/java/com/health/openscale/gui/activities/AppIntroActivity.java index b7efb31b..439bd574 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/activities/AppIntroActivity.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/activities/AppIntroActivity.java @@ -38,10 +38,8 @@ public class AppIntroActivity extends AppIntro { super.onCreate(savedInstanceState); setBarColor(getResources().getColor(R.color.blue_normal)); - setWizardMode(true); - setBackButtonVisibilityWithDone(true); - showSkipButton(true); + setSkipButtonEnabled(true); addSlide(WelcomeIntroSlide.newInstance(R.layout.slide_welcome)); addSlide(PrivacyIntroSlide.newInstance(R.layout.slide_privacy)); @@ -71,9 +69,11 @@ public class AppIntroActivity extends AppIntro { super.onSlideChanged(oldFragment, newFragment); if (newFragment instanceof WelcomeIntroSlide) { - showSkipButton(true); + setSkipButtonEnabled(true); + setWizardMode(false); } else { - showSkipButton(false); + setSkipButtonEnabled(false); + setWizardMode(true); } } diff --git a/android_app/build.gradle b/android_app/build.gradle index abcaccfa..2152d8a6 100644 --- a/android_app/build.gradle +++ b/android_app/build.gradle @@ -3,6 +3,7 @@ buildscript { repositories { google() jcenter() + mavenCentral() } dependencies { classpath 'com.android.tools.build:gradle:3.5.3' @@ -14,5 +15,6 @@ allprojects { maven { url 'https://maven.google.com' } maven { url 'https://jitpack.io' } jcenter() + mavenCentral() } }