Redid icon

Added "ART" to credits
Added title to start screen

app/src/main/java/de/frajul/endlessroll/entities/tools/ToolType.java

@@ -19,7 +19,7 @@ public enum ToolType {
     RAMP(R.string.tool_name_ramp, R.string.tool_description_ramp, R.drawable.tools_ramp,
             R.drawable.tools_ramp_button, 0, 1, 5,
             new ToolUpgrade(ToolUpgradeType.COOLDOWN, 3000, 1000)),
-    SPRING(R.string.tool_name_spring, R.string.tool_description_spring, R.drawable.tools_spring_2,
+    SPRING(R.string.tool_name_spring, R.string.tool_description_spring, R.drawable.tools_spring,
             R.drawable.tools_spring_button, 5, 2, 5,
             new ToolUpgrade(ToolUpgradeType.COOLDOWN, 4000, 2000)),
     BOMB(R.string.tool_name_bomb, R.string.tool_description_bomb, R.drawable.tools_bomb,

app/src/main/java/de/frajul/endlessroll/main/screens/StartScreen.java

@@ -6,6 +6,9 @@ import android.view.View;
 import android.view.animation.AnimationUtils;
 import android.widget.Button;
 import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import org.w3c.dom.Text;
 
 import de.frajul.endlessroll.R;
 import de.frajul.endlessroll.main.GameActivity;
@@ -37,6 +40,8 @@ public class StartScreen extends GLScreen<RelativeLayout> implements View.OnClic
         super(ScreenType.START, gameActivity, R.layout.start_screen, glSurfaceView);
 
         Typeface typeface = gameActivity.getTypeface();
+        TextView title = (TextView) layout.findViewById(R.id.startscreen_title);
+        title.setTypeface(typeface);
         play = createButton(R.id.startscreen_play, typeface);
         play.startAnimation(AnimationUtils.loadAnimation(gameActivity, R.anim.rotate));
         unlockLevels = createButton(R.id.startscreen_unlock_levels, typeface);

app/src/main/java/de/frajul/endlessroll/views/CreditsDialog.java

@@ -48,6 +48,8 @@ public class CreditsDialog extends Dialog implements View.OnTouchListener {
 
         setTypefaceToTextView(R.id.credits_title);
         setTypefaceToTextView(R.id.credits_author);
+        setTypefaceToTextView(R.id.credits_art_title);
+        setTypefaceToTextView(R.id.credits_art);
         setTypefaceToTextView(R.id.credits_testers_title);
         setTypefaceToTextView(R.id.credits_testers);
         setTypefaceToTextView(R.id.credits_sounds_title);
@@ -81,7 +83,7 @@ public class CreditsDialog extends Dialog implements View.OnTouchListener {
                 try {
                     scrollViewAnimator = ObjectAnimator
                             .ofInt(scrollView, "scrollY", scrollViewLayout.getBottom() - scrollView.getHeight());
-                    scrollViewAnimator.setDuration(14000);
+                    scrollViewAnimator.setDuration(16000);
                     scrollViewAnimator.setInterpolator(new LinearInterpolator());
                     scrollViewAnimator.start();
                 } finally {

app/src/main/res/layout/credits_dialog.xml

@@ -47,6 +47,25 @@
                 android:textAlignment="center"
                 android:textSize="25sp"/>
 
+            <TextView
+                android:id="@+id/credits_art_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:text="@string/credits_art_title"
+                android:textAlignment="center"
+                android:textSize="25sp"/>
+
+            <TextView
+                android:id="@+id/credits_art"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginBottom="@dimen/credits_margin_between_categories"
+                android:text="@string/credits_art"
+                android:textAlignment="center"
+                android:textSize="15sp"/>
+
             <TextView
                 android:id="@+id/credits_testers_title"
                 android:layout_width="wrap_content"

app/src/main/res/layout/start_screen.xml

@@ -13,21 +13,38 @@
         android:text="@string/start_screen_play"
         android:textAlignment="gravity"
         android:textColor="#ffffff"
-        android:textSize="26sp"/>
+        android:textSize="26sp" />
+
+    <RelativeLayout
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_above="@id/startscreen_play"
+        android:layout_centerHorizontal="true">
+
+        <TextView
+            android:id="@+id/startscreen_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:text="@string/app_name"
+            android:textColor="@color/secondary"
+            android:textSize="60sp" />
+
+    </RelativeLayout>
 
     <Button
         android:id="@+id/startscreen_unlock_levels"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentStart="true"
         android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
         android:layout_below="@+id/startscreen_gain_90_ep"
         android:layout_marginBottom="2dp"
-        android:layout_marginStart="10dp"
         android:layout_marginLeft="10dp"
+        android:layout_marginStart="10dp"
         android:layout_marginTop="2dp"
         android:text="@string/start_screen_unlock_all_levels"
-        android:visibility="invisible"/>
+        android:visibility="gone" />
 
     <Button
         android:id="@+id/startscreen_gain_90_ep"
@@ -37,11 +54,11 @@
         android:layout_alignParentStart="true"
         android:layout_below="@+id/startscreen_to_gl_test_screen"
         android:layout_marginBottom="2dp"
-        android:layout_marginStart="10dp"
         android:layout_marginLeft="10dp"
+        android:layout_marginStart="10dp"
         android:layout_marginTop="2dp"
         android:text="@string/start_screen_gain_90_ep"
-        android:visibility="invisible"/>l
+        android:visibility="gone" />
 
     <Button
         android:id="@+id/startscreen_finish_world_1"
@@ -52,7 +69,7 @@
         android:layout_alignParentTop="true"
         android:layout_margin="10dp"
         android:text="@string/start_screen_finish_world_1"
-        android:visibility="invisible"/>
+        android:visibility="gone" />
 
     <Button
         android:id="@+id/startscreen_to_gl_test_screen"
@@ -63,6 +80,5 @@
         android:layout_alignParentTop="true"
         android:layout_margin="10dp"
         android:text="@string/start_screen_to_gl_test_screen"
-        android:visibility="invisible"/>
-
+        android:visibility="gone" />
 </RelativeLayout>

app/src/main/res/values-de/strings.xml

@@ -74,6 +74,7 @@
     <string name="tutorial_place_ramp_gap">Setze die Rampe vor die Lücke</string>
     <string name="credits_author">von Julian Mutter</string>
     <string name="credits_testers_title">TESTER</string>
+    <string name="credits_art_title">KUNST</string>
     <string name="credits_music_title">MUSIK</string>
     <string name="settings_music">Musik</string>
     <string name="settings_show_fps">Fps anzeigen</string>

app/src/main/res/values/strings.xml

@@ -114,6 +114,8 @@
     <string name="credits_title" translatable="false">ENDLESS ROLL</string>
     <string name="credits_author">by Julian Mutter</string>
     <string name="credits_testers_title">TESTERS</string>
+    <string name="credits_art_title">ART</string>
+    <string name="credits_art" translatable="false">Julian Mutter\nkrituri006</string>
     <string name="credits_testers" translatable="false">Markus\nLukas\nMaurice\nLandmann\nRainer\nJohannes</string>
     <string name="credits_sounds_title" translatable="false">SOUNDS</string>
     <string name="credits_sounds" translatable="false">„Fruit-collected“, „Glocken-good“, „Carillon-02-a“, „Carillon-02-b“, „Fireball-02“, „Fruit-appearance“, „Voltage-hum“ (noiseforfun.com)</string>