diff --git a/.travis.yml b/.travis.yml index 841930852..66f378c9b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,12 +3,12 @@ android: components: - tools - platform-tools - - build-tools-28.0.0 + - build-tools-28.0.2 - android-28 - sys-img-armeabi-v7a-android-18 before_install: - yes | sdkmanager "platforms;android-28" - - yes | sdkmanager "build-tools;28.0.0" + - yes | sdkmanager "build-tools;28.0.2" jdk: - oraclejdk8 script: diff --git a/README.md b/README.md index 7764e81dd..9ae29c0a3 100644 --- a/README.md +++ b/README.md @@ -41,33 +41,35 @@ You can try it out here [Google Play](https://play.google.com/store/apps/details The library is split up into core, commons, and extensions. The core functions are included in the following dependency. ```gradle -implementation 'com.mikepenz:fastadapter:3.2.8' -implementation 'com.android.support:appcompat-v7:${latestSupportLib}' -implementation 'com.android.support:recyclerview-v7:${latestSupportLib}' +implementation 'com.mikepenz:fastadapter:3.3.0-rc01' +implementation "androidx.appcompat:appcompat:${androidX}" +implementation "androidx.recyclerview:recyclerview:${androidX}" ``` The commons package comes with some useful helpers (which are not needed in all cases) This one for example includes the `FastItemAdapter` ```gradle -implementation 'com.mikepenz:fastadapter-commons:3.2.8' +implementation 'com.mikepenz:fastadapter-commons:3.3.0-rc01' ``` Expandable support is included and can be added via this ```gradle -implementation 'com.mikepenz:fastadapter-extensions-expandable:3.2.8' +implementation 'com.mikepenz:fastadapter-extensions-expandable:3.3.0-rc01' //The tiny Materialize library used for its useful helper classes -implementation 'com.mikepenz:materialize:${latestVersion}' +implementation 'com.mikepenz:materialize:${latestVersion}' // at least 1.2.0-rc01 ``` Many helper classes are included in the following dependency. (This functionality also needs the `Expandable` extension ```gradle -implementation 'com.mikepenz:fastadapter-extensions:3.2.8' -implementation 'com.android.support:design:${versions.supportLib}' +implementation 'com.mikepenz:fastadapter-extensions:3.3.0-rc01' +implementation "com.google.android.material:material:${androidX}" //The tiny Materialize library used for its useful helper classes -implementation 'com.mikepenz:materialize:${latestVersion}' +implementation 'com.mikepenz:materialize:${latestVersion}' // at least 1.2.0-rc01 ``` -## v3.0.x +## v3.3.x +> Upgrades to use androidX dependencies. Use a version smaller than 3.3.x to use with appCompat dependencies. +## v3.x.x > v3 is a huge new release and comes with a big set of new changes. If you previously used the `FastAdapter` and head over to the [MIGRATION GUIDE](https://github.com/mikepenz/FastAdapter/blob/develop/MIGRATION.md) on how to get started with v3. > In case you are searching [v2.x head over here to it here](https://github.com/mikepenz/FastAdapter/tree/v2.6.3). diff --git a/app/build.gradle b/app/build.gradle index d73d42916..dae3f39c9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,6 +16,8 @@ android { versionCode release.versionCode versionName release.versionName + multiDexEnabled true + setProperty("archivesBaseName", "FastAdapter-v$versionName-c$versionCode") } buildTypes { @@ -42,27 +44,32 @@ android { } dependencies { + implementation 'com.android.support:multidex:1.0.3' + implementation project(':library-core') implementation project(':library') implementation project(':library-extensions') implementation project(':library-extensions-expandable') - implementation "com.android.support:appcompat-v7:${versions.supportLib}" - implementation "com.android.support:recyclerview-v7:${versions.supportLib}" - implementation "com.android.support:cardview-v7:${versions.supportLib}" - implementation "com.android.support:design:${versions.supportLib}" + implementation "androidx.appcompat:appcompat:${versions.androidX}" + implementation "androidx.recyclerview:recyclerview:${versions.androidX}" + implementation "androidx.cardview:cardview:${versions.androidX}" + implementation "com.google.android.material:material:${versions.androidX}" + + // view binding lib? + implementation 'com.android.support:support-annotations:27.1.1' // used to base on some backwards compatible themes // contains util classes to support various android versions, and clean up code // comes with the awesome "Holder"-Pattern // https://github.com/mikepenz/Materialize - implementation 'com.mikepenz:materialize:1.1.2@aar' + implementation 'com.mikepenz:materialize:1.2.0-rc01' // used to provide out of the box icon font support. simplifies development, // and provides scalable icons. the core is very very light // https://github.com/mikepenz/Android-Iconics - implementation 'com.mikepenz:iconics-core:3.0.4@aar' - implementation "com.mikepenz:iconics-views:3.0.4@aar" + implementation 'com.mikepenz:iconics-core:3.1.0-rc01' + implementation "com.mikepenz:iconics-views:3.1.0-rc01" //used to generate the drawer on the left //https://github.com/mikepenz/MaterialDrawer @@ -72,7 +79,7 @@ dependencies { } //used to provide different itemAnimators for the RecyclerView //https://github.com/mikepenz/ItemAnimators - implementation 'com.mikepenz:itemanimators:1.0.2@aar' + implementation 'com.mikepenz:itemanimators:1.1.0-rc01' //used to generate the Open Source section //https://github.com/mikepenz/AboutLibraries implementation('com.mikepenz:aboutlibraries:6.0.9@aar') { @@ -90,15 +97,15 @@ dependencies { //https://github.com/timehop/sticky-headers-recyclerview //original dependency: implementation 'com.timehop.stickyheadersrecyclerview:library:0.4.3@aar' //customized version to allow minimal header animation - implementation 'com.mikepenz.thirdparty:stickyheadersrecyclerview:0.4.4-SNAPSHOT@aar' + implementation 'com.mikepenz.thirdparty:stickyheadersrecyclerview:0.5.1-SNAPSHOT@aar' //Used to provide the FastScrollBar //https://github.com/krimin-killr21/MaterialScrollBar implementation 'com.turingtechnologies.materialscrollbar:lib:10.0.1' //https://github.com/JakeWharton/butterknife - implementation 'com.jakewharton:butterknife:8.8.1' - annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1' + implementation 'com.jakewharton:butterknife:9.0.0-SNAPSHOT' + annotationProcessor 'com.jakewharton:butterknife-compiler:9.0.0-SNAPSHOT' //used to load the images in the ImageListSample //https://github.com/bumptech/glide @@ -118,14 +125,13 @@ dependencies { implementation 'io.reactivex.rxjava2:rxjava:2.1.9' configurations.all { - resolutionStrategy.force "com.mikepenz:materialize:1.1.2" - resolutionStrategy.force "com.mikepenz:iconics-core:3.0.4" + resolutionStrategy.force "com.mikepenz:materialize:1.2.0-rc01" + resolutionStrategy.force "com.mikepenz:iconics-core:3.1.0-rc01" resolutionStrategy.force "com.mikepenz:aboutlibraries:6.0.9" - resolutionStrategy.force "com.android.support:support-v4:${versions.supportLib}" - resolutionStrategy.force "com.android.support:appcompat-v7:${versions.supportLib}" - resolutionStrategy.force "com.android.support:recyclerview-v7:${versions.supportLib}" - resolutionStrategy.force "com.android.support:cardview-v7:${versions.supportLib}" - resolutionStrategy.force "com.android.support:design:${versions.supportLib}" + resolutionStrategy.force "androidx.appcompat:appcompat:${versions.androidX}" + resolutionStrategy.force "androidx.recyclerview:recyclerview:${versions.androidX}" + resolutionStrategy.force "androidx.cardview:cardview:${versions.androidX}" + resolutionStrategy.force "com.google.android.material:material:${versions.androidX}" } } diff --git a/app/src/main/java/com/mikepenz/fastadapter/app/AdvancedSampleActivity.java b/app/src/main/java/com/mikepenz/fastadapter/app/AdvancedSampleActivity.java index 4d3d502f3..9a17589c2 100755 --- a/app/src/main/java/com/mikepenz/fastadapter/app/AdvancedSampleActivity.java +++ b/app/src/main/java/com/mikepenz/fastadapter/app/AdvancedSampleActivity.java @@ -1,14 +1,14 @@ package com.mikepenz.fastadapter.app; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.view.LayoutInflaterCompat; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.view.ActionMode; -import android.support.v7.widget.DefaultItemAnimator; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; +import androidx.annotation.NonNull; +import androidx.core.view.LayoutInflaterCompat; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.view.ActionMode; +import androidx.recyclerview.widget.DefaultItemAnimator; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.Toolbar; import android.view.Menu; import android.view.MenuItem; import android.view.View; diff --git a/app/src/main/java/com/mikepenz/fastadapter/app/CheckBoxSampleActivity.java b/app/src/main/java/com/mikepenz/fastadapter/app/CheckBoxSampleActivity.java index 203c87ce2..5649db05c 100644 --- a/app/src/main/java/com/mikepenz/fastadapter/app/CheckBoxSampleActivity.java +++ b/app/src/main/java/com/mikepenz/fastadapter/app/CheckBoxSampleActivity.java @@ -1,12 +1,12 @@ package com.mikepenz.fastadapter.app; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.DefaultItemAnimator; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.DefaultItemAnimator; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.Toolbar; import android.view.MenuItem; import android.view.View; import android.widget.Toast; diff --git a/app/src/main/java/com/mikepenz/fastadapter/app/CustomApplication.java b/app/src/main/java/com/mikepenz/fastadapter/app/CustomApplication.java index 879efb17d..2122c0b27 100644 --- a/app/src/main/java/com/mikepenz/fastadapter/app/CustomApplication.java +++ b/app/src/main/java/com/mikepenz/fastadapter/app/CustomApplication.java @@ -1,7 +1,6 @@ package com.mikepenz.fastadapter.app; -import android.app.Application; - +import androidx.multidex.MultiDexApplication; import io.realm.Realm; import io.realm.RealmConfiguration; @@ -9,7 +8,7 @@ * Created by mikepenz on 04.07.16. */ -public class CustomApplication extends Application { +public class CustomApplication extends MultiDexApplication { @Override public void onCreate() { super.onCreate(); diff --git a/app/src/main/java/com/mikepenz/fastadapter/app/DiffUtilActivity.java b/app/src/main/java/com/mikepenz/fastadapter/app/DiffUtilActivity.java index 347c3b6e0..c14b6d3a8 100644 --- a/app/src/main/java/com/mikepenz/fastadapter/app/DiffUtilActivity.java +++ b/app/src/main/java/com/mikepenz/fastadapter/app/DiffUtilActivity.java @@ -2,12 +2,12 @@ import android.graphics.Color; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.util.DiffUtil; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.DiffUtil; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.Toolbar; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; diff --git a/app/src/main/java/com/mikepenz/fastadapter/app/EndlessScrollListActivity.java b/app/src/main/java/com/mikepenz/fastadapter/app/EndlessScrollListActivity.java index 6b201e10f..a6f6e09cd 100755 --- a/app/src/main/java/com/mikepenz/fastadapter/app/EndlessScrollListActivity.java +++ b/app/src/main/java/com/mikepenz/fastadapter/app/EndlessScrollListActivity.java @@ -3,15 +3,15 @@ import android.graphics.Color; import android.os.Bundle; import android.os.Handler; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.DefaultItemAnimator; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.SearchView; -import android.support.v7.widget.Toolbar; -import android.support.v7.widget.helper.ItemTouchHelper; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.DefaultItemAnimator; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.SearchView; +import androidx.appcompat.widget.Toolbar; +import androidx.recyclerview.widget.ItemTouchHelper; import android.text.TextUtils; import android.view.Menu; import android.view.MenuInflater; diff --git a/app/src/main/java/com/mikepenz/fastadapter/app/ExpandableMultiselectDeleteSampleActivity.java b/app/src/main/java/com/mikepenz/fastadapter/app/ExpandableMultiselectDeleteSampleActivity.java index d1a5c3c2f..c215af2ca 100644 --- a/app/src/main/java/com/mikepenz/fastadapter/app/ExpandableMultiselectDeleteSampleActivity.java +++ b/app/src/main/java/com/mikepenz/fastadapter/app/ExpandableMultiselectDeleteSampleActivity.java @@ -1,13 +1,13 @@ package com.mikepenz.fastadapter.app; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.view.LayoutInflaterCompat; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.view.ActionMode; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; +import androidx.annotation.NonNull; +import androidx.core.view.LayoutInflaterCompat; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.view.ActionMode; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.Toolbar; import android.view.Menu; import android.view.MenuItem; import android.view.View; diff --git a/app/src/main/java/com/mikepenz/fastadapter/app/ExpandableSampleActivity.java b/app/src/main/java/com/mikepenz/fastadapter/app/ExpandableSampleActivity.java index b659403fc..5474b17fb 100755 --- a/app/src/main/java/com/mikepenz/fastadapter/app/ExpandableSampleActivity.java +++ b/app/src/main/java/com/mikepenz/fastadapter/app/ExpandableSampleActivity.java @@ -1,11 +1,11 @@ package com.mikepenz.fastadapter.app; import android.os.Bundle; -import android.support.v4.view.LayoutInflaterCompat; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; +import androidx.core.view.LayoutInflaterCompat; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.Toolbar; import android.view.MenuItem; import android.view.View; diff --git a/app/src/main/java/com/mikepenz/fastadapter/app/IconGridActivity.java b/app/src/main/java/com/mikepenz/fastadapter/app/IconGridActivity.java index cac8eac9b..ef9982c36 100755 --- a/app/src/main/java/com/mikepenz/fastadapter/app/IconGridActivity.java +++ b/app/src/main/java/com/mikepenz/fastadapter/app/IconGridActivity.java @@ -1,11 +1,11 @@ package com.mikepenz.fastadapter.app; import android.os.Bundle; -import android.support.v4.view.LayoutInflaterCompat; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; +import androidx.core.view.LayoutInflaterCompat; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.Toolbar; import android.view.MenuItem; import android.view.View; diff --git a/app/src/main/java/com/mikepenz/fastadapter/app/ImageListActivity.java b/app/src/main/java/com/mikepenz/fastadapter/app/ImageListActivity.java index 99b82fb99..fd98c6e6f 100755 --- a/app/src/main/java/com/mikepenz/fastadapter/app/ImageListActivity.java +++ b/app/src/main/java/com/mikepenz/fastadapter/app/ImageListActivity.java @@ -1,13 +1,13 @@ package com.mikepenz.fastadapter.app; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.DefaultItemAnimator; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.DefaultItemAnimator; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.Toolbar; import android.view.MenuItem; import android.view.View; import android.widget.Toast; diff --git a/app/src/main/java/com/mikepenz/fastadapter/app/ModelItemActivity.java b/app/src/main/java/com/mikepenz/fastadapter/app/ModelItemActivity.java index bcaa8ec16..560a35ff7 100755 --- a/app/src/main/java/com/mikepenz/fastadapter/app/ModelItemActivity.java +++ b/app/src/main/java/com/mikepenz/fastadapter/app/ModelItemActivity.java @@ -1,11 +1,11 @@ package com.mikepenz.fastadapter.app; import android.os.Bundle; -import android.support.v4.content.ContextCompat; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; +import androidx.core.content.ContextCompat; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.Toolbar; import android.view.MenuItem; import android.view.View; diff --git a/app/src/main/java/com/mikepenz/fastadapter/app/MopubAdsActivity.java b/app/src/main/java/com/mikepenz/fastadapter/app/MopubAdsActivity.java index 075748f0f..a222a425e 100644 --- a/app/src/main/java/com/mikepenz/fastadapter/app/MopubAdsActivity.java +++ b/app/src/main/java/com/mikepenz/fastadapter/app/MopubAdsActivity.java @@ -1,12 +1,12 @@ package com.mikepenz.fastadapter.app; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.Toolbar; import android.view.MenuItem; import android.view.View; import android.widget.Toast; diff --git a/app/src/main/java/com/mikepenz/fastadapter/app/MultiTypeModelItemActivity.java b/app/src/main/java/com/mikepenz/fastadapter/app/MultiTypeModelItemActivity.java index 5fc5b0c7e..0361c4f76 100755 --- a/app/src/main/java/com/mikepenz/fastadapter/app/MultiTypeModelItemActivity.java +++ b/app/src/main/java/com/mikepenz/fastadapter/app/MultiTypeModelItemActivity.java @@ -1,10 +1,10 @@ package com.mikepenz.fastadapter.app; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.Toolbar; import android.view.MenuItem; import android.view.View; diff --git a/app/src/main/java/com/mikepenz/fastadapter/app/MultiselectSampleActivity.java b/app/src/main/java/com/mikepenz/fastadapter/app/MultiselectSampleActivity.java index 318cd94f9..49af0b6e8 100755 --- a/app/src/main/java/com/mikepenz/fastadapter/app/MultiselectSampleActivity.java +++ b/app/src/main/java/com/mikepenz/fastadapter/app/MultiselectSampleActivity.java @@ -1,13 +1,13 @@ package com.mikepenz.fastadapter.app; 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.view.ActionMode; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; +import androidx.annotation.NonNull; +import com.google.android.material.snackbar.Snackbar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.view.ActionMode; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.Toolbar; import android.util.Log; import android.view.Menu; import android.view.MenuItem; diff --git a/app/src/main/java/com/mikepenz/fastadapter/app/RadioButtonSampleActivity.java b/app/src/main/java/com/mikepenz/fastadapter/app/RadioButtonSampleActivity.java index e1986190e..e26ef3338 100644 --- a/app/src/main/java/com/mikepenz/fastadapter/app/RadioButtonSampleActivity.java +++ b/app/src/main/java/com/mikepenz/fastadapter/app/RadioButtonSampleActivity.java @@ -1,12 +1,12 @@ package com.mikepenz.fastadapter.app; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.DefaultItemAnimator; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.DefaultItemAnimator; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.Toolbar; import android.view.MenuItem; import android.view.View; import android.widget.Toast; diff --git a/app/src/main/java/com/mikepenz/fastadapter/app/RealmActivity.java b/app/src/main/java/com/mikepenz/fastadapter/app/RealmActivity.java index 6099c3f17..9e3314323 100755 --- a/app/src/main/java/com/mikepenz/fastadapter/app/RealmActivity.java +++ b/app/src/main/java/com/mikepenz/fastadapter/app/RealmActivity.java @@ -2,11 +2,11 @@ import android.graphics.Color; 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.support.v7.widget.Toolbar; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.Toolbar; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; diff --git a/app/src/main/java/com/mikepenz/fastadapter/app/SampleActivity.java b/app/src/main/java/com/mikepenz/fastadapter/app/SampleActivity.java index 9f0d81645..1428bc976 100755 --- a/app/src/main/java/com/mikepenz/fastadapter/app/SampleActivity.java +++ b/app/src/main/java/com/mikepenz/fastadapter/app/SampleActivity.java @@ -4,11 +4,11 @@ import android.graphics.Color; import android.os.Bundle; import android.os.Handler; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.Toolbar; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; diff --git a/app/src/main/java/com/mikepenz/fastadapter/app/SimpleItemListActivity.java b/app/src/main/java/com/mikepenz/fastadapter/app/SimpleItemListActivity.java index 972e64bd6..258ca1d9e 100755 --- a/app/src/main/java/com/mikepenz/fastadapter/app/SimpleItemListActivity.java +++ b/app/src/main/java/com/mikepenz/fastadapter/app/SimpleItemListActivity.java @@ -3,15 +3,15 @@ import android.graphics.Color; import android.os.Build; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.DefaultItemAnimator; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.SearchView; -import android.support.v7.widget.Toolbar; -import android.support.v7.widget.helper.ItemTouchHelper; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.DefaultItemAnimator; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.SearchView; +import androidx.appcompat.widget.Toolbar; +import androidx.recyclerview.widget.ItemTouchHelper; import android.text.TextUtils; import android.view.Menu; import android.view.MenuInflater; diff --git a/app/src/main/java/com/mikepenz/fastadapter/app/SortActivity.java b/app/src/main/java/com/mikepenz/fastadapter/app/SortActivity.java index df051763f..ffba9b5e1 100644 --- a/app/src/main/java/com/mikepenz/fastadapter/app/SortActivity.java +++ b/app/src/main/java/com/mikepenz/fastadapter/app/SortActivity.java @@ -2,15 +2,15 @@ import android.graphics.Color; import android.os.Bundle; -import android.support.annotation.IntDef; -import android.support.annotation.IntRange; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.DefaultItemAnimator; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; +import androidx.annotation.IntDef; +import androidx.annotation.IntRange; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.DefaultItemAnimator; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.Toolbar; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; diff --git a/app/src/main/java/com/mikepenz/fastadapter/app/StickyHeaderMopubAdsActivity.java b/app/src/main/java/com/mikepenz/fastadapter/app/StickyHeaderMopubAdsActivity.java index 7327fc176..45574557a 100644 --- a/app/src/main/java/com/mikepenz/fastadapter/app/StickyHeaderMopubAdsActivity.java +++ b/app/src/main/java/com/mikepenz/fastadapter/app/StickyHeaderMopubAdsActivity.java @@ -1,13 +1,13 @@ package com.mikepenz.fastadapter.app; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.DefaultItemAnimator; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.DefaultItemAnimator; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.Toolbar; import android.view.MenuItem; import android.view.View; import android.widget.Toast; diff --git a/app/src/main/java/com/mikepenz/fastadapter/app/StickyHeaderSampleActivity.java b/app/src/main/java/com/mikepenz/fastadapter/app/StickyHeaderSampleActivity.java index 3a7fe065c..47752846d 100755 --- a/app/src/main/java/com/mikepenz/fastadapter/app/StickyHeaderSampleActivity.java +++ b/app/src/main/java/com/mikepenz/fastadapter/app/StickyHeaderSampleActivity.java @@ -1,11 +1,11 @@ package com.mikepenz.fastadapter.app; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.DefaultItemAnimator; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.DefaultItemAnimator; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.Toolbar; import android.view.MenuItem; import android.view.View; diff --git a/app/src/main/java/com/mikepenz/fastadapter/app/SwipeListActivity.java b/app/src/main/java/com/mikepenz/fastadapter/app/SwipeListActivity.java index 351adff28..598228946 100644 --- a/app/src/main/java/com/mikepenz/fastadapter/app/SwipeListActivity.java +++ b/app/src/main/java/com/mikepenz/fastadapter/app/SwipeListActivity.java @@ -4,15 +4,15 @@ import android.graphics.drawable.Drawable; import android.os.Build; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.content.ContextCompat; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.DefaultItemAnimator; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.SearchView; -import android.support.v7.widget.Toolbar; -import android.support.v7.widget.helper.ItemTouchHelper; +import androidx.annotation.NonNull; +import androidx.core.content.ContextCompat; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.DefaultItemAnimator; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.SearchView; +import androidx.appcompat.widget.Toolbar; +import androidx.recyclerview.widget.ItemTouchHelper; import android.text.TextUtils; import android.view.Menu; import android.view.MenuInflater; diff --git a/app/src/main/java/com/mikepenz/fastadapter/app/adapters/FastScrollIndicatorAdapter.java b/app/src/main/java/com/mikepenz/fastadapter/app/adapters/FastScrollIndicatorAdapter.java index 3cab75493..0082b44a8 100644 --- a/app/src/main/java/com/mikepenz/fastadapter/app/adapters/FastScrollIndicatorAdapter.java +++ b/app/src/main/java/com/mikepenz/fastadapter/app/adapters/FastScrollIndicatorAdapter.java @@ -1,6 +1,6 @@ package com.mikepenz.fastadapter.app.adapters; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.ViewGroup; import com.mikepenz.fastadapter.FastAdapter; diff --git a/app/src/main/java/com/mikepenz/fastadapter/app/adapters/MopubFastItemAdapter.java b/app/src/main/java/com/mikepenz/fastadapter/app/adapters/MopubFastItemAdapter.java index 4f3143157..3d851b02a 100644 --- a/app/src/main/java/com/mikepenz/fastadapter/app/adapters/MopubFastItemAdapter.java +++ b/app/src/main/java/com/mikepenz/fastadapter/app/adapters/MopubFastItemAdapter.java @@ -1,7 +1,7 @@ package com.mikepenz.fastadapter.app.adapters; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import com.mikepenz.fastadapter.IItem; import com.mikepenz.fastadapter.commons.adapters.FastItemAdapter; diff --git a/app/src/main/java/com/mikepenz/fastadapter/app/adapters/StickyHeaderAdapter.java b/app/src/main/java/com/mikepenz/fastadapter/app/adapters/StickyHeaderAdapter.java index 9cfd79b1e..e6657c158 100644 --- a/app/src/main/java/com/mikepenz/fastadapter/app/adapters/StickyHeaderAdapter.java +++ b/app/src/main/java/com/mikepenz/fastadapter/app/adapters/StickyHeaderAdapter.java @@ -1,7 +1,7 @@ package com.mikepenz.fastadapter.app.adapters; import android.graphics.Color; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/mikepenz/fastadapter/app/helpers/CustomHeaderViewCache.java b/app/src/main/java/com/mikepenz/fastadapter/app/helpers/CustomHeaderViewCache.java index 7af75abab..248d4bd39 100644 --- a/app/src/main/java/com/mikepenz/fastadapter/app/helpers/CustomHeaderViewCache.java +++ b/app/src/main/java/com/mikepenz/fastadapter/app/helpers/CustomHeaderViewCache.java @@ -1,6 +1,6 @@ package com.mikepenz.fastadapter.app.helpers; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import com.mopub.nativeads.MoPubRecyclerAdapter; diff --git a/app/src/main/java/com/mikepenz/fastadapter/app/helpers/CustomStickyRecyclerHeadersDecoration.java b/app/src/main/java/com/mikepenz/fastadapter/app/helpers/CustomStickyRecyclerHeadersDecoration.java index d48bdc36c..b0aecc204 100644 --- a/app/src/main/java/com/mikepenz/fastadapter/app/helpers/CustomStickyRecyclerHeadersDecoration.java +++ b/app/src/main/java/com/mikepenz/fastadapter/app/helpers/CustomStickyRecyclerHeadersDecoration.java @@ -2,8 +2,8 @@ import android.graphics.Canvas; import android.graphics.Rect; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.util.SparseArray; import android.view.View; diff --git a/app/src/main/java/com/mikepenz/fastadapter/app/helpers/HeaderPositionCalculator.java b/app/src/main/java/com/mikepenz/fastadapter/app/helpers/HeaderPositionCalculator.java index 57e0a75d5..9de7abed4 100644 --- a/app/src/main/java/com/mikepenz/fastadapter/app/helpers/HeaderPositionCalculator.java +++ b/app/src/main/java/com/mikepenz/fastadapter/app/helpers/HeaderPositionCalculator.java @@ -1,8 +1,8 @@ package com.mikepenz.fastadapter.app.helpers; import android.graphics.Rect; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.view.ViewGroup; import android.widget.LinearLayout; diff --git a/app/src/main/java/com/mikepenz/fastadapter/app/items/CheckBoxSampleItem.java b/app/src/main/java/com/mikepenz/fastadapter/app/items/CheckBoxSampleItem.java index 24f5c7ca2..06c7ff5ad 100644 --- a/app/src/main/java/com/mikepenz/fastadapter/app/items/CheckBoxSampleItem.java +++ b/app/src/main/java/com/mikepenz/fastadapter/app/items/CheckBoxSampleItem.java @@ -1,8 +1,8 @@ package com.mikepenz.fastadapter.app.items; -import android.support.annotation.NonNull; -import android.support.annotation.StringRes; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.StringRes; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.CheckBox; import android.widget.TextView; diff --git a/app/src/main/java/com/mikepenz/fastadapter/app/items/HeaderSelectionItem.java b/app/src/main/java/com/mikepenz/fastadapter/app/items/HeaderSelectionItem.java index 3ddded0e8..dd9901c0c 100644 --- a/app/src/main/java/com/mikepenz/fastadapter/app/items/HeaderSelectionItem.java +++ b/app/src/main/java/com/mikepenz/fastadapter/app/items/HeaderSelectionItem.java @@ -2,7 +2,7 @@ import android.content.Context; import android.graphics.Color; -import android.support.v4.view.ViewCompat; +import androidx.core.view.ViewCompat; import com.mikepenz.fastadapter.IExpandable; import com.mikepenz.fastadapter.IItem; diff --git a/app/src/main/java/com/mikepenz/fastadapter/app/items/IconItem.java b/app/src/main/java/com/mikepenz/fastadapter/app/items/IconItem.java index e91c7f2a2..0606acb0a 100644 --- a/app/src/main/java/com/mikepenz/fastadapter/app/items/IconItem.java +++ b/app/src/main/java/com/mikepenz/fastadapter/app/items/IconItem.java @@ -1,6 +1,6 @@ package com.mikepenz.fastadapter.app.items; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.TextView; diff --git a/app/src/main/java/com/mikepenz/fastadapter/app/items/ImageItem.java b/app/src/main/java/com/mikepenz/fastadapter/app/items/ImageItem.java index 61e1a296e..e0134b0d5 100644 --- a/app/src/main/java/com/mikepenz/fastadapter/app/items/ImageItem.java +++ b/app/src/main/java/com/mikepenz/fastadapter/app/items/ImageItem.java @@ -2,9 +2,9 @@ import android.content.Context; import android.os.Build; -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 android.view.ViewGroup; import android.view.ViewPropertyAnimator; diff --git a/app/src/main/java/com/mikepenz/fastadapter/app/items/LetterItem.java b/app/src/main/java/com/mikepenz/fastadapter/app/items/LetterItem.java index ca87824b9..d0cee365f 100644 --- a/app/src/main/java/com/mikepenz/fastadapter/app/items/LetterItem.java +++ b/app/src/main/java/com/mikepenz/fastadapter/app/items/LetterItem.java @@ -1,6 +1,6 @@ package com.mikepenz.fastadapter.app.items; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.TextView; diff --git a/app/src/main/java/com/mikepenz/fastadapter/app/items/RadioButtonSampleItem.java b/app/src/main/java/com/mikepenz/fastadapter/app/items/RadioButtonSampleItem.java index 541593f59..a93724d92 100644 --- a/app/src/main/java/com/mikepenz/fastadapter/app/items/RadioButtonSampleItem.java +++ b/app/src/main/java/com/mikepenz/fastadapter/app/items/RadioButtonSampleItem.java @@ -1,8 +1,8 @@ package com.mikepenz.fastadapter.app.items; -import android.support.annotation.NonNull; -import android.support.annotation.StringRes; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.StringRes; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.RadioButton; import android.widget.TextView; diff --git a/app/src/main/java/com/mikepenz/fastadapter/app/items/RealmSampleUserItem.java b/app/src/main/java/com/mikepenz/fastadapter/app/items/RealmSampleUserItem.java index efb79e4d2..6b3d61ee3 100644 --- a/app/src/main/java/com/mikepenz/fastadapter/app/items/RealmSampleUserItem.java +++ b/app/src/main/java/com/mikepenz/fastadapter/app/items/RealmSampleUserItem.java @@ -1,7 +1,7 @@ package com.mikepenz.fastadapter.app.items; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/mikepenz/fastadapter/app/items/SimpleImageItem.java b/app/src/main/java/com/mikepenz/fastadapter/app/items/SimpleImageItem.java index 6d1f12529..48ca84465 100644 --- a/app/src/main/java/com/mikepenz/fastadapter/app/items/SimpleImageItem.java +++ b/app/src/main/java/com/mikepenz/fastadapter/app/items/SimpleImageItem.java @@ -1,7 +1,7 @@ package com.mikepenz.fastadapter.app.items; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.FrameLayout; import android.widget.ImageView; diff --git a/app/src/main/java/com/mikepenz/fastadapter/app/items/SimpleItem.java b/app/src/main/java/com/mikepenz/fastadapter/app/items/SimpleItem.java index 7bf039e6e..987a20850 100644 --- a/app/src/main/java/com/mikepenz/fastadapter/app/items/SimpleItem.java +++ b/app/src/main/java/com/mikepenz/fastadapter/app/items/SimpleItem.java @@ -2,8 +2,8 @@ import android.content.Context; import android.graphics.Color; -import android.support.annotation.NonNull; -import android.support.annotation.StringRes; +import androidx.annotation.NonNull; +import androidx.annotation.StringRes; import android.view.View; import android.widget.TextView; diff --git a/app/src/main/java/com/mikepenz/fastadapter/app/items/SwipeableItem.java b/app/src/main/java/com/mikepenz/fastadapter/app/items/SwipeableItem.java index 11cb5829b..70caeaa6e 100644 --- a/app/src/main/java/com/mikepenz/fastadapter/app/items/SwipeableItem.java +++ b/app/src/main/java/com/mikepenz/fastadapter/app/items/SwipeableItem.java @@ -1,9 +1,9 @@ package com.mikepenz.fastadapter.app.items; -import android.support.annotation.StringRes; -import android.support.v4.content.ContextCompat; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.helper.ItemTouchHelper; +import androidx.annotation.StringRes; +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.ItemTouchHelper; import android.view.View; import android.widget.TextView; diff --git a/app/src/main/java/com/mikepenz/fastadapter/app/items/expandable/SimpleSubExpandableItem.java b/app/src/main/java/com/mikepenz/fastadapter/app/items/expandable/SimpleSubExpandableItem.java index 90ef66ad0..5f01a9755 100644 --- a/app/src/main/java/com/mikepenz/fastadapter/app/items/expandable/SimpleSubExpandableItem.java +++ b/app/src/main/java/com/mikepenz/fastadapter/app/items/expandable/SimpleSubExpandableItem.java @@ -2,10 +2,10 @@ import android.content.Context; import android.graphics.Color; -import android.support.annotation.NonNull; -import android.support.annotation.StringRes; -import android.support.v4.view.ViewCompat; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.StringRes; +import androidx.core.view.ViewCompat; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.ImageView; import android.widget.TextView; diff --git a/app/src/main/java/com/mikepenz/fastadapter/app/items/expandable/SimpleSubItem.java b/app/src/main/java/com/mikepenz/fastadapter/app/items/expandable/SimpleSubItem.java index 0b6ad7fa4..521bf08eb 100644 --- a/app/src/main/java/com/mikepenz/fastadapter/app/items/expandable/SimpleSubItem.java +++ b/app/src/main/java/com/mikepenz/fastadapter/app/items/expandable/SimpleSubItem.java @@ -2,9 +2,9 @@ import android.content.Context; import android.graphics.Color; -import android.support.annotation.StringRes; -import android.support.v4.view.ViewCompat; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.StringRes; +import androidx.core.view.ViewCompat; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.TextView; diff --git a/app/src/main/java/com/mikepenz/fastadapter/app/model/ModelIconItem.java b/app/src/main/java/com/mikepenz/fastadapter/app/model/ModelIconItem.java index bca63d6f1..2a14939b1 100644 --- a/app/src/main/java/com/mikepenz/fastadapter/app/model/ModelIconItem.java +++ b/app/src/main/java/com/mikepenz/fastadapter/app/model/ModelIconItem.java @@ -1,6 +1,6 @@ package com.mikepenz.fastadapter.app.model; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.TextView; diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 0b6ffd26a..2b78ac202 100755 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -3,7 +3,7 @@ android:layout_height="match_parent" android:gravity="center"> - - - - diff --git a/app/src/main/res/layout/activity_sort.xml b/app/src/main/res/layout/activity_sort.xml index aee634d23..2d8a21237 100644 --- a/app/src/main/res/layout/activity_sort.xml +++ b/app/src/main/res/layout/activity_sort.xml @@ -3,21 +3,21 @@ android:layout_height="match_parent" android:gravity="center"> - - - + - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/letter_item.xml b/app/src/main/res/layout/letter_item.xml index a279ac7e6..55a9a80c9 100644 --- a/app/src/main/res/layout/letter_item.xml +++ b/app/src/main/res/layout/letter_item.xml @@ -3,7 +3,7 @@ android:layout_height="wrap_content" android:padding="4dp"> - - + \ No newline at end of file diff --git a/app/src/main/res/layout/right_icon_item.xml b/app/src/main/res/layout/right_icon_item.xml index 25804eda9..c8de134e5 100755 --- a/app/src/main/res/layout/right_icon_item.xml +++ b/app/src/main/res/layout/right_icon_item.xml @@ -14,7 +14,7 @@ ~ limitations under the License. --> - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/simple_image_item.xml b/app/src/main/res/layout/simple_image_item.xml index a60ecd68a..a36a703cc 100644 --- a/app/src/main/res/layout/simple_image_item.xml +++ b/app/src/main/res/layout/simple_image_item.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/menu/search.xml b/app/src/main/res/menu/search.xml index 6425ada8a..188659515 100644 --- a/app/src/main/res/menu/search.xml +++ b/app/src/main/res/menu/search.xml @@ -4,6 +4,6 @@ \ No newline at end of file diff --git a/build.gradle b/build.gradle index e242e26e2..b33a213c6 100644 --- a/build.gradle +++ b/build.gradle @@ -2,19 +2,19 @@ buildscript { ext { release = [ - versionName: "3.2.8", - versionCode: 3280 + versionName: "3.3.0-rc01", + versionCode: 3300 ] setup = [ compileSdk: 28, - buildTools: "28.0.0", + buildTools: "28.0.2", minSdk : 14, targetSdk : 28 ] versions = [ - supportLib: "27.1.1" + androidX: '1.0.0-rc01' ] } @@ -23,9 +23,9 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.3' - classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0' - classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3' + classpath 'com.android.tools.build:gradle:3.3.0-alpha05' + classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' + classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4' } } diff --git a/gradle-release.gradle b/gradle-release.gradle index aced65105..49f29e31c 100644 --- a/gradle-release.gradle +++ b/gradle-release.gradle @@ -13,10 +13,11 @@ def getRepositoryPassword() { return hasProperty('NEXUS_PASSWORD') ? NEXUS_PASSWORD : "" } +apply plugin: "com.jfrog.bintray" + afterEvaluate { project -> apply plugin: 'maven-publish' apply plugin: 'com.github.dcendents.android-maven' - apply plugin: "com.jfrog.bintray" if (JavaVersion.current().isJava8Compatible()) { allprojects { diff --git a/gradle.properties b/gradle.properties index 777a26347..914e422e3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,3 +17,6 @@ POM_LICENCE_DIST=repo POM_DEVELOPER_ID=mikepenz POM_DEVELOPER_NAME=Mike Penz + +android.useAndroidX=true +android.enableJetifier=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 87717e3ec..252d46106 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip diff --git a/library-core/build.gradle b/library-core/build.gradle index 6bda42749..630c34c29 100644 --- a/library-core/build.gradle +++ b/library-core/build.gradle @@ -28,9 +28,9 @@ android { } dependencies { - implementation "com.android.support:appcompat-v7:${versions.supportLib}" - implementation "com.android.support:recyclerview-v7:${versions.supportLib}" - implementation "com.android.support:support-annotations:${versions.supportLib}" + implementation "androidx.appcompat:appcompat:${versions.androidX}" + implementation "androidx.recyclerview:recyclerview:${versions.androidX}" + implementation "androidx.annotation:annotation:${versions.androidX}" compileOnly "com.google.code.findbugs:jsr305:3.0.2" } diff --git a/library-core/src/main/java/com/mikepenz/fastadapter/FastAdapter.java b/library-core/src/main/java/com/mikepenz/fastadapter/FastAdapter.java index 7a794f51c..f9824a06f 100644 --- a/library-core/src/main/java/com/mikepenz/fastadapter/FastAdapter.java +++ b/library-core/src/main/java/com/mikepenz/fastadapter/FastAdapter.java @@ -1,10 +1,10 @@ package com.mikepenz.fastadapter; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.util.ArrayMap; -import android.support.v4.util.Pair; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.collection.ArrayMap; +import androidx.core.util.Pair; +import androidx.recyclerview.widget.RecyclerView; import android.util.Log; import android.util.SparseArray; import android.view.MotionEvent; diff --git a/library-core/src/main/java/com/mikepenz/fastadapter/IItem.java b/library-core/src/main/java/com/mikepenz/fastadapter/IItem.java index 25d627509..8f13ba290 100644 --- a/library-core/src/main/java/com/mikepenz/fastadapter/IItem.java +++ b/library-core/src/main/java/com/mikepenz/fastadapter/IItem.java @@ -1,9 +1,9 @@ package com.mikepenz.fastadapter; import android.content.Context; -import android.support.annotation.IdRes; -import android.support.annotation.LayoutRes; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.IdRes; +import androidx.annotation.LayoutRes; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.view.ViewGroup; diff --git a/library-core/src/main/java/com/mikepenz/fastadapter/IModelItem.java b/library-core/src/main/java/com/mikepenz/fastadapter/IModelItem.java index daae07efe..030b2f822 100644 --- a/library-core/src/main/java/com/mikepenz/fastadapter/IModelItem.java +++ b/library-core/src/main/java/com/mikepenz/fastadapter/IModelItem.java @@ -1,6 +1,6 @@ package com.mikepenz.fastadapter; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; /** * Created by mikepenz on 03.02.15. diff --git a/library-core/src/main/java/com/mikepenz/fastadapter/adapters/ModelAdapter.java b/library-core/src/main/java/com/mikepenz/fastadapter/adapters/ModelAdapter.java index 3cd391dd9..41d81fa66 100644 --- a/library-core/src/main/java/com/mikepenz/fastadapter/adapters/ModelAdapter.java +++ b/library-core/src/main/java/com/mikepenz/fastadapter/adapters/ModelAdapter.java @@ -1,6 +1,6 @@ package com.mikepenz.fastadapter.adapters; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.mikepenz.fastadapter.AbstractAdapter; import com.mikepenz.fastadapter.FastAdapter; diff --git a/library-core/src/main/java/com/mikepenz/fastadapter/items/AbstractItem.java b/library-core/src/main/java/com/mikepenz/fastadapter/items/AbstractItem.java index e9fb08a1c..f8a807fdb 100644 --- a/library-core/src/main/java/com/mikepenz/fastadapter/items/AbstractItem.java +++ b/library-core/src/main/java/com/mikepenz/fastadapter/items/AbstractItem.java @@ -1,10 +1,10 @@ package com.mikepenz.fastadapter.items; import android.content.Context; -import android.support.annotation.CallSuper; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.CallSuper; +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/library-core/src/main/java/com/mikepenz/fastadapter/items/ModelAbstractItem.java b/library-core/src/main/java/com/mikepenz/fastadapter/items/ModelAbstractItem.java index 0aed92155..737b86370 100644 --- a/library-core/src/main/java/com/mikepenz/fastadapter/items/ModelAbstractItem.java +++ b/library-core/src/main/java/com/mikepenz/fastadapter/items/ModelAbstractItem.java @@ -1,6 +1,6 @@ package com.mikepenz.fastadapter.items; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import com.mikepenz.fastadapter.IModelItem; diff --git a/library-core/src/main/java/com/mikepenz/fastadapter/listeners/ClickEventHook.java b/library-core/src/main/java/com/mikepenz/fastadapter/listeners/ClickEventHook.java index 8f8cf6d25..f8f619f99 100644 --- a/library-core/src/main/java/com/mikepenz/fastadapter/listeners/ClickEventHook.java +++ b/library-core/src/main/java/com/mikepenz/fastadapter/listeners/ClickEventHook.java @@ -1,6 +1,6 @@ package com.mikepenz.fastadapter.listeners; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import com.mikepenz.fastadapter.FastAdapter; diff --git a/library-core/src/main/java/com/mikepenz/fastadapter/listeners/CustomEventHook.java b/library-core/src/main/java/com/mikepenz/fastadapter/listeners/CustomEventHook.java index e0fba7fcb..bdabbf6b1 100644 --- a/library-core/src/main/java/com/mikepenz/fastadapter/listeners/CustomEventHook.java +++ b/library-core/src/main/java/com/mikepenz/fastadapter/listeners/CustomEventHook.java @@ -1,6 +1,6 @@ package com.mikepenz.fastadapter.listeners; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import com.mikepenz.fastadapter.FastAdapter; diff --git a/library-core/src/main/java/com/mikepenz/fastadapter/listeners/EventHook.java b/library-core/src/main/java/com/mikepenz/fastadapter/listeners/EventHook.java index de288dca4..49b8c7bdd 100644 --- a/library-core/src/main/java/com/mikepenz/fastadapter/listeners/EventHook.java +++ b/library-core/src/main/java/com/mikepenz/fastadapter/listeners/EventHook.java @@ -1,6 +1,6 @@ package com.mikepenz.fastadapter.listeners; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import com.mikepenz.fastadapter.IItem; diff --git a/library-core/src/main/java/com/mikepenz/fastadapter/listeners/LongClickEventHook.java b/library-core/src/main/java/com/mikepenz/fastadapter/listeners/LongClickEventHook.java index ac06ae659..caff731e4 100644 --- a/library-core/src/main/java/com/mikepenz/fastadapter/listeners/LongClickEventHook.java +++ b/library-core/src/main/java/com/mikepenz/fastadapter/listeners/LongClickEventHook.java @@ -1,6 +1,6 @@ package com.mikepenz.fastadapter.listeners; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import com.mikepenz.fastadapter.FastAdapter; diff --git a/library-core/src/main/java/com/mikepenz/fastadapter/listeners/OnBindViewHolderListener.java b/library-core/src/main/java/com/mikepenz/fastadapter/listeners/OnBindViewHolderListener.java index dab704beb..316e0bc4d 100644 --- a/library-core/src/main/java/com/mikepenz/fastadapter/listeners/OnBindViewHolderListener.java +++ b/library-core/src/main/java/com/mikepenz/fastadapter/listeners/OnBindViewHolderListener.java @@ -1,6 +1,6 @@ package com.mikepenz.fastadapter.listeners; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import java.util.List; diff --git a/library-core/src/main/java/com/mikepenz/fastadapter/listeners/OnBindViewHolderListenerImpl.java b/library-core/src/main/java/com/mikepenz/fastadapter/listeners/OnBindViewHolderListenerImpl.java index 6b31a1f0b..c5e4f88ed 100644 --- a/library-core/src/main/java/com/mikepenz/fastadapter/listeners/OnBindViewHolderListenerImpl.java +++ b/library-core/src/main/java/com/mikepenz/fastadapter/listeners/OnBindViewHolderListenerImpl.java @@ -1,6 +1,6 @@ package com.mikepenz.fastadapter.listeners; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.util.Log; import com.mikepenz.fastadapter.FastAdapter; diff --git a/library-core/src/main/java/com/mikepenz/fastadapter/listeners/OnCreateViewHolderListener.java b/library-core/src/main/java/com/mikepenz/fastadapter/listeners/OnCreateViewHolderListener.java index 83b67e0f1..5850bd56a 100644 --- a/library-core/src/main/java/com/mikepenz/fastadapter/listeners/OnCreateViewHolderListener.java +++ b/library-core/src/main/java/com/mikepenz/fastadapter/listeners/OnCreateViewHolderListener.java @@ -1,6 +1,6 @@ package com.mikepenz.fastadapter.listeners; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.ViewGroup; import com.mikepenz.fastadapter.FastAdapter; diff --git a/library-core/src/main/java/com/mikepenz/fastadapter/listeners/OnCreateViewHolderListenerImpl.java b/library-core/src/main/java/com/mikepenz/fastadapter/listeners/OnCreateViewHolderListenerImpl.java index bbcc7d723..37b12555a 100644 --- a/library-core/src/main/java/com/mikepenz/fastadapter/listeners/OnCreateViewHolderListenerImpl.java +++ b/library-core/src/main/java/com/mikepenz/fastadapter/listeners/OnCreateViewHolderListenerImpl.java @@ -1,6 +1,6 @@ package com.mikepenz.fastadapter.listeners; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.ViewGroup; import com.mikepenz.fastadapter.FastAdapter; diff --git a/library-core/src/main/java/com/mikepenz/fastadapter/listeners/TouchEventHook.java b/library-core/src/main/java/com/mikepenz/fastadapter/listeners/TouchEventHook.java index 9ecf8ef81..bf75bd23c 100644 --- a/library-core/src/main/java/com/mikepenz/fastadapter/listeners/TouchEventHook.java +++ b/library-core/src/main/java/com/mikepenz/fastadapter/listeners/TouchEventHook.java @@ -1,6 +1,6 @@ package com.mikepenz.fastadapter.listeners; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.MotionEvent; import android.view.View; diff --git a/library-core/src/main/java/com/mikepenz/fastadapter/select/SelectExtension.java b/library-core/src/main/java/com/mikepenz/fastadapter/select/SelectExtension.java index dbcc11d18..23639297b 100644 --- a/library-core/src/main/java/com/mikepenz/fastadapter/select/SelectExtension.java +++ b/library-core/src/main/java/com/mikepenz/fastadapter/select/SelectExtension.java @@ -1,8 +1,8 @@ package com.mikepenz.fastadapter.select; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.util.ArraySet; +import androidx.annotation.NonNull; +import androidx.collection.ArraySet; import android.view.MotionEvent; import android.view.View; diff --git a/library-core/src/main/java/com/mikepenz/fastadapter/utils/ComparableItemListImpl.java b/library-core/src/main/java/com/mikepenz/fastadapter/utils/ComparableItemListImpl.java index 34c8a39f0..add3551ab 100644 --- a/library-core/src/main/java/com/mikepenz/fastadapter/utils/ComparableItemListImpl.java +++ b/library-core/src/main/java/com/mikepenz/fastadapter/utils/ComparableItemListImpl.java @@ -1,6 +1,6 @@ package com.mikepenz.fastadapter.utils; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.mikepenz.fastadapter.IItem; diff --git a/library-core/src/main/java/com/mikepenz/fastadapter/utils/EventHookUtil.java b/library-core/src/main/java/com/mikepenz/fastadapter/utils/EventHookUtil.java index d69262c8b..b5d7281a5 100644 --- a/library-core/src/main/java/com/mikepenz/fastadapter/utils/EventHookUtil.java +++ b/library-core/src/main/java/com/mikepenz/fastadapter/utils/EventHookUtil.java @@ -1,6 +1,6 @@ package com.mikepenz.fastadapter.utils; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.MotionEvent; import android.view.View; diff --git a/library-core/src/main/java/com/mikepenz/fastadapter/utils/Triple.java b/library-core/src/main/java/com/mikepenz/fastadapter/utils/Triple.java index 366a86c2b..67748430c 100644 --- a/library-core/src/main/java/com/mikepenz/fastadapter/utils/Triple.java +++ b/library-core/src/main/java/com/mikepenz/fastadapter/utils/Triple.java @@ -1,6 +1,6 @@ package com.mikepenz.fastadapter.utils; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; /** * a helper class to provide a triple class, to store 3 values and return them from a method diff --git a/library-extensions-expandable/build.gradle b/library-extensions-expandable/build.gradle index 1fb88acb6..a3a07e6da 100644 --- a/library-extensions-expandable/build.gradle +++ b/library-extensions-expandable/build.gradle @@ -27,9 +27,9 @@ dependencies { implementation project(':library-core') implementation project(':library') - implementation "com.android.support:appcompat-v7:${versions.supportLib}" - implementation "com.android.support:recyclerview-v7:${versions.supportLib}" - implementation "com.android.support:support-annotations:${versions.supportLib}" + implementation "androidx.appcompat:appcompat:${versions.androidX}" + implementation "androidx.recyclerview:recyclerview:${versions.androidX}" + implementation "androidx.annotation:annotation:${versions.androidX}" compileOnly "com.google.code.findbugs:jsr305:3.0.2" diff --git a/library-extensions-expandable/src/main/java/com/mikepenz/fastadapter/expandable/ExpandableExtension.java b/library-extensions-expandable/src/main/java/com/mikepenz/fastadapter/expandable/ExpandableExtension.java index 6b0ad097d..f0d4abc1c 100644 --- a/library-extensions-expandable/src/main/java/com/mikepenz/fastadapter/expandable/ExpandableExtension.java +++ b/library-extensions-expandable/src/main/java/com/mikepenz/fastadapter/expandable/ExpandableExtension.java @@ -1,9 +1,9 @@ package com.mikepenz.fastadapter.expandable; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.util.ArraySet; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.collection.ArraySet; import android.util.SparseIntArray; import android.view.MotionEvent; import android.view.View; diff --git a/library-extensions-expandable/src/main/java/com/mikepenz/fastadapter/expandable/items/AbstractExpandableItem.java b/library-extensions-expandable/src/main/java/com/mikepenz/fastadapter/expandable/items/AbstractExpandableItem.java index 45fcf2916..0355f3047 100644 --- a/library-extensions-expandable/src/main/java/com/mikepenz/fastadapter/expandable/items/AbstractExpandableItem.java +++ b/library-extensions-expandable/src/main/java/com/mikepenz/fastadapter/expandable/items/AbstractExpandableItem.java @@ -1,6 +1,6 @@ package com.mikepenz.fastadapter.expandable.items; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import com.mikepenz.fastadapter.IClickable; import com.mikepenz.fastadapter.IExpandable; diff --git a/library-extensions-expandable/src/main/java/com/mikepenz/fastadapter/expandable/items/ModelAbstractExpandableItem.java b/library-extensions-expandable/src/main/java/com/mikepenz/fastadapter/expandable/items/ModelAbstractExpandableItem.java index f39dadcef..3080ed2f4 100644 --- a/library-extensions-expandable/src/main/java/com/mikepenz/fastadapter/expandable/items/ModelAbstractExpandableItem.java +++ b/library-extensions-expandable/src/main/java/com/mikepenz/fastadapter/expandable/items/ModelAbstractExpandableItem.java @@ -1,6 +1,6 @@ package com.mikepenz.fastadapter.expandable.items; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import com.mikepenz.fastadapter.IExpandable; import com.mikepenz.fastadapter.IItem; diff --git a/library-extensions-expandable/src/test/java/com/mikepenz/fastadapter/ExpandableFastAdapterTest.java b/library-extensions-expandable/src/test/java/com/mikepenz/fastadapter/ExpandableFastAdapterTest.java index 89a8d919f..c0260c904 100644 --- a/library-extensions-expandable/src/test/java/com/mikepenz/fastadapter/ExpandableFastAdapterTest.java +++ b/library-extensions-expandable/src/test/java/com/mikepenz/fastadapter/ExpandableFastAdapterTest.java @@ -1,6 +1,6 @@ package com.mikepenz.fastadapter; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import com.mikepenz.fastadapter.adapters.ItemAdapter; diff --git a/library-extensions-expandable/src/test/java/com/mikepenz/fastadapter/TestDataGenerator.java b/library-extensions-expandable/src/test/java/com/mikepenz/fastadapter/TestDataGenerator.java index 894903a0b..fd719da29 100644 --- a/library-extensions-expandable/src/test/java/com/mikepenz/fastadapter/TestDataGenerator.java +++ b/library-extensions-expandable/src/test/java/com/mikepenz/fastadapter/TestDataGenerator.java @@ -1,6 +1,6 @@ package com.mikepenz.fastadapter; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.util.ArrayList; import java.util.List; diff --git a/library-extensions-expandable/src/test/java/com/mikepenz/fastadapter/TestItem.java b/library-extensions-expandable/src/test/java/com/mikepenz/fastadapter/TestItem.java index 1d3085612..5d96219fc 100644 --- a/library-extensions-expandable/src/test/java/com/mikepenz/fastadapter/TestItem.java +++ b/library-extensions-expandable/src/test/java/com/mikepenz/fastadapter/TestItem.java @@ -1,6 +1,6 @@ package com.mikepenz.fastadapter; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import com.mikepenz.fastadapter.items.AbstractItem; diff --git a/library-extensions/build.gradle b/library-extensions/build.gradle index f1cff8a12..a1edb9f5e 100644 --- a/library-extensions/build.gradle +++ b/library-extensions/build.gradle @@ -30,11 +30,11 @@ dependencies { implementation project(':library') implementation project(':library-extensions-expandable') - implementation "com.android.support:recyclerview-v7:${versions.supportLib}" - implementation "com.android.support:design:${versions.supportLib}" - implementation "com.android.support:support-annotations:${versions.supportLib}" + implementation "androidx.recyclerview:recyclerview:${versions.androidX}" + implementation "com.google.android.material:material:${versions.androidX}" + implementation "androidx.annotation:annotation:${versions.androidX}" - implementation 'com.mikepenz:materialize:1.1.2' + implementation 'com.mikepenz:materialize:1.2.0-rc01' } if (project.hasProperty('pushall') || project.hasProperty('libraryextensiononly')) { diff --git a/library-extensions/src/main/java/android/support/v7/widget/com_mikepenz_fastadapter_extensions_scroll.java b/library-extensions/src/main/java/androidx/recyclerview/widget/com_mikepenz_fastadapter_extensions_scroll.java similarity index 83% rename from library-extensions/src/main/java/android/support/v7/widget/com_mikepenz_fastadapter_extensions_scroll.java rename to library-extensions/src/main/java/androidx/recyclerview/widget/com_mikepenz_fastadapter_extensions_scroll.java index 43967c5d7..a53dd6f92 100644 --- a/library-extensions/src/main/java/android/support/v7/widget/com_mikepenz_fastadapter_extensions_scroll.java +++ b/library-extensions/src/main/java/androidx/recyclerview/widget/com_mikepenz_fastadapter_extensions_scroll.java @@ -1,6 +1,6 @@ -package android.support.v7.widget; +package androidx.recyclerview.widget; -import android.support.v7.widget.RecyclerView.LayoutManager; +import androidx.recyclerview.widget.RecyclerView.LayoutManager; /** * Why the class name? Because it guarantees zero naming conflicts! diff --git a/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/ActionModeHelper.java b/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/ActionModeHelper.java index a30a9b034..ea76b72d2 100644 --- a/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/ActionModeHelper.java +++ b/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/ActionModeHelper.java @@ -1,9 +1,9 @@ package com.mikepenz.fastadapter_extensions; -import android.support.annotation.MenuRes; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.view.ActionMode; +import androidx.annotation.MenuRes; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.view.ActionMode; import android.view.Menu; import android.view.MenuItem; diff --git a/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/UndoHelper.java b/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/UndoHelper.java index 1fa21df26..e2c6adfff 100644 --- a/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/UndoHelper.java +++ b/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/UndoHelper.java @@ -1,8 +1,8 @@ package com.mikepenz.fastadapter_extensions; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.design.widget.Snackbar; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import com.google.android.material.snackbar.Snackbar; import android.view.View; import android.widget.TextView; @@ -102,7 +102,7 @@ Snackbar remove(Set positions) { } View snackbarView = mSnackBar.getView(); - TextView snackbarText = (TextView) snackbarView.findViewById(android.support.design.R.id.snackbar_text); + TextView snackbarText = (TextView) snackbarView.findViewById(com.google.android.material.R.id.snackbar_text); return remove(snackbarView, snackbarText.getText().toString(), mSnackbarActionText, mSnackBar.getDuration(), positions); } diff --git a/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/dialog/FastAdapterBottomSheetDialog.java b/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/dialog/FastAdapterBottomSheetDialog.java index 357b7824c..bf543dffe 100644 --- a/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/dialog/FastAdapterBottomSheetDialog.java +++ b/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/dialog/FastAdapterBottomSheetDialog.java @@ -1,10 +1,10 @@ package com.mikepenz.fastadapter_extensions.dialog; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.design.widget.BottomSheetDialog; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import com.google.android.material.bottomsheet.BottomSheetDialog; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.ViewGroup; import com.mikepenz.fastadapter.FastAdapter; diff --git a/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/dialog/FastAdapterDialog.java b/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/dialog/FastAdapterDialog.java index 6e2b8ee86..01d937d0f 100644 --- a/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/dialog/FastAdapterDialog.java +++ b/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/dialog/FastAdapterDialog.java @@ -2,11 +2,11 @@ import android.content.Context; import android.content.DialogInterface; -import android.support.annotation.NonNull; -import android.support.annotation.StringRes; -import android.support.v7.app.AlertDialog; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.StringRes; +import androidx.appcompat.app.AlertDialog; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.ViewGroup; import com.mikepenz.fastadapter.FastAdapter; diff --git a/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/drag/IExtendedDraggable.java b/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/drag/IExtendedDraggable.java index 52fcf0044..7024c64a7 100644 --- a/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/drag/IExtendedDraggable.java +++ b/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/drag/IExtendedDraggable.java @@ -1,10 +1,9 @@ package com.mikepenz.fastadapter_extensions.drag; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.helper.ItemTouchHelper; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.ItemTouchHelper; import android.view.View; -import com.mikepenz.fastadapter_extensions.drag.IDraggable; import com.mikepenz.fastadapter.IItem; /** diff --git a/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/drag/SimpleDragCallback.java b/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/drag/SimpleDragCallback.java index ff74005c9..8438bd2cc 100644 --- a/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/drag/SimpleDragCallback.java +++ b/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/drag/SimpleDragCallback.java @@ -1,8 +1,8 @@ package com.mikepenz.fastadapter_extensions.drag; -import android.support.annotation.IntDef; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.helper.ItemTouchHelper; +import androidx.annotation.IntDef; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.ItemTouchHelper; import com.mikepenz.fastadapter.FastAdapter; import com.mikepenz.fastadapter.IItem; diff --git a/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/items/ProgressItem.java b/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/items/ProgressItem.java index 7fa00e6b9..9322cdd16 100644 --- a/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/items/ProgressItem.java +++ b/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/items/ProgressItem.java @@ -1,6 +1,6 @@ package com.mikepenz.fastadapter_extensions.items; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.ProgressBar; diff --git a/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/items/SingleLineItem.java b/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/items/SingleLineItem.java index 9c7f8d6ef..b57547359 100644 --- a/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/items/SingleLineItem.java +++ b/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/items/SingleLineItem.java @@ -3,8 +3,8 @@ import android.graphics.Bitmap; import android.graphics.drawable.Drawable; import android.net.Uri; -import android.support.annotation.DrawableRes; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.DrawableRes; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.ImageView; import android.widget.TextView; diff --git a/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/items/ThreeLineItem.java b/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/items/ThreeLineItem.java index 870ec6463..218d18204 100644 --- a/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/items/ThreeLineItem.java +++ b/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/items/ThreeLineItem.java @@ -3,8 +3,8 @@ import android.graphics.Bitmap; import android.graphics.drawable.Drawable; import android.net.Uri; -import android.support.annotation.DrawableRes; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.DrawableRes; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.ImageView; import android.widget.TextView; diff --git a/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/items/TwoLineItem.java b/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/items/TwoLineItem.java index 402cf1473..5f4676de7 100644 --- a/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/items/TwoLineItem.java +++ b/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/items/TwoLineItem.java @@ -3,8 +3,8 @@ import android.graphics.Bitmap; import android.graphics.drawable.Drawable; import android.net.Uri; -import android.support.annotation.DrawableRes; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.DrawableRes; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.ImageView; import android.widget.TextView; diff --git a/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/scroll/EndlessRecyclerOnScrollListener.java b/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/scroll/EndlessRecyclerOnScrollListener.java index 63fc640bd..c4cec83f8 100644 --- a/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/scroll/EndlessRecyclerOnScrollListener.java +++ b/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/scroll/EndlessRecyclerOnScrollListener.java @@ -1,7 +1,7 @@ package com.mikepenz.fastadapter_extensions.scroll; -import android.support.v7.widget.OrientationHelper; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.OrientationHelper; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import com.mikepenz.fastadapter.adapters.ItemAdapter; diff --git a/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/scroll/EndlessRecyclerOnTopScrollListener.java b/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/scroll/EndlessRecyclerOnTopScrollListener.java index 6c0080a03..cc5f66baf 100644 --- a/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/scroll/EndlessRecyclerOnTopScrollListener.java +++ b/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/scroll/EndlessRecyclerOnTopScrollListener.java @@ -1,8 +1,8 @@ package com.mikepenz.fastadapter_extensions.scroll; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.OrientationHelper; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.OrientationHelper; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import com.mikepenz.fastadapter.FastAdapter; diff --git a/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/scroll/EndlessScrollHelper.java b/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/scroll/EndlessScrollHelper.java index fbfa86f1f..765f4b44f 100644 --- a/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/scroll/EndlessScrollHelper.java +++ b/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/scroll/EndlessScrollHelper.java @@ -1,8 +1,5 @@ package com.mikepenz.fastadapter_extensions.scroll; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.RecyclerView.LayoutManager; import android.view.View; import com.mikepenz.fastadapter.IInterceptor; @@ -15,7 +12,12 @@ import java.util.ArrayList; import java.util.List; -import static android.support.v7.widget.com_mikepenz_fastadapter_extensions_scroll.postOnRecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView.LayoutManager; + +import static androidx.recyclerview.widget.com_mikepenz_fastadapter_extensions_scroll.postOnRecyclerView; + /** * This is an extension of {@link EndlessRecyclerOnScrollListener}, providing a more powerful API diff --git a/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/swipe/SimpleSwipeCallback.java b/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/swipe/SimpleSwipeCallback.java index 9123b43eb..c1343c2f7 100644 --- a/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/swipe/SimpleSwipeCallback.java +++ b/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/swipe/SimpleSwipeCallback.java @@ -5,9 +5,9 @@ import android.graphics.Color; import android.graphics.Paint; import android.graphics.drawable.Drawable; -import android.support.annotation.ColorInt; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.helper.ItemTouchHelper; +import androidx.annotation.ColorInt; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.ItemTouchHelper; import android.view.View; import com.mikepenz.fastadapter.FastAdapter; diff --git a/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/swipe/SimpleSwipeDragCallback.java b/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/swipe/SimpleSwipeDragCallback.java index 2b4abc2c0..a256aee9d 100644 --- a/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/swipe/SimpleSwipeDragCallback.java +++ b/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/swipe/SimpleSwipeDragCallback.java @@ -4,9 +4,9 @@ import android.graphics.Canvas; import android.graphics.Color; import android.graphics.drawable.Drawable; -import android.support.annotation.ColorInt; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.helper.ItemTouchHelper; +import androidx.annotation.ColorInt; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.ItemTouchHelper; import com.mikepenz.fastadapter_extensions.drag.ItemTouchCallback; import com.mikepenz.fastadapter_extensions.drag.SimpleDragCallback; diff --git a/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/utilities/DragDropUtil.java b/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/utilities/DragDropUtil.java index de467a676..3ad4e0572 100644 --- a/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/utilities/DragDropUtil.java +++ b/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/utilities/DragDropUtil.java @@ -1,7 +1,7 @@ package com.mikepenz.fastadapter_extensions.utilities; -import android.support.v4.view.MotionEventCompat; -import android.support.v7.widget.RecyclerView; +import androidx.core.view.MotionEventCompat; +import androidx.recyclerview.widget.RecyclerView; import android.view.MotionEvent; import android.view.View; diff --git a/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/utilities/SubItemUtil.java b/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/utilities/SubItemUtil.java index 00a7c5dac..c9fbea109 100644 --- a/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/utilities/SubItemUtil.java +++ b/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/utilities/SubItemUtil.java @@ -1,6 +1,6 @@ package com.mikepenz.fastadapter_extensions.utilities; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.mikepenz.fastadapter.FastAdapter; import com.mikepenz.fastadapter.IAdapter; diff --git a/library/build.gradle b/library/build.gradle index 8eabaf8fe..d69170895 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -26,9 +26,9 @@ android { dependencies { implementation project(':library-core') - implementation "com.android.support:appcompat-v7:${versions.supportLib}" - implementation "com.android.support:recyclerview-v7:${versions.supportLib}" - implementation "com.android.support:support-annotations:${versions.supportLib}" + implementation "androidx.appcompat:appcompat:${versions.androidX}" + implementation "androidx.recyclerview:recyclerview:${versions.androidX}" + implementation "androidx.annotation:annotation:${versions.androidX}" testImplementation 'junit:junit:4.12' testImplementation 'org.mockito:mockito-all:1.10.19' diff --git a/library/src/main/java/com/mikepenz/fastadapter/commons/adapters/AbstractWrapAdapter.java b/library/src/main/java/com/mikepenz/fastadapter/commons/adapters/AbstractWrapAdapter.java index 3e63c3482..3e547e9d2 100644 --- a/library/src/main/java/com/mikepenz/fastadapter/commons/adapters/AbstractWrapAdapter.java +++ b/library/src/main/java/com/mikepenz/fastadapter/commons/adapters/AbstractWrapAdapter.java @@ -1,6 +1,6 @@ package com.mikepenz.fastadapter.commons.adapters; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.ViewGroup; import com.mikepenz.fastadapter.IItem; diff --git a/library/src/main/java/com/mikepenz/fastadapter/commons/utils/DiffCallback.java b/library/src/main/java/com/mikepenz/fastadapter/commons/utils/DiffCallback.java index 7714fb51a..ee802a47e 100644 --- a/library/src/main/java/com/mikepenz/fastadapter/commons/utils/DiffCallback.java +++ b/library/src/main/java/com/mikepenz/fastadapter/commons/utils/DiffCallback.java @@ -1,7 +1,7 @@ package com.mikepenz.fastadapter.commons.utils; -import android.support.annotation.Nullable; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; /** * DiffCallback used to efficiently update the items inside the list with the new DiffUtils @@ -23,7 +23,7 @@ public interface DiffCallback { * DiffUtil uses this method to check equality instead of {@link Object#equals(Object)} * so that you can change its behavior depending on your UI. * For example, if you are using DiffUtil with a - * {@link android.support.v7.widget.RecyclerView.Adapter RecyclerView.Adapter}, you should + * {@link RecyclerView.Adapter RecyclerView.Adapter}, you should * return whether the items' visual representations are the same. * This method is called only if #areItemsTheSame(Item, Item) returns * {@code true} for these items. @@ -40,7 +40,7 @@ public interface DiffCallback { * calls this method to get a payload about the change. * For example, if you are using DiffUtil with {@link RecyclerView}, you can return the * particular field that changed in the item and your - * {@link android.support.v7.widget.RecyclerView.ItemAnimator ItemAnimator} can use that + * {@link RecyclerView.ItemAnimator ItemAnimator} can use that * information to run the correct animation. * Default implementation returns {@code null}. * diff --git a/library/src/main/java/com/mikepenz/fastadapter/commons/utils/DiffCallbackImpl.java b/library/src/main/java/com/mikepenz/fastadapter/commons/utils/DiffCallbackImpl.java index cfe3ea2bb..52e179de6 100644 --- a/library/src/main/java/com/mikepenz/fastadapter/commons/utils/DiffCallbackImpl.java +++ b/library/src/main/java/com/mikepenz/fastadapter/commons/utils/DiffCallbackImpl.java @@ -1,6 +1,6 @@ package com.mikepenz.fastadapter.commons.utils; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.mikepenz.fastadapter.IItem; diff --git a/library/src/main/java/com/mikepenz/fastadapter/commons/utils/FastAdapterDiffUtil.java b/library/src/main/java/com/mikepenz/fastadapter/commons/utils/FastAdapterDiffUtil.java index 81971d5a3..7652b9ad3 100644 --- a/library/src/main/java/com/mikepenz/fastadapter/commons/utils/FastAdapterDiffUtil.java +++ b/library/src/main/java/com/mikepenz/fastadapter/commons/utils/FastAdapterDiffUtil.java @@ -1,8 +1,8 @@ package com.mikepenz.fastadapter.commons.utils; -import android.support.annotation.Nullable; -import android.support.v7.util.DiffUtil; -import android.support.v7.util.ListUpdateCallback; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.DiffUtil; +import androidx.recyclerview.widget.ListUpdateCallback; import com.mikepenz.fastadapter.FastAdapter; import com.mikepenz.fastadapter.IAdapterExtension; @@ -23,11 +23,11 @@ public class FastAdapterDiffUtil { /** - * This method will compute a {@link android.support.v7.util.DiffUtil.DiffResult} based on the given adapter, and the list of new items. + * This method will compute a {@link androidx.recyclerview.widget.DiffUtil.DiffResult} based on the given adapter, and the list of new items. *

* It automatically collapses all expandables (if enabled) as they are not supported by the diff util, * pre sort the items based on the comparator if available, - * map the new item types for the FastAdapter then calculates the {@link android.support.v7.util.DiffUtil.DiffResult} using the {@link DiffUtil}. + * map the new item types for the FastAdapter then calculates the {@link androidx.recyclerview.widget.DiffUtil.DiffResult} using the {@link DiffUtil}. *

* As the last step it will replace the items inside the adapter with the new set of items provided. * @@ -38,7 +38,7 @@ public class FastAdapterDiffUtil { * @param The adapter type, whereas A extends {@link ModelAdapter} * @param The model type we work with * @param The item type kept in the adapter - * @return the {@link android.support.v7.util.DiffUtil.DiffResult} computed. + * @return the {@link androidx.recyclerview.widget.DiffUtil.DiffResult} computed. */ public static , Model, Item extends IItem> DiffUtil.DiffResult calculateDiff(final A adapter, final List items, final DiffCallback callback, final boolean detectMoves) { if (adapter.isUseIdDistributor()) { @@ -98,10 +98,10 @@ private static void collapseIfPossible(FastAdapter fastAdapter) { } /** - * Dispatches a {@link android.support.v7.util.DiffUtil.DiffResult} to the given Adapter. + * Dispatches a {@link androidx.recyclerview.widget.DiffUtil.DiffResult} to the given Adapter. * * @param adapter the adapter to dispatch the updates to - * @param result the computed {@link android.support.v7.util.DiffUtil.DiffResult} + * @param result the computed {@link androidx.recyclerview.widget.DiffUtil.DiffResult} * @return the adapter to allow chaining */ public static , Model, Item extends IItem> A set(final A adapter, DiffUtil.DiffResult result) { @@ -112,7 +112,7 @@ public static , Model, Item extends IItem> A /** * convenient function for {@link #calculateDiff(ModelAdapter, List, DiffCallback, boolean)} * - * @return the {@link android.support.v7.util.DiffUtil.DiffResult} computed. + * @return the {@link androidx.recyclerview.widget.DiffUtil.DiffResult} computed. */ public static , Model, Item extends IItem> DiffUtil.DiffResult calculateDiff(final A adapter, final List items, final DiffCallback callback) { return calculateDiff(adapter, items, callback, true); @@ -121,7 +121,7 @@ public static , Model, Item extends IItem> D /** * convenient function for {@link #calculateDiff(ModelAdapter, List, DiffCallback, boolean)} * - * @return the {@link android.support.v7.util.DiffUtil.DiffResult} computed. + * @return the {@link androidx.recyclerview.widget.DiffUtil.DiffResult} computed. */ public static , Model, Item extends IItem> DiffUtil.DiffResult calculateDiff(final A adapter, final List items, final boolean detectMoves) { return calculateDiff(adapter, items, new DiffCallbackImpl(), detectMoves); @@ -130,14 +130,14 @@ public static , Model, Item extends IItem> D /** * convenient function for {@link #calculateDiff(ModelAdapter, List, DiffCallback, boolean)} * - * @return the {@link android.support.v7.util.DiffUtil.DiffResult} computed. + * @return the {@link androidx.recyclerview.widget.DiffUtil.DiffResult} computed. */ public static , Model, Item extends IItem> DiffUtil.DiffResult calculateDiff(final A adapter, final List items) { return calculateDiff(adapter, items, new DiffCallbackImpl(), true); } /** - * Calculates a {@link android.support.v7.util.DiffUtil.DiffResult} given the adapter and the items, and will directly dispatch them to the adapter. + * Calculates a {@link androidx.recyclerview.widget.DiffUtil.DiffResult} given the adapter and the items, and will directly dispatch them to the adapter. * * @param adapter the adapter containing the current items. * @param items the new set of items we want to put into the adapter @@ -183,7 +183,7 @@ public static , Model, Item extends IItem> A /** * convenient function for {@link #calculateDiff(ModelAdapter, List, DiffCallback, boolean)} * - * @return the {@link android.support.v7.util.DiffUtil.DiffResult} computed. + * @return the {@link androidx.recyclerview.widget.DiffUtil.DiffResult} computed. */ public static , Item extends IItem> DiffUtil.DiffResult calculateDiff(final A adapter, final List items, final DiffCallback callback) { return calculateDiff(adapter.getItemAdapter(), items, callback); @@ -192,7 +192,7 @@ public static , Item extends IItem> DiffUtil.Dif /** * convenient function for {@link #calculateDiff(ModelAdapter, List, DiffCallback, boolean)} * - * @return the {@link android.support.v7.util.DiffUtil.DiffResult} computed. + * @return the {@link androidx.recyclerview.widget.DiffUtil.DiffResult} computed. */ public static , Item extends IItem> DiffUtil.DiffResult calculateDiff(final A adapter, final List items, final boolean detectMoves) { return calculateDiff(adapter.getItemAdapter(), items, detectMoves); @@ -201,7 +201,7 @@ public static , Item extends IItem> DiffUtil.Dif /** * convenient function for {@link #calculateDiff(ModelAdapter, List, DiffCallback, boolean)} * - * @return the {@link android.support.v7.util.DiffUtil.DiffResult} computed. + * @return the {@link androidx.recyclerview.widget.DiffUtil.DiffResult} computed. */ public static , Item extends IItem> DiffUtil.DiffResult calculateDiff(final A adapter, final List items) { return calculateDiff(adapter.getItemAdapter(), items); @@ -258,7 +258,7 @@ public static , Item extends IItem> A set(final } /** - * Convenient implementation for the {@link android.support.v7.util.DiffUtil.Callback} to simplify difference calculation using {@link FastAdapter} items. + * Convenient implementation for the {@link androidx.recyclerview.widget.DiffUtil.Callback} to simplify difference calculation using {@link FastAdapter} items. * * @param the item type in the adapter */ diff --git a/library/src/main/java/com/mikepenz/fastadapter/commons/utils/FastAdapterUIUtils.java b/library/src/main/java/com/mikepenz/fastadapter/commons/utils/FastAdapterUIUtils.java index a92c60f00..737007d97 100644 --- a/library/src/main/java/com/mikepenz/fastadapter/commons/utils/FastAdapterUIUtils.java +++ b/library/src/main/java/com/mikepenz/fastadapter/commons/utils/FastAdapterUIUtils.java @@ -9,8 +9,8 @@ import android.graphics.drawable.StateListDrawable; import android.graphics.drawable.shapes.RoundRectShape; import android.os.Build; -import android.support.annotation.ColorInt; -import android.support.v4.content.ContextCompat; +import androidx.annotation.ColorInt; +import androidx.core.content.ContextCompat; import android.util.TypedValue; import com.mikepenz.fastadapter.R; diff --git a/library/src/test/java/com/mikepenz/fastadapter/FastAdapterTest.java b/library/src/test/java/com/mikepenz/fastadapter/FastAdapterTest.java index 6ecc9d3be..146014fcd 100644 --- a/library/src/test/java/com/mikepenz/fastadapter/FastAdapterTest.java +++ b/library/src/test/java/com/mikepenz/fastadapter/FastAdapterTest.java @@ -1,6 +1,6 @@ package com.mikepenz.fastadapter; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.view.ViewGroup; import android.widget.FrameLayout; diff --git a/library/src/test/java/com/mikepenz/fastadapter/TestDataGenerator.java b/library/src/test/java/com/mikepenz/fastadapter/TestDataGenerator.java index 984244936..ef7ddfcc0 100644 --- a/library/src/test/java/com/mikepenz/fastadapter/TestDataGenerator.java +++ b/library/src/test/java/com/mikepenz/fastadapter/TestDataGenerator.java @@ -1,6 +1,6 @@ package com.mikepenz.fastadapter; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.util.ArrayList; import java.util.List; diff --git a/library/src/test/java/com/mikepenz/fastadapter/TestItem.java b/library/src/test/java/com/mikepenz/fastadapter/TestItem.java index 039d44ebe..328374ecb 100644 --- a/library/src/test/java/com/mikepenz/fastadapter/TestItem.java +++ b/library/src/test/java/com/mikepenz/fastadapter/TestItem.java @@ -1,8 +1,8 @@ package com.mikepenz.fastadapter; import android.content.Context; -import android.support.annotation.Nullable; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.view.ViewGroup; import android.widget.FrameLayout;