From 4aebeedec6898501a0671f32c70a239aeab45060 Mon Sep 17 00:00:00 2001 From: sgallese Date: Wed, 22 Sep 2021 20:06:41 -0700 Subject: [PATCH 1/2] Finish intro when skipped pressed --- .../org/isoron/uhabits/activities/intro/IntroActivity.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/intro/IntroActivity.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/intro/IntroActivity.kt index 7336bbd41..1a4288910 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/intro/IntroActivity.kt +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/intro/IntroActivity.kt @@ -67,5 +67,8 @@ class IntroActivity : AppIntro2() { finish() } - override fun onSlideChanged() {} + override fun onSkipPressed(currentFragment: Fragment?) { + super.onSkipPressed(currentFragment) + finish() + } } From c79d1e82a59bc76755d2aa246cd7a0801808cbcc Mon Sep 17 00:00:00 2001 From: sgallese Date: Wed, 22 Sep 2021 20:07:01 -0700 Subject: [PATCH 2/2] Update AppIntro to latest version --- build.gradle.kts | 1 + uhabits-android/build.gradle.kts | 2 +- .../uhabits/activities/intro/IntroActivity.kt | 14 ++++++++------ 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 993a59a6c..3fc6fe5fd 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -20,5 +20,6 @@ allprojects { maven(url = "https://oss.sonatype.org/content/repositories/snapshots/") maven(url = "https://kotlin.bintray.com/ktor") maven(url = "https://kotlin.bintray.com/kotlin-js-wrappers") + maven(url = "https://jitpack.io") } } diff --git a/uhabits-android/build.gradle.kts b/uhabits-android/build.gradle.kts index 319a19f2f..ff936f6b9 100644 --- a/uhabits-android/build.gradle.kts +++ b/uhabits-android/build.gradle.kts @@ -105,7 +105,7 @@ dependencies { androidTestImplementation("com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0") compileOnly("javax.annotation:jsr250-api:1.0") coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.1.5") - implementation("com.github.paolorotolo:appintro:4.1.0") + implementation("com.github.AppIntro:AppIntro:6.1.0") implementation("com.google.code.findbugs:jsr305:3.0.2") implementation("com.google.dagger:dagger:$daggerVersion") implementation("com.google.guava:guava:30.1.1-android") diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/intro/IntroActivity.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/intro/IntroActivity.kt index 1a4288910..499694a90 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/intro/IntroActivity.kt +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/intro/IntroActivity.kt @@ -21,8 +21,9 @@ package org.isoron.uhabits.activities.intro import android.graphics.Color import android.os.Bundle -import com.github.paolorotolo.appintro.AppIntro2 -import com.github.paolorotolo.appintro.AppIntroFragment +import androidx.fragment.app.Fragment +import com.github.appintro.AppIntro2 +import com.github.appintro.AppIntroFragment import org.isoron.uhabits.R /** @@ -30,7 +31,9 @@ import org.isoron.uhabits.R * launched for the first time. */ class IntroActivity : AppIntro2() { - override fun init(savedInstanceState: Bundle?) { + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) showStatusBar(false) addSlide( @@ -61,9 +64,8 @@ class IntroActivity : AppIntro2() { ) } - override fun onNextPressed() {} - - override fun onDonePressed() { + override fun onDonePressed(currentFragment: Fragment?) { + super.onDonePressed(currentFragment) finish() }