Skip to content

Commit e5aaa4b

Browse files
committed
End of video 4
1 parent 12cc2c8 commit e5aaa4b

File tree

3 files changed

+46
-7
lines changed

3 files changed

+46
-7
lines changed

.idea/workspace.xml

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

app/app.iml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@
8484
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
8585
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8686
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
87+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
8788
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
8889
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
8990
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />

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

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,14 @@
66
import android.os.Environment;
77
import android.provider.MediaStore;
88
import android.support.v7.app.AppCompatActivity;
9+
import android.util.Log;
910
import android.widget.Toast;
1011

12+
import java.io.File;
13+
import java.io.IOException;
14+
import java.text.SimpleDateFormat;
15+
import java.util.Date;
16+
1117
import butterknife.ButterKnife;
1218
import butterknife.OnClick;
1319

@@ -78,7 +84,38 @@ private Uri getOutputMediaFileUri(int mediaType) {
7884
// check for external storage
7985
if (isExternalStorageAvailable()) {
8086
// get the URI
81-
return null;
87+
88+
// 1. Get the external storage directory
89+
File mediaStorageDir = getExternalFilesDir(Environment.DIRECTORY_PICTURES);
90+
91+
// 2. Create a unique file name
92+
String fileName = "";
93+
String fileType = "";
94+
String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss").format(new Date());
95+
96+
if (mediaType == MEDIA_TYPE_IMAGE){
97+
fileName = "IMG_"+ timeStamp;
98+
fileType = ".jpg";
99+
} else if (mediaType == MEDIA_TYPE_VIDEO) {
100+
fileName = "VID_"+ timeStamp;
101+
fileType = ".mp4";
102+
} else {
103+
return null;
104+
}
105+
106+
// 3. Create the file
107+
File mediaFile;
108+
try {
109+
mediaFile = File.createTempFile(fileName, fileType, mediaStorageDir);
110+
Log.i(TAG, "File: " + Uri.fromFile(mediaFile));
111+
112+
// 4. Return the file's URI
113+
return Uri.fromFile(mediaFile);
114+
}
115+
catch (IOException e) {
116+
Log.e(TAG, "Error creating file: " +
117+
mediaStorageDir.getAbsolutePath() + fileName + fileType);
118+
}
82119
}
83120

84121
// something went wrong

0 commit comments

Comments
 (0)