feat(Android):androidx 适配

daodaolee · Mar 8, 2023 · 98f8310 · 98f8310
1 parent a3467a6
commit 98f8310
Show file tree

Hide file tree

Showing 78 changed files with 262 additions and 154 deletions.
diff --git a/android/config.gradle b/android/config.gradle
@@ -13,4 +13,33 @@ ext {
 
     SOURCE_COMPATIBILITY = JavaVersion.VERSION_1_8
     TARGET_COMPATIBILITY = JavaVersion.VERSION_1_8
+
+    androidx = [
+            "multidex"                      : 'androidx.multidex:multidex:2.0.0',
+            //androidx base
+            "appcompat"                     : 'androidx.appcompat:appcompat:1.1.0',
+            "annotation"                    : "androidx.annotation:annotation:1.1.0",
+            "fragment"                      : "androidx.fragment:fragment:1.2.0",
+            //androidx view
+            "cardview"                      : 'androidx.cardview:cardview:1.0.0',
+            "recyclerview"                  : 'androidx.recyclerview:recyclerview:1.1.0',
+            "webkit"                        : "androidx.webkit:webkit:1.3.0",
+            "drawerlayout"                  : "androidx.drawerlayout:drawerlayout:1.1.1",
+
+            //androidx kotlin
+            "core-ktx"                      : "androidx.core:core-ktx:1.3.0",
+            "activity-ktx"                  : "androidx.activity:activity-ktx:1.1.0",
+            "fragment-ktx"                  : "androidx.fragment:fragment-ktx:1.2.0",
+
+            //constraintLayout
+            "constraintLayout"              : 'androidx.constraintlayout:constraintlayout:2.1.0',
+
+            //lifecycle
+            "lifecycle-viewmodel-savedstate": "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.2.0",
+            "lifecycle-comm"                : "androidx.lifecycle:lifecycle-common-java8:2.2.0",
+
+            //material
+            "material"                      : 'com.google.android.material:material:1.1.0',
+    ]
+
 }
diff --git a/android/gradle.properties b/android/gradle.properties
@@ -6,6 +6,8 @@ org.gradle.daemon=true
 org.gradle.parallel=true
 # 开启安装Debug包
 android.injected.testOnly=false
+android.useAndroidX=true
+android.enableJetifier=true
 
 # 编译JS引擎库: All/JSC/QuickJS/V8/Hermes/NAPI
 COMPILE_JS_ENGINE=NAPI

diff --git a/android/hermes-debugger/build.gradle b/android/hermes-debugger/build.gradle
@@ -44,6 +44,8 @@ android {
 }
 
 dependencies {
+    implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
+
     compileOnly project(':hummer-sdk')
 
     // OkHttp

diff --git a/android/hermes-debugger/src/main/java/com/didi/hummer/hermes/queue/SimpleSettableFuture.java b/android/hermes-debugger/src/main/java/com/didi/hummer/hermes/queue/SimpleSettableFuture.java
@@ -7,7 +7,8 @@
 
 package com.didi.hummer.hermes.queue;
 
-import android.support.annotation.Nullable;
+
+import androidx.annotation.Nullable;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutionException;

diff --git a/android/hermes-debugger/src/main/java/com/didi/hummer/hermes/queue/UiThreadUtil.java b/android/hermes-debugger/src/main/java/com/didi/hummer/hermes/queue/UiThreadUtil.java
@@ -9,7 +9,8 @@
 
 import android.os.Handler;
 import android.os.Looper;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.Nullable;
 
 /** Utility for interacting with the UI thread. */
 public class UiThreadUtil {

diff --git a/android/hummer-component/build.gradle b/android/hummer-component/build.gradle
@@ -22,8 +22,10 @@ android {
 }
 
 dependencies {
-    api 'com.android.support:recyclerview-v7:28.0.0'
-    api 'com.android.support:support-v4:28.0.0'
+    implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
+
+    api  rootProject.ext.androidx["appcompat"]
+    api  rootProject.ext.androidx["recyclerview"]
 
     api project(':hummer-sdk')
     annotationProcessor project(":hummer-compiler")

diff --git a/...hummer-component/src/main/java/com/didi/hummer/component/canvas/CanvasDrawHelperView.java b/...hummer-component/src/main/java/com/didi/hummer/component/canvas/CanvasDrawHelperView.java
@@ -7,14 +7,15 @@
 import android.graphics.Paint;
 import android.graphics.Rect;
 import android.graphics.RectF;
-import android.support.annotation.Nullable;
 import android.text.Layout.Alignment;
 import android.text.StaticLayout;
 import android.text.TextPaint;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.View;
 
+import androidx.annotation.Nullable;
+
 import com.didi.hummer.render.style.HummerStyleUtils;
 import com.didi.hummer.render.utility.DPUtil;
 

diff --git a/android/hummer-component/src/main/java/com/didi/hummer/component/canvas/CanvasView.java b/android/hummer-component/src/main/java/com/didi/hummer/component/canvas/CanvasView.java
@@ -4,10 +4,11 @@
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Paint;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.text.TextUtils;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.target.SimpleTarget;
 import com.bumptech.glide.request.transition.Transition;

diff --git a/android/hummer-component/src/main/java/com/didi/hummer/component/imageview/Image.java b/android/hummer-component/src/main/java/com/didi/hummer/component/imageview/Image.java
@@ -2,10 +2,11 @@
 
 import android.content.Context;
 import android.graphics.Color;
-import android.support.annotation.Nullable;
 import android.text.TextUtils;
 import android.widget.ImageView;
 
+import androidx.annotation.Nullable;
+
 import com.didi.hummer.adapter.HummerAdapter;
 import com.didi.hummer.adapter.imageloader.ImageSizeCallback;
 import com.didi.hummer.annotation.Component;

diff --git a/.../hummer-component/src/main/java/com/didi/hummer/component/imageview/RoundedImageView.java b/.../hummer-component/src/main/java/com/didi/hummer/component/imageview/RoundedImageView.java
@@ -15,12 +15,13 @@
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.IntDef;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.AppCompatImageView;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatImageView;
+
 
 public class RoundedImageView extends AppCompatImageView {
 

diff --git a/android/hummer-component/src/main/java/com/didi/hummer/component/input/HMInputProperty.java b/android/hummer-component/src/main/java/com/didi/hummer/component/input/HMInputProperty.java
@@ -8,7 +8,6 @@
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.support.v4.content.ContextCompat;
 import android.text.InputFilter;
 import android.text.InputType;
 import android.text.TextUtils;
@@ -19,6 +18,8 @@
 import android.widget.EditText;
 import android.widget.TextView;
 
+import androidx.core.content.ContextCompat;
+
 import com.didi.hummer.component.text.FontManager;
 import com.didi.hummer.context.HummerContext;
 

diff --git a/android/hummer-component/src/main/java/com/didi/hummer/component/input/NJInputType.java b/android/hummer-component/src/main/java/com/didi/hummer/component/input/NJInputType.java
@@ -1,6 +1,7 @@
 package com.didi.hummer.component.input;
 
-import android.support.annotation.StringDef;
+
+import androidx.annotation.StringDef;
 
 /**
  * @author: linjizong

diff --git a/android/hummer-component/src/main/java/com/didi/hummer/component/input/NJReturnKeyType.java b/android/hummer-component/src/main/java/com/didi/hummer/component/input/NJReturnKeyType.java
@@ -1,6 +1,7 @@
 package com.didi.hummer.component.input;
 
-import android.support.annotation.StringDef;
+
+import androidx.annotation.StringDef;
 
 /**
  * @author: linjizong

diff --git a/android/hummer-component/src/main/java/com/didi/hummer/component/input/NJTextAlign.java b/android/hummer-component/src/main/java/com/didi/hummer/component/input/NJTextAlign.java
@@ -1,6 +1,7 @@
 package com.didi.hummer.component.input;
 
-import android.support.annotation.StringDef;
+
+import androidx.annotation.StringDef;
 
 /**
  * @author: linjizong

diff --git a/android/hummer-component/src/main/java/com/didi/hummer/component/list/HMListAdapter.java b/android/hummer-component/src/main/java/com/didi/hummer/component/list/HMListAdapter.java
@@ -1,11 +1,12 @@
 package com.didi.hummer.component.list;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.didi.hummer.core.engine.JSCallback;
 import com.didi.hummer.core.engine.JSValue;
 import com.didi.hummer.pool.ObjectPool;

diff --git a/android/hummer-component/src/main/java/com/didi/hummer/component/list/List.java b/android/hummer-component/src/main/java/com/didi/hummer/component/list/List.java
@@ -1,15 +1,17 @@
 package com.didi.hummer.component.list;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.StaggeredGridLayoutManager;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
 
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.StaggeredGridLayoutManager;
+
 import com.didi.hummer.annotation.Component;
 import com.didi.hummer.annotation.JsAttribute;
 import com.didi.hummer.annotation.JsMethod;
@@ -274,6 +276,7 @@ protected void onStyleUpdated(Map<String, Object> newStyle) {
         needUpdateEdgeSpacing = false;
     }
 
+    @SuppressLint("WrongConstant")
     private void initLayoutManager() {
         switch (mode) {
             case MODE_LIST:

diff --git a/android/hummer-component/src/main/java/com/didi/hummer/component/list/ListUtil.java b/android/hummer-component/src/main/java/com/didi/hummer/component/list/ListUtil.java
@@ -1,8 +1,10 @@
 package com.didi.hummer.component.list;
 
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.StaggeredGridLayoutManager;
+
+
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.StaggeredGridLayoutManager;
 
 import java.util.Arrays;
 

diff --git a/...ummer-component/src/main/java/com/didi/hummer/component/list/TopLinearSmoothScroller.java b/...ummer-component/src/main/java/com/didi/hummer/component/list/TopLinearSmoothScroller.java
@@ -1,7 +1,8 @@
 package com.didi.hummer.component.list;
 
 import android.content.Context;
-import android.support.v7.widget.LinearSmoothScroller;
+
+import androidx.recyclerview.widget.LinearSmoothScroller;
 
 /**
  * 在RecyclerView滚动到某一个item的时候，使其始终滚动item到屏幕的开始处（RecyclerView默认是滚动item到屏幕的可见范围，不一定在屏幕开始处）

diff --git a/...nt/src/main/java/com/didi/hummer/component/list/decoration/GridSpacingItemDecoration.java b/...nt/src/main/java/com/didi/hummer/component/list/decoration/GridSpacingItemDecoration.java
@@ -1,9 +1,10 @@
 package com.didi.hummer.component.list.decoration;
 
 import android.graphics.Rect;
-import android.support.v7.widget.RecyclerView;
 import android.view.View;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.didi.hummer.component.list.ListUtil;
 
 /**

diff --git a/.../src/main/java/com/didi/hummer/component/list/decoration/LinearSpacingItemDecoration.java b/.../src/main/java/com/didi/hummer/component/list/decoration/LinearSpacingItemDecoration.java
@@ -1,9 +1,10 @@
 package com.didi.hummer.component.list.decoration;
 
 import android.graphics.Rect;
-import android.support.v7.widget.RecyclerView;
 import android.view.View;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.didi.hummer.component.list.ListUtil;
 
 /**

diff --git a/...in/java/com/didi/hummer/component/list/decoration/StaggeredGridSpacingItemDecoration.java b/...in/java/com/didi/hummer/component/list/decoration/StaggeredGridSpacingItemDecoration.java
@@ -1,10 +1,11 @@
 package com.didi.hummer.component.list.decoration;
 
 import android.graphics.Rect;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.StaggeredGridLayoutManager;
 import android.view.View;
 
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.StaggeredGridLayoutManager;
+
 import com.didi.hummer.component.list.ListUtil;
 
 /**

diff --git a/android/hummer-component/src/main/java/com/didi/hummer/component/refresh/HummerFooter.java b/android/hummer-component/src/main/java/com/didi/hummer/component/refresh/HummerFooter.java
@@ -1,10 +1,11 @@
 package com.didi.hummer.component.refresh;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
 import android.util.AttributeSet;
 import android.view.ViewGroup;
 
+import androidx.annotation.NonNull;
+
 import com.didi.hummer.render.component.view.HMBase;
 import com.didi.hummer.render.style.HummerLayout;
 import com.scwang.smart.refresh.layout.api.RefreshFooter;

diff --git a/android/hummer-component/src/main/java/com/didi/hummer/component/refresh/HummerHeader.java b/android/hummer-component/src/main/java/com/didi/hummer/component/refresh/HummerHeader.java
@@ -1,11 +1,12 @@
 package com.didi.hummer.component.refresh;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
 import android.util.AttributeSet;
 import android.view.ViewGroup;
 import android.widget.RelativeLayout;
 
+import androidx.annotation.NonNull;
+
 import com.didi.hummer.render.component.view.HMBase;
 import com.didi.hummer.render.style.HummerLayout;
 import com.scwang.smart.refresh.layout.api.RefreshHeader;

diff --git a/android/hummer-component/src/main/java/com/didi/hummer/component/refresh/LoadMoreState.java b/android/hummer-component/src/main/java/com/didi/hummer/component/refresh/LoadMoreState.java
@@ -1,6 +1,7 @@
 package com.didi.hummer.component.refresh;
 
-import android.support.annotation.IntDef;
+
+import androidx.annotation.IntDef;
 
 /**
  * Created by XiaoFeng on 2020/10/10.

diff --git a/...id/hummer-component/src/main/java/com/didi/hummer/component/refresh/PullRefreshState.java b/...id/hummer-component/src/main/java/com/didi/hummer/component/refresh/PullRefreshState.java
@@ -1,6 +1,7 @@
 package com.didi.hummer.component.refresh;
 
-import android.support.annotation.IntDef;
+
+import androidx.annotation.IntDef;
 
 /**
  * Created by XiaoFeng on 2020/10/10.

diff --git a/android/hummer-component/src/main/java/com/didi/hummer/component/scroller/HScrollView.java b/android/hummer-component/src/main/java/com/didi/hummer/component/scroller/HScrollView.java
@@ -2,11 +2,12 @@
 
 import android.app.Activity;
 import android.content.Context;
-import android.support.v4.view.ViewCompat;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.widget.HorizontalScrollView;
 
+import androidx.core.view.ViewCompat;
+
 import com.didi.hummer.component.input.FocusUtil;
 import com.didi.hummer.component.input.KeyboardUtil;
 

diff --git a/android/hummer-component/src/main/java/com/didi/hummer/component/switchview/Switch.java b/android/hummer-component/src/main/java/com/didi/hummer/component/switchview/Switch.java
@@ -3,9 +3,10 @@
 import android.content.Context;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.Nullable;
 import android.widget.CompoundButton;
 
+import androidx.annotation.Nullable;
+
 import com.didi.hummer.annotation.Component;
 import com.didi.hummer.annotation.JsAttribute;
 import com.didi.hummer.annotation.JsProperty;

diff --git a/android/hummer-component/src/main/java/com/didi/hummer/component/text/ImageSpanEx.java b/android/hummer-component/src/main/java/com/didi/hummer/component/text/ImageSpanEx.java
@@ -4,9 +4,10 @@
 import android.graphics.Paint;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.NonNull;
 import android.text.style.ImageSpan;
 
+import androidx.annotation.NonNull;
+
 import java.lang.ref.WeakReference;
 
 /**

diff --git a/android/hummer-component/src/main/java/com/didi/hummer/component/text/URLSpanEx.java b/android/hummer-component/src/main/java/com/didi/hummer/component/text/URLSpanEx.java
@@ -1,10 +1,11 @@
 package com.didi.hummer.component.text;
 
 import android.graphics.Color;
-import android.support.annotation.NonNull;
 import android.text.TextPaint;
 import android.text.style.URLSpan;
 
+import androidx.annotation.NonNull;
+
 /**
  * URLSpan扩展类，支持修改url文字颜色和去掉下划线
  *