fenix/Simple-Camera
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Camera.git synced 2025-04-24 04:07:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

some refactoring, no real functionality change

Browse Source
This commit is contained in:
tibbi 2016-06-19 00:11:14 +02:00
parent c2d91be4f1
commit ecd50486d2
10 changed files with 355 additions and 333 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/AndroidManifest.xml
View File

@ -17,7 +17,7 @@
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/AppTheme"> android:theme="@style/AppTheme">
<activity <activity
android:name=".MainActivity" android:name=".activities.MainActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:theme="@style/FullScreenTheme"> android:theme="@style/FullScreenTheme">
<intent-filter> <intent-filter>
@ -38,15 +38,15 @@
</activity> </activity>
<activity <activity
android:name=".LicenseActivity" android:name=".activities.LicenseActivity"
android:label="@string/third_party_licences"/> android:label="@string/third_party_licences"/>
<activity <activity
android:name=".AboutActivity" android:name=".activities.AboutActivity"
android:label="@string/about"/> android:label="@string/about"/>
<activity <activity
android:name=".SettingsActivity" android:name=".activities.SettingsActivity"
android:label="@string/settings"/> android:label="@string/settings"/>
<receiver <receiver

12
app/src/main/java/com/simplemobiletools/camera/Config.java
View File

@ -4,29 +4,29 @@ import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
public class Config { public class Config {
private SharedPreferences prefs; private SharedPreferences mPrefs;
public static Config newInstance(Context context) { public static Config newInstance(Context context) {
return new Config(context); return new Config(context);
} }
public Config(Context context) { public Config(Context context) {
prefs = context.getSharedPreferences(Constants.PREFS_KEY, Context.MODE_PRIVATE); mPrefs = context.getSharedPreferences(Constants.PREFS_KEY, Context.MODE_PRIVATE);
} }
public boolean getLongTapEnabled() { public boolean getLongTapEnabled() {
return prefs.getBoolean(Constants.LONG_TAP, true); return mPrefs.getBoolean(Constants.LONG_TAP, true);
} }
public void setLongTapEnabled(boolean enabled) { public void setLongTapEnabled(boolean enabled) {
prefs.edit().putBoolean(Constants.LONG_TAP, enabled).apply(); mPrefs.edit().putBoolean(Constants.LONG_TAP, enabled).apply();
} }
public boolean getFocusBeforeCaptureEnabled() { public boolean getFocusBeforeCaptureEnabled() {
return prefs.getBoolean(Constants.FOCUS_BEFORE_CAPTURE, false); return mPrefs.getBoolean(Constants.FOCUS_BEFORE_CAPTURE, false);
} }
public void setFocusBeforeCaptureEnabled(boolean enabled) { public void setFocusBeforeCaptureEnabled(boolean enabled) {
prefs.edit().putBoolean(Constants.FOCUS_BEFORE_CAPTURE, enabled).apply(); mPrefs.edit().putBoolean(Constants.FOCUS_BEFORE_CAPTURE, enabled).apply();
} }
} }

4
app/src/main/java/com/simplemobiletools/camera/HardwareShutterReceiver.java
View File

@ -4,11 +4,13 @@ import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import com.simplemobiletools.camera.activities.MainActivity;
public class HardwareShutterReceiver extends BroadcastReceiver { public class HardwareShutterReceiver extends BroadcastReceiver {
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
Intent mainIntent = new Intent(context.getApplicationContext(), MainActivity.class); final Intent mainIntent = new Intent(context.getApplicationContext(), MainActivity.class);
mainIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK); mainIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK);
context.startActivity(mainIntent); context.startActivity(mainIntent);
} }

4
app/src/main/java/com/simplemobiletools/camera/PhotoProcessor.java
View File

@ -4,6 +4,8 @@ import android.net.Uri;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.util.Log; import android.util.Log;
import com.simplemobiletools.camera.activities.MainActivity;
import java.io.File; import java.io.File;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.FileOutputStream; import java.io.FileOutputStream;
@ -61,7 +63,7 @@ public class PhotoProcessor extends AsyncTask<byte[], Void, Void> {
@Override @Override
protected void onPostExecute(Void aVoid) { protected void onPostExecute(Void aVoid) {
super.onPostExecute(aVoid); super.onPostExecute(aVoid);
MediaSavedListener listener = mActivity.get(); final MediaSavedListener listener = mActivity.get();
if (listener != null) { if (listener != null) {
listener.mediaSaved(); listener.mediaSaved();
} }

371
app/src/main/java/com/simplemobiletools/camera/Preview.java
View File

@ -19,6 +19,8 @@ import android.view.View;
import android.view.View.OnLongClickListener; import android.view.View.OnLongClickListener;
import android.view.ViewGroup; import android.view.ViewGroup;
import com.simplemobiletools.camera.activities.MainActivity;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
@ -31,133 +33,134 @@ public class Preview extends ViewGroup implements SurfaceHolder.Callback, View.O
private static final int PHOTO_PREVIEW_LENGTH = 1000; private static final int PHOTO_PREVIEW_LENGTH = 1000;
private static final float RATIO_TOLERANCE = 0.1f; private static final float RATIO_TOLERANCE = 0.1f;
private static SurfaceHolder surfaceHolder; private static SurfaceHolder mSurfaceHolder;
private static Camera camera; private static Camera mCamera;
private static List<Camera.Size> supportedPreviewSizes; private static List<Camera.Size> mSupportedPreviewSizes;
private static SurfaceView surfaceView; private static SurfaceView mSurfaceView;
private static Camera.Size previewSize; private static Camera.Size mPreviewSize;
private static boolean canTakePicture; private static MainActivity mActivity;
private static MainActivity activity; private static Camera.Parameters mParameters;
private static int currCameraId; private static PreviewListener mCallback;
private static boolean isFlashEnabled; private static MediaRecorder mRecorder;
private static Camera.Parameters parameters; private static String mCurVideoPath;
private static PreviewListener callback; private static Point mScreenSize;
private static MediaRecorder recorder; private static Uri mTargetUri;
private static boolean isRecording;
private static boolean isVideoMode; private static boolean mCanTakePicture;
private static boolean isSurfaceCreated; private static boolean mIsFlashEnabled;
private static boolean switchToVideoAsap; private static boolean mIsRecording;
private static boolean isVideoCaptureIntent; private static boolean mIsVideoMode;
private static boolean focusBeforeCapture; private static boolean mIsSurfaceCreated;
private boolean setupPreviewAfterMeasure; private static boolean mSwitchToVideoAsap;
private static String curVideoPath; private static boolean mIsVideoCaptureIntent;
private static int lastClickX; private static boolean mFocusBeforeCapture;
private static int lastClickY; private static boolean mSetupPreviewAfterMeasure;
private static int initVideoRotation; private static int mLastClickX;
private static Point screenSize; private static int mLastClickY;
private static Uri targetUri; private static int mInitVideoRotation;
private static int mCurrCameraId;
public Preview(Context context) { public Preview(Context context) {
super(context); super(context);
} }
public Preview(MainActivity act, SurfaceView sv, PreviewListener cb) { public Preview(MainActivity activity, SurfaceView surfaceView, PreviewListener previewListener) {
super(act); super(activity);
activity = act; mActivity = activity;
callback = cb; mCallback = previewListener;
surfaceView = sv; mSurfaceView = surfaceView;
surfaceHolder = surfaceView.getHolder(); mSurfaceHolder = mSurfaceView.getHolder();
surfaceHolder.addCallback(this); mSurfaceHolder.addCallback(this);
surfaceHolder.setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS); mSurfaceHolder.setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS);
canTakePicture = false; mCanTakePicture = false;
surfaceView.setOnTouchListener(this); mSurfaceView.setOnTouchListener(this);
surfaceView.setOnClickListener(this); mSurfaceView.setOnClickListener(this);
isFlashEnabled = false; mIsFlashEnabled = false;
isVideoMode = false; mIsVideoMode = false;
isSurfaceCreated = false; mIsSurfaceCreated = false;
setupPreviewAfterMeasure = false; mSetupPreviewAfterMeasure = false;
curVideoPath = ""; mCurVideoPath = "";
screenSize = Utils.getScreenSize(activity); mScreenSize = Utils.getScreenSize(mActivity);
} }
public void trySwitchToVideo() { public void trySwitchToVideo() {
if (isSurfaceCreated) { if (mIsSurfaceCreated) {
initRecorder(); initRecorder();
} else { } else {
switchToVideoAsap = true; mSwitchToVideoAsap = true;
} }
} }
public void setIsVideoCaptureIntent() { public void setIsVideoCaptureIntent() {
isVideoCaptureIntent = true; mIsVideoCaptureIntent = true;
} }
public boolean setCamera(int cameraId) { public boolean setCamera(int cameraId) {
currCameraId = cameraId; mCurrCameraId = cameraId;
Camera newCamera; Camera newCamera;
try { try {
newCamera = Camera.open(cameraId); newCamera = Camera.open(cameraId);
callback.setIsCameraAvailable(true); mCallback.setIsCameraAvailable(true);
} catch (Exception e) { } catch (Exception e) {
Utils.showToast(getContext(), R.string.camera_open_error); Utils.showToast(getContext(), R.string.camera_open_error);
Log.e(TAG, "setCamera open " + e.getMessage()); Log.e(TAG, "setCamera open " + e.getMessage());
callback.setIsCameraAvailable(false); mCallback.setIsCameraAvailable(false);
return false; return false;
} }
if (camera == newCamera) { if (mCamera == newCamera) {
return false; return false;
} }
releaseCamera(); releaseCamera();
camera = newCamera; mCamera = newCamera;
if (camera != null) { if (mCamera != null) {
parameters = camera.getParameters(); mParameters = mCamera.getParameters();
supportedPreviewSizes = parameters.getSupportedPreviewSizes(); mSupportedPreviewSizes = mParameters.getSupportedPreviewSizes();
requestLayout(); requestLayout();
invalidate(); invalidate();
setupPreviewAfterMeasure = true; mSetupPreviewAfterMeasure = true;
final List<String> focusModes = parameters.getSupportedFocusModes(); final List<String> focusModes = mParameters.getSupportedFocusModes();
if (focusModes.contains(Camera.Parameters.FOCUS_MODE_CONTINUOUS_PICTURE)) if (focusModes.contains(Camera.Parameters.FOCUS_MODE_CONTINUOUS_PICTURE))
parameters.setFocusMode(Camera.Parameters.FOCUS_MODE_CONTINUOUS_PICTURE); mParameters.setFocusMode(Camera.Parameters.FOCUS_MODE_CONTINUOUS_PICTURE);
final int rotation = getPreviewRotation(cameraId); final int rotation = getPreviewRotation(cameraId);
camera.setDisplayOrientation(rotation); mCamera.setDisplayOrientation(rotation);
camera.setParameters(parameters); mCamera.setParameters(mParameters);
if (canTakePicture) { if (mCanTakePicture) {
try { try {
camera.setPreviewDisplay(surfaceHolder); mCamera.setPreviewDisplay(mSurfaceHolder);
} catch (IOException e) { } catch (IOException e) {
Log.e(TAG, "setCamera setPreviewDisplay " + e.getMessage()); Log.e(TAG, "setCamera setPreviewDisplay " + e.getMessage());
return false; return false;
} }
} }
callback.setFlashAvailable(Utils.hasFlash(camera)); mCallback.setFlashAvailable(Utils.hasFlash(mCamera));
} }
if (isVideoMode) { if (mIsVideoMode) {
initRecorder(); initRecorder();
} }
final boolean isLongTapEnabled = Config.newInstance(getContext()).getLongTapEnabled(); final boolean isLongTapEnabled = Config.newInstance(getContext()).getLongTapEnabled();
surfaceView.setOnLongClickListener(isLongTapEnabled ? this : null); mSurfaceView.setOnLongClickListener(isLongTapEnabled ? this : null);
focusBeforeCapture = Config.newInstance(getContext()).getFocusBeforeCaptureEnabled(); mFocusBeforeCapture = Config.newInstance(getContext()).getFocusBeforeCaptureEnabled();
return true; return true;
} }
public void setTargetUri(Uri uri) { public void setTargetUri(Uri uri) {
targetUri = uri; mTargetUri = uri;
} }
private static int getPreviewRotation(int cameraId) { private static int getPreviewRotation(int cameraId) {
final Camera.CameraInfo info = Utils.getCameraInfo(cameraId); final Camera.CameraInfo info = Utils.getCameraInfo(cameraId);
int degrees = getRotationDegrees(); final int degrees = getRotationDegrees();
int result; int result;
if (info.facing == Camera.CameraInfo.CAMERA_FACING_FRONT) { if (info.facing == Camera.CameraInfo.CAMERA_FACING_FRONT) {
@ -171,7 +174,7 @@ public class Preview extends ViewGroup implements SurfaceHolder.Callback, View.O
} }
private static int getMediaRotation(int cameraId) { private static int getMediaRotation(int cameraId) {
int degrees = getRotationDegrees(); final int degrees = getRotationDegrees();
final Camera.CameraInfo info = Utils.getCameraInfo(cameraId); final Camera.CameraInfo info = Utils.getCameraInfo(cameraId);
if (info.facing == Camera.CameraInfo.CAMERA_FACING_FRONT) { if (info.facing == Camera.CameraInfo.CAMERA_FACING_FRONT) {
return (360 + info.orientation + degrees) % 360; return (360 + info.orientation + degrees) % 360;
@ -181,7 +184,7 @@ public class Preview extends ViewGroup implements SurfaceHolder.Callback, View.O
} }
private static int getRotationDegrees() { private static int getRotationDegrees() {
int rotation = activity.getWindowManager().getDefaultDisplay().getRotation(); int rotation = mActivity.getWindowManager().getDefaultDisplay().getRotation();
switch (rotation) { switch (rotation) {
case Surface.ROTATION_0: case Surface.ROTATION_0:
return 0; return 0;
@ -197,7 +200,7 @@ public class Preview extends ViewGroup implements SurfaceHolder.Callback, View.O
} }
public void tryTakePicture() { public void tryTakePicture() {
if (focusBeforeCapture) { if (mFocusBeforeCapture) {
focusArea(true); focusArea(true);
} else { } else {
takePicture(); takePicture();
@ -205,28 +208,28 @@ public class Preview extends ViewGroup implements SurfaceHolder.Callback, View.O
} }
private void takePicture() { private void takePicture() {
if (canTakePicture) { if (mCanTakePicture) {
if (isFlashEnabled) { if (mIsFlashEnabled) {
parameters.setFlashMode(Camera.Parameters.FLASH_MODE_TORCH); mParameters.setFlashMode(Camera.Parameters.FLASH_MODE_TORCH);
} else { } else {
parameters.setFlashMode(Camera.Parameters.FLASH_MODE_OFF); mParameters.setFlashMode(Camera.Parameters.FLASH_MODE_OFF);
} }
int rotation = getMediaRotation(currCameraId); int rotation = getMediaRotation(mCurrCameraId);
rotation += compensateDeviceRotation(); rotation += compensateDeviceRotation();
final Camera.Size maxSize = getOptimalPictureSize(); final Camera.Size maxSize = getOptimalPictureSize();
parameters.setPictureSize(maxSize.width, maxSize.height); mParameters.setPictureSize(maxSize.width, maxSize.height);
parameters.setRotation(rotation % 360); mParameters.setRotation(rotation % 360);
MediaPlayer.create(getContext(), R.raw.camera_shutter).start(); MediaPlayer.create(getContext(), R.raw.camera_shutter).start();
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) { if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) {
camera.enableShutterSound(false); mCamera.enableShutterSound(false);
} }
camera.setParameters(parameters); mCamera.setParameters(mParameters);
camera.takePicture(null, null, takePictureCallback); mCamera.takePicture(null, null, takePictureCallback);
} }
canTakePicture = false; mCanTakePicture = false;
} }
private Camera.PictureCallback takePictureCallback = new Camera.PictureCallback() { private Camera.PictureCallback takePictureCallback = new Camera.PictureCallback() {
@ -235,24 +238,24 @@ public class Preview extends ViewGroup implements SurfaceHolder.Callback, View.O
new Handler().postDelayed(new Runnable() { new Handler().postDelayed(new Runnable() {
@Override @Override
public void run() { public void run() {
if (camera != null) { if (mCamera != null) {
camera.startPreview(); mCamera.startPreview();
} }
canTakePicture = true; mCanTakePicture = true;
} }
}, PHOTO_PREVIEW_LENGTH); }, PHOTO_PREVIEW_LENGTH);
new PhotoProcessor(activity, targetUri).execute(data); new PhotoProcessor(mActivity, mTargetUri).execute(data);
if (isFlashEnabled) { if (mIsFlashEnabled) {
parameters.setFlashMode(Camera.Parameters.FLASH_MODE_OFF); mParameters.setFlashMode(Camera.Parameters.FLASH_MODE_OFF);
camera.setParameters(parameters); mCamera.setParameters(mParameters);
} }
} }
}; };
private Camera.Size getOptimalPictureSize() { private Camera.Size getOptimalPictureSize() {
final List<Camera.Size> sizes = parameters.getSupportedPictureSizes(); final List<Camera.Size> sizes = mParameters.getSupportedPictureSizes();
Camera.Size maxSize = sizes.get(0); Camera.Size maxSize = sizes.get(0);
for (Camera.Size size : sizes) { for (Camera.Size size : sizes) {
final boolean isEightMegapixelsMax = isEightMegapixelsMax(size); final boolean isEightMegapixelsMax = isEightMegapixelsMax(size);
@ -277,7 +280,7 @@ public class Preview extends ViewGroup implements SurfaceHolder.Callback, View.O
} }
private Camera.Size getOptimalVideoSize() { private Camera.Size getOptimalVideoSize() {
final List<Camera.Size> sizes = parameters.getSupportedVideoSizes(); final List<Camera.Size> sizes = mParameters.getSupportedVideoSizes();
Camera.Size maxSize = sizes.get(0); Camera.Size maxSize = sizes.get(0);
for (Camera.Size size : sizes) { for (Camera.Size size : sizes) {
final boolean isSixteenToNine = isSixteenToNine(size); final boolean isSixteenToNine = isSixteenToNine(size);
@ -291,8 +294,8 @@ public class Preview extends ViewGroup implements SurfaceHolder.Callback, View.O
private int compensateDeviceRotation() { private int compensateDeviceRotation() {
int degrees = 0; int degrees = 0;
boolean isFrontCamera = (currCameraId == Camera.CameraInfo.CAMERA_FACING_FRONT); boolean isFrontCamera = (mCurrCameraId == Camera.CameraInfo.CAMERA_FACING_FRONT);
int deviceOrientation = callback.getCurrentOrientation(); int deviceOrientation = mCallback.getCurrentOrientation();
if (deviceOrientation == Constants.ORIENT_LANDSCAPE_LEFT) { if (deviceOrientation == Constants.ORIENT_LANDSCAPE_LEFT) {
degrees += isFrontCamera ? 90 : 270; degrees += isFrontCamera ? 90 : 270;
} else if (deviceOrientation == Constants.ORIENT_LANDSCAPE_RIGHT) { } else if (deviceOrientation == Constants.ORIENT_LANDSCAPE_RIGHT) {
@ -302,33 +305,33 @@ public class Preview extends ViewGroup implements SurfaceHolder.Callback, View.O
} }
private int getFinalRotation() { private int getFinalRotation() {
int rotation = getMediaRotation(currCameraId); int rotation = getMediaRotation(mCurrCameraId);
rotation += compensateDeviceRotation(); rotation += compensateDeviceRotation();
return rotation % 360; return rotation % 360;
} }
private void focusArea(final boolean takePictureAfter) { private void focusArea(final boolean takePictureAfter) {
if (camera == null) if (mCamera == null)
return; return;
camera.cancelAutoFocus(); mCamera.cancelAutoFocus();
final Rect focusRect = calculateFocusArea(lastClickX, lastClickY); final Rect focusRect = calculateFocusArea(mLastClickX, mLastClickY);
if (parameters.getMaxNumFocusAreas() > 0) { if (mParameters.getMaxNumFocusAreas() > 0) {
final List<Camera.Area> focusAreas = new ArrayList<>(1); final List<Camera.Area> focusAreas = new ArrayList<>(1);
focusAreas.add(new Camera.Area(focusRect, 1000)); focusAreas.add(new Camera.Area(focusRect, 1000));
parameters.setFocusAreas(focusAreas); mParameters.setFocusAreas(focusAreas);
} }
camera.setParameters(parameters); mCamera.setParameters(mParameters);
camera.autoFocus(new Camera.AutoFocusCallback() { mCamera.autoFocus(new Camera.AutoFocusCallback() {
@Override @Override
public void onAutoFocus(boolean success, Camera camera) { public void onAutoFocus(boolean success, Camera camera) {
camera.cancelAutoFocus(); camera.cancelAutoFocus();
final List<String> focusModes = parameters.getSupportedFocusModes(); final List<String> focusModes = mParameters.getSupportedFocusModes();
if (focusModes.contains(Camera.Parameters.FOCUS_MODE_CONTINUOUS_PICTURE)) if (focusModes.contains(Camera.Parameters.FOCUS_MODE_CONTINUOUS_PICTURE))
parameters.setFocusMode(Camera.Parameters.FOCUS_MODE_CONTINUOUS_PICTURE); mParameters.setFocusMode(Camera.Parameters.FOCUS_MODE_CONTINUOUS_PICTURE);
camera.setParameters(parameters); camera.setParameters(mParameters);
if (takePictureAfter) { if (takePictureAfter) {
takePicture(); takePicture();
} }
@ -337,8 +340,8 @@ public class Preview extends ViewGroup implements SurfaceHolder.Callback, View.O
} }
private Rect calculateFocusArea(float x, float y) { private Rect calculateFocusArea(float x, float y) {
int left = Float.valueOf((x / surfaceView.getWidth()) * 2000 - 1000).intValue(); int left = Float.valueOf((x / mSurfaceView.getWidth()) * 2000 - 1000).intValue();
int top = Float.valueOf((y / surfaceView.getHeight()) * 2000 - 1000).intValue(); int top = Float.valueOf((y / mSurfaceView.getHeight()) * 2000 - 1000).intValue();
int tmp = left; int tmp = left;
left = top; left = top;
@ -354,10 +357,10 @@ public class Preview extends ViewGroup implements SurfaceHolder.Callback, View.O
public void releaseCamera() { public void releaseCamera() {
stopRecording(); stopRecording();
if (camera != null) { if (mCamera != null) {
camera.stopPreview(); mCamera.stopPreview();
camera.release(); mCamera.release();
camera = null; mCamera = null;
} }
cleanupRecorder(); cleanupRecorder();
@ -365,13 +368,13 @@ public class Preview extends ViewGroup implements SurfaceHolder.Callback, View.O
@Override @Override
public void surfaceCreated(SurfaceHolder holder) { public void surfaceCreated(SurfaceHolder holder) {
isSurfaceCreated = true; mIsSurfaceCreated = true;
try { try {
if (camera != null) { if (mCamera != null) {
camera.setPreviewDisplay(surfaceHolder); mCamera.setPreviewDisplay(mSurfaceHolder);
} }
if (switchToVideoAsap) if (mSwitchToVideoAsap)
initRecorder(); initRecorder();
} catch (IOException e) { } catch (IOException e) {
Log.e(TAG, "surfaceCreated IOException " + e.getMessage()); Log.e(TAG, "surfaceCreated IOException " + e.getMessage());
@ -380,40 +383,40 @@ public class Preview extends ViewGroup implements SurfaceHolder.Callback, View.O
@Override @Override
public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) { public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
isSurfaceCreated = true; mIsSurfaceCreated = true;
if (isVideoMode) { if (mIsVideoMode) {
initRecorder(); initRecorder();
} }
} }
@Override @Override
public void surfaceDestroyed(SurfaceHolder holder) { public void surfaceDestroyed(SurfaceHolder holder) {
isSurfaceCreated = false; mIsSurfaceCreated = false;
if (camera != null) { if (mCamera != null) {
camera.stopPreview(); mCamera.stopPreview();
} }
cleanupRecorder(); cleanupRecorder();
} }
private void setupPreview() { private void setupPreview() {
canTakePicture = true; mCanTakePicture = true;
if (camera != null && previewSize != null) { if (mCamera != null && mPreviewSize != null) {
parameters.setPreviewSize(previewSize.width, previewSize.height); mParameters.setPreviewSize(mPreviewSize.width, mPreviewSize.height);
camera.setParameters(parameters); mCamera.setParameters(mParameters);
camera.startPreview(); mCamera.startPreview();
} }
} }
private void cleanupRecorder() { private void cleanupRecorder() {
if (recorder != null) { if (mRecorder != null) {
if (isRecording) { if (mIsRecording) {
stopRecording(); stopRecording();
} }
recorder.release(); mRecorder.release();
recorder = null; mRecorder = null;
} }
} }
@ -456,23 +459,23 @@ public class Preview extends ViewGroup implements SurfaceHolder.Callback, View.O
@Override @Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
setMeasuredDimension(screenSize.x, screenSize.y); setMeasuredDimension(mScreenSize.x, mScreenSize.y);
if (supportedPreviewSizes != null) { if (mSupportedPreviewSizes != null) {
previewSize = getOptimalPreviewSize(supportedPreviewSizes, screenSize.x, screenSize.y); mPreviewSize = getOptimalPreviewSize(mSupportedPreviewSizes, mScreenSize.x, mScreenSize.y);
final LayoutParams lp = surfaceView.getLayoutParams(); final LayoutParams lp = mSurfaceView.getLayoutParams();
if (screenSize.x > previewSize.height) { if (mScreenSize.x > mPreviewSize.height) {
final float ratio = (float) screenSize.x / previewSize.height; final float ratio = (float) mScreenSize.x / mPreviewSize.height;
lp.width = (int) (previewSize.height * ratio); lp.width = (int) (mPreviewSize.height * ratio);
lp.height = (int) (previewSize.width * ratio); lp.height = (int) (mPreviewSize.width * ratio);
} else { } else {
lp.width = previewSize.height; lp.width = mPreviewSize.height;
lp.height = previewSize.width; lp.height = mPreviewSize.width;
} }
if (setupPreviewAfterMeasure) { if (mSetupPreviewAfterMeasure) {
setupPreviewAfterMeasure = false; mSetupPreviewAfterMeasure = false;
setupPreview(); setupPreview();
} }
} }
@ -480,55 +483,55 @@ public class Preview extends ViewGroup implements SurfaceHolder.Callback, View.O
@Override @Override
public boolean onTouch(View v, MotionEvent event) { public boolean onTouch(View v, MotionEvent event) {
lastClickX = (int) event.getX(); mLastClickX = (int) event.getX();
lastClickY = (int) event.getY(); mLastClickY = (int) event.getY();
return false; return false;
} }
public void enableFlash() { public void enableFlash() {
if (isVideoMode) { if (mIsVideoMode) {
parameters.setFlashMode(Camera.Parameters.FLASH_MODE_TORCH); mParameters.setFlashMode(Camera.Parameters.FLASH_MODE_TORCH);
camera.setParameters(parameters); mCamera.setParameters(mParameters);
} }
isFlashEnabled = true; mIsFlashEnabled = true;
} }
public void disableFlash() { public void disableFlash() {
isFlashEnabled = false; mIsFlashEnabled = false;
parameters.setFlashMode(Camera.Parameters.FLASH_MODE_OFF); mParameters.setFlashMode(Camera.Parameters.FLASH_MODE_OFF);
camera.setParameters(parameters); mCamera.setParameters(mParameters);
} }
public void initPhotoMode() { public void initPhotoMode() {
isRecording = false; mIsRecording = false;
isVideoMode = false; mIsVideoMode = false;
stopRecording(); stopRecording();
cleanupRecorder(); cleanupRecorder();
} }
// VIDEO RECORDING // VIDEO RECORDING
public boolean initRecorder() { public boolean initRecorder() {
if (camera == null || recorder != null || !isSurfaceCreated) if (mCamera == null || mRecorder != null || !mIsSurfaceCreated)
return false; return false;
switchToVideoAsap = false; mSwitchToVideoAsap = false;
final Camera.Size preferred = parameters.getPreferredPreviewSizeForVideo(); final Camera.Size preferred = mParameters.getPreferredPreviewSizeForVideo();
if (preferred == null) if (preferred == null)
return false; return false;
parameters.setPreviewSize(preferred.width, preferred.height); mParameters.setPreviewSize(preferred.width, preferred.height);
camera.setParameters(parameters); mCamera.setParameters(mParameters);
isRecording = false; mIsRecording = false;
isVideoMode = true; mIsVideoMode = true;
recorder = new MediaRecorder(); mRecorder = new MediaRecorder();
recorder.setCamera(camera); mRecorder.setCamera(mCamera);
recorder.setVideoSource(MediaRecorder.VideoSource.DEFAULT); mRecorder.setVideoSource(MediaRecorder.VideoSource.DEFAULT);
recorder.setAudioSource(MediaRecorder.AudioSource.DEFAULT); mRecorder.setAudioSource(MediaRecorder.AudioSource.DEFAULT);
curVideoPath = Utils.getOutputMediaFile(getContext(), false); mCurVideoPath = Utils.getOutputMediaFile(getContext(), false);
if (curVideoPath.isEmpty()) { if (mCurVideoPath.isEmpty()) {
Utils.showToast(getContext(), R.string.video_creating_error); Utils.showToast(getContext(), R.string.video_creating_error);
return false; return false;
} }
@ -537,16 +540,16 @@ public class Preview extends ViewGroup implements SurfaceHolder.Callback, View.O
final CamcorderProfile cpHigh = CamcorderProfile.get(CamcorderProfile.QUALITY_HIGH); final CamcorderProfile cpHigh = CamcorderProfile.get(CamcorderProfile.QUALITY_HIGH);
cpHigh.videoFrameWidth = videoSize.width; cpHigh.videoFrameWidth = videoSize.width;
cpHigh.videoFrameHeight = videoSize.height; cpHigh.videoFrameHeight = videoSize.height;
recorder.setProfile(cpHigh); mRecorder.setProfile(cpHigh);
recorder.setOutputFile(curVideoPath); mRecorder.setOutputFile(mCurVideoPath);
recorder.setPreviewDisplay(surfaceHolder.getSurface()); mRecorder.setPreviewDisplay(mSurfaceHolder.getSurface());
int rotation = getFinalRotation(); int rotation = getFinalRotation();
initVideoRotation = rotation; mInitVideoRotation = rotation;
recorder.setOrientationHint(rotation); mRecorder.setOrientationHint(rotation);
try { try {
recorder.prepare(); mRecorder.prepare();
} catch (Exception e) { } catch (Exception e) {
Utils.showToast(getContext(), R.string.video_setup_error); Utils.showToast(getContext(), R.string.video_setup_error);
Log.e(TAG, "initRecorder " + e.getMessage()); Log.e(TAG, "initRecorder " + e.getMessage());
@ -557,25 +560,25 @@ public class Preview extends ViewGroup implements SurfaceHolder.Callback, View.O
} }
public boolean toggleRecording() { public boolean toggleRecording() {
if (isRecording) { if (mIsRecording) {
stopRecording(); stopRecording();
initRecorder(); initRecorder();
} else { } else {
startRecording(); startRecording();
} }
return isRecording; return mIsRecording;
} }
private void startRecording() { private void startRecording() {
if (initVideoRotation != getFinalRotation()) { if (mInitVideoRotation != getFinalRotation()) {
cleanupRecorder(); cleanupRecorder();
initRecorder(); initRecorder();
} }
try { try {
camera.unlock(); mCamera.unlock();
recorder.start(); mRecorder.start();
isRecording = true; mIsRecording = true;
} catch (Exception e) { } catch (Exception e) {
Utils.showToast(getContext(), R.string.video_setup_error); Utils.showToast(getContext(), R.string.video_setup_error);
Log.e(TAG, "toggleRecording " + e.getMessage()); Log.e(TAG, "toggleRecording " + e.getMessage());
@ -584,23 +587,23 @@ public class Preview extends ViewGroup implements SurfaceHolder.Callback, View.O
} }
private void stopRecording() { private void stopRecording() {
if (recorder != null && isRecording) { if (mRecorder != null && mIsRecording) {
try { try {
recorder.stop(); mRecorder.stop();
final String[] paths = {curVideoPath}; final String[] paths = {mCurVideoPath};
MediaScannerConnection.scanFile(getContext(), paths, null, isVideoCaptureIntent ? this : null); MediaScannerConnection.scanFile(getContext(), paths, null, mIsVideoCaptureIntent ? this : null);
} catch (RuntimeException e) { } catch (RuntimeException e) {
new File(curVideoPath).delete(); new File(mCurVideoPath).delete();
Utils.showToast(getContext(), R.string.video_saving_error); Utils.showToast(getContext(), R.string.video_saving_error);
Log.e(TAG, "stopRecording " + e.getMessage()); Log.e(TAG, "stopRecording " + e.getMessage());
releaseCamera(); releaseCamera();
} finally { } finally {
recorder = null; mRecorder = null;
isRecording = false; mIsRecording = false;
} }
} }
final File file = new File(curVideoPath); final File file = new File(mCurVideoPath);
if (file.exists() && file.length() == 0) { if (file.exists() && file.length() == 0) {
file.delete(); file.delete();
} }
@ -608,7 +611,7 @@ public class Preview extends ViewGroup implements SurfaceHolder.Callback, View.O
@Override @Override
public boolean onLongClick(View v) { public boolean onLongClick(View v) {
callback.activateShutter(); mCallback.activateShutter();
return true; return true;
} }
@ -619,7 +622,7 @@ public class Preview extends ViewGroup implements SurfaceHolder.Callback, View.O
@Override @Override
public void onScanCompleted(String path, Uri uri) { public void onScanCompleted(String path, Uri uri) {
callback.videoSaved(uri); mCallback.videoSaved(uri);
} }
public interface PreviewListener { public interface PreviewListener {

36
app/src/main/java/com/simplemobiletools/camera/AboutActivity.java → app/src/main/java/com/simplemobiletools/camera/activities/AboutActivity.java
View File

@ -1,4 +1,4 @@
package com.simplemobiletools.camera; package com.simplemobiletools.camera.activities;
import android.content.Intent; import android.content.Intent;
import android.content.res.Resources; import android.content.res.Resources;
@ -7,10 +7,12 @@ import android.support.v7.app.AppCompatActivity;
import android.text.Html; import android.text.Html;
import android.text.method.LinkMovementMethod; import android.text.method.LinkMovementMethod;
import android.view.Menu; import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem; import android.view.MenuItem;
import android.widget.TextView; import android.widget.TextView;
import com.simplemobiletools.camera.BuildConfig;
import com.simplemobiletools.camera.R;
import java.util.Calendar; import java.util.Calendar;
import butterknife.BindView; import butterknife.BindView;
@ -18,17 +20,18 @@ import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
public class AboutActivity extends AppCompatActivity { public class AboutActivity extends AppCompatActivity {
@BindView(R.id.about_copyright) TextView copyright; @BindView(R.id.about_copyright) TextView mCopyright;
@BindView(R.id.about_version) TextView version; @BindView(R.id.about_version) TextView mVersion;
@BindView(R.id.about_email) TextView emailTV; @BindView(R.id.about_email) TextView mEmailTV;
private Resources res;
private Resources mRes;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_about); setContentView(R.layout.activity_about);
ButterKnife.bind(this); ButterKnife.bind(this);
res = getResources(); mRes = getResources();
setupEmail(); setupEmail();
setupVersion(); setupVersion();
@ -37,8 +40,7 @@ public class AboutActivity extends AppCompatActivity {
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
MenuInflater inflater = getMenuInflater(); getMenuInflater().inflate(R.menu.menu, menu);
inflater.inflate(R.menu.menu, menu);
return true; return true;
} }
@ -55,23 +57,23 @@ public class AboutActivity extends AppCompatActivity {
} }
private void setupEmail() { private void setupEmail() {
final String email = res.getString(R.string.email); final String email = mRes.getString(R.string.email);
final String appName = res.getString(R.string.app_name); final String appName = mRes.getString(R.string.app_name);
final String href = "<a href=\"mailto:" + email + "?subject=" + appName + "\">" + email + "</a>"; final String href = "<a href=\"mailto:" + email + "?subject=" + appName + "\">" + email + "</a>";
emailTV.setText(Html.fromHtml(href)); mEmailTV.setText(Html.fromHtml(href));
emailTV.setMovementMethod(LinkMovementMethod.getInstance()); mEmailTV.setMovementMethod(LinkMovementMethod.getInstance());
} }
private void setupVersion() { private void setupVersion() {
final String versionName = BuildConfig.VERSION_NAME; final String versionName = BuildConfig.VERSION_NAME;
final String versionText = String.format(res.getString(R.string.version), versionName); final String versionText = String.format(mRes.getString(R.string.version), versionName);
version.setText(versionText); mVersion.setText(versionText);
} }
private void setupCopyright() { private void setupCopyright() {
final int year = Calendar.getInstance().get(Calendar.YEAR); final int year = Calendar.getInstance().get(Calendar.YEAR);
final String copyrightText = String.format(res.getString(R.string.copyright), year); final String copyrightText = String.format(mRes.getString(R.string.copyright), year);
copyright.setText(copyrightText); mCopyright.setText(copyrightText);
} }
@OnClick(R.id.about_license) @OnClick(R.id.about_license)

5
app/src/main/java/com/simplemobiletools/camera/LicenseActivity.java → app/src/main/java/com/simplemobiletools/camera/activities/LicenseActivity.java
View File

@ -1,14 +1,17 @@
package com.simplemobiletools.camera; package com.simplemobiletools.camera.activities;
import android.content.Intent; import android.content.Intent;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.support.v7.app.AppCompatActivity; import android.support.v7.app.AppCompatActivity;
import com.simplemobiletools.camera.R;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
public class LicenseActivity extends AppCompatActivity { public class LicenseActivity extends AppCompatActivity {
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);

225
app/src/main/java/com/simplemobiletools/camera/MainActivity.java → app/src/main/java/com/simplemobiletools/camera/activities/MainActivity.java
View File

@ -1,4 +1,4 @@
package com.simplemobiletools.camera; package com.simplemobiletools.camera.activities;
import android.Manifest; import android.Manifest;
import android.content.Intent; import android.content.Intent;
@ -26,7 +26,12 @@ import android.widget.ImageView;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
import android.widget.TextView; import android.widget.TextView;
import com.simplemobiletools.camera.Constants;
import com.simplemobiletools.camera.PhotoProcessor;
import com.simplemobiletools.camera.Preview;
import com.simplemobiletools.camera.Preview.PreviewListener; import com.simplemobiletools.camera.Preview.PreviewListener;
import com.simplemobiletools.camera.R;
import com.simplemobiletools.camera.Utils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -36,29 +41,31 @@ import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
public class MainActivity extends AppCompatActivity implements SensorEventListener, PreviewListener, PhotoProcessor.MediaSavedListener { public class MainActivity extends AppCompatActivity implements SensorEventListener, PreviewListener, PhotoProcessor.MediaSavedListener {
@BindView(R.id.viewHolder) RelativeLayout viewHolder; @BindView(R.id.viewHolder) RelativeLayout mViewHolder;
@BindView(R.id.toggle_camera) ImageView toggleCameraBtn; @BindView(R.id.toggle_camera) ImageView mToggleCameraBtn;
@BindView(R.id.toggle_flash) ImageView toggleFlashBtn; @BindView(R.id.toggle_flash) ImageView mToggleFlashBtn;
@BindView(R.id.toggle_photo_video) ImageView togglePhotoVideoBtn; @BindView(R.id.toggle_photo_video) ImageView mTogglePhotoVideoBtn;
@BindView(R.id.shutter) ImageView shutterBtn; @BindView(R.id.shutter) ImageView mShutterBtn;
@BindView(R.id.video_rec_curr_timer) TextView recCurrTimer; @BindView(R.id.video_rec_curr_timer) TextView mRecCurrTimer;
@BindView(R.id.about) View aboutBtn; @BindView(R.id.about) View mAboutBtn;
private static final int CAMERA_STORAGE_PERMISSION = 1; private static final int CAMERA_STORAGE_PERMISSION = 1;
private static final int AUDIO_PERMISSION = 2; private static final int AUDIO_PERMISSION = 2;
private static SensorManager sensorManager;
private Preview preview; private static SensorManager mSensorManager;
private boolean isFlashEnabled; private static Preview mPreview;
private boolean isInPhotoMode; private static Handler mTimerHandler;
private boolean isAskingPermissions;
private boolean isCameraAvailable; private static boolean mIsFlashEnabled;
private boolean isImageCaptureIntent; private static boolean mIsInPhotoMode;
private boolean isVideoCaptureIntent; private static boolean mIsAskingPermissions;
private boolean isHardwareShutterHandled; private static boolean mIsCameraAvailable;
private int currVideoRecTimer; private static boolean mIsImageCaptureIntent;
private int orientation; private static boolean mIsVideoCaptureIntent;
private int currCamera; private static boolean mIsHardwareShutterHandled;
private Handler timerHandler; private static int mCurrVideoRecTimer;
private static int mOrientation;
private static int mCurrCamera;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
@ -74,8 +81,8 @@ public class MainActivity extends AppCompatActivity implements SensorEventListen
@Override @Override
public boolean onKeyDown(int keyCode, KeyEvent event) { public boolean onKeyDown(int keyCode, KeyEvent event) {
if (keyCode == KeyEvent.KEYCODE_CAMERA && !isHardwareShutterHandled) { if (keyCode == KeyEvent.KEYCODE_CAMERA && !mIsHardwareShutterHandled) {
isHardwareShutterHandled = true; mIsHardwareShutterHandled = true;
shutterPressed(); shutterPressed();
return true; return true;
} else { } else {
@ -86,17 +93,17 @@ public class MainActivity extends AppCompatActivity implements SensorEventListen
@Override @Override
public boolean onKeyUp(int keyCode, KeyEvent event) { public boolean onKeyUp(int keyCode, KeyEvent event) {
if (keyCode == KeyEvent.KEYCODE_CAMERA) { if (keyCode == KeyEvent.KEYCODE_CAMERA) {
isHardwareShutterHandled = false; mIsHardwareShutterHandled = false;
} }
return super.onKeyUp(keyCode, event); return super.onKeyUp(keyCode, event);
} }
private void hideToggleModeAbout() { private void hideToggleModeAbout() {
if (togglePhotoVideoBtn != null) if (mTogglePhotoVideoBtn != null)
togglePhotoVideoBtn.setVisibility(View.GONE); mTogglePhotoVideoBtn.setVisibility(View.GONE);
if (aboutBtn != null) if (mAboutBtn != null)
aboutBtn.setVisibility(View.GONE); mAboutBtn.setVisibility(View.GONE);
} }
private void tryInitCamera() { private void tryInitCamera() {
@ -119,17 +126,17 @@ public class MainActivity extends AppCompatActivity implements SensorEventListen
final Intent intent = getIntent(); final Intent intent = getIntent();
if (intent != null && intent.getAction() != null) { if (intent != null && intent.getAction() != null) {
if (intent.getExtras() != null && intent.getAction().equals(MediaStore.ACTION_IMAGE_CAPTURE)) { if (intent.getExtras() != null && intent.getAction().equals(MediaStore.ACTION_IMAGE_CAPTURE)) {
isImageCaptureIntent = true; mIsImageCaptureIntent = true;
hideToggleModeAbout(); hideToggleModeAbout();
final Object output = intent.getExtras().get(MediaStore.EXTRA_OUTPUT); final Object output = intent.getExtras().get(MediaStore.EXTRA_OUTPUT);
if (output != null && output instanceof Uri) { if (output != null && output instanceof Uri) {
preview.setTargetUri((Uri) output); mPreview.setTargetUri((Uri) output);
} }
} else if (intent.getAction().equals(MediaStore.ACTION_VIDEO_CAPTURE)) { } else if (intent.getAction().equals(MediaStore.ACTION_VIDEO_CAPTURE)) {
isVideoCaptureIntent = true; mIsVideoCaptureIntent = true;
hideToggleModeAbout(); hideToggleModeAbout();
preview.setIsVideoCaptureIntent(); mPreview.setIsVideoCaptureIntent();
shutterBtn.setImageDrawable(getResources().getDrawable(R.mipmap.video_rec)); mShutterBtn.setImageDrawable(getResources().getDrawable(R.mipmap.video_rec));
} }
} }
} }
@ -138,13 +145,13 @@ public class MainActivity extends AppCompatActivity implements SensorEventListen
setContentView(R.layout.activity_main); setContentView(R.layout.activity_main);
ButterKnife.bind(this); ButterKnife.bind(this);
currCamera = Camera.CameraInfo.CAMERA_FACING_BACK; mCurrCamera = Camera.CameraInfo.CAMERA_FACING_BACK;
preview = new Preview(this, (SurfaceView) findViewById(R.id.surfaceView), this); mPreview = new Preview(this, (SurfaceView) findViewById(R.id.surfaceView), this);
preview.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)); mPreview.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
viewHolder.addView(preview); mViewHolder.addView(mPreview);
sensorManager = (SensorManager) getSystemService(SENSOR_SERVICE); mSensorManager = (SensorManager) getSystemService(SENSOR_SERVICE);
isInPhotoMode = true; mIsInPhotoMode = true;
timerHandler = new Handler(); mTimerHandler = new Handler();
} }
private boolean hasCameraAndStoragePermission() { private boolean hasCameraAndStoragePermission() {
@ -154,7 +161,7 @@ public class MainActivity extends AppCompatActivity implements SensorEventListen
@Override @Override
public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) { public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
super.onRequestPermissionsResult(requestCode, permissions, grantResults); super.onRequestPermissionsResult(requestCode, permissions, grantResults);
isAskingPermissions = false; mIsAskingPermissions = false;
if (requestCode == CAMERA_STORAGE_PERMISSION) { if (requestCode == CAMERA_STORAGE_PERMISSION) {
if (hasCameraAndStoragePermission()) { if (hasCameraAndStoragePermission()) {
@ -169,7 +176,7 @@ public class MainActivity extends AppCompatActivity implements SensorEventListen
toggleVideo(); toggleVideo();
} else { } else {
Utils.showToast(getApplicationContext(), R.string.no_audio_permissions); Utils.showToast(getApplicationContext(), R.string.no_audio_permissions);
if (isVideoCaptureIntent) if (mIsVideoCaptureIntent)
finish(); finish();
} }
} }
@ -181,19 +188,19 @@ public class MainActivity extends AppCompatActivity implements SensorEventListen
return; return;
} }
if (currCamera == Camera.CameraInfo.CAMERA_FACING_BACK) { if (mCurrCamera == Camera.CameraInfo.CAMERA_FACING_BACK) {
currCamera = Camera.CameraInfo.CAMERA_FACING_FRONT; mCurrCamera = Camera.CameraInfo.CAMERA_FACING_FRONT;
} else { } else {
currCamera = Camera.CameraInfo.CAMERA_FACING_BACK; mCurrCamera = Camera.CameraInfo.CAMERA_FACING_BACK;
} }
int newIconId = R.mipmap.camera_front; int newIconId = R.mipmap.camera_front;
preview.releaseCamera(); mPreview.releaseCamera();
if (preview.setCamera(currCamera)) { if (mPreview.setCamera(mCurrCamera)) {
if (currCamera == Camera.CameraInfo.CAMERA_FACING_BACK) { if (mCurrCamera == Camera.CameraInfo.CAMERA_FACING_BACK) {
newIconId = R.mipmap.camera_rear; newIconId = R.mipmap.camera_rear;
} }
toggleCameraBtn.setImageResource(newIconId); mToggleCameraBtn.setImageResource(newIconId);
disableFlash(); disableFlash();
hideTimer(); hideTimer();
} else { } else {
@ -207,7 +214,7 @@ public class MainActivity extends AppCompatActivity implements SensorEventListen
return; return;
} }
if (isFlashEnabled) { if (mIsFlashEnabled) {
disableFlash(); disableFlash();
} else { } else {
enableFlash(); enableFlash();
@ -215,15 +222,15 @@ public class MainActivity extends AppCompatActivity implements SensorEventListen
} }
private void disableFlash() { private void disableFlash() {
preview.disableFlash(); mPreview.disableFlash();
isFlashEnabled = false; mIsFlashEnabled = false;
toggleFlashBtn.setImageResource(R.mipmap.flash_off); mToggleFlashBtn.setImageResource(R.mipmap.flash_off);
} }
private void enableFlash() { private void enableFlash() {
preview.enableFlash(); mPreview.enableFlash();
isFlashEnabled = true; mIsFlashEnabled = true;
toggleFlashBtn.setImageResource(R.mipmap.flash_on); mToggleFlashBtn.setImageResource(R.mipmap.flash_on);
} }
@OnClick(R.id.shutter) @OnClick(R.id.shutter)
@ -240,18 +247,18 @@ public class MainActivity extends AppCompatActivity implements SensorEventListen
} }
private void handleShutter() { private void handleShutter() {
if (isInPhotoMode) { if (mIsInPhotoMode) {
preview.tryTakePicture(); mPreview.tryTakePicture();
} else { } else {
final Resources res = getResources(); final Resources res = getResources();
final boolean isRecording = preview.toggleRecording(); final boolean isRecording = mPreview.toggleRecording();
if (isRecording) { if (isRecording) {
shutterBtn.setImageDrawable(res.getDrawable(R.mipmap.video_stop)); mShutterBtn.setImageDrawable(res.getDrawable(R.mipmap.video_stop));
toggleCameraBtn.setVisibility(View.INVISIBLE); mToggleCameraBtn.setVisibility(View.INVISIBLE);
showTimer(); showTimer();
} else { } else {
shutterBtn.setImageDrawable(res.getDrawable(R.mipmap.video_rec)); mShutterBtn.setImageDrawable(res.getDrawable(R.mipmap.video_rec));
toggleCameraBtn.setVisibility(View.VISIBLE); mToggleCameraBtn.setVisibility(View.VISIBLE);
hideTimer(); hideTimer();
} }
} }
@ -276,21 +283,21 @@ public class MainActivity extends AppCompatActivity implements SensorEventListen
if (!Utils.hasAudioPermission(getApplicationContext())) { if (!Utils.hasAudioPermission(getApplicationContext())) {
ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.RECORD_AUDIO}, AUDIO_PERMISSION); ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.RECORD_AUDIO}, AUDIO_PERMISSION);
isAskingPermissions = true; mIsAskingPermissions = true;
return; return;
} }
if (isVideoCaptureIntent) if (mIsVideoCaptureIntent)
preview.trySwitchToVideo(); mPreview.trySwitchToVideo();
disableFlash(); disableFlash();
hideTimer(); hideTimer();
isInPhotoMode = !isInPhotoMode; mIsInPhotoMode = !mIsInPhotoMode;
toggleCameraBtn.setVisibility(View.VISIBLE); mToggleCameraBtn.setVisibility(View.VISIBLE);
} }
private void checkButtons() { private void checkButtons() {
if (isInPhotoMode) { if (mIsInPhotoMode) {
initPhotoButtons(); initPhotoButtons();
} else { } else {
initVideoButtons(true); initVideoButtons(true);
@ -299,19 +306,19 @@ public class MainActivity extends AppCompatActivity implements SensorEventListen
private void initPhotoButtons() { private void initPhotoButtons() {
final Resources res = getResources(); final Resources res = getResources();
togglePhotoVideoBtn.setImageDrawable(res.getDrawable(R.mipmap.videocam)); mTogglePhotoVideoBtn.setImageDrawable(res.getDrawable(R.mipmap.videocam));
shutterBtn.setImageDrawable(res.getDrawable(R.mipmap.camera)); mShutterBtn.setImageDrawable(res.getDrawable(R.mipmap.camera));
preview.initPhotoMode(); mPreview.initPhotoMode();
} }
private void initVideoButtons(boolean warnOnError) { private void initVideoButtons(boolean warnOnError) {
if (preview.initRecorder()) { if (mPreview.initRecorder()) {
final Resources res = getResources(); final Resources res = getResources();
togglePhotoVideoBtn.setImageDrawable(res.getDrawable(R.mipmap.photo)); mTogglePhotoVideoBtn.setImageDrawable(res.getDrawable(R.mipmap.photo));
shutterBtn.setImageDrawable(res.getDrawable(R.mipmap.video_rec)); mShutterBtn.setImageDrawable(res.getDrawable(R.mipmap.video_rec));
toggleCameraBtn.setVisibility(View.VISIBLE); mToggleCameraBtn.setVisibility(View.VISIBLE);
} else { } else {
if (!isVideoCaptureIntent && warnOnError) { if (!mIsVideoCaptureIntent && warnOnError) {
Utils.showToast(getApplicationContext(), R.string.video_mode_error); Utils.showToast(getApplicationContext(), R.string.video_mode_error);
} }
} }
@ -322,14 +329,14 @@ public class MainActivity extends AppCompatActivity implements SensorEventListen
} }
private void hideTimer() { private void hideTimer() {
recCurrTimer.setText(Utils.formatSeconds(0)); mRecCurrTimer.setText(Utils.formatSeconds(0));
recCurrTimer.setVisibility(View.GONE); mRecCurrTimer.setVisibility(View.GONE);
currVideoRecTimer = 0; mCurrVideoRecTimer = 0;
timerHandler.removeCallbacksAndMessages(null); mTimerHandler.removeCallbacksAndMessages(null);
} }
private void showTimer() { private void showTimer() {
recCurrTimer.setVisibility(View.VISIBLE); mRecCurrTimer.setVisibility(View.VISIBLE);
setupTimer(); setupTimer();
} }
@ -337,8 +344,8 @@ public class MainActivity extends AppCompatActivity implements SensorEventListen
runOnUiThread(new Runnable() { runOnUiThread(new Runnable() {
@Override @Override
public void run() { public void run() {
recCurrTimer.setText(Utils.formatSeconds(currVideoRecTimer++)); mRecCurrTimer.setText(Utils.formatSeconds(mCurrVideoRecTimer++));
timerHandler.postDelayed(this, 1000); mTimerHandler.postDelayed(this, 1000);
} }
}); });
} }
@ -349,7 +356,7 @@ public class MainActivity extends AppCompatActivity implements SensorEventListen
if (hasCameraAndStoragePermission()) { if (hasCameraAndStoragePermission()) {
resumeCameraItems(); resumeCameraItems();
if (isVideoCaptureIntent && isInPhotoMode) { if (mIsVideoCaptureIntent && mIsInPhotoMode) {
toggleVideo(); toggleVideo();
checkButtons(); checkButtons();
} }
@ -359,18 +366,18 @@ public class MainActivity extends AppCompatActivity implements SensorEventListen
private void resumeCameraItems() { private void resumeCameraItems() {
final int cnt = Camera.getNumberOfCameras(); final int cnt = Camera.getNumberOfCameras();
if (cnt == 1) { if (cnt == 1) {
toggleCameraBtn.setVisibility(View.INVISIBLE); mToggleCameraBtn.setVisibility(View.INVISIBLE);
} }
if (preview.setCamera(currCamera)) { if (mPreview.setCamera(mCurrCamera)) {
hideNavigationBarIcons(); hideNavigationBarIcons();
if (sensorManager != null) { if (mSensorManager != null) {
final Sensor accelerometer = sensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER); final Sensor accelerometer = mSensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER);
sensorManager.registerListener(this, accelerometer, SensorManager.SENSOR_DELAY_GAME); mSensorManager.registerListener(this, accelerometer, SensorManager.SENSOR_DELAY_GAME);
} }
if (!isInPhotoMode) { if (!mIsInPhotoMode) {
initVideoButtons(false); initVideoButtons(false);
} }
} else { } else {
@ -381,27 +388,27 @@ public class MainActivity extends AppCompatActivity implements SensorEventListen
@Override @Override
protected void onPause() { protected void onPause() {
super.onPause(); super.onPause();
if (!hasCameraAndStoragePermission() || isAskingPermissions) if (!hasCameraAndStoragePermission() || mIsAskingPermissions)
return; return;
hideTimer(); hideTimer();
if (preview != null) { if (mPreview != null) {
preview.releaseCamera(); mPreview.releaseCamera();
} }
if (sensorManager != null) if (mSensorManager != null)
sensorManager.unregisterListener(this); mSensorManager.unregisterListener(this);
} }
@Override @Override
public void onSensorChanged(SensorEvent event) { public void onSensorChanged(SensorEvent event) {
if (event.values[0] < 6.5 && event.values[0] > -6.5) { if (event.values[0] < 6.5 && event.values[0] > -6.5) {
orientation = Constants.ORIENT_PORTRAIT; mOrientation = Constants.ORIENT_PORTRAIT;
} else { } else {
if (event.values[0] > 0) { if (event.values[0] > 0) {
orientation = Constants.ORIENT_LANDSCAPE_LEFT; mOrientation = Constants.ORIENT_LANDSCAPE_LEFT;
} else { } else {
orientation = Constants.ORIENT_LANDSCAPE_RIGHT; mOrientation = Constants.ORIENT_LANDSCAPE_RIGHT;
} }
} }
} }
@ -412,25 +419,25 @@ public class MainActivity extends AppCompatActivity implements SensorEventListen
} }
private boolean checkCameraAvailable() { private boolean checkCameraAvailable() {
if (!isCameraAvailable) { if (!mIsCameraAvailable) {
Utils.showToast(getApplicationContext(), R.string.camera_unavailable); Utils.showToast(getApplicationContext(), R.string.camera_unavailable);
} }
return isCameraAvailable; return mIsCameraAvailable;
} }
@Override @Override
public void setFlashAvailable(boolean available) { public void setFlashAvailable(boolean available) {
if (available) { if (available) {
toggleFlashBtn.setVisibility(View.VISIBLE); mToggleFlashBtn.setVisibility(View.VISIBLE);
} else { } else {
toggleFlashBtn.setVisibility(View.INVISIBLE); mToggleFlashBtn.setVisibility(View.INVISIBLE);
disableFlash(); disableFlash();
} }
} }
@Override @Override
public void setIsCameraAvailable(boolean available) { public void setIsCameraAvailable(boolean available) {
isCameraAvailable = available; mIsCameraAvailable = available;
} }
@Override @Override
@ -440,12 +447,12 @@ public class MainActivity extends AppCompatActivity implements SensorEventListen
@Override @Override
public int getCurrentOrientation() { public int getCurrentOrientation() {
return orientation; return mOrientation;
} }
@Override @Override
public void videoSaved(Uri uri) { public void videoSaved(Uri uri) {
if (isVideoCaptureIntent) { if (mIsVideoCaptureIntent) {
final Intent intent = new Intent(); final Intent intent = new Intent();
intent.setData(uri); intent.setData(uri);
intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
@ -456,7 +463,7 @@ public class MainActivity extends AppCompatActivity implements SensorEventListen
@Override @Override
public void mediaSaved() { public void mediaSaved() {
if (isImageCaptureIntent) { if (mIsImageCaptureIntent) {
setResult(RESULT_OK); setResult(RESULT_OK);
finish(); finish();
} }
@ -465,7 +472,7 @@ public class MainActivity extends AppCompatActivity implements SensorEventListen
@Override @Override
protected void onDestroy() { protected void onDestroy() {
super.onDestroy(); super.onDestroy();
if (preview != null) if (mPreview != null)
preview.releaseCamera(); mPreview.releaseCamera();
} }
} }

21
app/src/main/java/com/simplemobiletools/camera/SettingsActivity.java → app/src/main/java/com/simplemobiletools/camera/activities/SettingsActivity.java
View File

@ -1,16 +1,19 @@
package com.simplemobiletools.camera; package com.simplemobiletools.camera.activities;
import android.os.Bundle; import android.os.Bundle;
import android.support.v7.app.AppCompatActivity; import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.SwitchCompat; import android.support.v7.widget.SwitchCompat;
import com.simplemobiletools.camera.Config;
import com.simplemobiletools.camera.R;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
public class SettingsActivity extends AppCompatActivity { public class SettingsActivity extends AppCompatActivity {
@BindView(R.id.settings_long_tap) SwitchCompat longTapSwitch; @BindView(R.id.settings_long_tap) SwitchCompat mLongTapSwitch;
@BindView(R.id.settings_focus_before_capture) SwitchCompat focusBeforeCaptureSwitch; @BindView(R.id.settings_focus_before_capture) SwitchCompat mFocusBeforeCaptureSwitch;
private static Config mConfig; private static Config mConfig;
@ -26,22 +29,22 @@ public class SettingsActivity extends AppCompatActivity {
} }
private void setupLongTap() { private void setupLongTap() {
longTapSwitch.setChecked(mConfig.getLongTapEnabled()); mLongTapSwitch.setChecked(mConfig.getLongTapEnabled());
} }
private void setupFocusBeforeCapture() { private void setupFocusBeforeCapture() {
focusBeforeCaptureSwitch.setChecked(mConfig.getFocusBeforeCaptureEnabled()); mFocusBeforeCaptureSwitch.setChecked(mConfig.getFocusBeforeCaptureEnabled());
} }
@OnClick(R.id.settings_long_tap_holder) @OnClick(R.id.settings_long_tap_holder)
public void handleLongTapToTrigger() { public void handleLongTapToTrigger() {
longTapSwitch.setChecked(!longTapSwitch.isChecked()); mLongTapSwitch.setChecked(!mLongTapSwitch.isChecked());
mConfig.setLongTapEnabled(longTapSwitch.isChecked()); mConfig.setLongTapEnabled(mLongTapSwitch.isChecked());
} }
@OnClick(R.id.settings_focus_before_capture_holder) @OnClick(R.id.settings_focus_before_capture_holder)
public void handleFocusBeforeCapture() { public void handleFocusBeforeCapture() {
focusBeforeCaptureSwitch.setChecked(!focusBeforeCaptureSwitch.isChecked()); mFocusBeforeCaptureSwitch.setChecked(!mFocusBeforeCaptureSwitch.isChecked());
mConfig.setFocusBeforeCaptureEnabled(focusBeforeCaptureSwitch.isChecked()); mConfig.setFocusBeforeCaptureEnabled(mFocusBeforeCaptureSwitch.isChecked());
} }
} }

2
app/src/main/res/values/strings.xml
View File

@ -15,7 +15,7 @@
<!-- Settings --> <!-- Settings -->
<string name="settings">Settings</string> <string name="settings">Settings</string>
<string name="long_tap_capture">Long tap to capture</string> <string name="long_tap_capture">Long tap to capture</string>
<string name="focus_before_capture">Focus before capture</string> <string name="focus_before_capture">Refocus before capture</string>
<!-- About --> <!-- About -->
<string name="about">About</string> <string name="about">About</string>