r/weknowhowyoufeel
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #22 from Affectiva/3.1.1

Browse source 
3.1.1
This commit is contained in:
Andy Dennie 2016-09-08 17:47:34 -04:00 committed by GitHub
commit d709f1675b
5 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/build.gradle
View file

@ -8,8 +8,8 @@ android {
applicationId "com.affectiva.affdexme"
minSdkVersion 16
targetSdkVersion 23
versionCode 494
versionName "3.1"
versionCode 683
versionName "3.1.1"
setProperty("archivesBaseName", "AffdexMe-$versionName-$versionCode")
}
buildTypes {
@ -37,7 +37,7 @@ android {
dependencies {
//include the Affdex SDK
compile('com.affectiva.android:affdexsdk:3.1')
compile('com.affectiva.android:affdexsdk:3.1.1')
//include project dependencies
compile 'com.android.support:support-v4:23.1.1'

4
app/src/main/assets/Affdex/READ.ME
View file

@ -1,4 +0,0 @@
Place license file and Classifiers folder here.
license.txt
Classifiers/v_9/*

9
app/src/main/java/com/affectiva/affdexme/MainActivity.java
View file

@ -443,9 +443,6 @@ public class MainActivity extends AppCompatActivity
* that view will be painted with what the camera sees.
*/
detector = new CameraDetector(this, cameraType, cameraView, (multiFaceModeEnabled ? MAX_SUPPORTED_FACES : 1), Detector.FaceDetectorMode.LARGE_FACES);
// update the license path here if you name your file something else
detector.setLicensePath("license.txt");
detector.setImageListener(this);
detector.setFaceListener(this);
detector.setOnCameraEventListener(this);
@ -513,10 +510,10 @@ public class MainActivity extends AppCompatActivity
}
if (sharedPreferences.getBoolean("appearance", drawingView.getDrawAppearanceMarkersEnabled())) {
detector.setDetectAllAppearance(true);
detector.setDetectAllAppearances(true);
setShowAppearance(true);
} else {
detector.setDetectAllAppearance(false);
detector.setDetectAllAppearances(false);
setShowAppearance(false);
}
@ -884,7 +881,7 @@ public class MainActivity extends AppCompatActivity
detector.setDetectAllEmotions(false);
detector.setDetectAllExpressions(false);
detector.setDetectAllAppearance(false);
detector.setDetectAllAppearances(false);
detector.setDetectAllEmojis(false);
}

2
build.gradle
View file

@ -5,7 +5,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.1.2'
classpath 'com.android.tools.build:gradle:2.1.3'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files

4
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,6 +1,6 @@
#Fri May 13 11:17:14 EDT 2016
#Thu Aug 18 18:52:23 EDT 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip