Release v5.1.0 (AndroidX)

Raynor999 · Sep 30, 2018 · a062ca4 · a062ca4
1 parent 3fe4816
commit a062ca4
Show file tree

Hide file tree

Showing 127 changed files with 479 additions and 470 deletions.
diff --git a/README.md b/README.md
@@ -5,7 +5,8 @@
 ![Methods and Size](https://img.shields.io/badge/Methods%20and%20size-Core:%20759,%20124%20KB%20|%20UI:%20267,%2068%20KB-e91e63.svg)
 
 # FlexibleAdapter
-- [v5.0.6](https://github.com/davideas/FlexibleAdapter/releases/tag/5.0.6) built on 2018.09.16
+- [v5.0.7](https://github.com/davideas/FlexibleAdapter/releases/tag/5.0.7) built on 2018.09.30 last with Support v28
+- [v5.1.0](https://github.com/davideas/FlexibleAdapter/releases/tag/5.1.0) built on 2018.09.30 with AndroidX
 - If you come from previous versions, update your code following the Wiki page [Migrations](https://github.com/davideas/FlexibleAdapter/wiki/Migrations).
 - Please read also [issues](https://github.com/davideas/FlexibleAdapter/issues) and [releases](https://github.com/davideas/FlexibleAdapter/releases).
 
@@ -63,17 +64,17 @@ repositories {
 ```
 dependencies {
     // Using JCenter
-    implementation 'eu.davidea:flexible-adapter:5.0.6'
-    implementation 'eu.davidea:flexible-adapter-ui:1.0.0-b5'
-    implementation 'eu.davidea:flexible-adapter-livedata:1.0.0-b2'
+    implementation 'eu.davidea:flexible-adapter:5.1.0'
+    implementation 'eu.davidea:flexible-adapter-ui:1.0.0-b6'
+    implementation 'eu.davidea:flexible-adapter-livedata:1.0.0-b3'
     // From 1.0.0-b3, library is compiled with data binding v2
-    implementation 'eu.davidea:flexible-adapter-databinding:1.0.0-b3'
+    implementation 'eu.davidea:flexible-adapter-databinding:1.0.0-b4'
 }
 ```
 #### Stay Updated
 |Flexible Adapter|UI|Live Data|Data Binding|
 |---|---|---|---|
-|<div align="center">5.0.6</div>|<div align="center">1.0.0-b5</div>|<div align="center">1.0.0-b2</div>|<div align="center">1.0.0-b3</div>|
+|<div align="center">5.1.0</div>|<div align="center">1.0.0-b6</div>|<div align="center">1.0.0-b3</div>|<div align="center">1.0.0-b4</div>|
 |<a href='https://bintray.com/davideas/maven/flexible-adapter?source=watch' alt='Get automatic notifications about new "flexible-adapter" versions'><img src='https://www.bintray.com/docs/images/bintray_badge_color.png'></a>|<a href='https://bintray.com/davideas/maven/flexible-adapter-ui?source=watch' alt='Get automatic notifications about new "flexible-adapter-ui" versions'><img src='https://www.bintray.com/docs/images/bintray_badge_bw.png'></a>|<a href='https://bintray.com/davideas/maven/flexible-adapter-livedata?source=watch' alt='Get automatic notifications about new "flexible-adapter-livedata" versions'><img src='https://www.bintray.com/docs/images/bintray_badge_bw.png'></a>|<a href='https://bintray.com/davideas/maven/flexible-adapter-databinding?source=watch' alt='Get automatic notifications about new "flexible-adapter-databinding" versions'><img src='https://www.bintray.com/docs/images/bintray_badge_bw.png'></a>|
 
 # Wiki!
@@ -120,9 +121,11 @@ This [Wiki page](https://github.com/davideas/FlexibleAdapter/wiki/5.x-%7C-Demo-A
 
 # Change Log
 ###### Latest release
-[v5.0.6](https://github.com/davideas/FlexibleAdapter/releases/tag/5.0.6) - 2018.09.16 |
+[v5.0.7](https://github.com/davideas/FlexibleAdapter/releases/tag/5.0.7) - 2018.09.30 |
+[v5.1.0](https://github.com/davideas/FlexibleAdapter/releases/tag/5.1.0) - 2018.09.30
 
 ###### Old releases
+[v5.0.6](https://github.com/davideas/FlexibleAdapter/releases/tag/5.0.6) - 2018.09.16 |
 [v5.0.5](https://github.com/davideas/FlexibleAdapter/releases/tag/5.0.5) - 2018.06.03 |
 [v5.0.4](https://github.com/davideas/FlexibleAdapter/releases/tag/5.0.4) - 2018.05.01 |
 [v5.0.3](https://github.com/davideas/FlexibleAdapter/releases/tag/5.0.3) - 2018.03.23 |

diff --git a/build.gradle b/build.gradle
@@ -15,8 +15,8 @@ allprojects {
 
         // SDK and Build tools version
         minSdk = 14
-        targetSdk = 27
-        buildTools = "27.0.3"
+        targetSdk = 28
+        buildTools = "28.0.3"
 
         // Android Architecture Components
         archLifecycleVer = "1.1.1"
@@ -34,9 +34,26 @@ allprojects {
                 roomRxJava2    : "android.arch.persistence.room:rxjava2:${roomPersistenceVer}"
         ]
 
+        // AndroidX
+        androidxVer = "1.0.0"
+        lifecycleVer = "2.0.0"
+        androidx = [
+                recyclerView        : "androidx.recyclerview:recyclerview:${androidxVer}",
+                appCompat           : "androidx.appcompat:appcompat:${androidxVer}",
+                cardView            : "androidx.cardview:cardview:${androidxVer}",
+                annotation          : "androidx.annotation:annotation:${androidxVer}",
+                lifecycleExtensions : "androidx.lifecycle:lifecycle-extensions:${lifecycleVer}"
+        ]
+
+        // Google Material
+        googleVer = "1.0.0"
+        google = [
+                material        : "com.google.android.material:material:${androidxVer}"
+        ]
+
         // Support Libraries dependencies
-        supportVer = "27.1.1"
-        constraintVer = "1.1.0"
+        supportVer = "28.0.0"
+        constraintVer = "1.1.2"
         supportLib = [
                 design          : "com.android.support:design:${supportVer}",
                 recyclerView    : "com.android.support:recyclerview-v7:${supportVer}",
@@ -64,12 +81,12 @@ allprojects {
         ]
 
         // 3rd Libraries
-        butterKnifeVer = "8.8.1"
-        timberVer = "4.7.0"
+        butterKnifeVer = "9.0.0-SNAPSHOT"
+        timberVer = "4.7.1"
         glideVer = "4.6.1"
         javaxInjectVer = "1"
         junitPlatformVer = "1.1.0"
-        junitJupiterVer = "5.1.0"
+        junitJupiterVer = "5.2.0"
         libraries = [
                 butterKnife        : "com.jakewharton:butterknife:${butterKnifeVer}",
                 butterKnifeCompiler: "com.jakewharton:butterknife-compiler:${butterKnifeVer}",
@@ -108,13 +125,13 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.3'
+        classpath 'com.android.tools.build:gradle:3.2.0'
         classpath "com.neenbedankt.gradle.plugins:android-apt:1.8"
         classpath "com.github.dcendents:android-maven-gradle-plugin:2.0"
         classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3"
         classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.0.1"
         classpath "com.vanniktech:gradle-android-javadoc-plugin:0.3.0-SNAPSHOT"
-        classpath "de.mannodermaus.gradle.plugins:android-junit5:1.0.31"
+        classpath "de.mannodermaus.gradle.plugins:android-junit5:1.2.0.0"
         classpath "eu.davidea:grabver:1.0.0"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/flexible-adapter-app/build.gradle b/flexible-adapter-app/build.gradle
@@ -3,8 +3,8 @@ apply plugin: 'eu.davidea.grabver'
 
 versioning {
     major 5
-    minor 0
-    patch 6
+    minor 1
+    patch 0
 }
 
 android {
@@ -22,7 +22,7 @@ android {
         // https://developer.android.com/studio/write/vector-asset-studio.html
         vectorDrawables.useSupportLibrary = true
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         android.applicationVariants.all { variant ->
             variant.outputs.all {
@@ -66,11 +66,11 @@ dependencies {
     implementation project(':flexible-adapter-ui')
     implementation project(':flexible-adapter-databinding')
 
-    // Support Libraries
-    implementation supportLib.appCompat
-    implementation supportLib.cardView
-    implementation supportLib.design
-    implementation supportLib.recyclerView
+    // AndroidX Libraries
+    implementation androidx.appCompat
+    implementation androidx.cardView
+    implementation androidx.recyclerView
+    implementation google.material
 
     // Timber (Logger) - https://github.com/JakeWharton/timber
     implementation libraries.timber
@@ -92,14 +92,14 @@ dependencies {
     implementation widgets.flipView
 
     // Test libraries
-    androidTestImplementation 'com.android.support.test:runner:1.0.1'
-    androidTestImplementation 'com.android.support.test:rules:1.0.1'
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:3.0.1', {
+    androidTestImplementation 'androidx.test:runner:1.1.0-alpha4'
+    androidTestImplementation 'androidx.test:rules:1.1.0-alpha4'
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0-alpha4', {
         exclude group: 'com.android.support', module: 'support-annotations'
         exclude group: 'com.google.code.findbugs', module: 'jsr305'
     })
     testImplementation 'org.robolectric:robolectric:3.4.2'
     testImplementation 'junit:junit:4.12'
-    testImplementation 'org.mockito:mockito-core:2.15.0'
+    testImplementation 'org.mockito:mockito-core:2.21.0'
 
 }
diff --git a/flexible-adapter-app/src/main/java/eu/davidea/samples/anim/FlipDownItemAnimator.java b/flexible-adapter-app/src/main/java/eu/davidea/samples/anim/FlipDownItemAnimator.java
@@ -1,8 +1,8 @@
 package eu.davidea.samples.anim;
 
-import android.support.v4.view.ViewCompat;
-import android.support.v4.view.ViewPropertyAnimatorCompat;
-import android.support.v7.widget.RecyclerView.ViewHolder;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.ViewPropertyAnimatorCompat;
+import androidx.recyclerview.widget.RecyclerView.ViewHolder;
 import android.view.animation.AccelerateInterpolator;
 import android.view.animation.BounceInterpolator;
 

diff --git a/flexible-adapter-app/src/main/java/eu/davidea/samples/anim/FromTopItemAnimator.java b/flexible-adapter-app/src/main/java/eu/davidea/samples/anim/FromTopItemAnimator.java
@@ -1,9 +1,9 @@
 package eu.davidea.samples.anim;
 
 import android.graphics.Point;
-import android.support.v4.view.ViewCompat;
-import android.support.v4.view.ViewPropertyAnimatorCompat;
-import android.support.v7.widget.RecyclerView.ViewHolder;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.ViewPropertyAnimatorCompat;
+import androidx.recyclerview.widget.RecyclerView.ViewHolder;
 import android.view.animation.AccelerateInterpolator;
 import android.view.animation.OvershootInterpolator;
 

diff --git a/flexible-adapter-app/src/main/java/eu/davidea/samples/anim/PendingItemAnimator.java b/flexible-adapter-app/src/main/java/eu/davidea/samples/anim/PendingItemAnimator.java
@@ -4,11 +4,11 @@
  * This class handles the pending que for you.
  */
 
-import android.support.v4.view.ViewCompat;
-import android.support.v4.view.ViewPropertyAnimatorCompat;
-import android.support.v4.view.ViewPropertyAnimatorListener;
-import android.support.v7.widget.RecyclerView.ViewHolder;
-import android.support.v7.widget.SimpleItemAnimator;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.ViewPropertyAnimatorCompat;
+import androidx.core.view.ViewPropertyAnimatorListener;
+import androidx.recyclerview.widget.RecyclerView.ViewHolder;
+import androidx.recyclerview.widget.SimpleItemAnimator;
 import android.view.View;
 
 import java.util.ArrayList;

diff --git a/flexible-adapter-app/src/main/java/eu/davidea/samples/anim/SlideItemAnimator.java b/flexible-adapter-app/src/main/java/eu/davidea/samples/anim/SlideItemAnimator.java
@@ -1,9 +1,9 @@
 package eu.davidea.samples.anim;
 
-import android.support.v4.view.ViewCompat;
-import android.support.v4.view.ViewPropertyAnimatorCompat;
-import android.support.v7.widget.RecyclerView.LayoutParams;
-import android.support.v7.widget.RecyclerView.ViewHolder;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.ViewPropertyAnimatorCompat;
+import androidx.recyclerview.widget.RecyclerView.LayoutParams;
+import androidx.recyclerview.widget.RecyclerView.ViewHolder;
 import android.view.View;
 import android.view.animation.AnticipateOvershootInterpolator;
 import android.view.animation.BounceInterpolator;

diff --git a/flexible-adapter-app/src/main/java/eu/davidea/samples/flexibleadapter/ExampleAdapter.java b/flexible-adapter-app/src/main/java/eu/davidea/samples/flexibleadapter/ExampleAdapter.java
@@ -3,8 +3,8 @@
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.StaggeredGridLayoutManager;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.StaggeredGridLayoutManager;
 
 import java.util.List;
 import java.util.Random;

diff --git a/flexible-adapter-app/src/main/java/eu/davidea/samples/flexibleadapter/MainActivity.java b/flexible-adapter-app/src/main/java/eu/davidea/samples/flexibleadapter/MainActivity.java
@@ -8,25 +8,25 @@
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
-import android.support.annotation.NonNull;
-import android.support.design.widget.FloatingActionButton;
-import android.support.design.widget.NavigationView;
-import android.support.design.widget.Snackbar;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.app.ActivityOptionsCompat;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.view.GravityCompat;
-import android.support.v4.view.MenuItemCompat;
-import android.support.v4.view.ViewCompat;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.app.ActionBarDrawerToggle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.view.ActionMode;
-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 com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.navigation.NavigationView;
+import com.google.android.material.snackbar.Snackbar;
+import androidx.core.app.ActivityCompat;
+import androidx.core.app.ActivityOptionsCompat;
+import androidx.fragment.app.FragmentManager;
+import androidx.core.view.GravityCompat;
+import androidx.core.view.MenuItemCompat;
+import androidx.core.view.ViewCompat;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.appcompat.app.ActionBarDrawerToggle;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.view.ActionMode;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.SearchView;
+import androidx.appcompat.widget.Toolbar;
+import androidx.recyclerview.widget.ItemTouchHelper;
 import android.text.InputType;
 import android.transition.Fade;
 import android.view.Menu;

diff --git a/flexible-adapter-app/src/main/java/eu/davidea/samples/flexibleadapter/OverallAdapter.java b/flexible-adapter-app/src/main/java/eu/davidea/samples/flexibleadapter/OverallAdapter.java
@@ -1,8 +1,8 @@
 package eu.davidea.samples.flexibleadapter;
 
 import android.app.Activity;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.StaggeredGridLayoutManager;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.StaggeredGridLayoutManager;
 
 import eu.davidea.flexibleadapter.FlexibleAdapter;
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem;

diff --git a/flexible-adapter-app/src/main/java/eu/davidea/samples/flexibleadapter/SplashActivity.java b/flexible-adapter-app/src/main/java/eu/davidea/samples/flexibleadapter/SplashActivity.java
@@ -2,9 +2,9 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.app.ActivityOptionsCompat;
-import android.support.v7.app.AppCompatActivity;
+import androidx.core.app.ActivityCompat;
+import androidx.core.app.ActivityOptionsCompat;
+import androidx.appcompat.app.AppCompatActivity;
 import android.transition.Fade;
 import android.view.Window;
 

diff --git a/flexible-adapter-app/src/main/java/eu/davidea/samples/flexibleadapter/ViewPagerActivity.java b/flexible-adapter-app/src/main/java/eu/davidea/samples/flexibleadapter/ViewPagerActivity.java
@@ -1,16 +1,18 @@
 package eu.davidea.samples.flexibleadapter;
 
 import android.os.Bundle;
-import android.support.design.widget.TabLayout;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
-import android.support.v4.view.OnApplyWindowInsetsListener;
-import android.support.v4.view.ViewCompat;
-import android.support.v4.view.ViewPager;
-import android.support.v4.view.WindowInsetsCompat;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import com.google.android.material.tabs.TabLayout;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
+import androidx.core.view.OnApplyWindowInsetsListener;
+import androidx.core.view.ViewCompat;
+import androidx.fragment.app.FragmentStatePagerAdapter;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+import androidx.core.view.WindowInsetsCompat;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -21,12 +23,12 @@
 public class ViewPagerActivity extends AppCompatActivity {
 
     /**
-     * The {@link android.support.v4.view.PagerAdapter} that will provide
+     * The {@link PagerAdapter} that will provide
      * fragments for each of the sections. We use a
      * {@link FragmentPagerAdapter} derivative, which will keep every
      * loaded fragment in memory. If this becomes too memory intensive, it
      * may be best to switch to a
-     * {@link android.support.v4.app.FragmentStatePagerAdapter}.
+     * {@link FragmentStatePagerAdapter}.
      */
     private SectionsPagerAdapter mSectionsPagerAdapter;
 

diff --git a/...pp/src/main/java/eu/davidea/samples/flexibleadapter/animators/FadeInDownItemAnimator.java b/...pp/src/main/java/eu/davidea/samples/flexibleadapter/animators/FadeInDownItemAnimator.java
@@ -15,8 +15,8 @@
  */
 package eu.davidea.samples.flexibleadapter.animators;
 
-import android.support.v4.view.ViewCompat;
-import android.support.v7.widget.RecyclerView;
+import androidx.core.view.ViewCompat;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.animation.Interpolator;
 
 import eu.davidea.flexibleadapter.common.FlexibleItemAnimator;

diff --git a/...er-app/src/main/java/eu/davidea/samples/flexibleadapter/animators/FadeInItemAnimator.java b/...er-app/src/main/java/eu/davidea/samples/flexibleadapter/animators/FadeInItemAnimator.java
@@ -15,8 +15,8 @@
  */
 package eu.davidea.samples.flexibleadapter.animators;
 
-import android.support.v4.view.ViewCompat;
-import android.support.v7.widget.RecyclerView;
+import androidx.core.view.ViewCompat;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.animation.Interpolator;
 
 import eu.davidea.flexibleadapter.common.FlexibleItemAnimator;

diff --git a/...pp/src/main/java/eu/davidea/samples/flexibleadapter/animators/FadeInLeftItemAnimator.java b/...pp/src/main/java/eu/davidea/samples/flexibleadapter/animators/FadeInLeftItemAnimator.java
@@ -15,8 +15,8 @@
  */
 package eu.davidea.samples.flexibleadapter.animators;
 
-import android.support.v4.view.ViewCompat;
-import android.support.v7.widget.RecyclerView;
+import androidx.core.view.ViewCompat;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.animation.Interpolator;
 
 import eu.davidea.flexibleadapter.common.FlexibleItemAnimator;

diff --git a/...p/src/main/java/eu/davidea/samples/flexibleadapter/animators/FadeInRightItemAnimator.java b/...p/src/main/java/eu/davidea/samples/flexibleadapter/animators/FadeInRightItemAnimator.java
@@ -15,8 +15,8 @@
  */
 package eu.davidea.samples.flexibleadapter.animators;
 
-import android.support.v4.view.ViewCompat;
-import android.support.v7.widget.RecyclerView;
+import androidx.core.view.ViewCompat;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.animation.Interpolator;
 
 import eu.davidea.flexibleadapter.common.FlexibleItemAnimator;