From f2c919c690915041e18efe3e0a2b5f90fa146134 Mon Sep 17 00:00:00 2001 From: Lakshan Dissanayake Date: Sun, 24 Nov 2019 22:44:05 +0530 Subject: [PATCH 1/2] upgraded gradle dependencies --- build.gradle | 15 ++++----------- gradle.properties | 20 +++++++------------- gradle/wrapper/gradle-wrapper.properties | 2 +- library/build.gradle | 6 +++--- sample/build.gradle | 6 +++--- 5 files changed, 18 insertions(+), 31 deletions(-) diff --git a/build.gradle b/build.gradle index dc66a8f4..8165d594 100644 --- a/build.gradle +++ b/build.gradle @@ -2,17 +2,14 @@ buildscript { repositories { + google() jcenter() mavenLocal() mavenCentral() maven { url 'https://jitpack.io' } } dependencies { - classpath 'com.android.tools.build:gradle:2.2.3' - // to auto install sdk components when building see #248 - // classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.+' - classpath 'com.github.plastiv:sdk-manager-plugin:b04aea1cddf87e78db9a4372794d678f9e568c48' - + classpath 'com.android.tools.build:gradle:3.5.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -27,10 +24,6 @@ allprojects { jcenter() mavenLocal() mavenCentral() + google() } - apply plugin: 'android-sdk-manager' //see #248 -} - -task wrapper(type: Wrapper) { - gradleVersion = '3.2' -} +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 49d70469..cc46e0ac 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,30 +1,24 @@ # Project-wide Gradle settings. - # IDE (e.g. Android Studio) users: # Settings specified in this file will override any Gradle settings # configured through the IDE. - # For more details on how to configure your build environment visit # http://www.gradle.org/docs/current/userguide/build_environment.html - # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. # Default value: -Xmx10248m -XX:MaxPermSize=256m # org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 - # 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 -VERSION_NAME=3.1.0 -VERSION_CODE=310 +VERSION_NAME=3.1.1 +VERSION_CODE=311 GROUP=com.code-troopers.betterpickers - -ANDROID_BUILD_MIN_SDK_VERSION=9 -ANDROID_BUILD_TARGET_SDK_VERSION=25 -ANDROID_BUILD_SDK_VERSION=25 -ANDROID_BUILD_TOOLS_VERSION=25.0.0 - +ANDROID_BUILD_MIN_SDK_VERSION=14 +ANDROID_BUILD_TARGET_SDK_VERSION=29 +ANDROID_BUILD_SDK_VERSION=29 +ANDROID_BUILD_TOOLS_VERSION=29.0.2 POM_DESCRIPTION=Android library for better number/date/time-picker DialogFragments. POM_URL=http://github.com/derekbrameyer/android-betterpickers POM_SCM_URL=http://github.com/derekbrameyer/android-betterpickers @@ -35,4 +29,4 @@ POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt POM_LICENCE_DIST=repo POM_DEVELOPER_ID=codetroopers POM_DEVELOPER_NAME=Code Troopers -POM_DEVELOPER_EMAIL=contact@code-troopers.com \ No newline at end of file +POM_DEVELOPER_EMAIL=contact@code-troopers.com diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9c4cbae8..5dc6b3d8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip diff --git a/library/build.gradle b/library/build.gradle index 89723ae2..b7794b07 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -35,7 +35,7 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.nineoldandroids:library:2.4.0' - compile 'com.android.support:appcompat-v7:25.0.1' + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'com.nineoldandroids:library:2.4.0' + implementation 'com.android.support:appcompat-v7:28.0.0' } diff --git a/sample/build.gradle b/sample/build.gradle index bbb2affe..4fe6df56 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -23,7 +23,7 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - compile project(':library') - compile 'joda-time:joda-time:2.9.6' + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation project(':library') + implementation 'joda-time:joda-time:2.9.6' } From 8ae14d3e15eb51d2f8223f091c822b6dca3500dc Mon Sep 17 00:00:00 2001 From: Lakshan Dissanayake Date: Sun, 24 Nov 2019 22:49:42 +0530 Subject: [PATCH 2/2] migrated to AndroidX --- gradle.properties | 2 ++ library/build.gradle | 2 +- .../betterpickers/TouchExplorationHelper.java | 10 +++++----- .../CalendarDatePickerDialogFragment.java | 8 ++++---- .../betterpickers/calendardatepicker/MonthAdapter.java | 2 +- .../betterpickers/calendardatepicker/MonthView.java | 10 +++++----- .../calendardatepicker/YearPickerView.java | 4 ++-- .../betterpickers/datepicker/DatePicker.java | 4 ++-- .../betterpickers/datepicker/DatePickerBuilder.java | 6 +++--- .../datepicker/DatePickerDialogFragment.java | 4 ++-- .../expirationpicker/ExpirationPicker.java | 4 ++-- .../expirationpicker/ExpirationPickerBuilder.java | 6 +++--- .../ExpirationPickerDialogFragment.java | 4 ++-- .../betterpickers/hmspicker/HmsPickerBuilder.java | 6 +++--- .../hmspicker/HmsPickerDialogFragment.java | 4 ++-- .../numberpicker/NumberPickerBuilder.java | 6 +++--- .../numberpicker/NumberPickerDialogFragment.java | 4 ++-- .../radialtimepicker/AmPmCirclesView.java | 2 +- .../betterpickers/radialtimepicker/CircleView.java | 2 +- .../radialtimepicker/RadialPickerLayout.java | 2 +- .../radialtimepicker/RadialSelectorView.java | 2 +- .../radialtimepicker/RadialTextsView.java | 2 +- .../RadialTimePickerDialogFragment.java | 4 ++-- .../RecurrencePickerDialogFragment.java | 6 +++--- .../betterpickers/recurrencepicker/WeekButton.java | 2 +- .../betterpickers/timepicker/TimePickerBuilder.java | 6 +++--- .../timepicker/TimePickerDialogFragment.java | 4 ++-- .../betterpickers/timezonepicker/TimeZoneInfo.java | 2 +- .../timezonepicker/TimeZonePickerDialogFragment.java | 4 ++-- .../betterpickers/widget/PageIndicator.java | 2 +- .../widget/UnderlinePageIndicatorPicker.java | 6 +++--- library/src/main/res/layout/date_picker_view.xml | 2 +- library/src/main/res/layout/expiration_picker_view.xml | 2 +- library/src/main/res/layout/recurrencepicker.xml | 2 +- .../codetroopers/betterpickers/sample/ListSamples.java | 2 +- .../sample/activity/BaseSampleActivity.java | 2 +- .../activity/datepicker/SampleDateListAdapter.java | 2 +- .../activity/datepicker/SampleDateUsingFragment.java | 4 ++-- .../activity/hmspicker/SampleHmsListAdapter.java | 2 +- .../activity/hmspicker/SampleHmsUsingFragment.java | 4 ++-- .../numberpicker/SampleNumberDoubleListAdapter.java | 2 +- .../numberpicker/SampleNumberIntegerListAdapter.java | 2 +- .../numberpicker/SampleNumberUsingFragment.java | 4 ++-- .../recurrencepicker/SampleRecurrenceBasicUsage.java | 2 +- .../SampleRecurrenceDismissListener.java | 2 +- .../recurrencepicker/SampleRecurrenceForcedOn.java | 2 +- .../activity/timepicker/SampleTimeListAdapter.java | 2 +- .../activity/timepicker/SampleTimeUsingFragment.java | 4 ++-- .../timezonepicker/SampleTimeZoneBasicUsage.java | 2 +- .../timezonepicker/SampleTimeZoneDismissListener.java | 2 +- .../sample/fragment/SampleDateFragment.java | 2 +- .../sample/fragment/SampleHmsFragment.java | 2 +- .../sample/fragment/SampleNumberFragment.java | 2 +- .../sample/fragment/SampleTimeFragment.java | 2 +- 54 files changed, 94 insertions(+), 92 deletions(-) diff --git a/gradle.properties b/gradle.properties index cc46e0ac..99586540 100644 --- a/gradle.properties +++ b/gradle.properties @@ -30,3 +30,5 @@ POM_LICENCE_DIST=repo POM_DEVELOPER_ID=codetroopers POM_DEVELOPER_NAME=Code Troopers POM_DEVELOPER_EMAIL=contact@code-troopers.com +android.useAndroidX=true +android.enableJetifier=true diff --git a/library/build.gradle b/library/build.gradle index b7794b07..89eda07a 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -37,5 +37,5 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation 'com.nineoldandroids:library:2.4.0' - implementation 'com.android.support:appcompat-v7:28.0.0' + implementation 'androidx.appcompat:appcompat:1.1.0' } diff --git a/library/src/main/java/com/codetroopers/betterpickers/TouchExplorationHelper.java b/library/src/main/java/com/codetroopers/betterpickers/TouchExplorationHelper.java index bcb2de18..757a8071 100644 --- a/library/src/main/java/com/codetroopers/betterpickers/TouchExplorationHelper.java +++ b/library/src/main/java/com/codetroopers/betterpickers/TouchExplorationHelper.java @@ -19,11 +19,11 @@ import android.content.Context; import android.graphics.Rect; import android.os.Bundle; -import android.support.v4.view.AccessibilityDelegateCompat; -import android.support.v4.view.ViewCompat; -import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat; -import android.support.v4.view.accessibility.AccessibilityNodeProviderCompat; -import android.support.v4.view.accessibility.AccessibilityRecordCompat; +import androidx.core.view.AccessibilityDelegateCompat; +import androidx.core.view.ViewCompat; +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat; +import androidx.core.view.accessibility.AccessibilityNodeProviderCompat; +import androidx.core.view.accessibility.AccessibilityRecordCompat; import android.text.TextUtils; import android.view.View; import android.view.ViewGroup; diff --git a/library/src/main/java/com/codetroopers/betterpickers/calendardatepicker/CalendarDatePickerDialogFragment.java b/library/src/main/java/com/codetroopers/betterpickers/calendardatepicker/CalendarDatePickerDialogFragment.java index 641424a3..67ba2fac 100644 --- a/library/src/main/java/com/codetroopers/betterpickers/calendardatepicker/CalendarDatePickerDialogFragment.java +++ b/library/src/main/java/com/codetroopers/betterpickers/calendardatepicker/CalendarDatePickerDialogFragment.java @@ -21,10 +21,10 @@ import android.content.res.Resources; import android.content.res.TypedArray; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.DialogFragment; -import android.support.v4.content.ContextCompat; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.DialogFragment; +import androidx.core.content.ContextCompat; import android.text.format.DateUtils; import android.util.Log; import android.util.SparseArray; diff --git a/library/src/main/java/com/codetroopers/betterpickers/calendardatepicker/MonthAdapter.java b/library/src/main/java/com/codetroopers/betterpickers/calendardatepicker/MonthAdapter.java index de0bb3ab..ee3f6289 100644 --- a/library/src/main/java/com/codetroopers/betterpickers/calendardatepicker/MonthAdapter.java +++ b/library/src/main/java/com/codetroopers/betterpickers/calendardatepicker/MonthAdapter.java @@ -21,7 +21,7 @@ import android.content.res.TypedArray; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.format.Time; import android.view.View; import android.view.ViewGroup; diff --git a/library/src/main/java/com/codetroopers/betterpickers/calendardatepicker/MonthView.java b/library/src/main/java/com/codetroopers/betterpickers/calendardatepicker/MonthView.java index b31e2686..7ec99da8 100644 --- a/library/src/main/java/com/codetroopers/betterpickers/calendardatepicker/MonthView.java +++ b/library/src/main/java/com/codetroopers/betterpickers/calendardatepicker/MonthView.java @@ -27,11 +27,11 @@ import android.graphics.Typeface; import android.os.Build; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.content.ContextCompat; -import android.support.v4.view.ViewCompat; -import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat; -import android.support.v4.widget.ExploreByTouchHelper; +import androidx.annotation.NonNull; +import androidx.core.content.ContextCompat; +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; diff --git a/library/src/main/java/com/codetroopers/betterpickers/calendardatepicker/YearPickerView.java b/library/src/main/java/com/codetroopers/betterpickers/calendardatepicker/YearPickerView.java index d2afadef..523c39f0 100644 --- a/library/src/main/java/com/codetroopers/betterpickers/calendardatepicker/YearPickerView.java +++ b/library/src/main/java/com/codetroopers/betterpickers/calendardatepicker/YearPickerView.java @@ -20,8 +20,8 @@ import android.content.res.Resources; import android.content.res.TypedArray; import android.graphics.drawable.StateListDrawable; -import android.support.annotation.NonNull; -import android.support.v4.content.ContextCompat; +import androidx.annotation.NonNull; +import androidx.core.content.ContextCompat; import android.view.View; import android.view.ViewGroup; import android.view.accessibility.AccessibilityEvent; diff --git a/library/src/main/java/com/codetroopers/betterpickers/datepicker/DatePicker.java b/library/src/main/java/com/codetroopers/betterpickers/datepicker/DatePicker.java index 4aa8a288..1fbc8d79 100644 --- a/library/src/main/java/com/codetroopers/betterpickers/datepicker/DatePicker.java +++ b/library/src/main/java/com/codetroopers/betterpickers/datepicker/DatePicker.java @@ -6,8 +6,8 @@ import android.content.res.TypedArray; import android.os.Parcel; import android.os.Parcelable; -import android.support.v4.view.PagerAdapter; -import android.support.v4.view.ViewPager; +import androidx.viewpager.widget.PagerAdapter; +import androidx.viewpager.widget.ViewPager; import android.text.format.DateFormat; import android.util.AttributeSet; import android.view.HapticFeedbackConstants; diff --git a/library/src/main/java/com/codetroopers/betterpickers/datepicker/DatePickerBuilder.java b/library/src/main/java/com/codetroopers/betterpickers/datepicker/DatePickerBuilder.java index 2c20bd7c..74109a9f 100644 --- a/library/src/main/java/com/codetroopers/betterpickers/datepicker/DatePickerBuilder.java +++ b/library/src/main/java/com/codetroopers/betterpickers/datepicker/DatePickerBuilder.java @@ -1,8 +1,8 @@ package com.codetroopers.betterpickers.datepicker; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentTransaction; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentTransaction; import android.util.Log; import com.codetroopers.betterpickers.OnDialogDismissListener; diff --git a/library/src/main/java/com/codetroopers/betterpickers/datepicker/DatePickerDialogFragment.java b/library/src/main/java/com/codetroopers/betterpickers/datepicker/DatePickerDialogFragment.java index 64a5e92e..d306209c 100644 --- a/library/src/main/java/com/codetroopers/betterpickers/datepicker/DatePickerDialogFragment.java +++ b/library/src/main/java/com/codetroopers/betterpickers/datepicker/DatePickerDialogFragment.java @@ -5,8 +5,8 @@ import android.content.res.ColorStateList; import android.content.res.TypedArray; import android.os.Bundle; -import android.support.v4.app.DialogFragment; -import android.support.v4.app.Fragment; +import androidx.fragment.app.DialogFragment; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/library/src/main/java/com/codetroopers/betterpickers/expirationpicker/ExpirationPicker.java b/library/src/main/java/com/codetroopers/betterpickers/expirationpicker/ExpirationPicker.java index 5a45ac4e..0d22d0d6 100644 --- a/library/src/main/java/com/codetroopers/betterpickers/expirationpicker/ExpirationPicker.java +++ b/library/src/main/java/com/codetroopers/betterpickers/expirationpicker/ExpirationPicker.java @@ -7,8 +7,8 @@ import android.content.res.TypedArray; import android.os.Parcel; import android.os.Parcelable; -import android.support.v4.view.PagerAdapter; -import android.support.v4.view.ViewPager; +import androidx.viewpager.widget.PagerAdapter; +import androidx.viewpager.widget.ViewPager; import android.text.format.DateFormat; import android.util.AttributeSet; import android.view.HapticFeedbackConstants; diff --git a/library/src/main/java/com/codetroopers/betterpickers/expirationpicker/ExpirationPickerBuilder.java b/library/src/main/java/com/codetroopers/betterpickers/expirationpicker/ExpirationPickerBuilder.java index 50e769b4..15537c6e 100644 --- a/library/src/main/java/com/codetroopers/betterpickers/expirationpicker/ExpirationPickerBuilder.java +++ b/library/src/main/java/com/codetroopers/betterpickers/expirationpicker/ExpirationPickerBuilder.java @@ -1,8 +1,8 @@ package com.codetroopers.betterpickers.expirationpicker; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentTransaction; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentTransaction; import android.util.Log; import com.codetroopers.betterpickers.OnDialogDismissListener; diff --git a/library/src/main/java/com/codetroopers/betterpickers/expirationpicker/ExpirationPickerDialogFragment.java b/library/src/main/java/com/codetroopers/betterpickers/expirationpicker/ExpirationPickerDialogFragment.java index 52a8dd21..5b01bc44 100644 --- a/library/src/main/java/com/codetroopers/betterpickers/expirationpicker/ExpirationPickerDialogFragment.java +++ b/library/src/main/java/com/codetroopers/betterpickers/expirationpicker/ExpirationPickerDialogFragment.java @@ -5,8 +5,8 @@ import android.content.res.ColorStateList; import android.content.res.TypedArray; import android.os.Bundle; -import android.support.v4.app.DialogFragment; -import android.support.v4.app.Fragment; +import androidx.fragment.app.DialogFragment; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/library/src/main/java/com/codetroopers/betterpickers/hmspicker/HmsPickerBuilder.java b/library/src/main/java/com/codetroopers/betterpickers/hmspicker/HmsPickerBuilder.java index 581cf9bf..d9aafb7e 100644 --- a/library/src/main/java/com/codetroopers/betterpickers/hmspicker/HmsPickerBuilder.java +++ b/library/src/main/java/com/codetroopers/betterpickers/hmspicker/HmsPickerBuilder.java @@ -1,8 +1,8 @@ package com.codetroopers.betterpickers.hmspicker; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentTransaction; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentTransaction; import android.util.Log; import com.codetroopers.betterpickers.OnDialogDismissListener; diff --git a/library/src/main/java/com/codetroopers/betterpickers/hmspicker/HmsPickerDialogFragment.java b/library/src/main/java/com/codetroopers/betterpickers/hmspicker/HmsPickerDialogFragment.java index 0ab44032..40e9b216 100644 --- a/library/src/main/java/com/codetroopers/betterpickers/hmspicker/HmsPickerDialogFragment.java +++ b/library/src/main/java/com/codetroopers/betterpickers/hmspicker/HmsPickerDialogFragment.java @@ -5,8 +5,8 @@ import android.content.res.ColorStateList; import android.content.res.TypedArray; import android.os.Bundle; -import android.support.v4.app.DialogFragment; -import android.support.v4.app.Fragment; +import androidx.fragment.app.DialogFragment; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/library/src/main/java/com/codetroopers/betterpickers/numberpicker/NumberPickerBuilder.java b/library/src/main/java/com/codetroopers/betterpickers/numberpicker/NumberPickerBuilder.java index 8d3cdbfd..d7cc7da1 100644 --- a/library/src/main/java/com/codetroopers/betterpickers/numberpicker/NumberPickerBuilder.java +++ b/library/src/main/java/com/codetroopers/betterpickers/numberpicker/NumberPickerBuilder.java @@ -1,8 +1,8 @@ package com.codetroopers.betterpickers.numberpicker; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentTransaction; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentTransaction; import android.util.Log; import com.codetroopers.betterpickers.OnDialogDismissListener; diff --git a/library/src/main/java/com/codetroopers/betterpickers/numberpicker/NumberPickerDialogFragment.java b/library/src/main/java/com/codetroopers/betterpickers/numberpicker/NumberPickerDialogFragment.java index 765c3866..ec4cc5a1 100644 --- a/library/src/main/java/com/codetroopers/betterpickers/numberpicker/NumberPickerDialogFragment.java +++ b/library/src/main/java/com/codetroopers/betterpickers/numberpicker/NumberPickerDialogFragment.java @@ -5,8 +5,8 @@ import android.content.res.ColorStateList; import android.content.res.TypedArray; import android.os.Bundle; -import android.support.v4.app.DialogFragment; -import android.support.v4.app.Fragment; +import androidx.fragment.app.DialogFragment; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/library/src/main/java/com/codetroopers/betterpickers/radialtimepicker/AmPmCirclesView.java b/library/src/main/java/com/codetroopers/betterpickers/radialtimepicker/AmPmCirclesView.java index dade49ba..065319d2 100644 --- a/library/src/main/java/com/codetroopers/betterpickers/radialtimepicker/AmPmCirclesView.java +++ b/library/src/main/java/com/codetroopers/betterpickers/radialtimepicker/AmPmCirclesView.java @@ -23,7 +23,7 @@ import android.graphics.Paint; import android.graphics.Paint.Align; import android.graphics.Typeface; -import android.support.v4.content.ContextCompat; +import androidx.core.content.ContextCompat; import android.util.Log; import android.view.View; diff --git a/library/src/main/java/com/codetroopers/betterpickers/radialtimepicker/CircleView.java b/library/src/main/java/com/codetroopers/betterpickers/radialtimepicker/CircleView.java index e04f78b4..45f61cd4 100644 --- a/library/src/main/java/com/codetroopers/betterpickers/radialtimepicker/CircleView.java +++ b/library/src/main/java/com/codetroopers/betterpickers/radialtimepicker/CircleView.java @@ -21,7 +21,7 @@ import android.content.res.TypedArray; import android.graphics.Canvas; import android.graphics.Paint; -import android.support.v4.content.ContextCompat; +import androidx.core.content.ContextCompat; import android.util.Log; import android.view.View; diff --git a/library/src/main/java/com/codetroopers/betterpickers/radialtimepicker/RadialPickerLayout.java b/library/src/main/java/com/codetroopers/betterpickers/radialtimepicker/RadialPickerLayout.java index b6b15884..7bf187de 100644 --- a/library/src/main/java/com/codetroopers/betterpickers/radialtimepicker/RadialPickerLayout.java +++ b/library/src/main/java/com/codetroopers/betterpickers/radialtimepicker/RadialPickerLayout.java @@ -22,7 +22,7 @@ import android.content.res.TypedArray; import android.os.Bundle; import android.os.Handler; -import android.support.v4.view.accessibility.AccessibilityManagerCompat; +import androidx.core.view.accessibility.AccessibilityManagerCompat; import android.text.format.DateUtils; import android.text.format.Time; import android.util.AttributeSet; diff --git a/library/src/main/java/com/codetroopers/betterpickers/radialtimepicker/RadialSelectorView.java b/library/src/main/java/com/codetroopers/betterpickers/radialtimepicker/RadialSelectorView.java index f1ed7275..3bd34cb1 100644 --- a/library/src/main/java/com/codetroopers/betterpickers/radialtimepicker/RadialSelectorView.java +++ b/library/src/main/java/com/codetroopers/betterpickers/radialtimepicker/RadialSelectorView.java @@ -21,7 +21,7 @@ import android.content.res.TypedArray; import android.graphics.Canvas; import android.graphics.Paint; -import android.support.v4.content.ContextCompat; +import androidx.core.content.ContextCompat; import android.util.Log; import android.view.View; diff --git a/library/src/main/java/com/codetroopers/betterpickers/radialtimepicker/RadialTextsView.java b/library/src/main/java/com/codetroopers/betterpickers/radialtimepicker/RadialTextsView.java index 5b45fff2..8fac030e 100644 --- a/library/src/main/java/com/codetroopers/betterpickers/radialtimepicker/RadialTextsView.java +++ b/library/src/main/java/com/codetroopers/betterpickers/radialtimepicker/RadialTextsView.java @@ -23,7 +23,7 @@ import android.graphics.Paint; import android.graphics.Paint.Align; import android.graphics.Typeface; -import android.support.v4.content.ContextCompat; +import androidx.core.content.ContextCompat; import android.util.Log; import android.view.View; diff --git a/library/src/main/java/com/codetroopers/betterpickers/radialtimepicker/RadialTimePickerDialogFragment.java b/library/src/main/java/com/codetroopers/betterpickers/radialtimepicker/RadialTimePickerDialogFragment.java index 9beaccfa..47b7ffed 100644 --- a/library/src/main/java/com/codetroopers/betterpickers/radialtimepicker/RadialTimePickerDialogFragment.java +++ b/library/src/main/java/com/codetroopers/betterpickers/radialtimepicker/RadialTimePickerDialogFragment.java @@ -22,8 +22,8 @@ import android.content.res.Resources; import android.content.res.TypedArray; import android.os.Bundle; -import android.support.v4.app.DialogFragment; -import android.support.v4.content.ContextCompat; +import androidx.fragment.app.DialogFragment; +import androidx.core.content.ContextCompat; import android.text.format.DateFormat; import android.util.Log; import android.view.KeyCharacterMap; diff --git a/library/src/main/java/com/codetroopers/betterpickers/recurrencepicker/RecurrencePickerDialogFragment.java b/library/src/main/java/com/codetroopers/betterpickers/recurrencepicker/RecurrencePickerDialogFragment.java index 7197be23..ca87185b 100644 --- a/library/src/main/java/com/codetroopers/betterpickers/recurrencepicker/RecurrencePickerDialogFragment.java +++ b/library/src/main/java/com/codetroopers/betterpickers/recurrencepicker/RecurrencePickerDialogFragment.java @@ -25,9 +25,9 @@ import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; -import android.support.v4.app.DialogFragment; -import android.support.v7.widget.SwitchCompat; +import androidx.annotation.NonNull; +import androidx.fragment.app.DialogFragment; +import androidx.appcompat.widget.SwitchCompat; import android.text.Editable; import android.text.TextUtils; import android.text.TextWatcher; diff --git a/library/src/main/java/com/codetroopers/betterpickers/recurrencepicker/WeekButton.java b/library/src/main/java/com/codetroopers/betterpickers/recurrencepicker/WeekButton.java index a616df16..9b9ba31b 100644 --- a/library/src/main/java/com/codetroopers/betterpickers/recurrencepicker/WeekButton.java +++ b/library/src/main/java/com/codetroopers/betterpickers/recurrencepicker/WeekButton.java @@ -17,7 +17,7 @@ package com.codetroopers.betterpickers.recurrencepicker; import android.content.Context; -import android.support.v4.view.ViewCompat; +import androidx.core.view.ViewCompat; import android.util.AttributeSet; import android.view.View; diff --git a/library/src/main/java/com/codetroopers/betterpickers/timepicker/TimePickerBuilder.java b/library/src/main/java/com/codetroopers/betterpickers/timepicker/TimePickerBuilder.java index 1a7e28c8..acf08a2a 100644 --- a/library/src/main/java/com/codetroopers/betterpickers/timepicker/TimePickerBuilder.java +++ b/library/src/main/java/com/codetroopers/betterpickers/timepicker/TimePickerBuilder.java @@ -1,8 +1,8 @@ package com.codetroopers.betterpickers.timepicker; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentTransaction; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentTransaction; import android.util.Log; import com.codetroopers.betterpickers.OnDialogDismissListener; diff --git a/library/src/main/java/com/codetroopers/betterpickers/timepicker/TimePickerDialogFragment.java b/library/src/main/java/com/codetroopers/betterpickers/timepicker/TimePickerDialogFragment.java index cad9598c..fa67a798 100644 --- a/library/src/main/java/com/codetroopers/betterpickers/timepicker/TimePickerDialogFragment.java +++ b/library/src/main/java/com/codetroopers/betterpickers/timepicker/TimePickerDialogFragment.java @@ -5,8 +5,8 @@ import android.content.res.ColorStateList; import android.content.res.TypedArray; import android.os.Bundle; -import android.support.v4.app.DialogFragment; -import android.support.v4.app.Fragment; +import androidx.fragment.app.DialogFragment; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/library/src/main/java/com/codetroopers/betterpickers/timezonepicker/TimeZoneInfo.java b/library/src/main/java/com/codetroopers/betterpickers/timezonepicker/TimeZoneInfo.java index 7a002920..09e8b947 100644 --- a/library/src/main/java/com/codetroopers/betterpickers/timezonepicker/TimeZoneInfo.java +++ b/library/src/main/java/com/codetroopers/betterpickers/timezonepicker/TimeZoneInfo.java @@ -18,7 +18,7 @@ import android.content.Context; import android.os.Build; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.Spannable; import android.text.Spannable.Factory; import android.text.format.DateUtils; diff --git a/library/src/main/java/com/codetroopers/betterpickers/timezonepicker/TimeZonePickerDialogFragment.java b/library/src/main/java/com/codetroopers/betterpickers/timezonepicker/TimeZonePickerDialogFragment.java index bc3f9b8d..721f30af 100644 --- a/library/src/main/java/com/codetroopers/betterpickers/timezonepicker/TimeZonePickerDialogFragment.java +++ b/library/src/main/java/com/codetroopers/betterpickers/timezonepicker/TimeZonePickerDialogFragment.java @@ -19,8 +19,8 @@ import android.app.Dialog; import android.content.DialogInterface; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.app.DialogFragment; +import androidx.annotation.NonNull; +import androidx.fragment.app.DialogFragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/library/src/main/java/com/codetroopers/betterpickers/widget/PageIndicator.java b/library/src/main/java/com/codetroopers/betterpickers/widget/PageIndicator.java index fa8667d8..d102091b 100644 --- a/library/src/main/java/com/codetroopers/betterpickers/widget/PageIndicator.java +++ b/library/src/main/java/com/codetroopers/betterpickers/widget/PageIndicator.java @@ -17,7 +17,7 @@ package com.codetroopers.betterpickers.widget; -import android.support.v4.view.ViewPager; +import androidx.viewpager.widget.ViewPager; /** * A PageIndicator is responsible to show an visual indicator on the total views number and the current visible view. diff --git a/library/src/main/java/com/codetroopers/betterpickers/widget/UnderlinePageIndicatorPicker.java b/library/src/main/java/com/codetroopers/betterpickers/widget/UnderlinePageIndicatorPicker.java index 9d6ab00b..086de8f3 100644 --- a/library/src/main/java/com/codetroopers/betterpickers/widget/UnderlinePageIndicatorPicker.java +++ b/library/src/main/java/com/codetroopers/betterpickers/widget/UnderlinePageIndicatorPicker.java @@ -22,9 +22,9 @@ import android.graphics.Paint.Style; import android.os.Parcel; import android.os.Parcelable; -import android.support.v4.view.MotionEventCompat; -import android.support.v4.view.ViewConfigurationCompat; -import android.support.v4.view.ViewPager; +import androidx.core.view.MotionEventCompat; +import androidx.core.view.ViewConfigurationCompat; +import androidx.viewpager.widget.ViewPager; import android.util.AttributeSet; import android.view.MotionEvent; import android.view.View; diff --git a/library/src/main/res/layout/date_picker_view.xml b/library/src/main/res/layout/date_picker_view.xml index 3aedbe67..93325b3f 100644 --- a/library/src/main/res/layout/date_picker_view.xml +++ b/library/src/main/res/layout/date_picker_view.xml @@ -63,7 +63,7 @@ android:id="@+id/keyboard_indicator" android:layout_width="match_parent" android:layout_height="2dip"/> - diff --git a/library/src/main/res/layout/expiration_picker_view.xml b/library/src/main/res/layout/expiration_picker_view.xml index 137299bf..0c57f913 100644 --- a/library/src/main/res/layout/expiration_picker_view.xml +++ b/library/src/main/res/layout/expiration_picker_view.xml @@ -64,7 +64,7 @@ android:id="@+id/keyboard_indicator" android:layout_width="match_parent" android:layout_height="2dip"/> - diff --git a/library/src/main/res/layout/recurrencepicker.xml b/library/src/main/res/layout/recurrencepicker.xml index c7b13998..f2cc18e4 100644 --- a/library/src/main/res/layout/recurrencepicker.xml +++ b/library/src/main/res/layout/recurrencepicker.xml @@ -61,7 +61,7 @@ android:gravity="left" android:padding="0dp" /> -