diff --git a/app/build.gradle b/app/build.gradle index be9973a..13e1352 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,15 +3,15 @@ apply plugin: 'com.android.application' apply from: "$rootDir/versions.gradle" android { - compileSdkVersion 25 - buildToolsVersion "25.0.0" + compileSdkVersion 29 + buildToolsVersion "29.0.3" defaultConfig { applicationId "agency.tango.materialintro" minSdkVersion 15 - targetSdkVersion 25 + targetSdkVersion 29 versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' } buildTypes { release { @@ -22,11 +22,9 @@ android { } dependencies { - compile fileTree(include: ['*.jar'], dir: 'libs') - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { - exclude group: 'com.android.support', module: 'support-annotations' - }) - compile "com.android.support:appcompat-v7:${project.androidSupport}" - testCompile 'junit:junit:4.12' - compile project(path: ':material-intro-screen') + implementation fileTree(include: ['*.jar'], dir: 'libs') + androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' + implementation 'androidx.appcompat:appcompat:1.1.0' + testImplementation 'junit:junit:4.13' + implementation project(path: ':material-intro-screen') } diff --git a/app/src/main/java/agency/tango/materialintro/CustomSlide.java b/app/src/main/java/agency/tango/materialintro/CustomSlide.java index 4214cf9..bf315d6 100644 --- a/app/src/main/java/agency/tango/materialintro/CustomSlide.java +++ b/app/src/main/java/agency/tango/materialintro/CustomSlide.java @@ -1,12 +1,13 @@ package agency.tango.materialintro; import android.os.Bundle; -import android.support.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.CheckBox; +import androidx.annotation.Nullable; + import agency.tango.materialintroscreen.SlideFragment; public class CustomSlide extends SlideFragment { diff --git a/app/src/main/java/agency/tango/materialintro/IntroActivity.java b/app/src/main/java/agency/tango/materialintro/IntroActivity.java index 461a4cf..367bad6 100644 --- a/app/src/main/java/agency/tango/materialintro/IntroActivity.java +++ b/app/src/main/java/agency/tango/materialintro/IntroActivity.java @@ -2,11 +2,12 @@ import android.Manifest; import android.os.Bundle; -import android.support.annotation.FloatRange; -import android.support.annotation.Nullable; import android.view.View; import android.widget.Toast; +import androidx.annotation.FloatRange; +import androidx.annotation.Nullable; + import agency.tango.materialintroscreen.MaterialIntroActivity; import agency.tango.materialintroscreen.MessageButtonBehaviour; import agency.tango.materialintroscreen.SlideFragmentBuilder; diff --git a/app/src/main/java/agency/tango/materialintro/MainActivity.java b/app/src/main/java/agency/tango/materialintro/MainActivity.java index a1bca02..68fb72b 100644 --- a/app/src/main/java/agency/tango/materialintro/MainActivity.java +++ b/app/src/main/java/agency/tango/materialintro/MainActivity.java @@ -2,10 +2,12 @@ import android.content.Intent; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.AppCompatButton; import android.view.View; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.AppCompatButton; + + public class MainActivity extends AppCompatActivity { AppCompatButton button; diff --git a/app/src/main/java/agency/tango/materialintro/SplashActivity.java b/app/src/main/java/agency/tango/materialintro/SplashActivity.java index 3f7e00d..5a7f7db 100644 --- a/app/src/main/java/agency/tango/materialintro/SplashActivity.java +++ b/app/src/main/java/agency/tango/materialintro/SplashActivity.java @@ -1,8 +1,10 @@ package agency.tango.materialintro; import android.content.Intent; -import android.support.v4.app.TaskStackBuilder; -import android.support.v7.app.AppCompatActivity; + +import androidx.appcompat.app.AppCompatActivity; +import androidx.core.app.TaskStackBuilder; + public class SplashActivity extends AppCompatActivity { @Override diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index c134d92..082459e 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -4,7 +4,7 @@ android:layout_height="match_parent" android:background="@color/colorPrimary"> - { public MoveUpBehaviour(Context context, AttributeSet attrs) { diff --git a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/SlideFragment.java b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/SlideFragment.java index ba15ac6..ffa532a 100644 --- a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/SlideFragment.java +++ b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/SlideFragment.java @@ -2,9 +2,10 @@ import android.content.pm.PackageManager; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.app.ActivityCompat; -import android.support.v4.content.ContextCompat; + +import androidx.annotation.Nullable; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/SlideFragmentBuilder.java b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/SlideFragmentBuilder.java index f32b5ae..695d87e 100644 --- a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/SlideFragmentBuilder.java +++ b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/SlideFragmentBuilder.java @@ -1,7 +1,8 @@ package agency.tango.materialintroscreen; -import android.support.annotation.ColorRes; -import android.support.annotation.DrawableRes; + +import androidx.annotation.ColorRes; +import androidx.annotation.DrawableRes; @SuppressWarnings({"unused", "WeakerAccess"}) public class SlideFragmentBuilder { diff --git a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/adapter/SlidesAdapter.java b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/adapter/SlidesAdapter.java index b73fd38..ce400b8 100644 --- a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/adapter/SlidesAdapter.java +++ b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/adapter/SlidesAdapter.java @@ -1,9 +1,10 @@ package agency.tango.materialintroscreen.adapter; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentStatePagerAdapter; import android.view.ViewGroup; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentStatePagerAdapter; + import java.util.ArrayList; import agency.tango.materialintroscreen.SlideFragment; diff --git a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/animations/IViewTranslation.java b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/animations/IViewTranslation.java index 2f11f0b..4a3cce1 100644 --- a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/animations/IViewTranslation.java +++ b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/animations/IViewTranslation.java @@ -1,8 +1,9 @@ package agency.tango.materialintroscreen.animations; -import android.support.annotation.FloatRange; import android.view.View; +import androidx.annotation.FloatRange; + public interface IViewTranslation { void translate(View view, @FloatRange(from = 0, to = 1.0) float percentage); } diff --git a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/animations/ViewTranslationWrapper.java b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/animations/ViewTranslationWrapper.java index 8f8d23a..0e68288 100644 --- a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/animations/ViewTranslationWrapper.java +++ b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/animations/ViewTranslationWrapper.java @@ -1,10 +1,11 @@ package agency.tango.materialintroscreen.animations; -import android.support.annotation.AnimRes; import android.view.View; import android.view.animation.Animation; import android.view.animation.AnimationUtils; +import androidx.annotation.AnimRes; + import agency.tango.materialintroscreen.animations.translations.NoTranslation; @SuppressWarnings("WeakerAccess") diff --git a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/animations/translations/AlphaTranslation.java b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/animations/translations/AlphaTranslation.java index 03af321..b1bd3f5 100644 --- a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/animations/translations/AlphaTranslation.java +++ b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/animations/translations/AlphaTranslation.java @@ -1,8 +1,9 @@ package agency.tango.materialintroscreen.animations.translations; -import android.support.annotation.FloatRange; import android.view.View; +import androidx.annotation.FloatRange; + import agency.tango.materialintroscreen.animations.IViewTranslation; public class AlphaTranslation implements IViewTranslation { diff --git a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/animations/translations/DefaultAlphaTranslation.java b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/animations/translations/DefaultAlphaTranslation.java index 7bf9d4b..016ffce 100644 --- a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/animations/translations/DefaultAlphaTranslation.java +++ b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/animations/translations/DefaultAlphaTranslation.java @@ -1,8 +1,9 @@ package agency.tango.materialintroscreen.animations.translations; -import android.support.annotation.FloatRange; import android.view.View; +import androidx.annotation.FloatRange; + import agency.tango.materialintroscreen.animations.IViewTranslation; public class DefaultAlphaTranslation implements IViewTranslation { diff --git a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/animations/translations/DefaultPositionTranslation.java b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/animations/translations/DefaultPositionTranslation.java index 2d01189..d0ac2c4 100644 --- a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/animations/translations/DefaultPositionTranslation.java +++ b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/animations/translations/DefaultPositionTranslation.java @@ -1,8 +1,9 @@ package agency.tango.materialintroscreen.animations.translations; -import android.support.annotation.FloatRange; import android.view.View; +import androidx.annotation.FloatRange; + import agency.tango.materialintroscreen.animations.IViewTranslation; public class DefaultPositionTranslation implements IViewTranslation { diff --git a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/animations/translations/EnterDefaultTranslation.java b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/animations/translations/EnterDefaultTranslation.java index 48905f0..1fbcb76 100644 --- a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/animations/translations/EnterDefaultTranslation.java +++ b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/animations/translations/EnterDefaultTranslation.java @@ -1,8 +1,9 @@ package agency.tango.materialintroscreen.animations.translations; -import android.support.annotation.FloatRange; import android.view.View; +import androidx.annotation.FloatRange; + import agency.tango.materialintroscreen.R; import agency.tango.materialintroscreen.animations.IViewTranslation; diff --git a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/animations/translations/ExitDefaultTranslation.java b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/animations/translations/ExitDefaultTranslation.java index a1d6693..28587b7 100644 --- a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/animations/translations/ExitDefaultTranslation.java +++ b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/animations/translations/ExitDefaultTranslation.java @@ -1,8 +1,9 @@ package agency.tango.materialintroscreen.animations.translations; -import android.support.annotation.FloatRange; import android.view.View; +import androidx.annotation.FloatRange; + import agency.tango.materialintroscreen.R; import agency.tango.materialintroscreen.animations.IViewTranslation; diff --git a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/animations/translations/NoTranslation.java b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/animations/translations/NoTranslation.java index 2b1004d..4b5822c 100644 --- a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/animations/translations/NoTranslation.java +++ b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/animations/translations/NoTranslation.java @@ -1,8 +1,9 @@ package agency.tango.materialintroscreen.animations.translations; -import android.support.annotation.FloatRange; import android.view.View; +import androidx.annotation.FloatRange; + import agency.tango.materialintroscreen.animations.IViewTranslation; public class NoTranslation implements IViewTranslation { diff --git a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/listeners/ViewBehavioursOnPageChangeListener.java b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/listeners/ViewBehavioursOnPageChangeListener.java index dc8804c..56e8b38 100644 --- a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/listeners/ViewBehavioursOnPageChangeListener.java +++ b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/listeners/ViewBehavioursOnPageChangeListener.java @@ -1,5 +1,6 @@ package agency.tango.materialintroscreen.listeners; + import android.support.v4.view.CustomViewPager; import java.util.ArrayList; diff --git a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/listeners/scrollListeners/ParallaxScrollListener.java b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/listeners/scrollListeners/ParallaxScrollListener.java index 0493e2e..9a18ba3 100644 --- a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/listeners/scrollListeners/ParallaxScrollListener.java +++ b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/listeners/scrollListeners/ParallaxScrollListener.java @@ -1,7 +1,7 @@ package agency.tango.materialintroscreen.listeners.scrollListeners; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; import agency.tango.materialintroscreen.SlideFragment; import agency.tango.materialintroscreen.adapter.SlidesAdapter; diff --git a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/parallax/ParallaxFragment.java b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/parallax/ParallaxFragment.java index c1a0905..58acaa9 100644 --- a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/parallax/ParallaxFragment.java +++ b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/parallax/ParallaxFragment.java @@ -1,12 +1,13 @@ package agency.tango.materialintroscreen.parallax; import android.os.Bundle; -import android.support.annotation.FloatRange; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; import android.view.View; import android.view.ViewGroup; +import androidx.annotation.FloatRange; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; + import java.util.LinkedList; import java.util.Queue; diff --git a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/parallax/ParallaxFrameLayout.java b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/parallax/ParallaxFrameLayout.java index 2fb4f6d..a211019 100644 --- a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/parallax/ParallaxFrameLayout.java +++ b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/parallax/ParallaxFrameLayout.java @@ -2,12 +2,13 @@ import android.content.Context; import android.content.res.TypedArray; -import android.support.annotation.FloatRange; import android.util.AttributeSet; import android.view.View; import android.view.ViewGroup; import android.widget.FrameLayout; +import androidx.annotation.FloatRange; + import agency.tango.materialintroscreen.R; public class ParallaxFrameLayout extends FrameLayout implements Parallaxable { diff --git a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/parallax/ParallaxLinearLayout.java b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/parallax/ParallaxLinearLayout.java index 3fa2743..4342f8c 100644 --- a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/parallax/ParallaxLinearLayout.java +++ b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/parallax/ParallaxLinearLayout.java @@ -2,12 +2,13 @@ import android.content.Context; import android.content.res.TypedArray; -import android.support.annotation.FloatRange; import android.util.AttributeSet; import android.view.View; import android.view.ViewGroup; import android.widget.LinearLayout; +import androidx.annotation.FloatRange; + import agency.tango.materialintroscreen.R; public class ParallaxLinearLayout extends LinearLayout implements Parallaxable { diff --git a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/parallax/ParallaxRelativeLayout.java b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/parallax/ParallaxRelativeLayout.java index 1e524be..2b8440f 100644 --- a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/parallax/ParallaxRelativeLayout.java +++ b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/parallax/ParallaxRelativeLayout.java @@ -2,12 +2,13 @@ import android.content.Context; import android.content.res.TypedArray; -import android.support.annotation.FloatRange; import android.util.AttributeSet; import android.view.View; import android.view.ViewGroup; import android.widget.RelativeLayout; +import androidx.annotation.FloatRange; + import agency.tango.materialintroscreen.R; public class ParallaxRelativeLayout extends RelativeLayout implements Parallaxable { diff --git a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/parallax/Parallaxable.java b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/parallax/Parallaxable.java index 320884e..b6fc22e 100644 --- a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/parallax/Parallaxable.java +++ b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/parallax/Parallaxable.java @@ -1,6 +1,7 @@ package agency.tango.materialintroscreen.parallax; -import android.support.annotation.FloatRange; + +import androidx.annotation.FloatRange; public interface Parallaxable { void setOffset(@FloatRange(from = -1.0, to = 1.0) float offset); diff --git a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/widgets/InkPageIndicator.java b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/widgets/InkPageIndicator.java index 5fa7762..96126d4 100644 --- a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/widgets/InkPageIndicator.java +++ b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/widgets/InkPageIndicator.java @@ -13,9 +13,10 @@ import android.graphics.RectF; import android.os.Parcel; import android.os.Parcelable; -import android.support.v4.view.ViewCompat; +import androidx.core.view.ViewCompat; +import androidx.interpolator.view.animation.FastOutSlowInInterpolator; + import android.support.v4.view.CustomViewPager; -import android.support.v4.view.animation.FastOutSlowInInterpolator; import android.util.AttributeSet; import android.view.View; import android.view.animation.Interpolator; diff --git a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/widgets/OverScrollViewPager.java b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/widgets/OverScrollViewPager.java index 186d532..433b792 100644 --- a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/widgets/OverScrollViewPager.java +++ b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/widgets/OverScrollViewPager.java @@ -1,8 +1,9 @@ package agency.tango.materialintroscreen.widgets; import android.content.Context; -import android.support.v4.view.PagerAdapter; -import android.support.v4.view.ViewCompat; +import androidx.core.view.ViewCompat; +import androidx.viewpager.widget.PagerAdapter; + import android.util.AttributeSet; import android.view.MotionEvent; import android.view.ViewConfiguration; diff --git a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/widgets/SwipeableViewPager.java b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/widgets/SwipeableViewPager.java index dc1d9c1..fa58eb2 100644 --- a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/widgets/SwipeableViewPager.java +++ b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/widgets/SwipeableViewPager.java @@ -1,8 +1,9 @@ package agency.tango.materialintroscreen.widgets; import android.content.Context; +import androidx.core.view.MotionEventCompat; + import android.support.v4.view.CustomViewPager; -import android.support.v4.view.MotionEventCompat; import android.util.AttributeSet; import android.view.KeyEvent; import android.view.MotionEvent; diff --git a/material-intro-screen/src/main/java/android/support/v4/view/CustomViewPager.java b/material-intro-screen/src/main/java/android/support/v4/view/CustomViewPager.java index 5164dad..24b2a06 100644 --- a/material-intro-screen/src/main/java/android/support/v4/view/CustomViewPager.java +++ b/material-intro-screen/src/main/java/android/support/v4/view/CustomViewPager.java @@ -28,16 +28,25 @@ import android.os.Parcel; import android.os.Parcelable; import android.os.SystemClock; -import android.support.annotation.CallSuper; -import android.support.annotation.DrawableRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.os.ParcelableCompat; -import android.support.v4.os.ParcelableCompatCreatorCallbacks; -import android.support.v4.view.accessibility.AccessibilityEventCompat; -import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat; -import android.support.v4.view.accessibility.AccessibilityRecordCompat; -import android.support.v4.widget.EdgeEffectCompat; + +import androidx.annotation.CallSuper; +import androidx.annotation.DrawableRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.os.ParcelableCompat; +import androidx.core.os.ParcelableCompatCreatorCallbacks; +import androidx.core.view.AccessibilityDelegateCompat; +import androidx.core.view.MotionEventCompat; +import androidx.core.view.VelocityTrackerCompat; +import androidx.core.view.ViewCompat; +import androidx.core.view.WindowInsetsCompat; +import androidx.core.view.accessibility.AccessibilityEventCompat; +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat; +import androidx.core.view.accessibility.AccessibilityRecordCompat; +import androidx.core.widget.EdgeEffectCompat; +import androidx.customview.view.AbsSavedState; +import androidx.viewpager.widget.PagerAdapter; + import android.util.AttributeSet; import android.util.Log; import android.view.FocusFinder; @@ -74,8 +83,8 @@ * which is a convenient way to supply and manage the lifecycle of each page. * There are standard adapters implemented for using fragments with the ViewPager, * which cover the most common use cases. These are - * {@link android.support.v4.app.FragmentPagerAdapter} and - * {@link android.support.v4.app.FragmentStatePagerAdapter}; each of these + * {@link androidx.core.app.FragmentPagerAdapter} and + * {@link androidx.core.app.FragmentStatePagerAdapter}; each of these * classes have simple code showing how to build a full user interface * with them. * @@ -427,7 +436,7 @@ void initViewPager() { } ViewCompat.setOnApplyWindowInsetsListener(this, - new android.support.v4.view.OnApplyWindowInsetsListener() { + new androidx.core.view.OnApplyWindowInsetsListener() { private final Rect mTempRect = new Rect(); @Override @@ -506,7 +515,7 @@ private void setScrollState(int newState) { */ public void setAdapter(PagerAdapter adapter) { if (mAdapter != null) { - mAdapter.setViewPagerObserver(null); + mAdapter.unregisterDataSetObserver(mObserver); mAdapter.startUpdate(this); for (int i = 0; i < mItems.size(); i++) { final ItemInfo ii = mItems.get(i); @@ -527,7 +536,7 @@ public void setAdapter(PagerAdapter adapter) { if (mObserver == null) { mObserver = new PagerObserver(); } - mAdapter.setViewPagerObserver(mObserver); + mAdapter.registerDataSetObserver(mObserver); mPopulatePending = false; final boolean wasFirstLayout = mFirstLayout; mFirstLayout = true; @@ -2752,14 +2761,12 @@ public boolean executeKeyEvent(KeyEvent event) { handled = arrowScroll(FOCUS_RIGHT); break; case KeyEvent.KEYCODE_TAB: - if (Build.VERSION.SDK_INT >= 11) { - // The focus finder had a bug handling FOCUS_FORWARD and FOCUS_BACKWARD - // before Android 3.0. Ignore the tab key on those devices. - if (KeyEventCompat.hasNoModifiers(event)) { - handled = arrowScroll(FOCUS_FORWARD); - } else if (KeyEventCompat.hasModifiers(event, KeyEvent.META_SHIFT_ON)) { - handled = arrowScroll(FOCUS_BACKWARD); - } + // The focus finder had a bug handling FOCUS_FORWARD and FOCUS_BACKWARD + // before Android 3.0. Ignore the tab key on those devices. + if (event.hasNoModifiers()) { + handled = arrowScroll(FOCUS_FORWARD); + } else if (event.hasModifiers(KeyEvent.META_SHIFT_ON)) { + handled = arrowScroll(FOCUS_BACKWARD); } break; } diff --git a/material-intro-screen/src/main/res/layout/activity_material_intro.xml b/material-intro-screen/src/main/res/layout/activity_material_intro.xml index 0826b95..d5555b2 100644 --- a/material-intro-screen/src/main/res/layout/activity_material_intro.xml +++ b/material-intro-screen/src/main/res/layout/activity_material_intro.xml @@ -1,6 +1,6 @@ - - - + diff --git a/material-intro-screen/src/main/res/values/styles.xml b/material-intro-screen/src/main/res/values/styles.xml index 13307cc..1af1fa5 100644 --- a/material-intro-screen/src/main/res/values/styles.xml +++ b/material-intro-screen/src/main/res/values/styles.xml @@ -1,12 +1,12 @@ - -