From 9774bcc1ce6bbaf70ceb239ed5362691385edaf6 Mon Sep 17 00:00:00 2001 From: Mattia Iavarone Date: Mon, 7 Aug 2017 22:49:19 +0200 Subject: [PATCH] Refactor module name --- {camerakit => cameraview}/.gitignore | 0 {camerakit => cameraview}/build.gradle | 0 {camerakit => cameraview}/proguard-rules.pro | 0 {camerakit => cameraview}/src/main/AndroidManifest.xml | 0 .../src/main/java/com/otaliastudios/cameraview/AspectRatio.java | 0 .../src/main/java/com/otaliastudios/cameraview/Camera1.java | 0 .../src/main/java/com/otaliastudios/cameraview/Camera2.java | 0 .../main/java/com/otaliastudios/cameraview/CameraConstants.java | 0 .../java/com/otaliastudios/cameraview/CameraController.java | 0 .../main/java/com/otaliastudios/cameraview/CameraListener.java | 0 .../main/java/com/otaliastudios/cameraview/CameraOptions.java | 0 .../src/main/java/com/otaliastudios/cameraview/CameraView.java | 0 .../main/java/com/otaliastudios/cameraview/ExtraProperties.java | 0 .../src/main/java/com/otaliastudios/cameraview/Mapper.java | 0 .../src/main/java/com/otaliastudios/cameraview/Size.java | 0 .../src/main/options/com/otaliastudios/cameraview/Facing.java | 0 .../src/main/options/com/otaliastudios/cameraview/Flash.java | 0 .../src/main/options/com/otaliastudios/cameraview/Focus.java | 0 .../src/main/options/com/otaliastudios/cameraview/Grid.java | 0 .../src/main/options/com/otaliastudios/cameraview/Method.java | 0 .../main/options/com/otaliastudios/cameraview/Permissions.java | 0 .../main/options/com/otaliastudios/cameraview/SessionType.java | 0 .../main/options/com/otaliastudios/cameraview/VideoQuality.java | 0 .../main/options/com/otaliastudios/cameraview/WhiteBalance.java | 0 .../src/main/options/com/otaliastudios/cameraview/ZoomMode.java | 0 .../src/main/res/drawable/focus_marker_fill.xml | 0 .../src/main/res/drawable/focus_marker_outline.xml | 0 .../src/main/res/layout/layout_focus_marker.xml | 0 {camerakit => cameraview}/src/main/res/layout/surface_view.xml | 0 {camerakit => cameraview}/src/main/res/layout/texture_view.xml | 0 {camerakit => cameraview}/src/main/res/values/attrs.xml | 0 .../main/utils/com/otaliastudios/cameraview/CameraUtils.java | 0 .../src/main/utils/com/otaliastudios/cameraview/CropHelper.java | 0 .../src/main/utils/com/otaliastudios/cameraview/ExifUtils.java | 0 .../utils/com/otaliastudios/cameraview/OrientationHelper.java | 0 .../main/utils/com/otaliastudios/cameraview/RotationHelper.java | 0 .../views/com/otaliastudios/cameraview/FocusMarkerLayout.java | 0 .../views/com/otaliastudios/cameraview/GridLinesLayout.java | 0 .../views/com/otaliastudios/cameraview/PinchToZoomLayout.java | 0 .../src/main/views/com/otaliastudios/cameraview/Preview.java | 0 .../views/com/otaliastudios/cameraview/SurfaceViewPreview.java | 0 .../views/com/otaliastudios/cameraview/TextureViewPreview.java | 0 demo/build.gradle | 2 +- settings.gradle | 2 +- 44 files changed, 2 insertions(+), 2 deletions(-) rename {camerakit => cameraview}/.gitignore (100%) rename {camerakit => cameraview}/build.gradle (100%) rename {camerakit => cameraview}/proguard-rules.pro (100%) rename {camerakit => cameraview}/src/main/AndroidManifest.xml (100%) rename {camerakit => cameraview}/src/main/java/com/otaliastudios/cameraview/AspectRatio.java (100%) rename {camerakit => cameraview}/src/main/java/com/otaliastudios/cameraview/Camera1.java (100%) rename {camerakit => cameraview}/src/main/java/com/otaliastudios/cameraview/Camera2.java (100%) rename {camerakit => cameraview}/src/main/java/com/otaliastudios/cameraview/CameraConstants.java (100%) rename {camerakit => cameraview}/src/main/java/com/otaliastudios/cameraview/CameraController.java (100%) rename {camerakit => cameraview}/src/main/java/com/otaliastudios/cameraview/CameraListener.java (100%) rename {camerakit => cameraview}/src/main/java/com/otaliastudios/cameraview/CameraOptions.java (100%) rename {camerakit => cameraview}/src/main/java/com/otaliastudios/cameraview/CameraView.java (100%) rename {camerakit => cameraview}/src/main/java/com/otaliastudios/cameraview/ExtraProperties.java (100%) rename {camerakit => cameraview}/src/main/java/com/otaliastudios/cameraview/Mapper.java (100%) rename {camerakit => cameraview}/src/main/java/com/otaliastudios/cameraview/Size.java (100%) rename {camerakit => cameraview}/src/main/options/com/otaliastudios/cameraview/Facing.java (100%) rename {camerakit => cameraview}/src/main/options/com/otaliastudios/cameraview/Flash.java (100%) rename {camerakit => cameraview}/src/main/options/com/otaliastudios/cameraview/Focus.java (100%) rename {camerakit => cameraview}/src/main/options/com/otaliastudios/cameraview/Grid.java (100%) rename {camerakit => cameraview}/src/main/options/com/otaliastudios/cameraview/Method.java (100%) rename {camerakit => cameraview}/src/main/options/com/otaliastudios/cameraview/Permissions.java (100%) rename {camerakit => cameraview}/src/main/options/com/otaliastudios/cameraview/SessionType.java (100%) rename {camerakit => cameraview}/src/main/options/com/otaliastudios/cameraview/VideoQuality.java (100%) rename {camerakit => cameraview}/src/main/options/com/otaliastudios/cameraview/WhiteBalance.java (100%) rename {camerakit => cameraview}/src/main/options/com/otaliastudios/cameraview/ZoomMode.java (100%) rename {camerakit => cameraview}/src/main/res/drawable/focus_marker_fill.xml (100%) rename {camerakit => cameraview}/src/main/res/drawable/focus_marker_outline.xml (100%) rename {camerakit => cameraview}/src/main/res/layout/layout_focus_marker.xml (100%) rename {camerakit => cameraview}/src/main/res/layout/surface_view.xml (100%) rename {camerakit => cameraview}/src/main/res/layout/texture_view.xml (100%) rename {camerakit => cameraview}/src/main/res/values/attrs.xml (100%) rename {camerakit => cameraview}/src/main/utils/com/otaliastudios/cameraview/CameraUtils.java (100%) rename {camerakit => cameraview}/src/main/utils/com/otaliastudios/cameraview/CropHelper.java (100%) rename {camerakit => cameraview}/src/main/utils/com/otaliastudios/cameraview/ExifUtils.java (100%) rename {camerakit => cameraview}/src/main/utils/com/otaliastudios/cameraview/OrientationHelper.java (100%) rename {camerakit => cameraview}/src/main/utils/com/otaliastudios/cameraview/RotationHelper.java (100%) rename {camerakit => cameraview}/src/main/views/com/otaliastudios/cameraview/FocusMarkerLayout.java (100%) rename {camerakit => cameraview}/src/main/views/com/otaliastudios/cameraview/GridLinesLayout.java (100%) rename {camerakit => cameraview}/src/main/views/com/otaliastudios/cameraview/PinchToZoomLayout.java (100%) rename {camerakit => cameraview}/src/main/views/com/otaliastudios/cameraview/Preview.java (100%) rename {camerakit => cameraview}/src/main/views/com/otaliastudios/cameraview/SurfaceViewPreview.java (100%) rename {camerakit => cameraview}/src/main/views/com/otaliastudios/cameraview/TextureViewPreview.java (100%) diff --git a/camerakit/.gitignore b/cameraview/.gitignore similarity index 100% rename from camerakit/.gitignore rename to cameraview/.gitignore diff --git a/camerakit/build.gradle b/cameraview/build.gradle similarity index 100% rename from camerakit/build.gradle rename to cameraview/build.gradle diff --git a/camerakit/proguard-rules.pro b/cameraview/proguard-rules.pro similarity index 100% rename from camerakit/proguard-rules.pro rename to cameraview/proguard-rules.pro diff --git a/camerakit/src/main/AndroidManifest.xml b/cameraview/src/main/AndroidManifest.xml similarity index 100% rename from camerakit/src/main/AndroidManifest.xml rename to cameraview/src/main/AndroidManifest.xml diff --git a/camerakit/src/main/java/com/otaliastudios/cameraview/AspectRatio.java b/cameraview/src/main/java/com/otaliastudios/cameraview/AspectRatio.java similarity index 100% rename from camerakit/src/main/java/com/otaliastudios/cameraview/AspectRatio.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/AspectRatio.java diff --git a/camerakit/src/main/java/com/otaliastudios/cameraview/Camera1.java b/cameraview/src/main/java/com/otaliastudios/cameraview/Camera1.java similarity index 100% rename from camerakit/src/main/java/com/otaliastudios/cameraview/Camera1.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/Camera1.java diff --git a/camerakit/src/main/java/com/otaliastudios/cameraview/Camera2.java b/cameraview/src/main/java/com/otaliastudios/cameraview/Camera2.java similarity index 100% rename from camerakit/src/main/java/com/otaliastudios/cameraview/Camera2.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/Camera2.java diff --git a/camerakit/src/main/java/com/otaliastudios/cameraview/CameraConstants.java b/cameraview/src/main/java/com/otaliastudios/cameraview/CameraConstants.java similarity index 100% rename from camerakit/src/main/java/com/otaliastudios/cameraview/CameraConstants.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/CameraConstants.java diff --git a/camerakit/src/main/java/com/otaliastudios/cameraview/CameraController.java b/cameraview/src/main/java/com/otaliastudios/cameraview/CameraController.java similarity index 100% rename from camerakit/src/main/java/com/otaliastudios/cameraview/CameraController.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/CameraController.java diff --git a/camerakit/src/main/java/com/otaliastudios/cameraview/CameraListener.java b/cameraview/src/main/java/com/otaliastudios/cameraview/CameraListener.java similarity index 100% rename from camerakit/src/main/java/com/otaliastudios/cameraview/CameraListener.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/CameraListener.java diff --git a/camerakit/src/main/java/com/otaliastudios/cameraview/CameraOptions.java b/cameraview/src/main/java/com/otaliastudios/cameraview/CameraOptions.java similarity index 100% rename from camerakit/src/main/java/com/otaliastudios/cameraview/CameraOptions.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/CameraOptions.java diff --git a/camerakit/src/main/java/com/otaliastudios/cameraview/CameraView.java b/cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java similarity index 100% rename from camerakit/src/main/java/com/otaliastudios/cameraview/CameraView.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java diff --git a/camerakit/src/main/java/com/otaliastudios/cameraview/ExtraProperties.java b/cameraview/src/main/java/com/otaliastudios/cameraview/ExtraProperties.java similarity index 100% rename from camerakit/src/main/java/com/otaliastudios/cameraview/ExtraProperties.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/ExtraProperties.java diff --git a/camerakit/src/main/java/com/otaliastudios/cameraview/Mapper.java b/cameraview/src/main/java/com/otaliastudios/cameraview/Mapper.java similarity index 100% rename from camerakit/src/main/java/com/otaliastudios/cameraview/Mapper.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/Mapper.java diff --git a/camerakit/src/main/java/com/otaliastudios/cameraview/Size.java b/cameraview/src/main/java/com/otaliastudios/cameraview/Size.java similarity index 100% rename from camerakit/src/main/java/com/otaliastudios/cameraview/Size.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/Size.java diff --git a/camerakit/src/main/options/com/otaliastudios/cameraview/Facing.java b/cameraview/src/main/options/com/otaliastudios/cameraview/Facing.java similarity index 100% rename from camerakit/src/main/options/com/otaliastudios/cameraview/Facing.java rename to cameraview/src/main/options/com/otaliastudios/cameraview/Facing.java diff --git a/camerakit/src/main/options/com/otaliastudios/cameraview/Flash.java b/cameraview/src/main/options/com/otaliastudios/cameraview/Flash.java similarity index 100% rename from camerakit/src/main/options/com/otaliastudios/cameraview/Flash.java rename to cameraview/src/main/options/com/otaliastudios/cameraview/Flash.java diff --git a/camerakit/src/main/options/com/otaliastudios/cameraview/Focus.java b/cameraview/src/main/options/com/otaliastudios/cameraview/Focus.java similarity index 100% rename from camerakit/src/main/options/com/otaliastudios/cameraview/Focus.java rename to cameraview/src/main/options/com/otaliastudios/cameraview/Focus.java diff --git a/camerakit/src/main/options/com/otaliastudios/cameraview/Grid.java b/cameraview/src/main/options/com/otaliastudios/cameraview/Grid.java similarity index 100% rename from camerakit/src/main/options/com/otaliastudios/cameraview/Grid.java rename to cameraview/src/main/options/com/otaliastudios/cameraview/Grid.java diff --git a/camerakit/src/main/options/com/otaliastudios/cameraview/Method.java b/cameraview/src/main/options/com/otaliastudios/cameraview/Method.java similarity index 100% rename from camerakit/src/main/options/com/otaliastudios/cameraview/Method.java rename to cameraview/src/main/options/com/otaliastudios/cameraview/Method.java diff --git a/camerakit/src/main/options/com/otaliastudios/cameraview/Permissions.java b/cameraview/src/main/options/com/otaliastudios/cameraview/Permissions.java similarity index 100% rename from camerakit/src/main/options/com/otaliastudios/cameraview/Permissions.java rename to cameraview/src/main/options/com/otaliastudios/cameraview/Permissions.java diff --git a/camerakit/src/main/options/com/otaliastudios/cameraview/SessionType.java b/cameraview/src/main/options/com/otaliastudios/cameraview/SessionType.java similarity index 100% rename from camerakit/src/main/options/com/otaliastudios/cameraview/SessionType.java rename to cameraview/src/main/options/com/otaliastudios/cameraview/SessionType.java diff --git a/camerakit/src/main/options/com/otaliastudios/cameraview/VideoQuality.java b/cameraview/src/main/options/com/otaliastudios/cameraview/VideoQuality.java similarity index 100% rename from camerakit/src/main/options/com/otaliastudios/cameraview/VideoQuality.java rename to cameraview/src/main/options/com/otaliastudios/cameraview/VideoQuality.java diff --git a/camerakit/src/main/options/com/otaliastudios/cameraview/WhiteBalance.java b/cameraview/src/main/options/com/otaliastudios/cameraview/WhiteBalance.java similarity index 100% rename from camerakit/src/main/options/com/otaliastudios/cameraview/WhiteBalance.java rename to cameraview/src/main/options/com/otaliastudios/cameraview/WhiteBalance.java diff --git a/camerakit/src/main/options/com/otaliastudios/cameraview/ZoomMode.java b/cameraview/src/main/options/com/otaliastudios/cameraview/ZoomMode.java similarity index 100% rename from camerakit/src/main/options/com/otaliastudios/cameraview/ZoomMode.java rename to cameraview/src/main/options/com/otaliastudios/cameraview/ZoomMode.java diff --git a/camerakit/src/main/res/drawable/focus_marker_fill.xml b/cameraview/src/main/res/drawable/focus_marker_fill.xml similarity index 100% rename from camerakit/src/main/res/drawable/focus_marker_fill.xml rename to cameraview/src/main/res/drawable/focus_marker_fill.xml diff --git a/camerakit/src/main/res/drawable/focus_marker_outline.xml b/cameraview/src/main/res/drawable/focus_marker_outline.xml similarity index 100% rename from camerakit/src/main/res/drawable/focus_marker_outline.xml rename to cameraview/src/main/res/drawable/focus_marker_outline.xml diff --git a/camerakit/src/main/res/layout/layout_focus_marker.xml b/cameraview/src/main/res/layout/layout_focus_marker.xml similarity index 100% rename from camerakit/src/main/res/layout/layout_focus_marker.xml rename to cameraview/src/main/res/layout/layout_focus_marker.xml diff --git a/camerakit/src/main/res/layout/surface_view.xml b/cameraview/src/main/res/layout/surface_view.xml similarity index 100% rename from camerakit/src/main/res/layout/surface_view.xml rename to cameraview/src/main/res/layout/surface_view.xml diff --git a/camerakit/src/main/res/layout/texture_view.xml b/cameraview/src/main/res/layout/texture_view.xml similarity index 100% rename from camerakit/src/main/res/layout/texture_view.xml rename to cameraview/src/main/res/layout/texture_view.xml diff --git a/camerakit/src/main/res/values/attrs.xml b/cameraview/src/main/res/values/attrs.xml similarity index 100% rename from camerakit/src/main/res/values/attrs.xml rename to cameraview/src/main/res/values/attrs.xml diff --git a/camerakit/src/main/utils/com/otaliastudios/cameraview/CameraUtils.java b/cameraview/src/main/utils/com/otaliastudios/cameraview/CameraUtils.java similarity index 100% rename from camerakit/src/main/utils/com/otaliastudios/cameraview/CameraUtils.java rename to cameraview/src/main/utils/com/otaliastudios/cameraview/CameraUtils.java diff --git a/camerakit/src/main/utils/com/otaliastudios/cameraview/CropHelper.java b/cameraview/src/main/utils/com/otaliastudios/cameraview/CropHelper.java similarity index 100% rename from camerakit/src/main/utils/com/otaliastudios/cameraview/CropHelper.java rename to cameraview/src/main/utils/com/otaliastudios/cameraview/CropHelper.java diff --git a/camerakit/src/main/utils/com/otaliastudios/cameraview/ExifUtils.java b/cameraview/src/main/utils/com/otaliastudios/cameraview/ExifUtils.java similarity index 100% rename from camerakit/src/main/utils/com/otaliastudios/cameraview/ExifUtils.java rename to cameraview/src/main/utils/com/otaliastudios/cameraview/ExifUtils.java diff --git a/camerakit/src/main/utils/com/otaliastudios/cameraview/OrientationHelper.java b/cameraview/src/main/utils/com/otaliastudios/cameraview/OrientationHelper.java similarity index 100% rename from camerakit/src/main/utils/com/otaliastudios/cameraview/OrientationHelper.java rename to cameraview/src/main/utils/com/otaliastudios/cameraview/OrientationHelper.java diff --git a/camerakit/src/main/utils/com/otaliastudios/cameraview/RotationHelper.java b/cameraview/src/main/utils/com/otaliastudios/cameraview/RotationHelper.java similarity index 100% rename from camerakit/src/main/utils/com/otaliastudios/cameraview/RotationHelper.java rename to cameraview/src/main/utils/com/otaliastudios/cameraview/RotationHelper.java diff --git a/camerakit/src/main/views/com/otaliastudios/cameraview/FocusMarkerLayout.java b/cameraview/src/main/views/com/otaliastudios/cameraview/FocusMarkerLayout.java similarity index 100% rename from camerakit/src/main/views/com/otaliastudios/cameraview/FocusMarkerLayout.java rename to cameraview/src/main/views/com/otaliastudios/cameraview/FocusMarkerLayout.java diff --git a/camerakit/src/main/views/com/otaliastudios/cameraview/GridLinesLayout.java b/cameraview/src/main/views/com/otaliastudios/cameraview/GridLinesLayout.java similarity index 100% rename from camerakit/src/main/views/com/otaliastudios/cameraview/GridLinesLayout.java rename to cameraview/src/main/views/com/otaliastudios/cameraview/GridLinesLayout.java diff --git a/camerakit/src/main/views/com/otaliastudios/cameraview/PinchToZoomLayout.java b/cameraview/src/main/views/com/otaliastudios/cameraview/PinchToZoomLayout.java similarity index 100% rename from camerakit/src/main/views/com/otaliastudios/cameraview/PinchToZoomLayout.java rename to cameraview/src/main/views/com/otaliastudios/cameraview/PinchToZoomLayout.java diff --git a/camerakit/src/main/views/com/otaliastudios/cameraview/Preview.java b/cameraview/src/main/views/com/otaliastudios/cameraview/Preview.java similarity index 100% rename from camerakit/src/main/views/com/otaliastudios/cameraview/Preview.java rename to cameraview/src/main/views/com/otaliastudios/cameraview/Preview.java diff --git a/camerakit/src/main/views/com/otaliastudios/cameraview/SurfaceViewPreview.java b/cameraview/src/main/views/com/otaliastudios/cameraview/SurfaceViewPreview.java similarity index 100% rename from camerakit/src/main/views/com/otaliastudios/cameraview/SurfaceViewPreview.java rename to cameraview/src/main/views/com/otaliastudios/cameraview/SurfaceViewPreview.java diff --git a/camerakit/src/main/views/com/otaliastudios/cameraview/TextureViewPreview.java b/cameraview/src/main/views/com/otaliastudios/cameraview/TextureViewPreview.java similarity index 100% rename from camerakit/src/main/views/com/otaliastudios/cameraview/TextureViewPreview.java rename to cameraview/src/main/views/com/otaliastudios/cameraview/TextureViewPreview.java diff --git a/demo/build.gradle b/demo/build.gradle index da5bc6e0..ef165e2d 100644 --- a/demo/build.gradle +++ b/demo/build.gradle @@ -21,7 +21,7 @@ android { } dependencies { - compile project(':camerakit') + compile project(':cameraview') compile 'com.android.support:appcompat-v7:25.2.0' compile 'com.jakewharton:butterknife:8.4.0' annotationProcessor 'com.jakewharton:butterknife-compiler:8.4.0' diff --git a/settings.gradle b/settings.gradle index 6956bfac..48f809fc 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include ':demo', ':camerakit' +include ':demo', ':cameraview'