1
0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-18 14:31:23 +02:00

Travis issue (#530)

fixed travis issue with kotlin
This commit is contained in:
OliE
2019-12-22 12:18:53 +01:00
committed by GitHub
parent 61765d305e
commit c8c7a63986
3 changed files with 9 additions and 6 deletions

View File

@@ -73,7 +73,8 @@ dependencies {
// CustomActivityOnCrash // CustomActivityOnCrash
implementation 'cat.ereza:customactivityoncrash:2.2.0' implementation 'cat.ereza:customactivityoncrash:2.2.0'
// AppIntro // 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 // Room
implementation 'androidx.room:room-runtime:2.2.3' implementation 'androidx.room:room-runtime:2.2.3'
annotationProcessor 'androidx.room:room-compiler:2.2.3' annotationProcessor 'androidx.room:room-compiler:2.2.3'

View File

@@ -38,10 +38,8 @@ public class AppIntroActivity extends AppIntro {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setBarColor(getResources().getColor(R.color.blue_normal)); setBarColor(getResources().getColor(R.color.blue_normal));
setWizardMode(true);
setBackButtonVisibilityWithDone(true);
showSkipButton(true); setSkipButtonEnabled(true);
addSlide(WelcomeIntroSlide.newInstance(R.layout.slide_welcome)); addSlide(WelcomeIntroSlide.newInstance(R.layout.slide_welcome));
addSlide(PrivacyIntroSlide.newInstance(R.layout.slide_privacy)); addSlide(PrivacyIntroSlide.newInstance(R.layout.slide_privacy));
@@ -71,9 +69,11 @@ public class AppIntroActivity extends AppIntro {
super.onSlideChanged(oldFragment, newFragment); super.onSlideChanged(oldFragment, newFragment);
if (newFragment instanceof WelcomeIntroSlide) { if (newFragment instanceof WelcomeIntroSlide) {
showSkipButton(true); setSkipButtonEnabled(true);
setWizardMode(false);
} else { } else {
showSkipButton(false); setSkipButtonEnabled(false);
setWizardMode(true);
} }
} }

View File

@@ -3,6 +3,7 @@ buildscript {
repositories { repositories {
google() google()
jcenter() jcenter()
mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.5.3' classpath 'com.android.tools.build:gradle:3.5.3'
@@ -14,5 +15,6 @@ allprojects {
maven { url 'https://maven.google.com' } maven { url 'https://maven.google.com' }
maven { url 'https://jitpack.io' } maven { url 'https://jitpack.io' }
jcenter() jcenter()
mavenCentral()
} }
} }