From c91f7cbc211e84d67dbf5e663f3e1e6a891a408b Mon Sep 17 00:00:00 2001
From: Ruben <rubenvandeven@gmail.com>
Date: Wed, 21 Sep 2016 14:58:49 +0100
Subject: [PATCH] Fix #12 and Fix #10

---
 .idea/misc.xml                                |   2 +-
 app/src/main/AndroidManifest.xml              |   1 +
 .../emotionhero/Achievement.java              |   3 +-
 .../emotionhero/AchievementCollection.java    |  35 +++----
 .../emotionhero/IntroActivity.java            |   4 +-
 .../emotionhero/MirrorMenuActivity.java       |  36 ++++++-
 .../com/rubenvandeven/emotionhero/Player.java |  17 ++++
 .../ReviewAchievementsActivity.java           |   3 +-
 .../rubenvandeven/emotionhero/Scenario.java   |   5 +-
 .../emotionhero/ScenarioView.java             |  31 +++---
 .../emotionhero/SnapshotDialogFragment.java   |  91 ++++++++++++++++++
 app/src/main/res/drawable/example_brow.jpg    | Bin 0 -> 6980 bytes
 app/src/main/res/drawable/example_mouth.jpg   | Bin 0 -> 2279 bytes
 app/src/main/res/drawable/example_nose.jpg    | Bin 0 -> 1933 bytes
 .../main/res/layout/activity_mirror_menu.xml  |  16 ++-
 app/src/main/res/layout/snapshot_check.xml    |  74 ++++++++++++++
 app/src/main/res/values/dimens.xml            |   3 +
 app/src/main/res/values/strings.xml           |   1 +
 build.gradle                                  |   2 +-
 19 files changed, 278 insertions(+), 46 deletions(-)
 create mode 100644 app/src/main/java/com/rubenvandeven/emotionhero/SnapshotDialogFragment.java
 create mode 100644 app/src/main/res/drawable/example_brow.jpg
 create mode 100644 app/src/main/res/drawable/example_mouth.jpg
 create mode 100644 app/src/main/res/drawable/example_nose.jpg
 create mode 100644 app/src/main/res/layout/snapshot_check.xml

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 1b77328..bd04605 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -37,7 +37,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a6fe132..15b9c63 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -49,6 +49,7 @@
             android:theme="@style/FullscreenTheme" />
         <activity
             android:name=".ReviewActivity"
+            android:launchMode="singleTop"
             android:theme="@style/AppTheme.NoActionBar" />
         <activity android:name=".MirrorMenuActivity" />
         <activity
diff --git a/app/src/main/java/com/rubenvandeven/emotionhero/Achievement.java b/app/src/main/java/com/rubenvandeven/emotionhero/Achievement.java
index 68d1179..4c51f17 100644
--- a/app/src/main/java/com/rubenvandeven/emotionhero/Achievement.java
+++ b/app/src/main/java/com/rubenvandeven/emotionhero/Achievement.java
@@ -1,6 +1,7 @@
 package com.rubenvandeven.emotionhero;
 
 import android.graphics.Bitmap;
+import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 
 /**
@@ -30,6 +31,6 @@ public class Achievement {
 
     public interface AchievementListener {
         boolean hasGotAchievement(Player player, Game game);
-        void setDescription(Player player, Game game, RelativeLayout layout);
+        void setDescription(Player player, Game game, LinearLayout layout);
     }
 }
diff --git a/app/src/main/java/com/rubenvandeven/emotionhero/AchievementCollection.java b/app/src/main/java/com/rubenvandeven/emotionhero/AchievementCollection.java
index 861d185..b576ace 100644
--- a/app/src/main/java/com/rubenvandeven/emotionhero/AchievementCollection.java
+++ b/app/src/main/java/com/rubenvandeven/emotionhero/AchievementCollection.java
@@ -5,6 +5,7 @@ import android.content.Intent;
 import android.net.Uri;
 import android.support.v7.widget.AppCompatTextView;
 import android.view.View;
+import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 
 import java.util.ArrayList;
@@ -38,7 +39,7 @@ public class AchievementCollection {
                     }
 
                     @Override
-                    public void setDescription(Player player, Game game, RelativeLayout descriptionLayout) {
+                    public void setDescription(Player player, Game game, LinearLayout descriptionLayout) {
                         Context c = descriptionLayout.getContext();
                         AppCompatTextView textView = new AppCompatTextView(c);
                         textView.setText("Do you have something to hide? You are not showing all requested emotions intense enough. A microexpression is a brief, involuntary facial expression shown on the face of humans according to emotions experienced.");
@@ -69,7 +70,7 @@ public class AchievementCollection {
                     }
 
                     @Override
-                    public void setDescription(Player player, Game game, RelativeLayout descriptionLayout) {
+                    public void setDescription(Player player, Game game, LinearLayout descriptionLayout) {
                         Context c = descriptionLayout.getContext();
                         AppCompatTextView textView = new AppCompatTextView(c);
                         textView.setText("There is no sign of deceit itself. There is no gesture, facial expression, nor muscle twitch that itself indicates that a person is lying. There are only clues that the person is poorly prepared and that the clues of emotions do not fit what the person is saying. These are what provide clues of leakage or deception. (Wikipedia)");
@@ -97,7 +98,7 @@ public class AchievementCollection {
                     }
 
                     @Override
-                    public void setDescription(Player player, Game game, final RelativeLayout descriptionLayout) {
+                    public void setDescription(Player player, Game game, final LinearLayout descriptionLayout) {
                         Context c = descriptionLayout.getContext();
                         AppCompatTextView textView = new AppCompatTextView(c);
                         textView.setText("You improved your performance after a retry! The 'data double' is a term coined by Mina Ruckenstein to describe how our gathered information is be figuratively reassembled for the purposes of personal reflection and interaction.");
@@ -139,7 +140,7 @@ public class AchievementCollection {
                     }
 
                     @Override
-                    public void setDescription(Player player, Game game, RelativeLayout descriptionLayout) {
+                    public void setDescription(Player player, Game game, LinearLayout descriptionLayout) {
                         Context c = descriptionLayout.getContext();
                         AppCompatTextView textView = new AppCompatTextView(c);
                         textView.setText("\"We do not have names for all the possible combinations of " +
@@ -165,7 +166,7 @@ public class AchievementCollection {
                             }
 
                             @Override
-                            public void setDescription(Player player, Game game, RelativeLayout descriptionLayout) {
+                            public void setDescription(Player player, Game game, LinearLayout descriptionLayout) {
                                 Context c = descriptionLayout.getContext();
                                 AppCompatTextView textView = new AppCompatTextView(c);
                                 textView.setText("You are HYSTERICAL!!! Augustine is one of Jean-Martin Charcot's proofs cases for hysteria. Read 'The Invention Of Hysteria' by George Didi-Huberman on how Charcot contributed to her performance of hysteria.");
@@ -189,7 +190,7 @@ public class AchievementCollection {
                     }
 
                     @Override
-                    public void setDescription(Player player, Game game, RelativeLayout descriptionLayout) {
+                    public void setDescription(Player player, Game game, LinearLayout descriptionLayout) {
                         Context c = descriptionLayout.getContext();
                         AppCompatTextView textView = new AppCompatTextView(c);
                         textView.setText("...");
@@ -221,7 +222,7 @@ public class AchievementCollection {
                     }
 
                     @Override
-                    public void setDescription(Player player, Game game, RelativeLayout descriptionLayout) {
+                    public void setDescription(Player player, Game game, LinearLayout descriptionLayout) {
                         Context c = descriptionLayout.getContext();
                         AppCompatTextView textView = new AppCompatTextView(c);
                         textView.setText("Have you been on drugs? You're making a mess of things!");
@@ -252,7 +253,7 @@ public class AchievementCollection {
                     }
 
                     @Override
-                    public void setDescription(Player player, Game game, RelativeLayout descriptionLayout) {
+                    public void setDescription(Player player, Game game, LinearLayout descriptionLayout) {
                         Context c = descriptionLayout.getContext();
                         AppCompatTextView textView = new AppCompatTextView(c);
                         textView.setText("You would be a great CEO! You'll be able to convice shareholders, even if the company is in chaos!");
@@ -275,7 +276,7 @@ public class AchievementCollection {
                     }
 
                     @Override
-                    public void setDescription(Player player, Game game, RelativeLayout descriptionLayout) {
+                    public void setDescription(Player player, Game game, LinearLayout descriptionLayout) {
                         Context c = descriptionLayout.getContext();
                         AppCompatTextView textView = new AppCompatTextView(c);
                         textView.setText("...");
@@ -294,7 +295,7 @@ public class AchievementCollection {
                     }
 
                     @Override
-                    public void setDescription(Player player, Game game, RelativeLayout descriptionLayout) {
+                    public void setDescription(Player player, Game game, LinearLayout descriptionLayout) {
                         Context c = descriptionLayout.getContext();
                         AppCompatTextView textView = new AppCompatTextView(c);
                         textView.setText("...");
@@ -327,7 +328,7 @@ public class AchievementCollection {
                     }
 
                     @Override
-                    public void setDescription(Player player, Game game, RelativeLayout descriptionLayout) {
+                    public void setDescription(Player player, Game game, LinearLayout descriptionLayout) {
                         Context c = descriptionLayout.getContext();
                         AppCompatTextView textView = new AppCompatTextView(c);
                         textView.setText("...");
@@ -360,7 +361,7 @@ public class AchievementCollection {
                     }
 
                     @Override
-                    public void setDescription(Player player, Game game, RelativeLayout descriptionLayout) {
+                    public void setDescription(Player player, Game game, LinearLayout descriptionLayout) {
                         Context c = descriptionLayout.getContext();
                         AppCompatTextView textView = new AppCompatTextView(c);
                         textView.setText("...");
@@ -379,7 +380,7 @@ public class AchievementCollection {
                     }
 
                     @Override
-                    public void setDescription(Player player, Game game, RelativeLayout descriptionLayout) {
+                    public void setDescription(Player player, Game game, LinearLayout descriptionLayout) {
                         Context c = descriptionLayout.getContext();
                         AppCompatTextView textView = new AppCompatTextView(c);
                         textView.setText("...");
@@ -401,7 +402,7 @@ public class AchievementCollection {
                     }
 
                     @Override
-                    public void setDescription(Player player, Game game, RelativeLayout descriptionLayout) {
+                    public void setDescription(Player player, Game game, LinearLayout descriptionLayout) {
                         Context c = descriptionLayout.getContext();
                         AppCompatTextView textView = new AppCompatTextView(c);
                         textView.setText("\"CV Dazzle explores how fashion can be used as camouflage from face-detection technology, the first step in automated face recognition. ");
@@ -431,7 +432,7 @@ public class AchievementCollection {
                     }
 
                     @Override
-                    public void setDescription(Player player, Game game, RelativeLayout descriptionLayout) {
+                    public void setDescription(Player player, Game game, LinearLayout descriptionLayout) {
                         Context c = descriptionLayout.getContext();
                         AppCompatTextView textView = new AppCompatTextView(c);
                         textView.setText("In the beginning of the 20th century filmmaker Lev Kuleshov did an experiment\n" +
@@ -456,7 +457,7 @@ public class AchievementCollection {
                     }
 
                     @Override
-                    public void setDescription(Player player, Game game, RelativeLayout descriptionLayout) {
+                    public void setDescription(Player player, Game game, LinearLayout descriptionLayout) {
                         Context c = descriptionLayout.getContext();
                         AppCompatTextView textView = new AppCompatTextView(c);
                         textView.setText("...");
@@ -484,7 +485,7 @@ public class AchievementCollection {
                     }
 
                     @Override
-                    public void setDescription(Player player, Game game, RelativeLayout descriptionLayout) {
+                    public void setDescription(Player player, Game game, LinearLayout descriptionLayout) {
                         Context c = descriptionLayout.getContext();
                         AppCompatTextView textView = new AppCompatTextView(c);
                         textView.setText("You are remarkably good at posing, just like this guy:");
diff --git a/app/src/main/java/com/rubenvandeven/emotionhero/IntroActivity.java b/app/src/main/java/com/rubenvandeven/emotionhero/IntroActivity.java
index 0b448e7..1ede131 100644
--- a/app/src/main/java/com/rubenvandeven/emotionhero/IntroActivity.java
+++ b/app/src/main/java/com/rubenvandeven/emotionhero/IntroActivity.java
@@ -42,14 +42,14 @@ public class IntroActivity extends AppCompatActivity {
 
         View introView = findViewById(R.id.activity_intro);
 
-        if(!player.isNew()) {
+//        if(!player.isNew()) {
             introView.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
                     continueToMenu();
                 }
             });
-        }
+//        }
 
         final ImageView logoV2 = (ImageView) findViewById(R.id.logoV2);
         final ImageView logoArquivo = (ImageView) findViewById(R.id.logoArquivo);
diff --git a/app/src/main/java/com/rubenvandeven/emotionhero/MirrorMenuActivity.java b/app/src/main/java/com/rubenvandeven/emotionhero/MirrorMenuActivity.java
index a78e716..f0032bc 100644
--- a/app/src/main/java/com/rubenvandeven/emotionhero/MirrorMenuActivity.java
+++ b/app/src/main/java/com/rubenvandeven/emotionhero/MirrorMenuActivity.java
@@ -7,6 +7,7 @@ import android.app.ProgressDialog;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
+import android.support.v4.app.DialogFragment;
 import android.support.v8.renderscript.RenderScript;
 import android.graphics.Typeface;
 import android.support.v4.app.ActivityCompat;
@@ -56,6 +57,7 @@ public class MirrorMenuActivity extends AppCompatActivity implements Detector.Im
     TextView readyButton;
     TextView text1;
     TextView text2;
+    ImageView logoEmotionHero;
 
     boolean has_camera_permission = false;
 
@@ -64,6 +66,7 @@ public class MirrorMenuActivity extends AppCompatActivity implements Detector.Im
     RenderScript rs;
 
     Player player;
+    Animation anim;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -77,11 +80,12 @@ public class MirrorMenuActivity extends AppCompatActivity implements Detector.Im
         player = Player.getInstance(this);
 
         RelativeLayout videoContentLayout = (RelativeLayout) findViewById(R.id.videoContent);
-        ImageView logoEmotionHero = (ImageView) findViewById(R.id.logoEmotionHero);
+        logoEmotionHero = (ImageView) findViewById(R.id.logoEmotionHero);
         messageText = (TextView) findViewById(R.id.messageText);
         final TextView startButton = (TextView) findViewById(R.id.startButton);
         TextView highscoresButton = (TextView) findViewById(R.id.highscoresButton);
         TextView creditsButton = (TextView) findViewById(R.id.creditsButton);
+        TextView settingsButton = (TextView) findViewById(R.id.settingsButton);
         mainMenu = (LinearLayout) findViewById(R.id.mainMenu);
         nextButton = (TextView) findViewById(R.id.nextButton);
         readyButton = (TextView) findViewById(R.id.readyButton);
@@ -92,6 +96,7 @@ public class MirrorMenuActivity extends AppCompatActivity implements Detector.Im
         startButton .setTypeface(font);
         highscoresButton .setTypeface(font);
         creditsButton .setTypeface(font);
+        settingsButton.setTypeface(font);
         messageText.setTypeface(font);
         nextButton.setTypeface(font);
         readyButton.setTypeface(font);
@@ -153,7 +158,7 @@ public class MirrorMenuActivity extends AppCompatActivity implements Detector.Im
         scenarioView.drawOverlay = true;
         scenarioView.noFace = true;
 
-        Animation anim = new AlphaAnimation(0.0f, 1.0f);
+        anim = new AlphaAnimation(0.0f, 1.0f);
         anim.setDuration(1000); //You can manage the blinking time with this parameter
         anim.setStartOffset(20);
         anim.setRepeatMode(Animation.REVERSE);
@@ -180,15 +185,17 @@ public class MirrorMenuActivity extends AppCompatActivity implements Detector.Im
 
 
         // merge with 'start button'
-        
+
+//        highscoresButton.setVisibility(View.GONE);
         if(!player.getPlayerInfo().canContinueLevel()) {
             highscoresButton.setVisibility(View.GONE);
         } else {
+            startButton.setText("Introduction");
+            highscoresButton.setText("Start");
             highscoresButton.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
                     Intent intent = new Intent(MirrorMenuActivity.this, ProgressActivity.class);
-    //                intent.putExtra(HighscoreActivity.INTENT_EXTRA_LEVEL, player.getPlayerInfo().reachedLevelId);
                     startActivity(intent);
                 }
             });
@@ -202,6 +209,13 @@ public class MirrorMenuActivity extends AppCompatActivity implements Detector.Im
             }
         });
 
+        settingsButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                showSettings();
+            }
+        });
+
         rs = RenderScript.create(this);
 
 
@@ -231,6 +245,10 @@ public class MirrorMenuActivity extends AppCompatActivity implements Detector.Im
             }
         });
 
+        if(!player.hasSetSnapshotConfirm()) {
+            showSettings();
+        }
+
 
 
         // all setup, see wheter we immediately continue to intro:
@@ -241,11 +259,21 @@ public class MirrorMenuActivity extends AppCompatActivity implements Detector.Im
     }
 
     protected void gotoIntro() {
+        if(anim != null) {
+            anim.cancel();
+        }
+        logoEmotionHero.setVisibility(View.GONE);
+        logoEmotionHero.setAlpha(0f);
         nextButton.setVisibility(View.VISIBLE);
         text1.setVisibility(View.VISIBLE);
         mainMenu.setVisibility(View.GONE);
     }
 
+    public void showSettings() {
+        DialogFragment newFragment = SnapshotDialogFragment.newInstance();
+        newFragment.show(getSupportFragmentManager(), "dialog");
+    }
+
     @Override
     protected void onResume() {
         super.onResume();
diff --git a/app/src/main/java/com/rubenvandeven/emotionhero/Player.java b/app/src/main/java/com/rubenvandeven/emotionhero/Player.java
index 9cc19f7..9092837 100644
--- a/app/src/main/java/com/rubenvandeven/emotionhero/Player.java
+++ b/app/src/main/java/com/rubenvandeven/emotionhero/Player.java
@@ -63,6 +63,23 @@ public class Player {
         editor.commit();
     }
 
+    public boolean hasSetSnapshotConfirm() {
+        SharedPreferences settings = c.getSharedPreferences(PREFS_NAME, 0);
+        return settings.contains("snapshot_confirm");
+    }
+
+    public boolean allowsSnapshots() {
+        SharedPreferences settings = c.getSharedPreferences(PREFS_NAME, 0);
+        return settings.getBoolean("snapshot_confirm", false);
+    }
+
+    public void setAllowsSnapshots(boolean allows) {
+        SharedPreferences settings = c.getSharedPreferences(PREFS_NAME, 0);
+        SharedPreferences.Editor editor = settings.edit();
+        editor.putBoolean("snapshot_confirm", allows);
+        editor.commit();
+    }
+
     /**
      * Set the JWT as it is used on the API
      * @return
diff --git a/app/src/main/java/com/rubenvandeven/emotionhero/ReviewAchievementsActivity.java b/app/src/main/java/com/rubenvandeven/emotionhero/ReviewAchievementsActivity.java
index 698af47..b10978d 100644
--- a/app/src/main/java/com/rubenvandeven/emotionhero/ReviewAchievementsActivity.java
+++ b/app/src/main/java/com/rubenvandeven/emotionhero/ReviewAchievementsActivity.java
@@ -73,7 +73,8 @@ public class ReviewAchievementsActivity extends AppCompatActivity {
     public void addAchievement(Achievement achievement) {
         AppCompatTextView titleText = new AppCompatTextView(this);
         AppCompatTextView descriptionText = new AppCompatTextView(this);
-        RelativeLayout descriptionLayout = new RelativeLayout(this);
+        LinearLayout descriptionLayout = new LinearLayout(this);
+        descriptionLayout.setOrientation(LinearLayout.VERTICAL);
 //        ImageView imageView = new ImageView(this);
 
         LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
diff --git a/app/src/main/java/com/rubenvandeven/emotionhero/Scenario.java b/app/src/main/java/com/rubenvandeven/emotionhero/Scenario.java
index 200b82f..bf03ece 100644
--- a/app/src/main/java/com/rubenvandeven/emotionhero/Scenario.java
+++ b/app/src/main/java/com/rubenvandeven/emotionhero/Scenario.java
@@ -121,6 +121,7 @@ public class Scenario {
     protected boolean lostFace = false;
 
     public static int MAX_SNAPSHOTS = 5;
+    public boolean takeSnapshots;
     /**
      * Which targets to capture an image of
      */
@@ -180,6 +181,8 @@ public class Scenario {
         // determine before start which targets will be stored and send
         // only do it randomly so we don't need to do ALL and yet have spread across the level.
         snapTargets = pickNRandom(targets, MAX_SNAPSHOTS);
+
+        takeSnapshots = _activity.player.allowsSnapshots();
     }
 
     public static List<Target> pickNRandom(List<Target> lst, int n) {
@@ -229,7 +232,7 @@ public class Scenario {
 
 
                 Bitmap outputBitmap = null;
-                if(currentFrame != null &&  snapTargets.contains(target) ) {
+                if(currentFrame != null && takeSnapshots && snapTargets.contains(target) ) {
                     // convert NV21 byteArrayFrame from camera to RGB bitmap.
                     Frame.ByteArrayFrame byteArrayFrame = (Frame.ByteArrayFrame) currentFrame;
                     outputBitmap = Nv21Image.nv21ToBitmap(rs, byteArrayFrame.getByteArray(), byteArrayFrame.getWidth(), byteArrayFrame.getHeight());
diff --git a/app/src/main/java/com/rubenvandeven/emotionhero/ScenarioView.java b/app/src/main/java/com/rubenvandeven/emotionhero/ScenarioView.java
index 7367627..790a42e 100644
--- a/app/src/main/java/com/rubenvandeven/emotionhero/ScenarioView.java
+++ b/app/src/main/java/com/rubenvandeven/emotionhero/ScenarioView.java
@@ -29,6 +29,9 @@ public class ScenarioView extends SurfaceView implements SurfaceHolder.Callback
 
     private Scenario _scenario;
 
+    //        bottom at 60%;
+    public static float BAR_POSITION = 0.7f;
+
     /**
      * The scorres in this moment, as to draw them on the screen.
      * Indexes are Emotion ordinals
@@ -46,7 +49,6 @@ public class ScenarioView extends SurfaceView implements SurfaceHolder.Callback
     private Paint missedPaint = new Paint();
     private Paint scorePaint = new Paint();
     private Paint bonusScorePaint = new Paint();
-    private Paint scoreFinishedPaint = new Paint();
     private Paint bonusBarPaint = new Paint();
 
     private Point mLeftTop;
@@ -107,7 +109,7 @@ public class ScenarioView extends SurfaceView implements SurfaceHolder.Callback
         Typeface font = Typeface.createFromAsset(context.getAssets(), "unifont-9.0.02.ttf");
 
         scorePaint.setColor(Color.YELLOW);
-        scorePaint.setTextSize(40);
+        scorePaint.setTextSize(getResources().getDimensionPixelSize(R.dimen.scenario_scorevalue));
         scorePaint.setTypeface(Typeface.DEFAULT_BOLD);
 
         bonusScorePaint.setColor(Color.rgb(132, 0, 255));
@@ -116,10 +118,6 @@ public class ScenarioView extends SurfaceView implements SurfaceHolder.Callback
 
         bonusBarPaint.setColor(Color.rgb(132, 0, 255));
 
-        scoreFinishedPaint.setColor(Color.YELLOW);
-        scoreFinishedPaint.setTextSize(100);
-        scoreFinishedPaint.setTypeface(Typeface.DEFAULT_BOLD);
-
 
         //setup paints for drawing
         mainPaint.setColor(Color.GRAY);
@@ -134,7 +132,7 @@ public class ScenarioView extends SurfaceView implements SurfaceHolder.Callback
 
         for(Emotion emotion: Emotion.values()) {
             Paint emoPaint = new Paint();
-            emoPaint.setTextSize(22);
+            emoPaint.setTextSize(getResources().getDimensionPixelSize(R.dimen.scenario_emolabel));
 //            emoPaint.setTypeface(font);//gets ugly when transformed
             emoPaint.setColor(emotion.getColor());
 //            emoPaint.setShadowLayer(10,0,0,Color.BLACK);
@@ -156,7 +154,7 @@ public class ScenarioView extends SurfaceView implements SurfaceHolder.Callback
             int emoLightenedColor = Color.rgb(red, green, blue);
 
             emoScoredPaint.setColor(emoLightenedColor);
-            emoScoredPaint.setTextSize(20);
+            emoScoredPaint.setTextSize(getResources().getDimensionPixelSize(R.dimen.scenario_emolabel));
             emoScoredPaint.setStrokeWidth(2);
             emoScoredPaint.setStyle(Paint.Style.FILL_AND_STROKE);
 //            emoScoredPaint.setShadowLayer(10,0,0,Color.BLACK);
@@ -189,12 +187,12 @@ public class ScenarioView extends SurfaceView implements SurfaceHolder.Callback
         float height = canvas.getHeight();
         float width = canvas.getWidth();
 
-        //        bottom at 80%;
-        float bottomline_height = height * (float) 0.8;
+        //        bottom at 60%;
+        float bottomline_height = height * BAR_POSITION;
 
 
         // draw current hits:
-        float used_width = (float) 0.8; // 0.7: only use center
+        float used_width = (float) 0.9; // 0.7: only use center
         float padding_left = canvas.getWidth() * (1-used_width) / 2;
         float step_y = (canvas.getWidth() * used_width) / Emotion.values().length;
         float max_ball_radius = step_y * (float) 0.8 / 2;
@@ -269,19 +267,20 @@ public class ScenarioView extends SurfaceView implements SurfaceHolder.Callback
             float hitWidth = width*(_scenario.getHitPercentage()/100);
             float misWidth = width*(_scenario.getMissedPercentage()/100);
             float bonusWidth = width*(_scenario.getBonusPercentage()/100);
+            float bonus =_scenario.getBonusTotalValue();
 
-            String scoreText = String.format("%1$.0f", _scenario.getHitTotalValue());
+            String scoreText = String.format("%1$.0f", _scenario.getHitTotalValue() + bonus);
             Rect scoreTextBounds = new Rect();
             scorePaint.getTextBounds(scoreText, 0, scoreText.length(), scoreTextBounds);
             canvas.drawText(scoreText, hitWidth, height*0.95f-scoreTextBounds.height(), scorePaint);
 
-            float bonus =_scenario.getBonusTotalValue();
-            if(bonus > 0) {
+
+            /*if(bonus > 0) {
                 String bonusText = String.format("+ %1$.0f", bonus);
                 Rect bonusTextBounds = new Rect();
                 bonusScorePaint.getTextBounds(bonusText, 0, bonusText.length(), bonusTextBounds);
                 canvas.drawText(bonusText, hitWidth+scoreTextBounds.width()+3, height*0.95f-bonusTextBounds.height()-10, bonusScorePaint);
-            }
+            }*/
 
 
             canvas.drawRect(0, height*0.95f, width, height, mainPaint);
@@ -292,7 +291,7 @@ public class ScenarioView extends SurfaceView implements SurfaceHolder.Callback
             canvas.drawRect(0, height*0.95f, hitWidth, height, emoPaints.get(Emotion.JOY)); // paint: yellow
             canvas.drawRect(hitWidth, height*0.95f, hitWidth+misWidth, height, missedPaint);
 
-            canvas.drawRect(0, height*0.95f, bonusWidth, height*0.975f, bonusBarPaint);
+//            canvas.drawRect(0, height*0.95f, bonusWidth, height*0.975f, bonusBarPaint);
 
         }
     }
diff --git a/app/src/main/java/com/rubenvandeven/emotionhero/SnapshotDialogFragment.java b/app/src/main/java/com/rubenvandeven/emotionhero/SnapshotDialogFragment.java
new file mode 100644
index 0000000..9be7deb
--- /dev/null
+++ b/app/src/main/java/com/rubenvandeven/emotionhero/SnapshotDialogFragment.java
@@ -0,0 +1,91 @@
+package com.rubenvandeven.emotionhero;
+
+import android.app.Dialog;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.v4.app.DialogFragment;
+import android.support.v4.widget.TextViewCompat;
+import android.support.v7.app.AlertDialog;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+import android.widget.Toast;
+
+/**
+ * Created by ruben on 21/09/16.
+ */
+
+public class SnapshotDialogFragment extends DialogFragment {
+
+    Player player;
+
+    public static SnapshotDialogFragment newInstance() {
+        SnapshotDialogFragment frag = new SnapshotDialogFragment();
+        return frag;
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        player = Player.getInstance(getContext());
+
+        View v = getActivity().getLayoutInflater().inflate(R.layout.snapshot_check, null);
+
+        if(player.hasSetSnapshotConfirm()) {
+            String statusString = player.allowsSnapshots() ? "share" : "not share";
+            TextView statusText = new TextView(getContext());
+            statusText.setText("You have currently set to "+statusString+" the snapshots.");
+            RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+            params.addRule(RelativeLayout.BELOW, R.id.lastText);
+            int margin = getResources().getDimensionPixelSize(R.dimen.fab_margin);
+            params.setMargins(margin, margin/2, margin, 0);
+            ((RelativeLayout) v.findViewById(R.id.snapshotLayout)).addView(statusText,params);
+        }
+
+        return new AlertDialog.Builder(getActivity())
+//                .setIcon(R.drawable.alert_dialog_icon)
+                .setTitle("Contribute")
+                .setView(v)
+                .setOnDismissListener(new DialogInterface.OnDismissListener() {
+                    @Override
+                    public void onDismiss(DialogInterface dialogInterface) {
+                        // Set nothing, load website (triggers thing the next time
+                    }
+                })
+                .setPositiveButton("Yes!",
+                        new DialogInterface.OnClickListener() {
+                            public void onClick(DialogInterface dialog, int whichButton) {
+//                                ((FragmentAlertDialog)getActivity()).doPositiveClick();
+                                player.setAllowsSnapshots(true);
+                                Toast.makeText(getContext(), "Thanks!", Toast.LENGTH_LONG).show();
+                            }
+                        }
+                )
+                .setNeutralButton("See website",
+                        new DialogInterface.OnClickListener() {
+                            public void onClick(DialogInterface dialog, int whichButton) {
+                                // Set nothing, load website (triggers thing the next time
+                                Intent i = new Intent(Intent.ACTION_VIEW);
+                                i.setData(Uri.parse("https://emotionhero.com/faces"));
+                                startActivity(i);
+                            }
+                        }
+                )
+                .setNegativeButton("Nope",
+                        new DialogInterface.OnClickListener() {
+                            public void onClick(DialogInterface dialog, int whichButton) {
+//                                ((FragmentAlertDialog)getActivity()).doNegativeClick();
+                                player.setAllowsSnapshots(false);
+                                Toast.makeText(getContext(), "Don't worry, we get it!", Toast.LENGTH_LONG).show();
+                            }
+                        }
+                )
+                .create();
+    }
+
+
+}
diff --git a/app/src/main/res/drawable/example_brow.jpg b/app/src/main/res/drawable/example_brow.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..f76a0a45a1e8ab390f7a75965c804b39db252e2d
GIT binary patch
literal 6980
zcmbW5cQ71Yxc7JU-eQ$ly;~uAZ;37;BGJoFUA?W|mIx8ih3FDBdI**%A(mAatHvU_
ztlmWl*YDmt_s+b3z3=-y&pH2`=REU#=FEK0%(<PtT>{YPYU*eLfIt8McsBsISioZd
zJ|5n`aVLViAS59qBp@IpBPJ#yp&+B6ASWXyr=+5zp`@avA}6O|prO4-4+4QGs2Q0U
z=$Yu~LG=F?0pj1CAs{3rBqXJ$B&VeRf7WdmfR+UC2&j(_<O1N)0`X~qw@3i{U7v)&
z{}kZA1;o4Sk%*Xtl#Ki?p@{~72gJw6Bf$T+>$~jmyL|uwEg>DJm>SVNLtA1lAA0eq
z)K4VbkLtTY&&LmVB<y@&k&-bmGBMxh<>MC+6q1yZmXVc{f2^*dsim!>YxLr!v5Bdf
zxxIs<6V%zo73Sw35Ev9368$<R_D$T|__Xx*8JQolvU7@xOG?YiKUY*Xd~IxMMzpkk
z`_Y5!?L+ks3}PlGr>19Sf6gthtgfwZZ2rb=9UdK@oSvQkxw!n73kbmfFRZ)uzrg+v
zF4{XTJOToI0^)zUfOvs-6Q7oVkW-9^PR)?m*5@9VcoYf!qts9J-K5+S&ksO$zT;#J
zJd(@2hySAeC)xiU*sK39vi|}5U#>X-1wQcZ^6+T^Du9bstt+W{{9!zz*NI8--pKUP
z8B7OU)jxqGg;=<<grIBmdkZ+Aj&3|-7y0EH^XQR$-YuZ%GO*6(plQ6lDKR&MY4*BO
zR`$FuwRV$nXzXfGa?-fYIPjZ&oYk|D<Grhod7=2}b8U%o*DX0Ze2YX68QE*RLtccI
znlV#nQkm7K!7opL&Us$Rd;IgF@V(#;1l?I~r-4j{g(YEC@yo44;G%;y*$&5KpFHv-
z;O{3mQrtNzurbRar#Jqtb3+27JWl$)4}*=iAf_NjyKtopa=C>h;As8mv24|Nr^CDn
zpg{J<4-4Ts$fgbWygF%I9gw^Z=$Dw_FwQG`TST(^x_rF{oZPmLskZPF6Q@D#)iV)a
zPFG9watKFKBwRw-Z@wj&lJ_S!GW7XMY`-XCWcFZ8BUeE)o#6`2o7O)<jh}uD1Ub#|
zrKjNubm6mZtz}-7P{(k$C{a46re_y|U4Iy>i0Z$Wvs1<qPy}{Y-2$M3k=g?&!|9w%
zWcc_on=h)=wFtUPGLDDD<)!)RjDmP*Bv9NHSj5MZ(onnJXEGxxvq~!RW7=boT_e=u
zd8J{i;s!Kh9bEJ#@$2Nt=iaIkN`%t}0TD_c{-cR)PC7dS^h#z}^|U0E0m}P6#zt3I
ziaVuq;wPHI;mekR&r80>V;Q_I0%oS0eI-bJXN)GX^+%_M;;%Z6w)0?b`HfGXj=>S-
z#WgE!VB#)WuNAh_=+Dj(uC-H6qtEmIs+gaWCrT*F5%}?tmHv%a3Bj{f-J+guonx0<
znJY~<Z9s8&49(yRYt^{_ff`ZMCpZvDlL*OLo)9&*Ta_R<APV+J*KX`TQhKO9ojDSk
z^=+)S?5SN&T09-<d}HbH?$xk5T!6EID5B||4|S@K=-^17j8F7QEn<gB)zWhm3`;dL
zPb_?2g2XEm?`~svt#XFK<bQC6ayTkrS=6wYv~B$~tapl+EHh^usC+qY61~kL2-w@a
zG(Nq_-7wEgeFQ>luYp6R$4uVJC{8`d9X8}xh`nLcxdm)bS!DIL5oWI%`}b=uo$p?l
zJoP7a<YgwMjJlX&`OQsY$)x~Lc3(>FYt%MTJiD3iV-1K=eZ#57acRO*<ML&{Rj9Ox
zDc#=Z1fLlfe}c`0i#g5}Ss_!SBU?_YDJ=|i7>pBXc9zmY@Cy&iGHRjxd%uG^o9^#>
zl)mx+a&s$QUB)kqVu)LfI93!hdZ>J6aMo3|I3Mh17pB5of=a)WOMjJ&;KlN?Pw%w{
z?K6N@ar2<lA`yiKe!fK%OVFzoY1)U0;N3Yjr|toq=?BAH-c<T*WR@9&!7|g9SW<|I
zg^xSuh2!hY1kZuZiX9bEbiIEC-MXIoJC^<~Po8^y;R^ql=zb7)-t@AzSWw|knOe4Z
z7l0Mu)qF;AU3?3uyENv@|2*VS3d)pYj6_EmGk1giM*Kb)7ISxbGSb<*e(5vePk{r?
z5YrEN+ur$8@~D5NjG-Ly*XS4(&uKC)uG~eO&WchP^<L9f`S!Q3zrATPdU<ffRcXh`
z4Ruj97-M&RTbBDIgEm8iHQPpZN1Xb&O2#mE{pyKl?0mBse%Jsu9+yzkIkWWQ_m7a4
zg^p&O2x2A9c0>xcquq53gwGwIqZD^m^Lg{i@v|`*iQLaN;_WTL%h<e>M<_JZx-|Q8
z30`n#I?1HpWC%SbyRfh$HtqAjLhp06z&y)59dIKYoY+)fd7Nbs8k6e>{X}3tg8<<c
z8Q-G-ue2k7-PD6FG&fT(;PPuHyg}J%0@JGC3)@&GD!A@mV;k#)`i*w_&<_Xih|a&a
z0HKTa#|hZZ<_mU{$EIayba$73VtZFPm<@nB-L^uflk2$VB1FrmZOk_sO_y?<RJ#Uy
zxC0mY`ICZn+{Pu{{z+b|T%%1yO<-C%8R}qesV>dwq`u02PF<(hZlw(qzQkEFg^qm!
z?+j=Mz_vQ11tIXu?UIQlQ~0z%SD#W<S)M}ru$osnYdo#yBtK+!I>&T}`Djvv2%r*@
z8Lsod9-Cp9tiK>(_I%qpYB)(O3Q^d0QgiV*YuZ_{Z;sIk)}{PckSmhYX`vwCctR=~
zw#worOPesBIMS4b(C<)^H&K%5wa~U)CDc+tSzZNHG-|ggiGZk>u@uGYOsD0Ir1w7r
zES;R!i6^hv>u~zZH7fy`uHAHJP-pwec?sZ1RGm_AIp|YD3HrqJBq01}A8^;eG*hDS
z3-f05CCsv&O(-fUVys*#P{!ckvuBt-kCyhV7b_UncsW&Eu(QMc0+RPZC6mzXXZ?%a
ze^|cARzKj{Ff+XWETF*)RpZg^vw;{^<DkJ0U~8&W3y|nfHQnLy+;ibNW(*oE%)(<~
zUp2n&NJ%lRSLz;7gL)<IAqlRjBbovpJWW~bRwfo03<WziEJqn@DyZ3x4z^PxXY_=A
z*v|#jpW0v=HZ>3~56PkIqOJqT7W6tK4?;ymGEjt!h4%BaK9nc3(sdrBXxNmMvd~W1
za}@STvQUEX-*e9D6pjv~6zOW&slhI`?;DVLWt@G}PGDqSOV49p?+w|g@ci)b39H(L
z0jLL6j9&>mkGKKu&wcTcPC`9(yFcpMU!URK7E5htmQ$8z*Whb2@p((`&bmxq+PiW`
z+H;OF^*XtpVIGtuvl+;)64$zEuu|;#+)&ZwYpz?3MFtT7+`hCwVo+=R!f_OG^AZ^p
zpjyBuVA+6JP>$`O+frFj%<4vupVYXZ9_ce&&WSh3_kBW8wxPAm2Xav7M3PoZ=Vv=^
z5$iNVTmx?|0trWTdu3=#YMN~XLphYbP83Wv+G&aP>y_skXJgl6Qfe{YYNHpR{$Doz
zJ3akJkt}9`M~fN1**IU3?(C7MUhff5q`+{N(jBh)OduAmPXyBelS5fc?Jw;-(wq>5
zyDU@8(Pc#8qpO!D#4zWg#b;d~C<3C6q6;LpvE>~h)*Y@h#tlNTZ_#qr5rsA0IeCM2
zX|kUvJ`&A`;88!B#9Fnb%!TCnU&P*PUP{ih1sAAsBoAFf(x#)#%>SwK23XQaXRb~h
z{B?sP8H;2ex4&zY;hZ3oUp-oB-?uq@LDO#0xm|Cy<>vZyz-2ZI&C*a-%GIC9@|Izp
zO}txca5XQ|;BnVQ$F{N?P^d!A%wf}09^O@Na{t29@4UqXp#2kyezZFA>!fNLgQ5@{
zI(pI%5E;pEKfwnz^7FP15#+7&R)?K9DcAfXQa$WbS<)5b@^)12cepHm4w7~N>T|5M
zVSD4R){S2in1(aHe4F}<;c$f6(Q=>IGvo&Tu{!ZlcX2|S08&df@q#14xIX(O*99+V
zoGbgE&Ee-yYw_LRJ?N%PMX(iB*r<C1#~7=-gHi;RU?^@J?uAFWg&ecuiroix@4eN6
z@QB7YFK7i~_^e4)+GQ=F2`1|LLSJFY5;L9^e##SL4;-hQUTP$X3MWX*;VXJ59R!aA
z8cQ48i&_WrQ{XL!hkqZHLIvG3ig#w6@y2)czz)IYIv9R9wk%=<-}$bIC!F=y<>r2G
z!$>2pRg7@<lGA<rvFgV}IT~-xB@i%?)xu}t!L?UUzr`|X+jpv+2jYoYiez{*EG+BL
zYI79d>%P32tg2jS<j{%B4mzd01x(l2v-{;1<l9$i*}E!kXnM3>{bY}-_OMxzq-{;m
z<py65hQNAZ(>_DqaSg@VOp$npNg;m)Kitq|E>rbH>MXEO!EhKvd>eOGbp%fhc8EpJ
zp_{Y+YCaDDCmSuaYHhN^K_njXyU}SXyhy!P@JJJ}meIPZL{>pnYGqeS;RN#*KelNW
zQe%W+IZfpA`daMO+krU=@d$CvcLT(-fTiS{4#Rg=S4tIh2Ev<PG-s)ljti#|Ue}D(
zK!G5J^|<-!p;zDEz~Wb$+T5_v40gTz>^Kc&vo70-a;B0Bov$j+&V_7$3+VrjX`>0^
zd3Yx`XYStMmliAZ0p~pR+T7qh^lGxFTg>+Zf2^gtxr^Pg>DRI#cKwa=77SIs7Z0QK
zfntK@G&e!AyHm{L)T=7E1Tp06RAVwD^C7*j?lm+*lS)TrrXx@pbZE~_V%FZ#!t*r@
zMLb4(IWszET>LlNJ=!+$fL!Eyvw(U%{&(XqX05Y0quu9fq6CtHZQLsPyhNher=A~H
zhx~rxXPZR<H5Kd-52UizTNYS+`qyTL^;V^$gJOd=eerE=_}RAPjnN+t$(A3~a$P-I
z_a^arfBcK**f@p#311VzxVv~X$0p~u%~GD6c4H*c>cs#`3DP4u$}&RzbM1Ym;Z?K8
z#RZ(~gi>L2`n3tcJtm=NQRhjamp&G$6^nDOKErCZF~5lyN2hD74QSqGNA^jy$*#0)
zb`qUVgZt`R-cimZo#w9Eu!$79rz{1x%xkJKRnJK#ttZpDr8btRwjrc{lt=%WE{rK!
za9wnjzV<=n!4tjN7+TYjfg@tc!wLDw^nTE`alim!jsS}`hoga9b$}8{vHZ%*xyQ5_
zyW20h$i50^4Q|Tvr{~nv1w~0trR*$jc`JUQuJJtzy1@*;>P5cEkG$7-IUOj4K@|z-
ze)O~Ro`22yX8LQS*H>`}r*&Sz{0w8+wbA&#=XH6jAmj_6zfB9%7N`4^rGXX!*!#rX
zWIyCzl`ZKJLL3wJUL-Jruj9UwwL&g@UxI>o|FqY)fFFZdSs$vBMMq@UT4QYrA5WIV
z{#Nu6qb){g_Q~D?P*owWeRNQVB^||zqX7;(-yoGl?*g9A$HKmvsF3FFgyWm19>2Dz
z{Us&(s^1kt>WB|-0rxkg7@J!r_Ym(P<n=sxz$A!z?%1Y#aqae(@HmIKDeoiY9lu>m
zaaYV1;)BT%-;jM|(#1m5uj`yQ$hi_vOyg)nFAodIS1&xcPHy^IkFQmto9Rlb!JYyc
z*_G!_ETx+p>Tb6lQLb0>r(tF!$iwsk>5%75@2`Au-WyyVANJ%-JR{D562qXF1{-B7
zOMg*-?i=As(xK_=HP;|$jBYt+%h(KAU)aRb?<wnD#~TcKhp^Z1>pz$sgoV^S7PXji
zXl=QuZPpz&{b)%vu%{vt{>?;=FHxj8NZaHH4ND(et%ZE5$FLi>ll!=jse=!QbWmY8
zQoqb_q;8H(M?R8ukxRBoz~9uKVn!ssbI9@aih#v8SzGrVCrK*bgb3Rw^)T<i&?M|J
zPFhuP=#a2a)lkbpb@3~e(XbiEI$U5w-(c&*uhdyIWUmx%R0dnx79`Dg)Cu}^gt4UE
zXtA6*T9b8mKin~-XMcMP=U3wd8K6Z*Sp`Jh%RAi)q?6sK-3l>txYsp&EJC#~@BcTb
zmUhnp;fJ0IAYkUicUen-o&1G(PMEf|HYEwW&lYdcQFUIgMMyQ;@>rH&-;3;ed;^y?
zch`w9SrC#v_Ehh-aSyS}F6#!j-C$C6l5)F7Y!2y@&MSnEvVhMX60=16DHnqyK%)aZ
zh0YnBf0pp?tg?0esSIDU$@h)${Us0X!Oo+UY6?JDbisE_2iKsWIsAbmj|>SCnAD>@
zHQ;>TJre<ldlCp#bx`S}u7eMD5dXLg`4*hk*WW`RxLs)AdNI50H(L3V4%f+`&3nP5
zCCDnraSJ&8Q#+$Iw!25KrPKm7I!}IlQe`YnYxzjq=0P+Coh$%a>X(`G9H}17+{KeV
zgR}C(=nls^ng4!h-tS<$p?VGVg6y7*N<}Czm32A&@YiC6?HlvHjG5Im%V>qn%&=#O
z|1@{BR{JO7H*OK3!$t6vIcMDh4)$0rxSm=rG9Trzlom_hH^Nfz4T$TWII^}@9ZG7%
z!Bc>9h{U&{&h`Tz=ZMlsQv!sLu#2<G?+353S!=P5NzN&;)^bGOWWL4nI}Wxex2HeV
zWYK<9&asp}z?R{{Ma^_b-Q6O}m$o%2na1#Uf{jG(B9?mfVurZx`r#y3)XE3F5Bw!X
zQXZXI8=W88=69PlmLoX?QIp9-r`6$)AAM=p4E^|A<vfmfqJxqT>JSF2{v))n+aCWs
zfsPa5hxGKaT!J1+ZY#Vn5l3&ke)`(V?n4&(N+a|Z@K%xgBSR)n?8-8VgOQ(^dEeS2
zcqw0G(99D`CA(CAp&8<E6=EzN|C<&el@v1ZOu}hJAtsfXgoib;Pu~DG)9J>yY8^GC
zL$U9|Q>iugIv5Nq_?5~NYE(y=QB%GD0O`S)WoG+IX}GnI3a%_f&ceb{Pd0D46J?RO
zqeb|QO-Vq9$3IlzGC#0qBx1|rP!O8N^)jP4j&Kc1z&3UACg$4EvspY<JS{R$)M*#h
z6s#HL;YE~HU^%YCFjk+U)(^Jdwm7>laI9u`@QRdEmY;e1`BajNCd!JhrT!=LoV3%X
z4}V(t)8OXjxq|O-)`q>8`OP~<LllR*k&v?cVaZBeRH!t7{ZRt@K}{lGm&-);hKksP
zEUP}r7DNsNs+bJA*OMA#uRlA`dYIO=(JZCp64(IQl$Aw`CEPTjH7cxs4cyfAM-wxt
zh*k9ED-3-T*Gp34{=Av9-ujDf(B;_{1kyjabQE~xCTem}Q(^Kl;US7eb$9>IB;uhf
z&^s+ScqvlQXxGpJwQ*0xyV7K)!vQPAUl5esl`1Jd80XvSNam9eI>WzQ`0jpTv}mFJ
zbPpW52LVU(e%g`P?jk;{gHG9tk|w5n{RXndp43tPNnQTq_09`SRSG*gMV)Lv3J`P+
z<+0}dGUf65a9&HmaVZw9BoV)U4Rw}MQY2ZW6ap-Nk@3M{6-`DiiQ}c<1bRU!`uj9?
zssV#b0iP8$uJmlM1`lc)eqi`4e7_sG;>sb}x{R}z3VMf>jm9<)`ow+JTL!_WsAWr;
zL`92o7dJ&G&6Z54xY%2t0XgPdfKt`Qg3YQ^DXb%L*n5C0?Mb-IKZj=AeHho_v%o+)
z%jolA>T|90dMiKNw|Dw)K-B@A4-VH7_|$~-2Oq{q>^J-1EHnB_c}5^V5-{4T#}=~g
zmmb}0`L1{WWQ?!0$!cdO8L4MlMsen61x%(qiN$ShairbY<5z)f2Ib~W#Gp_q&+i9R
zu-9!@ex6?j6dH6#-p^9WU;i9co5-8;KUiOw^yzQt7=!2a6SJtH<-p<cp)=obHsqMI
zMZr&`60&nvrUkA2D%Q7v7(a9Vo)UzOn8%<zSO~hVc!F9tw>C=dC>GZhPk;9Zey=y|
z!7@9I%>v@*iA^d%P}=mN9M56SiG?WMVsE_&qaWrVFuz6dAiQd-F;T=q+w{WlheV_%
zkk!Do6-MFNr=@V%g@5g$2@)ME)ur8tSA1-B0C}h0l)Q12{ip%}X*P)H$vGOO36fqx
z>To1Z2VO{*3$@>TH_Ey6GLPPU*glSAhms$ivES59w{Ie)x4DHQ>`3)I<dlGlGxEmi
z&70~04Zp)yMWgQrs|J(y8RVug%5f{V?oXFD9&9^&&#B(hv=%kkavSpxC$azvIrQrZ
zJP~E>#y_skK3N6}@~7Add6x!VYuDfqkY1$(UZ!K1jnPn;k6qa$r_*1o7;hhGw_-$7
zPgY(nH36IV(-5sB2bQ(tOidSdH|^aFe%9d2nZjNLRm(jyrab7ZUu~QcwQ`Z=z_}J~
zML?7#g*-#fe!8uOPRhmi1)ax{ul%@1kQOFCA`MS3hD8(o>YJOvcScM+q=?Ub@K8{w
zT8(2D9N$(F{?h<%E>QE@6$`I^AJDaWTq(TUu(T&fiBb|MYAVy^X|Z!RP1D&d{86i}
z*O;5M^EkD@+qnqwHjO-%OJRkS&?MPY!<Wr|6oks^dqUW^nrEn?(<mdGJCq$UDtK(8
zY_{ohQYUcOF^L9CVjj|g@sKO=5F&vvXg*pOr#tA~_c%@d@3G0=d*0KmXY};XRad{?
z0xZWh^yYWU54kZB3{Sbu&HFH7YBZcWvcx#+6f}ybo_|Pjb1q(J8bzO&E4uh2_XeIC
zaV|B6`^Xr#nzyPvi_-v&JTsJb2Phl?Yt)X`lBj%8rSv9ZvwFY*yWq_Z2N}9>nfn5t
zGkcMn?b^dtA{ecK*_qToc^PO@X2sPG`WNBZjQ2KvC3ueE&TlN}FHEn?S+~1u*L*<5
zv7A_iT*ZP8=c48}J?xL3ATp4%R9#>P=-<j+Nligt-L%qA^FDVjFKK8!LfNTBF)~6H
zOg;NH^(}|Pp5n1}?sAf6ssW_s5W8=v;SUyF)~dwOwY1X`+cKu<4_|k*nOL|Tn@0vS
z!A7U!A=#-0_R<)W3(d1`Y(e-|<5z9ba^Nh*$q2nkDqGp-4Eo>?`1ovv8NquMUiWO)
z`d(*!O)IW-E^32>8LWA+y~+R6q<W<ZVDVUpRbV$?uI5kkxDVq=<Xm!mtK4X)`vEyp
oaSa8na9L<}4xkwoFLzXyAcO3GpZ~op@i~lt^ySYG_S>KT0oHR_NB{r;

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/example_mouth.jpg b/app/src/main/res/drawable/example_mouth.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..a2eb49b0a8be2e5104975d4ebbf2a504b6fa1ae3
GIT binary patch
literal 2279
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
OzZ=+?T4-Z;#{UEg6C<7g

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/example_nose.jpg b/app/src/main/res/drawable/example_nose.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..57b9d2e5e5bdeb349abb172aff6086169bc24d40
GIT binary patch
literal 1933
zcmbW!XH=6}8VB$<yd)t6gg_DlhPXly1W}qaDZ)_WE-W<~#1TSMM28kSN5BYVC<ci%
zMF@gIAOcDeaR#J`iX$Zi2#j=4${=+FH5+F3?4GlqcK3gud%xUrp5M8`Vc`TIOR{ya
z1t1UrfQSYl6ae1=pqSWRi6Sm4s00)$E)JE1!(kFql2TGgNhDHwpPa1pKGZ%WQWh(V
zl1F1O7%7?kI4l|`hsL1y9)W<OJK|6T6pBDgBc;**bA+t`N&@f!>_CVzAclf~D2T8F
zI4J593i%_zKLZgH^$3GYAS98Z1NE|i7z6~x#KFC;MW^FM`+ztKDtAc75+?8L4Ob39
z>n1WwBvh<w+b}MDt3*AY&?JN;c0W!*QT4Ez`VkHN69$Gx#wOoc+t}LKJCI!6+&#!=
z&Qhqpe*OW07cYf{N6;dpqGOV;({H4trZKW_<*;t&=H(Z#OYfJJKX_PCS@-x!eM4i@
z)8-fL9i3g>FMD3~4-E2#_`@TklT*_(vvczcA3lCsTi@8++W!6X&YlYbfPb<?>z}ay
zaG^vlF>!HF9KPp*h((Gfh!Te$(t*iYI>Ws~<dt<3CD2yPlG-+eik{0V#wWB-5=+#d
zRQ<F^`$P8M!IJ(j*}q`_c8vm3AVl<eAPTSmHXq4;NKv-N{nix8Aspn<eAG-C9jo2x
zf)1K1Wvs(|fMDoAplJ&M^G%xIvSO0NnjOIJb_(0rh!FxeuAEs?m}V>oKNv|-n{Au!
zZxOs0So%9|Ep~_Ow%uE!ots5!JE_ewr`nO5V0y_((T|MyKic-kjb(><u?B@eV6rhh
z^BNz+m6ItpjX$DBJLes|FGkbJ+?_TF4{?h-T|xOko8@w`L?wt>5N(9#UJ4u}O|>{p
z6z-0bJcmb-bfUh`G_ebAgrDB1o@}!3%<8gQS{|tOyG!OwsDBOQD4u6kQcf$IdOTat
zj+PADn0|lFq|d9?q1q9#-dOUpQWbXV?W(mht}Dc`rq0ionbpe}`qrDhh!3VmS9pwp
z^>&V%orfbmU5op0#fx+!ZsNT+X_ls7kxiJ1Nn>86BhR%r!pA~qe*iN5YfzD$HBF;e
z#rpa@P*lW9;T+G?t$$o0Rx|zF4;Q!4qxF)lnrA~yPXor2UvgYWRF@m`K|JB%xJMOw
znAZ3`CC=lKJT@awGXks+EGm~L56@l=_hcO?g`25!f3?tXSJ=6t%=kE`%|k>6Y(+`Z
zrGQTF)FgPQO~g)4>{KhrKk@34I*I}IhE|h2Z*MsN6fxd9W<rjt;hefp!)<frt^ZaQ
zi6_VU7ET>#mh#DA^;MnC;&dgvwVVuVkKvo)>G;wg%z~<hw9Z~rDT*N<3N1G_DAFlN
z4ZK{hCX2Wy7-|Tvc2hq7*I55r{m<J*E+NTY9xO%s68m2;6@^rJN3wKcl1vCg^M^AD
zXqUnHIXlDZ=2Q40BQ7DjMUXx6vf4s%(TJ8|tM_Y-{?@UcCOM7lrtEk}j#cBu`{#~X
znrZ$tFuBgwfW2!W>#<L<(V917$<b^9qH37APJNCrJ}K|=fOzG?CF~LegfD3R$SX#u
z;FZP~2Y-9gLdlhMQd&$IT$1cq0%m;uxo!per4-$fJHDZx4GDMnev`XA4F_*QQc&t3
zlh;U{JFn5jtZX^<T#(Lq)wRYWv|m-WZ$%CIGiJi$6AUbySf&M<Zp-hcScdU3M=#Fu
z9#L$A+l}WMFVwA3$=(e$OWnhkZ)4^Q-YJgS7oJT#;cReH2*@yrfnn>^tTNhGq}9+c
z`=)~eVRPmi{u5r~)zkLGzGwUZ%$k=*&m2Cv6-HlSs)sE^(hRl7USOSjTHCnCJ5co7
zQMYgkqhX`vDXu!$b~zcM5FmB(H!abZcW?BY+@d&^@iJrFl#IvmnU!hyHxKT`xf^S>
zlsU)`z#hI|bUs>5tZp#fRAZbD_KGm82+p@Ovm<p9(tZvCUt>2fAB@oqu%`!KaQA*%
zyZx}z$KRuR5@LF_o}sf~6CIiQMZQvNDfH+X`^ZEo^~8n^uQ@vU<4MMR1QNG$=F7bd
z|IG8$H{pw#O~Jgo`FCUPT;Mygf6smGb^S|wW>A8R%zb9va_cXY?m<(9zvSc<zNWq(
zYG|gqKGvW4q`-uIkI9IQKU}89YO32(;;6Q$RvvgqA3GdPB!{r0tSMH=73S`<5Yp?g
z^WmX<b3#V(=!8Q-|LRH_;jV&C7tGO!o4wMdpPG^1RxS`gWWn_HEK+Y>4)<JbBm6)&
z+U=&z6P=@^Oeh8zp*io?ZdUcAsD1sYUOc1P`uWn1y4fi<10_YjwqJ|fDkdA!i*|pW
fT#}!l%jOU`HW;|Ifm-f2Gtb4ZfoulSLOAjdFhNH;

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/activity_mirror_menu.xml b/app/src/main/res/layout/activity_mirror_menu.xml
index a9112a0..de9ad39 100644
--- a/app/src/main/res/layout/activity_mirror_menu.xml
+++ b/app/src/main/res/layout/activity_mirror_menu.xml
@@ -57,6 +57,17 @@
             android:layout_height="wrap_content"
             android:id="@+id/creditsButton"
             android:fontFamily="sans-serif" />
+        <TextView
+            android:textAlignment="center"
+            android:textSize="30dp"
+            android:textColor="@color/textPrimary"
+            android:textAllCaps="true"
+            android:layout_marginBottom="@dimen/fab_margin"
+            android:text="@string/settings"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/settingsButton"
+            android:fontFamily="sans-serif" />
 
     </LinearLayout>
 
@@ -72,7 +83,7 @@
         android:textColor="@color/textSecondary"
         android:textSize="30sp"
         android:textStyle="bold"
-        android:paddingBottom="60dp"
+        android:paddingBottom="100dp"
         android:shadowColor="@android:color/black"
         android:shadowDx="0"
         android:shadowDy="0"
@@ -81,7 +92,6 @@
         android:typeface="normal"
         android:fontFamily="sans-serif-condensed" />
 
-
     <ImageView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -105,6 +115,7 @@
         android:layout_below="@+id/logoEmotionHero"
         android:paddingLeft="@dimen/fab_margin"
         android:paddingRight="@dimen/fab_margin"
+        android:paddingTop="@dimen/fab_margin"
         android:id="@+id/introText1"
         android:text="@string/game_intro_text"
         android:textColor="@color/textPrimary"
@@ -129,6 +140,7 @@
         android:layout_below="@+id/logoEmotionHero"
         android:paddingLeft="@dimen/fab_margin"
         android:paddingRight="@dimen/fab_margin"
+        android:paddingTop="@dimen/fab_margin"
         android:id="@+id/introText2"
         android:text="@string/game_intro_text2"
         android:textColor="@color/textPrimary"
diff --git a/app/src/main/res/layout/snapshot_check.xml b/app/src/main/res/layout/snapshot_check.xml
new file mode 100644
index 0000000..b013c5e
--- /dev/null
+++ b/app/src/main/res/layout/snapshot_check.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:elevation="1dp"
+    android:id="@+id/snapshotLayout">
+
+    <TextView
+        android:text="While using this game, you can contribute snapshots of certain facial features to a central piece.\nNote that solely the following features are shared:"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:id="@+id/textView3"
+        android:layout_marginLeft="@dimen/fab_margin"
+        android:layout_marginRight="@dimen/fab_margin" />
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/textView3"
+        android:layout_centerHorizontal="true"
+        android:layout_margin="@dimen/fab_margin"
+        android:id="@+id/imageGrid">
+
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center">
+
+            <ImageView
+                android:layout_width="120dp"
+                android:layout_height="wrap_content"
+                app:srcCompat="@drawable/example_mouth"
+                android:id="@+id/imageView4"
+                android:layout_weight="1"
+                android:adjustViewBounds="true" />
+
+            <ImageView
+                android:layout_width="120dp"
+                android:layout_height="wrap_content"
+                app:srcCompat="@drawable/example_brow"
+                android:id="@+id/imageView2"
+                android:layout_weight="1"
+                android:adjustViewBounds="true"
+                android:layout_marginTop="@dimen/appbar_padding_top" />
+        </LinearLayout>
+
+        <ImageView
+            android:layout_width="120dp"
+            android:layout_height="match_parent"
+            app:srcCompat="@drawable/example_nose"
+            android:id="@+id/imageView3"
+            android:layout_weight="1"
+            android:adjustViewBounds="false" />
+
+    </LinearLayout>
+
+    <TextView
+        android:text="For more information see emotionhero.com.\nYou can always change these settings later."
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/imageGrid"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_marginLeft="@dimen/fab_margin"
+        android:layout_marginRight="@dimen/fab_margin"
+        android:id="@+id/lastText" />
+
+</RelativeLayout>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index ca45e7a..04e3d5e 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -6,4 +6,7 @@
     <dimen name="appbar_padding_top">8dp</dimen>
     <dimen name="highscore_textsize">15sp</dimen>
     <dimen name="gametitle_textsize">12sp</dimen>
+    <dimen name="scenario_scorevalue">20sp</dimen>
+    <dimen name="scenario_emolabel">12sp</dimen>
+
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8c1f236..a9a17fd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -10,6 +10,7 @@
     <string name="continueBtn">Continue</string>
     <string name="highscores">Progress</string>
     <string name="credits">Credits</string>
+    <string name="settings">Settings</string>
     <string name="title_activity_highscore">HighscoreActivity</string>
     <string name="action_settings">Settings</string>
     <string name="section_format">Hello World from section: %1$d</string>
diff --git a/build.gradle b/build.gradle
index dd57b9d..86851b2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.0-rc2'
+        classpath 'com.android.tools.build:gradle:2.2.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files