r
/
emotionhero
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Exit button is not required under Google Guidelines

This commit is contained in:
Ruben 2016-08-22 16:01:52 +01:00
parent c8085df15d
commit f43569b832
2 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/com/rubenvandeven/emotionhero/MenuActivity.java
View File

@ -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();
}
});
}

7
app/src/main/res/layout/activity_menu.xml
View File

@ -39,13 +39,6 @@
android:id="@+id/highscoresButton"
android:fontFamily="sans-serif" />
<Button
android:text="Exit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/quitButton"
android:fontFamily="sans-serif"
android:layout_marginTop="20dp" />
</LinearLayout>
<ImageView