From 4645ae4a6b4cef40a5563b792cd12f50b8a517c7 Mon Sep 17 00:00:00 2001
From: Ruben <rubenvandeven@gmail.com>
Date: Fri, 8 Sep 2017 10:26:55 +0200
Subject: [PATCH] Prepare to add action bar to Credits screen

---
 app/build.gradle                                           | 4 ++--
 .../com/rubenvandeven/emotionhero/CreditsActivity.java     | 7 +++++++
 app/src/main/res/layout/activity_credits.xml               | 4 ++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index fe0af47..f29c452 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId 'com.rubenvandeven.emotion_hero.kiosk'
         minSdkVersion 16
         targetSdkVersion 24
-        versionCode 9
-        versionName '1.1'
+        versionCode 10
+        versionName '1.2'
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
         renderscriptTargetApi 16
diff --git a/app/src/main/java/com/rubenvandeven/emotionhero/CreditsActivity.java b/app/src/main/java/com/rubenvandeven/emotionhero/CreditsActivity.java
index 69e4610..ec25024 100644
--- a/app/src/main/java/com/rubenvandeven/emotionhero/CreditsActivity.java
+++ b/app/src/main/java/com/rubenvandeven/emotionhero/CreditsActivity.java
@@ -7,6 +7,7 @@ import android.graphics.Typeface;
 import android.net.Uri;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.support.v7.widget.Toolbar;
 import android.view.View;
 import android.view.WindowManager;
 import android.widget.LinearLayout;
@@ -21,6 +22,12 @@ public class CreditsActivity extends AppCompatActivity {
         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);
 
         Typeface font = Typeface.createFromAsset(getAssets(), "unifont-9.0.02.ttf");
diff --git a/app/src/main/res/layout/activity_credits.xml b/app/src/main/res/layout/activity_credits.xml
index be93f57..f56b1c4 100644
--- a/app/src/main/res/layout/activity_credits.xml
+++ b/app/src/main/res/layout/activity_credits.xml
@@ -9,13 +9,13 @@
     android:paddingRight="@dimen/activity_horizontal_margin"
     tools:context="com.rubenvandeven.emotionhero.CreditsActivity">
 
-
     <ScrollView
         android:id="@+id/creditsLayout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_alignParentBottom="true"
-        android:layout_centerHorizontal="true">
+        android:layout_centerHorizontal="true"
+        >
 
         <LinearLayout
             android:layout_width="match_parent"