From c45a0d2e7f678727ca4da862dce2953a825479d7 Mon Sep 17 00:00:00 2001 From: Ruben Date: Wed, 5 Oct 2016 14:55:23 +0200 Subject: [PATCH] Small changes --- .../com/rubenvandeven/emotionhero/AchievementCollection.java | 2 +- .../java/com/rubenvandeven/emotionhero/GamingActivity.java | 1 - app/src/main/res/layout/activity_review_achievements.xml | 3 ++- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/rubenvandeven/emotionhero/AchievementCollection.java b/app/src/main/java/com/rubenvandeven/emotionhero/AchievementCollection.java index a367b29..5e63aae 100644 --- a/app/src/main/java/com/rubenvandeven/emotionhero/AchievementCollection.java +++ b/app/src/main/java/com/rubenvandeven/emotionhero/AchievementCollection.java @@ -30,7 +30,7 @@ public class AchievementCollection { if(hit.target.value == 100) { // if target was 100, but player only showed less // then 13..s/he's playing with microexpressions ;-) - if(hit.emotions.get(hit.target.emotion) < 13) { + if(hit.emotions.get(hit.target.emotion) < 20) { return true; } } diff --git a/app/src/main/java/com/rubenvandeven/emotionhero/GamingActivity.java b/app/src/main/java/com/rubenvandeven/emotionhero/GamingActivity.java index f780468..ee45fc9 100644 --- a/app/src/main/java/com/rubenvandeven/emotionhero/GamingActivity.java +++ b/app/src/main/java/com/rubenvandeven/emotionhero/GamingActivity.java @@ -211,7 +211,6 @@ public class GamingActivity extends AppCompatActivity implements Detector.ImageL // SurfaceView surfaceView = (SurfaceView) findViewById(R.id.surfaceView); detector = new CameraDetector(this, CameraDetector.CameraType.CAMERA_FRONT, cameraPreview, 1, Detector.FaceDetectorMode.LARGE_FACES); - detector.setLicensePath("emotionhero_dev.license"); detector.setDetectAllEmotions(true); detector.setDetectAllAppearances(true); diff --git a/app/src/main/res/layout/activity_review_achievements.xml b/app/src/main/res/layout/activity_review_achievements.xml index ea457a6..e63cbc8 100644 --- a/app/src/main/res/layout/activity_review_achievements.xml +++ b/app/src/main/res/layout/activity_review_achievements.xml @@ -43,7 +43,8 @@ android:layout_height="wrap_content" android:orientation="vertical" android:id="@+id/achievementsLayout" - android:layout_margin="@dimen/fab_margin"> + android:layout_margin="@dimen/fab_margin" + android:layout_marginBottom="32dp">