项目升级androidx

Androidcfr · Oct 25, 2019 · b69692f · b69692f
1 parent 2148e72
commit b69692f
Show file tree

Hide file tree

Showing 53 changed files with 230 additions and 158 deletions.
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,14 +1,14 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
     defaultConfig {
         applicationId "com.necer.ncalendar"
         minSdkVersion 15
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 2
-        versionName "4.3.8"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        versionName "4.3.9"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
@@ -20,13 +20,13 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    implementation 'com.android.support:appcompat-v7:27.1.1'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
 
     testImplementation 'junit:junit:4.12'
     implementation project(':ncalendar')
-    implementation 'com.android.support:recyclerview-v7:27.1.1'
-    implementation 'com.android.support:design:27.1.1'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    implementation 'com.google.android.material:material:1.0.0'
 }
diff --git a/app/src/androidTest/java/necer/ncalendardemo/ExampleInstrumentedTest.java b/app/src/androidTest/java/necer/ncalendardemo/ExampleInstrumentedTest.java
@@ -1,8 +1,8 @@
 package necer.ncalendardemo;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/app/src/main/java/com/necer/ncalendar/TestActivity.java b/app/src/main/java/com/necer/ncalendar/TestActivity.java
@@ -1,11 +1,11 @@
 package com.necer.ncalendar;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.design.widget.TabLayout;
-import android.support.v4.app.Fragment;
-import android.support.v4.view.ViewPager;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.Nullable;
+import com.google.android.material.tabs.TabLayout;
+import androidx.fragment.app.Fragment;
+import androidx.viewpager.widget.ViewPager;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.necer.ncalendar.adapter.ViewPagerAdapter;
 import com.necer.ncalendar.fragment.Fragment1;

diff --git a/app/src/main/java/com/necer/ncalendar/activity/BaseActivity.java b/app/src/main/java/com/necer/ncalendar/activity/BaseActivity.java
@@ -1,11 +1,9 @@
 package com.necer.ncalendar.activity;
 
-import android.content.Context;
-import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.necer.enumeration.SelectedModel;
 

diff --git a/app/src/main/java/com/necer/ncalendar/activity/CustomCalendarActivity.java b/app/src/main/java/com/necer/ncalendar/activity/CustomCalendarActivity.java
@@ -1,8 +1,8 @@
 package com.necer.ncalendar.activity;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 
 import com.necer.calendar.Miui10Calendar;

diff --git a/app/src/main/java/com/necer/ncalendar/activity/MainActivity.java b/app/src/main/java/com/necer/ncalendar/activity/MainActivity.java
@@ -2,8 +2,8 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.TextView;
 

diff --git a/app/src/main/java/com/necer/ncalendar/activity/TestAddViewActivity.java b/app/src/main/java/com/necer/ncalendar/activity/TestAddViewActivity.java
@@ -1,14 +1,13 @@
 package com.necer.ncalendar.activity;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 
 import com.necer.calendar.Miui10Calendar;
 import com.necer.enumeration.CalendarState;
 import com.necer.ncalendar.R;
-import com.necer.utils.Attrs;
 
 public class TestAddViewActivity extends AppCompatActivity {
 

diff --git a/app/src/main/java/com/necer/ncalendar/activity/TestEmuiActivity.java b/app/src/main/java/com/necer/ncalendar/activity/TestEmuiActivity.java
@@ -1,7 +1,7 @@
 package com.necer.ncalendar.activity;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Log;
 import android.view.View;
 import android.widget.TextView;

diff --git a/app/src/main/java/com/necer/ncalendar/activity/TestGeneralActivity.java b/app/src/main/java/com/necer/ncalendar/activity/TestGeneralActivity.java
@@ -1,8 +1,8 @@
 package com.necer.ncalendar.activity;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.necer.ncalendar.R;
 

diff --git a/app/src/main/java/com/necer/ncalendar/activity/TestMiui10Activity.java b/app/src/main/java/com/necer/ncalendar/activity/TestMiui10Activity.java
@@ -2,7 +2,7 @@
 
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Log;
 import android.widget.TextView;
 

diff --git a/app/src/main/java/com/necer/ncalendar/activity/TestMiui9Activity.java b/app/src/main/java/com/necer/ncalendar/activity/TestMiui9Activity.java
@@ -1,9 +1,9 @@
 package com.necer.ncalendar.activity;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.view.View;
 import android.widget.TextView;

diff --git a/app/src/main/java/com/necer/ncalendar/activity/TestMonthActivity.java b/app/src/main/java/com/necer/ncalendar/activity/TestMonthActivity.java
@@ -1,7 +1,7 @@
 package com.necer.ncalendar.activity;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Log;
 import android.view.View;
 import android.widget.TextView;

diff --git a/app/src/main/java/com/necer/ncalendar/activity/TestStretchActivity.java b/app/src/main/java/com/necer/ncalendar/activity/TestStretchActivity.java
@@ -1,13 +1,11 @@
 package com.necer.ncalendar.activity;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-import android.view.View;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.necer.calendar.Miui10Calendar;
 import com.necer.ncalendar.R;
-import com.necer.ncalendar.painter.StretchPainter;
 import com.necer.painter.InnerPainter;
 
 import java.util.Arrays;

diff --git a/app/src/main/java/com/necer/ncalendar/activity/TestViewPagerActivity.java b/app/src/main/java/com/necer/ncalendar/activity/TestViewPagerActivity.java
@@ -1,11 +1,11 @@
 package com.necer.ncalendar.activity;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.design.widget.TabLayout;
-import android.support.v4.app.Fragment;
-import android.support.v4.view.ViewPager;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.Nullable;
+import com.google.android.material.tabs.TabLayout;
+import androidx.fragment.app.Fragment;
+import androidx.viewpager.widget.ViewPager;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.necer.ncalendar.R;
 import com.necer.ncalendar.adapter.ViewPagerAdapter;

diff --git a/app/src/main/java/com/necer/ncalendar/activity/TestWeekActivity.java b/app/src/main/java/com/necer/ncalendar/activity/TestWeekActivity.java
@@ -1,7 +1,7 @@
 package com.necer.ncalendar.activity;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Log;
 import android.view.View;
 import android.widget.TextView;

diff --git a/app/src/main/java/com/necer/ncalendar/activity/TestWeekHoldActivity.java b/app/src/main/java/com/necer/ncalendar/activity/TestWeekHoldActivity.java
@@ -2,11 +2,11 @@
 
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.Nullable;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.Nullable;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 
 import com.necer.calendar.Miui9Calendar;

diff --git a/app/src/main/java/com/necer/ncalendar/adapter/RecyclerViewAdapter.java b/app/src/main/java/com/necer/ncalendar/adapter/RecyclerViewAdapter.java
@@ -1,7 +1,7 @@
 package com.necer.ncalendar.adapter;
 
 import android.content.Context;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/app/src/main/java/com/necer/ncalendar/adapter/ViewPagerAdapter.java b/app/src/main/java/com/necer/ncalendar/adapter/ViewPagerAdapter.java
@@ -1,8 +1,8 @@
 package com.necer.ncalendar.adapter;
 
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
 
 import java.util.List;