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

First implementation of Shape shop

Browse Source
This commit is contained in:
=
2017-10-22 18:48:00 +02:00
parent 33275f9046
commit 757c13c31c
52 changed files with 2237 additions and 1788 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,9 +75,8 @@
android:layout_width="35dp"
android:layout_height="35dp"
android:layout_centerVertical="true"
android:layout_marginRight="20dp"
android:layout_toLeftOf="@+id/topbar_toolshop"
android:layout_toStartOf="@+id/topbar_toolshop"
android:layout_marginRight="5dp"
android:layout_alignParentEnd="true"
android:background="@drawable/xml_selector_settingsbutton"/>
<Button
@ -85,10 +84,20 @@
style="@style/GameButton"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginRight="5dp"
android:background="@drawable/xml_selector_shopbutton"/>
android:layout_toLeftOf="@+id/topbar_settings"
android:layout_marginRight="10dp"
android:background="@drawable/xml_selector_toolshopbutton"/>
<Button
android:id="@+id/topbar_shapeshop"
style="@style/GameButton"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_toLeftOf="@+id/topbar_toolshop"
android:layout_centerVertical="true"
android:layout_marginRight="10dp"
android:background="@drawable/xml_selector_shapeshopbutton"/>
<TextView
android:id="@+id/topbar_starcount_decrease"

5
app/build/intermediates/res/merged/debug/values/values.xml
View File

@ -254,6 +254,11 @@
<string name="message_win">YOU DID IT</string>
<string name="number_placeholder">997.5</string>
<string name="percent_placeholder">85.1%</string>
<string name="playershape_name_ball">Ball</string>
<string name="playershape_name_clock">Clock</string>
<string name="playershape_name_hypno_spiral">Hypno</string>
<string name="playershape_name_pacman">Pacman</string>
<string name="playershape_name_smiley">Smiley</string>
<string name="pre_start_screen_loading">LOADING...</string>
<string name="price_button_buy">Buy</string>
<string name="price_button_upgrade">Upgrade</string>

BIN
app/build/intermediates/res/resources-debug.ap_
View File

Binary file not shown.