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

Added toolinspector -> tool-upgrades can be bought (not saved yet)

Browse Source 
only the time upgrade is used
This commit is contained in:
=
2017-06-10 13:19:34 +02:00
parent 504e2383fa
commit 4b4d81d8c7
46 changed files with 2940 additions and 5907 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/build/intermediates/res/merged/debug/layout/start_screen.xml
View File

@ -21,13 +21,13 @@
android:id="@+id/startscreen_play"
android:layout_width="110dp"
android:layout_height="110dp"
android:layout_marginTop="40dp"
android:layout_marginTop="38dp"
android:background="@drawable/playershapes_ball"
android:text="Play"
android:textSize="25sp"
android:textColor="#ffffff"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:textColor="#ffffff"/>
android:layout_centerHorizontal="true"/>
<Button
android:id="@+id/startscreen_comingsoon"

7
app/build/intermediates/res/merged/debug/layout/tool_offer_slot.xml
View File

@ -20,11 +20,4 @@
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>

2
app/build/intermediates/res/merged/debug/layout/tool_slot.xml
View File

@ -9,6 +9,6 @@
android:layout_height="70dp"
android:layout_gravity="center"
android:background="@drawable/xml_background_toolslot"
android:src="@drawable/rampbutton"/>
android:src="@drawable/tools_rampbutton"/>
</FrameLayout>

4
app/build/intermediates/res/merged/debug/layout/toolbutton.xml
View File

@ -8,13 +8,13 @@
android:layout_width="70dp"
android:layout_height="60dp"
android:layout_centerInParent="true"
android:src="@drawable/rampbutton"/>
android:src="@drawable/tools_rampbutton"/>
<ImageView
android:id="@+id/toolProgressButtonAnimation"
android:layout_width="70dp"
android:layout_height="60dp"
android:src="@drawable/rampbutton"
android:src="@drawable/tools_rampbutton"
android:visibility="invisible"/>
<ProgressBar

129
app/build/intermediates/res/merged/debug/layout/toolshop.xml
View File

@ -10,61 +10,82 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/toolshop_topbar"
android:layout_centerHorizontal="true"
android:layout_marginTop="26dp"
android:orientation="horizontal">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@+id/toolshop_topbar">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_toLeftOf="@+id/toolshop_toolinspector"
android:layout_toStartOf="@+id/toolshop_toolinspector">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="10dp"
android:orientation="horizontal"
android:id="@+id/linearLayout4">
<include
android:id="@+id/toolshop_slot1"
layout="@layout/tool_slot"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="5dp"/>
<include
android:id="@+id/toolshop_slot2"
layout="@layout/tool_slot"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"/>
<include
android:id="@+id/toolshop_slot3"
layout="@layout/tool_slot"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"/>
<include
android:id="@+id/toolshop_slot4"
layout="@layout/tool_slot"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"/>
</LinearLayout>
<HorizontalScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp">
<LinearLayout
android:id="@+id/toolshop_tool_offer_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="2dp"
android:orientation="horizontal">
</LinearLayout>
</HorizontalScrollView>
</RelativeLayout>
<include
android:id="@+id/toolshop_slot1"
layout="@layout/tool_slot"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="5dp"/>
<include
android:id="@+id/toolshop_slot2"
layout="@layout/tool_slot"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"/>
<include
android:id="@+id/toolshop_slot3"
layout="@layout/tool_slot"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"/>
<include
android:id="@+id/toolshop_slot4"
layout="@layout/tool_slot"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"/>
</LinearLayout>
<HorizontalScrollView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_marginLeft="30dp"
android:layout_marginRight="30dp">
<LinearLayout
android:id="@+id/toolshop_tool_offer_layout"
android:layout_width="wrap_content"
android:layout_marginBottom="2dp"
android:layout_height="wrap_content"
android:orientation="horizontal">
</LinearLayout>
</HorizontalScrollView>
android:id="@+id/toolshop_toolinspector"
layout="@layout/tool_inspector"
android:layout_width="170dp"
android:layout_height="match_parent"
android:layout_alignParentRight="true"/>
</RelativeLayout>
</RelativeLayout>

11
app/build/intermediates/res/merged/debug/layout/topbar.xml
View File

@ -106,6 +106,17 @@
android:layout_centerVertical="true"
android:layout_alignEnd="@+id/topbar_starcount"/>
<TextView
android:id="@+id/topbar_energycount_decrease"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="-200"
android:visibility="invisible"
android:textColor="#000000"
android:textSize="20sp"
android:layout_centerVertical="true"
android:layout_alignEnd="@+id/topbar_energycount"/>
<Button
android:id="@+id/topbar_resetButton"
style="@style/GameButton"

2
app/build/intermediates/res/merged/debug/layout/unlock_message.xml
View File

@ -9,7 +9,7 @@
android:layout_width="40dp"
android:layout_height="40dp"
android:id="@+id/unlockmessage_toolimage"
android:src="@drawable/rampbutton"
android:src="@drawable/tools_rampbutton"
android:layout_gravity="center_vertical"/>
<TextView