适配AndroidX

app/build.gradle

@@ -17,7 +17,7 @@ android {
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 10
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         // 混淆配置
         proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-app.pro'
@@ -139,14 +139,14 @@ dependencies {
     // 友盟隔离
     implementation project(':umeng')
 
-    implementation "com.android.support:appcompat-v7:$rootProject.ext.supportLibraryVersion"
-    implementation "com.android.support:design:$rootProject.ext.supportLibraryVersion"
-    implementation "com.android.support:support-v4:$rootProject.ext.supportLibraryVersion"
-    implementation "com.android.support:cardview-v7:$rootProject.ext.supportLibraryVersion"
-    implementation "com.android.support.constraint:constraint-layout:$rootProject.ext.constraintLayoutVersion"
+    implementation 'androidx.appcompat:appcompat:1.1.0-alpha04'
+    implementation 'com.google.android.material:material:1.1.0-alpha06'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha5'
 
     // Dex分包，解决 64k 问题
-    implementation 'com.android.support:multidex:1.0.3'
+    implementation 'androidx.multidex:multidex:2.0.1'
 
     // ButterKnife 注解库：https://github.com/JakeWharton/butterknife
     implementation 'com.jakewharton:butterknife:9.0.0-rc1'

app/src/main/AndroidManifest.xml

@@ -30,7 +30,7 @@
 
         <!-- 适配Android 7.0文件意图 -->
         <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.provider"
             android:exported="false"
             android:grantUriPermissions="true">

app/src/main/java/com/hjq/demo/common/MyActivity.java

@@ -2,9 +2,9 @@ package com.hjq.demo.common;
 
 import android.content.pm.ActivityInfo;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
 import android.util.Log;
 import android.view.View;
 

app/src/main/java/com/hjq/demo/common/MyApplication.java

@@ -2,7 +2,7 @@ package com.hjq.demo.common;
 
 import android.app.Application;
 import android.content.Context;
-import android.support.multidex.MultiDex;
+import androidx.multidex.MultiDex;
 
 import com.hjq.demo.other.EventBusManager;
 import com.hjq.image.ImageLoader;

app/src/main/java/com/hjq/demo/common/MyLazyFragment.java

@@ -2,10 +2,10 @@ package com.hjq.demo.common;
 
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;

app/src/main/java/com/hjq/demo/common/MyListViewAdapter.java

@@ -1,10 +1,10 @@
 package com.hjq.demo.common;
 
 import android.content.Context;
-import android.support.annotation.ColorInt;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.IdRes;
-import android.support.annotation.StringRes;
+import androidx.annotation.ColorInt;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.IdRes;
+import androidx.annotation.StringRes;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CompoundButton;

app/src/main/java/com/hjq/demo/common/MyRecyclerViewAdapter.java

@@ -1,10 +1,10 @@
 package com.hjq.demo.common;
 
 import android.content.Context;
-import android.support.annotation.ColorInt;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.IdRes;
-import android.support.annotation.StringRes;
+import androidx.annotation.ColorInt;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.IdRes;
+import androidx.annotation.StringRes;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CompoundButton;

app/src/main/java/com/hjq/demo/helper/ActivityStackManager.java

@@ -1,7 +1,7 @@
 package com.hjq.demo.helper;
 
 import android.app.Activity;
-import android.support.v4.util.ArrayMap;
+import androidx.collection.ArrayMap;
 
 /**
  *    author : Android 轮子哥

app/src/main/java/com/hjq/demo/helper/IntentExtraUtils.java

@@ -82,7 +82,7 @@ public final class IntentExtraUtils {
         return this;
     }
 
-    public IntentExtraUtils startActivity(android.support.v4.app.Fragment fragment, int requestCode) {
+    public IntentExtraUtils startActivity(androidx.fragment.app.Fragment fragment, int requestCode) {
         fragment.startActivityForResult(new Intent(fragment.getActivity(), sCurrentClass), requestCode);
         return this;
     }

app/src/main/java/com/hjq/demo/helper/PopupWindowHelper.java

@@ -3,8 +3,8 @@ package com.hjq.demo.helper;
 import android.content.Context;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.animation.Animation;

app/src/main/java/com/hjq/demo/helper/RadioButtonGroupHelper.java

@@ -1,6 +1,6 @@
 package com.hjq.demo.helper;
 
-import android.support.annotation.IdRes;
+import androidx.annotation.IdRes;
 import android.view.View;
 import android.widget.CompoundButton;
 import android.widget.RadioButton;

app/src/main/java/com/hjq/demo/other/EventBusManager.java

@@ -1,6 +1,6 @@
 package com.hjq.demo.other;
 
-import android.support.v4.util.ArrayMap;
+import androidx.collection.ArrayMap;
 
 import com.hjq.demo.MyEventBusIndex;
 

app/src/main/java/com/hjq/demo/other/StatusManager.java

@@ -4,10 +4,10 @@ import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.RequiresPermission;
-import android.support.annotation.StringRes;
-import android.support.v4.app.FragmentActivity;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.RequiresPermission;
+import androidx.annotation.StringRes;
+import androidx.fragment.app.FragmentActivity;
 import android.view.View;
 import android.view.ViewGroup;
 

app/src/main/java/com/hjq/demo/ui/activity/DialogActivity.java

@@ -3,7 +3,7 @@ package com.hjq.demo.ui.activity;
 import android.app.Dialog;
 import android.content.Intent;
 import android.content.pm.PackageManager;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.Gravity;
 import android.view.View;
 import android.widget.ImageView;

app/src/main/java/com/hjq/demo/ui/activity/HomeActivity.java

@@ -1,8 +1,8 @@
 package com.hjq.demo.ui.activity;
 
-import android.support.annotation.NonNull;
-import android.support.design.widget.BottomNavigationView;
-import android.support.v4.view.ViewPager;
+import androidx.annotation.NonNull;
+import com.google.android.material.bottomnavigation.BottomNavigationView;
+import androidx.viewpager.widget.ViewPager;
 import android.view.KeyEvent;
 import android.view.MenuItem;
 

app/src/main/java/com/hjq/demo/ui/activity/LoginActivity.java

@@ -1,7 +1,7 @@
 package com.hjq.demo.ui.activity;
 
 import android.content.Intent;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;

app/src/main/java/com/hjq/demo/ui/activity/PhotoActivity.java

@@ -1,6 +1,6 @@
 package com.hjq.demo.ui.activity;
 
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
 
 import com.hjq.demo.R;
 import com.hjq.demo.common.MyActivity;

app/src/main/java/com/hjq/demo/ui/adapter/CopyAdapter.java

@@ -1,7 +1,7 @@
 package com.hjq.demo.ui.adapter;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.ViewGroup;
 
 import com.hjq.demo.R;

app/src/main/java/com/hjq/demo/ui/adapter/PhotoPagerAdapter.java

@@ -1,8 +1,8 @@
 package com.hjq.demo.ui.adapter;
 
 import android.app.Activity;
-import android.support.annotation.NonNull;
-import android.support.v4.view.PagerAdapter;
+import androidx.annotation.NonNull;
+import androidx.viewpager.widget.PagerAdapter;
 import android.view.View;
 import android.view.ViewGroup;
 

app/src/main/java/com/hjq/demo/ui/dialog/CopyDialog.java

@@ -1,6 +1,6 @@
 package com.hjq.demo.ui.dialog;
 
-import android.support.v4.app.FragmentActivity;
+import androidx.fragment.app.FragmentActivity;
 import android.view.Gravity;
 
 import com.hjq.base.BaseDialog;

app/src/main/java/com/hjq/demo/ui/dialog/ShareDialog.java

@@ -3,11 +3,11 @@ package com.hjq.demo.ui.dialog;
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.NonNull;
-import android.support.v4.app.FragmentActivity;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.FragmentActivity;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.TypedValue;
 import android.view.Gravity;
 import android.view.View;

app/src/main/java/com/hjq/demo/ui/dialog/UpdateDialog.java

@@ -11,8 +11,8 @@ import android.os.Environment;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.content.FileProvider;
+import androidx.fragment.app.FragmentActivity;
+import androidx.core.content.FileProvider;
 import android.text.format.Formatter;
 import android.view.Gravity;
 import android.view.View;

app/src/main/java/com/hjq/demo/ui/fragment/TestFragmentA.java

@@ -1,7 +1,7 @@
 package com.hjq.demo.ui.fragment;
 
-import android.support.design.widget.AppBarLayout;
-import android.support.v7.widget.Toolbar;
+import com.google.android.material.appbar.AppBarLayout;
+import androidx.appcompat.widget.Toolbar;
 import android.widget.TextView;
 
 import com.gyf.barlibrary.ImmersionBar;

app/src/main/java/com/hjq/demo/widget/PhotoViewPager.java

@@ -1,7 +1,7 @@
 package com.hjq.demo.widget;
 
 import android.content.Context;
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 

app/src/main/java/com/hjq/demo/widget/XCollapsingToolbarLayout.java

@@ -1,7 +1,7 @@
 package com.hjq.demo.widget;
 
 import android.content.Context;
-import android.support.design.widget.CollapsingToolbarLayout;
+import com.google.android.material.appbar.CollapsingToolbarLayout;
 import android.util.AttributeSet;
 
 /**

app/src/main/res/layout/activity_dialog.xml

@@ -13,7 +13,7 @@
         android:layout_height="wrap_content"
         app:title="对话框案例" />
 
-    <android.support.v4.widget.NestedScrollView
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
@@ -139,6 +139,6 @@
 
         </LinearLayout>
 
-    </android.support.v4.widget.NestedScrollView>
+    </androidx.core.widget.NestedScrollView>
 
 </LinearLayout>

app/src/main/res/layout/activity_home.xml

@@ -14,7 +14,7 @@
         android:layout_weight="1"
         android:fitsSystemWindows="false" />
 
-    <android.support.design.widget.BottomNavigationView
+    <com.google.android.material.bottomnavigation.BottomNavigationView
         android:id="@+id/bv_home_navigation"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

app/src/main/res/layout/activity_register.xml

@@ -18,7 +18,7 @@
         app:leftTitle="@string/register_login"
         app:title="" />
 
-    <android.support.v4.widget.NestedScrollView
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
@@ -122,6 +122,6 @@
 
         </LinearLayout>
 
-    </android.support.v4.widget.NestedScrollView>
+    </androidx.core.widget.NestedScrollView>
 
 </LinearLayout>

app/src/main/res/layout/activity_status.xml

@@ -17,7 +17,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             tools:listCount="10"

app/src/main/res/layout/dialog_update.xml

@@ -51,7 +51,7 @@
             </LinearLayout>
 
             <!--这个地方需要设置可以滚动-->
-            <android.support.v4.widget.NestedScrollView
+            <androidx.core.widget.NestedScrollView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:overScrollMode="never"
@@ -73,7 +73,7 @@
                     android:textSize="13sp"
                     tools:text="更新内容\n更新内容\n更新内容\n更新内容\n更新内容\n更新内容\n更新内容\n更新内容\n更新内容\n更新内容\n更新内容\n更新内容\n更新内容\n更新内容\n" />
 
-            </android.support.v4.widget.NestedScrollView>
+            </androidx.core.widget.NestedScrollView>
 
             <com.hjq.widget.NumberProgressBar
                 android:id="@+id/pb_dialog_update_progress"

app/src/main/res/layout/fragment_test_a.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".ui.fragment.TestFragmentA">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/abl_test_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -30,7 +30,7 @@
                 android:src="@drawable/bg_launcher"
                 app:layout_collapseMode="parallax" />
 
-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                 android:id="@+id/t_test_title"
                 android:layout_width="match_parent"
                 android:layout_height="?android:attr/actionBarSize"
@@ -79,9 +79,9 @@
 
         </com.hjq.demo.widget.XCollapsingToolbarLayout>
 
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
-    <android.support.v4.widget.NestedScrollView
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
@@ -95,6 +95,6 @@
 
         </LinearLayout>
 
-    </android.support.v4.widget.NestedScrollView>
+    </androidx.core.widget.NestedScrollView>
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

app/src/main/res/layout/fragment_test_b.xml

@@ -13,7 +13,7 @@
         app:backButton="false"
         app:title="@string/home_nav_found" />
 
-    <android.support.v4.widget.NestedScrollView
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
@@ -214,6 +214,6 @@
 
         </LinearLayout>
 
-    </android.support.v4.widget.NestedScrollView>
+    </androidx.core.widget.NestedScrollView>
 
 </LinearLayout>

app/src/main/res/layout/fragment_test_c.xml

@@ -13,7 +13,7 @@
         app:backButton="false"
         app:title="@string/home_nav_message" />
 
-    <android.support.v4.widget.NestedScrollView
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
@@ -103,6 +103,6 @@
                 android:text="关闭界面侧滑" />
         </LinearLayout>
 
-    </android.support.v4.widget.NestedScrollView>
+    </androidx.core.widget.NestedScrollView>
 
 </LinearLayout>

app/src/main/res/layout/fragment_test_d.xml

@@ -13,7 +13,7 @@
         app:backButton="false"
         app:title="@string/home_nav_me" />
 
-    <android.support.v4.widget.NestedScrollView
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
@@ -139,6 +139,6 @@
 
         </LinearLayout>
 
-    </android.support.v4.widget.NestedScrollView>
+    </androidx.core.widget.NestedScrollView>
 
 </LinearLayout>

base/build.gradle

@@ -13,6 +13,6 @@ android {
 }
 
 dependencies {
-    implementation "com.android.support:appcompat-v7:$rootProject.ext.supportLibraryVersion"
-    implementation "com.android.support:design:$rootProject.ext.supportLibraryVersion"
+    implementation 'androidx.appcompat:appcompat:1.1.0-alpha04'
+    implementation 'com.google.android.material:material:1.1.0-alpha06'
 }

base/src/main/java/com/hjq/base/BaseActivity.java

@@ -7,8 +7,8 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.SystemClock;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 

base/src/main/java/com/hjq/base/BaseDialog.java

@@ -8,15 +8,15 @@ import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.SystemClock;
-import android.support.annotation.ColorRes;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.IdRes;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
-import android.support.annotation.StyleRes;
-import android.support.v7.app.AppCompatDialog;
+import androidx.annotation.ColorRes;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.IdRes;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.annotation.StyleRes;
+import androidx.appcompat.app.AppCompatDialog;
 import android.util.SparseArray;
 import android.util.SparseIntArray;
 import android.view.Gravity;

base/src/main/java/com/hjq/base/BaseDialogFragment.java

@@ -3,13 +3,13 @@ package com.hjq.base;
 import android.app.Dialog;
 import android.os.Bundle;
 import android.os.SystemClock;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
 
 /**
  *    author : Android 轮子哥

base/src/main/java/com/hjq/base/BaseFragmentAdapter.java

@@ -1,10 +1,10 @@
 package com.hjq.base;
 
-import android.support.annotation.NonNull;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
 import android.view.ViewGroup;
 
 import java.util.ArrayList;

base/src/main/java/com/hjq/base/BaseLazyFragment.java

@@ -4,10 +4,10 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.IdRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
+import androidx.annotation.IdRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;

base/src/main/java/com/hjq/base/BaseListViewAdapter.java

@@ -4,12 +4,12 @@ import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.support.annotation.ColorRes;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.IdRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
+import androidx.annotation.ColorRes;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.IdRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
 import android.util.SparseArray;
 import android.view.LayoutInflater;
 import android.view.View;

base/src/main/java/com/hjq/base/BaseRecyclerViewAdapter.java

@@ -4,14 +4,14 @@ import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.support.annotation.ColorRes;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.IdRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.ColorRes;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.IdRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.SparseArray;
 import android.view.LayoutInflater;
 import android.view.View;

dialog/build.gradle

@@ -13,8 +13,8 @@ android {
 }
 
 dependencies {
-    implementation "com.android.support:appcompat-v7:$rootProject.ext.supportLibraryVersion"
-    implementation "com.android.support:design:$rootProject.ext.supportLibraryVersion"
+    implementation 'androidx.appcompat:appcompat:1.1.0-alpha04'
+    implementation 'com.google.android.material:material:1.1.0-alpha06'
     // 基础库（不包任何第三方框架）
     implementation project(':base')
 }

dialog/src/main/java/com/hjq/dialog/AbsLooperDialog.java

@@ -1,7 +1,7 @@
 package com.hjq.dialog;
 
 import android.content.Context;
-import android.support.v4.app.FragmentActivity;
+import androidx.fragment.app.FragmentActivity;
 import android.util.DisplayMetrics;
 import android.view.Gravity;
 import android.view.View;

dialog/src/main/java/com/hjq/dialog/AddressDialog.java

@@ -3,10 +3,10 @@ package com.hjq.dialog;
 import android.app.Dialog;
 import android.content.Context;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.design.widget.TabLayout;
-import android.support.v4.app.FragmentActivity;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import com.google.android.material.tabs.TabLayout;
+import androidx.fragment.app.FragmentActivity;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.DisplayMetrics;
 import android.util.TypedValue;
 import android.view.Gravity;

dialog/src/main/java/com/hjq/dialog/DateDialog.java

@@ -1,7 +1,7 @@
 package com.hjq.dialog;
 
 import android.app.Dialog;
-import android.support.v4.app.FragmentActivity;
+import androidx.fragment.app.FragmentActivity;
 
 import com.hjq.dialog.widget.LoopView;
 

dialog/src/main/java/com/hjq/dialog/InputDialog.java

@@ -2,7 +2,7 @@ package com.hjq.dialog;
 
 import android.app.Dialog;
 import android.content.Context;
-import android.support.v4.app.FragmentActivity;
+import androidx.fragment.app.FragmentActivity;
 import android.view.Gravity;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;

dialog/src/main/java/com/hjq/dialog/MenuDialog.java

@@ -2,10 +2,10 @@ package com.hjq.dialog;
 
 import android.app.Dialog;
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.v4.app.FragmentActivity;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.FragmentActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup;

dialog/src/main/java/com/hjq/dialog/MessageDialog.java

@@ -1,7 +1,7 @@
 package com.hjq.dialog;
 
 import android.app.Dialog;
-import android.support.v4.app.FragmentActivity;
+import androidx.fragment.app.FragmentActivity;
 import android.view.Gravity;
 import android.view.View;
 import android.widget.TextView;

dialog/src/main/java/com/hjq/dialog/PayPasswordDialog.java

@@ -2,10 +2,10 @@ package com.hjq.dialog;
 
 import android.app.Dialog;
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.v4.app.FragmentActivity;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.FragmentActivity;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup;

dialog/src/main/java/com/hjq/dialog/ToastDialog.java

@@ -1,6 +1,6 @@
 package com.hjq.dialog;
 
-import android.support.v4.app.FragmentActivity;
+import androidx.fragment.app.FragmentActivity;
 import android.view.Gravity;
 import android.widget.ImageView;
 import android.widget.TextView;

dialog/src/main/java/com/hjq/dialog/WaitDialog.java

@@ -1,6 +1,6 @@
 package com.hjq.dialog;
 
-import android.support.v4.app.FragmentActivity;
+import androidx.fragment.app.FragmentActivity;
 import android.view.Gravity;
 import android.view.View;
 import android.widget.TextView;

dialog/src/main/java/com/hjq/dialog/widget/CircleProgressView.java

@@ -15,8 +15,8 @@ import android.graphics.drawable.Animatable;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.SystemClock;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.util.TypedValue;
 import android.view.View;

dialog/src/main/java/com/hjq/dialog/widget/PasswordView.java

@@ -4,7 +4,7 @@ import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.Path;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.util.TypedValue;
 import android.view.View;

dialog/src/main/res/layout/dialog_address.xml

@@ -38,7 +38,7 @@
         android:layout_height="1px"
         android:background="#ececec" />
 
-    <android.support.design.widget.TabLayout
+    <com.google.android.material.tabs.TabLayout
         android:id="@+id/tb_dialog_address_tab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -57,25 +57,25 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rv_dialog_address_list1"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:visibility="visible" />
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rv_dialog_address_list2"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:visibility="gone" />
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rv_dialog_address_list3"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:visibility="gone" />
 
-        <android.support.v7.widget.AppCompatImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/iv_dialog_address_hint"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"

dialog/src/main/res/layout/dialog_menu.xml

@@ -9,14 +9,14 @@
     android:paddingLeft="30dp"
     android:paddingRight="30dp">
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv_dialog_menu_list"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="10dp"
         android:background="@drawable/dialog_message_bg"
         android:overScrollMode="never"
-        tools:layoutManager="android.support.v7.widget.LinearLayoutManager"
+        tools:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
         tools:listitem="@layout/item_dialog_menu" />
 
     <TextView

dialog/src/main/res/layout/dialog_pay_password.xml

@@ -72,12 +72,12 @@
         android:layout_height="1px"
         android:background="#ECECEC" />
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv_dialog_pay_list"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:overScrollMode="never"
-        tools:layoutManager="android.support.v7.widget.GridLayoutManager"
+        tools:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
         tools:listitem="@layout/item_dialog_pay_password"
         tools:spanCount="3" />
 

gradle.properties

@@ -9,6 +9,8 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
 
 # When configured, Gradle will run in incubating parallel mode.

image/build.gradle

@@ -15,8 +15,8 @@ android {
 }
 
 dependencies {
-    implementation "com.android.support:appcompat-v7:$rootProject.ext.supportLibraryVersion"
-    implementation "com.android.support:design:$rootProject.ext.supportLibraryVersion"
+    implementation 'androidx.appcompat:appcompat:1.1.0-alpha04'
+    implementation 'com.google.android.material:material:1.1.0-alpha06'
     implementation 'com.github.bumptech.glide:glide:4.9.0'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
 }

image/src/main/java/com/hjq/image/GlideHandler.java

@@ -9,8 +9,8 @@ import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.RectF;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.NonNull;
-import android.support.v4.app.FragmentActivity;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.FragmentActivity;
 import android.widget.ImageView;
 
 import com.bumptech.glide.Glide;
@@ -112,8 +112,8 @@ final class GlideHandler implements ImageHandler {
             }
         } else if (object instanceof Fragment) {
             return Glide.with((Fragment) object);
-        }else if (object instanceof android.support.v4.app.Fragment) {
-            return Glide.with((android.support.v4.app.Fragment) object);
+        }else if (object instanceof androidx.fragment.app.Fragment) {
+            return Glide.with((androidx.fragment.app.Fragment) object);
         }
         // 直接抛出异常
         throw new IllegalArgumentException("This object is illegal");

image/src/main/java/com/hjq/image/ImageLoader.java

@@ -3,8 +3,8 @@ package com.hjq.image;
 import android.app.Application;
 import android.app.Fragment;
 import android.content.Context;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.NonNull;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
 import android.widget.ImageView;
 
 /**
@@ -55,7 +55,7 @@ public final class ImageLoader {
     public static void loadImage(Fragment fragment, @NonNull ImageView imageView, String url) {
         sImageHandler.loadImage(fragment, imageView, url);
     }
-    public static void loadImage(android.support.v4.app.Fragment fragment, @NonNull ImageView imageView, String url) {
+    public static void loadImage(androidx.fragment.app.Fragment fragment, @NonNull ImageView imageView, String url) {
         sImageHandler.loadImage(fragment, imageView, url);
     }
 
@@ -68,7 +68,7 @@ public final class ImageLoader {
     public static void loadImage(Fragment fragment, @NonNull ImageView imageView, @DrawableRes int resourceId) {
         sImageHandler.loadImage(fragment, imageView, resourceId);
     }
-    public static void loadImage(android.support.v4.app.Fragment fragment, @NonNull ImageView imageView, @DrawableRes int resourceId) {
+    public static void loadImage(androidx.fragment.app.Fragment fragment, @NonNull ImageView imageView, @DrawableRes int resourceId) {
         sImageHandler.loadImage(fragment, imageView, resourceId);
     }
 
@@ -85,7 +85,7 @@ public final class ImageLoader {
     public static void loadCircleImage(Fragment fragment, @NonNull ImageView imageView, String url) {
         sImageHandler.loadCircleImage(fragment, imageView, url);
     }
-    public static void loadCircleImage(android.support.v4.app.Fragment fragment, @NonNull ImageView imageView, String url) {
+    public static void loadCircleImage(androidx.fragment.app.Fragment fragment, @NonNull ImageView imageView, String url) {
         sImageHandler.loadCircleImage(fragment, imageView, url);
     }
 
@@ -98,7 +98,7 @@ public final class ImageLoader {
     public static void loadCircleImage(Fragment fragment, @NonNull ImageView imageView, @DrawableRes int resourceId) {
         sImageHandler.loadCircleImage(fragment, imageView, resourceId);
     }
-    public static void loadCircleImage(android.support.v4.app.Fragment fragment, @NonNull ImageView imageView, @DrawableRes int resourceId) {
+    public static void loadCircleImage(androidx.fragment.app.Fragment fragment, @NonNull ImageView imageView, @DrawableRes int resourceId) {
         sImageHandler.loadCircleImage(fragment, imageView, resourceId);
     }
 
@@ -115,7 +115,7 @@ public final class ImageLoader {
     public static void loadRoundImage(Fragment fragment, @NonNull ImageView imageView, String url, float radius) {
         sImageHandler.loadRoundImage(fragment, imageView, url, radius);
     }
-    public static void loadRoundImage(android.support.v4.app.Fragment fragment, @NonNull ImageView imageView, String url, float radius) {
+    public static void loadRoundImage(androidx.fragment.app.Fragment fragment, @NonNull ImageView imageView, String url, float radius) {
         sImageHandler.loadRoundImage(fragment, imageView, url, radius);
     }
 
@@ -128,7 +128,7 @@ public final class ImageLoader {
     public static void loadRoundImage(Fragment fragment, @NonNull ImageView imageView, @DrawableRes int resourceId, float radius) {
         sImageHandler.loadRoundImage(fragment, imageView, resourceId, radius);
     }
-    public static void loadRoundImage(android.support.v4.app.Fragment fragment, @NonNull ImageView imageView, @DrawableRes int resourceId, float radius) {
+    public static void loadRoundImage(androidx.fragment.app.Fragment fragment, @NonNull ImageView imageView, @DrawableRes int resourceId, float radius) {
         sImageHandler.loadRoundImage(fragment, imageView, resourceId, radius);
     }
 }

umeng/build.gradle

@@ -17,5 +17,5 @@ android {
 dependencies {
     // 依赖 libs 目录下所有 Jar 包
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation "com.android.support:appcompat-v7:$rootProject.ext.supportLibraryVersion"
+    implementation 'androidx.appcompat:appcompat:1.1.0-alpha04'
 }

umeng/src/main/java/com/hjq/umeng/UmengClient.java

@@ -6,9 +6,9 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
 
 import com.umeng.analytics.MobclickAgent;
 import com.umeng.commonsdk.UMConfigure;

umeng/src/main/java/com/hjq/umeng/UmengShare.java

@@ -1,7 +1,7 @@
 package com.hjq.umeng;
 
 import android.content.Context;
-import android.support.annotation.DrawableRes;
+import androidx.annotation.DrawableRes;
 
 import com.umeng.socialize.UMShareListener;
 import com.umeng.socialize.bean.SHARE_MEDIA;

widget/build.gradle

@@ -13,8 +13,8 @@ android {
 }
 
 dependencies {
-    implementation "com.android.support:appcompat-v7:$rootProject.ext.supportLibraryVersion"
-    implementation "com.android.support:design:$rootProject.ext.supportLibraryVersion"
+    implementation 'androidx.appcompat:appcompat:1.1.0-alpha04'
+    implementation 'com.google.android.material:material:1.1.0-alpha06'
     // 基础库（不包任何第三方框架）
     implementation project(':base')
 }

widget/src/main/java/com/hjq/widget/ClearEditText.java

@@ -4,10 +4,10 @@ import android.annotation.SuppressLint;
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.graphics.drawable.DrawableCompat;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import androidx.core.content.ContextCompat;
+import androidx.core.graphics.drawable.DrawableCompat;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.AttributeSet;

widget/src/main/java/com/hjq/widget/CountdownView.java

@@ -3,8 +3,8 @@ package com.hjq.widget;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.Build;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 import android.util.AttributeSet;
 import android.widget.TextView;
 

widget/src/main/java/com/hjq/widget/HintLayout.java

@@ -4,11 +4,11 @@ import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.support.annotation.AttrRes;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
+import androidx.annotation.AttrRes;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;

widget/src/main/java/com/hjq/widget/NoScrollViewPager.java

@@ -2,8 +2,8 @@ package com.hjq.widget;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.v4.view.ViewPager;
+import androidx.annotation.NonNull;
+import androidx.viewpager.widget.ViewPager;
 import android.util.AttributeSet;
 import android.view.KeyEvent;
 import android.view.MotionEvent;

widget/src/main/java/com/hjq/widget/SimpleLayout.java

@@ -2,7 +2,7 @@ package com.hjq.widget;
 
 import android.content.Context;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;

widget/src/main/java/com/hjq/widget/SwitchButton.java

@@ -13,8 +13,8 @@ import android.graphics.Shader;
 import android.os.Build;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 import android.util.AttributeSet;
 import android.util.TypedValue;
 import android.view.MotionEvent;

widget/src/main/java/com/hjq/widget/square/SquareImageView.java

@@ -1,7 +1,7 @@
 package com.hjq.widget.square;
 
 import android.content.Context;
-import android.support.v7.widget.AppCompatImageView;
+import androidx.appcompat.widget.AppCompatImageView;
 import android.util.AttributeSet;
 
 /**

widget/src/main/java/com/hjq/widget/square/SquareTextView.java

@@ -1,7 +1,7 @@
 package com.hjq.widget.square;
 
 import android.content.Context;
-import android.support.v7.widget.AppCompatTextView;
+import androidx.appcompat.widget.AppCompatTextView;
 import android.util.AttributeSet;
 
 /**