parent
							
								
									97b768fa85
								
							
						
					
					
						commit
						6da37049d8
					
				| @ -1,4 +1,4 @@ | ||||
| package com.flurgle.camerakit; | ||||
| package com.otaliastudios.cameraview; | ||||
| 
 | ||||
| import android.os.Parcel; | ||||
| import android.os.Parcelable; | ||||
| @ -1,4 +1,4 @@ | ||||
| package com.flurgle.camerakit; | ||||
| package com.otaliastudios.cameraview; | ||||
| 
 | ||||
| import android.annotation.TargetApi; | ||||
| import android.content.Context; | ||||
| @ -1,4 +1,4 @@ | ||||
| package com.flurgle.camerakit; | ||||
| package com.otaliastudios.cameraview; | ||||
| 
 | ||||
| /** | ||||
|  * Created by Mattia on 06/08/17. | ||||
| @ -1,4 +1,4 @@ | ||||
| package com.flurgle.camerakit; | ||||
| package com.otaliastudios.cameraview; | ||||
| 
 | ||||
| import android.support.annotation.NonNull; | ||||
| import android.support.annotation.Nullable; | ||||
| @ -1,7 +1,6 @@ | ||||
| package com.flurgle.camerakit; | ||||
| package com.otaliastudios.cameraview; | ||||
| 
 | ||||
| import android.graphics.PointF; | ||||
| import android.graphics.YuvImage; | ||||
| 
 | ||||
| import java.io.File; | ||||
| 
 | ||||
| @ -1,4 +1,4 @@ | ||||
| package com.flurgle.camerakit; | ||||
| package com.otaliastudios.cameraview; | ||||
| 
 | ||||
| 
 | ||||
| import android.annotation.TargetApi; | ||||
| @ -1,4 +1,4 @@ | ||||
| package com.flurgle.camerakit; | ||||
| package com.otaliastudios.cameraview; | ||||
| 
 | ||||
| import android.hardware.Camera; | ||||
| import android.util.SparseArray; | ||||
| @ -1,4 +1,4 @@ | ||||
| package com.flurgle.camerakit; | ||||
| package com.otaliastudios.cameraview; | ||||
| 
 | ||||
| import android.support.annotation.NonNull; | ||||
| 
 | ||||
| @ -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 { | ||||
| } | ||||
| @ -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 { | ||||
| } | ||||
| @ -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 { | ||||
| } | ||||
| @ -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 { | ||||
| } | ||||
| @ -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 { | ||||
| } | ||||
| @ -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) | ||||
| @ -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 { | ||||
| } | ||||
| @ -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 { | ||||
| } | ||||
| @ -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 { | ||||
| } | ||||
| @ -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) | ||||
| @ -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) | ||||
| @ -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}) | ||||
| @ -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 { | ||||
| } | ||||
| @ -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 { | ||||
| } | ||||
| @ -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}) | ||||
| @ -1,4 +1,4 @@ | ||||
| package com.flurgle.camerakit; | ||||
| package com.otaliastudios.cameraview; | ||||
| 
 | ||||
| import android.content.Context; | ||||
| import android.content.pm.PackageManager; | ||||
| @ -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 { | ||||
| 
 | ||||
| @ -1,4 +1,4 @@ | ||||
| package com.flurgle.camerakit; | ||||
| package com.otaliastudios.cameraview; | ||||
| 
 | ||||
| 
 | ||||
| import android.support.media.ExifInterface; | ||||
| @ -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; | ||||
| @ -1,4 +1,4 @@ | ||||
| package com.flurgle.camerakit; | ||||
| package com.otaliastudios.cameraview; | ||||
| 
 | ||||
| class RotationHelper { | ||||
| 
 | ||||
| @ -1,4 +1,4 @@ | ||||
| package com.flurgle.camerakit; | ||||
| package com.otaliastudios.cameraview; | ||||
| 
 | ||||
| import android.content.Context; | ||||
| import android.graphics.Canvas; | ||||
| @ -1,4 +1,4 @@ | ||||
| package com.flurgle.camerakit; | ||||
| package com.otaliastudios.cameraview; | ||||
| 
 | ||||
| import android.content.Context; | ||||
| import android.graphics.PointF; | ||||
| @ -1,4 +1,4 @@ | ||||
| package com.flurgle.camerakit; | ||||
| package com.otaliastudios.cameraview; | ||||
| 
 | ||||
| import android.content.Context; | ||||
| import android.graphics.SurfaceTexture; | ||||
| @ -1,4 +1,4 @@ | ||||
| package com.flurgle.camerakit; | ||||
| package com.otaliastudios.cameraview; | ||||
| 
 | ||||
| import android.content.Context; | ||||
| import android.view.Surface; | ||||
| @ -1,4 +1,4 @@ | ||||
| package com.flurgle.camerakit; | ||||
| package com.otaliastudios.cameraview; | ||||
| 
 | ||||
| import android.annotation.TargetApi; | ||||
| import android.content.Context; | ||||
| @ -1,4 +1,4 @@ | ||||
| package com.flurgle.camerakit.demo; | ||||
| package com.otaliastudios.cameraview.demo; | ||||
| 
 | ||||
| import android.content.Context; | ||||
| import android.support.v7.widget.AppCompatEditText; | ||||
| @ -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; | ||||
					Loading…
					
					
				
		Reference in new issue