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

Minor changes to cleanup stuff

Browse source
This commit is contained in:
Ruben 2016-08-22 16:07:56 +01:00
parent f43569b832
commit 07f3320a47
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/rubenvandeven/emotionhero/IntroActivity.java
View file

@ -68,6 +68,8 @@ public class IntroActivity extends AppCompatActivity {
Intent intent = new Intent(IntroActivity.this, MenuActivity.class); Intent intent = new Intent(IntroActivity.this, MenuActivity.class);
finish(); finish();
startActivity(intent); startActivity(intent);
//disable distracting transition when going to menu
IntroActivity.this.overridePendingTransition(0, 0);
} }
}, 7000 + (3*extraLogoDelay)); }, 7000 + (3*extraLogoDelay));

9
app/src/main/res/layout/activity_menu.xml
View file

@ -21,19 +21,19 @@
android:layout_marginTop="19dp"> android:layout_marginTop="19dp">
<Button <Button
android:text="Start" android:text="@string/start"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/startButton" android:id="@+id/startButton"
android:fontFamily="sans-serif" /> android:fontFamily="sans-serif" />
<Button <Button
android:text="Continue" android:text="@string/continue"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/continueButton" android:id="@+id/continueButton"
android:fontFamily="sans-serif" /> android:fontFamily="sans-serif" />
<Button <Button
android:text="Highscores" android:text="@string/highscores"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/highscoresButton" android:id="@+id/highscoresButton"
@ -51,6 +51,7 @@
android:layout_marginTop="58dp" android:layout_marginTop="58dp"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" /> android:layout_alignParentStart="true"
android:contentDescription="@string/app_name" />
</RelativeLayout> </RelativeLayout>

3
app/src/main/res/values/strings.xml
View file

@ -6,4 +6,7 @@
<string name="camera_required">The camera permission is required. Please start again</string> <string name="camera_required">The camera permission is required. Please start again</string>
<string name="restart">Restart</string> <string name="restart">Restart</string>
<string name="nextLvl">Next Level!</string> <string name="nextLvl">Next Level!</string>
<string name="start">Start</string>
<string name="continue">Continue</string>
<string name="highscores">Highscores</string>
</resources> </resources>