diff --git a/adapter-toolbox/build.gradle b/adapter-toolbox/build.gradle index c009f21..02bc60e 100644 --- a/adapter-toolbox/build.gradle +++ b/adapter-toolbox/build.gradle @@ -2,19 +2,19 @@ import java.text.DateFormat import java.text.SimpleDateFormat group = 'net.cattaka' -version = '0.6.0' +version = '0.7.0-beta01' apply plugin: 'com.android.library' apply plugin: 'com.github.dcendents.android-maven' apply plugin: 'com.jfrog.bintray' android { - compileSdkVersion 25 + compileSdkVersion 28 buildToolsVersion '28.0.2' defaultConfig { minSdkVersion 15 - targetSdkVersion 25 + targetSdkVersion 28 versionCode 1 versionName "1.0" } @@ -132,13 +132,13 @@ artifacts { //} dependencies { - provided fileTree(dir: 'libs', include: ['*.jar']) - provided 'com.android.support:recyclerview-v7:25.1.0' + compileOnly fileTree(dir: 'libs', include: ['*.jar']) + compileOnly 'androidx.recyclerview:recyclerview:1.0.0-beta01' - androidTestProvided('com.android.support.test.espresso:espresso-core:2.2.1') { + androidTestCompileOnly('androidx.test.espresso:espresso-core:3.1.0-alpha4') { exclude module: 'support-annotations' } - androidTestProvided('com.android.support.test.espresso:espresso-contrib:2.2.1') { + androidTestCompileOnly('androidx.test.espresso:espresso-contrib:3.1.0-alpha4') { exclude group: 'com.android.support', module: 'appcompat' exclude group: 'com.android.support', module: 'support-v4' exclude group: 'com.android.support', module: 'design' diff --git a/adapter-toolbox/src/androidTest/java/net/cattaka/android/adaptertoolbox/test/ScrollToExAction.java b/adapter-toolbox/src/androidTest/java/net/cattaka/android/adaptertoolbox/test/ScrollToExAction.java index 628ed15..35c45f4 100644 --- a/adapter-toolbox/src/androidTest/java/net/cattaka/android/adaptertoolbox/test/ScrollToExAction.java +++ b/adapter-toolbox/src/androidTest/java/net/cattaka/android/adaptertoolbox/test/ScrollToExAction.java @@ -1,12 +1,12 @@ package net.cattaka.android.adaptertoolbox.test; import android.graphics.Rect; -import android.support.test.espresso.PerformException; -import android.support.test.espresso.UiController; -import android.support.test.espresso.ViewAction; -import android.support.test.espresso.matcher.ViewMatchers; -import android.support.test.espresso.util.HumanReadables; -import android.support.v4.widget.NestedScrollView; +import androidx.test.espresso.PerformException; +import androidx.test.espresso.UiController; +import androidx.test.espresso.ViewAction; +import androidx.test.espresso.matcher.ViewMatchers; +import androidx.test.espresso.util.HumanReadables; +import androidx.core.widget.NestedScrollView; import android.util.Log; import android.view.View; import android.widget.HorizontalScrollView; @@ -14,10 +14,10 @@ import org.hamcrest.Matcher; -import static android.support.test.espresso.matcher.ViewMatchers.isAssignableFrom; -import static android.support.test.espresso.matcher.ViewMatchers.isDescendantOfA; -import static android.support.test.espresso.matcher.ViewMatchers.isDisplayingAtLeast; -import static android.support.test.espresso.matcher.ViewMatchers.withEffectiveVisibility; +import static androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom; +import static androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA; +import static androidx.test.espresso.matcher.ViewMatchers.isDisplayingAtLeast; +import static androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.anyOf; diff --git a/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/AbsChoosableTreeItemAdapter.java b/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/AbsChoosableTreeItemAdapter.java index 14d87c3..a91667e 100644 --- a/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/AbsChoosableTreeItemAdapter.java +++ b/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/AbsChoosableTreeItemAdapter.java @@ -1,9 +1,9 @@ package net.cattaka.android.adaptertoolbox.adapter; import android.content.Context; -import android.support.annotation.IntDef; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.IntDef; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import net.cattaka.android.adaptertoolbox.data.ITreeItem; diff --git a/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/AbsCustomRecyclerAdapter.java b/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/AbsCustomRecyclerAdapter.java index eb52986..d6f5290 100644 --- a/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/AbsCustomRecyclerAdapter.java +++ b/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/AbsCustomRecyclerAdapter.java @@ -1,8 +1,8 @@ package net.cattaka.android.adaptertoolbox.adapter; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import net.cattaka.android.adaptertoolbox.adapter.listener.IForwardingListener; diff --git a/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/AbsScrambleAdapter.java b/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/AbsScrambleAdapter.java index a7256e7..181037e 100644 --- a/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/AbsScrambleAdapter.java +++ b/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/AbsScrambleAdapter.java @@ -1,8 +1,8 @@ package net.cattaka.android.adaptertoolbox.adapter; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; import android.util.SparseArray; import android.view.View; import android.view.ViewGroup; diff --git a/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/AbsTreeItemAdapter.java b/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/AbsTreeItemAdapter.java index 7fee281..73d18eb 100644 --- a/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/AbsTreeItemAdapter.java +++ b/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/AbsTreeItemAdapter.java @@ -1,9 +1,9 @@ package net.cattaka.android.adaptertoolbox.adapter; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; import net.cattaka.android.adaptertoolbox.adapter.listener.ForwardingListener; import net.cattaka.android.adaptertoolbox.adapter.listener.ListenerRelay; diff --git a/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/CodeLabelAdapter.java b/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/CodeLabelAdapter.java index 88b21ee..b2b95dd 100644 --- a/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/CodeLabelAdapter.java +++ b/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/CodeLabelAdapter.java @@ -1,7 +1,7 @@ package net.cattaka.android.adaptertoolbox.adapter; import android.content.Context; -import android.support.annotation.LayoutRes; +import androidx.annotation.LayoutRes; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/CustomRecyclerAdapter.java b/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/CustomRecyclerAdapter.java index e24a14c..d19416c 100644 --- a/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/CustomRecyclerAdapter.java +++ b/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/CustomRecyclerAdapter.java @@ -1,8 +1,8 @@ package net.cattaka.android.adaptertoolbox.adapter; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; import net.cattaka.android.adaptertoolbox.adapter.listener.ForwardingListener; import net.cattaka.android.adaptertoolbox.adapter.listener.ListenerRelay; diff --git a/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/IHasItemAdapter.java b/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/IHasItemAdapter.java index 1554ffb..cdfdaa4 100644 --- a/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/IHasItemAdapter.java +++ b/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/IHasItemAdapter.java @@ -1,6 +1,6 @@ package net.cattaka.android.adaptertoolbox.adapter; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.ViewGroup; /** diff --git a/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/ScrambleAdapter.java b/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/ScrambleAdapter.java index c0b1978..3387504 100644 --- a/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/ScrambleAdapter.java +++ b/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/ScrambleAdapter.java @@ -1,9 +1,9 @@ package net.cattaka.android.adaptertoolbox.adapter; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import net.cattaka.android.adaptertoolbox.adapter.listener.ForwardingListener; diff --git a/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/SingleViewAdapter.java b/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/SingleViewAdapter.java index 0acf6bf..fc1e628 100644 --- a/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/SingleViewAdapter.java +++ b/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/SingleViewAdapter.java @@ -1,9 +1,9 @@ package net.cattaka.android.adaptertoolbox.adapter; import android.content.Context; -import android.support.annotation.LayoutRes; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.LayoutRes; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/SingleViewAdapter2.java b/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/SingleViewAdapter2.java index c09de76..ab430da 100644 --- a/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/SingleViewAdapter2.java +++ b/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/SingleViewAdapter2.java @@ -1,9 +1,9 @@ package net.cattaka.android.adaptertoolbox.adapter; import android.content.Context; -import android.support.annotation.LayoutRes; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.LayoutRes; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/listener/ForwardingListener.java b/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/listener/ForwardingListener.java index 62c7a80..f1112e1 100644 --- a/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/listener/ForwardingListener.java +++ b/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/listener/ForwardingListener.java @@ -1,8 +1,8 @@ package net.cattaka.android.adaptertoolbox.adapter.listener; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; import android.text.Editable; import android.text.TextWatcher; import android.view.KeyEvent; diff --git a/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/listener/IForwardingListener.java b/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/listener/IForwardingListener.java index 4684e90..15499f0 100644 --- a/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/listener/IForwardingListener.java +++ b/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/listener/IForwardingListener.java @@ -1,8 +1,8 @@ package net.cattaka.android.adaptertoolbox.adapter.listener; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; /** * Created by cattaka on 2016/05/12. diff --git a/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/listener/ListenerRelay.java b/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/listener/ListenerRelay.java index 12c4650..e139ee6 100644 --- a/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/listener/ListenerRelay.java +++ b/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/listener/ListenerRelay.java @@ -1,7 +1,7 @@ package net.cattaka.android.adaptertoolbox.adapter.listener; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.text.Editable; import android.view.KeyEvent; import android.view.View; diff --git a/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/classic/AdapterConverter.java b/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/classic/AdapterConverter.java index 1be1b75..45b8c64 100644 --- a/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/classic/AdapterConverter.java +++ b/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/classic/AdapterConverter.java @@ -1,10 +1,10 @@ package net.cattaka.android.adaptertoolbox.classic; import android.database.DataSetObserver; -import android.support.annotation.IdRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.IdRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.view.ViewGroup; import android.widget.BaseAdapter; diff --git a/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/classic/ClassicScrambleAdapter.java b/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/classic/ClassicScrambleAdapter.java index ce18f2c..fe752a7 100644 --- a/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/classic/ClassicScrambleAdapter.java +++ b/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/classic/ClassicScrambleAdapter.java @@ -1,9 +1,9 @@ package net.cattaka.android.adaptertoolbox.classic; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import net.cattaka.android.adaptertoolbox.adapter.AbsScrambleAdapter; diff --git a/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/classic/listener/ClassicForwardingListener.java b/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/classic/listener/ClassicForwardingListener.java index 7284a21..35d0ff5 100644 --- a/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/classic/listener/ClassicForwardingListener.java +++ b/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/classic/listener/ClassicForwardingListener.java @@ -1,9 +1,9 @@ package net.cattaka.android.adaptertoolbox.classic.listener; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.util.Pair; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.util.Pair; +import androidx.recyclerview.widget.RecyclerView; import android.text.Editable; import android.text.TextWatcher; import android.view.KeyEvent; diff --git a/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/classic/listener/ClassicListenerRelay.java b/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/classic/listener/ClassicListenerRelay.java index 30cb79a..784804d 100644 --- a/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/classic/listener/ClassicListenerRelay.java +++ b/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/classic/listener/ClassicListenerRelay.java @@ -1,7 +1,7 @@ package net.cattaka.android.adaptertoolbox.classic.listener; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.text.Editable; import android.view.KeyEvent; import android.view.View; diff --git a/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/decoration/VerticalListDividerItemDecoration.java b/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/decoration/VerticalListDividerItemDecoration.java index f771592..f53f18c 100644 --- a/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/decoration/VerticalListDividerItemDecoration.java +++ b/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/decoration/VerticalListDividerItemDecoration.java @@ -5,11 +5,11 @@ import android.graphics.Canvas; import android.graphics.Rect; import android.graphics.drawable.Drawable; -import android.support.annotation.DrawableRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.content.ContextCompat; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.DrawableRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.view.ViewGroup; diff --git a/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/thirdparty/MergeRecyclerAdapter.java b/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/thirdparty/MergeRecyclerAdapter.java index f9564a0..c03d2e8 100644 --- a/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/thirdparty/MergeRecyclerAdapter.java +++ b/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/thirdparty/MergeRecyclerAdapter.java @@ -1,7 +1,7 @@ package net.cattaka.android.adaptertoolbox.thirdparty; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.view.ViewGroup; @@ -39,12 +39,12 @@ * these views are then put into an adapter themselves, even if the adapter only holds the * one view. *

- * RecyclerView Adapters must implement both the {@link android.support.v7.widget.RecyclerView.Adapter#onCreateViewHolder(android.view.ViewGroup, int)} - * and {@link android.support.v7.widget.RecyclerView.Adapter#onBindViewHolder(android.support.v7.widget.RecyclerView.ViewHolder, + * RecyclerView Adapters must implement both the {@link RecyclerView.Adapter#onCreateViewHolder(android.view.ViewGroup, int)} + * and {@link RecyclerView.Adapter#onBindViewHolder( RecyclerView.ViewHolder, * int)} methods, as opposed to just the {@link android.widget.BaseAdapter#getView(int, android.view.View, * android.view.ViewGroup)} method in a ListView Adapter. *

- * Because the {@link android.support.v7.widget.RecyclerView.Adapter#onCreateViewHolder(android.view.ViewGroup, int)} method only provides us the ViewGroup and a View Type, we must keep a mapping of + * Because the {@link RecyclerView.Adapter#onCreateViewHolder(android.view.ViewGroup, int)} method only provides us the ViewGroup and a View Type, we must keep a mapping of * (unique) view types in this merge adapter to each sub adapter, so we know which adapters' onCreateViewHolder method to call. *

* The {@link MergeRecyclerAdapter.LocalAdapter} class diff --git a/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/utils/SpinnerUtils.java b/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/utils/SpinnerUtils.java index cd23923..b2199da 100644 --- a/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/utils/SpinnerUtils.java +++ b/adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/utils/SpinnerUtils.java @@ -1,6 +1,6 @@ package net.cattaka.android.adaptertoolbox.utils; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.widget.AdapterView; import android.widget.Spinner; diff --git a/build.gradle b/build.gradle index 7a3f463..23d96b1 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.3' + classpath 'com.android.tools.build:gradle:3.3.0-alpha07' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1' diff --git a/example/build.gradle b/example/build.gradle index a31fd82..0d08ccb 100644 --- a/example/build.gradle +++ b/example/build.gradle @@ -1,17 +1,17 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 26 + compileSdkVersion 28 buildToolsVersion '28.0.2' defaultConfig { applicationId "net.cattaka.android.adaptertoolbox.example" minSdkVersion 15 - targetSdkVersion 26 + targetSdkVersion 28 versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { release { @@ -25,35 +25,35 @@ android { } dependencies { - compile project(':adapter-toolbox') - compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:recyclerview-v7:26.1.0' - compile 'com.android.support:design:26.1.0' - compile 'com.android.support:support-annotations:26.1.0' - compile 'com.android.support:appcompat-v7:26.1.0' - compile 'com.android.support:cardview-v7:26.1.0' + implementation project(':adapter-toolbox') + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'androidx.recyclerview:recyclerview:1.0.0-beta01' + implementation 'com.google.android.material:material:1.0.0-beta01' + implementation 'androidx.annotation:annotation:1.0.0-beta01' + implementation 'androidx.appcompat:appcompat:1.0.0-beta01' + implementation 'androidx.cardview:cardview:1.0.0-beta01' - testCompile 'junit:junit:4.12' - androidTestCompile 'junit:junit:4.12' - androidTestCompile('com.android.support.test:runner:0.5') { + testImplementation 'junit:junit:4.12' + androidTestImplementation 'junit:junit:4.12' + androidTestImplementation('androidx.test:runner:1.1.0-alpha4') { exclude group: 'com.android.support', module: 'support-annotations' exclude group: 'com.android.support', module: 'recyclerview-v7' } - androidTestCompile('com.android.support.test:rules:0.5') { + androidTestImplementation('androidx.test:rules:1.1.0-alpha4') { exclude group: 'com.android.support', module: 'support-annotations' exclude group: 'com.android.support', module: 'recyclerview-v7' } - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.1') { + androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0-alpha4') { exclude group: 'com.android.support', module: 'support-v4' exclude group: 'com.android.support', module: 'support-annotations' exclude group: 'com.android.support', module: 'recyclerview-v7' } - androidTestCompile('com.android.support.test.espresso:espresso-contrib:2.2.1') { + androidTestImplementation('androidx.test.espresso:espresso-contrib:3.1.0-alpha4') { exclude group: 'com.android.support', module: 'support-v4' exclude group: 'com.android.support', module: 'support-annotations' exclude group: 'com.android.support', module: 'recyclerview-v7' } - androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.2' - androidTestCompile 'com.google.dexmaker:dexmaker:1.2' - androidTestCompile 'org.mockito:mockito-core:1.9.5' + androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:1.2' + androidTestImplementation 'com.google.dexmaker:dexmaker:1.2' + androidTestImplementation 'org.mockito:mockito-core:1.9.5' } diff --git a/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/ApplicationTest.java b/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/ApplicationTest.java deleted file mode 100644 index 01f651d..0000000 --- a/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/ApplicationTest.java +++ /dev/null @@ -1,13 +0,0 @@ -package net.cattaka.android.adaptertoolbox.example; - -import android.app.Application; -import android.test.ApplicationTestCase; - -/** - * Testing Fundamentals - */ -public class ApplicationTest extends ApplicationTestCase { - public ApplicationTest() { - super(Application.class); - } -} \ No newline at end of file diff --git a/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/ClassicScrambleAdapterExampleActivityTest.java b/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/ClassicScrambleAdapterExampleActivityTest.java index 9637b01..e41dae3 100644 --- a/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/ClassicScrambleAdapterExampleActivityTest.java +++ b/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/ClassicScrambleAdapterExampleActivityTest.java @@ -1,8 +1,8 @@ package net.cattaka.android.adaptertoolbox.example; import android.content.res.Resources; -import android.support.test.InstrumentationRegistry; -import android.support.test.rule.ActivityTestRule; +import androidx.test.InstrumentationRegistry; +import androidx.test.rule.ActivityTestRule; import android.view.View; import android.widget.ListView; @@ -15,8 +15,8 @@ import org.junit.Rule; import org.junit.Test; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.action.ViewActions.click; +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.action.ViewActions.click; import static net.cattaka.android.adaptertoolbox.example.test.TestUtils.withIdInAdapterView; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; diff --git a/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/CodeLabelExampleActivityTest.java b/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/CodeLabelExampleActivityTest.java index 53b9688..d22dff6 100644 --- a/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/CodeLabelExampleActivityTest.java +++ b/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/CodeLabelExampleActivityTest.java @@ -1,7 +1,7 @@ package net.cattaka.android.adaptertoolbox.example; import android.content.res.Resources; -import android.support.test.rule.ActivityTestRule; +import androidx.test.rule.ActivityTestRule; import android.view.View; import net.cattaka.android.adaptertoolbox.example.data.OrdinalLabel; @@ -10,10 +10,10 @@ import org.junit.Rule; import org.junit.Test; -import static android.support.test.espresso.Espresso.onData; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.action.ViewActions.click; -import static android.support.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.Espresso.onData; +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.action.ViewActions.click; +import static androidx.test.espresso.matcher.ViewMatchers.withId; import static org.hamcrest.Matchers.is; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; diff --git a/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/ComplexStringExampleActivityTest.java b/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/ComplexStringExampleActivityTest.java index 5663d1d..5bdc601 100644 --- a/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/ComplexStringExampleActivityTest.java +++ b/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/ComplexStringExampleActivityTest.java @@ -1,6 +1,6 @@ package net.cattaka.android.adaptertoolbox.example; -import android.support.test.rule.ActivityTestRule; +import androidx.test.rule.ActivityTestRule; import android.view.View; import net.cattaka.android.adaptertoolbox.adapter.ScrambleAdapter; @@ -10,10 +10,10 @@ import org.junit.Rule; import org.junit.Test; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.action.ViewActions.click; -import static android.support.test.espresso.contrib.RecyclerViewActions.scrollToPosition; -import static android.support.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.action.ViewActions.click; +import static androidx.test.espresso.contrib.RecyclerViewActions.scrollToPosition; +import static androidx.test.espresso.matcher.ViewMatchers.withId; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.containsString; import static org.mockito.Matchers.any; diff --git a/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/DataBindingManipulableListExampleActivityTest.java b/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/DataBindingManipulableListExampleActivityTest.java index 5d52eb2..c570629 100644 --- a/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/DataBindingManipulableListExampleActivityTest.java +++ b/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/DataBindingManipulableListExampleActivityTest.java @@ -1,7 +1,7 @@ package net.cattaka.android.adaptertoolbox.example; -import android.support.test.espresso.assertion.ViewAssertions; -import android.support.test.rule.ActivityTestRule; +import androidx.test.espresso.assertion.ViewAssertions; +import androidx.test.rule.ActivityTestRule; import net.cattaka.android.adaptertoolbox.adapter.ScrambleAdapter; import net.cattaka.android.adaptertoolbox.example.data.ObservableMyInfo; @@ -13,12 +13,12 @@ import org.junit.Rule; import org.junit.Test; -import static android.support.test.espresso.Espresso.onData; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.action.ViewActions.click; -import static android.support.test.espresso.contrib.RecyclerViewActions.scrollToPosition; -import static android.support.test.espresso.matcher.ViewMatchers.isChecked; -import static android.support.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.Espresso.onData; +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.action.ViewActions.click; +import static androidx.test.espresso.contrib.RecyclerViewActions.scrollToPosition; +import static androidx.test.espresso.matcher.ViewMatchers.isChecked; +import static androidx.test.espresso.matcher.ViewMatchers.withId; import static net.cattaka.android.adaptertoolbox.example.test.TestUtils.find; import static net.cattaka.android.adaptertoolbox.example.test.TestUtils.hasProgress; import static net.cattaka.android.adaptertoolbox.example.test.TestUtils.hasSelectedItem; diff --git a/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/DifferenceDividerExampleActivityTest.java b/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/DifferenceDividerExampleActivityTest.java index 2a7e537..f8fe598 100644 --- a/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/DifferenceDividerExampleActivityTest.java +++ b/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/DifferenceDividerExampleActivityTest.java @@ -1,6 +1,6 @@ package net.cattaka.android.adaptertoolbox.example; -import android.support.test.rule.ActivityTestRule; +import androidx.test.rule.ActivityTestRule; import net.cattaka.android.adaptertoolbox.example.test.RecyclerViewAnimatingIdlingResource; @@ -8,10 +8,10 @@ import org.junit.Rule; import org.junit.Test; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.action.ViewActions.swipeDown; -import static android.support.test.espresso.action.ViewActions.swipeUp; -import static android.support.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.action.ViewActions.swipeDown; +import static androidx.test.espresso.action.ViewActions.swipeUp; +import static androidx.test.espresso.matcher.ViewMatchers.withId; import static net.cattaka.android.adaptertoolbox.example.test.TestUtils.waitForIdlingResource; /** diff --git a/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/FizzBuzzExampleActivityTest.java b/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/FizzBuzzExampleActivityTest.java index f1e13e7..8c3b623 100644 --- a/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/FizzBuzzExampleActivityTest.java +++ b/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/FizzBuzzExampleActivityTest.java @@ -1,6 +1,6 @@ package net.cattaka.android.adaptertoolbox.example; -import android.support.test.rule.ActivityTestRule; +import androidx.test.rule.ActivityTestRule; import android.view.View; import net.cattaka.android.adaptertoolbox.example.logic.SnackbarLogic; @@ -8,10 +8,10 @@ import org.junit.Rule; import org.junit.Test; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.action.ViewActions.click; -import static android.support.test.espresso.contrib.RecyclerViewActions.scrollToPosition; -import static android.support.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.action.ViewActions.click; +import static androidx.test.espresso.contrib.RecyclerViewActions.scrollToPosition; +import static androidx.test.espresso.matcher.ViewMatchers.withId; import static net.cattaka.android.adaptertoolbox.example.test.TestUtils.withIdInRecyclerView; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.containsString; diff --git a/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/MainActivityTest.java b/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/MainActivityTest.java index 17ad80e..1c6f719 100644 --- a/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/MainActivityTest.java +++ b/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/MainActivityTest.java @@ -1,8 +1,8 @@ package net.cattaka.android.adaptertoolbox.example; import android.app.Activity; -import android.support.test.InstrumentationRegistry; -import android.support.test.rule.ActivityTestRule; +import androidx.test.InstrumentationRegistry; +import androidx.test.rule.ActivityTestRule; import net.cattaka.android.adaptertoolbox.example.adapter.ActivityEntryAdapter; import net.cattaka.android.adaptertoolbox.example.data.ActivityEntry; @@ -10,11 +10,11 @@ import org.junit.Rule; import org.junit.Test; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.action.ViewActions.click; -import static android.support.test.espresso.contrib.RecyclerViewActions.actionOnItemAtPosition; -import static android.support.test.espresso.contrib.RecyclerViewActions.scrollToPosition; -import static android.support.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.action.ViewActions.click; +import static androidx.test.espresso.contrib.RecyclerViewActions.actionOnItemAtPosition; +import static androidx.test.espresso.contrib.RecyclerViewActions.scrollToPosition; +import static androidx.test.espresso.matcher.ViewMatchers.withId; import static net.cattaka.android.adaptertoolbox.example.test.TestUtils.monitorActivity; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; diff --git a/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/ManipulableListExampleActivityTest.java b/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/ManipulableListExampleActivityTest.java index 1b98821..6a2eb4e 100644 --- a/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/ManipulableListExampleActivityTest.java +++ b/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/ManipulableListExampleActivityTest.java @@ -1,7 +1,7 @@ package net.cattaka.android.adaptertoolbox.example; -import android.support.test.espresso.assertion.ViewAssertions; -import android.support.test.rule.ActivityTestRule; +import androidx.test.espresso.assertion.ViewAssertions; +import androidx.test.rule.ActivityTestRule; import net.cattaka.android.adaptertoolbox.adapter.ScrambleAdapter; import net.cattaka.android.adaptertoolbox.example.data.MyInfo; @@ -14,14 +14,14 @@ import org.junit.Rule; import org.junit.Test; -import static android.support.test.espresso.Espresso.onData; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.action.ViewActions.click; -import static android.support.test.espresso.action.ViewActions.replaceText; -import static android.support.test.espresso.contrib.RecyclerViewActions.scrollToPosition; -import static android.support.test.espresso.matcher.ViewMatchers.isChecked; -import static android.support.test.espresso.matcher.ViewMatchers.withId; -import static android.support.test.espresso.matcher.ViewMatchers.withText; +import static androidx.test.espresso.Espresso.onData; +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.action.ViewActions.click; +import static androidx.test.espresso.action.ViewActions.replaceText; +import static androidx.test.espresso.contrib.RecyclerViewActions.scrollToPosition; +import static androidx.test.espresso.matcher.ViewMatchers.isChecked; +import static androidx.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.matcher.ViewMatchers.withText; import static net.cattaka.android.adaptertoolbox.example.test.TestUtils.find; import static net.cattaka.android.adaptertoolbox.example.test.TestUtils.hasProgress; import static net.cattaka.android.adaptertoolbox.example.test.TestUtils.hasSelectedItem; diff --git a/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/MultiAdapterExampleActivityTest.java b/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/MultiAdapterExampleActivityTest.java index a8d1503..e7a9633 100644 --- a/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/MultiAdapterExampleActivityTest.java +++ b/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/MultiAdapterExampleActivityTest.java @@ -1,6 +1,6 @@ package net.cattaka.android.adaptertoolbox.example; -import android.support.test.rule.ActivityTestRule; +import androidx.test.rule.ActivityTestRule; import android.view.View; import net.cattaka.android.adaptertoolbox.example.logic.SnackbarLogic; @@ -10,10 +10,10 @@ import org.junit.Rule; import org.junit.Test; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.action.ViewActions.click; -import static android.support.test.espresso.contrib.RecyclerViewActions.scrollToPosition; -import static android.support.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.action.ViewActions.click; +import static androidx.test.espresso.contrib.RecyclerViewActions.scrollToPosition; +import static androidx.test.espresso.matcher.ViewMatchers.withId; import static net.cattaka.android.adaptertoolbox.example.test.TestUtils.withIdInRecyclerView; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.containsString; diff --git a/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/MultiChoosableTreeItemAdapterExampleActivityTest.java b/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/MultiChoosableTreeItemAdapterExampleActivityTest.java index 26749f4..4257f1b 100644 --- a/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/MultiChoosableTreeItemAdapterExampleActivityTest.java +++ b/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/MultiChoosableTreeItemAdapterExampleActivityTest.java @@ -1,6 +1,6 @@ package net.cattaka.android.adaptertoolbox.example; -import android.support.test.rule.ActivityTestRule; +import androidx.test.rule.ActivityTestRule; import android.view.View; import net.cattaka.android.adaptertoolbox.example.adapter.ChoosableMyTreeItemAdapter; @@ -14,10 +14,10 @@ import org.junit.Rule; import org.junit.Test; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.action.ViewActions.click; -import static android.support.test.espresso.contrib.RecyclerViewActions.scrollToPosition; -import static android.support.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.action.ViewActions.click; +import static androidx.test.espresso.contrib.RecyclerViewActions.scrollToPosition; +import static androidx.test.espresso.matcher.ViewMatchers.withId; import static net.cattaka.android.adaptertoolbox.example.test.TestUtils.find; import static net.cattaka.android.adaptertoolbox.example.test.TestUtils.waitForIdlingResource; import static net.cattaka.android.adaptertoolbox.example.test.TestUtils.withIdInRecyclerView; diff --git a/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/NestedScrambleAdapterExampleActivityTest.java b/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/NestedScrambleAdapterExampleActivityTest.java index 028bf29..8d07b7e 100644 --- a/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/NestedScrambleAdapterExampleActivityTest.java +++ b/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/NestedScrambleAdapterExampleActivityTest.java @@ -1,8 +1,8 @@ package net.cattaka.android.adaptertoolbox.example; import android.content.res.Resources; -import android.support.test.espresso.action.ViewActions; -import android.support.test.rule.ActivityTestRule; +import androidx.test.espresso.action.ViewActions; +import androidx.test.rule.ActivityTestRule; import android.view.View; import net.cattaka.android.adaptertoolbox.adapter.ScrambleAdapter; @@ -15,11 +15,11 @@ import org.junit.Rule; import org.junit.Test; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.action.ViewActions.click; -import static android.support.test.espresso.contrib.RecyclerViewActions.scrollToPosition; -import static android.support.test.espresso.matcher.ViewMatchers.isDescendantOfA; -import static android.support.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.action.ViewActions.click; +import static androidx.test.espresso.contrib.RecyclerViewActions.scrollToPosition; +import static androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA; +import static androidx.test.espresso.matcher.ViewMatchers.withId; import static net.cattaka.android.adaptertoolbox.example.test.TestUtils.find; import static net.cattaka.android.adaptertoolbox.example.test.TestUtils.withIdInRecyclerView; import static org.hamcrest.Matchers.allOf; diff --git a/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/RecyclerViewHeaderExampleActivityTest.java b/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/RecyclerViewHeaderExampleActivityTest.java index a058a81..08473a5 100644 --- a/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/RecyclerViewHeaderExampleActivityTest.java +++ b/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/RecyclerViewHeaderExampleActivityTest.java @@ -1,6 +1,6 @@ package net.cattaka.android.adaptertoolbox.example; -import android.support.test.rule.ActivityTestRule; +import androidx.test.rule.ActivityTestRule; import android.view.View; import net.cattaka.android.adaptertoolbox.example.logic.SnackbarLogic; @@ -10,10 +10,10 @@ import org.junit.Rule; import org.junit.Test; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.action.ViewActions.click; -import static android.support.test.espresso.contrib.RecyclerViewActions.scrollToPosition; -import static android.support.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.action.ViewActions.click; +import static androidx.test.espresso.contrib.RecyclerViewActions.scrollToPosition; +import static androidx.test.espresso.matcher.ViewMatchers.withId; import static net.cattaka.android.adaptertoolbox.example.test.TestUtils.withIdInRecyclerView; import static org.hamcrest.Matchers.containsString; import static org.mockito.Matchers.any; diff --git a/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/ScrambleAdapterExampleActivityTest.java b/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/ScrambleAdapterExampleActivityTest.java index 8814be7..ab9de26 100644 --- a/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/ScrambleAdapterExampleActivityTest.java +++ b/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/ScrambleAdapterExampleActivityTest.java @@ -1,7 +1,7 @@ package net.cattaka.android.adaptertoolbox.example; import android.content.res.Resources; -import android.support.test.rule.ActivityTestRule; +import androidx.test.rule.ActivityTestRule; import android.view.View; import net.cattaka.android.adaptertoolbox.adapter.ScrambleAdapter; @@ -14,12 +14,12 @@ import org.junit.Rule; import org.junit.Test; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.action.ViewActions.click; -import static android.support.test.espresso.action.ViewActions.swipeDown; -import static android.support.test.espresso.action.ViewActions.swipeUp; -import static android.support.test.espresso.contrib.RecyclerViewActions.scrollToPosition; -import static android.support.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.action.ViewActions.click; +import static androidx.test.espresso.action.ViewActions.swipeDown; +import static androidx.test.espresso.action.ViewActions.swipeUp; +import static androidx.test.espresso.contrib.RecyclerViewActions.scrollToPosition; +import static androidx.test.espresso.matcher.ViewMatchers.withId; import static net.cattaka.android.adaptertoolbox.example.test.TestUtils.find; import static net.cattaka.android.adaptertoolbox.example.test.TestUtils.waitForIdlingResource; import static net.cattaka.android.adaptertoolbox.example.test.TestUtils.withIdInRecyclerView; diff --git a/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/SimpleStringExampleActivityTest.java b/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/SimpleStringExampleActivityTest.java index 6d965f4..c4ae7c1 100644 --- a/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/SimpleStringExampleActivityTest.java +++ b/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/SimpleStringExampleActivityTest.java @@ -1,6 +1,6 @@ package net.cattaka.android.adaptertoolbox.example; -import android.support.test.rule.ActivityTestRule; +import androidx.test.rule.ActivityTestRule; import android.view.View; import net.cattaka.android.adaptertoolbox.adapter.ScrambleAdapter; @@ -12,12 +12,12 @@ import org.junit.Rule; import org.junit.Test; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.action.ViewActions.click; -import static android.support.test.espresso.action.ViewActions.swipeDown; -import static android.support.test.espresso.action.ViewActions.swipeUp; -import static android.support.test.espresso.contrib.RecyclerViewActions.scrollToPosition; -import static android.support.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.action.ViewActions.click; +import static androidx.test.espresso.action.ViewActions.swipeDown; +import static androidx.test.espresso.action.ViewActions.swipeUp; +import static androidx.test.espresso.contrib.RecyclerViewActions.scrollToPosition; +import static androidx.test.espresso.matcher.ViewMatchers.withId; import static net.cattaka.android.adaptertoolbox.example.test.TestUtils.find; import static net.cattaka.android.adaptertoolbox.example.test.TestUtils.waitForIdlingResource; import static net.cattaka.android.adaptertoolbox.example.test.TestUtils.withIdInRecyclerView; diff --git a/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/SingleChoosableTreeItemAdapterExampleActivityTest.java b/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/SingleChoosableTreeItemAdapterExampleActivityTest.java index dbdab52..ba514ab 100644 --- a/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/SingleChoosableTreeItemAdapterExampleActivityTest.java +++ b/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/SingleChoosableTreeItemAdapterExampleActivityTest.java @@ -1,6 +1,6 @@ package net.cattaka.android.adaptertoolbox.example; -import android.support.test.rule.ActivityTestRule; +import androidx.test.rule.ActivityTestRule; import android.view.View; import net.cattaka.android.adaptertoolbox.example.adapter.ChoosableMyTreeItemAdapter; @@ -14,10 +14,10 @@ import org.junit.Rule; import org.junit.Test; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.action.ViewActions.click; -import static android.support.test.espresso.contrib.RecyclerViewActions.scrollToPosition; -import static android.support.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.action.ViewActions.click; +import static androidx.test.espresso.contrib.RecyclerViewActions.scrollToPosition; +import static androidx.test.espresso.matcher.ViewMatchers.withId; import static net.cattaka.android.adaptertoolbox.example.test.TestUtils.find; import static net.cattaka.android.adaptertoolbox.example.test.TestUtils.waitForIdlingResource; import static net.cattaka.android.adaptertoolbox.example.test.TestUtils.withIdInRecyclerView; diff --git a/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/SpinnerScrambleAdapterExampleActivityTest.java b/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/SpinnerScrambleAdapterExampleActivityTest.java index bbac632..afb2de0 100644 --- a/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/SpinnerScrambleAdapterExampleActivityTest.java +++ b/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/SpinnerScrambleAdapterExampleActivityTest.java @@ -1,6 +1,6 @@ package net.cattaka.android.adaptertoolbox.example; -import android.support.test.rule.ActivityTestRule; +import androidx.test.rule.ActivityTestRule; import android.view.View; import net.cattaka.android.adaptertoolbox.classic.ClassicScrambleAdapter; @@ -11,10 +11,10 @@ import org.junit.Rule; import org.junit.Test; -import static android.support.test.espresso.Espresso.onData; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.action.ViewActions.click; -import static android.support.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.Espresso.onData; +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.action.ViewActions.click; +import static androidx.test.espresso.matcher.ViewMatchers.withId; import static net.cattaka.android.adaptertoolbox.example.test.TestUtils.find; import static net.cattaka.android.adaptertoolbox.example.test.TestUtils.hasSelectedItem; import static org.hamcrest.Matchers.is; diff --git a/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/SpinnerTreeItemAdapterExampleActivityTest.java b/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/SpinnerTreeItemAdapterExampleActivityTest.java index 6649106..c3006bb 100644 --- a/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/SpinnerTreeItemAdapterExampleActivityTest.java +++ b/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/SpinnerTreeItemAdapterExampleActivityTest.java @@ -1,6 +1,6 @@ package net.cattaka.android.adaptertoolbox.example; -import android.support.test.rule.ActivityTestRule; +import androidx.test.rule.ActivityTestRule; import android.view.View; import net.cattaka.android.adaptertoolbox.classic.AdapterConverter; @@ -14,10 +14,10 @@ import org.junit.Rule; import org.junit.Test; -import static android.support.test.espresso.Espresso.onData; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.action.ViewActions.click; -import static android.support.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.Espresso.onData; +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.action.ViewActions.click; +import static androidx.test.espresso.matcher.ViewMatchers.withId; import static net.cattaka.android.adaptertoolbox.example.test.TestUtils.find; import static net.cattaka.android.adaptertoolbox.example.test.TestUtils.hasSelectedItem; import static org.hamcrest.Matchers.is; diff --git a/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/StringWithPayloadExampleActivityTest.java b/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/StringWithPayloadExampleActivityTest.java index b8f235b..f593205 100644 --- a/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/StringWithPayloadExampleActivityTest.java +++ b/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/StringWithPayloadExampleActivityTest.java @@ -1,6 +1,6 @@ package net.cattaka.android.adaptertoolbox.example; -import android.support.test.rule.ActivityTestRule; +import androidx.test.rule.ActivityTestRule; import net.cattaka.android.adaptertoolbox.example.test.RecyclerViewAnimatingIdlingResource; import net.cattaka.android.adaptertoolbox.example.utils.FlashColorItemAnimator.FlashColor; @@ -9,13 +9,13 @@ import org.junit.Rule; import org.junit.Test; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.action.ViewActions.click; -import static android.support.test.espresso.action.ViewActions.swipeDown; -import static android.support.test.espresso.action.ViewActions.swipeUp; -import static android.support.test.espresso.assertion.ViewAssertions.matches; -import static android.support.test.espresso.matcher.ViewMatchers.withId; -import static android.support.test.espresso.matcher.ViewMatchers.withText; +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.action.ViewActions.click; +import static androidx.test.espresso.action.ViewActions.swipeDown; +import static androidx.test.espresso.action.ViewActions.swipeUp; +import static androidx.test.espresso.assertion.ViewAssertions.matches; +import static androidx.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.matcher.ViewMatchers.withText; import static net.cattaka.android.adaptertoolbox.example.test.TestUtils.waitForIdlingResource; import static net.cattaka.android.adaptertoolbox.example.test.TestUtils.withIdInRecyclerView; diff --git a/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/TreeItemAdapterExampleActivityTest.java b/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/TreeItemAdapterExampleActivityTest.java index 0826d36..12afec8 100644 --- a/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/TreeItemAdapterExampleActivityTest.java +++ b/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/TreeItemAdapterExampleActivityTest.java @@ -1,6 +1,6 @@ package net.cattaka.android.adaptertoolbox.example; -import android.support.test.rule.ActivityTestRule; +import androidx.test.rule.ActivityTestRule; import android.view.View; import net.cattaka.android.adaptertoolbox.example.adapter.MyTreeItemAdapter; @@ -14,10 +14,10 @@ import org.junit.Rule; import org.junit.Test; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.action.ViewActions.click; -import static android.support.test.espresso.contrib.RecyclerViewActions.scrollToPosition; -import static android.support.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.action.ViewActions.click; +import static androidx.test.espresso.contrib.RecyclerViewActions.scrollToPosition; +import static androidx.test.espresso.matcher.ViewMatchers.withId; import static net.cattaka.android.adaptertoolbox.example.test.TestUtils.find; import static net.cattaka.android.adaptertoolbox.example.test.TestUtils.waitForIdlingResource; import static net.cattaka.android.adaptertoolbox.example.test.TestUtils.withIdInRecyclerView; diff --git a/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/VerticalListDividerExampleActivityTest.java b/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/VerticalListDividerExampleActivityTest.java index c46d454..5570513 100644 --- a/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/VerticalListDividerExampleActivityTest.java +++ b/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/VerticalListDividerExampleActivityTest.java @@ -1,6 +1,6 @@ package net.cattaka.android.adaptertoolbox.example; -import android.support.test.rule.ActivityTestRule; +import androidx.test.rule.ActivityTestRule; import net.cattaka.android.adaptertoolbox.example.test.RecyclerViewAnimatingIdlingResource; @@ -8,10 +8,10 @@ import org.junit.Rule; import org.junit.Test; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.action.ViewActions.swipeDown; -import static android.support.test.espresso.action.ViewActions.swipeUp; -import static android.support.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.action.ViewActions.swipeDown; +import static androidx.test.espresso.action.ViewActions.swipeUp; +import static androidx.test.espresso.matcher.ViewMatchers.withId; import static net.cattaka.android.adaptertoolbox.example.test.TestUtils.waitForIdlingResource; /** diff --git a/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/test/RecyclerViewAnimatingIdlingResource.java b/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/test/RecyclerViewAnimatingIdlingResource.java index f29e091..6cdd7e9 100644 --- a/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/test/RecyclerViewAnimatingIdlingResource.java +++ b/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/test/RecyclerViewAnimatingIdlingResource.java @@ -1,7 +1,7 @@ package net.cattaka.android.adaptertoolbox.example.test; -import android.support.test.espresso.IdlingResource; -import android.support.v7.widget.RecyclerView; +import androidx.test.espresso.IdlingResource; +import androidx.recyclerview.widget.RecyclerView; /** * Created by cattaka on 16/06/05. diff --git a/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/test/TestUtils.java b/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/test/TestUtils.java index 072cd84..13f7d53 100644 --- a/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/test/TestUtils.java +++ b/example/src/androidTest/java/net/cattaka/android/adaptertoolbox/example/test/TestUtils.java @@ -4,16 +4,16 @@ import android.app.Instrumentation; import android.content.res.Resources; import android.os.SystemClock; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.test.InstrumentationRegistry; -import android.support.test.espresso.IdlingResource; -import android.support.test.espresso.NoMatchingViewException; -import android.support.test.espresso.UiController; -import android.support.test.espresso.ViewAction; -import android.support.test.espresso.ViewAssertion; -import android.support.test.espresso.matcher.ViewMatchers; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.test.InstrumentationRegistry; +import androidx.test.espresso.IdlingResource; +import androidx.test.espresso.NoMatchingViewException; +import androidx.test.espresso.UiController; +import androidx.test.espresso.ViewAction; +import androidx.test.espresso.ViewAssertion; +import androidx.test.espresso.matcher.ViewMatchers; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.AdapterView; import android.widget.ProgressBar; @@ -27,7 +27,7 @@ import java.util.List; -import static android.support.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.matcher.ViewMatchers.withId; import static org.hamcrest.Matchers.allOf; /** diff --git a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/ClassicScrambleAdapterExampleActivity.java b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/ClassicScrambleAdapterExampleActivity.java index 468fc06..f9adf64 100644 --- a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/ClassicScrambleAdapterExampleActivity.java +++ b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/ClassicScrambleAdapterExampleActivity.java @@ -1,10 +1,10 @@ package net.cattaka.android.adaptertoolbox.example; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.design.widget.Snackbar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import com.google.android.material.snackbar.Snackbar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.AdapterView; import android.widget.ListView; diff --git a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/CodeLabelExampleActivity.java b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/CodeLabelExampleActivity.java index db68509..2c8ee67 100644 --- a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/CodeLabelExampleActivity.java +++ b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/CodeLabelExampleActivity.java @@ -1,8 +1,8 @@ package net.cattaka.android.adaptertoolbox.example; import android.os.Bundle; -import android.support.design.widget.Snackbar; -import android.support.v7.app.AppCompatActivity; +import com.google.android.material.snackbar.Snackbar; +import androidx.appcompat.app.AppCompatActivity; import android.view.View; import android.widget.AdapterView; import android.widget.Spinner; diff --git a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/ComplexStringExampleActivity.java b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/ComplexStringExampleActivity.java index a24f84c..c755915 100644 --- a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/ComplexStringExampleActivity.java +++ b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/ComplexStringExampleActivity.java @@ -1,11 +1,11 @@ package net.cattaka.android.adaptertoolbox.example; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.design.widget.Snackbar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import com.google.android.material.snackbar.Snackbar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import net.cattaka.android.adaptertoolbox.adapter.ScrambleAdapter; @@ -85,7 +85,7 @@ protected void onCreate(Bundle savedInstanceState) { items.add("item " + i); } ComplexStringAdapter adapter = new ComplexStringAdapter(this, items, mListenerRelay); - mRecyclerView.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)); + mRecyclerView.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false)); mRecyclerView.setAdapter(adapter); } } diff --git a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/DataBindingManipulableListExampleActivity.java b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/DataBindingManipulableListExampleActivity.java index f9b8520..52057e7 100644 --- a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/DataBindingManipulableListExampleActivity.java +++ b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/DataBindingManipulableListExampleActivity.java @@ -1,9 +1,6 @@ package net.cattaka.android.adaptertoolbox.example; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; import net.cattaka.android.adaptertoolbox.adapter.ScrambleAdapter; import net.cattaka.android.adaptertoolbox.adapter.listener.ListenerRelay; @@ -17,6 +14,10 @@ import java.util.Collections; import java.util.List; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + /** * Created by cattaka on 16/05/15. */ @@ -55,7 +56,7 @@ protected void onCreate(Bundle savedInstanceState) { ); mMergeRecyclerAdapter.addAdapter(mItemAdapter); } - mRecyclerView.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)); + mRecyclerView.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false)); mRecyclerView.setAdapter(mMergeRecyclerAdapter); } } diff --git a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/DifferenceDividerExampleActivity.java b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/DifferenceDividerExampleActivity.java index 638e6b5..a7660f7 100644 --- a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/DifferenceDividerExampleActivity.java +++ b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/DifferenceDividerExampleActivity.java @@ -1,10 +1,6 @@ package net.cattaka.android.adaptertoolbox.example; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; import net.cattaka.android.adaptertoolbox.adapter.SingleViewAdapter2; import net.cattaka.android.adaptertoolbox.decoration.VerticalListDividerItemDecoration; @@ -17,6 +13,11 @@ import java.util.ArrayList; import java.util.List; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + /** * Created by cattaka on 16/12/11. */ @@ -66,7 +67,7 @@ protected void onCreate(Bundle savedInstanceState) { mMergeRecyclerAdapter.addAdapter(mNumbersAdapter); } { - mRecyclerView.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)); + mRecyclerView.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false)); mRecyclerView.setAdapter(mMergeRecyclerAdapter); } } diff --git a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/FizzBuzzExampleActivity.java b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/FizzBuzzExampleActivity.java index de105d2..c51b2bc 100644 --- a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/FizzBuzzExampleActivity.java +++ b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/FizzBuzzExampleActivity.java @@ -1,12 +1,12 @@ package net.cattaka.android.adaptertoolbox.example; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.design.widget.Snackbar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.StaggeredGridLayoutManager; +import androidx.annotation.NonNull; +import com.google.android.material.snackbar.Snackbar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.StaggeredGridLayoutManager; import android.view.View; import android.widget.CheckBox; import android.widget.CompoundButton; @@ -106,7 +106,7 @@ protected void onCreate(Bundle savedInstanceState) { mFizzViewHolderFactory, new IntegerViewHolderFactory() ); - mRecyclerView.setLayoutManager(new StaggeredGridLayoutManager(2, LinearLayoutManager.VERTICAL)); + mRecyclerView.setLayoutManager(new StaggeredGridLayoutManager(2, RecyclerView.VERTICAL)); mRecyclerView.setAdapter(mAdapter); } } diff --git a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/MainActivity.java b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/MainActivity.java index 45b0463..86df74b 100644 --- a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/MainActivity.java +++ b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/MainActivity.java @@ -2,10 +2,6 @@ import android.content.Intent; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; import android.view.View; import net.cattaka.android.adaptertoolbox.adapter.listener.ListenerRelay; @@ -15,6 +11,11 @@ import java.util.Arrays; import java.util.List; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + public class MainActivity extends AppCompatActivity { private static final List ACTIVITY_ENTRIES = Arrays.asList( new ActivityEntry(R.string.activity_entry_payload, null, @@ -85,6 +86,6 @@ protected void onCreate(Bundle savedInstanceState) { adapter.setListenerRelay(mListenerRelay); mRecyclerView.setAdapter(adapter); - mRecyclerView.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)); + mRecyclerView.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false)); } } diff --git a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/ManipulableListExampleActivity.java b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/ManipulableListExampleActivity.java index a86cc53..9e404eb 100644 --- a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/ManipulableListExampleActivity.java +++ b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/ManipulableListExampleActivity.java @@ -1,11 +1,6 @@ package net.cattaka.android.adaptertoolbox.example; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.design.widget.Snackbar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; import android.text.Editable; import android.view.KeyEvent; import android.view.View; @@ -14,6 +9,8 @@ import android.widget.SeekBar; import android.widget.TextView; +import com.google.android.material.snackbar.Snackbar; + import net.cattaka.android.adaptertoolbox.adapter.ScrambleAdapter; import net.cattaka.android.adaptertoolbox.adapter.listener.ListenerRelay; import net.cattaka.android.adaptertoolbox.example.adapter.SimpleStringAdapter; @@ -29,6 +26,11 @@ import java.util.Collections; import java.util.List; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + /** * Created by cattaka on 16/05/15. */ @@ -140,7 +142,7 @@ protected void onCreate(Bundle savedInstanceState) { ); mMergeRecyclerAdapter.addAdapter(mItemAdapter); } - mRecyclerView.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)); + mRecyclerView.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false)); mRecyclerView.setAdapter(mMergeRecyclerAdapter); } } diff --git a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/MultiAdapterExampleActivity.java b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/MultiAdapterExampleActivity.java index 0698485..1cbfbb0 100644 --- a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/MultiAdapterExampleActivity.java +++ b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/MultiAdapterExampleActivity.java @@ -1,15 +1,12 @@ package net.cattaka.android.adaptertoolbox.example; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.design.widget.Snackbar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; import android.view.View; import android.widget.CheckBox; import android.widget.CompoundButton; +import com.google.android.material.snackbar.Snackbar; + import net.cattaka.android.adaptertoolbox.adapter.ScrambleAdapter; import net.cattaka.android.adaptertoolbox.adapter.SingleViewAdapter2; import net.cattaka.android.adaptertoolbox.adapter.listener.ListenerRelay; @@ -21,6 +18,11 @@ import java.util.ArrayList; import java.util.List; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + /** * Created by cattaka on 16/05/02. */ @@ -166,7 +168,7 @@ protected void onCreate(Bundle savedInstanceState) { mMergeRecyclerAdapter.addAdapter(mNumbersAdapter); } { - mRecyclerView.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)); + mRecyclerView.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false)); mRecyclerView.setAdapter(mMergeRecyclerAdapter); } } diff --git a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/MultiChoosableTreeItemAdapterExampleActivity.java b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/MultiChoosableTreeItemAdapterExampleActivity.java index 89d736a..9eff7a1 100644 --- a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/MultiChoosableTreeItemAdapterExampleActivity.java +++ b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/MultiChoosableTreeItemAdapterExampleActivity.java @@ -1,10 +1,10 @@ package net.cattaka.android.adaptertoolbox.example; import android.os.Bundle; -import android.support.design.widget.Snackbar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import com.google.android.material.snackbar.Snackbar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import net.cattaka.android.adaptertoolbox.adapter.AbsChoosableTreeItemAdapter; @@ -41,7 +41,7 @@ protected void onCreate(Bundle savedInstanceState) { List items = ExampleDataGenerator.generateMyTreeItem(Arrays.asList(5, 3, 2), 0); mAdapter = new ChoosableMyTreeItemAdapter(this, items); mAdapter.setChoiceMode(AbsChoosableTreeItemAdapter.CHOICE_MODE_MULTIPLE); - mRecyclerView.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)); + mRecyclerView.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false)); mRecyclerView.setAdapter(mAdapter); } } diff --git a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/NestedScrambleAdapterExampleActivity.java b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/NestedScrambleAdapterExampleActivity.java index a2d2e14..25eb0f4 100644 --- a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/NestedScrambleAdapterExampleActivity.java +++ b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/NestedScrambleAdapterExampleActivity.java @@ -1,11 +1,11 @@ package net.cattaka.android.adaptertoolbox.example; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.design.widget.Snackbar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import com.google.android.material.snackbar.Snackbar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import net.cattaka.android.adaptertoolbox.adapter.ScrambleAdapter; @@ -79,7 +79,7 @@ protected void onCreate(Bundle savedInstanceState) { mListenerRelay, new NestedScrambleInfoViewHolderFactory() ); - mRecyclerView.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)); + mRecyclerView.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false)); mRecyclerView.setAdapter(mAdapter); } } diff --git a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/RecyclerViewHeaderExampleActivity.java b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/RecyclerViewHeaderExampleActivity.java index 69de62e..f2d10d5 100644 --- a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/RecyclerViewHeaderExampleActivity.java +++ b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/RecyclerViewHeaderExampleActivity.java @@ -1,11 +1,11 @@ package net.cattaka.android.adaptertoolbox.example; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.design.widget.Snackbar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import com.google.android.material.snackbar.Snackbar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import net.cattaka.android.adaptertoolbox.adapter.ScrambleAdapter; @@ -115,7 +115,7 @@ protected void onCreate(Bundle savedInstanceState) { mMergeRecyclerAdapter.addAdapter(mFooterAdapter); } { - mRecyclerView.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)); + mRecyclerView.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false)); mRecyclerView.setAdapter(mMergeRecyclerAdapter); } } diff --git a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/ScrambleAdapterExampleActivity.java b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/ScrambleAdapterExampleActivity.java index 3a62af9..d258e34 100644 --- a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/ScrambleAdapterExampleActivity.java +++ b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/ScrambleAdapterExampleActivity.java @@ -1,11 +1,11 @@ package net.cattaka.android.adaptertoolbox.example; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.design.widget.Snackbar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import com.google.android.material.snackbar.Snackbar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import net.cattaka.android.adaptertoolbox.adapter.ScrambleAdapter; @@ -106,7 +106,7 @@ protected void onCreate(Bundle savedInstanceState) { new SimpleNumberViewHolderFactory(), new CodeLableViewHolderFactory(getResources()) ); - mRecyclerView.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)); + mRecyclerView.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false)); mRecyclerView.setAdapter(adapter); } } diff --git a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/SimpleStringExampleActivity.java b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/SimpleStringExampleActivity.java index f3187d8..90f44a5 100644 --- a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/SimpleStringExampleActivity.java +++ b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/SimpleStringExampleActivity.java @@ -1,11 +1,11 @@ package net.cattaka.android.adaptertoolbox.example; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.design.widget.Snackbar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import com.google.android.material.snackbar.Snackbar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import net.cattaka.android.adaptertoolbox.adapter.ScrambleAdapter; @@ -58,7 +58,7 @@ protected void onCreate(Bundle savedInstanceState) { items.add("item " + i); } SimpleStringAdapter adapter = new SimpleStringAdapter(this, items, mListenerRelay); - mRecyclerView.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)); + mRecyclerView.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false)); mRecyclerView.setAdapter(adapter); } } diff --git a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/SingleChoosableTreeItemAdapterExampleActivity.java b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/SingleChoosableTreeItemAdapterExampleActivity.java index c010c35..069dbda 100644 --- a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/SingleChoosableTreeItemAdapterExampleActivity.java +++ b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/SingleChoosableTreeItemAdapterExampleActivity.java @@ -1,12 +1,10 @@ package net.cattaka.android.adaptertoolbox.example; import android.os.Bundle; -import android.support.design.widget.Snackbar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; import android.view.View; +import com.google.android.material.snackbar.Snackbar; + import net.cattaka.android.adaptertoolbox.adapter.AbsChoosableTreeItemAdapter; import net.cattaka.android.adaptertoolbox.example.adapter.ChoosableMyTreeItemAdapter; import net.cattaka.android.adaptertoolbox.example.data.MyTreeItem; @@ -16,6 +14,10 @@ import java.util.Arrays; import java.util.List; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + /** * Created by cattaka on 16/05/21. */ @@ -40,7 +42,7 @@ protected void onCreate(Bundle savedInstanceState) { List items = ExampleDataGenerator.generateMyTreeItem(Arrays.asList(5, 3, 2), 0); mAdapter = new ChoosableMyTreeItemAdapter(this, items); mAdapter.setChoiceMode(AbsChoosableTreeItemAdapter.CHOICE_MODE_SINGLE); - mRecyclerView.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)); + mRecyclerView.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false)); mRecyclerView.setAdapter(mAdapter); } } diff --git a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/SpinnerScrambleAdapterExampleActivity.java b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/SpinnerScrambleAdapterExampleActivity.java index be43850..519bf8f 100644 --- a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/SpinnerScrambleAdapterExampleActivity.java +++ b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/SpinnerScrambleAdapterExampleActivity.java @@ -1,8 +1,8 @@ package net.cattaka.android.adaptertoolbox.example; import android.os.Bundle; -import android.support.design.widget.Snackbar; -import android.support.v7.app.AppCompatActivity; +import com.google.android.material.snackbar.Snackbar; +import androidx.appcompat.app.AppCompatActivity; import android.view.View; import android.widget.AdapterView; import android.widget.Spinner; diff --git a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/SpinnerTreeItemAdapterExampleActivity.java b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/SpinnerTreeItemAdapterExampleActivity.java index 9013ed6..bcb5ca5 100644 --- a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/SpinnerTreeItemAdapterExampleActivity.java +++ b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/SpinnerTreeItemAdapterExampleActivity.java @@ -1,10 +1,10 @@ package net.cattaka.android.adaptertoolbox.example; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.design.widget.Snackbar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import com.google.android.material.snackbar.Snackbar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.view.ViewGroup; import android.widget.AdapterView; diff --git a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/StringWithPayloadExampleActivity.java b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/StringWithPayloadExampleActivity.java index ad67611..f6d208a 100644 --- a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/StringWithPayloadExampleActivity.java +++ b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/StringWithPayloadExampleActivity.java @@ -1,10 +1,10 @@ package net.cattaka.android.adaptertoolbox.example; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import net.cattaka.android.adaptertoolbox.adapter.ScrambleAdapter; @@ -51,7 +51,7 @@ protected void onCreate(Bundle savedInstanceState) { items.add("item " + i); } mAdapter = new ScrambleAdapter(this, items, mListenerRelay, new StringWithPayloadViewHolderFactory()); - mRecyclerView.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)); + mRecyclerView.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false)); mRecyclerView.setItemAnimator(new FlashColorItemAnimator()); mRecyclerView.setAdapter(mAdapter); } diff --git a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/TreeItemAdapterExampleActivity.java b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/TreeItemAdapterExampleActivity.java index 7516105..e802238 100644 --- a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/TreeItemAdapterExampleActivity.java +++ b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/TreeItemAdapterExampleActivity.java @@ -1,11 +1,11 @@ package net.cattaka.android.adaptertoolbox.example; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.design.widget.Snackbar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import com.google.android.material.snackbar.Snackbar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import net.cattaka.android.adaptertoolbox.adapter.listener.ListenerRelay; @@ -57,7 +57,7 @@ protected void onCreate(Bundle savedInstanceState) { List items = ExampleDataGenerator.generateMyTreeItem(Arrays.asList(5, 3, 2), 0); MyTreeItemAdapter adapter = new MyTreeItemAdapter(this, items); adapter.setListenerRelay(mListenerRelay); - mRecyclerView.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)); + mRecyclerView.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false)); mRecyclerView.setAdapter(adapter); } } diff --git a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/VerticalListDividerExampleActivity.java b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/VerticalListDividerExampleActivity.java index a16de87..81b38bf 100644 --- a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/VerticalListDividerExampleActivity.java +++ b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/VerticalListDividerExampleActivity.java @@ -1,9 +1,9 @@ package net.cattaka.android.adaptertoolbox.example; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import net.cattaka.android.adaptertoolbox.decoration.VerticalListDividerItemDecoration; import net.cattaka.android.adaptertoolbox.example.adapter.SimpleStringAdapter; @@ -32,7 +32,7 @@ protected void onCreate(Bundle savedInstanceState) { items.add("item " + i); } SimpleStringAdapter adapter = new SimpleStringAdapter(this, items, null); - mRecyclerView.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)); + mRecyclerView.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false)); mRecyclerView.setAdapter(adapter); mRecyclerView.addItemDecoration(new VerticalListDividerItemDecoration(this, false, R.drawable.vertical_list_divider_rgb)); } diff --git a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/ActivityEntryAdapter.java b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/ActivityEntryAdapter.java index c95b7ae..d81fcb7 100644 --- a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/ActivityEntryAdapter.java +++ b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/ActivityEntryAdapter.java @@ -1,9 +1,9 @@ package net.cattaka.android.adaptertoolbox.example.adapter; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.v4.widget.Space; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.legacy.widget.Space; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/ChoosableMyTreeItemAdapter.java b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/ChoosableMyTreeItemAdapter.java index d70c3f4..4670841 100644 --- a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/ChoosableMyTreeItemAdapter.java +++ b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/ChoosableMyTreeItemAdapter.java @@ -1,9 +1,9 @@ package net.cattaka.android.adaptertoolbox.example.adapter; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.v4.widget.Space; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.legacy.widget.Space; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/ComplexStringAdapter.java b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/ComplexStringAdapter.java index ce0293b..b5381c1 100644 --- a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/ComplexStringAdapter.java +++ b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/ComplexStringAdapter.java @@ -1,7 +1,7 @@ package net.cattaka.android.adaptertoolbox.example.adapter; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import net.cattaka.android.adaptertoolbox.adapter.ScrambleAdapter; import net.cattaka.android.adaptertoolbox.adapter.listener.ListenerRelay; diff --git a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/MyTreeItemAdapter.java b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/MyTreeItemAdapter.java index 9612c97..46e5fb5 100644 --- a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/MyTreeItemAdapter.java +++ b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/MyTreeItemAdapter.java @@ -1,9 +1,9 @@ package net.cattaka.android.adaptertoolbox.example.adapter; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.v4.widget.Space; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.legacy.widget.Space; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/SimpleNumberAdapter.java b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/SimpleNumberAdapter.java index 5dc1669..a6b3ff0 100644 --- a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/SimpleNumberAdapter.java +++ b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/SimpleNumberAdapter.java @@ -1,7 +1,7 @@ package net.cattaka.android.adaptertoolbox.example.adapter; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import net.cattaka.android.adaptertoolbox.adapter.ScrambleAdapter; import net.cattaka.android.adaptertoolbox.adapter.listener.ListenerRelay; diff --git a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/SimpleStringAdapter.java b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/SimpleStringAdapter.java index e1fded3..1ce0814 100644 --- a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/SimpleStringAdapter.java +++ b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/SimpleStringAdapter.java @@ -1,7 +1,7 @@ package net.cattaka.android.adaptertoolbox.example.adapter; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import net.cattaka.android.adaptertoolbox.adapter.ScrambleAdapter; import net.cattaka.android.adaptertoolbox.adapter.listener.ListenerRelay; diff --git a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/factory/BuzzViewHolderFactory.java b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/factory/BuzzViewHolderFactory.java index 35de1e4..1244a64 100644 --- a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/factory/BuzzViewHolderFactory.java +++ b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/factory/BuzzViewHolderFactory.java @@ -1,7 +1,7 @@ package net.cattaka.android.adaptertoolbox.example.adapter.factory; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/factory/CodeLableViewHolderFactory.java b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/factory/CodeLableViewHolderFactory.java index 93e647f..abbc533 100644 --- a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/factory/CodeLableViewHolderFactory.java +++ b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/factory/CodeLableViewHolderFactory.java @@ -1,8 +1,8 @@ package net.cattaka.android.adaptertoolbox.example.adapter.factory; import android.content.res.Resources; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/factory/ComplexStringViewHolderFactory.java b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/factory/ComplexStringViewHolderFactory.java index f671bb9..861dd34 100644 --- a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/factory/ComplexStringViewHolderFactory.java +++ b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/factory/ComplexStringViewHolderFactory.java @@ -1,7 +1,7 @@ package net.cattaka.android.adaptertoolbox.example.adapter.factory; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/factory/DataBindingMyInfoViewHolderFactory.java b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/factory/DataBindingMyInfoViewHolderFactory.java index 724692f..91dc707 100644 --- a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/factory/DataBindingMyInfoViewHolderFactory.java +++ b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/factory/DataBindingMyInfoViewHolderFactory.java @@ -1,9 +1,9 @@ package net.cattaka.android.adaptertoolbox.example.adapter.factory; -import android.databinding.DataBindingUtil; -import android.databinding.adapters.SeekBarBindingAdapter; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.databinding.DataBindingUtil; +import androidx.databinding.adapters.SeekBarBindingAdapter; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/factory/FizzBuzzViewHolderFactory.java b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/factory/FizzBuzzViewHolderFactory.java index 045dc5f..1f2c167 100644 --- a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/factory/FizzBuzzViewHolderFactory.java +++ b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/factory/FizzBuzzViewHolderFactory.java @@ -1,7 +1,7 @@ package net.cattaka.android.adaptertoolbox.example.adapter.factory; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/factory/FizzViewHolderFactory.java b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/factory/FizzViewHolderFactory.java index e243b81..4951159 100644 --- a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/factory/FizzViewHolderFactory.java +++ b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/factory/FizzViewHolderFactory.java @@ -1,7 +1,7 @@ package net.cattaka.android.adaptertoolbox.example.adapter.factory; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/factory/IntegerViewHolderFactory.java b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/factory/IntegerViewHolderFactory.java index 45b267f..e1c70aa 100644 --- a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/factory/IntegerViewHolderFactory.java +++ b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/factory/IntegerViewHolderFactory.java @@ -1,7 +1,7 @@ package net.cattaka.android.adaptertoolbox.example.adapter.factory; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/factory/MyInfoViewHolderFactory.java b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/factory/MyInfoViewHolderFactory.java index 79f70ae..0dea5dc 100644 --- a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/factory/MyInfoViewHolderFactory.java +++ b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/factory/MyInfoViewHolderFactory.java @@ -1,7 +1,7 @@ package net.cattaka.android.adaptertoolbox.example.adapter.factory; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/factory/NestedScrambleInfoViewHolderFactory.java b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/factory/NestedScrambleInfoViewHolderFactory.java index 8ae5c0b..1bd18a9 100644 --- a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/factory/NestedScrambleInfoViewHolderFactory.java +++ b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/factory/NestedScrambleInfoViewHolderFactory.java @@ -1,8 +1,8 @@ package net.cattaka.android.adaptertoolbox.example.adapter.factory; -import android.support.annotation.NonNull; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/factory/SimpleNumberViewHolderFactory.java b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/factory/SimpleNumberViewHolderFactory.java index cfbbd39..45a5aad 100644 --- a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/factory/SimpleNumberViewHolderFactory.java +++ b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/factory/SimpleNumberViewHolderFactory.java @@ -1,7 +1,7 @@ package net.cattaka.android.adaptertoolbox.example.adapter.factory; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/factory/SimpleStringViewHolderFactory.java b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/factory/SimpleStringViewHolderFactory.java index ae682a9..8c32b52 100644 --- a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/factory/SimpleStringViewHolderFactory.java +++ b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/factory/SimpleStringViewHolderFactory.java @@ -1,7 +1,7 @@ package net.cattaka.android.adaptertoolbox.example.adapter.factory; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/factory/StringWithPayloadViewHolderFactory.java b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/factory/StringWithPayloadViewHolderFactory.java index 2930835..a18ef89 100644 --- a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/factory/StringWithPayloadViewHolderFactory.java +++ b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/factory/StringWithPayloadViewHolderFactory.java @@ -1,8 +1,8 @@ package net.cattaka.android.adaptertoolbox.example.adapter.factory; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/factory/TextInfoViewHolderFactory.java b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/factory/TextInfoViewHolderFactory.java index be4c25c..66c805d 100644 --- a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/factory/TextInfoViewHolderFactory.java +++ b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/adapter/factory/TextInfoViewHolderFactory.java @@ -1,7 +1,7 @@ package net.cattaka.android.adaptertoolbox.example.adapter.factory; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/data/ActivityEntry.java b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/data/ActivityEntry.java index 2802608..976d227 100644 --- a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/data/ActivityEntry.java +++ b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/data/ActivityEntry.java @@ -2,7 +2,7 @@ import android.app.Activity; import android.content.res.Resources; -import android.support.annotation.StringRes; +import androidx.annotation.StringRes; import net.cattaka.android.adaptertoolbox.data.ITreeItem; diff --git a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/data/NestedScrambleInfo.java b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/data/NestedScrambleInfo.java index c5ed2a3..74cd1a3 100644 --- a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/data/NestedScrambleInfo.java +++ b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/data/NestedScrambleInfo.java @@ -1,6 +1,6 @@ package net.cattaka.android.adaptertoolbox.example.data; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import net.cattaka.android.adaptertoolbox.adapter.ScrambleAdapter; import net.cattaka.android.adaptertoolbox.adapter.listener.ListenerRelay; diff --git a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/data/ObservableMyInfo.java b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/data/ObservableMyInfo.java index 3a87b37..dcf8288 100644 --- a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/data/ObservableMyInfo.java +++ b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/data/ObservableMyInfo.java @@ -1,7 +1,7 @@ package net.cattaka.android.adaptertoolbox.example.data; -import android.databinding.BaseObservable; -import android.databinding.Bindable; +import androidx.databinding.BaseObservable; +import androidx.databinding.Bindable; import net.cattaka.android.adaptertoolbox.example.BR; diff --git a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/data/OrdinalLabel.java b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/data/OrdinalLabel.java index 16cd049..e022ea7 100644 --- a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/data/OrdinalLabel.java +++ b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/data/OrdinalLabel.java @@ -1,7 +1,7 @@ package net.cattaka.android.adaptertoolbox.example.data; import android.content.res.Resources; -import android.support.annotation.StringRes; +import androidx.annotation.StringRes; import net.cattaka.android.adaptertoolbox.data.ICodeLabel; import net.cattaka.android.adaptertoolbox.example.R; diff --git a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/logic/SnackbarLogic.java b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/logic/SnackbarLogic.java index 6b98d22..a782df1 100644 --- a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/logic/SnackbarLogic.java +++ b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/logic/SnackbarLogic.java @@ -1,8 +1,8 @@ package net.cattaka.android.adaptertoolbox.example.logic; -import android.support.annotation.NonNull; -import android.support.annotation.StringRes; -import android.support.design.widget.Snackbar; +import androidx.annotation.NonNull; +import androidx.annotation.StringRes; +import com.google.android.material.snackbar.Snackbar; import android.view.View; /** diff --git a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/spinner/SpinnerMyTreeItemAdapter.java b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/spinner/SpinnerMyTreeItemAdapter.java index b044604..74b0bf6 100644 --- a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/spinner/SpinnerMyTreeItemAdapter.java +++ b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/spinner/SpinnerMyTreeItemAdapter.java @@ -2,9 +2,9 @@ import android.annotation.SuppressLint; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.v4.widget.Space; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.legacy.widget.Space; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/spinner/factory/SpinnerHeaderInfoViewHolderFactory.java b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/spinner/factory/SpinnerHeaderInfoViewHolderFactory.java index b00f516..71178cd 100644 --- a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/spinner/factory/SpinnerHeaderInfoViewHolderFactory.java +++ b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/spinner/factory/SpinnerHeaderInfoViewHolderFactory.java @@ -1,7 +1,7 @@ package net.cattaka.android.adaptertoolbox.example.spinner.factory; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/spinner/factory/SpinnerStringViewHolderFactory.java b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/spinner/factory/SpinnerStringViewHolderFactory.java index 52196dd..f045cb7 100644 --- a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/spinner/factory/SpinnerStringViewHolderFactory.java +++ b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/spinner/factory/SpinnerStringViewHolderFactory.java @@ -1,7 +1,7 @@ package net.cattaka.android.adaptertoolbox.example.spinner.factory; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/utils/FlashColorItemAnimator.java b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/utils/FlashColorItemAnimator.java index fcabd8a..2922ad0 100644 --- a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/utils/FlashColorItemAnimator.java +++ b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/utils/FlashColorItemAnimator.java @@ -4,9 +4,9 @@ import android.animation.ArgbEvaluator; import android.animation.ObjectAnimator; import android.graphics.Color; -import android.support.annotation.NonNull; -import android.support.v7.widget.DefaultItemAnimator; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.DefaultItemAnimator; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import net.cattaka.android.adaptertoolbox.example.R; diff --git a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/view/SpinnerEx.java b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/view/SpinnerEx.java index 86993e7..f0b91aa 100644 --- a/example/src/main/java/net/cattaka/android/adaptertoolbox/example/view/SpinnerEx.java +++ b/example/src/main/java/net/cattaka/android/adaptertoolbox/example/view/SpinnerEx.java @@ -2,7 +2,7 @@ import android.content.Context; import android.content.res.Resources; -import android.support.v7.widget.AppCompatSpinner; +import androidx.appcompat.widget.AppCompatSpinner; import android.util.AttributeSet; import net.cattaka.android.adaptertoolbox.utils.SpinnerUtils; diff --git a/example/src/main/res/layout/activity_classic_scramble_adapter_example.xml b/example/src/main/res/layout/activity_classic_scramble_adapter_example.xml index 006bd98..484341f 100644 --- a/example/src/main/res/layout/activity_classic_scramble_adapter_example.xml +++ b/example/src/main/res/layout/activity_classic_scramble_adapter_example.xml @@ -1,5 +1,5 @@ - - + diff --git a/example/src/main/res/layout/activity_difference_divider.xml b/example/src/main/res/layout/activity_difference_divider.xml index 54a35f7..ed059ae 100644 --- a/example/src/main/res/layout/activity_difference_divider.xml +++ b/example/src/main/res/layout/activity_difference_divider.xml @@ -10,7 +10,7 @@ android:paddingTop="@dimen/activity_vertical_margin" tools:context="net.cattaka.android.adaptertoolbox.example.DifferenceDividerExampleActivity"> - diff --git a/example/src/main/res/layout/activity_fizz_buzz_example.xml b/example/src/main/res/layout/activity_fizz_buzz_example.xml index df5d35f..6b3ea4a 100644 --- a/example/src/main/res/layout/activity_fizz_buzz_example.xml +++ b/example/src/main/res/layout/activity_fizz_buzz_example.xml @@ -1,5 +1,5 @@ - - - + diff --git a/example/src/main/res/layout/activity_main.xml b/example/src/main/res/layout/activity_main.xml index a937a33..6f63864 100644 --- a/example/src/main/res/layout/activity_main.xml +++ b/example/src/main/res/layout/activity_main.xml @@ -9,7 +9,7 @@ android:paddingTop="@dimen/activity_vertical_margin" tools:context="net.cattaka.android.adaptertoolbox.example.MainActivity"> - diff --git a/example/src/main/res/layout/activity_manipulable_list_example.xml b/example/src/main/res/layout/activity_manipulable_list_example.xml index ad50c2a..29267c4 100644 --- a/example/src/main/res/layout/activity_manipulable_list_example.xml +++ b/example/src/main/res/layout/activity_manipulable_list_example.xml @@ -10,7 +10,7 @@ android:paddingTop="@dimen/activity_vertical_margin" tools:context="net.cattaka.android.adaptertoolbox.example.CodeLabelExampleActivity"> - diff --git a/example/src/main/res/layout/activity_multi_adapter_example.xml b/example/src/main/res/layout/activity_multi_adapter_example.xml index 00435b4..6607e7c 100644 --- a/example/src/main/res/layout/activity_multi_adapter_example.xml +++ b/example/src/main/res/layout/activity_multi_adapter_example.xml @@ -32,7 +32,7 @@ android:text="Number items"/> - diff --git a/example/src/main/res/layout/activity_multi_choosable_tree_item_adapter.xml b/example/src/main/res/layout/activity_multi_choosable_tree_item_adapter.xml index 8c36d57..b5accfe 100644 --- a/example/src/main/res/layout/activity_multi_choosable_tree_item_adapter.xml +++ b/example/src/main/res/layout/activity_multi_choosable_tree_item_adapter.xml @@ -1,5 +1,5 @@ - - - + diff --git a/example/src/main/res/layout/activity_nested_scramble_adapter_example.xml b/example/src/main/res/layout/activity_nested_scramble_adapter_example.xml index 3864273..b35806e 100644 --- a/example/src/main/res/layout/activity_nested_scramble_adapter_example.xml +++ b/example/src/main/res/layout/activity_nested_scramble_adapter_example.xml @@ -1,5 +1,5 @@ - - - + diff --git a/example/src/main/res/layout/activity_recycler_view_header_example.xml b/example/src/main/res/layout/activity_recycler_view_header_example.xml index 3864273..b35806e 100644 --- a/example/src/main/res/layout/activity_recycler_view_header_example.xml +++ b/example/src/main/res/layout/activity_recycler_view_header_example.xml @@ -1,5 +1,5 @@ - - - + diff --git a/example/src/main/res/layout/activity_scramble_adapter_example.xml b/example/src/main/res/layout/activity_scramble_adapter_example.xml index 3864273..b35806e 100644 --- a/example/src/main/res/layout/activity_scramble_adapter_example.xml +++ b/example/src/main/res/layout/activity_scramble_adapter_example.xml @@ -1,5 +1,5 @@ - - - + diff --git a/example/src/main/res/layout/activity_simple_string_example.xml b/example/src/main/res/layout/activity_simple_string_example.xml index 3864273..b35806e 100644 --- a/example/src/main/res/layout/activity_simple_string_example.xml +++ b/example/src/main/res/layout/activity_simple_string_example.xml @@ -1,5 +1,5 @@ - - - + diff --git a/example/src/main/res/layout/activity_single_choosable_tree_item_adapter.xml b/example/src/main/res/layout/activity_single_choosable_tree_item_adapter.xml index 8c36d57..b5accfe 100644 --- a/example/src/main/res/layout/activity_single_choosable_tree_item_adapter.xml +++ b/example/src/main/res/layout/activity_single_choosable_tree_item_adapter.xml @@ -1,5 +1,5 @@ - - - + diff --git a/example/src/main/res/layout/activity_string_with_payload_example.xml b/example/src/main/res/layout/activity_string_with_payload_example.xml index 842a5eb..7c567a0 100644 --- a/example/src/main/res/layout/activity_string_with_payload_example.xml +++ b/example/src/main/res/layout/activity_string_with_payload_example.xml @@ -1,5 +1,5 @@ - - - + diff --git a/example/src/main/res/layout/activity_tree_item_adapter.xml b/example/src/main/res/layout/activity_tree_item_adapter.xml index 3864273..b35806e 100644 --- a/example/src/main/res/layout/activity_tree_item_adapter.xml +++ b/example/src/main/res/layout/activity_tree_item_adapter.xml @@ -1,5 +1,5 @@ - - - + diff --git a/example/src/main/res/layout/activity_vertical_divider_example.xml b/example/src/main/res/layout/activity_vertical_divider_example.xml index b810c3d..8bfcb2e 100644 --- a/example/src/main/res/layout/activity_vertical_divider_example.xml +++ b/example/src/main/res/layout/activity_vertical_divider_example.xml @@ -1,5 +1,5 @@ - - - + diff --git a/example/src/main/res/layout/item_activity_entry.xml b/example/src/main/res/layout/item_activity_entry.xml index 1b65d5c..421d2f6 100644 --- a/example/src/main/res/layout/item_activity_entry.xml +++ b/example/src/main/res/layout/item_activity_entry.xml @@ -5,12 +5,12 @@ android:layout_height="wrap_content" android:orientation="horizontal"> - - @@ -38,5 +38,5 @@ android:button="@drawable/btn_open_close" android:padding="@dimen/element_spacing_normal"/> - + diff --git a/example/src/main/res/layout/item_buzz.xml b/example/src/main/res/layout/item_buzz.xml index d42ed94..4e44e77 100644 --- a/example/src/main/res/layout/item_buzz.xml +++ b/example/src/main/res/layout/item_buzz.xml @@ -1,5 +1,5 @@ - @@ -21,4 +21,4 @@ /> - \ No newline at end of file + \ No newline at end of file diff --git a/example/src/main/res/layout/item_choosable_my_tree_item.xml b/example/src/main/res/layout/item_choosable_my_tree_item.xml index b7e3619..2ef40b8 100644 --- a/example/src/main/res/layout/item_choosable_my_tree_item.xml +++ b/example/src/main/res/layout/item_choosable_my_tree_item.xml @@ -5,12 +5,12 @@ android:layout_height="wrap_content" android:orientation="horizontal"> - - @@ -44,5 +44,5 @@ android:button="@drawable/btn_open_close" android:padding="@dimen/element_spacing_normal"/> - + diff --git a/example/src/main/res/layout/item_code_label.xml b/example/src/main/res/layout/item_code_label.xml index 7cbbc40..3f73974 100644 --- a/example/src/main/res/layout/item_code_label.xml +++ b/example/src/main/res/layout/item_code_label.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/example/src/main/res/layout/item_complex_string.xml b/example/src/main/res/layout/item_complex_string.xml index 66b291b..71cacfb 100644 --- a/example/src/main/res/layout/item_complex_string.xml +++ b/example/src/main/res/layout/item_complex_string.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/example/src/main/res/layout/item_data_binding_my_info.xml b/example/src/main/res/layout/item_data_binding_my_info.xml index a03d216..b41d0b6 100644 --- a/example/src/main/res/layout/item_data_binding_my_info.xml +++ b/example/src/main/res/layout/item_data_binding_my_info.xml @@ -14,7 +14,7 @@ type="net.cattaka.android.adaptertoolbox.example.adapter.factory.DataBindingMyInfoViewHolderFactory.ViewHolder"/> - @@ -88,5 +88,5 @@ - + diff --git a/example/src/main/res/layout/item_fizz.xml b/example/src/main/res/layout/item_fizz.xml index bd3cbee..df20d4e 100644 --- a/example/src/main/res/layout/item_fizz.xml +++ b/example/src/main/res/layout/item_fizz.xml @@ -1,5 +1,5 @@ - @@ -21,4 +21,4 @@ /> - \ No newline at end of file + \ No newline at end of file diff --git a/example/src/main/res/layout/item_fizz_buzz.xml b/example/src/main/res/layout/item_fizz_buzz.xml index 3e22c1c..e7e4cbe 100644 --- a/example/src/main/res/layout/item_fizz_buzz.xml +++ b/example/src/main/res/layout/item_fizz_buzz.xml @@ -1,5 +1,5 @@ - @@ -20,4 +20,4 @@ android:textAppearance="?android:attr/textAppearanceLarge"/> - \ No newline at end of file + \ No newline at end of file diff --git a/example/src/main/res/layout/item_integer.xml b/example/src/main/res/layout/item_integer.xml index ae73533..e33f5c4 100644 --- a/example/src/main/res/layout/item_integer.xml +++ b/example/src/main/res/layout/item_integer.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/example/src/main/res/layout/item_my_info.xml b/example/src/main/res/layout/item_my_info.xml index 02e125a..694f7c0 100644 --- a/example/src/main/res/layout/item_my_info.xml +++ b/example/src/main/res/layout/item_my_info.xml @@ -1,5 +1,5 @@ - @@ -67,4 +67,4 @@ - + diff --git a/example/src/main/res/layout/item_my_tree_item.xml b/example/src/main/res/layout/item_my_tree_item.xml index 1b65d5c..421d2f6 100644 --- a/example/src/main/res/layout/item_my_tree_item.xml +++ b/example/src/main/res/layout/item_my_tree_item.xml @@ -5,12 +5,12 @@ android:layout_height="wrap_content" android:orientation="horizontal"> - - @@ -38,5 +38,5 @@ android:button="@drawable/btn_open_close" android:padding="@dimen/element_spacing_normal"/> - + diff --git a/example/src/main/res/layout/item_nested_scramble.xml b/example/src/main/res/layout/item_nested_scramble.xml index 346fd2f..34e5b3a 100644 --- a/example/src/main/res/layout/item_nested_scramble.xml +++ b/example/src/main/res/layout/item_nested_scramble.xml @@ -4,7 +4,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - diff --git a/example/src/main/res/layout/item_simple_number.xml b/example/src/main/res/layout/item_simple_number.xml index 03d2ad6..8c4c3ef 100644 --- a/example/src/main/res/layout/item_simple_number.xml +++ b/example/src/main/res/layout/item_simple_number.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/example/src/main/res/layout/item_simple_string.xml b/example/src/main/res/layout/item_simple_string.xml index ae0432f..fffa95a 100644 --- a/example/src/main/res/layout/item_simple_string.xml +++ b/example/src/main/res/layout/item_simple_string.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/example/src/main/res/layout/item_spinner_header.xml b/example/src/main/res/layout/item_spinner_header.xml index 1d69df9..a21007d 100644 --- a/example/src/main/res/layout/item_spinner_header.xml +++ b/example/src/main/res/layout/item_spinner_header.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/example/src/main/res/layout/item_spinner_my_tree_item.xml b/example/src/main/res/layout/item_spinner_my_tree_item.xml index 1b65d5c..421d2f6 100644 --- a/example/src/main/res/layout/item_spinner_my_tree_item.xml +++ b/example/src/main/res/layout/item_spinner_my_tree_item.xml @@ -5,12 +5,12 @@ android:layout_height="wrap_content" android:orientation="horizontal"> - - @@ -38,5 +38,5 @@ android:button="@drawable/btn_open_close" android:padding="@dimen/element_spacing_normal"/> - + diff --git a/example/src/main/res/layout/item_spinner_string.xml b/example/src/main/res/layout/item_spinner_string.xml index ae0432f..fffa95a 100644 --- a/example/src/main/res/layout/item_spinner_string.xml +++ b/example/src/main/res/layout/item_spinner_string.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/example/src/main/res/layout/item_string_with_payload.xml b/example/src/main/res/layout/item_string_with_payload.xml index 4746b93..1c2f7e8 100644 --- a/example/src/main/res/layout/item_string_with_payload.xml +++ b/example/src/main/res/layout/item_string_with_payload.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - @@ -82,6 +82,6 @@ android:text="@string/button_blue" /> - + \ No newline at end of file diff --git a/example/src/main/res/layout/item_text_info.xml b/example/src/main/res/layout/item_text_info.xml index 8272e9b..20f44f2 100644 --- a/example/src/main/res/layout/item_text_info.xml +++ b/example/src/main/res/layout/item_text_info.xml @@ -1,10 +1,10 @@ - - @@ -37,6 +37,6 @@ android:layout_height="wrap_content" android:text="GO"/> - + - + diff --git a/gradle.properties b/gradle.properties index 1d3591c..915f0e6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,4 +15,6 @@ # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true \ No newline at end of file +# org.gradle.parallel=true +android.enableJetifier=true +android.useAndroidX=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a7e1543..68300ca 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri May 19 21:13:05 JST 2017 +#Sat Aug 25 00:00:50 JST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip