Modifying CameraModule to work inside ear recognition.

 - Remove several unused buttons on the main.
 - Handled finish correctly.

CameraModule/src/main/java/com/yalantis/cameramodule/activity/CameraActivity.java

@@ -165,6 +165,10 @@ public class CameraActivity extends BaseActivity implements PhotoTakenCallback,
                     String path = data.getStringExtra(BasePhotoActivity.EXTRAS.PATH);
                     PhotoUtil.deletePhoto(path);
                     break;
+                case 14:
+                    setResult(resultCode, data);
+                    finish();
+                    break;
             }
         }
     }

CameraModule/src/main/java/com/yalantis/cameramodule/activity/PhotoPreviewActivity.java

@@ -69,6 +69,11 @@ public class PhotoPreviewActivity extends BasePhotoActivity {
         startActivityForResult(setIntentData(intent), EXTRAS.REQUEST_PHOTO_EDIT);
     }
 
+    public void usePhoto(MenuItem item) {
+        setResult(14, setIntentData());
+        finish();
+    }
+
     @Override
     protected void showPhoto(Bitmap bitmap) {
         if (previewFragment == null) {

CameraModule/src/main/res/menu/photo_preview_options.xml

@@ -25,7 +25,7 @@
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item
+   <!-- <item
          android:id="@+id/delete"
          android:showAsAction="ifRoom"
          android:onClick="deletePhoto"
@@ -48,5 +48,11 @@
          android:showAsAction="ifRoom"
          android:onClick="openPhotoCropper"
          android:title="@string/lbl_crop"/>
+         -->
+    <item
+        android:id="@+id/ok"
+        android:showAsAction="ifRoom"
+        android:onClick="usePhoto"
+        android:title="OK"/>
 
 </menu>
\ No newline at end of file

app/src/main/AndroidManifest.xml

@@ -8,11 +8,12 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
     <application
+        android:name=".App"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/Widget.AppCompat.Light.ActionBar" >
-        <!-- Install test screen.
+        <!-- Install test screen. -->
         <activity
             android:name=".activities.EarCaptureActivity"
             android:label="@string/app_name"
@@ -22,7 +23,6 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        -->
 
         <!-- Search case_id intent (Follow-up) -->
         <activity android:name=".intents.IntentSearchFeatures"

app/src/main/java/com/aluxoft/earrecognition/App.java

+/*
+ Copyright by Boston University, 2016
+ Authors: Josejulio Martínez, Daniel Kornhauser
+ Licensed under the MIT license: http://www.opensource.org/licenses/mit-license.php
+ */
+package com.aluxoft.earrecognition;
+
+import android.app.Application;
+
+import com.yalantis.cameramodule.ManagerInitializer;
+
+public class App extends Application {
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        ManagerInitializer.i.init(getApplicationContext());
+    }
+}
\ No newline at end of file

app/src/main/java/com/aluxoft/earrecognition/activities/EarCaptureActivity.java

@@ -6,11 +6,18 @@
 package com.aluxoft.earrecognition.activities;
 
 import android.app.Activity;
+import android.content.Intent;
 import android.os.Bundle;
+import android.os.Environment;
+import android.view.View;
+import android.widget.Button;
 
 import com.aluxoft.earrecognition.R;
 
 import com.crashlytics.android.Crashlytics;
+import com.yalantis.cameramodule.activity.BasePhotoActivity;
+import com.yalantis.cameramodule.activity.CameraActivity;
+
 import io.fabric.sdk.android.Fabric;
 
 /**
@@ -18,7 +25,7 @@ import io.fabric.sdk.android.Fabric;
  * TODO: Add onscreen guide lines for ear acquisition
  */
 public class EarCaptureActivity extends Activity {
-    
+
     /*
      * (non-Javadoc)
      * @see android.app.Activity#onCreate(android.os.Bundle)
@@ -28,6 +35,35 @@ public class EarCaptureActivity extends Activity {
         super.onCreate(savedInstanceState);
         Fabric.with(this, new Crashlytics());
         setContentView(R.layout.open_commcare_layout);
+
+        Button button = (Button)this.findViewById(R.id.button);
+        button.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                openCamera();
+            }
+        });
+
+    }
+
+    public void openCamera() {
+        Intent intent = new Intent(this, CameraActivity.class);
+        intent.putExtra(CameraActivity.PATH, Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES).getAbsolutePath());
+        intent.putExtra(CameraActivity.OPEN_PHOTO_PREVIEW, true);
+        //intent.putExtra(CameraActivity.LAYOUT_ID, R.layout.fragment_camera_custom);
+        intent.putExtra(CameraActivity.USE_FRONT_CAMERA, false);
+        startActivityForResult(intent, 1000);
     }
 
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+
+        System.out.println(resultCode);
+        System.out.println(data);
+
+        System.out.println(data.getExtras().get(BasePhotoActivity.EXTRAS.PATH));
+        System.out.println(data.getExtras().get(BasePhotoActivity.EXTRAS.NAME));
+
+        super.onActivityResult(requestCode, resultCode, data);
+    }
 }

app/src/main/res/layout/open_commcare_layout.xml

@@ -9,4 +9,11 @@
         android:textAppearance="?android:attr/textAppearanceLarge"
         android:text="Open Commcare to start"
         android:id="@+id/textView2" />
+
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Open Camera"
+        android:id="@+id/button"
+        android:layout_gravity="center_horizontal" />
 </LinearLayout>
\ No newline at end of file