Merge pull request #4 from Affectiva/minor_fixes

Cosmic fixes

AffdexMe/app/build.gradle

@@ -9,7 +9,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 22
         versionCode 14
-        versionName "1.0.14b"
+        versionName "2.0.0"
     }
     buildTypes {
         release {

AffdexMe/app/src/main/java/com/affectiva/affdexme/DrawingView.java

@@ -16,8 +16,6 @@ import android.util.Log;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 
-import com.affectiva.android.affdex.sdk.detector.Face;
-
 
 /**
  * This class contains a SurfaceView and its own thread that draws to it.
@@ -332,7 +330,7 @@ public class DrawingView extends SurfaceView implements SurfaceHolder.Callback {
 
         drawingThread = new DrawingThread(surfaceHolder, drawingViewConfig);
     }
-    
+
     public void setTypeface(Typeface face) {
         drawingViewConfig.textPaint.setTypeface(face);
         drawingViewConfig.textBorderPaint.setTypeface(face);

AffdexMe/app/src/main/java/com/affectiva/affdexme/MainActivity.java

@@ -20,13 +20,6 @@ import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
-import android.widget.Toast;
-
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.InputStreamReader;
-import java.lang.reflect.Method;
-import java.util.List;
 
 import com.affectiva.android.affdex.sdk.Frame;
 import com.affectiva.android.affdex.sdk.Frame.ROTATE;
@@ -34,6 +27,9 @@ import com.affectiva.android.affdex.sdk.detector.CameraDetector;
 import com.affectiva.android.affdex.sdk.detector.Detector;
 import com.affectiva.android.affdex.sdk.detector.Face;
 
+import java.lang.reflect.Method;
+import java.util.List;
+
 /*
  * AffdexMe is an app that demonstrates the use of the Affectiva Android SDK.  It uses the
  * front-facing camera on your Android device to view, process and analyze live video of your face.
@@ -63,7 +59,7 @@ import com.affectiva.android.affdex.sdk.detector.Face;
  * - Build the project
  * - Run the app on an Android device with a front-facing camera
  *
- * Copyright (c) 2014 Affectiva. All rights reserved.
+ * Copyright (c) 2015 Affectiva. All rights reserved.
  */
 
 public class MainActivity extends Activity

AffdexMe/app/src/main/java/com/affectiva/affdexme/MetricDisplay.java

@@ -8,7 +8,7 @@ import android.graphics.Paint;
 import android.graphics.Typeface;
 import android.util.AttributeSet;
 import android.view.View;
-import java.lang.Math;
+
 import java.lang.reflect.Method;
 
 /**

AffdexMe/app/src/main/java/com/affectiva/affdexme/MetricSelectionFragment.java

@@ -20,10 +20,10 @@ import android.widget.Button;
 import android.widget.GridLayout;
 import android.widget.TextView;
 
-import static com.affectiva.affdexme.MainActivity.NUM_METRICS_DISPLAYED;
-
 import java.util.ArrayList;
 import java.util.HashMap;
+
+import static com.affectiva.affdexme.MainActivity.NUM_METRICS_DISPLAYED;
 /**
  * A fragment to display a graphical menu which allows the user to select which metrics to display.
  *

AffdexMe/app/src/main/java/com/affectiva/affdexme/MetricSelector.java

@@ -1,12 +1,9 @@
 package com.affectiva.affdexme;
 
 import android.app.Activity;
-import android.content.ContentResolver;
-import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Color;
 import android.net.Uri;
-import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.TextureView;
 import android.view.View;

AffdexMe/app/src/main/java/com/affectiva/affdexme/MetricsManager.java

@@ -1,7 +1,5 @@
 package com.affectiva.affdexme;
 
-import java.lang.StringBuilder;
-
 /**
  * A class containing:
  *  -enumerations representing the Emotion and Expressions featured in the Affectiva SDK.

AffdexMe/app/src/main/java/com/affectiva/affdexme/SettingsActivity.java

@@ -5,7 +5,6 @@ import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceFragment;
-import android.R.id.*;
 import android.view.MenuItem;
 
 import java.util.List;

AffdexMe/app/src/main/java/com/affectiva/errorreporting/CustomApplication.java

@@ -3,9 +3,6 @@ package com.affectiva.errorreporting;
 import android.app.Application;
 import android.content.Intent;
 
-/**
- * Created by Alan on 8/21/2015.
- */
 public class CustomApplication extends Application {
 
     static volatile boolean wasErrorActivityStarted = false;

AffdexMe/app/src/main/java/com/affectiva/errorreporting/ErrorReporter.java

@@ -1,7 +1,6 @@
 package com.affectiva.errorreporting;
 
 import android.app.Activity;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
@@ -13,9 +12,6 @@ import com.affectiva.affdexme.R;
 import java.text.DateFormat;
 import java.util.Date;
 
-/**
- * Created by Alan on 8/21/2015.
- */
 public class ErrorReporter extends Activity implements View.OnClickListener {
 
     String errorMessage;