From 6d9747cdfa390a6ec019c2099e104c952b3cdaba Mon Sep 17 00:00:00 2001 From: 005548 Date: Fri, 2 Oct 2020 14:44:26 +0700 Subject: [PATCH] migrate to androidx --- build.gradle | 2 +- gradle.properties | 1 + gradle/wrapper/gradle-wrapper.properties | 2 +- library/build.gradle | 10 +++++----- .../compactcalendarview/AnimationHandler.java | 3 ++- .../compactcalendarview/CompactCalendarView.java | 3 ++- .../sundeepk/compactcalendarview/domain/Event.java | 2 +- sample/build.gradle | 14 +++++++------- .../github/com/sample/ApplicationTest.java | 3 ++- .../github/com/sample/CompactCalendarTab.java | 11 ++++++----- .../sundeepk/github/com/sample/MainActivity.java | 8 +++++--- .../github/com/sample/SlidingTabLayout.java | 7 ++++--- .../main/java/sundeepk/github/com/sample/Tab2.java | 5 +++-- .../github/com/sample/ViewPagerAdapter.java | 6 +++--- sample/src/main/res/layout/activity_main.xml | 4 ++-- sample/src/main/res/layout/tool_bar.xml | 2 +- 16 files changed, 46 insertions(+), 37 deletions(-) diff --git a/build.gradle b/build.gradle index 24a9f6fd..1dd7f84b 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.2' + classpath "com.android.tools.build:gradle:4.0.1" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle.properties b/gradle.properties index d84e6c89..76fdcbff 100644 --- a/gradle.properties +++ b/gradle.properties @@ -28,3 +28,4 @@ POM_URL=https\://github.com/SundeepK/CompactCalendarView POM_SCM_CONNECTION=scm\:git@github.com\:SundeepK/CompactCalendarView.git POM_LICENCE_NAME=The MIT License (MIT) POM_DESCRIPTION=An android library which provides a compact calender view +android.useAndroidX=true diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0286cc9f..cb600a1d 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-4.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip diff --git a/library/build.gradle b/library/build.gradle index a62fde13..05ab7a45 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -17,12 +17,12 @@ repositories { android { - compileSdkVersion 27 - buildToolsVersion '27.0.3' + compileSdkVersion 30 + buildToolsVersion '30.0.2' defaultConfig { minSdkVersion 11 - targetSdkVersion 27 + targetSdkVersion 30 versionCode 1 versionName "1.0" } @@ -35,8 +35,8 @@ android { } dependencies { - api fileTree(include: ['*.jar'], dir: 'libs') - api 'com.android.support:appcompat-v7:27.1.1' + implementation fileTree(include: ['*.jar'], dir: 'libs') + implementation 'androidx.appcompat:appcompat:1.2.0' //mockito dependencies testImplementation 'junit:junit:4.12' testImplementation 'org.mockito:mockito-core:2.15.0' diff --git a/library/src/main/java/com/github/sundeepk/compactcalendarview/AnimationHandler.java b/library/src/main/java/com/github/sundeepk/compactcalendarview/AnimationHandler.java index cda5a1e0..b53a4460 100644 --- a/library/src/main/java/com/github/sundeepk/compactcalendarview/AnimationHandler.java +++ b/library/src/main/java/com/github/sundeepk/compactcalendarview/AnimationHandler.java @@ -3,11 +3,12 @@ import android.animation.Animator; import android.animation.ValueAnimator; -import android.support.annotation.NonNull; import android.view.animation.AccelerateDecelerateInterpolator; import android.view.animation.Animation; import android.view.animation.OvershootInterpolator; +import androidx.annotation.NonNull; + class AnimationHandler { private static final int HEIGHT_ANIM_DURATION_MILLIS = 650; diff --git a/library/src/main/java/com/github/sundeepk/compactcalendarview/CompactCalendarView.java b/library/src/main/java/com/github/sundeepk/compactcalendarview/CompactCalendarView.java index 904c5bcd..71ced648 100755 --- a/library/src/main/java/com/github/sundeepk/compactcalendarview/CompactCalendarView.java +++ b/library/src/main/java/com/github/sundeepk/compactcalendarview/CompactCalendarView.java @@ -5,7 +5,6 @@ import android.graphics.Color; import android.graphics.Paint; import android.graphics.Rect; -import android.support.v4.view.GestureDetectorCompat; import android.util.AttributeSet; import android.view.GestureDetector; import android.view.MotionEvent; @@ -13,6 +12,8 @@ import android.view.View; import android.widget.OverScroller; +import androidx.core.view.GestureDetectorCompat; + import com.github.sundeepk.compactcalendarview.domain.Event; import java.util.Calendar; diff --git a/library/src/main/java/com/github/sundeepk/compactcalendarview/domain/Event.java b/library/src/main/java/com/github/sundeepk/compactcalendarview/domain/Event.java index 15fb9db0..05048c66 100644 --- a/library/src/main/java/com/github/sundeepk/compactcalendarview/domain/Event.java +++ b/library/src/main/java/com/github/sundeepk/compactcalendarview/domain/Event.java @@ -1,6 +1,6 @@ package com.github.sundeepk.compactcalendarview.domain; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; public class Event { diff --git a/sample/build.gradle b/sample/build.gradle index 8ee6d99a..f793ca1b 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -16,13 +16,13 @@ apply plugin: 'com.android.application' apply plugin: 'com.facebook.testing.screenshot' android { - compileSdkVersion 27 - buildToolsVersion '27.0.3' + compileSdkVersion 30 + buildToolsVersion '30.0.2' defaultConfig { applicationId "sundeepk.github.com.sample" minSdkVersion 16 - targetSdkVersion 27 + targetSdkVersion 30 versionCode 1 versionName "1.0" testInstrumentationRunner "sundeepk.github.com.sample.TestRunner" @@ -40,10 +40,10 @@ configurations.all { } dependencies { - api fileTree(include: ['*.jar'], dir: 'libs') - api 'com.android.support:appcompat-v7:27.1.1' - api 'com.android.support:support-v4:27.1.1' - api project(':library') + implementation fileTree(include: ['*.jar'], dir: 'libs') + implementation 'androidx.appcompat:appcompat:1.2.0' + implementation project(':library') + androidTestImplementation 'com.android.support.test:runner:1.0.2' androidTestImplementation 'com.azimolabs.conditionwatcher:conditionwatcher:0.1' androidTestImplementation 'com.android.support.test:rules:1.0.2' diff --git a/sample/src/androidTest/java/sundeepk/github/com/sample/ApplicationTest.java b/sample/src/androidTest/java/sundeepk/github/com/sample/ApplicationTest.java index 716cb7a2..146f591b 100644 --- a/sample/src/androidTest/java/sundeepk/github/com/sample/ApplicationTest.java +++ b/sample/src/androidTest/java/sundeepk/github/com/sample/ApplicationTest.java @@ -12,12 +12,13 @@ import android.support.test.espresso.action.Tap; import android.support.test.rule.ActivityTestRule; import android.support.test.runner.AndroidJUnit4; -import android.support.v7.app.ActionBar; import android.util.DisplayMetrics; import android.util.Log; import android.util.TypedValue; import android.view.View; +import androidx.appcompat.app.ActionBar; + import com.azimolabs.conditionwatcher.ConditionWatcher; import com.azimolabs.conditionwatcher.Instruction; import com.facebook.testing.screenshot.Screenshot; diff --git a/sample/src/main/java/sundeepk/github/com/sample/CompactCalendarTab.java b/sample/src/main/java/sundeepk/github/com/sample/CompactCalendarTab.java index 7d1b44a1..6e992ce3 100644 --- a/sample/src/main/java/sundeepk/github/com/sample/CompactCalendarTab.java +++ b/sample/src/main/java/sundeepk/github/com/sample/CompactCalendarTab.java @@ -3,11 +3,6 @@ import android.graphics.Color; import android.os.Build; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; import android.util.Log; import android.view.LayoutInflater; import android.view.View; @@ -18,6 +13,12 @@ import android.widget.ListView; import android.widget.RelativeLayout; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.fragment.app.Fragment; + import com.github.sundeepk.compactcalendarview.CompactCalendarView; import com.github.sundeepk.compactcalendarview.domain.Event; diff --git a/sample/src/main/java/sundeepk/github/com/sample/MainActivity.java b/sample/src/main/java/sundeepk/github/com/sample/MainActivity.java index 66e834f6..c3b67e1b 100644 --- a/sample/src/main/java/sundeepk/github/com/sample/MainActivity.java +++ b/sample/src/main/java/sundeepk/github/com/sample/MainActivity.java @@ -1,12 +1,14 @@ package sundeepk.github.com.sample; import android.os.Bundle; -import android.support.v4.view.ViewPager; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; + import android.view.Menu; import android.view.MenuItem; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; +import androidx.viewpager.widget.ViewPager; + public class MainActivity extends AppCompatActivity { diff --git a/sample/src/main/java/sundeepk/github/com/sample/SlidingTabLayout.java b/sample/src/main/java/sundeepk/github/com/sample/SlidingTabLayout.java index 40722ea6..3a6ac11f 100644 --- a/sample/src/main/java/sundeepk/github/com/sample/SlidingTabLayout.java +++ b/sample/src/main/java/sundeepk/github/com/sample/SlidingTabLayout.java @@ -17,8 +17,6 @@ import android.content.Context; import android.graphics.Typeface; -import android.support.v4.view.PagerAdapter; -import android.support.v4.view.ViewPager; import android.util.AttributeSet; import android.util.SparseArray; import android.util.TypedValue; @@ -30,12 +28,15 @@ import android.widget.LinearLayout; import android.widget.TextView; +import androidx.viewpager.widget.PagerAdapter; +import androidx.viewpager.widget.ViewPager; + /** * To be used with ViewPager to provide a tab indicator component which give constant feedback as to * the user's scroll progress. *

* To use the component, simply add it to your view hierarchy. Then in your - * {@link android.app.Activity} or {@link android.support.v4.app.Fragment} call + * {@link android.app.Activity} or {@link androidx.fragment.app.Fragment} call * {@link #setViewPager(ViewPager)} providing it the ViewPager this layout is being used for. *

* The colors can be customized in two ways. The first and simplest is to provide an array of colors diff --git a/sample/src/main/java/sundeepk/github/com/sample/Tab2.java b/sample/src/main/java/sundeepk/github/com/sample/Tab2.java index 94ec91ae..9535c578 100644 --- a/sample/src/main/java/sundeepk/github/com/sample/Tab2.java +++ b/sample/src/main/java/sundeepk/github/com/sample/Tab2.java @@ -1,12 +1,13 @@ package sundeepk.github.com.sample; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; + public class Tab2 extends Fragment { @Override public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { diff --git a/sample/src/main/java/sundeepk/github/com/sample/ViewPagerAdapter.java b/sample/src/main/java/sundeepk/github/com/sample/ViewPagerAdapter.java index 502079a9..cb43a111 100644 --- a/sample/src/main/java/sundeepk/github/com/sample/ViewPagerAdapter.java +++ b/sample/src/main/java/sundeepk/github/com/sample/ViewPagerAdapter.java @@ -1,8 +1,8 @@ package sundeepk.github.com.sample; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentStatePagerAdapter; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentStatePagerAdapter; public class ViewPagerAdapter extends FragmentStatePagerAdapter { diff --git a/sample/src/main/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml index 81a13627..264f9156 100644 --- a/sample/src/main/res/layout/activity_main.xml +++ b/sample/src/main/res/layout/activity_main.xml @@ -21,11 +21,11 @@ android:elevation="2dp" android:background="#ffe95451"/> - - + diff --git a/sample/src/main/res/layout/tool_bar.xml b/sample/src/main/res/layout/tool_bar.xml index 5a88faad..c0beb848 100644 --- a/sample/src/main/res/layout/tool_bar.xml +++ b/sample/src/main/res/layout/tool_bar.xml @@ -1,5 +1,5 @@ -