支持AndroidX对应版本

2019-06-27 14:03:57 +08:00
parent 809930183a
commit d85da52e84
26 changed files with 81 additions and 76 deletions
--- a/.idea/caches/build_file_checksums.ser
+++ b/.idea/caches/build_file_checksums.ser
--- a/README.md
+++ b/README.md
@@ -51,6 +51,9 @@ ZXingLite for Android 是ZXing的精简版，基于ZXing库优化扫码和生成
 ```
 ### Gradle:
 ```gradle
+//AndroidX 版本
+implementation 'com.king.zxing:zxing-lite:1.1.2-androidx'
+//Android 版本
 implementation 'com.king.zxing:zxing-lite:1.1.2'
 ```
 ### Lvy:
@@ -71,6 +74,11 @@ allprojects {

 ## 引入的库：
 ```gradle
+//AndroidX
+compileOnly 'androidx.appcompat:appcompat:1.0.0+'
+api 'com.google.zxing:core:3.3.3'
+
+//Android
 compileOnly 'com.android.support:appcompat-v7:28.0.0'
 api 'com.google.zxing:core:3.3.3'
 ```
@@ -130,6 +138,7 @@ api 'com.google.zxing:core:3.3.3'

 #### v1.1.2：2019-6-27
 *  优化部分细节，为迁移至AndroidX做准备
+*  支持AndroidX对应版本

 #### v1.1.1：2019-5-20
 *  支持扫二维码过小时，自动缩放
--- a/app/release/app-release.apk
+++ b/app/release/app-release.apk
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":11,"versionName":"1.1.2","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":12,"versionName":"1.1.2-androidx","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
--- a/app/src/main/java/com/king/zxing/app/CaptureFragmentActivity.java
+++ b/app/src/main/java/com/king/zxing/app/CaptureFragmentActivity.java
@@ -1,17 +1,18 @@
 package com.king.zxing.app;

 import android.os.Bundle;
-import android.support.annotation.IdRes;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
 import android.view.View;
 import android.widget.TextView;

 import com.king.zxing.CaptureFragment;
 import com.king.zxing.app.util.StatusBarUtils;

+import androidx.annotation.IdRes;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.fragment.app.Fragment;
+
 /**
 * Fragment扫码
 * @author <a href="mailto:jenly1314@gmail.com">Jenly</a>
--- a/app/src/main/java/com/king/zxing/app/CodeActivity.java
+++ b/app/src/main/java/com/king/zxing/app/CodeActivity.java
@@ -18,8 +18,6 @@ package com.king.zxing.app;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -27,6 +25,9 @@ import android.widget.TextView;
 import com.google.zxing.BarcodeFormat;
 import com.king.zxing.util.CodeUtils;

+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+
 /**
 * @author Jenly <a href="mailto:jenly1314@gmail.com">Jenly</a>
 */
--- a/app/src/main/java/com/king/zxing/app/CustomActivity.java
+++ b/app/src/main/java/com/king/zxing/app/CustomActivity.java
@@ -3,9 +3,6 @@ package com.king.zxing.app;
 import android.hardware.Camera;
 import android.os.Bundle;
 import android.app.Activity;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v4.app.Fragment;
-import android.support.v7.widget.Toolbar;
 import android.view.MotionEvent;
 import android.view.SurfaceView;
 import android.view.View;
@@ -13,11 +10,14 @@ import android.widget.TextView;
 import android.widget.Toast;

 import com.king.zxing.CaptureHelper;
-import com.king.zxing.DecodeFormatManager;
 import com.king.zxing.OnCaptureCallback;
 import com.king.zxing.ViewfinderView;
 import com.king.zxing.app.util.StatusBarUtils;

+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.fragment.app.Fragment;
+
 /**
 * 自定义扫码：当直接使用CaptureActivity
 * 自定义扫码，切记自定义扫码需在{@link Activity}或者{@link Fragment}相对应的生命周期里面调用{@link #mCaptureHelper}对应的生命周期
--- a/app/src/main/java/com/king/zxing/app/CustomCaptureActivity.java
+++ b/app/src/main/java/com/king/zxing/app/CustomCaptureActivity.java
@@ -18,17 +18,17 @@ package com.king.zxing.app;
 import android.content.pm.PackageManager;
 import android.hardware.Camera;
 import android.os.Bundle;
-import android.support.v7.widget.Toolbar;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;

-import com.google.zxing.DecodeHintType;
 import com.king.zxing.CaptureActivity;
 import com.king.zxing.app.util.StatusBarUtils;
 import com.king.zxing.camera.CameraConfigurationUtils;

+import androidx.appcompat.widget.Toolbar;
+
 /**
 * 自定义继承CaptureActivity
 * @author Jenly <a href="mailto:jenly1314@gmail.com">Jenly</a>
--- a/app/src/main/java/com/king/zxing/app/EasyCaptureActivity.java
+++ b/app/src/main/java/com/king/zxing/app/EasyCaptureActivity.java
@@ -16,14 +16,14 @@
 package com.king.zxing.app;

 import android.os.Bundle;
-import android.support.v7.widget.Toolbar;
 import android.view.View;
 import android.widget.TextView;

 import com.king.zxing.CaptureActivity;
-import com.king.zxing.DecodeFormatManager;
 import com.king.zxing.app.util.StatusBarUtils;

+import androidx.appcompat.widget.Toolbar;
+
 /**
 * @author Jenly <a href="mailto:jenly1314@gmail.com">Jenly</a>
 */
--- a/app/src/main/java/com/king/zxing/app/MainActivity.java
+++ b/app/src/main/java/com/king/zxing/app/MainActivity.java
@@ -19,9 +19,6 @@ import android.Manifest;
 import android.content.Context;
 import android.content.Intent;
 import android.provider.MediaStore;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.app.ActivityOptionsCompat;
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;
@@ -36,6 +33,9 @@ import com.king.zxing.util.CodeUtils;

 import java.util.List;

+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.app.ActivityCompat;
+import androidx.core.app.ActivityOptionsCompat;
 import pub.devrel.easypermissions.AfterPermissionGranted;
 import pub.devrel.easypermissions.EasyPermissions;

--- a/app/src/main/java/com/king/zxing/app/util/StatusBarUtils.java
+++ b/app/src/main/java/com/king/zxing/app/util/StatusBarUtils.java
@@ -19,9 +19,6 @@ import android.app.Activity;
 import android.content.Context;
 import android.graphics.Color;
 import android.os.Build;
-import android.support.annotation.ColorInt;
-import android.support.annotation.FloatRange;
-import android.support.v7.widget.Toolbar;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
@@ -30,6 +27,9 @@ import android.widget.LinearLayout;

 import com.king.zxing.app.R;

+import androidx.annotation.FloatRange;
+import androidx.appcompat.widget.Toolbar;
+
 /**
 * @author Jenly <a href="mailto:jenly1314@gmail.com">Jenly</a>
 */
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,20 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<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=".MainActivity">
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
        android:id="@+id/toolbar"
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
        android:layout_width="match_parent"
        android:background="@color/colorPrimary"
        android:layout_height="wrap_content"
        app:contentInsetLeft="0dp"
-        app:contentInsetStart="0dp">
+        app:contentInsetStart="0dp"
+        tools:ignore="MissingConstraints">
        <TextView
            android:id="@+id/tvTitle"
            android:layout_width="match_parent"
@@ -25,7 +24,7 @@
            android:textColor="@color/white"
            android:layout_gravity="center_horizontal"
            android:text="@string/app_name"/>
-    </android.support.v7.widget.Toolbar>
+    </androidx.appcompat.widget.Toolbar>
    <Button
        android:id="@+id/btn0"
        android:layout_width="match_parent"
@@ -131,4 +130,4 @@
        app:layout_constraintRight_toRightOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/btn6"
        style="@style/OnClick"/>
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/layout/code_activity.xml
+++ b/app/src/main/res/layout/code_activity.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"
@@ -15,4 +15,4 @@
        app:layout_constraintTop_toBottomOf="@+id/toolbar"
        app:layout_constraintBottom_toBottomOf="parent"/>

-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/layout/custom_activity.xml
+++ b/app/src/main/res/layout/custom_activity.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"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
@@ -34,4 +34,4 @@
        android:layout_marginTop="160dp"
        style="@style/OnClick"/>
    <include layout="@layout/toolbar_capture"/>
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/layout/custom_capture_activity.xml
+++ b/app/src/main/res/layout/custom_capture_activity.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"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
@@ -33,4 +33,4 @@
        android:layout_marginTop="160dp"
        style="@style/OnClick"/>
    <include layout="@layout/toolbar_capture"/>
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/layout/easy_capture_activity.xml
+++ b/app/src/main/res/layout/easy_capture_activity.xml
@@ -1,8 +1,8 @@
 <?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">
    <include layout="@layout/zxl_capture"/>
    <include layout="@layout/toolbar_capture"/>
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/layout/toolbar.xml
+++ b/app/src/main/res/layout/toolbar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.Toolbar
+<androidx.appcompat.widget.Toolbar
    android:id="@+id/toolbar"
    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -9,4 +9,4 @@
    app:contentInsetLeft="0dp"
    app:contentInsetStart="0dp">
    <include layout="@layout/top_title_back_bar"/>
-</android.support.v7.widget.Toolbar>
+</androidx.appcompat.widget.Toolbar>
--- a/app/src/main/res/layout/toolbar_capture.xml
+++ b/app/src/main/res/layout/toolbar_capture.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.Toolbar
+<androidx.appcompat.widget.Toolbar
    android:id="@+id/toolbar"
    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -8,4 +8,4 @@
    app:contentInsetLeft="0dp"
    app:contentInsetStart="0dp">
    <include layout="@layout/top_title_back_bar"/>
-</android.support.v7.widget.Toolbar>
+</androidx.appcompat.widget.Toolbar>
--- a/build.gradle
+++ b/build.gradle
@@ -3,10 +3,8 @@
 buildscript {
    apply from: 'versions.gradle'

-    repositories {
-        google()
-        jcenter()
-    }
+    addRepos(repositories)
+
    dependencies {
        classpath 'com.android.tools.build:gradle:3.2.1'
        classpath 'com.novoda:bintray-release:0.9'
@@ -17,10 +15,8 @@ buildscript {
 }

 allprojects {
-    repositories {
    addRepos(repositories)
 }
-}

 task clean(type: Delete) {
    delete rootProject.buildDir
--- a/gradle.properties
+++ b/gradle.properties
@@ -11,3 +11,5 @@ org.gradle.jvmargs = -Xmx1536m
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
+android.useAndroidX=true
+android.enableJetifier=true
--- a/lib/src/main/java/com/king/zxing/CaptureActivity.java
+++ b/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{

--- a/lib/src/main/java/com/king/zxing/CaptureFragment.java
+++ b/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>
 */
--- a/lib/src/main/java/com/king/zxing/CaptureHelper.java
+++ b/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>
 */
--- a/lib/src/main/java/com/king/zxing/ViewfinderView.java
+++ b/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.
--- a/lib/src/main/java/com/king/zxing/util/CodeUtils.java
+++ b/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>
--- a/versions.gradle
+++ b/versions.gradle
@@ -1,7 +1,7 @@
 //App 
 def app_version = [:]
-app_version.versionCode = 11
-app_version.versionName = "1.1.2"
+app_version.versionCode = 12
+app_version.versionName = "1.1.2-androidx"
 ext.app_version = app_version

 //build version
@@ -17,7 +17,7 @@ ext.deps = [:]
 // App dependencies
 def versions = [:]
 //support
-versions.supportLibrary = "28.0.0"
+versions.supportLibrary = "1.0.0+"
 versions.constraintLayout = "1.1.3"

 //test
@@ -29,15 +29,15 @@ versions.espresso = "3.0.2"
 //zxing
 versions.zxing = "3.3.3"

-versions.easypermissions = "2.0.1"
+versions.easypermissions = "3.0.0"



 //support
 def support = [:]
-support.design = "com.android.support:design:$versions.supportLibrary"
-support.appcompat = "com.android.support:appcompat-v7:$versions.supportLibrary"
-support.constraintlayout = "com.android.support.constraint:constraint-layout:$versions.constraintLayout"
+support.design = "com.google.android.material:material:$versions.supportLibrary"
+support.appcompat = "androidx.appcompat:appcompat:$versions.supportLibrary"
+support.constraintlayout = "androidx.constraintlayout:constraintlayout:$versions.constraintLayout"
 deps.support = support

 //test