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

All upgrades are used in calculations -> bomb still has to be balanced

Browse Source 
added firework on goal and different goal screen (with button to toolshop), but not happy with second one
Have to change it in layout file

TopBarData has been removed -> All data (DataStorageHandler, TutorialManager, LevelManager, SoundManager, Typeface, User) is stored in the GameActivity and can be recieved by getters

Toolshop-tutorial can now be reset and works instantaniously
This commit is contained in:
=
2017-07-18 15:57:21 +02:00
parent 4b4d81d8c7
commit b8322c9f05
28 changed files with 7590 additions and 2572 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/build/intermediates/res/merged/debug/values-v21/values-v21.xml
View File

@ -58,7 +58,7 @@
<style name="Base.Theme.AppCompat.Light" parent="Base.V21.Theme.AppCompat.Light"/>
<style name="Base.Theme.AppCompat.Light.Dialog" parent="Base.V21.Theme.AppCompat.Light.Dialog"/>
<style name="Base.V21.Theme.AppCompat" parent="Base.V7.Theme.AppCompat">
<!-- Action Bar styling attributes -->
<item name="actionBarSize">?android:attr/actionBarSize</item>
<item name="actionBarDivider">?android:attr/actionBarDivider</item>
<item name="actionBarItemBackground">@drawable/abc_action_bar_item_background_material</item>
@ -68,12 +68,12 @@
<item name="actionOverflowButtonStyle">?android:attr/actionOverflowButtonStyle</item>
<item name="homeAsUpIndicator">?android:attr/homeAsUpIndicator</item>
<!-- For PopupMenu -->
<item name="listPreferredItemHeightSmall">?android:attr/listPreferredItemHeightSmall</item>
<item name="textAppearanceLargePopupMenu">?android:attr/textAppearanceLargePopupMenu</item>
<item name="textAppearanceSmallPopupMenu">?android:attr/textAppearanceSmallPopupMenu</item>
<!-- General view attributes -->
<item name="selectableItemBackground">?android:attr/selectableItemBackground</item>
<item name="selectableItemBackgroundBorderless">?android:attr/selectableItemBackgroundBorderless</item>
<item name="borderlessButtonStyle">?android:borderlessButtonStyle</item>
@ -83,7 +83,7 @@
<item name="editTextColor">?android:attr/editTextColor</item>
<item name="listChoiceBackgroundIndicator">?android:attr/listChoiceBackgroundIndicator</item>
<!-- Copy the platform default styles for the AppCompat widgets -->
<item name="buttonStyle">?android:attr/buttonStyle</item>
<item name="buttonStyleSmall">?android:attr/buttonStyleSmall</item>
<item name="checkboxStyle">?android:attr/checkboxStyle</item>
@ -92,7 +92,7 @@
<item name="ratingBarStyle">?android:attr/ratingBarStyle</item>
<item name="spinnerStyle">?android:attr/spinnerStyle</item>
<!-- Copy our color theme attributes to the framework -->
<item name="android:colorPrimary">?attr/colorPrimary</item>
<item name="android:colorPrimaryDark">?attr/colorPrimaryDark</item>
<item name="android:colorAccent">?attr/colorAccent</item>
@ -105,7 +105,7 @@
<item name="android:windowElevation">@dimen/abc_floating_window_z</item>
</style>
<style name="Base.V21.Theme.AppCompat.Light" parent="Base.V7.Theme.AppCompat.Light">
<!-- Action Bar styling attributes -->
<item name="actionBarSize">?android:attr/actionBarSize</item>
<item name="actionBarDivider">?android:attr/actionBarDivider</item>
<item name="actionBarItemBackground">@drawable/abc_action_bar_item_background_material</item>
@ -115,12 +115,12 @@
<item name="actionOverflowButtonStyle">?android:attr/actionOverflowButtonStyle</item>
<item name="homeAsUpIndicator">?android:attr/homeAsUpIndicator</item>
<!-- For PopupMenu -->
<item name="listPreferredItemHeightSmall">?android:attr/listPreferredItemHeightSmall</item>
<item name="textAppearanceLargePopupMenu">?android:attr/textAppearanceLargePopupMenu</item>
<item name="textAppearanceSmallPopupMenu">?android:attr/textAppearanceSmallPopupMenu</item>
<!-- General view attributes -->
<item name="selectableItemBackground">?android:attr/selectableItemBackground</item>
<item name="selectableItemBackgroundBorderless">?android:attr/selectableItemBackgroundBorderless</item>
<item name="borderlessButtonStyle">?android:borderlessButtonStyle</item>
@ -130,7 +130,7 @@
<item name="editTextColor">?android:attr/editTextColor</item>
<item name="listChoiceBackgroundIndicator">?android:attr/listChoiceBackgroundIndicator</item>
<!-- Copy the platform default styles for the AppCompat widgets -->
<item name="buttonStyle">?android:attr/buttonStyle</item>
<item name="buttonStyleSmall">?android:attr/buttonStyleSmall</item>
<item name="checkboxStyle">?android:attr/checkboxStyle</item>
@ -139,7 +139,7 @@
<item name="ratingBarStyle">?android:attr/ratingBarStyle</item>
<item name="spinnerStyle">?android:attr/spinnerStyle</item>
<!-- Copy our color theme attributes to the framework -->
<item name="android:colorPrimary">?attr/colorPrimary</item>
<item name="android:colorPrimaryDark">?attr/colorPrimaryDark</item>
<item name="android:colorAccent">?attr/colorAccent</item>
@ -225,7 +225,7 @@
<item name="android:buttonBarButtonStyle">?attr/buttonBarButtonStyle</item>
</style>
<style name="Platform.ThemeOverlay.AppCompat" parent="">
<!-- Copy our color theme attributes to the framework -->
<item name="android:colorPrimary">?attr/colorPrimary</item>
<item name="android:colorPrimaryDark">?attr/colorPrimaryDark</item>
<item name="android:colorAccent">?attr/colorAccent</item>