Merge branch 'release/v3.3.0-rc01'

mikepenz · Aug 11, 2018 · c77f5de · c77f5de
2 parents b294636 + f5a0001
commit c77f5de
Show file tree

Hide file tree

Showing 110 changed files with 365 additions and 353 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,15 +1,14 @@
 package com.mikepenz.fastadapter.app;
 
-import android.app.Application;
-
+import androidx.multidex.MultiDexApplication;
 import io.realm.Realm;
 import io.realm.RealmConfiguration;
 
 /**
  * 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
@@ -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
@@ -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/...src/main/java/com/mikepenz/fastadapter/app/ExpandableMultiselectDeleteSampleActivity.java b/...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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;