Skip to content

Commit 12cc2c8

Browse files
committed
End of video 3
1 parent db4484c commit 12cc2c8

File tree

3 files changed

+174
-18
lines changed

3 files changed

+174
-18
lines changed

.idea/workspace.xml

Lines changed: 113 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/app.iml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,17 +85,28 @@
8585
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8686
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8787
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
88+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
89+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
8890
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/23.4.0/jars" />
8991
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.4.0/jars" />
9092
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.4.0/jars" />
9193
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/23.4.0/jars" />
9294
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.jakewharton/butterknife/8.0.1/jars" />
9395
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
96+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
97+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
98+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
99+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
100+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
101+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
94102
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
103+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
95104
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
105+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
96106
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
97107
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
98108
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
109+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
99110
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
100111
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
101112
</content>

app/src/main/java/com/teamtreehouse/cameraworkshop/MainActivity.java

Lines changed: 50 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
package com.teamtreehouse.cameraworkshop;
22

33
import android.content.Intent;
4+
import android.net.Uri;
45
import android.os.Bundle;
6+
import android.os.Environment;
57
import android.provider.MediaStore;
68
import android.support.v7.app.AppCompatActivity;
79
import android.widget.Toast;
@@ -21,6 +23,8 @@ public class MainActivity extends AppCompatActivity {
2123
public static final int MEDIA_TYPE_IMAGE = 4;
2224
public static final int MEDIA_TYPE_VIDEO = 5;
2325

26+
private Uri mMediaUri;
27+
2428
@Override
2529
protected void onCreate(Bundle savedInstanceState) {
2630
super.onCreate(savedInstanceState);
@@ -42,8 +46,17 @@ else if (resultCode != RESULT_CANCELED) {
4246

4347
@OnClick(R.id.takePhoto)
4448
void takePhoto() {
45-
Intent takePhotoIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
46-
startActivityForResult(takePhotoIntent, REQUEST_TAKE_PHOTO);
49+
mMediaUri = getOutputMediaFileUri(MEDIA_TYPE_IMAGE);
50+
if (mMediaUri == null) {
51+
Toast.makeText(this,
52+
"There was a problem accessing your device's external storage.",
53+
Toast.LENGTH_LONG).show();
54+
}
55+
else {
56+
Intent takePhotoIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
57+
takePhotoIntent.putExtra(MediaStore.EXTRA_OUTPUT, mMediaUri);
58+
startActivityForResult(takePhotoIntent, REQUEST_TAKE_PHOTO);
59+
}
4760
}
4861

4962
@OnClick(R.id.takeVideo)
@@ -60,4 +73,39 @@ void pickPhoto() {
6073
void pickVideo() {
6174

6275
}
76+
77+
private Uri getOutputMediaFileUri(int mediaType) {
78+
// check for external storage
79+
if (isExternalStorageAvailable()) {
80+
// get the URI
81+
return null;
82+
}
83+
84+
// something went wrong
85+
return null;
86+
}
87+
88+
private boolean isExternalStorageAvailable() {
89+
String state = Environment.getExternalStorageState();
90+
if(Environment.MEDIA_MOUNTED.equals(state)) {
91+
return true;
92+
}
93+
else {
94+
return false;
95+
}
96+
}
6397
}
98+
99+
100+
101+
102+
103+
104+
105+
106+
107+
108+
109+
110+
111+

0 commit comments

Comments
 (0)