Update README

*  生成二维码时Logo支持自定义大小 fix(#62)

.circleci/config.yml

@@ -1,3 +1,4 @@
+
 version: 2
 jobs:
   build:

README.md

@@ -16,8 +16,6 @@ ZXingLite for Android 是ZXing的精简版，基于ZXing库优化扫码和生成
 >简单如斯，你不试试？ Come on~
 
 
-### [AndroidX version](https://github.com/jenly1314/ZXingLite/tree/androidx)
-
 ## Gif 展示
 ![Image](GIF.gif)
 
@@ -167,6 +165,7 @@ api 'com.google.zxing:core:3.3.3'
 
 > 4、参照CaptureHelper写一个自定义的扫码帮助类，其它步骤同方式3。（扩展高级用法，谨慎使用）
 
+
 ### 其他
 
 需使用JDK8+编译，在你项目中的build.gradle的android{}中添加配置：

app/build.gradle

@@ -9,7 +9,7 @@ android {
         targetSdkVersion build_versions.targetSdk
         versionCode app_version.versionCode
         versionName app_version.versionName
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {

app/release/output.json

@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":25,"versionName":"1.1.9","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":26,"versionName":"1.1.9-androidx","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]

app/src/androidTest/java/com/king/zxing/app/ExampleInstrumentedTest.java

@@ -1,13 +1,14 @@
 package com.king.zxing.app;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static org.junit.Assert.*;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+
+import static org.junit.Assert.assertEquals;
 
 /**
  * Instrumented test, which will execute on an Android device.

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>

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>
  */

app/src/main/java/com/king/zxing/app/CustomActivity.java

@@ -1,11 +1,7 @@
 package com.king.zxing.app;
 
 import android.app.Activity;
-import android.hardware.Camera;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
 import android.view.MotionEvent;
 import android.view.SurfaceView;
 import android.view.View;
@@ -17,6 +13,10 @@ 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}对应的生命周期

app/src/main/java/com/king/zxing/app/CustomCaptureActivity.java

@@ -16,7 +16,6 @@
 package com.king.zxing.app;
 
 import android.os.Bundle;
-import android.support.v7.widget.Toolbar;
 import android.view.View;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -25,6 +24,8 @@ import com.king.zxing.CaptureActivity;
 import com.king.zxing.app.util.StatusBarUtils;
 import com.king.zxing.camera.FrontLightMode;
 
+import androidx.appcompat.widget.Toolbar;
+
 /**
  * 自定义继承CaptureActivity
  * @author Jenly <a href="mailto:jenly1314@gmail.com">Jenly</a>

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>
  */

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;
 

app/src/main/java/com/king/zxing/app/util/StatusBarUtils.java

@@ -19,8 +19,6 @@ import android.app.Activity;
 import android.content.Context;
 import android.graphics.Color;
 import android.os.Build;
-import android.support.annotation.FloatRange;
-import android.support.v7.widget.Toolbar;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
@@ -29,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>
  */

app/src/main/res/layout/activity_main.xml

@@ -1,15 +1,13 @@
 <?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"
@@ -27,7 +25,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"
@@ -133,4 +131,4 @@
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/btn6"
         style="@style/OnClick"/>
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

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>

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"
@@ -33,4 +33,4 @@
         app:layout_constraintBottom_toBottomOf="parent"
         android:layout_marginTop="160dp" />
     <include layout="@layout/toolbar_capture"/>
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

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"
@@ -32,4 +32,4 @@
         app:layout_constraintBottom_toBottomOf="parent"
         android:layout_marginTop="160dp" />
     <include layout="@layout/toolbar_capture"/>
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

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>

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>

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>

build.gradle

@@ -4,6 +4,7 @@ buildscript {
     apply from: 'versions.gradle'
 
     addRepos(repositories)
+
     dependencies {
         classpath 'com.android.tools.build:gradle:3.2.1'
         classpath 'com.novoda:bintray-release:0.9'

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

lib/build.gradle

@@ -10,7 +10,7 @@ android {
         versionCode app_version.versionCode
         versionName app_version.versionName
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
     buildTypes {

lib/src/androidTest/java/com/king/zxing/ExampleInstrumentedTest.java

@@ -1,12 +1,13 @@
 package com.king.zxing;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+
 import static org.junit.Assert.*;
 
 /**

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

@@ -37,6 +37,8 @@ import java.io.IOException;
  */
 public final class BeepManager implements MediaPlayer.OnErrorListener, Closeable {
 
+    private static final String TAG = BeepManager.class.getSimpleName();
+
     private static final float BEEP_VOLUME = 0.10f;
     private static final long VIBRATE_DURATION = 200L;
 

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

@@ -16,16 +16,19 @@
 package com.king.zxing;
 
 import android.os.Bundle;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
 import android.view.MotionEvent;
 import android.view.SurfaceView;
 import android.view.View;
 
 import com.king.zxing.camera.CameraManager;
 
+import androidx.annotation.LayoutRes;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 
+/**
+ * @author <a href="mailto:jenly1314@gmail.com">Jenly</a>
+ */
 public class CaptureActivity extends AppCompatActivity implements OnCaptureCallback{
 
     public static final String KEY_RESULT = Intents.Scan.RESULT;

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

@@ -22,8 +22,6 @@ import android.graphics.Bitmap;
 import android.graphics.Rect;
 import android.graphics.RectF;
 import android.hardware.Camera;
-import android.support.annotation.FloatRange;
-import android.support.v4.app.Fragment;
 import android.view.MotionEvent;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
@@ -43,6 +41,12 @@ import java.util.EnumMap;
 import java.util.List;
 import java.util.Map;
 
+import androidx.annotation.FloatRange;
+import androidx.fragment.app.Fragment;
+
+/**
+ * @author <a href="mailto:jenly1314@gmail.com">Jenly</a>
+ */
 /**
  * @author <a href="mailto:jenly1314@gmail.com">Jenly</a>
  */
@@ -532,6 +536,7 @@ public class CaptureHelper implements CaptureLifecycle,CaptureTouchEvent,Capture
                 activity.setResult(Activity.RESULT_OK,intent);
                 activity.finish();
             },100);
+
             return;
         }
 

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

@@ -237,7 +237,7 @@ final class DecodeHandler extends Handler {
                     lastZoomTime = System.currentTimeMillis();
                     return true;
                 } else {
-                     LogUtils.i( "Zoom not supported");
+                    LogUtils.d("Zoom not supported");
                 }
             }
 

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

@@ -35,6 +35,8 @@ import java.util.concurrent.RejectedExecutionException;
  */
 final class InactivityTimer {
 
+    private static final String TAG = InactivityTimer.class.getSimpleName();
+
     private static final long INACTIVITY_DELAY_MS = 5 * 60 * 1000L;
 
     private final Activity activity;

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

@@ -1,5 +1,4 @@
 package com.king.zxing;
-
 /*
  * Copyright (C) 2008 ZXing authors
  *
@@ -16,7 +15,6 @@ package com.king.zxing;
  * limitations under the License.
  */
 
-
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Canvas;
@@ -25,10 +23,6 @@ import android.graphics.Paint;
 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;
@@ -43,6 +37,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/camera/AutoFocusManager.java

@@ -29,7 +29,6 @@ import java.util.concurrent.RejectedExecutionException;
 import com.king.zxing.Preferences;
 import com.king.zxing.util.LogUtils;
 
-@SuppressWarnings("deprecation") // camera APIs
 final class AutoFocusManager implements Camera.AutoFocusCallback {
 
     private static final long AUTO_FOCUS_INTERVAL_MS = 1200L;

lib/src/main/java/com/king/zxing/camera/CameraManager.java

@@ -22,7 +22,6 @@ import android.graphics.Point;
 import android.graphics.Rect;
 import android.hardware.Camera;
 import android.os.Handler;
-import android.support.annotation.FloatRange;
 import android.view.SurfaceHolder;
 
 import com.google.zxing.PlanarYUVLuminanceSource;
@@ -32,6 +31,8 @@ import com.king.zxing.util.LogUtils;
 
 import java.io.IOException;
 
+import androidx.annotation.FloatRange;
+
 /**
  * This object wraps the Camera service object and expects to be the only one talking to it. The
  * implementation encapsulates the steps needed to take preview-sized images, which are used for
@@ -184,7 +185,6 @@ public final class CameraManager {
             previewCallback.setHandler(null, 0);
             previewing = false;
         }
-
     }
 
     /**

lib/src/main/java/com/king/zxing/camera/PreviewCallback.java

@@ -27,6 +27,8 @@ import com.king.zxing.util.LogUtils;
 @SuppressWarnings("deprecation") // camera APIs
 final class PreviewCallback implements Camera.PreviewCallback {
 
+    private static final String TAG = PreviewCallback.class.getSimpleName();
+
     private final CameraConfigurationManager configManager;
     private Handler previewHandler;
     private int previewMessage;

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

@@ -20,12 +20,14 @@ 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.FloatRange;
-import android.support.annotation.NonNull;
 import android.text.TextPaint;
 import android.text.TextUtils;
 
+import androidx.annotation.ColorInt;
+import androidx.annotation.FloatRange;
+import androidx.annotation.NonNull;
+
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.BinaryBitmap;
 import com.google.zxing.DecodeHintType;

versions.gradle

@@ -1,7 +1,7 @@
 //App 
 def app_version = [:]
-app_version.versionCode = 25    //androidx 26
+app_version.versionCode = 26
-app_version.versionName = "1.1.9"
+app_version.versionName = "1.1.9-androidx"
 ext.app_version = app_version
 
 //build version
@@ -16,35 +16,37 @@ ext.deps = [:]
 
 // App dependencies
 def versions = [:]
-//support
+//AndroidX
-versions.supportLibrary = "28.0.0"
+versions.material = "1.2.0-alpha01"
+versions.appcompat = "1.1.0"
 versions.constraintLayout = "1.1.3"
 
 //test
-versions.junit = "4.12"
+versions.junit = "1.1.0"
-versions.runner = "1.0.2"
+versions.test = "1.2.0"
-versions.rules = "1.0.2"
+versions.runner = "1.2.0"
-versions.espresso = "3.0.2"
+versions.espresso = "3.2.0"
 
 //zxing
 versions.zxing = "3.3.3"
 
-versions.easypermissions = "2.0.1"
+versions.easypermissions = "3.0.0"
-
 
+ext.versions = versions
 
 //support
 def support = [:]
-support.design = "com.android.support:design:$versions.supportLibrary"
+support.design = "com.google.android.material:material:$versions.material"
-support.appcompat = "com.android.support:appcompat-v7:$versions.supportLibrary"
+support.appcompat = "androidx.appcompat:appcompat:$versions.appcompat"
-support.constraintlayout = "com.android.support.constraint:constraint-layout:$versions.constraintLayout"
+support.constraintlayout = "androidx.constraintlayout:constraintlayout:$versions.constraintLayout"
 deps.support = support
 
 //test
 def test = [:]
-test.junit = "junit:junit:$versions.junit"
+test.junit = "androidx.test.ext:junit:$versions.junit"
-test.runner = "com.android.support.test:runner:$versions.runner"
+test.test = "androidx.test:core:$versions.test"
-test.espresso = "com.android.support.test.espresso:espresso-core:$versions.espresso"
+test.runner = "androidx.test:runner:$versions.runner"
+test.espresso = "androidx.test.espresso:espresso-core:$versions.espresso"
 deps.test = test
 
 //zxing