From a80425b5477bda567436198ddba2469d7f9d3dca Mon Sep 17 00:00:00 2001
From: Ruben <ruben@r2>
Date: Tue, 30 Aug 2016 18:06:18 +0100
Subject: [PATCH] Minor layout changes

---
 app/src/main/AndroidManifest.xml                      | 10 ++++------
 .../com/rubenvandeven/emotionhero/GamingActivity.java |  7 +++++--
 .../com/rubenvandeven/emotionhero/ScenarioView.java   | 11 ++++++-----
 app/src/main/res/values/strings.xml                   |  2 +-
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c14d629..7e045f3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -19,12 +19,10 @@
             android:label="@string/app_name"
             android:theme="@style/FullscreenTheme">
 
-            <!-- <intent-filter> -->
-            <!-- <action android:name="android.intent.action.MAIN" /> -->
-
-
-            <!-- <category android:name="android.intent.category.LAUNCHER" /> -->
-            <!-- </intent-filter> -->
+             <!--<intent-filter> -->
+             <!--<action android:name="android.intent.action.MAIN" />-->
+             <!--<category android:name="android.intent.category.LAUNCHER" /> -->
+             <!--</intent-filter> -->
         </activity>
         <activity
             android:name=".IntroActivity"
diff --git a/app/src/main/java/com/rubenvandeven/emotionhero/GamingActivity.java b/app/src/main/java/com/rubenvandeven/emotionhero/GamingActivity.java
index ea1b984..b0b735c 100644
--- a/app/src/main/java/com/rubenvandeven/emotionhero/GamingActivity.java
+++ b/app/src/main/java/com/rubenvandeven/emotionhero/GamingActivity.java
@@ -146,6 +146,9 @@ public class GamingActivity extends AppCompatActivity implements Detector.ImageL
         RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
 //        RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(1,1);
         params.addRule(RelativeLayout.CENTER_IN_PARENT,RelativeLayout.TRUE);
+        // 10% margin:
+        params.leftMargin = (int) 120;
+        params.rightMargin = params.leftMargin;
         cameraPreview.setLayoutParams(params);
         videoLayout.addView(cameraPreview,0);
 
@@ -242,6 +245,7 @@ public class GamingActivity extends AppCompatActivity implements Detector.ImageL
         if (list == null)
             return;
         if (list.size() == 0) {
+            setText("No face found...");
 //            mContentView.setText("NO FACE FOUND"); // this happens in onFaceDetectionStopped
         } else {
             hideText(); // hide textView as we want as few elements as possible.
@@ -300,7 +304,6 @@ public class GamingActivity extends AppCompatActivity implements Detector.ImageL
     @Override
     public void onFaceDetectionStopped()
     {
-        setText("No face found...");
         currentScenario.pause();
     }
 
@@ -344,7 +347,7 @@ public class GamingActivity extends AppCompatActivity implements Detector.ImageL
     }
 
     public void finishLevel() {
-        setText("LEVEL ENDED");
+//        setText("LEVEL ENDED");
         stopDetector();
 //        restartButton.setVisibility(View.VISIBLE);
 //        if(!currentScenario.isFinalLevel()) {
diff --git a/app/src/main/java/com/rubenvandeven/emotionhero/ScenarioView.java b/app/src/main/java/com/rubenvandeven/emotionhero/ScenarioView.java
index ad85c03..60ec4bd 100644
--- a/app/src/main/java/com/rubenvandeven/emotionhero/ScenarioView.java
+++ b/app/src/main/java/com/rubenvandeven/emotionhero/ScenarioView.java
@@ -105,14 +105,14 @@ public class ScenarioView extends SurfaceView implements SurfaceHolder.Callback
 
         for(Emotion emotion: Emotion.values()) {
             Paint emoPaint = new Paint();
-            emoPaint.setTextSize(20);
+            emoPaint.setTextSize(22);
             emoPaint.setColor(emotion.getColor());
             emoPaints.put(emotion, emoPaint);
 
             Paint emoPaintOutline = new Paint();
             emoPaintOutline.setColor(emotion.getColor());
             emoPaintOutline.setStyle(Paint.Style.STROKE);
-            emoPaintOutline.setStrokeWidth(2);
+            emoPaintOutline.setStrokeWidth(3);
             emoOutlinePaints.put(emotion, emoPaintOutline);
 
             Paint emoScoredPaint = new Paint();
@@ -168,13 +168,13 @@ public class ScenarioView extends SurfaceView implements SurfaceHolder.Callback
 
 
             canvas.drawCircle(cx, cy, max_ball_radius, mainPaint);
-            canvas.drawCircle(cx, cy, max_ball_radius, emoOutlinePaints.get(emotion));
+            canvas.drawCircle(cx, cy, max_ball_radius + 5, emoOutlinePaints.get(emotion));
 
 //            canvas.drawCircle(cx, cy, max_ball_radius * value/100, emoPaints.get(emotion.ordinal()));
             canvas.drawCircle(cx, cy, max_ball_radius * value/100, attrScorePaint);
 
             Path emoNamePath = new Path();
-            emoNamePath.moveTo(cx, cy + max_ball_radius * 1.5f);
+            emoNamePath.moveTo(cx, cy + max_ball_radius * 1.55f);
 //            more curly line to draw on:
 //            emoNamePath.rCubicTo(width*0.1f,0, width*0.1f, height*0.2f,width*0.2f,height*0.2f);
             emoNamePath.rLineTo(1000,1000);
@@ -242,8 +242,9 @@ public class ScenarioView extends SurfaceView implements SurfaceHolder.Callback
     public void surfaceCreated(SurfaceHolder holder) {
         setWillNotDraw(false); //Allows us to use invalidate() to call onDraw()
 
-//        this.setZOrderOnTop(true);
+//        this.setZOrderOnTop(true); // performance impact
 //        holder.setFormat(PixelFormat.TRANSPARENT);
+//        holder.setFormat(PixelFormat.TRANSLUCENT);
 
 //        Log.e("TEST2", "Jaa2!");
         _thread = new PanelThread(getHolder(), this); //Start the thread that
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 666803b..303823a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -8,7 +8,7 @@
     <string name="nextLvl">Next Level!</string>
     <string name="start">Start</string>
     <string name="continueBtn">Continue</string>
-    <string name="highscores">Highscores</string>
+    <string name="highscores">Levels</string>
     <string name="credits">Credits</string>
     <string name="title_activity_highscore">HighscoreActivity</string>
     <string name="action_settings">Settings</string>