AndroidX

yangtuhua · Jul 2, 2019 · f52804b · f52804b
1 parent 59e5b6e
commit f52804b
Show file tree

Hide file tree

Showing 45 changed files with 111 additions and 116 deletions.
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/dbnavigator.xml b/.idea/dbnavigator.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -2,17 +2,16 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
+    compileSdkVersion 28
     //noinspection GradleDependency
-    buildToolsVersion "25.0.2"
     defaultConfig {
         applicationId "com.haibin.calendarviewproject"
         minSdkVersion 15
         //noinspection OldTargetApi
-        targetSdkVersion 25
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
@@ -23,17 +22,17 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     //noinspection GradleDependency
-    compile 'com.android.support:appcompat-v7:25.2.0'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
     //noinspection GradleDependency
-    compile 'com.android.support:design:25.2.0'
+    implementation 'com.google.android.material:material:1.0.0'
     //noinspection GradleDependency
-    compile 'com.github.bumptech.glide:glide:3.7.0'
-    testCompile 'junit:junit:4.12'
-    compile 'com.haibin:calendarview:3.6.3'
-    //compile project(':calendarview')
+    implementation 'com.github.bumptech.glide:glide:3.7.0'
+    testImplementation 'junit:junit:4.12'
+    //compile 'com.haibin:calendarview:3.6.3'
+    implementation project(':calendarview')
 }
diff --git a/app/src/main/java/com/haibin/calendarviewproject/ArticleAdapter.java b/app/src/main/java/com/haibin/calendarviewproject/ArticleAdapter.java
@@ -1,7 +1,7 @@
 package com.haibin.calendarviewproject;
 
 import android.content.Context;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;

diff --git a/app/src/main/java/com/haibin/calendarviewproject/MainActivity.java b/app/src/main/java/com/haibin/calendarviewproject/MainActivity.java
@@ -2,7 +2,7 @@
 
 import android.annotation.SuppressLint;
 import android.content.DialogInterface;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;

diff --git a/app/src/main/java/com/haibin/calendarviewproject/base/activity/BaseActivity.java b/app/src/main/java/com/haibin/calendarviewproject/base/activity/BaseActivity.java
@@ -3,8 +3,8 @@
 import android.annotation.SuppressLint;
 import android.os.Build;
 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.view.Window;
 import android.view.WindowManager;

diff --git a/app/src/main/java/com/haibin/calendarviewproject/base/adapter/BaseRecyclerAdapter.java b/app/src/main/java/com/haibin/calendarviewproject/base/adapter/BaseRecyclerAdapter.java
@@ -16,7 +16,7 @@
 package com.haibin.calendarviewproject.base.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/haibin/calendarviewproject/base/fragment/BaseFragment.java b/app/src/main/java/com/haibin/calendarviewproject/base/fragment/BaseFragment.java
@@ -2,8 +2,8 @@
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
+import androidx.annotation.Nullable;
+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/haibin/calendarviewproject/base/fragment/FragmentAdapter.java b/app/src/main/java/com/haibin/calendarviewproject/base/fragment/FragmentAdapter.java
@@ -1,9 +1,9 @@
 package com.haibin.calendarviewproject.base.fragment;
 
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
-import android.support.v4.app.FragmentTransaction;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
+import androidx.fragment.app.FragmentTransaction;
 import android.view.ViewGroup;
 
 import java.util.ArrayList;

diff --git a/app/src/main/java/com/haibin/calendarviewproject/colorful/ColorfulActivity.java b/app/src/main/java/com/haibin/calendarviewproject/colorful/ColorfulActivity.java
@@ -3,7 +3,7 @@
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
 import android.view.View;
 import android.widget.RelativeLayout;
 import android.widget.TextView;

diff --git a/app/src/main/java/com/haibin/calendarviewproject/custom/CustomActivity.java b/app/src/main/java/com/haibin/calendarviewproject/custom/CustomActivity.java
@@ -3,7 +3,7 @@
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
 import android.util.Log;
 import android.view.View;
 import android.widget.RelativeLayout;

diff --git a/app/src/main/java/com/haibin/calendarviewproject/group/GroupItemDecoration.java b/app/src/main/java/com/haibin/calendarviewproject/group/GroupItemDecoration.java
@@ -4,8 +4,8 @@
 import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.Rect;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.text.TextUtils;
 import android.view.View;
 

diff --git a/app/src/main/java/com/haibin/calendarviewproject/group/GroupRecyclerView.java b/app/src/main/java/com/haibin/calendarviewproject/group/GroupRecyclerView.java
@@ -2,8 +2,8 @@
 
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.AttributeSet;
 
 import com.haibin.calendarviewproject.R;

diff --git a/app/src/main/java/com/haibin/calendarviewproject/index/IndexActivity.java b/app/src/main/java/com/haibin/calendarviewproject/index/IndexActivity.java
@@ -3,7 +3,7 @@
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
 import android.util.Log;
 import android.view.View;
 import android.widget.RelativeLayout;

diff --git a/app/src/main/java/com/haibin/calendarviewproject/meizu/MeiZuActivity.java b/app/src/main/java/com/haibin/calendarviewproject/meizu/MeiZuActivity.java
@@ -3,8 +3,8 @@
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
-import android.graphics.Color;
-import android.support.v7.widget.LinearLayoutManager;
+
+import androidx.recyclerview.widget.LinearLayoutManager;
 import android.view.View;
 import android.widget.RelativeLayout;
 import android.widget.TextView;

diff --git a/app/src/main/java/com/haibin/calendarviewproject/multi/MultiActivity.java b/app/src/main/java/com/haibin/calendarviewproject/multi/MultiActivity.java
@@ -3,7 +3,7 @@
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
 import android.util.Log;
 import android.view.View;
 import android.widget.RelativeLayout;

diff --git a/app/src/main/java/com/haibin/calendarviewproject/pager/CalendarLinearLayout.java b/app/src/main/java/com/haibin/calendarviewproject/pager/CalendarLinearLayout.java
@@ -1,8 +1,8 @@
 package com.haibin.calendarviewproject.pager;
 
 import android.content.Context;
-import android.support.annotation.Nullable;
-import android.support.v4.view.ViewPager;
+import androidx.annotation.Nullable;
+import androidx.viewpager.widget.ViewPager;
 import android.util.AttributeSet;
 import android.widget.LinearLayout;
 

diff --git a/app/src/main/java/com/haibin/calendarviewproject/pager/PagerFragment.java b/app/src/main/java/com/haibin/calendarviewproject/pager/PagerFragment.java
@@ -1,6 +1,6 @@
 package com.haibin.calendarviewproject.pager;
 
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
 
 import com.haibin.calendarviewproject.Article;
 import com.haibin.calendarviewproject.ArticleAdapter;

diff --git a/app/src/main/java/com/haibin/calendarviewproject/pager/ViewPagerActivity.java b/app/src/main/java/com/haibin/calendarviewproject/pager/ViewPagerActivity.java
@@ -3,13 +3,13 @@
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
-import android.support.design.widget.TabLayout;
-import android.support.v4.app.Fragment;
-import android.support.v4.view.ViewPager;
+import androidx.fragment.app.Fragment;
+import androidx.viewpager.widget.ViewPager;
 import android.view.View;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import com.google.android.material.tabs.TabLayout;
 import com.haibin.calendarview.Calendar;
 import com.haibin.calendarview.CalendarLayout;
 import com.haibin.calendarview.CalendarView;

diff --git a/app/src/main/java/com/haibin/calendarviewproject/progress/ProgressActivity.java b/app/src/main/java/com/haibin/calendarviewproject/progress/ProgressActivity.java
@@ -3,7 +3,7 @@
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
 import android.view.View;
 import android.widget.RelativeLayout;
 import android.widget.TextView;

diff --git a/app/src/main/java/com/haibin/calendarviewproject/simple/SimpleActivity.java b/app/src/main/java/com/haibin/calendarviewproject/simple/SimpleActivity.java
@@ -3,7 +3,7 @@
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
 import android.view.View;
 import android.widget.RelativeLayout;
 import android.widget.TextView;

diff --git a/app/src/main/java/com/haibin/calendarviewproject/single/SingleActivity.java b/app/src/main/java/com/haibin/calendarviewproject/single/SingleActivity.java
@@ -3,7 +3,7 @@
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
 import android.util.Log;
 import android.view.View;
 import android.widget.RelativeLayout;

diff --git a/app/src/main/java/com/haibin/calendarviewproject/solay/SolarActivity.java b/app/src/main/java/com/haibin/calendarviewproject/solay/SolarActivity.java
@@ -5,7 +5,7 @@
 import android.content.Intent;
 import android.graphics.Color;
 import android.os.Build;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
 import android.view.View;
 import android.widget.RelativeLayout;
 import android.widget.TextView;

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -175,7 +175,7 @@
             app:year_view_week_text_size="7sp" />
 
 
-        <android.support.v4.widget.NestedScrollView
+        <androidx.core.widget.NestedScrollView
             android:id="@+id/nestedScrollView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
@@ -709,7 +709,7 @@
                 </LinearLayout>
 
             </LinearLayout>
-        </android.support.v4.widget.NestedScrollView>
+        </androidx.core.widget.NestedScrollView>
     </com.haibin.calendarview.CalendarLayout>
 
 

diff --git a/app/src/main/res/layout/activity_range.xml b/app/src/main/res/layout/activity_range.xml
@@ -65,7 +65,7 @@
 
     </LinearLayout>
 
-    <android.support.v4.widget.NestedScrollView
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1">
@@ -232,7 +232,7 @@
                     tools:ignore="RtlSymmetry" />
             </LinearLayout>
         </LinearLayout>
-    </android.support.v4.widget.NestedScrollView>
+    </androidx.core.widget.NestedScrollView>
 
     <TextView
         android:id="@+id/tv_commit"

diff --git a/app/src/main/res/layout/activity_view_pager.xml b/app/src/main/res/layout/activity_view_pager.xml
@@ -149,7 +149,7 @@
                 app:tabSelectedTextColor="#333333"
                 app:tabTextColor="#CFCFCF" />
 
-            <android.support.v4.view.ViewPager
+            <androidx.viewpager.widget.ViewPager
                 android:id="@+id/viewPager"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"