Upgrade to AndroidX

GitHubZJY · Jun 3, 2020 · 66f0161 · 66f0161
1 parent 5ec3c4e
commit 66f0161
Show file tree

Hide file tree

Showing 55 changed files with 128 additions and 125 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,14 +1,16 @@
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 26
+    compileSdkVersion 29
     defaultConfig {
         applicationId "com.example.zjy.zjywidget"
         minSdkVersion 15
-        targetSdkVersion 26
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
@@ -31,14 +33,15 @@ configurations.all {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:appcompat-v7:26.1.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.2'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
+    implementation 'jp.co.cyberagent.android:gpuimage:2.0.3'
 
-    implementation 'com.android.support:design:26.1.0'
-    implementation 'com.android.support:cardview-v7:26.0.2'
+    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
 
     implementation project(':widget')
 

diff --git a/app/src/androidTest/java/com/example/zjy/zjywidget/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/example/zjy/zjywidget/ExampleInstrumentedTest.java
@@ -1,8 +1,8 @@
 package com.example.zjy.zjywidget;
 
 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/example/zjy/zjywidget/EntranceItemAdapter.java b/app/src/main/java/com/example/zjy/zjywidget/EntranceItemAdapter.java
@@ -3,8 +3,8 @@
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Color;
-import android.support.v7.widget.CardView;
-import android.support.v7.widget.RecyclerView;
+import androidx.cardview.widget.CardView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;

diff --git a/app/src/main/java/com/example/zjy/zjywidget/MainActivity.java b/app/src/main/java/com/example/zjy/zjywidget/MainActivity.java
@@ -2,10 +2,10 @@
 
 import android.content.Intent;
 import android.net.Uri;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.Menu;
 import android.view.MenuItem;
 
@@ -19,7 +19,6 @@
 import com.example.zjy.zjywidget.sample.SkillViewTestActivity;
 import com.example.zjy.zjywidget.sample.WaveLoadTestActivity;
 import com.example.zjy.zjywidget.sample.YRoundelMenuActivity;
-import com.example.zjy.zjywidget.sample.YWheelViewActivity;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/app/src/main/java/com/example/zjy/zjywidget/duffmode/DuffModeView.java b/app/src/main/java/com/example/zjy/zjywidget/duffmode/DuffModeView.java
@@ -8,7 +8,7 @@
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffXfermode;
 import android.graphics.Rect;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.View;
 

diff --git a/app/src/main/java/com/example/zjy/zjywidget/duffmode/ShapePicView.java b/app/src/main/java/com/example/zjy/zjywidget/duffmode/ShapePicView.java
@@ -9,7 +9,7 @@
 import android.graphics.Path;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffXfermode;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.View;
 

diff --git a/app/src/main/java/com/example/zjy/zjywidget/sample/ArcMenuTestActivity.java b/app/src/main/java/com/example/zjy/zjywidget/sample/ArcMenuTestActivity.java
@@ -1,9 +1,9 @@
 package com.example.zjy.zjywidget.sample;
 
 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 android.widget.Toast;
 
 import com.example.zjy.zjywidget.R;

diff --git a/app/src/main/java/com/example/zjy/zjywidget/sample/BannerViewTestActivity.java b/app/src/main/java/com/example/zjy/zjywidget/sample/BannerViewTestActivity.java
@@ -1,14 +1,13 @@
 package com.example.zjy.zjywidget.sample;
 
 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.example.zjy.zjywidget.R;
 import com.zjywidget.widget.banner.YBannerView;
 import com.zjywidget.widget.banner.indicator.CircleIndicator;
-import com.zjywidget.widget.banner.indicator.RectangleIndicator;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/app/src/main/java/com/example/zjy/zjywidget/sample/CameraViewTestActivity.java b/app/src/main/java/com/example/zjy/zjywidget/sample/CameraViewTestActivity.java
@@ -3,7 +3,7 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;

diff --git a/app/src/main/java/com/example/zjy/zjywidget/sample/CircleProgressTestActivity.java b/app/src/main/java/com/example/zjy/zjywidget/sample/CircleProgressTestActivity.java
@@ -1,9 +1,9 @@
 package com.example.zjy.zjywidget.sample;
 
 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.example.zjy.zjywidget.R;
 

diff --git a/app/src/main/java/com/example/zjy/zjywidget/sample/FallingSurfaceTestActivity.java b/app/src/main/java/com/example/zjy/zjywidget/sample/FallingSurfaceTestActivity.java
@@ -1,13 +1,12 @@
 package com.example.zjy.zjywidget.sample;
 
 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.example.zjy.zjywidget.R;
 import com.zjywidget.widget.fallingsurface.FallingSurfaceView;
-import com.zjywidget.widget.switchview.YSwitchView;
 
 /**
  * Created by 74215 on 2019/4/14.

diff --git a/app/src/main/java/com/example/zjy/zjywidget/sample/PayLoadingTestActivity.java b/app/src/main/java/com/example/zjy/zjywidget/sample/PayLoadingTestActivity.java
@@ -2,7 +2,7 @@
 
 import android.app.Activity;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.View;
 import android.widget.Button;
 

diff --git a/app/src/main/java/com/example/zjy/zjywidget/sample/ScratchTestActivity.java b/app/src/main/java/com/example/zjy/zjywidget/sample/ScratchTestActivity.java
@@ -1,9 +1,9 @@
 package com.example.zjy.zjywidget.sample;
 
 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 android.view.View;
 import android.widget.TextView;
 import android.widget.Toast;

diff --git a/app/src/main/java/com/example/zjy/zjywidget/sample/SkillViewTestActivity.java b/app/src/main/java/com/example/zjy/zjywidget/sample/SkillViewTestActivity.java
@@ -1,8 +1,8 @@
 package com.example.zjy.zjywidget.sample;
 
 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.example.zjy.zjywidget.R;
 import com.zjywidget.widget.skillview.YSkillView;

diff --git a/app/src/main/java/com/example/zjy/zjywidget/sample/WaveLoadTestActivity.java b/app/src/main/java/com/example/zjy/zjywidget/sample/WaveLoadTestActivity.java
@@ -3,9 +3,9 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
-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.example.zjy.zjywidget.R;
 import com.zjywidget.widget.waveload.YWaveLoadView;

diff --git a/app/src/main/java/com/example/zjy/zjywidget/sample/YRoundelMenuActivity.java b/app/src/main/java/com/example/zjy/zjywidget/sample/YRoundelMenuActivity.java
@@ -1,9 +1,9 @@
 package com.example.zjy.zjywidget.sample;
 
 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.example.zjy.zjywidget.R;
 

diff --git a/app/src/main/java/com/example/zjy/zjywidget/sample/YSwitchTestActivity.java b/app/src/main/java/com/example/zjy/zjywidget/sample/YSwitchTestActivity.java
@@ -1,9 +1,9 @@
 package com.example.zjy.zjywidget.sample;
 
 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.example.zjy.zjywidget.R;
 import com.zjywidget.widget.switchview.YSwitchView;

diff --git a/app/src/main/java/com/example/zjy/zjywidget/sample/YWheelViewActivity.java b/app/src/main/java/com/example/zjy/zjywidget/sample/YWheelViewActivity.java
@@ -1,9 +1,9 @@
 package com.example.zjy.zjywidget.sample;
 
 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 android.view.View;
 import android.widget.Button;
 

diff --git a/app/src/main/java/com/example/zjy/zjywidget/utils/RoundDrawable.java b/app/src/main/java/com/example/zjy/zjywidget/utils/RoundDrawable.java
@@ -3,7 +3,7 @@
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.GradientDrawable;
-import android.support.v4.graphics.drawable.DrawableCompat;
+import androidx.core.graphics.drawable.DrawableCompat;
 
 /**
  * Created by YANG on 2018/3/1.

diff --git a/app/src/main/res/layout/activity_arc_menu.xml b/app/src/main/res/layout/activity_arc_menu.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -21,4 +21,4 @@
         />
 
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_bannerl_view.xml b/app/src/main/res/layout/activity_bannerl_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -18,4 +18,4 @@
         />
 
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_camera.xml b/app/src/main/res/layout/activity_camera.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -46,4 +46,4 @@
         />
 
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_circle_progress.xml b/app/src/main/res/layout/activity_circle_progress.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -45,4 +45,4 @@
         />
 
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_falling_surface.xml b/app/src/main/res/layout/activity_falling_surface.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -8,4 +8,4 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="com.example.zjy.zjywidget.MainActivity">
 
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/view_lv"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -16,7 +16,7 @@
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-    </android.support.v7.widget.RecyclerView>
+    </androidx.recyclerview.widget.RecyclerView>
 
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_pay_loading.xml b/app/src/main/res/layout/activity_pay_loading.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -53,4 +53,4 @@
 
 
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_roundel_menu.xml b/app/src/main/res/layout/activity_roundel_menu.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto">
@@ -26,4 +26,4 @@
 
     </com.zjywidget.widget.roundelmenu.YRoundelMenu>
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>