From 3e16d0f9e06b1761cf34c400d9c2d29e143720ad Mon Sep 17 00:00:00 2001
From: Md Tanbir Hossen <mdhossentanbir@gmail.com>
Date: Tue, 2 Jul 2019 14:31:02 +0600
Subject: [PATCH] AndroidX

---
 bottomsheetpickers/build.gradle               | 14 ++++++------
 .../BottomSheetPickerDialog.java              | 12 +++++-----
 .../CustomWidthBottomSheetDialog.java         |  6 ++---
 .../philliphsu/bottomsheetpickers/Utils.java  | 12 +++++-----
 .../date/BottomSheetDatePickerDialog.java     |  2 +-
 .../date/DatePickerDialog.java                |  8 +++----
 .../date/DayPickerViewPager.java              |  2 +-
 .../date/MonthPickerView.java                 |  6 ++---
 .../bottomsheetpickers/date/MonthView.java    | 10 ++++-----
 .../date/PagingDayPickerView.java             | 12 +++++-----
 .../date/PagingMonthAdapter.java              |  2 +-
 .../date/TextViewWithHighlightIndicator.java  |  2 +-
 .../date/TextViewWithIndicator.java           |  2 +-
 .../time/BottomSheetTimePickerDialog.java     |  2 +-
 .../time/TimePickerPadLayout.java             |  2 +-
 .../time/grid/GridPickerLayout.java           |  2 +-
 .../time/grid/GridTimePickerDialog.java       |  6 ++---
 .../time/grid/MinutesGrid.java                |  2 +-
 .../time/grid/NumbersGrid.java                |  4 ++--
 .../time/grid/TwentyFourHoursGrid.java        |  2 +-
 .../time/numberpad/GridLayoutNumberPad.java   | 10 ++++-----
 .../time/numberpad/NumberPadTimePicker.java   |  8 +++----
 .../numberpad/NumberPadTimePickerDialog.java  |  6 ++---
 .../layout-land/dialog_time_picker_grid.xml   |  2 +-
 .../res/layout/content_numpad_time_picker.xml |  2 +-
 .../res/layout/date_picker_footer_buttons.xml |  4 ++--
 .../res/layout/dialog_time_picker_grid.xml    |  2 +-
 build.gradle                                  | 22 ++++++++++++++++++-
 gradle.properties                             |  4 +++-
 gradle/wrapper/gradle-wrapper.properties      |  4 ++--
 sample/build.gradle                           | 14 ++++++------
 .../bottomsheetpickers/MainActivity.java      |  4 ++--
 sample/src/main/res/layout/activity_main.xml  |  2 +-
 33 files changed, 108 insertions(+), 86 deletions(-)

diff --git a/bottomsheetpickers/build.gradle b/bottomsheetpickers/build.gradle
index d4c8d13..4e4b9d4 100644
--- a/bottomsheetpickers/build.gradle
+++ b/bottomsheetpickers/build.gradle
@@ -25,12 +25,12 @@ ext {
 }
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    compileSdkVersion 28
+    buildToolsVersion "28.0.3"
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 25
+        targetSdkVersion 28
         versionCode 5
         versionName "2.3.0"
         vectorDrawables.useSupportLibrary = true
@@ -44,10 +44,10 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:25.1.0'
-    compile 'com.android.support:gridlayout-v7:25.1.0'
-    compile 'com.android.support:design:25.1.0'
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.gridlayout:gridlayout:1.0.0'
+    implementation 'com.google.android.material:material:1.0.0'
 }
 
 apply from: '../install.gradle'
diff --git a/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/BottomSheetPickerDialog.java b/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/BottomSheetPickerDialog.java
index 07c9907..0991ca7 100644
--- a/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/BottomSheetPickerDialog.java
+++ b/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/BottomSheetPickerDialog.java
@@ -3,16 +3,16 @@
 import android.app.Dialog;
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.ColorInt;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.BottomSheetDialogFragment;
+import androidx.annotation.ColorInt;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import static android.support.v4.content.ContextCompat.getColor;
+import static androidx.core.content.ContextCompat.getColor;
 
 /**
  * Created by Phillip Hsu on 10/4/2016.
diff --git a/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/CustomWidthBottomSheetDialog.java b/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/CustomWidthBottomSheetDialog.java
index 876a567..0d0426a 100644
--- a/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/CustomWidthBottomSheetDialog.java
+++ b/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/CustomWidthBottomSheetDialog.java
@@ -2,9 +2,9 @@
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.StyleRes;
-import android.support.design.widget.BottomSheetDialog;
+import androidx.annotation.NonNull;
+import androidx.annotation.StyleRes;
+import com.google.android.material.bottomsheet.BottomSheetDialog;
 import android.view.ViewGroup;
 
 final class CustomWidthBottomSheetDialog extends BottomSheetDialog {
diff --git a/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/Utils.java b/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/Utils.java
index cebef9e..d55f6b1 100644
--- a/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/Utils.java
+++ b/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/Utils.java
@@ -30,12 +30,12 @@
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.RippleDrawable;
 import android.os.Build;
-import android.support.annotation.AttrRes;
-import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
-import android.support.v4.graphics.drawable.DrawableCompat;
+import androidx.annotation.AttrRes;
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import androidx.core.graphics.drawable.DrawableCompat;
 import android.text.format.Time;
 import android.view.View;
 import android.widget.ImageView;
diff --git a/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/date/BottomSheetDatePickerDialog.java b/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/date/BottomSheetDatePickerDialog.java
index 419916a..ab68e3f 100644
--- a/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/date/BottomSheetDatePickerDialog.java
+++ b/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/date/BottomSheetDatePickerDialog.java
@@ -16,7 +16,7 @@
 
 package com.philliphsu.bottomsheetpickers.date;
 
-import android.support.annotation.ColorInt;
+import androidx.annotation.ColorInt;
 
 import java.util.Calendar;
 
diff --git a/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/date/DatePickerDialog.java b/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/date/DatePickerDialog.java
index c8507cf..391250c 100644
--- a/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/date/DatePickerDialog.java
+++ b/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/date/DatePickerDialog.java
@@ -4,10 +4,10 @@
 import android.content.res.ColorStateList;
 import android.content.res.Resources;
 import android.os.Bundle;
-import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
 import android.text.format.DateUtils;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
diff --git a/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/date/DayPickerViewPager.java b/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/date/DayPickerViewPager.java
index d31bf76..d32a2b7 100644
--- a/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/date/DayPickerViewPager.java
+++ b/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/date/DayPickerViewPager.java
@@ -19,7 +19,7 @@
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.View;
diff --git a/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/date/MonthPickerView.java b/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/date/MonthPickerView.java
index 4159707..24f101f 100644
--- a/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/date/MonthPickerView.java
+++ b/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/date/MonthPickerView.java
@@ -6,8 +6,8 @@
 import android.graphics.Paint;
 import android.graphics.Paint.Align;
 import android.graphics.Paint.Style;
-import android.support.annotation.ColorInt;
-import android.support.annotation.Nullable;
+import androidx.annotation.ColorInt;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
@@ -18,7 +18,7 @@
 import java.text.DateFormatSymbols;
 import java.util.Calendar;
 
-import static android.support.v4.content.ContextCompat.getColor;
+import static androidx.core.content.ContextCompat.getColor;
 import static com.philliphsu.bottomsheetpickers.date.PagingDayPickerView.MONTH_NAVIGATION_BAR_SIZE;
 
 /**
diff --git a/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/date/MonthView.java b/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/date/MonthView.java
index 5e955b4..6a45890 100644
--- a/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/date/MonthView.java
+++ b/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/date/MonthView.java
@@ -26,10 +26,10 @@
 import android.graphics.Typeface;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.ColorInt;
-import android.support.v4.view.ViewCompat;
-import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat;
-import android.support.v4.widget.ExploreByTouchHelper;
+import androidx.annotation.ColorInt;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
+import androidx.customview.widget.ExploreByTouchHelper;
 import android.text.format.DateFormat;
 import android.text.format.DateUtils;
 import android.text.format.Time;
@@ -49,7 +49,7 @@
 import java.util.List;
 import java.util.Locale;
 
-import static android.support.v4.content.ContextCompat.getColor;
+import static androidx.core.content.ContextCompat.getColor;
 import static com.philliphsu.bottomsheetpickers.date.PagingDayPickerView.MONTH_NAVIGATION_BAR_SIZE;
 
 /**
diff --git a/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/date/PagingDayPickerView.java b/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/date/PagingDayPickerView.java
index e3cde08..09e302b 100644
--- a/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/date/PagingDayPickerView.java
+++ b/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/date/PagingDayPickerView.java
@@ -23,11 +23,11 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
-import android.support.graphics.drawable.AnimatedVectorDrawableCompat;
-import android.support.v4.view.ViewPager;
-import android.support.v4.view.ViewPager.OnPageChangeListener;
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat;
+import androidx.viewpager.widget.ViewPager;
+import androidx.viewpager.widget.ViewPager.OnPageChangeListener;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -47,7 +47,7 @@
 import java.util.Calendar;
 import java.util.Locale;
 
-import static android.support.v4.content.ContextCompat.getColor;
+import static androidx.core.content.ContextCompat.getColor;
 import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
 
 /**
diff --git a/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/date/PagingMonthAdapter.java b/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/date/PagingMonthAdapter.java
index 371c994..3973e5c 100644
--- a/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/date/PagingMonthAdapter.java
+++ b/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/date/PagingMonthAdapter.java
@@ -19,7 +19,7 @@
 import android.content.Context;
 import android.os.Bundle;
 import android.os.Parcelable;
-import android.support.v4.view.PagerAdapter;
+import androidx.viewpager.widget.PagerAdapter;
 import android.util.SparseArray;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/date/TextViewWithHighlightIndicator.java b/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/date/TextViewWithHighlightIndicator.java
index 01f36c7..f7ac6fb 100644
--- a/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/date/TextViewWithHighlightIndicator.java
+++ b/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/date/TextViewWithHighlightIndicator.java
@@ -10,7 +10,7 @@
 import com.philliphsu.bottomsheetpickers.R;
 import com.philliphsu.bottomsheetpickers.Utils;
 
-import static android.support.v4.content.ContextCompat.getColor;
+import static androidx.core.content.ContextCompat.getColor;
 
 /**
  * A derivative of {@link TextViewWithCircularIndicator} for use in {@link
diff --git a/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/date/TextViewWithIndicator.java b/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/date/TextViewWithIndicator.java
index 1fbe90b..f4d27d0 100644
--- a/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/date/TextViewWithIndicator.java
+++ b/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/date/TextViewWithIndicator.java
@@ -1,7 +1,7 @@
 package com.philliphsu.bottomsheetpickers.date;
 
 import android.content.Context;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
 import android.util.AttributeSet;
 import android.widget.TextView;
 
diff --git a/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/time/BottomSheetTimePickerDialog.java b/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/time/BottomSheetTimePickerDialog.java
index 2830a99..849d4ea 100644
--- a/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/time/BottomSheetTimePickerDialog.java
+++ b/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/time/BottomSheetTimePickerDialog.java
@@ -16,7 +16,7 @@
 
 package com.philliphsu.bottomsheetpickers.time;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.ViewGroup;
 
 import com.philliphsu.bottomsheetpickers.BottomSheetPickerDialog;
diff --git a/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/time/TimePickerPadLayout.java b/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/time/TimePickerPadLayout.java
index beee942..f47907c 100644
--- a/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/time/TimePickerPadLayout.java
+++ b/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/time/TimePickerPadLayout.java
@@ -18,7 +18,7 @@
 
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.support.v7.widget.ViewUtils;
+import androidx.appcompat.widget.ViewUtils;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/time/grid/GridPickerLayout.java b/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/time/grid/GridPickerLayout.java
index 9dda1c4..7c22084 100644
--- a/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/time/grid/GridPickerLayout.java
+++ b/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/time/grid/GridPickerLayout.java
@@ -17,7 +17,7 @@
 package com.philliphsu.bottomsheetpickers.time.grid;
 
 import android.content.Context;
-import android.support.annotation.ColorInt;
+import androidx.annotation.ColorInt;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.animation.AlphaAnimation;
diff --git a/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/time/grid/GridTimePickerDialog.java b/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/time/grid/GridTimePickerDialog.java
index 5f01d73..d318827 100644
--- a/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/time/grid/GridTimePickerDialog.java
+++ b/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/time/grid/GridTimePickerDialog.java
@@ -20,9 +20,9 @@
 import android.content.res.ColorStateList;
 import android.content.res.Resources;
 import android.os.Bundle;
-import android.support.annotation.ColorInt;
-import android.support.design.widget.FloatingActionButton;
-import android.support.graphics.drawable.VectorDrawableCompat;
+import androidx.annotation.ColorInt;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
 import android.util.Log;
 import android.view.KeyCharacterMap;
 import android.view.KeyEvent;
diff --git a/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/time/grid/MinutesGrid.java b/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/time/grid/MinutesGrid.java
index 1510f75..2a2fb85 100644
--- a/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/time/grid/MinutesGrid.java
+++ b/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/time/grid/MinutesGrid.java
@@ -17,7 +17,7 @@
 package com.philliphsu.bottomsheetpickers.time.grid;
 
 import android.content.Context;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.ImageButton;
diff --git a/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/time/grid/NumbersGrid.java b/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/time/grid/NumbersGrid.java
index 9d1b21f..decfbad 100644
--- a/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/time/grid/NumbersGrid.java
+++ b/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/time/grid/NumbersGrid.java
@@ -18,8 +18,8 @@
 
 import android.content.Context;
 import android.graphics.Typeface;
-import android.support.annotation.ColorInt;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.ColorInt;
+import androidx.core.content.ContextCompat;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.View;
diff --git a/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/time/grid/TwentyFourHoursGrid.java b/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/time/grid/TwentyFourHoursGrid.java
index 950390f..8c72fcf 100644
--- a/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/time/grid/TwentyFourHoursGrid.java
+++ b/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/time/grid/TwentyFourHoursGrid.java
@@ -17,7 +17,7 @@
 package com.philliphsu.bottomsheetpickers.time.grid;
 
 import android.content.Context;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
 import android.util.AttributeSet;
 import android.view.View;
 
diff --git a/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/time/numberpad/GridLayoutNumberPad.java b/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/time/numberpad/GridLayoutNumberPad.java
index 5847496..c3bf2a3 100644
--- a/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/time/numberpad/GridLayoutNumberPad.java
+++ b/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/time/numberpad/GridLayoutNumberPad.java
@@ -18,11 +18,11 @@
 
 import android.content.Context;
 import android.content.res.ColorStateList;
-import android.support.annotation.CallSuper;
-import android.support.annotation.ColorInt;
-import android.support.annotation.LayoutRes;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.GridLayout;
+import androidx.annotation.CallSuper;
+import androidx.annotation.ColorInt;
+import androidx.annotation.LayoutRes;
+import androidx.core.content.ContextCompat;
+import androidx.gridlayout.widget.GridLayout;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.TextView;
diff --git a/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/time/numberpad/NumberPadTimePicker.java b/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/time/numberpad/NumberPadTimePicker.java
index 65ae36e..1e00c94 100644
--- a/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/time/numberpad/NumberPadTimePicker.java
+++ b/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/time/numberpad/NumberPadTimePicker.java
@@ -20,10 +20,10 @@
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.os.Build;
-import android.support.annotation.IntDef;
-import android.support.annotation.Nullable;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import androidx.core.content.ContextCompat;
 import android.text.format.DateFormat;
 import android.util.AttributeSet;
 import android.view.View;
diff --git a/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/time/numberpad/NumberPadTimePickerDialog.java b/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/time/numberpad/NumberPadTimePickerDialog.java
index a57a4f2..77b5095 100644
--- a/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/time/numberpad/NumberPadTimePickerDialog.java
+++ b/bottomsheetpickers/src/main/java/com/philliphsu/bottomsheetpickers/time/numberpad/NumberPadTimePickerDialog.java
@@ -17,9 +17,9 @@
 package com.philliphsu.bottomsheetpickers.time.numberpad;
 
 import android.os.Bundle;
-import android.support.annotation.ColorInt;
-import android.support.annotation.StringRes;
-import android.support.design.widget.FloatingActionButton;
+import androidx.annotation.ColorInt;
+import androidx.annotation.StringRes;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/bottomsheetpickers/src/main/res/layout-land/dialog_time_picker_grid.xml b/bottomsheetpickers/src/main/res/layout-land/dialog_time_picker_grid.xml
index e735889..9543fe8 100644
--- a/bottomsheetpickers/src/main/res/layout-land/dialog_time_picker_grid.xml
+++ b/bottomsheetpickers/src/main/res/layout-land/dialog_time_picker_grid.xml
@@ -51,7 +51,7 @@
             android:layout_marginRight="@dimen/bottom_sheet_edge_margin"
             android:layout_marginEnd="@dimen/bottom_sheet_edge_margin" />
 
-        <android.support.design.widget.FloatingActionButton
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:id="@+id/fab"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/bottomsheetpickers/src/main/res/layout/content_numpad_time_picker.xml b/bottomsheetpickers/src/main/res/layout/content_numpad_time_picker.xml
index f49160c..29b53ec 100644
--- a/bottomsheetpickers/src/main/res/layout/content_numpad_time_picker.xml
+++ b/bottomsheetpickers/src/main/res/layout/content_numpad_time_picker.xml
@@ -30,7 +30,7 @@
         style="@style/GridLayoutNumpadButton"
         app:layout_column="2"/>
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fab"
         style="@style/NumberPadFabStyle" />
 
diff --git a/bottomsheetpickers/src/main/res/layout/date_picker_footer_buttons.xml b/bottomsheetpickers/src/main/res/layout/date_picker_footer_buttons.xml
index 9fa03eb..1f6a233 100644
--- a/bottomsheetpickers/src/main/res/layout/date_picker_footer_buttons.xml
+++ b/bottomsheetpickers/src/main/res/layout/date_picker_footer_buttons.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.ButtonBarLayout
+<androidx.appcompat.widget.ButtonBarLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="@dimen/alert_dialog_action_area_height"
@@ -24,4 +24,4 @@
         android:text="@android:string/ok"
         style="@style/Widget.AppCompat.Button.ButtonBar.AlertDialog" />
 
-</android.support.v7.widget.ButtonBarLayout>
\ No newline at end of file
+</androidx.appcompat.widget.ButtonBarLayout>
\ No newline at end of file
diff --git a/bottomsheetpickers/src/main/res/layout/dialog_time_picker_grid.xml b/bottomsheetpickers/src/main/res/layout/dialog_time_picker_grid.xml
index 75fd15f..e4051c5 100644
--- a/bottomsheetpickers/src/main/res/layout/dialog_time_picker_grid.xml
+++ b/bottomsheetpickers/src/main/res/layout/dialog_time_picker_grid.xml
@@ -46,7 +46,7 @@
         android:layout_marginRight="@dimen/bottom_sheet_edge_margin"
         android:layout_marginEnd="@dimen/bottom_sheet_edge_margin" />
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/build.gradle b/build.gradle
index 50aa979..86e6d0e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,9 +3,10 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:3.4.0'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.4'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
 
@@ -17,6 +18,10 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        maven {
+            url "https://maven.google.com"
+        }
+        google()
     }
 }
 
@@ -27,3 +32,18 @@ subprojects {
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
+
+ext {
+    // Sdk and tools
+    minSdkVersion = 14
+    targetSdkVersion = 25
+    compileSdkVersion = 25
+    buildToolsVersion = '25.0.3'
+
+    // BottomSheetPickers versioning
+    versionName = '2.4.1'
+    versionCode = 11
+
+    // Library dependencies
+    supportLibraryVersion = '25.4.0'
+}
diff --git a/gradle.properties b/gradle.properties
index 1d3591c..915f0e6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,4 +15,6 @@
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
\ No newline at end of file
+# org.gradle.parallel=true
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 6682126..5fc2d99 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Oct 13 14:29:50 PDT 2016
+#Tue Jul 02 14:19:08 BDT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
diff --git a/sample/build.gradle b/sample/build.gradle
index 5f15017..6f08607 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    compileSdkVersion 28
+    buildToolsVersion "28.0.3"
 
     defaultConfig {
         applicationId "com.example.bottomsheetpickers"
         minSdkVersion 14
-        targetSdkVersion 25
+        targetSdkVersion 28
         versionCode 5
         versionName "2.3.0"
     }
@@ -20,11 +20,11 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile(project(':bottomsheetpickers')) {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation(project(':bottomsheetpickers')) {
         exclude group: 'com.android.support', module: 'appcompat-v7'
         exclude group: 'com.android.support', module: 'design'
     }
-    compile 'com.android.support:appcompat-v7:25.1.0'
-    compile 'com.android.support:design:25.1.0'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'com.google.android.material:material:1.0.0'
 }
diff --git a/sample/src/main/java/com/example/bottomsheetpickers/MainActivity.java b/sample/src/main/java/com/example/bottomsheetpickers/MainActivity.java
index c1d5ea2..63b8694 100644
--- a/sample/src/main/java/com/example/bottomsheetpickers/MainActivity.java
+++ b/sample/src/main/java/com/example/bottomsheetpickers/MainActivity.java
@@ -1,8 +1,8 @@
 package com.example.bottomsheetpickers;
 
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
-import android.support.v7.app.AppCompatActivity;
+import androidx.fragment.app.DialogFragment;
+import androidx.appcompat.app.AppCompatActivity;
 import android.text.format.DateFormat;
 import android.view.KeyEvent;
 import android.view.View;
diff --git a/sample/src/main/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml
index 2d64a0e..e58aaf3 100644
--- a/sample/src/main/res/layout/activity_main.xml
+++ b/sample/src/main/res/layout/activity_main.xml
@@ -107,7 +107,7 @@
 
     </ScrollView>
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"