update 升级为AndroidX

youlookwhat · youlookwhat · commit 98f634059707 · 2021-12-21T19:30:20.000+08:00
diff --git a/ByWebView/build.gradle b/ByWebView/build.gradle
@@ -11,7 +11,7 @@ android {
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
 
     }
 
@@ -27,7 +27,7 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    compileOnly "com.android.support:design:28.0.0"
+    compileOnly 'com.google.android.material:material:1.0.0'
 //    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'
diff --git a/ByWebView/src/main/java/me/jingbin/web/ByLoadJsHolder.java b/ByWebView/src/main/java/me/jingbin/web/ByLoadJsHolder.java
@@ -1,11 +1,12 @@
 package me.jingbin.web;
 
 import android.os.Build;
-import android.support.annotation.RequiresApi;
 import android.text.TextUtils;
 import android.webkit.ValueCallback;
 import android.webkit.WebView;
 
+import androidx.annotation.RequiresApi;
+
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
diff --git a/ByWebView/src/main/java/me/jingbin/web/ByWebChromeClient.java b/ByWebView/src/main/java/me/jingbin/web/ByWebChromeClient.java
@@ -8,8 +8,6 @@
 import android.graphics.BitmapFactory;
 import android.net.Uri;
 import android.os.Build;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -19,6 +17,9 @@
 import android.webkit.WebView;
 import android.widget.FrameLayout;
 
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+
 import java.lang.ref.WeakReference;
 
 
diff --git a/ByWebView/src/main/java/me/jingbin/web/ByWebView.java b/ByWebView/src/main/java/me/jingbin/web/ByWebView.java
@@ -4,8 +4,6 @@
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Build;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.NonNull;
 import android.text.TextUtils;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
@@ -15,6 +13,9 @@
 import android.webkit.WebView;
 import android.widget.FrameLayout;
 
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+
 /**
  * 网页可以处理:
  * 点击相应控件：
diff --git a/ByWebView/src/main/java/me/jingbin/web/ByWebViewClient.java b/ByWebView/src/main/java/me/jingbin/web/ByWebViewClient.java
@@ -5,8 +5,6 @@
 import android.graphics.Bitmap;
 import android.net.http.SslError;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
-import android.support.v7.app.AlertDialog;
 import android.text.TextUtils;
 import android.webkit.SslErrorHandler;
 import android.webkit.WebResourceError;
@@ -15,6 +13,9 @@
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 
+import androidx.annotation.RequiresApi;
+import androidx.appcompat.app.AlertDialog;
+
 import java.lang.ref.WeakReference;
 
 /**
diff --git a/ByWebView/src/main/java/me/jingbin/web/WebProgress.java b/ByWebView/src/main/java/me/jingbin/web/WebProgress.java
@@ -11,13 +11,14 @@
 import android.graphics.LinearGradient;
 import android.graphics.Paint;
 import android.graphics.Shader;
-import android.support.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.animation.DecelerateInterpolator;
 import android.view.animation.LinearInterpolator;
 import android.widget.FrameLayout;
 
+import androidx.annotation.Nullable;
+
 /**
  * WebView进度条，原作者: cenxiaozhong，在此基础上修改优化：
  * 1. progress同时返回两次100时进度条出现两次
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,9 +7,9 @@ android {
         applicationId "com.example.jingbin.webviewstudy"
         minSdkVersion 14
         targetSdkVersion 28
-        versionCode 12
-        versionName "3.1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        versionCode 13
+        versionName "3.2.0"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         // tencent x5
         ndk {
             abiFilters "armeabi", "armeabi-v7a", "x86", "mips"
@@ -40,10 +40,10 @@ 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:design:28.0.0"
+    implementation 'com.google.android.material:material:1.0.0'
     testImplementation 'junit:junit:4.12'
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.6.1'
     releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.1'
diff --git a/app/src/main/java/com/example/jingbin/webviewstudy/MainActivity.java b/app/src/main/java/com/example/jingbin/webviewstudy/MainActivity.java
@@ -4,9 +4,10 @@
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
+
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.content.ContextCompat;
 import android.text.TextUtils;
 import android.view.KeyEvent;
 import android.view.Menu;
diff --git a/app/src/main/java/com/example/jingbin/webviewstudy/config/MyWebChromeClient.java b/app/src/main/java/com/example/jingbin/webviewstudy/config/MyWebChromeClient.java
@@ -4,13 +4,14 @@
 import android.content.pm.ActivityInfo;
 import android.net.Uri;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
 import android.view.View;
 import android.webkit.PermissionRequest;
 import android.webkit.ValueCallback;
 import android.webkit.WebChromeClient;
 import android.webkit.WebView;
 
+import androidx.annotation.RequiresApi;
+
 import static android.app.Activity.RESULT_OK;
 
 
diff --git a/app/src/main/java/com/example/jingbin/webviewstudy/config/MyWebViewClient.java b/app/src/main/java/com/example/jingbin/webviewstudy/config/MyWebViewClient.java
@@ -3,7 +3,6 @@
 import android.content.DialogInterface;
 import android.net.http.SslError;
 import android.os.Build;
-import android.support.v7.app.AlertDialog;
 import android.text.TextUtils;
 import android.util.Log;
 import android.webkit.SslErrorHandler;
@@ -13,6 +12,8 @@
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 
+import androidx.appcompat.app.AlertDialog;
+
 /**
  * Created by jingbin on 2016/11/17.
  * 监听网页链接:
diff --git a/app/src/main/java/com/example/jingbin/webviewstudy/config/WebProgress.java b/app/src/main/java/com/example/jingbin/webviewstudy/config/WebProgress.java
@@ -11,13 +11,14 @@
 import android.graphics.LinearGradient;
 import android.graphics.Paint;
 import android.graphics.Shader;
-import android.support.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.animation.DecelerateInterpolator;
 import android.view.animation.LinearInterpolator;
 import android.widget.FrameLayout;
 
+import androidx.annotation.Nullable;
+
 /**
  * WebView进度条，原作者: cenxiaozhong，在此基础上修改优化：
  * 1. progress同时返回两次100时进度条出现两次
diff --git a/app/src/main/java/com/example/jingbin/webviewstudy/tencentx5/MyX5WebChromeClient.java b/app/src/main/java/com/example/jingbin/webviewstudy/tencentx5/MyX5WebChromeClient.java
@@ -5,9 +5,10 @@
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.net.Uri;
-import android.support.annotation.Nullable;
 import android.view.View;
 
+import androidx.annotation.Nullable;
+
 import com.example.jingbin.webviewstudy.R;
 import com.tencent.smtt.sdk.ValueCallback;
 import com.tencent.smtt.export.external.interfaces.IX5WebChromeClient;
diff --git a/app/src/main/java/com/example/jingbin/webviewstudy/tencentx5/X5WebViewActivity.java b/app/src/main/java/com/example/jingbin/webviewstudy/tencentx5/X5WebViewActivity.java
@@ -9,11 +9,12 @@
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.content.ContextCompat;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
diff --git a/app/src/main/java/com/example/jingbin/webviewstudy/ui/ByWebViewActivity.java b/app/src/main/java/com/example/jingbin/webviewstudy/ui/ByWebViewActivity.java
@@ -6,10 +6,11 @@
 import android.net.Uri;
 import android.net.http.SslError;
 import android.os.Bundle;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.content.ContextCompat;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.Menu;
diff --git a/app/src/main/java/com/example/jingbin/webviewstudy/ui/CoordinatorWebActivity.java b/app/src/main/java/com/example/jingbin/webviewstudy/ui/CoordinatorWebActivity.java
@@ -4,18 +4,17 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.design.widget.AppBarLayout;
-import android.support.design.widget.CoordinatorLayout;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import androidx.core.content.ContextCompat;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.webkit.WebView;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -25,6 +24,7 @@
 import com.example.jingbin.webviewstudy.utils.StatusBarUtil;
 import com.example.jingbin.webviewstudy.utils.WebTools;
 import com.example.jingbin.webviewstudy.view.NestedScrollWebView;
+import com.google.android.material.appbar.AppBarLayout;
 
 import me.jingbin.web.ByWebTools;
 import me.jingbin.web.ByWebView;
diff --git a/app/src/main/java/com/example/jingbin/webviewstudy/ui/DeepLinkActivity.java b/app/src/main/java/com/example/jingbin/webviewstudy/ui/DeepLinkActivity.java
@@ -2,10 +2,11 @@
 
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.widget.TextView;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.example.jingbin.webviewstudy.R;
 
 import java.util.List;
diff --git a/app/src/main/java/com/example/jingbin/webviewstudy/ui/WebViewActivity.java b/app/src/main/java/com/example/jingbin/webviewstudy/ui/WebViewActivity.java
@@ -8,11 +8,12 @@
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.content.ContextCompat;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.KeyEvent;
diff --git a/app/src/main/java/com/example/jingbin/webviewstudy/utils/StatusBarUtil.java b/app/src/main/java/com/example/jingbin/webviewstudy/utils/StatusBarUtil.java
@@ -6,13 +6,14 @@
 import android.content.Context;
 import android.graphics.Color;
 import android.os.Build;
-import android.support.annotation.ColorInt;
-import android.support.v4.widget.DrawerLayout;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
 import android.widget.LinearLayout;
 
+import androidx.annotation.ColorInt;
+import androidx.drawerlayout.widget.DrawerLayout;
+
 /**
  * Created by Jaeger on 16/2/14.
  * <p>
diff --git a/app/src/main/java/com/example/jingbin/webviewstudy/view/NestedScrollWebView.java b/app/src/main/java/com/example/jingbin/webviewstudy/view/NestedScrollWebView.java
@@ -17,10 +17,10 @@
 package com.example.jingbin.webviewstudy.view;
 
 import android.content.Context;
-import android.support.v4.view.MotionEventCompat;
-import android.support.v4.view.NestedScrollingChild;
-import android.support.v4.view.NestedScrollingChildHelper;
-import android.support.v4.view.ViewCompat;
+import androidx.core.view.MotionEventCompat;
+import androidx.core.view.NestedScrollingChild;
+import androidx.core.view.NestedScrollingChildHelper;
+import androidx.core.view.ViewCompat;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.webkit.WebView;
diff --git a/app/src/main/res/layout/activity_by_webview.xml b/app/src/main/res/layout/activity_by_webview.xml
@@ -7,7 +7,7 @@
     android:orientation="vertical"
     tools:context="com.example.jingbin.webviewstudy.ui.ByWebViewActivity">
 
-    <android.support.v7.widget.Toolbar xmlns:app="http://schemas.android.com/apk/res-auto"
+    <androidx.appcompat.widget.Toolbar xmlns:app="http://schemas.android.com/apk/res-auto"
         android:id="@+id/title_tool_bar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
@@ -28,7 +28,7 @@
             android:textSize="18sp"
             android:visibility="visible" />
 
-    </android.support.v7.widget.Toolbar>
+    </androidx.appcompat.widget.Toolbar>
 
 </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_coordinator_web.xml b/app/src/main/res/layout/activity_coordinator_web.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout 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:id="@+id/coordinatorLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/title_tool_bar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
@@ -32,7 +32,7 @@
                 android:textSize="18sp"
                 android:visibility="visible" />
 
-        </android.support.v7.widget.Toolbar>
-    </android.support.design.widget.AppBarLayout>
+        </androidx.appcompat.widget.Toolbar>
+    </com.google.android.material.appbar.AppBarLayout>
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
diff --git a/app/src/main/res/layout/activity_web_view.xml b/app/src/main/res/layout/activity_web_view.xml
diff --git a/app/src/main/res/layout/activity_webview_x5.xml b/app/src/main/res/layout/activity_webview_x5.xml
diff --git a/gradle.properties b/gradle.properties
