Merge branch 'master' into kioskmode

Now having the back button in the credits screen and some minor bugfixes

app/build.gradle

@@ -4,12 +4,12 @@ android {
     signingConfigs {
     }
     compileSdkVersion 24
-    buildToolsVersion '23.0.3'
+    buildToolsVersion '25.0.0'
     defaultConfig {
         applicationId 'com.rubenvandeven.emotion_hero.kiosk'
         minSdkVersion 16
         targetSdkVersion 24
-        versionCode 10
+        versionCode 11
         versionName '1.2'
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 

app/src/main/AndroidManifest.xml

@@ -59,7 +59,11 @@
             android:name=".CreditsActivity"
             android:screenOrientation="portrait"
             android:configChanges="orientation"
-            android:theme="@style/FullscreenTheme" />
+            android:theme="@style/FullscreenTheme">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="com.rubenvandeven.emotionhero.MirrorMenuActivity" />
+        </activity>
         <activity
             android:name=".ReviewActivity"
             android:launchMode="singleTop"

app/src/main/java/com/rubenvandeven/emotionhero/CreditsActivity.java

@@ -8,6 +8,7 @@ import android.net.Uri;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.support.v7.widget.Toolbar;
+import android.util.Log;
 import android.view.View;
 import android.view.WindowManager;
 import android.widget.LinearLayout;
@@ -15,21 +16,19 @@ import android.widget.TextView;
 
 public class CreditsActivity extends AppCompatActivity {
 
+    final static String LOG_TAG = "EmotionHero-Credits";
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
-        if(getSupportActionBar() != null) {
-            getSupportActionBar().hide();
-        }
-//        TODO: verander naar MET toolbar voor 'terug'
-//        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
-//        setSupportActionBar(toolbar);
-//        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-//        getSupportActionBar().setTitle("Credits");
-
         setContentView(R.layout.activity_credits);
 
+        Toolbar toolbar = (Toolbar) findViewById(R.id.credits_toolbar);
+        setSupportActionBar(toolbar);
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        getSupportActionBar().setTitle("Credits");
+
         Typeface font = Typeface.createFromAsset(getAssets(), "unifont-9.0.02.ttf");
         TextView textView = (TextView) findViewById(R.id.textView);
         TextView affectivaPower = (TextView) findViewById(R.id.affectivaPower);

app/src/main/java/com/rubenvandeven/emotionhero/IntroActivity.java

@@ -96,6 +96,7 @@ public class IntroActivity extends AppCompatActivity {
         startActivity(intent);
         //disable distracting transition when going to menu
         IntroActivity.this.overridePendingTransition(0, 0);
+        finish();
     }
 
     /**

app/src/main/java/com/rubenvandeven/emotionhero/MirrorMenuActivity.java

@@ -256,8 +256,6 @@ public class MirrorMenuActivity extends AppCompatActivity implements Detector.Im
             showSettings();
         }
 
-
-
         // all setup, see wheter we immediately continue to intro:
         boolean showIntro = getIntent().getBooleanExtra(INTENT_EXTRA_SHOW_INTRO, false);
         if(showIntro) {

app/src/main/java/com/rubenvandeven/emotionhero/ProgressActivity.java

@@ -163,7 +163,7 @@ public class ProgressActivity extends AppCompatActivity {
                     achievementTextParams.addRule(RelativeLayout.ALIGN_PARENT_LEFT, RelativeLayout.TRUE);
                     achievementTextParams.addRule(RelativeLayout.BELOW, scoreText.getId());
                     achievementText.setLayoutParams(achievementTextParams);
-                    achievementText.setTextSize(getResources().getDimensionPixelSize(R.dimen.highscore_textsize));
+                    achievementText.setTextSize(getResources().getDimensionPixelSize(R.dimen.progress_achievements));
                     achievementText.setOnClickListener(toHighScoreClick);
 
                     lvlLayout.addView(achievementText);

app/src/main/res/layout/activity_credits.xml

@@ -5,16 +5,40 @@
     android:id="@+id/activity_credits"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
     tools:context="com.rubenvandeven.emotionhero.CreditsActivity">
 
+    <android.support.design.widget.AppBarLayout
+        android:id="@+id/appbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="@dimen/appbar_padding_top"
+        android:theme="@style/AppTheme.AppBarOverlay"
+        android:layout_marginBottom="10dp"
+        >
+
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/credits_toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            app:layout_scrollFlags="scroll|enterAlways"
+            app:popupTheme="@style/AppTheme.PopupOverlay"
+            app:titleTextColor="@color/textHighlight">
+
+        </android.support.v7.widget.Toolbar>
+
+
+    </android.support.design.widget.AppBarLayout>
+
     <ScrollView
         android:id="@+id/creditsLayout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:layout_below="@+id/appbar"
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
+        android:paddingLeft="@dimen/activity_horizontal_margin"
+        android:paddingRight="@dimen/activity_horizontal_margin"
         >
 
         <LinearLayout
@@ -70,7 +94,11 @@
                 android:layout_centerHorizontal="true"
                 android:adjustViewBounds="true"
                 android:cropToPadding="true"
-                android:layout_marginBottom="@dimen/fab_margin" />
+                android:layout_marginBottom="@dimen/fab_margin"
+
+                android:layout_marginLeft="@dimen/activity_horizontal_margin"
+                android:layout_marginRight="@dimen/activity_horizontal_margin"
+                />
             <TextView
                 android:text="Font used: Unifont CSUR - GPL."
                 android:layout_width="match_parent"
@@ -105,7 +133,9 @@
         android:id="@+id/logoEmotionHero"
         android:cropToPadding="false"
         android:adjustViewBounds="true"
-        android:layout_marginTop="58dp"
+        android:layout_marginTop="75dp"
+        android:layout_marginLeft="@dimen/activity_horizontal_margin"
+        android:layout_marginRight="@dimen/activity_horizontal_margin"
         android:layout_alignParentTop="true"
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"

app/src/main/res/values/dimens.xml

@@ -8,8 +8,8 @@
     <dimen name="gametitle_textsize">14sp</dimen>
     <dimen name="progress_score">17sp</dimen>
     <dimen name="progress_play">17sp</dimen>
+    <dimen name="progress_achievements">11sp</dimen>
     <dimen name="scenario_scorevalue">20sp</dimen>
     <dimen name="scenario_emolabel">20sp</dimen>
     <dimen name="review_header">17sp</dimen>
-
 </resources>

build.gradle

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

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Dec 28 10:00:20 PST 2015
+#Wed Sep 13 13:41:16 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip