fenix/Simple-Camera
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Camera.git synced 2025-06-27 09:02:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

preparations for ACTION_VIDEO_CAPTURE handling

Browse Source
This commit is contained in:
tibbi
2016-06-17 17:10:58 +02:00
parent abb2ca51ab
commit af3f44b9fa
4 changed files with 52 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
app/src/main/java/com/simplemobiletools/camera/MainActivity.java
View File

@ -37,7 +37,7 @@ public class MainActivity extends AppCompatActivity implements SensorEventListen
@BindView(R.id.viewHolder) RelativeLayout viewHolder;
@BindView(R.id.toggle_camera) ImageView toggleCameraBtn;
@BindView(R.id.toggle_flash) ImageView toggleFlashBtn;
@BindView(R.id.toggle_videocam) ImageView togglePhotoVideoBtn;
@BindView(R.id.toggle_photo_video) ImageView togglePhotoVideoBtn;
@BindView(R.id.shutter) ImageView shutterBtn;
@BindView(R.id.video_rec_curr_timer) TextView recCurrTimer;
@BindView(R.id.about) View aboutBtn;
@ -51,6 +51,7 @@ public class MainActivity extends AppCompatActivity implements SensorEventListen
private boolean isAskingPermissions;
private boolean isCameraAvailable;
private boolean isImageCaptureIntent;
private boolean isVideoCaptureIntent;
private int currVideoRecTimer;
private int orientation;
private int currCamera;
@ -64,18 +65,29 @@ public class MainActivity extends AppCompatActivity implements SensorEventListen
tryInitCamera();
final Intent intent = getIntent();
if (intent != null && intent.getExtras() != null && intent.getAction().equals(MediaStore.ACTION_IMAGE_CAPTURE)) {
isImageCaptureIntent = true;
togglePhotoVideoBtn.setVisibility(View.GONE);
aboutBtn.setVisibility(View.GONE);
if (intent != null) {
if (intent.getExtras() != null && intent.getAction().equals(MediaStore.ACTION_IMAGE_CAPTURE)) {
isImageCaptureIntent = true;
final Object output = intent.getExtras().get(MediaStore.EXTRA_OUTPUT);
if (output != null && output instanceof Uri) {
preview.setTargetUri((Uri) output);
hideToggleModeAbout();
final Object output = intent.getExtras().get(MediaStore.EXTRA_OUTPUT);
if (output != null && output instanceof Uri) {
preview.setTargetUri((Uri) output);
}
} else if (intent.getAction().equals(MediaStore.ACTION_VIDEO_CAPTURE)) {
isVideoCaptureIntent = true;
hideToggleModeAbout();
preview.trySwitchToVideo();
shutterBtn.setImageDrawable(getResources().getDrawable(R.mipmap.video_rec));
}
}
}
private void hideToggleModeAbout() {
togglePhotoVideoBtn.setVisibility(View.GONE);
aboutBtn.setVisibility(View.GONE);
}
private void tryInitCamera() {
if (hasCameraAndStoragePermission()) {
initializeCamera();
@ -213,8 +225,12 @@ public class MainActivity extends AppCompatActivity implements SensorEventListen
startActivity(intent);
}
@OnClick(R.id.toggle_videocam)
public void toggleVideo() {
@OnClick(R.id.toggle_photo_video)
public void handleToggleVideo() {
toggleVideo();
}
private void toggleVideo() {
if (!checkCameraAvailable()) {
return;
}
@ -250,7 +266,9 @@ public class MainActivity extends AppCompatActivity implements SensorEventListen
shutterBtn.setImageDrawable(res.getDrawable(R.mipmap.video_rec));
toggleCameraBtn.setVisibility(View.VISIBLE);
} else {
Utils.showToast(getApplicationContext(), R.string.video_mode_error);
if (!isVideoCaptureIntent) {
Utils.showToast(getApplicationContext(), R.string.video_mode_error);
}
}
}
@ -286,6 +304,10 @@ public class MainActivity extends AppCompatActivity implements SensorEventListen
if (hasCameraAndStoragePermission()) {
resumeCameraItems();
}
if (isVideoCaptureIntent && isInPhotoMode) {
toggleVideo();
}
}
private void resumeCameraItems() {