From 63c6f7e524c0409beb4066c64181df1908f60f8b Mon Sep 17 00:00:00 2001
From: Pham Hong Viet <viet.pham@ascendcorp.com>
Date: Wed, 12 Jun 2019 13:07:44 +0700
Subject: [PATCH] migrate to AndroidX

---
 .idea/gradle.xml                              | 11 +--
 app/app.iml                                   | 97 +++++++++++++------
 app/build.gradle                              | 18 ++--
 .../com/rey/material/app/ContactEditText.java |  2 +-
 .../com/rey/material/app/ContactView.java     |  5 +-
 .../material/app/RecurringPickerDialog.java   |  3 +-
 .../java/com/rey/material/app/WeekView.java   |  7 +-
 .../com/rey/material/demo/ButtonFragment.java | 14 +--
 .../rey/material/demo/CustomViewPager.java    |  5 +-
 .../rey/material/demo/DialogsFragment.java    |  4 +-
 .../com/rey/material/demo/FabFragment.java    |  2 +-
 .../com/rey/material/demo/MainActivity.java   | 36 +++----
 .../rey/material/demo/ProgressFragment.java   |  2 +-
 .../com/rey/material/demo/SliderFragment.java |  2 +-
 .../rey/material/demo/SnackbarFragment.java   |  2 +-
 .../rey/material/demo/SpinnersFragment.java   |  2 +-
 .../rey/material/demo/SwitchesFragment.java   |  2 +-
 .../rey/material/demo/TextfieldFragment.java  |  2 +-
 app/src/main/res/layout/activity_main.xml     |  6 +-
 build.gradle                                  |  2 +-
 gradle/wrapper/gradle-wrapper.properties      |  4 +-
 gradlew                                       |  0
 material/build.gradle                         | 14 +--
 .../appcompat}/widget/ListViewCompat.java     | 18 ++--
 .../java/com/rey/material/app/Dialog.java     |  7 +-
 .../com/rey/material/app/DialogFragment.java  |  4 +-
 .../com/rey/material/app/SimpleDialog.java    |  3 +-
 .../com/rey/material/app/ThemeManager.java    |  7 +-
 .../com/rey/material/app/ToolbarManager.java  | 15 +--
 .../drawable/LineMorphingDrawable.java        |  5 +-
 .../material/drawable/PaddingDrawable.java    |  3 +-
 .../java/com/rey/material/widget/Button.java  |  5 +-
 .../rey/material/widget/CheckedTextView.java  |  5 +-
 .../widget/CircleCheckedTextView.java         |  3 +-
 .../rey/material/widget/CompoundButton.java   |  2 +-
 .../com/rey/material/widget/EditText.java     | 15 +--
 .../material/widget/FloatingActionButton.java |  2 +-
 .../com/rey/material/widget/FrameLayout.java  |  2 +-
 .../com/rey/material/widget/ImageButton.java  |  5 +-
 .../com/rey/material/widget/ImageView.java    |  5 +-
 .../com/rey/material/widget/LinearLayout.java |  2 +-
 .../rey/material/widget/ListPopupWindow.java  | 11 ++-
 .../com/rey/material/widget/ListView.java     |  3 +-
 .../com/rey/material/widget/ProgressView.java |  2 +-
 .../rey/material/widget/RelativeLayout.java   |  2 +-
 .../java/com/rey/material/widget/Slider.java  |  2 +-
 .../java/com/rey/material/widget/Spinner.java |  2 +-
 .../java/com/rey/material/widget/Switch.java  |  2 +-
 .../rey/material/widget/TabIndicatorView.java | 11 ++-
 .../rey/material/widget/TabPageIndicator.java |  9 +-
 .../com/rey/material/widget/TextView.java     |  5 +-
 .../com/rey/material/widget/TimePicker.java   |  2 +-
 .../com/rey/material/widget/YearPicker.java   |  3 +-
 53 files changed, 225 insertions(+), 179 deletions(-)
 mode change 100644 => 100755 gradlew
 rename material/src/main/java/{android/support/v7 => androidx/appcompat}/widget/ListViewCompat.java (97%)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 4d302ff4..24de682b 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -3,6 +3,9 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <compositeConfiguration>
+          <compositeBuild compositeDefinitionSource="SCRIPT" />
+        </compositeConfiguration>
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleJvm" value="1.7" />
@@ -13,13 +16,7 @@
             <option value="$PROJECT_DIR$/material" />
           </set>
         </option>
-        <option name="myModules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/app" />
-            <option value="$PROJECT_DIR$/material" />
-          </set>
-        </option>
+        <option name="resolveModulePerSourceSet" value="false" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/app/app.iml b/app/app.iml
index f38e504e..1291214c 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -17,28 +17,27 @@
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/build/generated/res/resValues/debug" />
+        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" />
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
       </configuration>
     </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
-    <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
+    <output url="file://$MODULE_DIR$/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
@@ -84,50 +83,88 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources" />
+      <excludeFolder url="file://$MODULE_DIR$/build/generated/source/r" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotation_processor_list" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/apk_list" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundle_manifest" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check_manifest_result" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/compatible_screen_manifest" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/duplicate_classes_check" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/external_libs_dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_app_manifest" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_merged_manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint_jar" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_assets" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_jni_libs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_shaders" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/metadata_feature_manifest" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/processed_res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shader_assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/signing_config" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
-      <excludeFolder url="file://$MODULE_DIR$/build/ivy.xml" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/validate_signing_config" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/reports" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 27 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Gradle: androidx.swiperefreshlayout:swiperefreshlayout:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-ui:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.loader:loader:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.drawerlayout:drawerlayout:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.documentfile:documentfile:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.localbroadcastmanager:localbroadcastmanager:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.recyclerview:recyclerview:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.cardview:cardview:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.customview:customview:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.core:core:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.leakcanary:leakcanary-android:1.3.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.asynclayoutinflater:asynclayoutinflater:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.picasso:picasso:2.5.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.interpolator:interpolator:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.fragment:fragment:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.0.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-utils:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.print:print:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.leakcanary:leakcanary-analyzer:1.3.1@jar" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.1.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-fragment-27.1.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-annotations:27.1.1@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:cardview-v7-27.1.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable-27.1.1" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.core:runtime-1.1.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-compat-27.1.1" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.slidingpanelayout:slidingpanelayout:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.0.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.annotation:annotation:1.0.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.haha:haha:1.3@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:appcompat-v7-27.1.1" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.lifecycle:viewmodel-1.1.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.leakcanary:leakcanary-android-1.3.1" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.coordinatorlayout:coordinatorlayout:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.leakcanary:leakcanary-watcher:1.3.1@jar" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata-core-1.1.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:recyclerview-v7-27.1.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable-27.1.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-core-ui-27.1.1" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.core:common:1.1.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-core-utils-27.1.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.picasso:picasso:2.5.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime-1.1.0" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.arch.core:core-runtime:2.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.collection:collection:1.0.0@jar" level="project" />
     <orderEntry type="module" module-name="material-material" />
   </component>
 </module>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 70066e1d..f89ec5be 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,15 +1,15 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion "28.0.0"
+    compileSdkVersion 28
+    buildToolsVersion "28.0.3"
 
     defaultConfig {
         applicationId "com.rey.material.demo"
         minSdkVersion 14
-        targetSdkVersion 27
-        versionCode 6
-        versionName "0.0.6"
+        targetSdkVersion 28
+        versionCode 7
+        versionName "0.0.7"
     }
 
     buildTypes {
@@ -34,14 +34,14 @@ android {
 }
 
 ext{
-    libSupportVersion = '27.1.1'
+    androidXVersion = '1.0.0'
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "com.android.support:appcompat-v7:${libSupportVersion}"
-    implementation "com.android.support:cardview-v7:${libSupportVersion}"
-    implementation "com.android.support:recyclerview-v7:${libSupportVersion}"
+    implementation "androidx.appcompat:appcompat:${androidXVersion}"
+    implementation "androidx.cardview:cardview:${androidXVersion}"
+    implementation "androidx.recyclerview:recyclerview:${androidXVersion}"
     implementation 'com.squareup.picasso:picasso:2.5.0'
     implementation 'com.squareup.leakcanary:leakcanary-android:1.3.1'
     implementation project(':material')
diff --git a/app/src/main/java/com/rey/material/app/ContactEditText.java b/app/src/main/java/com/rey/material/app/ContactEditText.java
index 405f8b94..86c3dc35 100644
--- a/app/src/main/java/com/rey/material/app/ContactEditText.java
+++ b/app/src/main/java/com/rey/material/app/ContactEditText.java
@@ -16,7 +16,7 @@
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.provider.ContactsContract;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.Editable;
 import android.text.Selection;
 import android.text.SpannableStringBuilder;
diff --git a/app/src/main/java/com/rey/material/app/ContactView.java b/app/src/main/java/com/rey/material/app/ContactView.java
index 10cb0a5e..08a0c720 100644
--- a/app/src/main/java/com/rey/material/app/ContactView.java
+++ b/app/src/main/java/com/rey/material/app/ContactView.java
@@ -16,8 +16,9 @@
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.v4.view.GravityCompat;
+import androidx.annotation.NonNull;
+import androidx.core.view.GravityCompat;
+
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.util.TypedValue;
diff --git a/app/src/main/java/com/rey/material/app/RecurringPickerDialog.java b/app/src/main/java/com/rey/material/app/RecurringPickerDialog.java
index 7138bb29..09361af3 100644
--- a/app/src/main/java/com/rey/material/app/RecurringPickerDialog.java
+++ b/app/src/main/java/com/rey/material/app/RecurringPickerDialog.java
@@ -13,7 +13,6 @@
 import android.os.Build;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.v4.view.ViewCompat;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
@@ -32,6 +31,8 @@
 import android.widget.LinearLayout;
 import android.widget.ScrollView;
 
+import androidx.core.view.ViewCompat;
+
 import com.rey.material.demo.R;
 import com.rey.material.util.ThemeUtil;
 import com.rey.material.util.ViewUtil;
diff --git a/app/src/main/java/com/rey/material/app/WeekView.java b/app/src/main/java/com/rey/material/app/WeekView.java
index 17d185d8..7ec8d2ea 100644
--- a/app/src/main/java/com/rey/material/app/WeekView.java
+++ b/app/src/main/java/com/rey/material/app/WeekView.java
@@ -5,22 +5,19 @@
 import android.content.res.Configuration;
 import android.content.res.TypedArray;
 import android.graphics.Paint;
-import android.os.Build;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
 import android.util.AttributeSet;
 import android.util.TypedValue;
 import android.view.View;
 import android.widget.FrameLayout;
 
-import com.rey.material.demo.R;
+import androidx.annotation.NonNull;
+
 import com.rey.material.util.ThemeUtil;
-import com.rey.material.util.ViewUtil;
 import com.rey.material.widget.CircleCheckedTextView;
 
 import java.util.Calendar;
-import java.util.Locale;
 
 /**
  * Created by Rey on 2/6/2015.
diff --git a/app/src/main/java/com/rey/material/demo/ButtonFragment.java b/app/src/main/java/com/rey/material/demo/ButtonFragment.java
index 542d0f4b..6d9df29e 100644
--- a/app/src/main/java/com/rey/material/demo/ButtonFragment.java
+++ b/app/src/main/java/com/rey/material/demo/ButtonFragment.java
@@ -1,26 +1,18 @@
 package com.rey.material.demo;
 
 import android.annotation.TargetApi;
-import android.app.AlertDialog;
-import android.content.DialogInterface;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Toast;
 
-import com.rey.material.app.DialogFragment;
-import com.rey.material.app.Recurring;
-import com.rey.material.app.RecurringPickerDialog;
-import com.rey.material.drawable.RippleDrawable;
+import androidx.fragment.app.Fragment;
+
 import com.rey.material.widget.Button;
 import com.rey.material.widget.FloatingActionButton;
 
-import java.util.Calendar;
-
-public class ButtonFragment extends Fragment{
+public class ButtonFragment extends Fragment {
 
 	public static ButtonFragment newInstance(){
 		ButtonFragment fragment = new ButtonFragment();
diff --git a/app/src/main/java/com/rey/material/demo/CustomViewPager.java b/app/src/main/java/com/rey/material/demo/CustomViewPager.java
index 4d16a4c7..e05ce6cf 100644
--- a/app/src/main/java/com/rey/material/demo/CustomViewPager.java
+++ b/app/src/main/java/com/rey/material/demo/CustomViewPager.java
@@ -1,17 +1,18 @@
 package com.rey.material.demo;
 
 import android.content.Context;
-import android.support.v4.view.ViewPager;
 import android.util.AttributeSet;
 import android.view.View;
 
+import androidx.viewpager.widget.ViewPager;
+
 import com.rey.material.widget.Slider;
 import com.rey.material.widget.Switch;
 
 /**
  * Created by Rey on 3/18/2015.
  */
-public class CustomViewPager extends ViewPager{
+public class CustomViewPager extends ViewPager {
 
     public CustomViewPager(Context context, AttributeSet attrs) {
         super(context, attrs);
diff --git a/app/src/main/java/com/rey/material/demo/DialogsFragment.java b/app/src/main/java/com/rey/material/demo/DialogsFragment.java
index da0d8454..807a5755 100644
--- a/app/src/main/java/com/rey/material/demo/DialogsFragment.java
+++ b/app/src/main/java/com/rey/material/demo/DialogsFragment.java
@@ -1,15 +1,15 @@
 package com.rey.material.demo;
 
 import android.annotation.TargetApi;
-import android.content.Context;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Toast;
 
+import androidx.fragment.app.Fragment;
+
 import com.rey.material.app.BottomSheetDialog;
 import com.rey.material.app.DatePickerDialog;
 import com.rey.material.app.Dialog;
diff --git a/app/src/main/java/com/rey/material/demo/FabFragment.java b/app/src/main/java/com/rey/material/demo/FabFragment.java
index c57d891c..9ae53d79 100644
--- a/app/src/main/java/com/rey/material/demo/FabFragment.java
+++ b/app/src/main/java/com/rey/material/demo/FabFragment.java
@@ -4,7 +4,7 @@
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/com/rey/material/demo/MainActivity.java b/app/src/main/java/com/rey/material/demo/MainActivity.java
index babf68f0..ac941853 100644
--- a/app/src/main/java/com/rey/material/demo/MainActivity.java
+++ b/app/src/main/java/com/rey/material/demo/MainActivity.java
@@ -2,14 +2,16 @@
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentStatePagerAdapter;
-import android.support.v4.view.GravityCompat;
-import android.support.v4.view.ViewPager;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.view.GravityCompat;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -54,14 +56,14 @@ protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		
 		setContentView(R.layout.activity_main);
-				
-		dl_navigator = (DrawerLayout)findViewById(R.id.main_dl);
-		fl_drawer = (FrameLayout)findViewById(R.id.main_fl_drawer);
-		lv_drawer = (ListView)findViewById(R.id.main_lv_drawer);
-		mToolbar = (Toolbar)findViewById(R.id.main_toolbar);
-		vp = (CustomViewPager)findViewById(R.id.main_vp);
-		tiv = (TabIndicatorView)findViewById(R.id.main_tiv);
-        mSnackBar = (SnackBar)findViewById(R.id.main_sn);
+
+        lv_drawer = findViewById(R.id.main_lv_drawer);
+		dl_navigator = findViewById(R.id.main_dl);
+		fl_drawer = findViewById(R.id.main_fl_drawer);
+        mToolbar = findViewById(R.id.main_toolbar);
+		vp = findViewById(R.id.main_vp);
+		tiv = findViewById(R.id.main_tiv);
+        mSnackBar = findViewById(R.id.main_sn);
 
         mToolbarManager = new ToolbarManager(getDelegate(), mToolbar, R.id.tb_group_main, R.style.ToolbarRippleStyle, R.anim.abc_fade_in, R.anim.abc_fade_out);
         mToolbarManager.setNavigationManager(new ToolbarManager.ThemableNavigationManager(R.array.navigation_drawer, getSupportFragmentManager(), mToolbar, dl_navigator) {
@@ -278,7 +280,7 @@ private static class PagerAdapter extends FragmentStatePagerAdapter {
 		static {
 			Field f = null;
 			try {
-				Class<?> c = Class.forName("android.support.v4.app.FragmentManagerImpl");
+				Class<?> c = Class.forName("androidx.fragment.app.FragmentManagerImpl");
 				f = c.getDeclaredField("mActive");
 				f.setAccessible(true);   
 			} catch (Exception e) {}
diff --git a/app/src/main/java/com/rey/material/demo/ProgressFragment.java b/app/src/main/java/com/rey/material/demo/ProgressFragment.java
index ce80224a..2426fa93 100644
--- a/app/src/main/java/com/rey/material/demo/ProgressFragment.java
+++ b/app/src/main/java/com/rey/material/demo/ProgressFragment.java
@@ -4,7 +4,7 @@
 import android.os.Handler;
 import android.os.Handler.Callback;
 import android.os.Message;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/com/rey/material/demo/SliderFragment.java b/app/src/main/java/com/rey/material/demo/SliderFragment.java
index 397f4cde..0866a7af 100644
--- a/app/src/main/java/com/rey/material/demo/SliderFragment.java
+++ b/app/src/main/java/com/rey/material/demo/SliderFragment.java
@@ -3,7 +3,7 @@
 import android.annotation.TargetApi;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/com/rey/material/demo/SnackbarFragment.java b/app/src/main/java/com/rey/material/demo/SnackbarFragment.java
index 31664825..34192d3a 100644
--- a/app/src/main/java/com/rey/material/demo/SnackbarFragment.java
+++ b/app/src/main/java/com/rey/material/demo/SnackbarFragment.java
@@ -3,7 +3,7 @@
 import android.annotation.TargetApi;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/com/rey/material/demo/SpinnersFragment.java b/app/src/main/java/com/rey/material/demo/SpinnersFragment.java
index 741459c6..44d473de 100644
--- a/app/src/main/java/com/rey/material/demo/SpinnersFragment.java
+++ b/app/src/main/java/com/rey/material/demo/SpinnersFragment.java
@@ -4,7 +4,7 @@
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/com/rey/material/demo/SwitchesFragment.java b/app/src/main/java/com/rey/material/demo/SwitchesFragment.java
index f86a6ee3..50962b63 100644
--- a/app/src/main/java/com/rey/material/demo/SwitchesFragment.java
+++ b/app/src/main/java/com/rey/material/demo/SwitchesFragment.java
@@ -3,7 +3,7 @@
 import android.annotation.TargetApi;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/com/rey/material/demo/TextfieldFragment.java b/app/src/main/java/com/rey/material/demo/TextfieldFragment.java
index 0c33fdc9..17964df1 100644
--- a/app/src/main/java/com/rey/material/demo/TextfieldFragment.java
+++ b/app/src/main/java/com/rey/material/demo/TextfieldFragment.java
@@ -14,7 +14,7 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.provider.ContactsContract;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
 import android.view.KeyEvent;
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 04e4c705..87cf4698 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.DrawerLayout
+<androidx.drawerlayout.widget.DrawerLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/main_dl"
@@ -15,7 +15,7 @@
             android:layout_height="match_parent"
             android:orientation="vertical">
 
-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                 android:id="@+id/main_toolbar"
                 android:layout_height="wrap_content"
                 android:layout_width="match_parent"
@@ -65,4 +65,4 @@
         
     </FrameLayout>    
     
-</android.support.v4.widget.DrawerLayout>
+</androidx.drawerlayout.widget.DrawerLayout>
diff --git a/build.gradle b/build.gradle
index 3f2437ec..d85a8983 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.3'
+        classpath 'com.android.tools.build:gradle:3.4.1'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index eb4006a1..d766e268 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Jun 22 15:44:18 ICT 2018
+#Wed Jun 12 11:01:23 ICT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
diff --git a/gradlew b/gradlew
old mode 100644
new mode 100755
diff --git a/material/build.gradle b/material/build.gradle
index 5a28b075..36b72eed 100644
--- a/material/build.gradle
+++ b/material/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion "28.0.0"
+    compileSdkVersion 28
+    buildToolsVersion "28.0.3"
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 22
         versionName "1.2.5"
     }
@@ -19,15 +19,15 @@ android {
 }
 
 ext{
-    libSupportVersion = '27.1.1'
+    androidXVersion = '1.0.0'
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     testImplementation 'junit:junit:4.12'
-    implementation "com.android.support:appcompat-v7:${libSupportVersion}"
-    implementation "com.android.support:cardview-v7:${libSupportVersion}"
-    implementation "com.android.support:recyclerview-v7:${libSupportVersion}"
+    implementation "androidx.appcompat:appcompat:${androidXVersion}"
+    implementation "androidx.cardview:cardview:${androidXVersion}"
+    implementation "androidx.recyclerview:recyclerview:${androidXVersion}"
 }
 
 // Place it at the end of the file
diff --git a/material/src/main/java/android/support/v7/widget/ListViewCompat.java b/material/src/main/java/androidx/appcompat/widget/ListViewCompat.java
similarity index 97%
rename from material/src/main/java/android/support/v7/widget/ListViewCompat.java
rename to material/src/main/java/androidx/appcompat/widget/ListViewCompat.java
index 970f7623..71664cfc 100644
--- a/material/src/main/java/android/support/v7/widget/ListViewCompat.java
+++ b/material/src/main/java/androidx/appcompat/widget/ListViewCompat.java
@@ -13,13 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package android.support.v7.widget;
+package androidx.appcompat.widget;
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
-import android.support.v4.graphics.drawable.DrawableCompat;
-import android.support.v7.graphics.drawable.DrawableWrapper;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
@@ -27,13 +26,12 @@
 import android.widget.AbsListView;
 import android.widget.ListAdapter;
 import android.widget.ListView;
+
+import androidx.appcompat.graphics.drawable.DrawableWrapper;
+import androidx.core.graphics.drawable.DrawableCompat;
+
 import java.lang.reflect.Field;
-/**
- * This class contains a number of useful things for ListView. Mainly used by
- * {@link android.support.v7.widget.ListPopupWindow}.
- *
- * @hide
- */
+
 public class ListViewCompat extends ListView {
     public static final int INVALID_POSITION = -1;
     public static final int NO_POSITION = -1;
@@ -302,6 +300,8 @@ protected void setSelectorEnabled(boolean enabled) {
             mSelector.setEnabled(enabled);
         }
     }
+
+    @SuppressLint("RestrictedApi")
     private static class GateKeeperDrawable extends DrawableWrapper {
         private boolean mEnabled;
         public GateKeeperDrawable(Drawable drawable) {
diff --git a/material/src/main/java/com/rey/material/app/Dialog.java b/material/src/main/java/com/rey/material/app/Dialog.java
index de428211..5119c475 100644
--- a/material/src/main/java/com/rey/material/app/Dialog.java
+++ b/material/src/main/java/com/rey/material/app/Dialog.java
@@ -12,8 +12,6 @@
 import android.os.Handler;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.v4.view.ViewCompat;
-import android.support.v7.widget.CardView;
 import android.text.TextUtils;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@@ -27,6 +25,9 @@
 import android.view.animation.AnimationUtils;
 import android.widget.FrameLayout;
 
+import androidx.cardview.widget.CardView;
+import androidx.core.view.ViewCompat;
+
 import com.rey.material.R;
 import com.rey.material.drawable.BlankDrawable;
 import com.rey.material.drawable.RippleDrawable;
@@ -1139,7 +1140,7 @@ public boolean onTouchEvent(MotionEvent event) {
 
     }
 
-    private class DialogCardView extends CardView{
+    private class DialogCardView extends CardView {
 
         private Paint mDividerPaint;
         private float mDividerPos = -1f;
diff --git a/material/src/main/java/com/rey/material/app/DialogFragment.java b/material/src/main/java/com/rey/material/app/DialogFragment.java
index ba5f9200..946887b2 100644
--- a/material/src/main/java/com/rey/material/app/DialogFragment.java
+++ b/material/src/main/java/com/rey/material/app/DialogFragment.java
@@ -4,13 +4,13 @@
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.View;
 
 /**
  * Created by Rey on 1/12/2015.
  */
-public class DialogFragment extends android.support.v4.app.DialogFragment{
+public class DialogFragment extends androidx.fragment.app.DialogFragment {
 
     /**
      * Interface definition for passing style data.
diff --git a/material/src/main/java/com/rey/material/app/SimpleDialog.java b/material/src/main/java/com/rey/material/app/SimpleDialog.java
index 33edbbd9..ce59b751 100644
--- a/material/src/main/java/com/rey/material/app/SimpleDialog.java
+++ b/material/src/main/java/com/rey/material/app/SimpleDialog.java
@@ -5,7 +5,6 @@
 import android.os.Build;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.v4.view.ViewCompat;
 import android.text.TextUtils;
 import android.view.Gravity;
 import android.view.View;
@@ -13,6 +12,8 @@
 import android.widget.BaseAdapter;
 import android.widget.ScrollView;
 
+import androidx.core.view.ViewCompat;
+
 import com.rey.material.R;
 import com.rey.material.drawable.BlankDrawable;
 import com.rey.material.widget.CheckBox;
diff --git a/material/src/main/java/com/rey/material/app/ThemeManager.java b/material/src/main/java/com/rey/material/app/ThemeManager.java
index c48b6de0..baba5e23 100644
--- a/material/src/main/java/com/rey/material/app/ThemeManager.java
+++ b/material/src/main/java/com/rey/material/app/ThemeManager.java
@@ -5,12 +5,13 @@
 import android.content.SharedPreferences;
 import android.content.res.TypedArray;
 import android.os.Looper;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.UiThread;
 import android.util.AttributeSet;
 import android.util.SparseArray;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.UiThread;
+
 import com.rey.material.R;
 
 import java.lang.ref.WeakReference;
diff --git a/material/src/main/java/com/rey/material/app/ToolbarManager.java b/material/src/main/java/com/rey/material/app/ToolbarManager.java
index 4a3dd0ac..38e3d3d7 100644
--- a/material/src/main/java/com/rey/material/app/ToolbarManager.java
+++ b/material/src/main/java/com/rey/material/app/ToolbarManager.java
@@ -4,13 +4,14 @@
 import android.animation.ValueAnimator;
 import android.os.Build;
 import android.os.SystemClock;
-import android.support.annotation.Nullable;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.view.GravityCompat;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.app.AppCompatDelegate;
-import android.support.v7.widget.ActionMenuView;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatDelegate;
+import androidx.appcompat.widget.ActionMenuView;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.view.GravityCompat;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.fragment.app.FragmentManager;
+
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
diff --git a/material/src/main/java/com/rey/material/drawable/LineMorphingDrawable.java b/material/src/main/java/com/rey/material/drawable/LineMorphingDrawable.java
index 1b095a99..96d0e98b 100644
--- a/material/src/main/java/com/rey/material/drawable/LineMorphingDrawable.java
+++ b/material/src/main/java/com/rey/material/drawable/LineMorphingDrawable.java
@@ -13,14 +13,15 @@
 import android.graphics.drawable.Animatable;
 import android.graphics.drawable.Drawable;
 import android.os.SystemClock;
-import android.support.v4.text.TextUtilsCompat;
-import android.support.v4.view.ViewCompat;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.animation.AccelerateInterpolator;
 import android.view.animation.AnimationUtils;
 import android.view.animation.Interpolator;
 
+import androidx.core.text.TextUtilsCompat;
+import androidx.core.view.ViewCompat;
+
 import com.rey.material.R;
 import com.rey.material.util.ThemeUtil;
 import com.rey.material.util.ViewUtil;
diff --git a/material/src/main/java/com/rey/material/drawable/PaddingDrawable.java b/material/src/main/java/com/rey/material/drawable/PaddingDrawable.java
index 8c6d11cc..a4f00602 100644
--- a/material/src/main/java/com/rey/material/drawable/PaddingDrawable.java
+++ b/material/src/main/java/com/rey/material/drawable/PaddingDrawable.java
@@ -8,7 +8,8 @@
 import android.graphics.Rect;
 import android.graphics.Region;
 import android.graphics.drawable.Drawable;
-import android.support.v4.graphics.drawable.DrawableCompat;
+
+import androidx.core.graphics.drawable.DrawableCompat;
 
 /**
  * Created by Rey on 8/19/2015.
diff --git a/material/src/main/java/com/rey/material/widget/Button.java b/material/src/main/java/com/rey/material/widget/Button.java
index 7a1e8da8..1f801d27 100644
--- a/material/src/main/java/com/rey/material/widget/Button.java
+++ b/material/src/main/java/com/rey/material/widget/Button.java
@@ -2,8 +2,9 @@
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.AppCompatButton;
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.AppCompatButton;
+
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 
diff --git a/material/src/main/java/com/rey/material/widget/CheckedTextView.java b/material/src/main/java/com/rey/material/widget/CheckedTextView.java
index 1bf60fce..33aff6ff 100644
--- a/material/src/main/java/com/rey/material/widget/CheckedTextView.java
+++ b/material/src/main/java/com/rey/material/widget/CheckedTextView.java
@@ -2,8 +2,9 @@
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.AppCompatCheckedTextView;
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.AppCompatCheckedTextView;
+
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 
diff --git a/material/src/main/java/com/rey/material/widget/CircleCheckedTextView.java b/material/src/main/java/com/rey/material/widget/CircleCheckedTextView.java
index fe1ec192..2b7b0b73 100644
--- a/material/src/main/java/com/rey/material/widget/CircleCheckedTextView.java
+++ b/material/src/main/java/com/rey/material/widget/CircleCheckedTextView.java
@@ -1,11 +1,12 @@
 package com.rey.material.widget;
 
 import android.content.Context;
-import android.support.v7.widget.AppCompatCheckedTextView;
 import android.util.AttributeSet;
 import android.view.Gravity;
 import android.view.animation.Interpolator;
 
+import androidx.appcompat.widget.AppCompatCheckedTextView;
+
 import com.rey.material.drawable.CircleDrawable;
 import com.rey.material.util.ViewUtil;
 
diff --git a/material/src/main/java/com/rey/material/widget/CompoundButton.java b/material/src/main/java/com/rey/material/widget/CompoundButton.java
index ebb5a7db..c069b769 100644
--- a/material/src/main/java/com/rey/material/widget/CompoundButton.java
+++ b/material/src/main/java/com/rey/material/widget/CompoundButton.java
@@ -5,7 +5,7 @@
 import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 
diff --git a/material/src/main/java/com/rey/material/widget/EditText.java b/material/src/main/java/com/rey/material/widget/EditText.java
index 8872bafc..070c7499 100644
--- a/material/src/main/java/com/rey/material/widget/EditText.java
+++ b/material/src/main/java/com/rey/material/widget/EditText.java
@@ -10,11 +10,12 @@
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.view.GravityCompat;
-import android.support.v7.widget.AppCompatAutoCompleteTextView;
-import android.support.v7.widget.AppCompatEditText;
-import android.support.v7.widget.AppCompatMultiAutoCompleteTextView;
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.AppCompatAutoCompleteTextView;
+import androidx.appcompat.widget.AppCompatEditText;
+import androidx.appcompat.widget.AppCompatMultiAutoCompleteTextView;
+import androidx.core.view.GravityCompat;
+
 import android.text.Editable;
 import android.text.InputFilter;
 import android.text.Layout;
@@ -3688,7 +3689,7 @@ protected int[] onCreateDrawableState(int extraSpace) {
 
 	}
 
-	private class InternalEditText extends AppCompatEditText{
+	private class InternalEditText extends AppCompatEditText {
 
 		public InternalEditText(Context context) {
 			super(context);
@@ -3987,7 +3988,7 @@ void superOnSelectionChanged(int selStart, int selEnd) {
         }
     }
 
-    private class InternalMultiAutoCompleteTextView extends AppCompatMultiAutoCompleteTextView{
+    private class InternalMultiAutoCompleteTextView extends AppCompatMultiAutoCompleteTextView {
 
         public InternalMultiAutoCompleteTextView(Context context) {
             super(context);
diff --git a/material/src/main/java/com/rey/material/widget/FloatingActionButton.java b/material/src/main/java/com/rey/material/widget/FloatingActionButton.java
index ed9e7342..c7241929 100644
--- a/material/src/main/java/com/rey/material/widget/FloatingActionButton.java
+++ b/material/src/main/java/com/rey/material/widget/FloatingActionButton.java
@@ -11,7 +11,7 @@
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.os.SystemClock;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.Gravity;
diff --git a/material/src/main/java/com/rey/material/widget/FrameLayout.java b/material/src/main/java/com/rey/material/widget/FrameLayout.java
index cd7b0f49..d71743dc 100644
--- a/material/src/main/java/com/rey/material/widget/FrameLayout.java
+++ b/material/src/main/java/com/rey/material/widget/FrameLayout.java
@@ -2,7 +2,7 @@
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 
diff --git a/material/src/main/java/com/rey/material/widget/ImageButton.java b/material/src/main/java/com/rey/material/widget/ImageButton.java
index f286ae96..ffef9aa7 100644
--- a/material/src/main/java/com/rey/material/widget/ImageButton.java
+++ b/material/src/main/java/com/rey/material/widget/ImageButton.java
@@ -2,8 +2,9 @@
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.AppCompatImageButton;
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.AppCompatImageButton;
+
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 
diff --git a/material/src/main/java/com/rey/material/widget/ImageView.java b/material/src/main/java/com/rey/material/widget/ImageView.java
index 38b36430..a742e0d2 100644
--- a/material/src/main/java/com/rey/material/widget/ImageView.java
+++ b/material/src/main/java/com/rey/material/widget/ImageView.java
@@ -2,8 +2,9 @@
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.AppCompatImageView;
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.AppCompatImageView;
+
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 
diff --git a/material/src/main/java/com/rey/material/widget/LinearLayout.java b/material/src/main/java/com/rey/material/widget/LinearLayout.java
index e01e7806..43165d03 100644
--- a/material/src/main/java/com/rey/material/widget/LinearLayout.java
+++ b/material/src/main/java/com/rey/material/widget/LinearLayout.java
@@ -4,7 +4,7 @@
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 
diff --git a/material/src/main/java/com/rey/material/widget/ListPopupWindow.java b/material/src/main/java/com/rey/material/widget/ListPopupWindow.java
index d5bdc2f3..2f0893e1 100644
--- a/material/src/main/java/com/rey/material/widget/ListPopupWindow.java
+++ b/material/src/main/java/com/rey/material/widget/ListPopupWindow.java
@@ -24,11 +24,6 @@
 import android.os.Build;
 import android.os.Handler;
 import android.os.SystemClock;
-import android.support.v4.text.TextUtilsCompat;
-import android.support.v4.view.MotionEventCompat;
-import android.support.v4.view.ViewPropertyAnimatorCompat;
-import android.support.v4.widget.ListViewAutoScrollHelper;
-import android.support.v4.widget.PopupWindowCompat;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.Gravity;
@@ -48,6 +43,12 @@
 import android.widget.LinearLayout;
 import android.widget.ListAdapter;
 
+import androidx.core.text.TextUtilsCompat;
+import androidx.core.view.MotionEventCompat;
+import androidx.core.view.ViewPropertyAnimatorCompat;
+import androidx.core.widget.ListViewAutoScrollHelper;
+import androidx.core.widget.PopupWindowCompat;
+
 import com.rey.material.R;
 
 import java.lang.reflect.Method;
diff --git a/material/src/main/java/com/rey/material/widget/ListView.java b/material/src/main/java/com/rey/material/widget/ListView.java
index b70ddba4..4f5f036d 100644
--- a/material/src/main/java/com/rey/material/widget/ListView.java
+++ b/material/src/main/java/com/rey/material/widget/ListView.java
@@ -1,10 +1,11 @@
 package com.rey.material.widget;
 
 import android.content.Context;
-import android.support.v7.widget.ListViewCompat;
 import android.util.AttributeSet;
 import android.view.View;
 
+import androidx.appcompat.widget.ListViewCompat;
+
 import com.rey.material.app.ThemeManager;
 import com.rey.material.util.ViewUtil;
 
diff --git a/material/src/main/java/com/rey/material/widget/ProgressView.java b/material/src/main/java/com/rey/material/widget/ProgressView.java
index 10bdf2ff..e03c6d6c 100644
--- a/material/src/main/java/com/rey/material/widget/ProgressView.java
+++ b/material/src/main/java/com/rey/material/widget/ProgressView.java
@@ -4,7 +4,7 @@
 import android.content.res.TypedArray;
 import android.graphics.drawable.Animatable;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.AttributeSet;
 import android.view.View;
 
diff --git a/material/src/main/java/com/rey/material/widget/RelativeLayout.java b/material/src/main/java/com/rey/material/widget/RelativeLayout.java
index f1528859..99076fac 100644
--- a/material/src/main/java/com/rey/material/widget/RelativeLayout.java
+++ b/material/src/main/java/com/rey/material/widget/RelativeLayout.java
@@ -2,7 +2,7 @@
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 
diff --git a/material/src/main/java/com/rey/material/widget/Slider.java b/material/src/main/java/com/rey/material/widget/Slider.java
index 187bcf98..6fddf463 100644
--- a/material/src/main/java/com/rey/material/widget/Slider.java
+++ b/material/src/main/java/com/rey/material/widget/Slider.java
@@ -13,7 +13,7 @@
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.os.SystemClock;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.AttributeSet;
 import android.view.Gravity;
 import android.view.MotionEvent;
diff --git a/material/src/main/java/com/rey/material/widget/Spinner.java b/material/src/main/java/com/rey/material/widget/Spinner.java
index 197df228..00037c13 100644
--- a/material/src/main/java/com/rey/material/widget/Spinner.java
+++ b/material/src/main/java/com/rey/material/widget/Spinner.java
@@ -11,7 +11,7 @@
 import android.os.Build;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.util.Log;
diff --git a/material/src/main/java/com/rey/material/widget/Switch.java b/material/src/main/java/com/rey/material/widget/Switch.java
index 80d1add7..0ab2740c 100644
--- a/material/src/main/java/com/rey/material/widget/Switch.java
+++ b/material/src/main/java/com/rey/material/widget/Switch.java
@@ -13,7 +13,7 @@
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.os.SystemClock;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.AttributeSet;
 import android.view.Gravity;
 import android.view.MotionEvent;
diff --git a/material/src/main/java/com/rey/material/widget/TabIndicatorView.java b/material/src/main/java/com/rey/material/widget/TabIndicatorView.java
index 56d74fa5..dbc45dac 100644
--- a/material/src/main/java/com/rey/material/widget/TabIndicatorView.java
+++ b/material/src/main/java/com/rey/material/widget/TabIndicatorView.java
@@ -6,11 +6,12 @@
 import android.graphics.Paint;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.v4.view.ViewPager;
-import android.support.v7.widget.DefaultItemAnimator;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.DefaultItemAnimator;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.viewpager.widget.ViewPager;
+
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.Gravity;
diff --git a/material/src/main/java/com/rey/material/widget/TabPageIndicator.java b/material/src/main/java/com/rey/material/widget/TabPageIndicator.java
index a866de76..d0ae77da 100644
--- a/material/src/main/java/com/rey/material/widget/TabPageIndicator.java
+++ b/material/src/main/java/com/rey/material/widget/TabPageIndicator.java
@@ -7,10 +7,11 @@
 import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewPager;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+
 import android.text.TextUtils.TruncateAt;
 import android.util.AttributeSet;
 import android.view.Gravity;
diff --git a/material/src/main/java/com/rey/material/widget/TextView.java b/material/src/main/java/com/rey/material/widget/TextView.java
index d372113f..d495e555 100644
--- a/material/src/main/java/com/rey/material/widget/TextView.java
+++ b/material/src/main/java/com/rey/material/widget/TextView.java
@@ -2,12 +2,13 @@
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.AppCompatTextView;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.AppCompatTextView;
+
 import com.rey.material.app.ThemeManager;
 import com.rey.material.drawable.RippleDrawable;
 import com.rey.material.util.ViewUtil;
diff --git a/material/src/main/java/com/rey/material/widget/TimePicker.java b/material/src/main/java/com/rey/material/widget/TimePicker.java
index f4b80e04..81854d6f 100644
--- a/material/src/main/java/com/rey/material/widget/TimePicker.java
+++ b/material/src/main/java/com/rey/material/widget/TimePicker.java
@@ -10,7 +10,7 @@
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.os.SystemClock;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.format.DateFormat;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
diff --git a/material/src/main/java/com/rey/material/widget/YearPicker.java b/material/src/main/java/com/rey/material/widget/YearPicker.java
index 164410ef..d56614eb 100644
--- a/material/src/main/java/com/rey/material/widget/YearPicker.java
+++ b/material/src/main/java/com/rey/material/widget/YearPicker.java
@@ -9,7 +9,6 @@
 import android.os.Build;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
 import android.util.AttributeSet;
 import android.util.TypedValue;
 import android.view.Gravity;
@@ -20,6 +19,8 @@
 import android.view.animation.Interpolator;
 import android.widget.BaseAdapter;
 
+import androidx.annotation.NonNull;
+
 import com.rey.material.R;
 import com.rey.material.drawable.BlankDrawable;
 import com.rey.material.util.ThemeUtil;