From d0220b0228aee707c528f69d5a49b165257288df Mon Sep 17 00:00:00 2001 From: adrco Date: Sat, 5 Jan 2019 11:49:28 +0200 Subject: [PATCH] migrate to AndroidX --- README.md | 2 +- app/build.gradle | 15 ++++---- .../materialintro/demo/FinishActivity.java | 4 +-- .../materialintro/demo/LoginFragment.java | 2 +- .../materialintro/demo/MainActivity.java | 4 +-- .../materialintro/demo/MainIntroActivity.java | 2 +- .../materialintro/demo/SplashActivity.java | 4 +-- .../main/res/layout-land/slide_canteen.xml | 2 +- app/src/main/res/layout/activity_finish.xml | 2 +- app/src/main/res/layout/activity_main.xml | 2 +- build.gradle | 4 +-- gradle.properties | 4 ++- gradle/wrapper/gradle-wrapper.properties | 4 +-- library/build.gradle | 9 +++-- .../materialintro/app/ButtonCtaFragment.java | 2 +- .../materialintro/app/IntroActivity.java | 36 +++++++++---------- .../app/OnNavigationBlockedListener.java | 2 +- .../materialintro/app/SlideFragment.java | 2 +- .../materialintro/slide/ButtonCtaSlide.java | 2 +- .../materialintro/slide/FragmentSlide.java | 12 +++---- .../materialintro/slide/RestorableSlide.java | 2 +- .../materialintro/slide/SimpleSlide.java | 22 ++++++------ .../materialintro/slide/Slide.java | 4 +-- .../materialintro/slide/SlideAdapter.java | 10 +++--- .../materialintro/util/AnimUtils.java | 2 +- .../materialintro/view/FadeableViewPager.java | 4 +-- .../materialintro/view/InkPageIndicator.java | 4 +-- .../view/SwipeBlockableViewPager.java | 2 +- .../view/parallax/ParallaxFragment.java | 6 ++-- .../view/parallax/ParallaxFrameLayout.java | 2 +- .../view/parallax/ParallaxLinearLayout.java | 2 +- .../view/parallax/ParallaxRelativeLayout.java | 2 +- .../view/parallax/ParallaxSlideFragment.java | 4 +-- .../view/parallax/Parallaxable.java | 2 +- .../view/parallax/util/ParallaxUtil.java | 2 +- .../layout-land/mi_fragment_simple_slide.xml | 2 +- .../mi_fragment_simple_slide_scrollable.xml | 2 +- .../src/main/res/layout/mi_activity_intro.xml | 4 +-- 38 files changed, 97 insertions(+), 97 deletions(-) diff --git a/README.md b/README.md index 48de400..ba378c2 100644 --- a/README.md +++ b/README.md @@ -90,7 +90,7 @@ android { } } dependencies { - compile 'com.heinrichreimersoftware:material-intro:1.6.2' + implementation 'com.heinrichreimersoftware:material-intro:1.6.2' } ``` diff --git a/app/build.gradle b/app/build.gradle index 53e5d4b..b431a5f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,13 +6,12 @@ def versionPatch = 2 def versionBuild = 0 // bump for dogfood builds, public betas, etc. android { - compileSdkVersion 27 - buildToolsVersion '27.0.3' + compileSdkVersion 28 defaultConfig { applicationId "com.heinrichreimersoftware.materialintro.demo" minSdkVersion 15 - targetSdkVersion 27 + targetSdkVersion 28 versionCode versionMajor * 10000 + versionMinor * 1000 + versionPatch * 100 + versionBuild versionName "${versionMajor}.${versionMinor}" + (versionPatch == 0 ? "" : ".${versionPatch}") } @@ -36,12 +35,12 @@ android { dependencies { compile project(':library') //Support - implementation 'com.android.support:appcompat-v7:27.1.1' - implementation 'com.android.support:support-v4:27.1.1' - implementation 'com.android.support:design:27.1.1' + implementation 'androidx.appcompat:appcompat:1.0.0-beta01' + implementation 'androidx.legacy:legacy-support-v4:1.0.0-beta01' + implementation 'com.google.android.material:material:1.0.0-beta01' //Firebase - implementation 'com.google.firebase:firebase-core:12.0.1' - implementation 'com.google.firebase:firebase-crash:12.0.1' + implementation 'com.google.firebase:firebase-core:16.0.6' + implementation 'com.google.firebase:firebase-crash:16.2.1' } apply plugin: 'com.google.gms.google-services' diff --git a/app/src/main/java/com/heinrichreimersoftware/materialintro/demo/FinishActivity.java b/app/src/main/java/com/heinrichreimersoftware/materialintro/demo/FinishActivity.java index b2faddb..4710042 100644 --- a/app/src/main/java/com/heinrichreimersoftware/materialintro/demo/FinishActivity.java +++ b/app/src/main/java/com/heinrichreimersoftware/materialintro/demo/FinishActivity.java @@ -25,10 +25,10 @@ package com.heinrichreimersoftware.materialintro.demo; import android.content.Intent; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; diff --git a/app/src/main/java/com/heinrichreimersoftware/materialintro/demo/LoginFragment.java b/app/src/main/java/com/heinrichreimersoftware/materialintro/demo/LoginFragment.java index 4b57731..78ccfef 100644 --- a/app/src/main/java/com/heinrichreimersoftware/materialintro/demo/LoginFragment.java +++ b/app/src/main/java/com/heinrichreimersoftware/materialintro/demo/LoginFragment.java @@ -24,7 +24,7 @@ package com.heinrichreimersoftware.materialintro.demo; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.os.Bundle; import android.os.Handler; import android.view.LayoutInflater; diff --git a/app/src/main/java/com/heinrichreimersoftware/materialintro/demo/MainActivity.java b/app/src/main/java/com/heinrichreimersoftware/materialintro/demo/MainActivity.java index c71cc6b..aad01a4 100644 --- a/app/src/main/java/com/heinrichreimersoftware/materialintro/demo/MainActivity.java +++ b/app/src/main/java/com/heinrichreimersoftware/materialintro/demo/MainActivity.java @@ -25,10 +25,10 @@ package com.heinrichreimersoftware.materialintro.demo; import android.content.Intent; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.net.Uri; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; diff --git a/app/src/main/java/com/heinrichreimersoftware/materialintro/demo/MainIntroActivity.java b/app/src/main/java/com/heinrichreimersoftware/materialintro/demo/MainIntroActivity.java index fbab4b7..8584ebf 100644 --- a/app/src/main/java/com/heinrichreimersoftware/materialintro/demo/MainIntroActivity.java +++ b/app/src/main/java/com/heinrichreimersoftware/materialintro/demo/MainIntroActivity.java @@ -27,7 +27,7 @@ import android.Manifest; import android.content.Intent; import android.os.Bundle; -import android.support.design.widget.Snackbar; +import com.google.android.material.snackbar.Snackbar; import android.view.Gravity; import android.view.View; import android.widget.Toast; diff --git a/app/src/main/java/com/heinrichreimersoftware/materialintro/demo/SplashActivity.java b/app/src/main/java/com/heinrichreimersoftware/materialintro/demo/SplashActivity.java index cc74f8f..07366a5 100644 --- a/app/src/main/java/com/heinrichreimersoftware/materialintro/demo/SplashActivity.java +++ b/app/src/main/java/com/heinrichreimersoftware/materialintro/demo/SplashActivity.java @@ -25,10 +25,10 @@ package com.heinrichreimersoftware.materialintro.demo; import android.content.Intent; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.os.Bundle; import android.os.Handler; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import com.heinrichreimersoftware.materialintro.demo.databinding.ActivitySplashBinding; diff --git a/app/src/main/res/layout-land/slide_canteen.xml b/app/src/main/res/layout-land/slide_canteen.xml index a91c422..0d4b569 100644 --- a/app/src/main/res/layout-land/slide_canteen.xml +++ b/app/src/main/res/layout-land/slide_canteen.xml @@ -46,7 +46,7 @@ tools:ignore="ContentDescription" tools:src="@android:drawable/sym_action_call" /> - diff --git a/app/src/main/res/layout/activity_finish.xml b/app/src/main/res/layout/activity_finish.xml index 9134390..4958120 100644 --- a/app/src/main/res/layout/activity_finish.xml +++ b/app/src/main/res/layout/activity_finish.xml @@ -31,7 +31,7 @@ android:orientation="vertical" tools:context="com.heinrichreimersoftware.materialintro.demo.FinishActivity"> - - - diff --git a/library/src/main/res/layout-land/mi_fragment_simple_slide_scrollable.xml b/library/src/main/res/layout-land/mi_fragment_simple_slide_scrollable.xml index 7da18f8..d0f3c40 100644 --- a/library/src/main/res/layout-land/mi_fragment_simple_slide_scrollable.xml +++ b/library/src/main/res/layout-land/mi_fragment_simple_slide_scrollable.xml @@ -50,7 +50,7 @@ - diff --git a/library/src/main/res/layout/mi_activity_intro.xml b/library/src/main/res/layout/mi_activity_intro.xml index 3737d29..baa10f9 100644 --- a/library/src/main/res/layout/mi_activity_intro.xml +++ b/library/src/main/res/layout/mi_activity_intro.xml @@ -22,7 +22,7 @@ ~ SOFTWARE. --> - - +