diff --git a/.gradle/2.2.1/taskArtifacts/cache.properties.lock b/.gradle/2.2.1/taskArtifacts/cache.properties.lock index 4651d72..c03b73b 100644 Binary files a/.gradle/2.2.1/taskArtifacts/cache.properties.lock and b/.gradle/2.2.1/taskArtifacts/cache.properties.lock differ diff --git a/.gradle/2.2.1/taskArtifacts/fileHashes.bin b/.gradle/2.2.1/taskArtifacts/fileHashes.bin index 4722e7b..8dcb143 100644 Binary files a/.gradle/2.2.1/taskArtifacts/fileHashes.bin and b/.gradle/2.2.1/taskArtifacts/fileHashes.bin differ diff --git a/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin b/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin index eed4e0b..bf6d8ee 100644 Binary files a/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin and b/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin differ diff --git a/.gradle/2.2.1/taskArtifacts/outputFileStates.bin b/.gradle/2.2.1/taskArtifacts/outputFileStates.bin index 69d8300..5910ed1 100644 Binary files a/.gradle/2.2.1/taskArtifacts/outputFileStates.bin and b/.gradle/2.2.1/taskArtifacts/outputFileStates.bin differ diff --git a/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin b/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin index 81bd41d..4bc11b7 100644 Binary files a/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin and b/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin differ diff --git a/.idea/misc.xml b/.idea/misc.xml index 64b405c..8b13585 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -10,49 +10,6 @@ - - - - - - - - - Android Lint - - - Class structure - - - Data flow issues - - - Declaration redundancy - - - Dependency issues - - - Imports - - - Modularization issues - - - Packaging issues - - - Pattern Validation - - - - - Abstraction issues - - - - - @@ -69,9 +26,6 @@ - - $USER_HOME$/.subversion - diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 6564d52..94a25f7 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 107a792..c414ece 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -18,7 +18,12 @@ - + + + + + + + + + @@ -891,11 +903,11 @@ @@ -907,6 +919,28 @@ + + + + + + + + + Android Lint + + + Pattern Validation + + + + + Android + + + + + @@ -930,8 +964,29 @@ - + + + + + + + + + + + + + + + + @@ -984,17 +1039,6 @@ - - - - - - - - - @@ -1015,6 +1059,9 @@ + + + @@ -1211,6 +1258,9 @@ + + $USER_HOME$/.subversion + @@ -1218,14 +1268,28 @@ + + 1427459265481 + + + 1427459330794 + + - + + @@ -1235,24 +1299,31 @@ - + - + - + + + + @@ -1260,6 +1331,8 @@ + + @@ -1269,7 +1342,7 @@ - + @@ -1277,15 +1350,15 @@ - - - + + + @@ -1316,13 +1389,66 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1373,17 +1499,15 @@ - - - - + + - + @@ -1430,17 +1554,36 @@ - + + + + + + + + + - + + + + + + + + + + + + - + @@ -1455,6 +1598,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1474,25 +1643,86 @@ - + - + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..6e00fb9 --- /dev/null +++ b/README.md @@ -0,0 +1,7 @@ +# Camera-module +A Simple project to take pictures on Android devices the camera intent. + +This is the simple module to take picture using camera intent. +I have manage Samsung camera issues. + + diff --git a/app/app.iml b/app/app.iml index 1fc27c3..0b74286 100644 --- a/app/app.iml +++ b/app/app.iml @@ -82,7 +82,6 @@ - diff --git a/app/src/main/java/mayurlab/cameramodule/MainActivity.java b/app/src/main/java/mayurlab/cameramodule/MainActivity.java index 675757b..8d5ab28 100644 --- a/app/src/main/java/mayurlab/cameramodule/MainActivity.java +++ b/app/src/main/java/mayurlab/cameramodule/MainActivity.java @@ -18,7 +18,7 @@ import mayurlab.cameramodule.util.CameraUtil; /** - * Created by "Mayur Solanki" on 26/03/15. + * Created by "Mayur Solanki" on 26/03/15. changes */ public class MainActivity extends Activity implements View.OnClickListener { @@ -37,22 +37,17 @@ protected void onCreate(Bundle savedInstanceState) { mBtnCamera = (Button) findViewById(R.id.main_btn_capture); imgPreview = (ImageView) findViewById(R.id.main_iv_privew); mBtnCamera.setOnClickListener(this); -// if (savedInstanceState != null) { -// path = savedInstanceState.getString("path"); -// } else { -// + if (savedInstanceState != null) { + path = savedInstanceState.getString("path"); + } -// } -// -// -// -// -// -// @Override -// protected void onSaveInstanceState(Bundle outState) { -// outState.putString("path", path); -// super.onSaveInstanceState(outState); -// } + } + + @Override + protected void onSaveInstanceState(Bundle outState) { + outState.putString("path", path); + super.onSaveInstanceState(outState); + } /* diff --git a/app/src/main/java/mayurlab/cameramodule/util/CameraUtil.java b/app/src/main/java/mayurlab/cameramodule/util/CameraUtil.java index 7c8909a..dc86eed 100644 --- a/app/src/main/java/mayurlab/cameramodule/util/CameraUtil.java +++ b/app/src/main/java/mayurlab/cameramodule/util/CameraUtil.java @@ -55,7 +55,7 @@ private static File getOutputMediaFile(int type) { // delete File[] contents = mediaStorageDir.listFiles(); if (contents.length >= 1) { - deleteRecursive(mediaStorageDir); + deleteFile(mediaStorageDir); } mediaFile = new File(mediaStorageDir.getPath() + File.separator + IMG_PREFIX + "temp" + IMG_POSTFIX); } else { @@ -112,6 +112,7 @@ public static int checkExIfInfo(String mediaFile) { * This method is use for rotation of image. * * @param mediaFile + * @param rotation * **/ public static void rotateImage(String mediaFile, int rotation) { @@ -136,10 +137,10 @@ public static void rotateImage(String mediaFile, int rotation) { } // Delete images or folder - public static void deleteRecursive(File fileOrDirectory) { + public static void deleteFile(File fileOrDirectory) { if (fileOrDirectory.isDirectory()) { for (File child : fileOrDirectory.listFiles()) { - deleteRecursive(child); + deleteFile(child); } } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 031f64b..de7df57 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -19,7 +19,7 @@ \ No newline at end of file diff --git a/build/intermediates/gradle_project_sync_data.bin b/build/intermediates/gradle_project_sync_data.bin index 2bf9e74..157d0f7 100644 Binary files a/build/intermediates/gradle_project_sync_data.bin and b/build/intermediates/gradle_project_sync_data.bin differ