Refactoring

Organizing classes in packages.

app/src/main/AndroidManifest.xml

@@ -32,7 +32,7 @@
             </intent-filter>
         </activity> -->
         <activity
-            android:name=".ActivityEarCapture"
+            android:name=".activities.EarCaptureActivity"
             android:label="@string/app_name"
             android:screenOrientation="portrait">
             <intent-filter>
@@ -48,14 +48,14 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".SelectUserActivity">
+        <activity android:name=".activities.SelectUserActivity">
             <intent-filter>
                 <action android:name="com.auriclon.activity_select_user"/>
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
 
-        <activity android:name=".SIFTActivity">
+        <activity android:name=".activities.SIFTActivity">
             <intent-filter>
                 <action android:name="com.auriclon.activity_sift"/>
                 <category android:name="android.intent.category.DEFAULT" />

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

 package com.aluxoft.earrecognition;
 
+import com.aluxoft.earrecognition.common.EarDatabase;
+import com.aluxoft.earrecognition.common.EarFeature;
+import com.aluxoft.earrecognition.common.EarIdentifierResult;
 import com.aluxoft.earrecognition.utils.OpenCvUtils;
 import com.google.gson.Gson;
 

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

-package com.aluxoft.earrecognition;
+package com.aluxoft.earrecognition.activities;
 
 import android.app.Activity;
 import android.content.ActivityNotFoundException;
@@ -10,12 +10,14 @@ import android.view.View.OnClickListener;
 import android.widget.Button;
 import android.widget.Toast;
 
+import com.aluxoft.earrecognition.EarIdentifier;
+import com.aluxoft.earrecognition.R;
 import com.aluxoft.earrecognition.utils.ImageUtils;
 
 import java.io.File;
 import java.io.IOException;
 
-public class ActivityEarCapture extends Activity {
+public class EarCaptureActivity extends Activity {
     
     Button getImage;
     Button returnToCommCare;
@@ -47,7 +49,7 @@ public class ActivityEarCapture extends Activity {
                                 "CASE_ID" + " " + "case_id" + " " + "99de08b8-7235-41ba-9dbe-d1e5d70575cf" + " " +
                                 "COMMAND_ID" + " " + "m1-f1";
                 i.putExtra("ccodk_session_request", sssd);
-                ActivityEarCapture.this.startActivity(i);
+                EarCaptureActivity.this.startActivity(i);
             }
         });
 
@@ -86,14 +88,14 @@ public class ActivityEarCapture extends Activity {
                 try {
                     startActivityForResult(i, KEY_REQUEST_IMAGE);
                 } catch (ActivityNotFoundException e) {
-                    Toast.makeText(ActivityEarCapture.this, "No Camera", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(EarCaptureActivity.this, "No Camera", Toast.LENGTH_SHORT).show();
                 }
             }
 
         });
 
         if(this.getLastNonConfigurationInstance() != null) {
-            location = ((ActivityEarCapture)this.getLastNonConfigurationInstance()).location;
+            location = ((EarCaptureActivity)this.getLastNonConfigurationInstance()).location;
         }
         
         if(savedInstanceState != null) {

app/src/main/java/com/aluxoft/earrecognition/MainActivity.java → app/src/main/java/com/aluxoft/earrecognition/activities/MainActivity.java

-package com.aluxoft.earrecognition;
+package com.aluxoft.earrecognition.activities;
 
 import android.annotation.SuppressLint;
 import android.app.AlertDialog;
@@ -21,6 +21,8 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.ImageView;
 
+import com.aluxoft.earrecognition.R;
+
 import org.opencv.android.Utils;
 import org.opencv.core.Mat;
 import org.opencv.core.MatOfDMatch;

app/src/main/java/com/aluxoft/earrecognition/SIFTActivity.java → app/src/main/java/com/aluxoft/earrecognition/activities/SIFTActivity.java

-package com.aluxoft.earrecognition;
+package com.aluxoft.earrecognition.activities;
 
 import android.app.Activity;
 import android.app.ProgressDialog;
 import android.content.Intent;
 import android.os.Bundle;
 
+import com.aluxoft.earrecognition.EarIdentifier;
+import com.aluxoft.earrecognition.R;
+
 import java.io.File;
 import java.util.concurrent.Callable;
 

app/src/main/java/com/aluxoft/earrecognition/SelectUserActivity.java → app/src/main/java/com/aluxoft/earrecognition/activities/SelectUserActivity.java

-package com.aluxoft.earrecognition;
+package com.aluxoft.earrecognition.activities;
 
 import android.app.Activity;
 import android.os.Bundle;
 
+import com.aluxoft.earrecognition.R;
+
 /**
  * Created by josejuliomartinez on 07/10/15.
  */

app/src/main/java/com/aluxoft/earrecognition/EarDatabase.java → app/src/main/java/com/aluxoft/earrecognition/common/EarDatabase.java

-package com.aluxoft.earrecognition;
+package com.aluxoft.earrecognition.common;
 
 import java.util.HashMap;
 

app/src/main/java/com/aluxoft/earrecognition/EarFeature.java → app/src/main/java/com/aluxoft/earrecognition/common/EarFeature.java

-package com.aluxoft.earrecognition;
+package com.aluxoft.earrecognition.common;
 
 /**
  * Created by josejuliomartinez on 06/10/15.

app/src/main/java/com/aluxoft/earrecognition/EarIdentifierResult.java → app/src/main/java/com/aluxoft/earrecognition/common/EarIdentifierResult.java

-package com.aluxoft.earrecognition;
+package com.aluxoft.earrecognition.common;
 
 /**
  * Created by josejuliomartinez on 06/10/15.

app/src/main/java/com/aluxoft/earrecognition/Person.java → app/src/main/java/com/aluxoft/earrecognition/common/Person.java

-package com.aluxoft.earrecognition;
+package com.aluxoft.earrecognition.common;
+
+import com.aluxoft.earrecognition.common.EarFeature;
 
 import java.util.ArrayList;
 

app/src/main/java/com/aluxoft/earrecognition/loader/EarDatabaseLoader.java

 package com.aluxoft.earrecognition.loader;
 
-import com.aluxoft.earrecognition.EarDatabase;
+import com.aluxoft.earrecognition.common.EarDatabase;
 
 /**
  * Created by josejuliomartinez on 07/10/15.