From b09f993b264578eb20844b9968afeb75400b335d Mon Sep 17 00:00:00 2001
From: toby cabot <toby.cabot@affectiva.com>
Date: Tue, 26 Jan 2016 13:42:58 -0500
Subject: [PATCH] Use .aar archive to install SDK

---
 .gitignore                       |  3 +++
 README.md                        | 15 ++++-----------
 app/build.gradle                 |  4 ++--
 app/libs/READ.ME                 |  6 ------
 app/src/main/AndroidManifest.xml |  2 ++
 build.gradle                     |  3 +++
 6 files changed, 14 insertions(+), 19 deletions(-)
 delete mode 100644 app/libs/READ.ME

diff --git a/.gitignore b/.gitignore
index 58bce9a..df4630f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,6 @@ proguard/
 .idea
 .DS_Store
 /captures
+
+# Affdex SDK package
+app/libs/affdexsdk-*.aar
diff --git a/README.md b/README.md
index 8c2bc4e..81a4596 100644
--- a/README.md
+++ b/README.md
@@ -7,20 +7,13 @@
 
 **AffdexMe** is an app that demonstrates the use of the Affectiva Android SDK.  It uses the camera on your Android device to view, process and analyze live video of your face. Start the app and you will see your face on the screen and metrics describing your expressions. Tapping the screen will bring up a menu with options to display the Processed Frames Per Second metric, display facial tracking points, and control the rate at which frames are processed by the SDK.
 
-Most of the methods in this file control the application's UI. Therefore, if you are just interested in learning how the Affectiva SDK works, you will find the calls relevant to the use of the SDK in the initializeCameraDetector(), startCamera(), stopCamera(), and onImageResults() methods.
-
-This is an Android Studio project.
-
-In order to use this project, you will need to:
-- Obtain the Affectiva Android SDK (visit http://www.affectiva.com/solutions/apis-sdks/)
-- Copy the contents of the SDK's assets folder into this project's app/src/main/assets folder
-- Copy the contents of the SDK's libs folder into this project's app/libs folder
-- Copy the armeabi-v7a folder (found in the SDK libs folder) into this project's app/jniLibs folder
+To use this project, you will need to:
+- Obtain a license for the Affectiva Android SDK.  Evaluation licenses are available at no cost from http://www.affectiva.com/solutions/apis-sdks/
 - Copy your license file to this project's app/src/main/assets/Affdex folder and rename to license.txt
-- Build the project
+- Build the project using Android Studio
 - Run the app and smile!
 
-See the comment section at the top of the MainActivity.java file for more information.
+If you are interested in learning how the Affectiva SDK works, you will find the calls relevant to the use of the SDK in the initializeCameraDetector(), startCamera(), stopCamera(), and onImageResults() methods.  See the comment section at the top of the MainActivity.java file for more information.
 
 ***
 
diff --git a/app/build.gradle b/app/build.gradle
index 2b90478..1425142 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -36,8 +36,8 @@ android {
 }
 
 dependencies {
-    //include the Affdex SDK jars and its dependencies
-    compile fileTree(dir: 'libs', include: '*.jar')
+    //include the Affdex SDK
+    compile('com.affectiva.android:affdexsdk:3.0.+')
 
     //include project dependencies
     compile 'com.android.support:support-v4:23.1.1'
diff --git a/app/libs/READ.ME b/app/libs/READ.ME
deleted file mode 100644
index c740ba4..0000000
--- a/app/libs/READ.ME
+++ /dev/null
@@ -1,6 +0,0 @@
-Place the Affdex SDK JARs here.
-
-Affdex-sdk.jar
-Affdex-sdk-javadoc.jar
-dagger-*.java
-javax.inject-1.jar
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ff5d2da..96b31ca 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -6,6 +6,7 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.affectiva.affdexme">
 
     <uses-permission android:name="android.permission.CAMERA" />
@@ -22,6 +23,7 @@
         android:required="false" />
 
     <application
+        tools:replace="android:allowBackup,android:label"
         android:name="com.affectiva.errorreporting.CustomApplication"
         android:allowBackup="false"
         android:hardwareAccelerated="true"
diff --git a/build.gradle b/build.gradle
index a6fcfe1..f5d2c90 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,6 +14,9 @@ buildscript {
 
 allprojects {
     repositories {
+        maven {
+            url "http://maven.affectiva.com"
+        }
         jcenter()
     }
 }