From a10f0ca2bd039b621e932ca1460a389b0ede27a4 Mon Sep 17 00:00:00 2001 From: Ruben Date: Thu, 25 Aug 2016 15:07:43 +0100 Subject: [PATCH] Preliminary Credits screen and 'custom' icon --- app/src/main/AndroidManifest.xml | 2 + app/src/main/ic_launcher-web.png | Bin 0 -> 16002 bytes .../emotionhero/CreditsActivity.java | 18 +++++ .../emotionhero/MenuActivity.java | 16 +++- app/src/main/res/layout/activity_credits.xml | 75 ++++++++++++++++++ app/src/main/res/layout/activity_menu.xml | 9 +++ app/src/main/res/mipmap-hdpi/ic_launcher.png | Bin 3418 -> 2417 bytes app/src/main/res/mipmap-mdpi/ic_launcher.png | Bin 2206 -> 1565 bytes app/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 4842 -> 3109 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 7718 -> 4520 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 10486 -> 5627 bytes app/src/main/res/values/strings.xml | 1 + 12 files changed, 120 insertions(+), 1 deletion(-) create mode 100644 app/src/main/ic_launcher-web.png create mode 100644 app/src/main/java/com/rubenvandeven/emotionhero/CreditsActivity.java create mode 100644 app/src/main/res/layout/activity_credits.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0934b86..c14d629 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -49,6 +49,8 @@ android:name="android.support.PARENT_ACTIVITY" android:value="com.rubenvandeven.emotionhero.MenuActivity" /> + \ No newline at end of file diff --git a/app/src/main/ic_launcher-web.png b/app/src/main/ic_launcher-web.png new file mode 100644 index 0000000000000000000000000000000000000000..9c68c875871af19cb7e9baa4c5c086832807f298 GIT binary patch literal 16002 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 A^Z)<= literal 0 HcmV?d00001 diff --git a/app/src/main/java/com/rubenvandeven/emotionhero/CreditsActivity.java b/app/src/main/java/com/rubenvandeven/emotionhero/CreditsActivity.java new file mode 100644 index 0000000..8bae76e --- /dev/null +++ b/app/src/main/java/com/rubenvandeven/emotionhero/CreditsActivity.java @@ -0,0 +1,18 @@ +package com.rubenvandeven.emotionhero; + +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; +import android.view.WindowManager; + +public class CreditsActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN); + if(getSupportActionBar() != null) { + getSupportActionBar().hide(); + } + setContentView(R.layout.activity_credits); + } +} diff --git a/app/src/main/java/com/rubenvandeven/emotionhero/MenuActivity.java b/app/src/main/java/com/rubenvandeven/emotionhero/MenuActivity.java index 3d458a2..ab7c65d 100644 --- a/app/src/main/java/com/rubenvandeven/emotionhero/MenuActivity.java +++ b/app/src/main/java/com/rubenvandeven/emotionhero/MenuActivity.java @@ -31,6 +31,7 @@ public class MenuActivity extends AppCompatActivity { Button startButton = (Button) findViewById(R.id.startButton); Button continueButton = (Button) findViewById(R.id.continueButton); Button highscoreButton = (Button) findViewById(R.id.highscoresButton); + Button creditsButton = (Button) findViewById(R.id.creditsButton); final ImageView logoEmotionHero = (ImageView) findViewById(R.id.logoEmotionHero); @@ -43,6 +44,7 @@ public class MenuActivity extends AppCompatActivity { startButton.setAlpha(0f); continueButton.setAlpha(0f); highscoreButton.setAlpha(0f); + creditsButton.setAlpha(0f); ObjectAnimator fadeInEmotionHero = ObjectAnimator.ofFloat(logoEmotionHero, "alpha", 0f, 1f); fadeInEmotionHero.setDuration(1000); @@ -55,6 +57,9 @@ public class MenuActivity extends AppCompatActivity { ObjectAnimator fadeInHighscoreButton = ObjectAnimator.ofFloat(highscoreButton, "alpha", 0f, 1f); fadeInHighscoreButton.setDuration(1000); fadeInHighscoreButton.setStartDelay(600); + ObjectAnimator fadeInCreditsButton = ObjectAnimator.ofFloat(creditsButton, "alpha", 0f, 1f); + fadeInCreditsButton.setDuration(1000); + fadeInCreditsButton.setStartDelay(1000); Animation anim = new AlphaAnimation(0.0f, 1.0f); @@ -67,7 +72,8 @@ public class MenuActivity extends AppCompatActivity { AnimatorSet buttonAnimatorSet = new AnimatorSet(); buttonAnimatorSet.playTogether(fadeInstartButton, fadeInContinueButton, - fadeInHighscoreButton); + fadeInHighscoreButton, + fadeInCreditsButton); buttonAnimatorSet.start(); @@ -98,6 +104,14 @@ public class MenuActivity extends AppCompatActivity { } }); + creditsButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent intent = new Intent(MenuActivity.this, CreditsActivity.class); + startActivity(intent); + } + }); + } diff --git a/app/src/main/res/layout/activity_credits.xml b/app/src/main/res/layout/activity_credits.xml new file mode 100644 index 0000000..72e16a8 --- /dev/null +++ b/app/src/main/res/layout/activity_credits.xml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_menu.xml b/app/src/main/res/layout/activity_menu.xml index 07ccea8..8feca6c 100644 --- a/app/src/main/res/layout/activity_menu.xml +++ b/app/src/main/res/layout/activity_menu.xml @@ -17,6 +17,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_below="@+id/logoEmotionHero" + android:layout_above="@+id/creditsButton" android:layout_centerHorizontal="true" android:layout_marginTop="19dp"> @@ -54,4 +55,12 @@ android:layout_alignParentStart="true" android:contentDescription="@string/app_name" /> +