From f43569b8327f2c5958c666f99c6c170c94a10776 Mon Sep 17 00:00:00 2001 From: Ruben Date: Mon, 22 Aug 2016 16:01:52 +0100 Subject: [PATCH] Exit button is not required under Google Guidelines --- .../emotionhero/MenuActivity.java | 18 +----------------- app/src/main/res/layout/activity_menu.xml | 7 ------- 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/app/src/main/java/com/rubenvandeven/emotionhero/MenuActivity.java b/app/src/main/java/com/rubenvandeven/emotionhero/MenuActivity.java index 9976f76..5c48ff7 100644 --- a/app/src/main/java/com/rubenvandeven/emotionhero/MenuActivity.java +++ b/app/src/main/java/com/rubenvandeven/emotionhero/MenuActivity.java @@ -29,7 +29,6 @@ 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 quitButton = (Button) findViewById(R.id.quitButton); final ImageView logoEmotionHero = (ImageView) findViewById(R.id.logoEmotionHero); @@ -42,7 +41,6 @@ public class MenuActivity extends AppCompatActivity { startButton.setAlpha(0f); continueButton.setAlpha(0f); highscoreButton.setAlpha(0f); - quitButton.setAlpha(0f); ObjectAnimator fadeInEmotionHero = ObjectAnimator.ofFloat(logoEmotionHero, "alpha", 0f, 1f); fadeInEmotionHero.setDuration(1000); @@ -55,9 +53,6 @@ public class MenuActivity extends AppCompatActivity { ObjectAnimator fadeInHighscoreButton = ObjectAnimator.ofFloat(highscoreButton, "alpha", 0f, 1f); fadeInHighscoreButton.setDuration(1000); fadeInHighscoreButton.setStartDelay(600); - ObjectAnimator fadeInQuitButton = ObjectAnimator.ofFloat(quitButton, "alpha", 0f, 1f); - fadeInQuitButton.setDuration(1000); - fadeInQuitButton.setStartDelay(900); Animation anim = new AlphaAnimation(0.0f, 1.0f); @@ -70,13 +65,9 @@ public class MenuActivity extends AppCompatActivity { AnimatorSet buttonAnimatorSet = new AnimatorSet(); buttonAnimatorSet.playTogether(fadeInstartButton, fadeInContinueButton, - fadeInHighscoreButton, - fadeInQuitButton); + fadeInHighscoreButton); buttonAnimatorSet.start(); -// AnimatorSet animatorSet = new AnimatorSet(); -// animatorSet.playSequentially(fadeInEmotionHero, buttonAnimatorSet); -// animatorSet.start(); startButton.setOnClickListener(new View.OnClickListener() { @@ -104,13 +95,6 @@ public class MenuActivity extends AppCompatActivity { } }); - quitButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); - } diff --git a/app/src/main/res/layout/activity_menu.xml b/app/src/main/res/layout/activity_menu.xml index 02c1210..a5a07c6 100644 --- a/app/src/main/res/layout/activity_menu.xml +++ b/app/src/main/res/layout/activity_menu.xml @@ -39,13 +39,6 @@ android:id="@+id/highscoresButton" android:fontFamily="sans-serif" /> -