支持AndroidX对应版本

2019-06-27 14:03:57 +08:00
parent 809930183a
commit d85da52e84
26 changed files with 81 additions and 76 deletions
--- 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,13 +27,16 @@ 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>
 */
 public enum StatusBarUtils {
    INSTANCE;

-    public static void immersiveStatusBar(Activity activity,Toolbar toolbar) {
+    public static void immersiveStatusBar(Activity activity, Toolbar toolbar) {
        immersiveStatusBar(activity,toolbar,0.0f);
    }

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