Improvement: Add AndroidX Support

build.gradle

@@ -17,14 +17,15 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.5.0-rc01'
     }
 }
 
 allprojects {
-    ext.support_lib_version = '26.0.2'
+    ext.support_lib_version = '28.0.0'
     ext.event_lib_version = '3.0.0'
     ext.fastscroll_lib_version = '0.1.3'
 

demo/build.gradle

@@ -16,17 +16,17 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion '26.0.1'
+    compileSdkVersion 28
+    buildToolsVersion '28.0.3'
 
     defaultConfig {
         applicationId "com.onegravity.contactpicker.demo"
 
-        minSdkVersion 14
-        targetSdkVersion 25
+        minSdkVersion 15
+        targetSdkVersion 28
 
-        versionCode 10
-        versionName "1.3.2"
+        versionCode 11
+        versionName "1.4.0"
     }
 
     packagingOptions {
@@ -51,8 +51,10 @@ android {
 
 dependencies {
     // debug builds should take the local code
-    debugCompile project(':library')
+    implementation project(':library')
 
+    implementation 'androidx.appcompat:appcompat:1.0.0'
     // release builds should take the published artifact
-    releaseCompile "com.1gravity:android-contactpicker:1.3.2"
+    // FIXME: When the release artifact is out of sync with the local library, this causes unwanted lintVitalRelease errors.
+    // releaseImplementation "com.1gravity:android-contactpicker:1.3.2"
 }

demo/src/main/AndroidManifest.xml

@@ -32,7 +32,7 @@
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />/>
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
 

demo/src/main/java/com/onegravity/contactpicker/demo/BaseActivity.java

@@ -24,8 +24,8 @@
 import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
 
 import java.util.ArrayList;
 import java.util.concurrent.atomic.AtomicBoolean;

gradle.properties

@@ -29,3 +29,5 @@ POM_DEVELOPER_ID=1gravity
 POM_DEVELOPER_NAME=Emanuel Moecklin
 POM_DEVELOPER_EMAIL=1gravityllc@gmail.com
 POM_ISSUE_URL=https://github.com/1gravity/Android-ContactPicker/issues
+android.useAndroidX=true
+android.enableJetifier=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Aug 29 22:41:54 EDT 2016
+#Tue Dec 11 19:24:30 IST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

library/build.gradle

@@ -17,12 +17,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion '26.0.1'
+    compileSdkVersion 28
+    buildToolsVersion '28.0.3'
 
     defaultConfig {
-        minSdkVersion 14
-        targetSdkVersion 25
+        minSdkVersion 15
+        targetSdkVersion 28
     }
 
     buildTypes {
@@ -34,13 +34,19 @@ android {
 }
 
 dependencies {
-    compile "com.android.support:appcompat-v7:$support_lib_version"
-    compile "com.android.support:recyclerview-v7:$support_lib_version"
-    compile "com.android.support:design:$support_lib_version"
+    implementation 'androidx.appcompat:appcompat:1.0.0'
 
-    compile "org.greenrobot:eventbus:$event_lib_version"
+    implementation 'androidx.vectordrawable:vectordrawable-animated:1.0.0'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
 
-    compile "xyz.danoz:recyclerviewfastscroller:$fastscroll_lib_version"
+    implementation 'androidx.annotation:annotation:1.0.0'
+
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    implementation 'com.google.android.material:material:1.0.0'
+
+    implementation "org.greenrobot:eventbus:$event_lib_version"
+
+    implementation "xyz.danoz:recyclerviewfastscroller:$fastscroll_lib_version"
 }
 
 apply from: '../android-artifacts.gradle'

library/src/main/AndroidManifest.xml

@@ -19,6 +19,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.onegravity.contactpicker">
 
-    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="23"/>
 
 </manifest>

library/src/main/java/com/onegravity/contactpicker/BaseFragment.java

@@ -17,11 +17,11 @@
 package com.onegravity.contactpicker;
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.view.MenuItemCompat;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.SearchView;
+import androidx.fragment.app.Fragment;
+import androidx.core.view.MenuItemCompat;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.SearchView;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;

library/src/main/java/com/onegravity/contactpicker/contact/ContactAdapter.java

@@ -17,7 +17,7 @@
 package com.onegravity.contactpicker.contact;
 
 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;

library/src/main/java/com/onegravity/contactpicker/contact/ContactFragment.java

@@ -17,7 +17,7 @@
 package com.onegravity.contactpicker.contact;
 
 import android.os.Bundle;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

library/src/main/java/com/onegravity/contactpicker/contact/ContactViewHolder.java

@@ -18,7 +18,7 @@
 
 import android.net.Uri;
 import android.provider.ContactsContract;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;

library/src/main/java/com/onegravity/contactpicker/core/ContactPickerActivity.java

@@ -26,12 +26,12 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.ContactsContract;
-import android.support.design.widget.TabLayout;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.content.CursorLoader;
-import android.support.v4.content.Loader;
-import android.support.v4.view.ViewPager;
-import android.support.v7.app.AppCompatActivity;
+import com.google.android.material.tabs.TabLayout;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.CursorLoader;
+import androidx.loader.content.Loader;
+import androidx.viewpager.widget.ViewPager;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.util.TypedValue;
 import android.view.Menu;
@@ -367,7 +367,7 @@ protected void onCreate(Bundle savedInstanceState) {
         viewPager.setAdapter(mAdapter);
         viewPager.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(tabLayout));
 
-        tabLayout.setOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
+        tabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
             @Override
             public void onTabSelected(TabLayout.Tab tab) {
                 viewPager.setCurrentItem(tab.getPosition());

library/src/main/java/com/onegravity/contactpicker/core/PagerAdapter.java

@@ -16,9 +16,9 @@
 
 package com.onegravity.contactpicker.core;
 
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentStatePagerAdapter;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
 
 import com.onegravity.contactpicker.contact.ContactDescription;
 import com.onegravity.contactpicker.contact.ContactFragment;

library/src/main/java/com/onegravity/contactpicker/group/GroupAdapter.java

@@ -17,7 +17,7 @@
 package com.onegravity.contactpicker.group;
 
 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;

library/src/main/java/com/onegravity/contactpicker/group/GroupViewHolder.java

@@ -17,7 +17,7 @@
 package com.onegravity.contactpicker.group;
 
 import android.content.res.Resources;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;

library/src/main/res/layout/cp_contact_list.xml

@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@android:id/list"
         android:scrollbars="vertical"
         android:layout_width="match_parent"

library/src/main/res/layout/cp_contact_tab_layout.xml

@@ -6,15 +6,15 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
-    <android.support.design.widget.TabLayout
+    <com.google.android.material.tabs.TabLayout
         android:id="@+id/tabContent"
         app:tabTextColor="?attr/cp_textColorSecondary"
         app:tabSelectedTextColor="?attr/cp_textColorPrimary"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tabMaxWidth="1000dp"/>
 
-    <android.support.v4.view.ViewPager
+    <androidx.viewpager.widget.ViewPager
         android:id="@+id/tabPager"
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>

library/src/main/res/layout/cp_group_list.xml

@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@android:id/list"
         android:scrollbars="vertical"
         android:layout_width="match_parent"

library/src/main/res/menu/cp_contact_picker.xml

@@ -22,7 +22,7 @@
     <item
         android:id="@+id/action_search"
         app:showAsAction="ifRoom|withText|collapseActionView"
-        app:actionViewClass="android.support.v7.widget.SearchView"
+        app:actionViewClass="androidx.appcompat.widget.SearchView"
         android:icon="?attr/cp_actionIconSearch"
         android:title="@android:string/search_go"/>