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

3
app/build/intermediates/res/merged/debug/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/build/intermediates/res/merged/debug/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/build/intermediates/res/merged/debug/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>

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>

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

@ -30,9 +30,6 @@
<color name="bright_foreground_material_light">@android:color/black</color>
<color name="button_material_dark">#ff5a595b</color>
<color name="button_material_light">#ffd6d7d7</color>
<color name="colorAccent">#ff4081</color>
<color name="colorPrimary">#3f51b5</color>
<color name="colorPrimaryDark">#303f9f</color>
<color name="countdown1">#f0d7b106</color>
<color name="countdown2">#f0f28117</color>
<color name="countdown3">#f0f41e02</color>
@ -230,12 +227,7 @@
<style name="AlertDialog.AppCompat.Light" parent="Base.AlertDialog.AppCompat.Light"/>
<style name="Animation.AppCompat.Dialog" parent="Base.Animation.AppCompat.Dialog"/>
<style name="Animation.AppCompat.DropDownUp" parent="Base.Animation.AppCompat.DropDownUp"/>
<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="Base.AlertDialog.AppCompat" parent="android:Widget">
<item name="android:layout">@layout/abc_alert_dialog_material</item>
<item name="listLayout">@layout/abc_select_dialog_material</item>
@ -1278,6 +1270,9 @@
<item name="android:dropDownItemStyle">@style/Widget.AppCompat.DropDownItem.Spinner</item>
</style>
<style name="Platform.Widget.AppCompat.Spinner" parent="android:Widget.Spinner"/>
<style name="PriceButton" parent="GameButton">
<item name="android:drawableLeft">@drawable/star_icon</item>
</style>
<style name="RtlOverlay.DialogWindowTitle.AppCompat" parent="Base.DialogWindowTitle.AppCompat">
</style>
<style name="RtlOverlay.Widget.AppCompat.ActionBar.TitleItem" parent="android:Widget">

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

Binary file not shown.