Refactor package name

README.md

@@ -67,7 +67,7 @@ For now, you must clone the repo and add it to your project.
 To use CameraView engine, simply add a `CameraView` to your layout:
 
 ```xml
-<com.flurgle.camerakit.CameraView
+<com.otaliastudios.cameraview.CameraView
     android:id="@+id/camera"
     android:keepScreenOn="true"
     android:layout_width="match_parent"
@@ -190,7 +190,7 @@ You can emulate a **center inside** behavior (like the `ImageView` scaletype) by
 
 
 ```xml
-<com.flurgle.camerakit.CameraView
+<com.otaliastudios.cameraview.CameraView
     android:layout_width="wrap_content"
     android:layout_height="wrap_content" />
 ```
@@ -202,7 +202,7 @@ This means that the whole preview is visible, and the image output matches what
 You can emulate a **center crop** behavior by setting both dimensions to fixed values or to `MATCH_PARENT`. The camera view will fill the rect. If your dimensions don't match the aspect ratio of the internal preview surface, the surface will be cropped to fill the view, just like `android:scaleType="centerCrop"` on an `ImageView`.
 
 ```xml
-<com.flurgle.camerakit.CameraView
+<com.otaliastudios.cameraview.CameraView
     android:layout_width="match_parent"
     android:layout_height="match_parent" />
 ```
@@ -212,7 +212,7 @@ This means that part of the preview is hidden, and the image output will contain
 ## XML Attributes
 
 ```xml
-<com.flurgle.camerakit.CameraView xmlns:app="http://schemas.android.com/apk/res-auto"
+<com.otaliastudios.cameraview.CameraView xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/camera"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"

camerakit/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.flurgle.camerakit">
+    package="com.otaliastudios.cameraview">
 
     <uses-permission android:name="android.permission.CAMERA" />
 

camerakit/src/main/java/com/otaliastudios/cameraview/AspectRatio.java

@@ -1,4 +1,4 @@
-package com.flurgle.camerakit;
+package com.otaliastudios.cameraview;
 
 import android.os.Parcel;
 import android.os.Parcelable;

camerakit/src/main/java/com/otaliastudios/cameraview/Camera1.java

@@ -1,4 +1,4 @@
-package com.flurgle.camerakit;
+package com.otaliastudios.cameraview;
 
 import android.graphics.Rect;
 import android.graphics.YuvImage;
@@ -18,12 +18,12 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import static com.flurgle.camerakit.CameraConstants.FOCUS_CONTINUOUS;
-import static com.flurgle.camerakit.CameraConstants.FOCUS_FIXED;
-import static com.flurgle.camerakit.CameraConstants.FOCUS_TAP;
-import static com.flurgle.camerakit.CameraConstants.FOCUS_TAP_WITH_MARKER;
-import static com.flurgle.camerakit.CameraConstants.SESSION_TYPE_PICTURE;
-import static com.flurgle.camerakit.CameraConstants.SESSION_TYPE_VIDEO;
+import static com.otaliastudios.cameraview.CameraConstants.FOCUS_CONTINUOUS;
+import static com.otaliastudios.cameraview.CameraConstants.FOCUS_FIXED;
+import static com.otaliastudios.cameraview.CameraConstants.FOCUS_TAP;
+import static com.otaliastudios.cameraview.CameraConstants.FOCUS_TAP_WITH_MARKER;
+import static com.otaliastudios.cameraview.CameraConstants.SESSION_TYPE_PICTURE;
+import static com.otaliastudios.cameraview.CameraConstants.SESSION_TYPE_VIDEO;
 
 @SuppressWarnings("deprecation")
 class Camera1 extends CameraController {

camerakit/src/main/java/com/otaliastudios/cameraview/Camera2.java

@@ -1,4 +1,4 @@
-package com.flurgle.camerakit;
+package com.otaliastudios.cameraview;
 
 import android.annotation.TargetApi;
 import android.content.Context;

camerakit/src/main/java/com/otaliastudios/cameraview/CameraConstants.java

@@ -1,4 +1,4 @@
-package com.flurgle.camerakit;
+package com.otaliastudios.cameraview;
 
 /**
  * Created by Mattia on 06/08/17.

camerakit/src/main/java/com/otaliastudios/cameraview/CameraController.java

@@ -1,4 +1,4 @@
-package com.flurgle.camerakit;
+package com.otaliastudios.cameraview;
 
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;

camerakit/src/main/java/com/otaliastudios/cameraview/CameraListener.java

@@ -1,7 +1,6 @@
-package com.flurgle.camerakit;
+package com.otaliastudios.cameraview;
 
 import android.graphics.PointF;
-import android.graphics.YuvImage;
 
 import java.io.File;
 

camerakit/src/main/java/com/otaliastudios/cameraview/CameraOptions.java

@@ -1,4 +1,4 @@
-package com.flurgle.camerakit;
+package com.otaliastudios.cameraview;
 
 
 import android.annotation.TargetApi;
@@ -6,7 +6,6 @@ import android.hardware.Camera;
 import android.hardware.camera2.CameraCharacteristics;
 import android.support.annotation.NonNull;
 
-import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;

camerakit/src/main/java/com/otaliastudios/cameraview/CameraView.java

@@ -1,4 +1,4 @@
-package com.flurgle.camerakit;
+package com.otaliastudios.cameraview;
 
 import android.Manifest;
 import android.annotation.TargetApi;
@@ -33,14 +33,14 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.flurgle.camerakit.CameraConstants.FACING_BACK;
-import static com.flurgle.camerakit.CameraConstants.FACING_FRONT;
-import static com.flurgle.camerakit.CameraConstants.FLASH_AUTO;
-import static com.flurgle.camerakit.CameraConstants.FLASH_OFF;
-import static com.flurgle.camerakit.CameraConstants.FLASH_ON;
-import static com.flurgle.camerakit.CameraConstants.FLASH_TORCH;
-import static com.flurgle.camerakit.CameraConstants.SESSION_TYPE_PICTURE;
-import static com.flurgle.camerakit.CameraConstants.SESSION_TYPE_VIDEO;
+import static com.otaliastudios.cameraview.CameraConstants.FACING_BACK;
+import static com.otaliastudios.cameraview.CameraConstants.FACING_FRONT;
+import static com.otaliastudios.cameraview.CameraConstants.FLASH_AUTO;
+import static com.otaliastudios.cameraview.CameraConstants.FLASH_OFF;
+import static com.otaliastudios.cameraview.CameraConstants.FLASH_ON;
+import static com.otaliastudios.cameraview.CameraConstants.FLASH_TORCH;
+import static com.otaliastudios.cameraview.CameraConstants.SESSION_TYPE_PICTURE;
+import static com.otaliastudios.cameraview.CameraConstants.SESSION_TYPE_VIDEO;
 
 import static android.view.View.MeasureSpec.AT_MOST;
 import static android.view.View.MeasureSpec.EXACTLY;

camerakit/src/main/java/com/otaliastudios/cameraview/ExtraProperties.java

@@ -1,4 +1,4 @@
-package com.flurgle.camerakit;
+package com.otaliastudios.cameraview;
 
 
 import android.annotation.TargetApi;

camerakit/src/main/java/com/otaliastudios/cameraview/Mapper.java

@@ -1,4 +1,4 @@
-package com.flurgle.camerakit;
+package com.otaliastudios.cameraview;
 
 import android.hardware.Camera;
 import android.util.SparseArray;

camerakit/src/main/java/com/otaliastudios/cameraview/Size.java

@@ -1,4 +1,4 @@
-package com.flurgle.camerakit;
+package com.otaliastudios.cameraview;
 
 import android.support.annotation.NonNull;
 

camerakit/src/main/options/com/flurgle/camerakit/Flash.java

@@ -1,16 +0,0 @@
-package com.flurgle.camerakit;
-
-import android.support.annotation.IntDef;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-import static com.flurgle.camerakit.CameraConstants.FLASH_AUTO;
-import static com.flurgle.camerakit.CameraConstants.FLASH_OFF;
-import static com.flurgle.camerakit.CameraConstants.FLASH_ON;
-import static com.flurgle.camerakit.CameraConstants.FLASH_TORCH;
-
-@Retention(RetentionPolicy.SOURCE)
-@IntDef({FLASH_OFF, FLASH_ON, FLASH_AUTO, FLASH_TORCH})
-public @interface Flash {
-}

camerakit/src/main/options/com/flurgle/camerakit/Focus.java

@@ -1,16 +0,0 @@
-package com.flurgle.camerakit;
-
-import android.support.annotation.IntDef;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-import static com.flurgle.camerakit.CameraConstants.FOCUS_TAP;
-import static com.flurgle.camerakit.CameraConstants.FOCUS_FIXED;
-import static com.flurgle.camerakit.CameraConstants.FOCUS_CONTINUOUS;
-import static com.flurgle.camerakit.CameraConstants.FOCUS_TAP_WITH_MARKER;
-
-@Retention(RetentionPolicy.SOURCE)
-@IntDef({FOCUS_CONTINUOUS, FOCUS_TAP, FOCUS_FIXED, FOCUS_TAP_WITH_MARKER})
-public @interface Focus {
-}

camerakit/src/main/options/com/flurgle/camerakit/Grid.java

@@ -1,16 +0,0 @@
-package com.flurgle.camerakit;
-
-import android.support.annotation.IntDef;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-import static com.flurgle.camerakit.CameraConstants.GRID_OFF;
-import static com.flurgle.camerakit.CameraConstants.GRID_3X3;
-import static com.flurgle.camerakit.CameraConstants.GRID_4X4;
-import static com.flurgle.camerakit.CameraConstants.GRID_PHI;
-
-@IntDef({GRID_OFF, GRID_3X3, GRID_4X4, GRID_PHI})
-@Retention(RetentionPolicy.SOURCE)
-public @interface Grid {
-}

camerakit/src/main/options/com/flurgle/camerakit/VideoQuality.java

@@ -1,19 +0,0 @@
-package com.flurgle.camerakit;
-
-import android.support.annotation.IntDef;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-import static com.flurgle.camerakit.CameraConstants.VIDEO_QUALITY_1080P;
-import static com.flurgle.camerakit.CameraConstants.VIDEO_QUALITY_2160P;
-import static com.flurgle.camerakit.CameraConstants.VIDEO_QUALITY_480P;
-import static com.flurgle.camerakit.CameraConstants.VIDEO_QUALITY_720P;
-import static com.flurgle.camerakit.CameraConstants.VIDEO_QUALITY_HIGHEST;
-import static com.flurgle.camerakit.CameraConstants.VIDEO_QUALITY_LOWEST;
-import static com.flurgle.camerakit.CameraConstants.VIDEO_QUALITY_QVGA;
-
-@Retention(RetentionPolicy.SOURCE)
-@IntDef({VIDEO_QUALITY_QVGA, VIDEO_QUALITY_480P, VIDEO_QUALITY_720P, VIDEO_QUALITY_1080P, VIDEO_QUALITY_2160P, VIDEO_QUALITY_HIGHEST, VIDEO_QUALITY_LOWEST})
-public @interface VideoQuality {
-}

camerakit/src/main/options/com/flurgle/camerakit/WhiteBalance.java

@@ -1,18 +0,0 @@
-package com.flurgle.camerakit;
-
-import android.support.annotation.IntDef;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-import static com.flurgle.camerakit.CameraConstants.WHITE_BALANCE_AUTO;
-import static com.flurgle.camerakit.CameraConstants.WHITE_BALANCE_INCANDESCENT;
-import static com.flurgle.camerakit.CameraConstants.WHITE_BALANCE_FLUORESCENT;
-import static com.flurgle.camerakit.CameraConstants.WHITE_BALANCE_DAYLIGHT;
-import static com.flurgle.camerakit.CameraConstants.WHITE_BALANCE_CLOUDY;
-
-@Retention(RetentionPolicy.SOURCE)
-@IntDef({WHITE_BALANCE_AUTO, WHITE_BALANCE_INCANDESCENT, WHITE_BALANCE_FLUORESCENT,
-        WHITE_BALANCE_DAYLIGHT, WHITE_BALANCE_CLOUDY})
-public @interface WhiteBalance {
-}

camerakit/src/main/options/com/otaliastudios/cameraview/Facing.java

@@ -1,12 +1,12 @@
-package com.flurgle.camerakit;
+package com.otaliastudios.cameraview;
 
 import android.support.annotation.IntDef;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
-import static com.flurgle.camerakit.CameraConstants.FACING_BACK;
-import static com.flurgle.camerakit.CameraConstants.FACING_FRONT;
+import static com.otaliastudios.cameraview.CameraConstants.FACING_BACK;
+import static com.otaliastudios.cameraview.CameraConstants.FACING_FRONT;
 
 @IntDef({FACING_BACK, FACING_FRONT})
 @Retention(RetentionPolicy.SOURCE)

camerakit/src/main/options/com/otaliastudios/cameraview/Flash.java

@@ -0,0 +1,16 @@
+package com.otaliastudios.cameraview;
+
+import android.support.annotation.IntDef;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import static com.otaliastudios.cameraview.CameraConstants.FLASH_AUTO;
+import static com.otaliastudios.cameraview.CameraConstants.FLASH_OFF;
+import static com.otaliastudios.cameraview.CameraConstants.FLASH_ON;
+import static com.otaliastudios.cameraview.CameraConstants.FLASH_TORCH;
+
+@Retention(RetentionPolicy.SOURCE)
+@IntDef({FLASH_OFF, FLASH_ON, FLASH_AUTO, FLASH_TORCH})
+public @interface Flash {
+}

camerakit/src/main/options/com/otaliastudios/cameraview/Focus.java

@@ -0,0 +1,16 @@
+package com.otaliastudios.cameraview;
+
+import android.support.annotation.IntDef;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import static com.otaliastudios.cameraview.CameraConstants.FOCUS_TAP;
+import static com.otaliastudios.cameraview.CameraConstants.FOCUS_FIXED;
+import static com.otaliastudios.cameraview.CameraConstants.FOCUS_CONTINUOUS;
+import static com.otaliastudios.cameraview.CameraConstants.FOCUS_TAP_WITH_MARKER;
+
+@Retention(RetentionPolicy.SOURCE)
+@IntDef({FOCUS_CONTINUOUS, FOCUS_TAP, FOCUS_FIXED, FOCUS_TAP_WITH_MARKER})
+public @interface Focus {
+}

camerakit/src/main/options/com/otaliastudios/cameraview/Grid.java

@@ -0,0 +1,16 @@
+package com.otaliastudios.cameraview;
+
+import android.support.annotation.IntDef;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import static com.otaliastudios.cameraview.CameraConstants.GRID_OFF;
+import static com.otaliastudios.cameraview.CameraConstants.GRID_3X3;
+import static com.otaliastudios.cameraview.CameraConstants.GRID_4X4;
+import static com.otaliastudios.cameraview.CameraConstants.GRID_PHI;
+
+@IntDef({GRID_OFF, GRID_3X3, GRID_4X4, GRID_PHI})
+@Retention(RetentionPolicy.SOURCE)
+public @interface Grid {
+}

camerakit/src/main/options/com/otaliastudios/cameraview/Method.java

@@ -1,12 +1,12 @@
-package com.flurgle.camerakit;
+package com.otaliastudios.cameraview;
 
 import android.support.annotation.IntDef;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
-import static com.flurgle.camerakit.CameraConstants.CAPTURE_METHOD_STANDARD;
-import static com.flurgle.camerakit.CameraConstants.CAPTURE_METHOD_FRAME;
+import static com.otaliastudios.cameraview.CameraConstants.CAPTURE_METHOD_STANDARD;
+import static com.otaliastudios.cameraview.CameraConstants.CAPTURE_METHOD_FRAME;
 
 @Deprecated
 @Retention(RetentionPolicy.SOURCE)

camerakit/src/main/options/com/otaliastudios/cameraview/Permissions.java

@@ -1,12 +1,12 @@
-package com.flurgle.camerakit;
+package com.otaliastudios.cameraview;
 
 import android.support.annotation.IntDef;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
-import static com.flurgle.camerakit.CameraConstants.PERMISSIONS_PICTURE;
-import static com.flurgle.camerakit.CameraConstants.PERMISSIONS_VIDEO;
+import static com.otaliastudios.cameraview.CameraConstants.PERMISSIONS_PICTURE;
+import static com.otaliastudios.cameraview.CameraConstants.PERMISSIONS_VIDEO;
 
 @Deprecated
 @Retention(RetentionPolicy.SOURCE)

camerakit/src/main/options/com/otaliastudios/cameraview/SessionType.java

@@ -1,12 +1,12 @@
-package com.flurgle.camerakit;
+package com.otaliastudios.cameraview;
 
 import android.support.annotation.IntDef;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
-import static com.flurgle.camerakit.CameraConstants.SESSION_TYPE_PICTURE;
-import static com.flurgle.camerakit.CameraConstants.SESSION_TYPE_VIDEO;
+import static com.otaliastudios.cameraview.CameraConstants.SESSION_TYPE_PICTURE;
+import static com.otaliastudios.cameraview.CameraConstants.SESSION_TYPE_VIDEO;
 
 @Retention(RetentionPolicy.SOURCE)
 @IntDef({SESSION_TYPE_PICTURE, SESSION_TYPE_VIDEO})

camerakit/src/main/options/com/otaliastudios/cameraview/VideoQuality.java

@@ -0,0 +1,19 @@
+package com.otaliastudios.cameraview;
+
+import android.support.annotation.IntDef;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import static com.otaliastudios.cameraview.CameraConstants.VIDEO_QUALITY_1080P;
+import static com.otaliastudios.cameraview.CameraConstants.VIDEO_QUALITY_2160P;
+import static com.otaliastudios.cameraview.CameraConstants.VIDEO_QUALITY_480P;
+import static com.otaliastudios.cameraview.CameraConstants.VIDEO_QUALITY_720P;
+import static com.otaliastudios.cameraview.CameraConstants.VIDEO_QUALITY_HIGHEST;
+import static com.otaliastudios.cameraview.CameraConstants.VIDEO_QUALITY_LOWEST;
+import static com.otaliastudios.cameraview.CameraConstants.VIDEO_QUALITY_QVGA;
+
+@Retention(RetentionPolicy.SOURCE)
+@IntDef({VIDEO_QUALITY_QVGA, VIDEO_QUALITY_480P, VIDEO_QUALITY_720P, VIDEO_QUALITY_1080P, VIDEO_QUALITY_2160P, VIDEO_QUALITY_HIGHEST, VIDEO_QUALITY_LOWEST})
+public @interface VideoQuality {
+}

camerakit/src/main/options/com/otaliastudios/cameraview/WhiteBalance.java

@@ -0,0 +1,18 @@
+package com.otaliastudios.cameraview;
+
+import android.support.annotation.IntDef;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import static com.otaliastudios.cameraview.CameraConstants.WHITE_BALANCE_AUTO;
+import static com.otaliastudios.cameraview.CameraConstants.WHITE_BALANCE_INCANDESCENT;
+import static com.otaliastudios.cameraview.CameraConstants.WHITE_BALANCE_FLUORESCENT;
+import static com.otaliastudios.cameraview.CameraConstants.WHITE_BALANCE_DAYLIGHT;
+import static com.otaliastudios.cameraview.CameraConstants.WHITE_BALANCE_CLOUDY;
+
+@Retention(RetentionPolicy.SOURCE)
+@IntDef({WHITE_BALANCE_AUTO, WHITE_BALANCE_INCANDESCENT, WHITE_BALANCE_FLUORESCENT,
+        WHITE_BALANCE_DAYLIGHT, WHITE_BALANCE_CLOUDY})
+public @interface WhiteBalance {
+}

camerakit/src/main/options/com/otaliastudios/cameraview/ZoomMode.java

@@ -1,12 +1,12 @@
-package com.flurgle.camerakit;
+package com.otaliastudios.cameraview;
 
 import android.support.annotation.IntDef;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
-import static com.flurgle.camerakit.CameraConstants.ZOOM_OFF;
-import static com.flurgle.camerakit.CameraConstants.ZOOM_PINCH;
+import static com.otaliastudios.cameraview.CameraConstants.ZOOM_OFF;
+import static com.otaliastudios.cameraview.CameraConstants.ZOOM_PINCH;
 
 @Retention(RetentionPolicy.SOURCE)
 @IntDef({ZOOM_OFF, ZOOM_PINCH})

camerakit/src/main/utils/com/otaliastudios/cameraview/CameraUtils.java

@@ -1,4 +1,4 @@
-package com.flurgle.camerakit;
+package com.otaliastudios.cameraview;
 
 import android.content.Context;
 import android.content.pm.PackageManager;

camerakit/src/main/utils/com/otaliastudios/cameraview/CropHelper.java

@@ -1,13 +1,10 @@
-package com.flurgle.camerakit;
+package com.otaliastudios.cameraview;
 
 import android.graphics.Bitmap;
-import android.graphics.BitmapRegionDecoder;
 import android.graphics.Rect;
 import android.graphics.YuvImage;
-import android.util.Log;
 
 import java.io.ByteArrayOutputStream;
-import java.io.IOException;
 
 public class CropHelper {
 

camerakit/src/main/utils/com/otaliastudios/cameraview/ExifUtils.java

@@ -1,4 +1,4 @@
-package com.flurgle.camerakit;
+package com.otaliastudios.cameraview;
 
 
 import android.support.media.ExifInterface;

camerakit/src/main/utils/com/otaliastudios/cameraview/OrientationHelper.java

@@ -1,8 +1,7 @@
-package com.flurgle.camerakit;
+package com.otaliastudios.cameraview;
 
 import android.content.Context;
 import android.hardware.SensorManager;
-import android.media.ExifInterface;
 import android.util.SparseIntArray;
 import android.view.Display;
 import android.view.OrientationEventListener;

camerakit/src/main/utils/com/otaliastudios/cameraview/RotationHelper.java

@@ -1,4 +1,4 @@
-package com.flurgle.camerakit;
+package com.otaliastudios.cameraview;
 
 class RotationHelper {
 

camerakit/src/main/views/com/otaliastudios/cameraview/FocusMarkerLayout.java

@@ -1,4 +1,4 @@
-package com.flurgle.camerakit;
+package com.otaliastudios.cameraview;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -8,7 +8,6 @@ import android.support.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
-import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 

camerakit/src/main/views/com/otaliastudios/cameraview/GridLinesLayout.java

@@ -1,4 +1,4 @@
-package com.flurgle.camerakit;
+package com.otaliastudios.cameraview;
 
 import android.content.Context;
 import android.graphics.Canvas;

camerakit/src/main/views/com/otaliastudios/cameraview/PinchToZoomLayout.java

@@ -1,4 +1,4 @@
-package com.flurgle.camerakit;
+package com.otaliastudios.cameraview;
 
 import android.content.Context;
 import android.graphics.PointF;

camerakit/src/main/views/com/otaliastudios/cameraview/Preview.java

@@ -1,4 +1,4 @@
-package com.flurgle.camerakit;
+package com.otaliastudios.cameraview;
 
 import android.content.Context;
 import android.graphics.SurfaceTexture;

camerakit/src/main/views/com/otaliastudios/cameraview/SurfaceViewPreview.java

@@ -1,4 +1,4 @@
-package com.flurgle.camerakit;
+package com.otaliastudios.cameraview;
 
 import android.content.Context;
 import android.view.Surface;

camerakit/src/main/views/com/otaliastudios/cameraview/TextureViewPreview.java

@@ -1,4 +1,4 @@
-package com.flurgle.camerakit;
+package com.otaliastudios.cameraview;
 
 import android.annotation.TargetApi;
 import android.content.Context;

demo/build.gradle

@@ -4,7 +4,7 @@ android {
     compileSdkVersion rootProject.ext.compileSdkVersion
     buildToolsVersion rootProject.ext.buildToolsVersion
     defaultConfig {
-        applicationId "com.flurgle.camerakit.demo"
+        applicationId "com.otaliastudios.cameraview.demo"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 4

demo/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.flurgle.camerakit.demo">
+    package="com.otaliastudios.cameraview.demo">
 
     <uses-permission android:name="android.permission.RECORD_AUDIO"/>
 
@@ -13,7 +13,7 @@
         android:theme="@style/AppTheme">
 
         <activity
-            android:name=".MainActivity"
+            android:name="com.otaliastudios.cameraview.demo.MainActivity"
             android:theme="@style/Theme.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -22,9 +22,9 @@
         </activity>
 
         <activity
-            android:name=".PicturePreviewActivity" />
+            android:name="com.otaliastudios.cameraview.demo.PicturePreviewActivity" />
 
-        <activity android:name=".VideoPreviewActivity"/>
+        <activity android:name="com.otaliastudios.cameraview.demo.VideoPreviewActivity"/>
 
     </application>
 

demo/src/main/java/com/otaliastudios/cameraview/demo/AutoUnfocusEditText.java

@@ -1,4 +1,4 @@
-package com.flurgle.camerakit.demo;
+package com.otaliastudios.cameraview.demo;
 
 import android.content.Context;
 import android.support.v7.widget.AppCompatEditText;

demo/src/main/java/com/otaliastudios/cameraview/demo/MainActivity.java

@@ -1,4 +1,4 @@
-package com.flurgle.camerakit.demo;
+package com.otaliastudios.cameraview.demo;
 
 import android.content.Intent;
 import android.net.Uri;
@@ -13,10 +13,10 @@ import android.widget.RadioGroup;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.flurgle.camerakit.CameraConstants;
-import com.flurgle.camerakit.CameraListener;
-import com.flurgle.camerakit.CameraView;
-import com.flurgle.camerakit.Size;
+import com.otaliastudios.cameraview.CameraConstants;
+import com.otaliastudios.cameraview.CameraListener;
+import com.otaliastudios.cameraview.CameraView;
+import com.otaliastudios.cameraview.Size;
 
 import java.io.File;
 

demo/src/main/java/com/otaliastudios/cameraview/demo/PicturePreviewActivity.java

@@ -1,4 +1,4 @@
-package com.flurgle.camerakit.demo;
+package com.otaliastudios.cameraview.demo;
 
 import android.app.Activity;
 import android.graphics.Bitmap;
@@ -7,9 +7,8 @@ import android.support.annotation.Nullable;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.flurgle.camerakit.AspectRatio;
-import com.flurgle.camerakit.CameraUtils;
-import com.flurgle.camerakit.Size;
+import com.otaliastudios.cameraview.AspectRatio;
+import com.otaliastudios.cameraview.CameraUtils;
 
 import java.lang.ref.WeakReference;
 

demo/src/main/java/com/otaliastudios/cameraview/demo/VideoPreviewActivity.java

@@ -1,21 +1,15 @@
-package com.flurgle.camerakit.demo;
+package com.otaliastudios.cameraview.demo;
 
 import android.app.Activity;
-import android.graphics.Bitmap;
 import android.media.MediaPlayer;
 import android.net.Uri;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
-import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ImageView;
 import android.widget.MediaController;
 import android.widget.TextView;
 import android.widget.VideoView;
 
-import com.flurgle.camerakit.AspectRatio;
-import com.flurgle.camerakit.Size;
-
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;

demo/src/main/res/layout/activity_main.xml

@@ -19,20 +19,20 @@
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
-            <com.flurgle.camerakit.CameraView xmlns:app="http://schemas.android.com/apk/res-auto"
-                android:id="@+id/camera"
-                android:layout_width="match_parent"
-                android:layout_height="400dp"
-                android:layout_gravity="center_horizontal"
-                android:keepScreenOn="true"
-                app:cameraZoomMode="off"
-                app:cameraGrid="off"
-                app:cameraCropOutput="false"
-                app:cameraFacing="back"
-                app:cameraFlash="off"
-                app:cameraFocus="tapWithMarker"
-                app:cameraJpegQuality="100"
-                app:cameraSessionType="picture" />
+            <com.otaliastudios.cameraview.CameraView xmlns:app="http://schemas.android.com/apk/res-auto"
+                                               android:id="@+id/camera"
+                                               android:layout_width="match_parent"
+                                               android:layout_height="400dp"
+                                               android:layout_gravity="center_horizontal"
+                                               android:keepScreenOn="true"
+                                               app:cameraZoomMode="off"
+                                               app:cameraGrid="off"
+                                               app:cameraCropOutput="false"
+                                               app:cameraFacing="back"
+                                               app:cameraFlash="off"
+                                               app:cameraFocus="tapWithMarker"
+                                               app:cameraJpegQuality="100"
+                                               app:cameraSessionType="picture" />
         </RelativeLayout>
 
         <LinearLayout
@@ -291,7 +291,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content">
 
-                        <com.flurgle.camerakit.demo.AutoUnfocusEditText
+                        <com.flurgle.cameraview.demo.AutoUnfocusEditText
                             android:id="@+id/width"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
@@ -391,7 +391,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content">
 
-                        <com.flurgle.camerakit.demo.AutoUnfocusEditText
+                        <com.flurgle.cameraview.demo.AutoUnfocusEditText
                             android:id="@+id/height"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"