支持AndroidX对应版本

lib/src/main/java/com/king/zxing/CaptureActivity.java

@@ -17,13 +17,14 @@ package com.king.zxing;
 
 import android.app.Activity;
 import android.os.Bundle;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.Nullable;
 import android.view.MotionEvent;
 import android.view.SurfaceView;
 
 import com.king.zxing.camera.CameraManager;
 
+import androidx.annotation.LayoutRes;
+import androidx.annotation.Nullable;
+
 
 public class CaptureActivity extends Activity implements OnCaptureCallback{
 

lib/src/main/java/com/king/zxing/CaptureFragment.java

@@ -16,9 +16,6 @@
 package com.king.zxing;
 
 import android.os.Bundle;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.SurfaceView;
 import android.view.View;
@@ -26,6 +23,10 @@ import android.view.ViewGroup;
 
 import com.king.zxing.camera.CameraManager;
 
+import androidx.annotation.LayoutRes;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
 /**
  * @author <a href="mailto:jenly1314@gmail.com">Jenly</a>
  */

lib/src/main/java/com/king/zxing/CaptureHelper.java

@@ -21,7 +21,6 @@ import android.graphics.Bitmap;
 import android.graphics.Rect;
 import android.graphics.RectF;
 import android.hardware.Camera;
-import android.support.v4.app.Fragment;
 import android.util.Log;
 import android.view.MotionEvent;
 import android.view.SurfaceHolder;
@@ -39,6 +38,8 @@ import java.util.EnumMap;
 import java.util.List;
 import java.util.Map;
 
+import androidx.fragment.app.Fragment;
+
 /**
  * @author <a href="mailto:jenly1314@gmail.com">Jenly</a>
  */

lib/src/main/java/com/king/zxing/ViewfinderView.java

@@ -1,5 +1,4 @@
 package com.king.zxing;
-
 /*
  * Copyright (C) 2008 ZXing authors
  *
@@ -16,32 +15,21 @@ package com.king.zxing;
  * limitations under the License.
  */
 
-
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.graphics.Bitmap;
 import android.graphics.Canvas;
-import android.graphics.Color;
 import android.graphics.LinearGradient;
-import android.graphics.Matrix;
 import android.graphics.Paint;
-import android.graphics.Path;
-import android.graphics.PointF;
 import android.graphics.Rect;
 import android.graphics.RectF;
 import android.graphics.Shader;
-import android.support.annotation.ColorInt;
-import android.support.annotation.ColorRes;
-import android.support.annotation.Nullable;
-import android.support.v4.content.ContextCompat;
 import android.text.Layout;
 import android.text.StaticLayout;
 import android.text.TextPaint;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.util.DisplayMetrics;
-import android.util.Log;
 import android.util.TypedValue;
 import android.view.View;
 
@@ -50,6 +38,11 @@ import com.google.zxing.ResultPoint;
 import java.util.ArrayList;
 import java.util.List;
 
+import androidx.annotation.ColorInt;
+import androidx.annotation.ColorRes;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+
 /**
  * This view is overlaid on top of the camera preview. It adds the viewfinder rectangle and partial
  * transparency outside it, as well as the laser scanner animation and result points.

lib/src/main/java/com/king/zxing/util/CodeUtils.java

@@ -20,8 +20,6 @@ import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
-import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
 import android.text.TextPaint;
 import android.text.TextUtils;
 
@@ -47,6 +45,9 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Vector;
 
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+
 
 /**
  * @author Jenly <a href="mailto:jenly1314@gmail.com">Jenly</a>