Merge pull request #476 from CameraKit/prereleases-module-consolidation

Prereleases module consolidation
CameraKit · Jan 9, 2019 · 1ae86c4 · 1ae86c4
2 parents 269ac0e + 775614c
commit 1ae86c4
Show file tree

Hide file tree

Showing 101 changed files with 88 additions and 316 deletions.
diff --git a/camerakit-core/.gitignore b/camerakit-core/.gitignore
diff --git a/camerakit-core/build.gradle b/camerakit-core/build.gradle
diff --git a/camerakit-core/proguard-rules.pro b/camerakit-core/proguard-rules.pro
diff --git a/camerakit-core/src/main/AndroidManifest.xml b/camerakit-core/src/main/AndroidManifest.xml
diff --git a/camerakit-vision/.gitignore b/camerakit-vision/.gitignore
diff --git a/camerakit-vision/build.gradle b/camerakit-vision/build.gradle
diff --git a/camerakit-vision/proguard-rules.pro b/camerakit-vision/proguard-rules.pro
diff --git a/camerakit-vision/src/main/AndroidManifest.xml b/camerakit-vision/src/main/AndroidManifest.xml
diff --git a/camerakit/build.gradle b/camerakit/build.gradle
@@ -17,11 +17,28 @@ android {
  proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
  }
  }
+ sourceSets {
+ main.java.srcDirs += 'src/main/base'
+ main.java.srcDirs += 'src/main/api16'
+ main.java.srcDirs += 'src/main/api21'
+ main.java.srcDirs += 'src/main/types'
+ main.java.srcDirs += 'src/main/events'
+ main.java.srcDirs += 'src/main/utils'
+ main.java.srcDirs += 'src/main/vision'
+ }
+ externalNativeBuild {
+ cmake {
+ path 'src/main/CMakeLists.txt'
+ }
+ }
 }
 
 dependencies {
- api project(':camerakit-core')
- api project(':camerakit-vision')
+ implementation 'com.android.support:appcompat-v7:28.0.0'
+ 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 'com.google.android.gms:play-services-vision:17.0.2'
 }
 
 group = 'com.wonderkiln'

diff --git a/camerakit/proguard-rules.pro b/camerakit/proguard-rules.pro
diff --git a/camerakit/src/main/AndroidManifest.xml b/camerakit/src/main/AndroidManifest.xml
@@ -1 +1,21 @@
-<manifest package="com.wonderkiln.camerakit"/>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.wonderkiln.camerakit.core">
+
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+ <uses-permission android:name="android.permission.CAMERA" />
+ <uses-permission android:name="android.permission.RECORD_AUDIO" />
+
+ <uses-feature android:name="android.hardware.camera" />
+ <uses-feature
+ android:name="android.hardware.camera.autofocus"
+ android:required="false" />
+ <uses-feature
+ android:name="android.hardware.camera.front"
+ android:required="false" />
+ <uses-feature
+ android:name="android.hardware.microphone"
+ android:required="false" />
+
+ <application />
+
+</manifest>
diff --git a/camerakit-core/src/main/CMakeLists.txt → camerakit/src/main/CMakeLists.txt b/camerakit-core/src/main/CMakeLists.txt → camerakit/src/main/CMakeLists.txt
diff --git a/...i16/com/wonderkiln/camerakit/Camera1.java → ...i16/com/wonderkiln/camerakit/Camera1.java b/...i16/com/wonderkiln/camerakit/Camera1.java → ...i16/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/.../wonderkiln/camerakit/ConstantMapper.java → .../wonderkiln/camerakit/ConstantMapper.java b/.../wonderkiln/camerakit/ConstantMapper.java → .../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/...onderkiln/camerakit/ProcessStillTask.java → ...onderkiln/camerakit/ProcessStillTask.java b/...onderkiln/camerakit/ProcessStillTask.java → ...onderkiln/camerakit/ProcessStillTask.java
diff --git a/...i21/com/wonderkiln/camerakit/Camera2.java → ...i21/com/wonderkiln/camerakit/Camera2.java b/...i21/com/wonderkiln/camerakit/Camera2.java → ...i21/com/wonderkiln/camerakit/Camera2.java
diff --git a/.../com/wonderkiln/camerakit/CameraImpl.java → .../com/wonderkiln/camerakit/CameraImpl.java b/.../com/wonderkiln/camerakit/CameraImpl.java → .../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/...onderkiln/camerakit/CameraViewLayout.java → ...onderkiln/camerakit/CameraViewLayout.java b/...onderkiln/camerakit/CameraViewLayout.java → ...onderkiln/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/...com/wonderkiln/camerakit/PreviewImpl.java → ...com/wonderkiln/camerakit/PreviewImpl.java b/...com/wonderkiln/camerakit/PreviewImpl.java → ...com/wonderkiln/camerakit/PreviewImpl.java
diff --git a/...rkiln/camerakit/SurfaceViewContainer.java → ...rkiln/camerakit/SurfaceViewContainer.java b/...rkiln/camerakit/SurfaceViewContainer.java → ...rkiln/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/...derkiln/camerakit/SurfaceViewPreview.java → ...derkiln/camerakit/SurfaceViewPreview.java b/...derkiln/camerakit/SurfaceViewPreview.java → ...derkiln/camerakit/SurfaceViewPreview.java
diff --git a/...-core/src/main/cpp/JniJpegTransformer.cpp → ...rakit/src/main/cpp/JniJpegTransformer.cpp b/...-core/src/main/cpp/JniJpegTransformer.cpp → ...rakit/src/main/cpp/JniJpegTransformer.cpp
diff --git a/...akit-core/src/main/cpp/JniYuvOperator.cpp → camerakit/src/main/cpp/JniYuvOperator.cpp b/...akit-core/src/main/cpp/JniYuvOperator.cpp → camerakit/src/main/cpp/JniYuvOperator.cpp
diff --git a/...t-core/src/main/cpp/libjpeg/include/bmp.h → camerakit/src/main/cpp/libjpeg/include/bmp.h b/...t-core/src/main/cpp/libjpeg/include/bmp.h → camerakit/src/main/cpp/libjpeg/include/bmp.h
diff --git a/...re/src/main/cpp/libjpeg/include/cderror.h → ...it/src/main/cpp/libjpeg/include/cderror.h b/...re/src/main/cpp/libjpeg/include/cderror.h → ...it/src/main/cpp/libjpeg/include/cderror.h
diff --git a/...ore/src/main/cpp/libjpeg/include/cdjpeg.h → ...kit/src/main/cpp/libjpeg/include/cdjpeg.h b/...ore/src/main/cpp/libjpeg/include/cdjpeg.h → ...kit/src/main/cpp/libjpeg/include/cdjpeg.h
diff --git a/...ore/src/main/cpp/libjpeg/include/config.h → ...kit/src/main/cpp/libjpeg/include/config.h b/...ore/src/main/cpp/libjpeg/include/config.h → ...kit/src/main/cpp/libjpeg/include/config.h
diff --git a/...c/main/cpp/libjpeg/include/cpu-features.h → ...c/main/cpp/libjpeg/include/cpu-features.h b/...c/main/cpp/libjpeg/include/cpu-features.h → ...c/main/cpp/libjpeg/include/cpu-features.h
diff --git a/...ore/src/main/cpp/libjpeg/include/jchuff.h → ...kit/src/main/cpp/libjpeg/include/jchuff.h b/...ore/src/main/cpp/libjpeg/include/jchuff.h → ...kit/src/main/cpp/libjpeg/include/jchuff.h
diff --git a/...re/src/main/cpp/libjpeg/include/jconfig.h → ...it/src/main/cpp/libjpeg/include/jconfig.h b/...re/src/main/cpp/libjpeg/include/jconfig.h → ...it/src/main/cpp/libjpeg/include/jconfig.h
diff --git a/...-core/src/main/cpp/libjpeg/include/jdct.h → ...rakit/src/main/cpp/libjpeg/include/jdct.h b/...-core/src/main/cpp/libjpeg/include/jdct.h → ...rakit/src/main/cpp/libjpeg/include/jdct.h
diff --git a/...ore/src/main/cpp/libjpeg/include/jdhuff.h → ...kit/src/main/cpp/libjpeg/include/jdhuff.h b/...ore/src/main/cpp/libjpeg/include/jdhuff.h → ...kit/src/main/cpp/libjpeg/include/jdhuff.h
diff --git a/...ore/src/main/cpp/libjpeg/include/jerror.h → ...kit/src/main/cpp/libjpeg/include/jerror.h b/...ore/src/main/cpp/libjpeg/include/jerror.h → ...kit/src/main/cpp/libjpeg/include/jerror.h
diff --git a/...e/src/main/cpp/libjpeg/include/jinclude.h → ...t/src/main/cpp/libjpeg/include/jinclude.h b/...e/src/main/cpp/libjpeg/include/jinclude.h → ...t/src/main/cpp/libjpeg/include/jinclude.h
diff --git a/...re/src/main/cpp/libjpeg/include/jmemsys.h → ...it/src/main/cpp/libjpeg/include/jmemsys.h b/...re/src/main/cpp/libjpeg/include/jmemsys.h → ...it/src/main/cpp/libjpeg/include/jmemsys.h
diff --git a/...e/src/main/cpp/libjpeg/include/jmorecfg.h → ...t/src/main/cpp/libjpeg/include/jmorecfg.h b/...e/src/main/cpp/libjpeg/include/jmorecfg.h → ...t/src/main/cpp/libjpeg/include/jmorecfg.h
diff --git a/...e/src/main/cpp/libjpeg/include/jpegcomp.h → ...t/src/main/cpp/libjpeg/include/jpegcomp.h b/...e/src/main/cpp/libjpeg/include/jpegcomp.h → ...t/src/main/cpp/libjpeg/include/jpegcomp.h
diff --git a/...re/src/main/cpp/libjpeg/include/jpegint.h → ...it/src/main/cpp/libjpeg/include/jpegint.h b/...re/src/main/cpp/libjpeg/include/jpegint.h → ...it/src/main/cpp/libjpeg/include/jpegint.h
diff --git a/...re/src/main/cpp/libjpeg/include/jpeglib.h → ...it/src/main/cpp/libjpeg/include/jpeglib.h b/...re/src/main/cpp/libjpeg/include/jpeglib.h → ...it/src/main/cpp/libjpeg/include/jpeglib.h
diff --git a/...core/src/main/cpp/libjpeg/include/jsimd.h → ...akit/src/main/cpp/libjpeg/include/jsimd.h b/...core/src/main/cpp/libjpeg/include/jsimd.h → ...akit/src/main/cpp/libjpeg/include/jsimd.h
diff --git a/...c/main/cpp/libjpeg/include/jsimdcfg.inc.h → ...c/main/cpp/libjpeg/include/jsimdcfg.inc.h b/...c/main/cpp/libjpeg/include/jsimdcfg.inc.h → ...c/main/cpp/libjpeg/include/jsimdcfg.inc.h
diff --git a/...e/src/main/cpp/libjpeg/include/jsimddct.h → ...t/src/main/cpp/libjpeg/include/jsimddct.h b/...e/src/main/cpp/libjpeg/include/jsimddct.h → ...t/src/main/cpp/libjpeg/include/jsimddct.h
diff --git a/...e/src/main/cpp/libjpeg/include/jversion.h → ...t/src/main/cpp/libjpeg/include/jversion.h b/...e/src/main/cpp/libjpeg/include/jversion.h → ...t/src/main/cpp/libjpeg/include/jversion.h
diff --git a/...ore/src/main/cpp/libjpeg/include/tjutil.h → ...kit/src/main/cpp/libjpeg/include/tjutil.h b/...ore/src/main/cpp/libjpeg/include/tjutil.h → ...kit/src/main/cpp/libjpeg/include/tjutil.h
diff --git a/...e/src/main/cpp/libjpeg/include/transupp.h → ...t/src/main/cpp/libjpeg/include/transupp.h b/...e/src/main/cpp/libjpeg/include/transupp.h → ...t/src/main/cpp/libjpeg/include/transupp.h
diff --git a/.../src/main/cpp/libjpeg/include/turbojpeg.h → .../src/main/cpp/libjpeg/include/turbojpeg.h b/.../src/main/cpp/libjpeg/include/turbojpeg.h → .../src/main/cpp/libjpeg/include/turbojpeg.h
diff --git a/.../wonderkiln/camerakit/CameraKitError.java → .../wonderkiln/camerakit/CameraKitError.java b/.../wonderkiln/camerakit/CameraKitError.java → .../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/.../wonderkiln/camerakit/CameraKitEvent.java → .../wonderkiln/camerakit/CameraKitEvent.java b/.../wonderkiln/camerakit/CameraKitEvent.java → .../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/...iln/camerakit/CameraKitEventCallback.java → ...iln/camerakit/CameraKitEventCallback.java b/...iln/camerakit/CameraKitEventCallback.java → ...iln/camerakit/CameraKitEventCallback.java
diff --git a/...iln/camerakit/CameraKitEventListener.java → ...iln/camerakit/CameraKitEventListener.java b/...iln/camerakit/CameraKitEventListener.java → ...iln/camerakit/CameraKitEventListener.java
diff --git a/...erakit/CameraKitEventListenerAdapter.java → ...erakit/CameraKitEventListenerAdapter.java b/...erakit/CameraKitEventListenerAdapter.java → ...erakit/CameraKitEventListenerAdapter.java
diff --git a/.../wonderkiln/camerakit/CameraKitImage.java → .../wonderkiln/camerakit/CameraKitImage.java b/.../wonderkiln/camerakit/CameraKitImage.java → .../wonderkiln/camerakit/CameraKitImage.java
diff --git a/.../wonderkiln/camerakit/CameraKitVideo.java → .../wonderkiln/camerakit/CameraKitVideo.java b/.../wonderkiln/camerakit/CameraKitVideo.java → .../wonderkiln/camerakit/CameraKitVideo.java
diff --git a/...wonderkiln/camerakit/EventDispatcher.java → ...wonderkiln/camerakit/EventDispatcher.java b/...wonderkiln/camerakit/EventDispatcher.java → ...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/...onderkiln/camerakit/OnCameraKitEvent.java → ...onderkiln/camerakit/OnCameraKitEvent.java b/...onderkiln/camerakit/OnCameraKitEvent.java → ...onderkiln/camerakit/OnCameraKitEvent.java
diff --git a/...om/wonderkiln/camerakit/CameraConfig.java → ...om/wonderkiln/camerakit/CameraConfig.java b/...om/wonderkiln/camerakit/CameraConfig.java → ...om/wonderkiln/camerakit/CameraConfig.java
diff --git a/...a/com/wonderkiln/camerakit/CameraKit.java → ...a/com/wonderkiln/camerakit/CameraKit.java b/...a/com/wonderkiln/camerakit/CameraKit.java → ...a/com/wonderkiln/camerakit/CameraKit.java
diff --git a/...erkiln/camerakit/CameraKitController.java → ...erkiln/camerakit/CameraKitController.java b/...erkiln/camerakit/CameraKitController.java → ...erkiln/camerakit/CameraKitController.java
diff --git a/...onderkiln/camerakit/CameraKitHandler.java → ...onderkiln/camerakit/CameraKitHandler.java b/...onderkiln/camerakit/CameraKitHandler.java → ...onderkiln/camerakit/CameraKitHandler.java
diff --git a/...onderkiln/camerakit/CameraProperties.java → ...onderkiln/camerakit/CameraProperties.java b/...onderkiln/camerakit/CameraProperties.java → ...onderkiln/camerakit/CameraProperties.java
diff --git a/.../com/wonderkiln/camerakit/CameraView.java → .../com/wonderkiln/camerakit/CameraView.java b/.../com/wonderkiln/camerakit/CameraView.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/...nderkiln/camerakit/FocusMarkerLayout.java → ...nderkiln/camerakit/FocusMarkerLayout.java b/...nderkiln/camerakit/FocusMarkerLayout.java → ...nderkiln/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/...rc/main/jniLibs/arm64-v8a/libjpeg-turbo.a → ...rc/main/jniLibs/arm64-v8a/libjpeg-turbo.a b/...rc/main/jniLibs/arm64-v8a/libjpeg-turbo.a → ...rc/main/jniLibs/arm64-v8a/libjpeg-turbo.a
diff --git a/.../main/jniLibs/armeabi-v7a/libjpeg-turbo.a → .../main/jniLibs/armeabi-v7a/libjpeg-turbo.a b/.../main/jniLibs/armeabi-v7a/libjpeg-turbo.a → .../main/jniLibs/armeabi-v7a/libjpeg-turbo.a
diff --git a/...core/src/main/jniLibs/x86/libjpeg-turbo.a → ...akit/src/main/jniLibs/x86/libjpeg-turbo.a b/...core/src/main/jniLibs/x86/libjpeg-turbo.a → ...akit/src/main/jniLibs/x86/libjpeg-turbo.a
diff --git a/...e/src/main/jniLibs/x86_64/libjpeg-turbo.a → ...t/src/main/jniLibs/x86_64/libjpeg-turbo.a b/...e/src/main/jniLibs/x86_64/libjpeg-turbo.a → ...t/src/main/jniLibs/x86_64/libjpeg-turbo.a
diff --git a/...c/main/res/drawable/focus_marker_fill.xml → ...c/main/res/drawable/focus_marker_fill.xml b/...c/main/res/drawable/focus_marker_fill.xml → ...c/main/res/drawable/focus_marker_fill.xml
diff --git a/...ain/res/drawable/focus_marker_outline.xml → ...ain/res/drawable/focus_marker_outline.xml b/...ain/res/drawable/focus_marker_outline.xml → ...ain/res/drawable/focus_marker_outline.xml
diff --git a/...c/main/res/layout/layout_focus_marker.xml → ...c/main/res/layout/layout_focus_marker.xml b/...c/main/res/layout/layout_focus_marker.xml → ...c/main/res/layout/layout_focus_marker.xml
diff --git a/...core/src/main/res/layout/surface_view.xml → ...akit/src/main/res/layout/surface_view.xml b/...core/src/main/res/layout/surface_view.xml → ...akit/src/main/res/layout/surface_view.xml
diff --git a/...core/src/main/res/layout/texture_view.xml → ...akit/src/main/res/layout/texture_view.xml b/...core/src/main/res/layout/texture_view.xml → ...akit/src/main/res/layout/texture_view.xml
diff --git a/camerakit-core/src/main/res/values/attrs.xml → camerakit/src/main/res/values/attrs.xml b/camerakit-core/src/main/res/values/attrs.xml → camerakit/src/main/res/values/attrs.xml