julian/EndlessRoll
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Toolshop tidied up

Browse Source
This commit is contained in:
=
2017-05-25 20:29:24 +02:00
parent beb0a6e747
commit 504e2383fa
23 changed files with 2426 additions and 3134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View File

@ -10,7 +10,7 @@
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:supportsRtl="true">
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity

3
app/src/main/res/layout/start_screen.xml
View File

@ -26,7 +26,8 @@
android:text="Play"
android:textSize="25sp"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"/>
android:layout_centerHorizontal="true"
android:textColor="#ffffff"/>
<Button
android:id="@+id/startscreen_comingsoon"

8
app/src/main/res/layout/tool_offer_slot.xml
View File

@ -19,4 +19,12 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"/>
<Button
android:id="@+id/toolofferslot_pricebutton"
style="@style/PriceButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="-10dp"/>
</LinearLayout>

14
app/src/main/res/layout/toolshop.xml
View File

@ -55,26 +55,16 @@
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_marginLeft="30dp"
android:layout_marginRight="30dp"
android:id="@+id/toolshop_scrollview">
android:layout_marginRight="30dp">
<LinearLayout
android:id="@+id/toolshop_tool_offer_layout"
android:layout_width="wrap_content"
android:layout_marginBottom="36dp"
android:layout_marginBottom="2dp"
android:layout_height="wrap_content"
android:orientation="horizontal">
</LinearLayout>
</HorizontalScrollView>
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="9"
style="@style/GameButton"
android:drawableLeft="@drawable/star_icon"
android:id="@+id/toolshop_price_button"
android:visibility="invisible"/>
</RelativeLayout>

110
app/src/main/res/layout/tutorial.xml
View File

@ -8,12 +8,14 @@
layout="@layout/game"
android:visibility="gone"/>
<!--Empty-->
<RelativeLayout
android:id="@+id/tutorial_empty"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone"/>
<!--Welcome-->
<RelativeLayout
android:id="@+id/tutorial_welcome"
android:layout_width="match_parent"
@ -33,6 +35,7 @@
android:text="Welcome to Endless Roll!\nHave fun!"/>
</RelativeLayout>
<!--Tools-->
<RelativeLayout
android:id="@+id/tutorial_tools"
android:layout_width="match_parent"
@ -63,6 +66,7 @@
</RelativeLayout>
<!--Place ramp-->
<RelativeLayout
android:id="@+id/tutorial_place_ramp"
android:layout_width="match_parent"
@ -70,7 +74,6 @@
android:visibility="gone">
<TextView
android:id="@+id/textView"
style="@style/TutorialTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -82,19 +85,9 @@
android:layout_marginTop="105dp"
android:text="Now place your ramp in front of the gap!"/>
<!--<ImageView-->
<!--android:layout_width="40dp"-->
<!--android:layout_height="40dp"-->
<!--android:layout_alignParentBottom="true"-->
<!--android:layout_alignParentEnd="true"-->
<!--android:layout_alignParentRight="true"-->
<!--android:layout_marginBottom="34dp"-->
<!--android:layout_marginEnd="86dp"-->
<!--android:layout_marginRight="86dp"-->
<!--android:background="@drawable/tip_icon"/>-->
</RelativeLayout>
<!--Place ramp 2-->
<RelativeLayout
android:id="@+id/tutorial_place_ramp_2"
android:layout_width="match_parent"
@ -111,21 +104,10 @@
android:layout_marginEnd="104dp"
android:layout_marginRight="104dp"
android:layout_marginTop="105dp"
android:text="Now place it in front of the obstacle!"
android:id="@+id/textView2"/>
<!--<ImageView-->
<!--android:layout_width="40dp"-->
<!--android:layout_height="40dp"-->
<!--android:background="@drawable/tip_icon"-->
<!--android:layout_marginRight="72dp"-->
<!--android:layout_marginEnd="72dp"-->
<!--android:layout_marginBottom="46dp"-->
<!--android:layout_alignParentBottom="true"-->
<!--android:layout_alignParentRight="true"-->
<!--android:layout_alignParentEnd="true"/>-->
android:text="Now place it in front of the obstacle!"/>
</RelativeLayout>
<!--Ramp in air-->
<RelativeLayout
android:id="@+id/tutorial_ramp_in_air"
android:layout_width="match_parent"
@ -136,13 +118,81 @@
style="@style/TutorialTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="You can even set a Tool in mid-air!"
android:layout_marginLeft="43dp"
android:layout_marginStart="43dp"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_marginTop="88dp"/>
android:layout_alignParentTop="true"
android:layout_marginLeft="43dp"
android:layout_marginStart="43dp"
android:layout_marginTop="88dp"
android:text="You can even set a Tool in mid-air!"/>
</RelativeLayout>
<!--Ramp in air 2-->
<RelativeLayout
android:id="@+id/tutorial_ramp_in_air_2"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone">
<TextView
style="@style/TutorialTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="66dp"
android:text="Now try again!"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"/>
</RelativeLayout>
<!--Leveled up-->
<RelativeLayout
android:id="@+id/tutorial_leveled_up"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone">
<TextView
android:id="@+id/textView3"
style="@style/TutorialTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_marginLeft="43dp"
android:layout_marginStart="43dp"
android:layout_marginTop="40dp"
android:text="Congratulations!!!"/>
<TextView
style="@style/TutorialTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignLeft="@+id/textView3"
android:layout_alignStart="@+id/textView3"
android:layout_below="@+id/textView3"
android:text="You have leveled up!"/>
</RelativeLayout>
<!--Go to toolshop-->
<RelativeLayout
android:id="@+id/tutorial_go_to_toolshop"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone">
<TextView
style="@style/TutorialTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_marginLeft="34dp"
android:layout_marginStart="34dp"
android:layout_marginTop="111dp"
android:text="Now go to the toolshop"/>
</RelativeLayout>
</RelativeLayout>

3
app/src/main/res/values/attr.xml Normal file
View File

@ -0,0 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
</resources>

3
app/src/main/res/values/colors.xml
View File

@ -1,8 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="colorPrimary">#3f51b5</color>
<color name="colorPrimaryDark">#303f9f</color>
<color name="colorAccent">#ff4081</color>
<color name="win">#ffda45</color>
<color name="loose">#891e4e</color>
<color name="retry">#39be27</color>

12
app/src/main/res/values/styles.xml
View File

@ -1,12 +1,6 @@
<resources>
<!-- Base application theme. -->
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<!-- Customize your theme here. -->
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
</style>
<style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar"/>
<style name="GameButton">
<item name="android:background">@drawable/xml_selector_gamebutton</item>
@ -18,6 +12,10 @@
<item name="android:shadowRadius">2</item>
</style>
<style name="PriceButton" parent="GameButton">
<item name="android:drawableLeft">@drawable/star_icon</item>
</style>
<style name="TutorialTextView">
<item name="android:background">@drawable/xml_background_tutorialtextview</item>
<item name="android:textColor">#000000</item>