From f902524c26906e78c3e24a59b249990b7491e850 Mon Sep 17 00:00:00 2001 From: Dylan McIntyre Date: Mon, 7 Jan 2019 20:18:23 -0800 Subject: [PATCH 1/2] consolidate core/vision modules into base module --- camerakit-core/.gitignore | 1 - camerakit-core/build.gradle | 78 ------------------ camerakit-core/proguard-rules.pro | 21 ----- camerakit-core/src/main/AndroidManifest.xml | 21 ----- camerakit-vision/.gitignore | 1 - camerakit-vision/build.gradle | 57 ------------- camerakit-vision/proguard-rules.pro | 21 ----- camerakit-vision/src/main/AndroidManifest.xml | 1 - camerakit/build.gradle | 26 +++++- camerakit/proguard-rules.pro | 25 ------ camerakit/src/main/AndroidManifest.xml | 22 ++++- .../src/main/CMakeLists.txt | 0 .../com/wonderkiln/camerakit/Camera1.java | 0 .../wonderkiln/camerakit/ConstantMapper.java | 0 .../camerakit/ProcessStillTask.java | 0 .../com/wonderkiln/camerakit/Camera2.java | 0 .../com/wonderkiln/camerakit/CameraImpl.java | 0 .../camerakit/CameraViewLayout.java | 0 .../com/wonderkiln/camerakit/PreviewImpl.java | 0 .../camerakit/SurfaceViewContainer.java | 0 .../camerakit/SurfaceViewPreview.java | 0 .../src/main/cpp/JniJpegTransformer.cpp | 0 .../src/main/cpp/JniYuvOperator.cpp | 0 .../src/main/cpp/libjpeg/include/bmp.h | 0 .../src/main/cpp/libjpeg/include/cderror.h | 0 .../src/main/cpp/libjpeg/include/cdjpeg.h | 0 .../src/main/cpp/libjpeg/include/config.h | 0 .../main/cpp/libjpeg/include/cpu-features.h | 0 .../src/main/cpp/libjpeg/include/jchuff.h | 0 .../src/main/cpp/libjpeg/include/jconfig.h | 0 .../src/main/cpp/libjpeg/include/jdct.h | 0 .../src/main/cpp/libjpeg/include/jdhuff.h | 0 .../src/main/cpp/libjpeg/include/jerror.h | 0 .../src/main/cpp/libjpeg/include/jinclude.h | 0 .../src/main/cpp/libjpeg/include/jmemsys.h | 0 .../src/main/cpp/libjpeg/include/jmorecfg.h | 0 .../src/main/cpp/libjpeg/include/jpegcomp.h | 0 .../src/main/cpp/libjpeg/include/jpegint.h | 0 .../src/main/cpp/libjpeg/include/jpeglib.h | 0 .../src/main/cpp/libjpeg/include/jsimd.h | 0 .../main/cpp/libjpeg/include/jsimdcfg.inc.h | 0 .../src/main/cpp/libjpeg/include/jsimddct.h | 0 .../src/main/cpp/libjpeg/include/jversion.h | 0 .../src/main/cpp/libjpeg/include/tjutil.h | 0 .../src/main/cpp/libjpeg/include/transupp.h | 0 .../src/main/cpp/libjpeg/include/turbojpeg.h | 0 .../wonderkiln/camerakit/CameraKitError.java | 0 .../wonderkiln/camerakit/CameraKitEvent.java | 0 .../camerakit/CameraKitEventCallback.java | 0 .../camerakit/CameraKitEventListener.java | 0 .../CameraKitEventListenerAdapter.java | 0 .../wonderkiln/camerakit/CameraKitImage.java | 0 .../wonderkiln/camerakit/CameraKitVideo.java | 0 .../wonderkiln/camerakit/EventDispatcher.java | 0 .../camerakit/OnCameraKitEvent.java | 0 .../wonderkiln/camerakit/CameraConfig.java | 0 .../com/wonderkiln/camerakit/CameraKit.java | 0 .../camerakit/CameraKitController.java | 0 .../camerakit/CameraKitHandler.java | 0 .../camerakit/CameraProperties.java | 0 .../com/wonderkiln/camerakit/CameraView.java | 0 .../camerakit/FocusMarkerLayout.java | 0 .../main/jniLibs/arm64-v8a/libjpeg-turbo.a | Bin .../main/jniLibs/armeabi-v7a/libjpeg-turbo.a | Bin .../src/main/jniLibs/x86/libjpeg-turbo.a | Bin .../src/main/jniLibs/x86_64/libjpeg-turbo.a | Bin .../main/res/drawable/focus_marker_fill.xml | 0 .../res/drawable/focus_marker_outline.xml | 0 .../main/res/layout/layout_focus_marker.xml | 0 .../src/main/res/layout/surface_view.xml | 0 .../src/main/res/layout/texture_view.xml | 0 .../src/main/res/values/attrs.xml | 0 .../wonderkiln/camerakit/CaptureMethod.java | 0 .../com/wonderkiln/camerakit/Facing.java | 0 .../types/com/wonderkiln/camerakit/Flash.java | 0 .../types/com/wonderkiln/camerakit/Focus.java | 0 .../com/wonderkiln/camerakit/Permissions.java | 0 .../wonderkiln/camerakit/VideoQuality.java | 0 .../com/wonderkiln/camerakit/AspectRatio.java | 0 .../wonderkiln/camerakit/BitmapOperator.java | 0 .../camerakit/DisplayOrientationDetector.java | 0 .../wonderkiln/camerakit/JpegTransformer.java | 0 .../wonderkiln/camerakit/PostProcessor.java | 0 .../com/wonderkiln/camerakit/Rotation.java | 0 .../utils/com/wonderkiln/camerakit/Size.java | 0 .../com/wonderkiln/camerakit/YuvOperator.java | 0 .../camerakit/CameraKitTextBlock.java | 0 .../camerakit/CameraKitTextDetect.java | 0 .../camerakit/FrameProcessingRunnable.java | 0 ...ooglePlayServicesUnavailableException.java | 0 .../wonderkiln/camerakit/TextProcessor.java | 0 demo/proguard-rules.pro | 25 ------ .../camerakit/demo/MainActivity.java | 3 +- settings.gradle | 2 +- 94 files changed, 48 insertions(+), 256 deletions(-) delete mode 100644 camerakit-core/.gitignore delete mode 100644 camerakit-core/build.gradle delete mode 100644 camerakit-core/proguard-rules.pro delete mode 100644 camerakit-core/src/main/AndroidManifest.xml delete mode 100644 camerakit-vision/.gitignore delete mode 100644 camerakit-vision/build.gradle delete mode 100644 camerakit-vision/proguard-rules.pro delete mode 100644 camerakit-vision/src/main/AndroidManifest.xml delete mode 100644 camerakit/proguard-rules.pro rename {camerakit-core => camerakit}/src/main/CMakeLists.txt (100%) rename {camerakit-core => camerakit}/src/main/api16/com/wonderkiln/camerakit/Camera1.java (100%) rename {camerakit-core => camerakit}/src/main/api16/com/wonderkiln/camerakit/ConstantMapper.java (100%) rename {camerakit-core => camerakit}/src/main/api16/com/wonderkiln/camerakit/ProcessStillTask.java (100%) rename {camerakit-core => camerakit}/src/main/api21/com/wonderkiln/camerakit/Camera2.java (100%) rename {camerakit-core => camerakit}/src/main/base/com/wonderkiln/camerakit/CameraImpl.java (100%) rename {camerakit-core => camerakit}/src/main/base/com/wonderkiln/camerakit/CameraViewLayout.java (100%) rename {camerakit-core => camerakit}/src/main/base/com/wonderkiln/camerakit/PreviewImpl.java (100%) rename {camerakit-core => camerakit}/src/main/base/com/wonderkiln/camerakit/SurfaceViewContainer.java (100%) rename {camerakit-core => camerakit}/src/main/base/com/wonderkiln/camerakit/SurfaceViewPreview.java (100%) rename {camerakit-core => camerakit}/src/main/cpp/JniJpegTransformer.cpp (100%) rename {camerakit-core => camerakit}/src/main/cpp/JniYuvOperator.cpp (100%) rename {camerakit-core => camerakit}/src/main/cpp/libjpeg/include/bmp.h (100%) rename {camerakit-core => camerakit}/src/main/cpp/libjpeg/include/cderror.h (100%) rename {camerakit-core => camerakit}/src/main/cpp/libjpeg/include/cdjpeg.h (100%) rename {camerakit-core => camerakit}/src/main/cpp/libjpeg/include/config.h (100%) rename {camerakit-core => camerakit}/src/main/cpp/libjpeg/include/cpu-features.h (100%) rename {camerakit-core => camerakit}/src/main/cpp/libjpeg/include/jchuff.h (100%) rename {camerakit-core => camerakit}/src/main/cpp/libjpeg/include/jconfig.h (100%) rename {camerakit-core => camerakit}/src/main/cpp/libjpeg/include/jdct.h (100%) rename {camerakit-core => camerakit}/src/main/cpp/libjpeg/include/jdhuff.h (100%) rename {camerakit-core => camerakit}/src/main/cpp/libjpeg/include/jerror.h (100%) rename {camerakit-core => camerakit}/src/main/cpp/libjpeg/include/jinclude.h (100%) rename {camerakit-core => camerakit}/src/main/cpp/libjpeg/include/jmemsys.h (100%) rename {camerakit-core => camerakit}/src/main/cpp/libjpeg/include/jmorecfg.h (100%) rename {camerakit-core => camerakit}/src/main/cpp/libjpeg/include/jpegcomp.h (100%) rename {camerakit-core => camerakit}/src/main/cpp/libjpeg/include/jpegint.h (100%) rename {camerakit-core => camerakit}/src/main/cpp/libjpeg/include/jpeglib.h (100%) rename {camerakit-core => camerakit}/src/main/cpp/libjpeg/include/jsimd.h (100%) rename {camerakit-core => camerakit}/src/main/cpp/libjpeg/include/jsimdcfg.inc.h (100%) rename {camerakit-core => camerakit}/src/main/cpp/libjpeg/include/jsimddct.h (100%) rename {camerakit-core => camerakit}/src/main/cpp/libjpeg/include/jversion.h (100%) rename {camerakit-core => camerakit}/src/main/cpp/libjpeg/include/tjutil.h (100%) rename {camerakit-core => camerakit}/src/main/cpp/libjpeg/include/transupp.h (100%) rename {camerakit-core => camerakit}/src/main/cpp/libjpeg/include/turbojpeg.h (100%) rename {camerakit-core => camerakit}/src/main/events/com/wonderkiln/camerakit/CameraKitError.java (100%) rename {camerakit-core => camerakit}/src/main/events/com/wonderkiln/camerakit/CameraKitEvent.java (100%) rename {camerakit-core => camerakit}/src/main/events/com/wonderkiln/camerakit/CameraKitEventCallback.java (100%) rename {camerakit-core => camerakit}/src/main/events/com/wonderkiln/camerakit/CameraKitEventListener.java (100%) rename {camerakit-core => camerakit}/src/main/events/com/wonderkiln/camerakit/CameraKitEventListenerAdapter.java (100%) rename {camerakit-core => camerakit}/src/main/events/com/wonderkiln/camerakit/CameraKitImage.java (100%) rename {camerakit-core => camerakit}/src/main/events/com/wonderkiln/camerakit/CameraKitVideo.java (100%) rename {camerakit-core => camerakit}/src/main/events/com/wonderkiln/camerakit/EventDispatcher.java (100%) rename {camerakit-core => camerakit}/src/main/events/com/wonderkiln/camerakit/OnCameraKitEvent.java (100%) rename {camerakit-core => camerakit}/src/main/java/com/wonderkiln/camerakit/CameraConfig.java (100%) rename {camerakit-core => camerakit}/src/main/java/com/wonderkiln/camerakit/CameraKit.java (100%) rename {camerakit-core => camerakit}/src/main/java/com/wonderkiln/camerakit/CameraKitController.java (100%) rename {camerakit-core => camerakit}/src/main/java/com/wonderkiln/camerakit/CameraKitHandler.java (100%) rename {camerakit-core => camerakit}/src/main/java/com/wonderkiln/camerakit/CameraProperties.java (100%) rename {camerakit-core => camerakit}/src/main/java/com/wonderkiln/camerakit/CameraView.java (100%) rename {camerakit-core => camerakit}/src/main/java/com/wonderkiln/camerakit/FocusMarkerLayout.java (100%) rename {camerakit-core => camerakit}/src/main/jniLibs/arm64-v8a/libjpeg-turbo.a (100%) rename {camerakit-core => camerakit}/src/main/jniLibs/armeabi-v7a/libjpeg-turbo.a (100%) rename {camerakit-core => camerakit}/src/main/jniLibs/x86/libjpeg-turbo.a (100%) rename {camerakit-core => camerakit}/src/main/jniLibs/x86_64/libjpeg-turbo.a (100%) rename {camerakit-core => camerakit}/src/main/res/drawable/focus_marker_fill.xml (100%) rename {camerakit-core => camerakit}/src/main/res/drawable/focus_marker_outline.xml (100%) rename {camerakit-core => camerakit}/src/main/res/layout/layout_focus_marker.xml (100%) rename {camerakit-core => camerakit}/src/main/res/layout/surface_view.xml (100%) rename {camerakit-core => camerakit}/src/main/res/layout/texture_view.xml (100%) rename {camerakit-core => camerakit}/src/main/res/values/attrs.xml (100%) rename {camerakit-core => camerakit}/src/main/types/com/wonderkiln/camerakit/CaptureMethod.java (100%) rename {camerakit-core => camerakit}/src/main/types/com/wonderkiln/camerakit/Facing.java (100%) rename {camerakit-core => camerakit}/src/main/types/com/wonderkiln/camerakit/Flash.java (100%) rename {camerakit-core => camerakit}/src/main/types/com/wonderkiln/camerakit/Focus.java (100%) rename {camerakit-core => camerakit}/src/main/types/com/wonderkiln/camerakit/Permissions.java (100%) rename {camerakit-core => camerakit}/src/main/types/com/wonderkiln/camerakit/VideoQuality.java (100%) rename {camerakit-core => camerakit}/src/main/utils/com/wonderkiln/camerakit/AspectRatio.java (100%) rename {camerakit-core => camerakit}/src/main/utils/com/wonderkiln/camerakit/BitmapOperator.java (100%) rename {camerakit-core => camerakit}/src/main/utils/com/wonderkiln/camerakit/DisplayOrientationDetector.java (100%) rename {camerakit-core => camerakit}/src/main/utils/com/wonderkiln/camerakit/JpegTransformer.java (100%) rename {camerakit-core => camerakit}/src/main/utils/com/wonderkiln/camerakit/PostProcessor.java (100%) rename {camerakit-core => camerakit}/src/main/utils/com/wonderkiln/camerakit/Rotation.java (100%) rename {camerakit-core => camerakit}/src/main/utils/com/wonderkiln/camerakit/Size.java (100%) rename {camerakit-core => camerakit}/src/main/utils/com/wonderkiln/camerakit/YuvOperator.java (100%) rename {camerakit-core => camerakit}/src/main/vision/com/wonderkiln/camerakit/CameraKitTextBlock.java (100%) rename {camerakit-core => camerakit}/src/main/vision/com/wonderkiln/camerakit/CameraKitTextDetect.java (100%) rename {camerakit-core => camerakit}/src/main/vision/com/wonderkiln/camerakit/FrameProcessingRunnable.java (100%) rename {camerakit-core => camerakit}/src/main/vision/com/wonderkiln/camerakit/GooglePlayServicesUnavailableException.java (100%) rename {camerakit-core => camerakit}/src/main/vision/com/wonderkiln/camerakit/TextProcessor.java (100%) delete mode 100644 demo/proguard-rules.pro diff --git a/camerakit-core/.gitignore b/camerakit-core/.gitignore deleted file mode 100644 index 796b96d1c4..0000000000 --- a/camerakit-core/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/camerakit-core/build.gradle b/camerakit-core/build.gradle deleted file mode 100644 index 9d904732ed..0000000000 --- a/camerakit-core/build.gradle +++ /dev/null @@ -1,78 +0,0 @@ -apply plugin: 'com.android.library' - -android { - compileSdkVersion rootProject.ext.compileSdkVersion - buildToolsVersion rootProject.ext.buildToolsVersion - defaultConfig { - minSdkVersion rootProject.ext.minSdkVersion - targetSdkVersion rootProject.ext.targetSdkVersion - versionName rootProject.ext.versionName - } - lintOptions { - abortOnError false - } - buildTypes { - release { - minifyEnabled false - 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 { -// arguments "-DANDROID_STL=c++_shared" - path 'src/main/CMakeLists.txt' - } - } -} - -dependencies { - 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 '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' -} - -group = 'com.wonderkiln' -version = rootProject.ext.versionName - -install { - repositories.mavenInstaller { - pom.project { - name 'CameraKit-Core-Android' - packaging 'aar' - } - } -} - -bintray { - user = rootProject.ext.bintrayUser - key = rootProject.ext.bintrayKey - override = true - publish = true - configurations = ['archives'] - pkg { - repo = 'snapshots' - name = 'CameraKit-Core-Android' - userOrg = 'wonderkiln' - vcsUrl = 'https://github.com/wonderkiln/CameraKit-Android.git' - version { - name = rootProject.ext.versionName - vcsTag = rootProject.ext.versionName - released = new Date() - } - } -} diff --git a/camerakit-core/proguard-rules.pro b/camerakit-core/proguard-rules.pro deleted file mode 100644 index f1b424510d..0000000000 --- a/camerakit-core/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/camerakit-core/src/main/AndroidManifest.xml b/camerakit-core/src/main/AndroidManifest.xml deleted file mode 100644 index f908311750..0000000000 --- a/camerakit-core/src/main/AndroidManifest.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/camerakit-vision/.gitignore b/camerakit-vision/.gitignore deleted file mode 100644 index 796b96d1c4..0000000000 --- a/camerakit-vision/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/camerakit-vision/build.gradle b/camerakit-vision/build.gradle deleted file mode 100644 index d4ea0fcba2..0000000000 --- a/camerakit-vision/build.gradle +++ /dev/null @@ -1,57 +0,0 @@ -apply plugin: 'com.android.library' - -android { - compileSdkVersion rootProject.ext.compileSdkVersion - buildToolsVersion rootProject.ext.buildToolsVersion - defaultConfig { - minSdkVersion rootProject.ext.minSdkVersion - targetSdkVersion rootProject.ext.targetSdkVersion - versionName rootProject.ext.versionName - } - lintOptions { - abortOnError false - } - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } - } -} - -dependencies { - api project(':camerakit-core') - implementation 'com.google.android.gms:play-services-vision:17.0.2' -} - -group = 'com.wonderkiln' -version = rootProject.ext.versionName - -install { - repositories.mavenInstaller { - pom.project { - name 'CameraKit-Vision-Android' - packaging 'aar' - } - } -} - -bintray { - user = rootProject.ext.bintrayUser - key = rootProject.ext.bintrayKey - override = true - publish = true - configurations = ['archives'] - pkg { - repo = 'snapshots' - name = 'CameraKit-Vision-Android' - userOrg = 'wonderkiln' - vcsUrl = 'https://github.com/wonderkiln/CameraKit-Android.git' - version { - name = rootProject.ext.versionName - vcsTag = rootProject.ext.versionName - released = new Date() - } - } -} - diff --git a/camerakit-vision/proguard-rules.pro b/camerakit-vision/proguard-rules.pro deleted file mode 100644 index f1b424510d..0000000000 --- a/camerakit-vision/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/camerakit-vision/src/main/AndroidManifest.xml b/camerakit-vision/src/main/AndroidManifest.xml deleted file mode 100644 index de49132abf..0000000000 --- a/camerakit-vision/src/main/AndroidManifest.xml +++ /dev/null @@ -1 +0,0 @@ - diff --git a/camerakit/build.gradle b/camerakit/build.gradle index 4cd72a099e..79fd80ef21 100644 --- a/camerakit/build.gradle +++ b/camerakit/build.gradle @@ -17,11 +17,33 @@ 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 { +// arguments "-DANDROID_STL=c++_shared" + 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 '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' } group = 'com.wonderkiln' diff --git a/camerakit/proguard-rules.pro b/camerakit/proguard-rules.pro deleted file mode 100644 index 0b5cf9d3ba..0000000000 --- a/camerakit/proguard-rules.pro +++ /dev/null @@ -1,25 +0,0 @@ -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in /Users/dylanmcintyre/Library/Android/sdk/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the proguardFiles -# directive in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/camerakit/src/main/AndroidManifest.xml b/camerakit/src/main/AndroidManifest.xml index 7999205faa..f908311750 100644 --- a/camerakit/src/main/AndroidManifest.xml +++ b/camerakit/src/main/AndroidManifest.xml @@ -1 +1,21 @@ - \ No newline at end of file + + + + + + + + + + + + + + \ No newline at end of file diff --git a/camerakit-core/src/main/CMakeLists.txt b/camerakit/src/main/CMakeLists.txt similarity index 100% rename from camerakit-core/src/main/CMakeLists.txt rename to camerakit/src/main/CMakeLists.txt diff --git a/camerakit-core/src/main/api16/com/wonderkiln/camerakit/Camera1.java b/camerakit/src/main/api16/com/wonderkiln/camerakit/Camera1.java similarity index 100% rename from camerakit-core/src/main/api16/com/wonderkiln/camerakit/Camera1.java rename to camerakit/src/main/api16/com/wonderkiln/camerakit/Camera1.java diff --git a/camerakit-core/src/main/api16/com/wonderkiln/camerakit/ConstantMapper.java b/camerakit/src/main/api16/com/wonderkiln/camerakit/ConstantMapper.java similarity index 100% rename from camerakit-core/src/main/api16/com/wonderkiln/camerakit/ConstantMapper.java rename to camerakit/src/main/api16/com/wonderkiln/camerakit/ConstantMapper.java diff --git a/camerakit-core/src/main/api16/com/wonderkiln/camerakit/ProcessStillTask.java b/camerakit/src/main/api16/com/wonderkiln/camerakit/ProcessStillTask.java similarity index 100% rename from camerakit-core/src/main/api16/com/wonderkiln/camerakit/ProcessStillTask.java rename to camerakit/src/main/api16/com/wonderkiln/camerakit/ProcessStillTask.java diff --git a/camerakit-core/src/main/api21/com/wonderkiln/camerakit/Camera2.java b/camerakit/src/main/api21/com/wonderkiln/camerakit/Camera2.java similarity index 100% rename from camerakit-core/src/main/api21/com/wonderkiln/camerakit/Camera2.java rename to camerakit/src/main/api21/com/wonderkiln/camerakit/Camera2.java diff --git a/camerakit-core/src/main/base/com/wonderkiln/camerakit/CameraImpl.java b/camerakit/src/main/base/com/wonderkiln/camerakit/CameraImpl.java similarity index 100% rename from camerakit-core/src/main/base/com/wonderkiln/camerakit/CameraImpl.java rename to camerakit/src/main/base/com/wonderkiln/camerakit/CameraImpl.java diff --git a/camerakit-core/src/main/base/com/wonderkiln/camerakit/CameraViewLayout.java b/camerakit/src/main/base/com/wonderkiln/camerakit/CameraViewLayout.java similarity index 100% rename from camerakit-core/src/main/base/com/wonderkiln/camerakit/CameraViewLayout.java rename to camerakit/src/main/base/com/wonderkiln/camerakit/CameraViewLayout.java diff --git a/camerakit-core/src/main/base/com/wonderkiln/camerakit/PreviewImpl.java b/camerakit/src/main/base/com/wonderkiln/camerakit/PreviewImpl.java similarity index 100% rename from camerakit-core/src/main/base/com/wonderkiln/camerakit/PreviewImpl.java rename to camerakit/src/main/base/com/wonderkiln/camerakit/PreviewImpl.java diff --git a/camerakit-core/src/main/base/com/wonderkiln/camerakit/SurfaceViewContainer.java b/camerakit/src/main/base/com/wonderkiln/camerakit/SurfaceViewContainer.java similarity index 100% rename from camerakit-core/src/main/base/com/wonderkiln/camerakit/SurfaceViewContainer.java rename to camerakit/src/main/base/com/wonderkiln/camerakit/SurfaceViewContainer.java diff --git a/camerakit-core/src/main/base/com/wonderkiln/camerakit/SurfaceViewPreview.java b/camerakit/src/main/base/com/wonderkiln/camerakit/SurfaceViewPreview.java similarity index 100% rename from camerakit-core/src/main/base/com/wonderkiln/camerakit/SurfaceViewPreview.java rename to camerakit/src/main/base/com/wonderkiln/camerakit/SurfaceViewPreview.java diff --git a/camerakit-core/src/main/cpp/JniJpegTransformer.cpp b/camerakit/src/main/cpp/JniJpegTransformer.cpp similarity index 100% rename from camerakit-core/src/main/cpp/JniJpegTransformer.cpp rename to camerakit/src/main/cpp/JniJpegTransformer.cpp diff --git a/camerakit-core/src/main/cpp/JniYuvOperator.cpp b/camerakit/src/main/cpp/JniYuvOperator.cpp similarity index 100% rename from camerakit-core/src/main/cpp/JniYuvOperator.cpp rename to camerakit/src/main/cpp/JniYuvOperator.cpp diff --git a/camerakit-core/src/main/cpp/libjpeg/include/bmp.h b/camerakit/src/main/cpp/libjpeg/include/bmp.h similarity index 100% rename from camerakit-core/src/main/cpp/libjpeg/include/bmp.h rename to camerakit/src/main/cpp/libjpeg/include/bmp.h diff --git a/camerakit-core/src/main/cpp/libjpeg/include/cderror.h b/camerakit/src/main/cpp/libjpeg/include/cderror.h similarity index 100% rename from camerakit-core/src/main/cpp/libjpeg/include/cderror.h rename to camerakit/src/main/cpp/libjpeg/include/cderror.h diff --git a/camerakit-core/src/main/cpp/libjpeg/include/cdjpeg.h b/camerakit/src/main/cpp/libjpeg/include/cdjpeg.h similarity index 100% rename from camerakit-core/src/main/cpp/libjpeg/include/cdjpeg.h rename to camerakit/src/main/cpp/libjpeg/include/cdjpeg.h diff --git a/camerakit-core/src/main/cpp/libjpeg/include/config.h b/camerakit/src/main/cpp/libjpeg/include/config.h similarity index 100% rename from camerakit-core/src/main/cpp/libjpeg/include/config.h rename to camerakit/src/main/cpp/libjpeg/include/config.h diff --git a/camerakit-core/src/main/cpp/libjpeg/include/cpu-features.h b/camerakit/src/main/cpp/libjpeg/include/cpu-features.h similarity index 100% rename from camerakit-core/src/main/cpp/libjpeg/include/cpu-features.h rename to camerakit/src/main/cpp/libjpeg/include/cpu-features.h diff --git a/camerakit-core/src/main/cpp/libjpeg/include/jchuff.h b/camerakit/src/main/cpp/libjpeg/include/jchuff.h similarity index 100% rename from camerakit-core/src/main/cpp/libjpeg/include/jchuff.h rename to camerakit/src/main/cpp/libjpeg/include/jchuff.h diff --git a/camerakit-core/src/main/cpp/libjpeg/include/jconfig.h b/camerakit/src/main/cpp/libjpeg/include/jconfig.h similarity index 100% rename from camerakit-core/src/main/cpp/libjpeg/include/jconfig.h rename to camerakit/src/main/cpp/libjpeg/include/jconfig.h diff --git a/camerakit-core/src/main/cpp/libjpeg/include/jdct.h b/camerakit/src/main/cpp/libjpeg/include/jdct.h similarity index 100% rename from camerakit-core/src/main/cpp/libjpeg/include/jdct.h rename to camerakit/src/main/cpp/libjpeg/include/jdct.h diff --git a/camerakit-core/src/main/cpp/libjpeg/include/jdhuff.h b/camerakit/src/main/cpp/libjpeg/include/jdhuff.h similarity index 100% rename from camerakit-core/src/main/cpp/libjpeg/include/jdhuff.h rename to camerakit/src/main/cpp/libjpeg/include/jdhuff.h diff --git a/camerakit-core/src/main/cpp/libjpeg/include/jerror.h b/camerakit/src/main/cpp/libjpeg/include/jerror.h similarity index 100% rename from camerakit-core/src/main/cpp/libjpeg/include/jerror.h rename to camerakit/src/main/cpp/libjpeg/include/jerror.h diff --git a/camerakit-core/src/main/cpp/libjpeg/include/jinclude.h b/camerakit/src/main/cpp/libjpeg/include/jinclude.h similarity index 100% rename from camerakit-core/src/main/cpp/libjpeg/include/jinclude.h rename to camerakit/src/main/cpp/libjpeg/include/jinclude.h diff --git a/camerakit-core/src/main/cpp/libjpeg/include/jmemsys.h b/camerakit/src/main/cpp/libjpeg/include/jmemsys.h similarity index 100% rename from camerakit-core/src/main/cpp/libjpeg/include/jmemsys.h rename to camerakit/src/main/cpp/libjpeg/include/jmemsys.h diff --git a/camerakit-core/src/main/cpp/libjpeg/include/jmorecfg.h b/camerakit/src/main/cpp/libjpeg/include/jmorecfg.h similarity index 100% rename from camerakit-core/src/main/cpp/libjpeg/include/jmorecfg.h rename to camerakit/src/main/cpp/libjpeg/include/jmorecfg.h diff --git a/camerakit-core/src/main/cpp/libjpeg/include/jpegcomp.h b/camerakit/src/main/cpp/libjpeg/include/jpegcomp.h similarity index 100% rename from camerakit-core/src/main/cpp/libjpeg/include/jpegcomp.h rename to camerakit/src/main/cpp/libjpeg/include/jpegcomp.h diff --git a/camerakit-core/src/main/cpp/libjpeg/include/jpegint.h b/camerakit/src/main/cpp/libjpeg/include/jpegint.h similarity index 100% rename from camerakit-core/src/main/cpp/libjpeg/include/jpegint.h rename to camerakit/src/main/cpp/libjpeg/include/jpegint.h diff --git a/camerakit-core/src/main/cpp/libjpeg/include/jpeglib.h b/camerakit/src/main/cpp/libjpeg/include/jpeglib.h similarity index 100% rename from camerakit-core/src/main/cpp/libjpeg/include/jpeglib.h rename to camerakit/src/main/cpp/libjpeg/include/jpeglib.h diff --git a/camerakit-core/src/main/cpp/libjpeg/include/jsimd.h b/camerakit/src/main/cpp/libjpeg/include/jsimd.h similarity index 100% rename from camerakit-core/src/main/cpp/libjpeg/include/jsimd.h rename to camerakit/src/main/cpp/libjpeg/include/jsimd.h diff --git a/camerakit-core/src/main/cpp/libjpeg/include/jsimdcfg.inc.h b/camerakit/src/main/cpp/libjpeg/include/jsimdcfg.inc.h similarity index 100% rename from camerakit-core/src/main/cpp/libjpeg/include/jsimdcfg.inc.h rename to camerakit/src/main/cpp/libjpeg/include/jsimdcfg.inc.h diff --git a/camerakit-core/src/main/cpp/libjpeg/include/jsimddct.h b/camerakit/src/main/cpp/libjpeg/include/jsimddct.h similarity index 100% rename from camerakit-core/src/main/cpp/libjpeg/include/jsimddct.h rename to camerakit/src/main/cpp/libjpeg/include/jsimddct.h diff --git a/camerakit-core/src/main/cpp/libjpeg/include/jversion.h b/camerakit/src/main/cpp/libjpeg/include/jversion.h similarity index 100% rename from camerakit-core/src/main/cpp/libjpeg/include/jversion.h rename to camerakit/src/main/cpp/libjpeg/include/jversion.h diff --git a/camerakit-core/src/main/cpp/libjpeg/include/tjutil.h b/camerakit/src/main/cpp/libjpeg/include/tjutil.h similarity index 100% rename from camerakit-core/src/main/cpp/libjpeg/include/tjutil.h rename to camerakit/src/main/cpp/libjpeg/include/tjutil.h diff --git a/camerakit-core/src/main/cpp/libjpeg/include/transupp.h b/camerakit/src/main/cpp/libjpeg/include/transupp.h similarity index 100% rename from camerakit-core/src/main/cpp/libjpeg/include/transupp.h rename to camerakit/src/main/cpp/libjpeg/include/transupp.h diff --git a/camerakit-core/src/main/cpp/libjpeg/include/turbojpeg.h b/camerakit/src/main/cpp/libjpeg/include/turbojpeg.h similarity index 100% rename from camerakit-core/src/main/cpp/libjpeg/include/turbojpeg.h rename to camerakit/src/main/cpp/libjpeg/include/turbojpeg.h diff --git a/camerakit-core/src/main/events/com/wonderkiln/camerakit/CameraKitError.java b/camerakit/src/main/events/com/wonderkiln/camerakit/CameraKitError.java similarity index 100% rename from camerakit-core/src/main/events/com/wonderkiln/camerakit/CameraKitError.java rename to camerakit/src/main/events/com/wonderkiln/camerakit/CameraKitError.java diff --git a/camerakit-core/src/main/events/com/wonderkiln/camerakit/CameraKitEvent.java b/camerakit/src/main/events/com/wonderkiln/camerakit/CameraKitEvent.java similarity index 100% rename from camerakit-core/src/main/events/com/wonderkiln/camerakit/CameraKitEvent.java rename to camerakit/src/main/events/com/wonderkiln/camerakit/CameraKitEvent.java diff --git a/camerakit-core/src/main/events/com/wonderkiln/camerakit/CameraKitEventCallback.java b/camerakit/src/main/events/com/wonderkiln/camerakit/CameraKitEventCallback.java similarity index 100% rename from camerakit-core/src/main/events/com/wonderkiln/camerakit/CameraKitEventCallback.java rename to camerakit/src/main/events/com/wonderkiln/camerakit/CameraKitEventCallback.java diff --git a/camerakit-core/src/main/events/com/wonderkiln/camerakit/CameraKitEventListener.java b/camerakit/src/main/events/com/wonderkiln/camerakit/CameraKitEventListener.java similarity index 100% rename from camerakit-core/src/main/events/com/wonderkiln/camerakit/CameraKitEventListener.java rename to camerakit/src/main/events/com/wonderkiln/camerakit/CameraKitEventListener.java diff --git a/camerakit-core/src/main/events/com/wonderkiln/camerakit/CameraKitEventListenerAdapter.java b/camerakit/src/main/events/com/wonderkiln/camerakit/CameraKitEventListenerAdapter.java similarity index 100% rename from camerakit-core/src/main/events/com/wonderkiln/camerakit/CameraKitEventListenerAdapter.java rename to camerakit/src/main/events/com/wonderkiln/camerakit/CameraKitEventListenerAdapter.java diff --git a/camerakit-core/src/main/events/com/wonderkiln/camerakit/CameraKitImage.java b/camerakit/src/main/events/com/wonderkiln/camerakit/CameraKitImage.java similarity index 100% rename from camerakit-core/src/main/events/com/wonderkiln/camerakit/CameraKitImage.java rename to camerakit/src/main/events/com/wonderkiln/camerakit/CameraKitImage.java diff --git a/camerakit-core/src/main/events/com/wonderkiln/camerakit/CameraKitVideo.java b/camerakit/src/main/events/com/wonderkiln/camerakit/CameraKitVideo.java similarity index 100% rename from camerakit-core/src/main/events/com/wonderkiln/camerakit/CameraKitVideo.java rename to camerakit/src/main/events/com/wonderkiln/camerakit/CameraKitVideo.java diff --git a/camerakit-core/src/main/events/com/wonderkiln/camerakit/EventDispatcher.java b/camerakit/src/main/events/com/wonderkiln/camerakit/EventDispatcher.java similarity index 100% rename from camerakit-core/src/main/events/com/wonderkiln/camerakit/EventDispatcher.java rename to camerakit/src/main/events/com/wonderkiln/camerakit/EventDispatcher.java diff --git a/camerakit-core/src/main/events/com/wonderkiln/camerakit/OnCameraKitEvent.java b/camerakit/src/main/events/com/wonderkiln/camerakit/OnCameraKitEvent.java similarity index 100% rename from camerakit-core/src/main/events/com/wonderkiln/camerakit/OnCameraKitEvent.java rename to camerakit/src/main/events/com/wonderkiln/camerakit/OnCameraKitEvent.java diff --git a/camerakit-core/src/main/java/com/wonderkiln/camerakit/CameraConfig.java b/camerakit/src/main/java/com/wonderkiln/camerakit/CameraConfig.java similarity index 100% rename from camerakit-core/src/main/java/com/wonderkiln/camerakit/CameraConfig.java rename to camerakit/src/main/java/com/wonderkiln/camerakit/CameraConfig.java diff --git a/camerakit-core/src/main/java/com/wonderkiln/camerakit/CameraKit.java b/camerakit/src/main/java/com/wonderkiln/camerakit/CameraKit.java similarity index 100% rename from camerakit-core/src/main/java/com/wonderkiln/camerakit/CameraKit.java rename to camerakit/src/main/java/com/wonderkiln/camerakit/CameraKit.java diff --git a/camerakit-core/src/main/java/com/wonderkiln/camerakit/CameraKitController.java b/camerakit/src/main/java/com/wonderkiln/camerakit/CameraKitController.java similarity index 100% rename from camerakit-core/src/main/java/com/wonderkiln/camerakit/CameraKitController.java rename to camerakit/src/main/java/com/wonderkiln/camerakit/CameraKitController.java diff --git a/camerakit-core/src/main/java/com/wonderkiln/camerakit/CameraKitHandler.java b/camerakit/src/main/java/com/wonderkiln/camerakit/CameraKitHandler.java similarity index 100% rename from camerakit-core/src/main/java/com/wonderkiln/camerakit/CameraKitHandler.java rename to camerakit/src/main/java/com/wonderkiln/camerakit/CameraKitHandler.java diff --git a/camerakit-core/src/main/java/com/wonderkiln/camerakit/CameraProperties.java b/camerakit/src/main/java/com/wonderkiln/camerakit/CameraProperties.java similarity index 100% rename from camerakit-core/src/main/java/com/wonderkiln/camerakit/CameraProperties.java rename to camerakit/src/main/java/com/wonderkiln/camerakit/CameraProperties.java diff --git a/camerakit-core/src/main/java/com/wonderkiln/camerakit/CameraView.java b/camerakit/src/main/java/com/wonderkiln/camerakit/CameraView.java similarity index 100% rename from camerakit-core/src/main/java/com/wonderkiln/camerakit/CameraView.java rename to camerakit/src/main/java/com/wonderkiln/camerakit/CameraView.java diff --git a/camerakit-core/src/main/java/com/wonderkiln/camerakit/FocusMarkerLayout.java b/camerakit/src/main/java/com/wonderkiln/camerakit/FocusMarkerLayout.java similarity index 100% rename from camerakit-core/src/main/java/com/wonderkiln/camerakit/FocusMarkerLayout.java rename to camerakit/src/main/java/com/wonderkiln/camerakit/FocusMarkerLayout.java diff --git a/camerakit-core/src/main/jniLibs/arm64-v8a/libjpeg-turbo.a b/camerakit/src/main/jniLibs/arm64-v8a/libjpeg-turbo.a similarity index 100% rename from camerakit-core/src/main/jniLibs/arm64-v8a/libjpeg-turbo.a rename to camerakit/src/main/jniLibs/arm64-v8a/libjpeg-turbo.a diff --git a/camerakit-core/src/main/jniLibs/armeabi-v7a/libjpeg-turbo.a b/camerakit/src/main/jniLibs/armeabi-v7a/libjpeg-turbo.a similarity index 100% rename from camerakit-core/src/main/jniLibs/armeabi-v7a/libjpeg-turbo.a rename to camerakit/src/main/jniLibs/armeabi-v7a/libjpeg-turbo.a diff --git a/camerakit-core/src/main/jniLibs/x86/libjpeg-turbo.a b/camerakit/src/main/jniLibs/x86/libjpeg-turbo.a similarity index 100% rename from camerakit-core/src/main/jniLibs/x86/libjpeg-turbo.a rename to camerakit/src/main/jniLibs/x86/libjpeg-turbo.a diff --git a/camerakit-core/src/main/jniLibs/x86_64/libjpeg-turbo.a b/camerakit/src/main/jniLibs/x86_64/libjpeg-turbo.a similarity index 100% rename from camerakit-core/src/main/jniLibs/x86_64/libjpeg-turbo.a rename to camerakit/src/main/jniLibs/x86_64/libjpeg-turbo.a diff --git a/camerakit-core/src/main/res/drawable/focus_marker_fill.xml b/camerakit/src/main/res/drawable/focus_marker_fill.xml similarity index 100% rename from camerakit-core/src/main/res/drawable/focus_marker_fill.xml rename to camerakit/src/main/res/drawable/focus_marker_fill.xml diff --git a/camerakit-core/src/main/res/drawable/focus_marker_outline.xml b/camerakit/src/main/res/drawable/focus_marker_outline.xml similarity index 100% rename from camerakit-core/src/main/res/drawable/focus_marker_outline.xml rename to camerakit/src/main/res/drawable/focus_marker_outline.xml diff --git a/camerakit-core/src/main/res/layout/layout_focus_marker.xml b/camerakit/src/main/res/layout/layout_focus_marker.xml similarity index 100% rename from camerakit-core/src/main/res/layout/layout_focus_marker.xml rename to camerakit/src/main/res/layout/layout_focus_marker.xml diff --git a/camerakit-core/src/main/res/layout/surface_view.xml b/camerakit/src/main/res/layout/surface_view.xml similarity index 100% rename from camerakit-core/src/main/res/layout/surface_view.xml rename to camerakit/src/main/res/layout/surface_view.xml diff --git a/camerakit-core/src/main/res/layout/texture_view.xml b/camerakit/src/main/res/layout/texture_view.xml similarity index 100% rename from camerakit-core/src/main/res/layout/texture_view.xml rename to camerakit/src/main/res/layout/texture_view.xml diff --git a/camerakit-core/src/main/res/values/attrs.xml b/camerakit/src/main/res/values/attrs.xml similarity index 100% rename from camerakit-core/src/main/res/values/attrs.xml rename to camerakit/src/main/res/values/attrs.xml diff --git a/camerakit-core/src/main/types/com/wonderkiln/camerakit/CaptureMethod.java b/camerakit/src/main/types/com/wonderkiln/camerakit/CaptureMethod.java similarity index 100% rename from camerakit-core/src/main/types/com/wonderkiln/camerakit/CaptureMethod.java rename to camerakit/src/main/types/com/wonderkiln/camerakit/CaptureMethod.java diff --git a/camerakit-core/src/main/types/com/wonderkiln/camerakit/Facing.java b/camerakit/src/main/types/com/wonderkiln/camerakit/Facing.java similarity index 100% rename from camerakit-core/src/main/types/com/wonderkiln/camerakit/Facing.java rename to camerakit/src/main/types/com/wonderkiln/camerakit/Facing.java diff --git a/camerakit-core/src/main/types/com/wonderkiln/camerakit/Flash.java b/camerakit/src/main/types/com/wonderkiln/camerakit/Flash.java similarity index 100% rename from camerakit-core/src/main/types/com/wonderkiln/camerakit/Flash.java rename to camerakit/src/main/types/com/wonderkiln/camerakit/Flash.java diff --git a/camerakit-core/src/main/types/com/wonderkiln/camerakit/Focus.java b/camerakit/src/main/types/com/wonderkiln/camerakit/Focus.java similarity index 100% rename from camerakit-core/src/main/types/com/wonderkiln/camerakit/Focus.java rename to camerakit/src/main/types/com/wonderkiln/camerakit/Focus.java diff --git a/camerakit-core/src/main/types/com/wonderkiln/camerakit/Permissions.java b/camerakit/src/main/types/com/wonderkiln/camerakit/Permissions.java similarity index 100% rename from camerakit-core/src/main/types/com/wonderkiln/camerakit/Permissions.java rename to camerakit/src/main/types/com/wonderkiln/camerakit/Permissions.java diff --git a/camerakit-core/src/main/types/com/wonderkiln/camerakit/VideoQuality.java b/camerakit/src/main/types/com/wonderkiln/camerakit/VideoQuality.java similarity index 100% rename from camerakit-core/src/main/types/com/wonderkiln/camerakit/VideoQuality.java rename to camerakit/src/main/types/com/wonderkiln/camerakit/VideoQuality.java diff --git a/camerakit-core/src/main/utils/com/wonderkiln/camerakit/AspectRatio.java b/camerakit/src/main/utils/com/wonderkiln/camerakit/AspectRatio.java similarity index 100% rename from camerakit-core/src/main/utils/com/wonderkiln/camerakit/AspectRatio.java rename to camerakit/src/main/utils/com/wonderkiln/camerakit/AspectRatio.java diff --git a/camerakit-core/src/main/utils/com/wonderkiln/camerakit/BitmapOperator.java b/camerakit/src/main/utils/com/wonderkiln/camerakit/BitmapOperator.java similarity index 100% rename from camerakit-core/src/main/utils/com/wonderkiln/camerakit/BitmapOperator.java rename to camerakit/src/main/utils/com/wonderkiln/camerakit/BitmapOperator.java diff --git a/camerakit-core/src/main/utils/com/wonderkiln/camerakit/DisplayOrientationDetector.java b/camerakit/src/main/utils/com/wonderkiln/camerakit/DisplayOrientationDetector.java similarity index 100% rename from camerakit-core/src/main/utils/com/wonderkiln/camerakit/DisplayOrientationDetector.java rename to camerakit/src/main/utils/com/wonderkiln/camerakit/DisplayOrientationDetector.java diff --git a/camerakit-core/src/main/utils/com/wonderkiln/camerakit/JpegTransformer.java b/camerakit/src/main/utils/com/wonderkiln/camerakit/JpegTransformer.java similarity index 100% rename from camerakit-core/src/main/utils/com/wonderkiln/camerakit/JpegTransformer.java rename to camerakit/src/main/utils/com/wonderkiln/camerakit/JpegTransformer.java diff --git a/camerakit-core/src/main/utils/com/wonderkiln/camerakit/PostProcessor.java b/camerakit/src/main/utils/com/wonderkiln/camerakit/PostProcessor.java similarity index 100% rename from camerakit-core/src/main/utils/com/wonderkiln/camerakit/PostProcessor.java rename to camerakit/src/main/utils/com/wonderkiln/camerakit/PostProcessor.java diff --git a/camerakit-core/src/main/utils/com/wonderkiln/camerakit/Rotation.java b/camerakit/src/main/utils/com/wonderkiln/camerakit/Rotation.java similarity index 100% rename from camerakit-core/src/main/utils/com/wonderkiln/camerakit/Rotation.java rename to camerakit/src/main/utils/com/wonderkiln/camerakit/Rotation.java diff --git a/camerakit-core/src/main/utils/com/wonderkiln/camerakit/Size.java b/camerakit/src/main/utils/com/wonderkiln/camerakit/Size.java similarity index 100% rename from camerakit-core/src/main/utils/com/wonderkiln/camerakit/Size.java rename to camerakit/src/main/utils/com/wonderkiln/camerakit/Size.java diff --git a/camerakit-core/src/main/utils/com/wonderkiln/camerakit/YuvOperator.java b/camerakit/src/main/utils/com/wonderkiln/camerakit/YuvOperator.java similarity index 100% rename from camerakit-core/src/main/utils/com/wonderkiln/camerakit/YuvOperator.java rename to camerakit/src/main/utils/com/wonderkiln/camerakit/YuvOperator.java diff --git a/camerakit-core/src/main/vision/com/wonderkiln/camerakit/CameraKitTextBlock.java b/camerakit/src/main/vision/com/wonderkiln/camerakit/CameraKitTextBlock.java similarity index 100% rename from camerakit-core/src/main/vision/com/wonderkiln/camerakit/CameraKitTextBlock.java rename to camerakit/src/main/vision/com/wonderkiln/camerakit/CameraKitTextBlock.java diff --git a/camerakit-core/src/main/vision/com/wonderkiln/camerakit/CameraKitTextDetect.java b/camerakit/src/main/vision/com/wonderkiln/camerakit/CameraKitTextDetect.java similarity index 100% rename from camerakit-core/src/main/vision/com/wonderkiln/camerakit/CameraKitTextDetect.java rename to camerakit/src/main/vision/com/wonderkiln/camerakit/CameraKitTextDetect.java diff --git a/camerakit-core/src/main/vision/com/wonderkiln/camerakit/FrameProcessingRunnable.java b/camerakit/src/main/vision/com/wonderkiln/camerakit/FrameProcessingRunnable.java similarity index 100% rename from camerakit-core/src/main/vision/com/wonderkiln/camerakit/FrameProcessingRunnable.java rename to camerakit/src/main/vision/com/wonderkiln/camerakit/FrameProcessingRunnable.java diff --git a/camerakit-core/src/main/vision/com/wonderkiln/camerakit/GooglePlayServicesUnavailableException.java b/camerakit/src/main/vision/com/wonderkiln/camerakit/GooglePlayServicesUnavailableException.java similarity index 100% rename from camerakit-core/src/main/vision/com/wonderkiln/camerakit/GooglePlayServicesUnavailableException.java rename to camerakit/src/main/vision/com/wonderkiln/camerakit/GooglePlayServicesUnavailableException.java diff --git a/camerakit-core/src/main/vision/com/wonderkiln/camerakit/TextProcessor.java b/camerakit/src/main/vision/com/wonderkiln/camerakit/TextProcessor.java similarity index 100% rename from camerakit-core/src/main/vision/com/wonderkiln/camerakit/TextProcessor.java rename to camerakit/src/main/vision/com/wonderkiln/camerakit/TextProcessor.java diff --git a/demo/proguard-rules.pro b/demo/proguard-rules.pro deleted file mode 100644 index 0b5cf9d3ba..0000000000 --- a/demo/proguard-rules.pro +++ /dev/null @@ -1,25 +0,0 @@ -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in /Users/dylanmcintyre/Library/Android/sdk/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the proguardFiles -# directive in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/demo/src/main/java/com/wonderkiln/camerakit/demo/MainActivity.java b/demo/src/main/java/com/wonderkiln/camerakit/demo/MainActivity.java index f0ee09e0be..1fd7899963 100644 --- a/demo/src/main/java/com/wonderkiln/camerakit/demo/MainActivity.java +++ b/demo/src/main/java/com/wonderkiln/camerakit/demo/MainActivity.java @@ -25,6 +25,7 @@ import com.wonderkiln.camerakit.CameraKit; import com.wonderkiln.camerakit.CameraView; +import com.wonderkiln.camerakit.core.BuildConfig; import java.util.ArrayList; import java.util.List; @@ -109,7 +110,7 @@ public boolean onOptionsItemSelected(MenuItem item) { R.string.about_dialog_message, BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE, - com.wonderkiln.camerakit.BuildConfig.VERSION_NAME + BuildConfig.VERSION_NAME )) .setPositiveButton("DONE", null) .show(); diff --git a/settings.gradle b/settings.gradle index 6a592b8853..6956bfacf8 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include ':demo', ':camerakit', ':camerakit-vision', ':camerakit-core' +include ':demo', ':camerakit' From 775614cbdbba70537f7843bfd88b2348261c7e8c Mon Sep 17 00:00:00 2001 From: emersoncloud Date: Tue, 8 Jan 2019 18:25:18 -0500 Subject: [PATCH 2/2] Revert back from AndroidX to Android Support libraries --- camerakit/build.gradle | 5 ----- .../api16/com/wonderkiln/camerakit/Camera1.java | 4 ++-- .../wonderkiln/camerakit/ConstantMapper.java | 2 +- .../com/wonderkiln/camerakit/CameraImpl.java | 2 +- .../wonderkiln/camerakit/CameraViewLayout.java | 4 ++-- .../camerakit/SurfaceViewContainer.java | 4 ++-- .../wonderkiln/camerakit/CameraKitError.java | 2 +- .../wonderkiln/camerakit/CameraKitEvent.java | 2 +- .../wonderkiln/camerakit/EventDispatcher.java | 2 +- .../com/wonderkiln/camerakit/CameraView.java | 12 ++++++------ .../wonderkiln/camerakit/FocusMarkerLayout.java | 4 ++-- .../com/wonderkiln/camerakit/CaptureMethod.java | 2 +- .../types/com/wonderkiln/camerakit/Facing.java | 2 +- .../types/com/wonderkiln/camerakit/Flash.java | 2 +- .../types/com/wonderkiln/camerakit/Focus.java | 2 +- .../com/wonderkiln/camerakit/Permissions.java | 2 +- .../com/wonderkiln/camerakit/VideoQuality.java | 2 +- .../com/wonderkiln/camerakit/AspectRatio.java | 4 ++-- .../com/wonderkiln/camerakit/PostProcessor.java | 2 +- .../utils/com/wonderkiln/camerakit/Size.java | 2 +- demo/build.gradle | 4 ---- .../camerakit/demo/AutoUnfocusEditText.java | 2 +- .../camerakit/demo/CameraControls.java | 4 ++-- .../wonderkiln/camerakit/demo/MainActivity.java | 17 +++++++---------- .../camerakit/demo/PreviewActivity.java | 12 +++--------- .../wonderkiln/camerakit/demo/ResultHolder.java | 2 +- demo/src/main/res/layout/activity_main.xml | 4 ++-- gradle.properties | 2 -- 28 files changed, 45 insertions(+), 65 deletions(-) diff --git a/camerakit/build.gradle b/camerakit/build.gradle index 79fd80ef21..af4cbbf040 100644 --- 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 index 69d750f89a..f98218895c 100644 --- 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 index fed13a0572..0c35dc76e5 100644 --- 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 index e89b8d687c..dc9ecdaa36 100644 --- 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 index 85ee6f203b..0a3825b6a2 100644 --- 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 index 4e3c34aa9b..0569676955 100644 --- 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 index e78d88fb94..2bdac7bd0d 100644 --- 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 index 2cfa3f0c7d..e7fd51b66a 100644 --- 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 index f7c5442a46..56bacfb38c 100644 --- 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 index 63ef7dd4ce..ebd76921ee 100644 --- 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 index ece204e9b2..31ff6997fd 100644 --- 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 index 35574290af..8568e148b7 100644 --- 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 index 08bba68344..c820c041e9 100644 --- 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 index 79434d5a59..edd0069503 100644 --- 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 index 58e3b0db46..7f5a60a1d1 100644 --- 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 index 1fe87935e4..193c2c303a 100644 --- 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 index 4eb4cc3039..536a9c266c 100644 --- 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 index 5a48b8e574..b6a6b6de3d 100644 --- 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, Parcelable { diff --git a/camerakit/src/main/utils/com/wonderkiln/camerakit/PostProcessor.java b/camerakit/src/main/utils/com/wonderkiln/camerakit/PostProcessor.java index e87c28e4e1..483f5c5e0c 100644 --- 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 index 9d558141dd..6c57119706 100644 --- 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 { diff --git a/demo/build.gradle b/demo/build.gradle index 84279d70a6..7b1a40500d 100644 --- 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 index 2a86a3d4a6..4d1b59a710 100644 --- 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 index c9cfbd21ef..f8db02e95a 100644 --- 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 index 1fd7899963..4ecb354211 100644 --- 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 index e8933c0f4c..c6dcd671ff 100644 --- 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 index 840641fcdf..a28986377f 100644 --- 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 index f8e9a9854f..475290be1b 100644 --- a/demo/src/main/res/layout/activity_main.xml +++ b/demo/src/main/res/layout/activity_main.xml @@ -1,5 +1,5 @@ - @@ -58,4 +58,4 @@ android:background="@color/colorPrimaryDark" android:choiceMode="singleChoice" /> - + diff --git a/gradle.properties b/gradle.properties index 7ac1b74f2d..6ed0f8f960 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1 @@ -android.enableJetifier=true -android.useAndroidX=true org.gradle.jvmargs=-Xmx1536m