Revert back from AndroidX to Android Support libraries

CameraKit · Jan 8, 2019 · 775614c · 775614c
1 parent f902524
commit 775614c
Show file tree

Hide file tree

Showing 28 changed files with 45 additions and 65 deletions.
diff --git a/camerakit/build.gradle b/camerakit/build.gradle
@@ -28,7 +28,6 @@ android {
  }
  externalNativeBuild {
  cmake {
-// arguments "-DANDROID_STL=c++_shared"
  path 'src/main/CMakeLists.txt'
  }
  }
@@ -39,10 +38,6 @@ dependencies {
  implementation 'com.android.support:support-media-compat:28.0.0'
  implementation 'com.android.support:support-v4:28.0.0'
  implementation 'com.android.support:exifinterface:28.0.0'
- implementation 'androidx.appcompat:appcompat:1.0.0'
- implementation 'androidx.media:media:1.0.0'
- implementation 'androidx.legacy:legacy-support-v4:1.0.0'
- implementation 'androidx.exifinterface:exifinterface:1.0.0'
  implementation 'com.google.android.gms:play-services-vision:17.0.2'
 }
 

diff --git a/camerakit/src/main/api16/com/wonderkiln/camerakit/Camera1.java b/camerakit/src/main/api16/com/wonderkiln/camerakit/Camera1.java
@@ -9,8 +9,8 @@
 import android.os.Environment;
 import android.os.Handler;
 import android.os.Looper;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.util.Log;
 
 import com.google.android.gms.vision.Detector;

diff --git a/camerakit/src/main/api16/com/wonderkiln/camerakit/ConstantMapper.java b/camerakit/src/main/api16/com/wonderkiln/camerakit/ConstantMapper.java
@@ -3,7 +3,7 @@
 import android.annotation.TargetApi;
 import android.hardware.Camera;
 import android.hardware.camera2.CameraCharacteristics;
-import androidx.collection.SparseArrayCompat;
+import android.support.v4.util.SparseArrayCompat;
 import android.util.SparseIntArray;
 
 public class ConstantMapper {

diff --git a/camerakit/src/main/base/com/wonderkiln/camerakit/CameraImpl.java b/camerakit/src/main/base/com/wonderkiln/camerakit/CameraImpl.java
@@ -1,6 +1,6 @@
 package com.wonderkiln.camerakit;
 
-import androidx.annotation.Nullable;
+import android.support.annotation.Nullable;
 
 import com.google.android.gms.vision.Detector;
 import com.google.android.gms.vision.text.TextBlock;

diff --git a/camerakit/src/main/base/com/wonderkiln/camerakit/CameraViewLayout.java b/camerakit/src/main/base/com/wonderkiln/camerakit/CameraViewLayout.java
@@ -1,8 +1,8 @@
 package com.wonderkiln.camerakit;
 
 import android.content.Context;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.GestureDetector;
 import android.view.MotionEvent;

diff --git a/camerakit/src/main/base/com/wonderkiln/camerakit/SurfaceViewContainer.java b/camerakit/src/main/base/com/wonderkiln/camerakit/SurfaceViewContainer.java
@@ -1,8 +1,8 @@
 package com.wonderkiln.camerakit;
 
 import android.content.Context;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.FrameLayout;

diff --git a/camerakit/src/main/events/com/wonderkiln/camerakit/CameraKitError.java b/camerakit/src/main/events/com/wonderkiln/camerakit/CameraKitError.java
@@ -1,6 +1,6 @@
 package com.wonderkiln.camerakit;
 
-import androidx.annotation.Nullable;
+import android.support.annotation.Nullable;
 
 public class CameraKitError extends CameraKitEvent {
 

diff --git a/camerakit/src/main/events/com/wonderkiln/camerakit/CameraKitEvent.java b/camerakit/src/main/events/com/wonderkiln/camerakit/CameraKitEvent.java
@@ -1,7 +1,7 @@
 package com.wonderkiln.camerakit;
 
 import android.os.Bundle;
-import androidx.annotation.NonNull;
+import android.support.annotation.NonNull;
 
 public class CameraKitEvent {
 

diff --git a/camerakit/src/main/events/com/wonderkiln/camerakit/EventDispatcher.java b/camerakit/src/main/events/com/wonderkiln/camerakit/EventDispatcher.java
@@ -2,7 +2,7 @@
 
 import android.os.Handler;
 import android.os.Looper;
-import androidx.annotation.NonNull;
+import android.support.annotation.NonNull;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;

diff --git a/camerakit/src/main/java/com/wonderkiln/camerakit/CameraView.java b/camerakit/src/main/java/com/wonderkiln/camerakit/CameraView.java
@@ -18,12 +18,12 @@
 import android.content.res.TypedArray;
 import android.os.Handler;
 import android.os.HandlerThread;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
-import androidx.core.hardware.display.DisplayManagerCompat;
-import androidx.core.view.ViewCompat;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.app.ActivityCompat;
+import android.support.v4.content.ContextCompat;
+import android.support.v4.hardware.display.DisplayManagerCompat;
+import android.support.v4.view.ViewCompat;
 import android.util.AttributeSet;
 import android.view.Display;
 import android.view.Surface;

diff --git a/camerakit/src/main/java/com/wonderkiln/camerakit/FocusMarkerLayout.java b/camerakit/src/main/java/com/wonderkiln/camerakit/FocusMarkerLayout.java
@@ -3,8 +3,8 @@
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.content.Context;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.widget.FrameLayout;

diff --git a/camerakit/src/main/types/com/wonderkiln/camerakit/CaptureMethod.java b/camerakit/src/main/types/com/wonderkiln/camerakit/CaptureMethod.java
@@ -1,6 +1,6 @@
 package com.wonderkiln.camerakit;
 
-import androidx.annotation.IntDef;
+import android.support.annotation.IntDef;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

diff --git a/camerakit/src/main/types/com/wonderkiln/camerakit/Facing.java b/camerakit/src/main/types/com/wonderkiln/camerakit/Facing.java
@@ -1,6 +1,6 @@
 package com.wonderkiln.camerakit;
 
-import androidx.annotation.IntDef;
+import android.support.annotation.IntDef;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

diff --git a/camerakit/src/main/types/com/wonderkiln/camerakit/Flash.java b/camerakit/src/main/types/com/wonderkiln/camerakit/Flash.java
@@ -1,6 +1,6 @@
 package com.wonderkiln.camerakit;
 
-import androidx.annotation.IntDef;
+import android.support.annotation.IntDef;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

diff --git a/camerakit/src/main/types/com/wonderkiln/camerakit/Focus.java b/camerakit/src/main/types/com/wonderkiln/camerakit/Focus.java
@@ -1,6 +1,6 @@
 package com.wonderkiln.camerakit;
 
-import androidx.annotation.IntDef;
+import android.support.annotation.IntDef;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

diff --git a/camerakit/src/main/types/com/wonderkiln/camerakit/Permissions.java b/camerakit/src/main/types/com/wonderkiln/camerakit/Permissions.java
@@ -1,6 +1,6 @@
 package com.wonderkiln.camerakit;
 
-import androidx.annotation.IntDef;
+import android.support.annotation.IntDef;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

diff --git a/camerakit/src/main/types/com/wonderkiln/camerakit/VideoQuality.java b/camerakit/src/main/types/com/wonderkiln/camerakit/VideoQuality.java
@@ -1,6 +1,6 @@
 package com.wonderkiln.camerakit;
 
-import androidx.annotation.IntDef;
+import android.support.annotation.IntDef;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

diff --git a/camerakit/src/main/utils/com/wonderkiln/camerakit/AspectRatio.java b/camerakit/src/main/utils/com/wonderkiln/camerakit/AspectRatio.java
@@ -2,8 +2,8 @@
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import androidx.annotation.NonNull;
-import androidx.collection.SparseArrayCompat;
+import android.support.annotation.NonNull;
+import android.support.v4.util.SparseArrayCompat;
 
 public class AspectRatio implements Comparable<AspectRatio>, Parcelable {
 

diff --git a/camerakit/src/main/utils/com/wonderkiln/camerakit/PostProcessor.java b/camerakit/src/main/utils/com/wonderkiln/camerakit/PostProcessor.java
@@ -1,7 +1,7 @@
 package com.wonderkiln.camerakit;
 
 import android.graphics.Rect;
-import androidx.exifinterface.media.ExifInterface;
+import android.support.media.ExifInterface;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;

diff --git a/camerakit/src/main/utils/com/wonderkiln/camerakit/Size.java b/camerakit/src/main/utils/com/wonderkiln/camerakit/Size.java
@@ -1,6 +1,6 @@
 package com.wonderkiln.camerakit;
 
-import androidx.annotation.NonNull;
+import android.support.annotation.NonNull;
 
 public class Size implements Comparable<Size> {
 

diff --git a/demo/build.gradle b/demo/build.gradle
@@ -24,9 +24,5 @@ android {
 
 dependencies {
  implementation project(':camerakit')
-// implementation 'com.android.support'
  implementation 'com.android.support:appcompat-v7:28.0.0'
- implementation 'androidx.appcompat:appcompat:1.0.2'
-// implementation 'com.jakewharton:butterknife:8.6.0'
-// annotationProcessor 'com.jakewharton:butterknife-compiler:8.6.0'
 }
diff --git a/demo/src/main/java/com/wonderkiln/camerakit/demo/AutoUnfocusEditText.java b/demo/src/main/java/com/wonderkiln/camerakit/demo/AutoUnfocusEditText.java
@@ -1,7 +1,7 @@
 package com.wonderkiln.camerakit.demo;
 
 import android.content.Context;
-import androidx.appcompat.widget.AppCompatEditText;
+import android.support.v7.widget.AppCompatEditText;
 import android.util.AttributeSet;
 import android.view.KeyEvent;
 import android.view.inputmethod.InputMethodManager;

diff --git a/demo/src/main/java/com/wonderkiln/camerakit/demo/CameraControls.java b/demo/src/main/java/com/wonderkiln/camerakit/demo/CameraControls.java
@@ -5,8 +5,8 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.TypedArray;
-import androidx.annotation.DrawableRes;
-import androidx.annotation.Nullable;
+import android.support.annotation.DrawableRes;
+import android.support.annotation.Nullable;
 
 import android.util.AttributeSet;
 import android.view.LayoutInflater;

diff --git a/demo/src/main/java/com/wonderkiln/camerakit/demo/MainActivity.java b/demo/src/main/java/com/wonderkiln/camerakit/demo/MainActivity.java
@@ -6,13 +6,13 @@
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
-import androidx.core.content.ContextCompat;
-import androidx.core.view.GravityCompat;
-import androidx.drawerlayout.widget.DrawerLayout;
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.ActionBarDrawerToggle;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AppCompatActivity;
+import android.support.v4.content.ContextCompat;
+import android.support.v4.view.GravityCompat;
+import android.support.v4.widget.DrawerLayout;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.ActionBarDrawerToggle;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.app.AppCompatActivity;
 import android.text.Html;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -30,9 +30,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-//import butterknife.BindView;
-//import butterknife.ButterKnife;
-
 public class MainActivity extends AppCompatActivity {
 
  private static final String TAG = MainActivity.class.getSimpleName();

diff --git a/demo/src/main/java/com/wonderkiln/camerakit/demo/PreviewActivity.java b/demo/src/main/java/com/wonderkiln/camerakit/demo/PreviewActivity.java
@@ -5,12 +5,9 @@
 import android.media.MediaPlayer;
 import android.net.Uri;
 import android.os.Bundle;
-//import android.support.annotation.Nullable;
-//import android.support.v7.app.ActionBar;
-//import android.support.v7.app.AppCompatActivity;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AppCompatActivity;
+import android.support.annotation.Nullable;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatActivity;
 import android.text.Html;
 import android.view.View;
 import android.view.ViewGroup;
@@ -21,9 +18,6 @@
 import android.widget.VideoView;
 
 import java.io.File;
-//
-//import butterknife.BindView;
-//import butterknife.ButterKnife;
 
 public class PreviewActivity extends AppCompatActivity {
 

diff --git a/demo/src/main/java/com/wonderkiln/camerakit/demo/ResultHolder.java b/demo/src/main/java/com/wonderkiln/camerakit/demo/ResultHolder.java
@@ -1,6 +1,6 @@
 package com.wonderkiln.camerakit.demo;
 
-import androidx.annotation.Nullable;
+import android.support.annotation.Nullable;
 
 import com.wonderkiln.camerakit.Size;
 

diff --git a/demo/src/main/res/layout/activity_main.xml b/demo/src/main/res/layout/activity_main.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
  android:id="@+id/activityMain"
  android:layout_width="match_parent"
  android:layout_height="match_parent">
@@ -58,4 +58,4 @@
  android:background="@color/colorPrimaryDark"
  android:choiceMode="singleChoice" />
 
-</androidx.drawerlayout.widget.DrawerLayout>
+</android.support.v4.widget.DrawerLayout>
diff --git a/gradle.properties b/gradle.properties
@@ -1,3 +1 @@
-android.enableJetifier=true
-android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m