diff --git a/app/build/generated/source/r/debug/android/support/v7/appcompat/R.java b/app/build/generated/source/r/debug/android/support/v7/appcompat/R.java index 4ed08b0..a10be0d 100644 --- a/app/build/generated/source/r/debug/android/support/v7/appcompat/R.java +++ b/app/build/generated/source/r/debug/android/support/v7/appcompat/R.java @@ -529,29 +529,29 @@ public final class R { public static final int search_src_text = 0x7f080066; public static final int search_voice_btn = 0x7f080067; public static final int select_dialog_listview = 0x7f080068; - public static final int shortcut = 0x7f080071; - public static final int showCustom = 0x7f080076; - public static final int showHome = 0x7f080077; - public static final int showTitle = 0x7f080078; - public static final int spacer = 0x7f080079; - public static final int split_action_bar = 0x7f08007a; - public static final int src_atop = 0x7f08007b; - public static final int src_in = 0x7f08007c; - public static final int src_over = 0x7f08007d; - public static final int status_bar_latest_event_content = 0x7f080083; - public static final int submit_area = 0x7f080084; - public static final int tabMode = 0x7f080085; - public static final int text = 0x7f080086; - public static final int text2 = 0x7f080087; - public static final int textSpacerNoButtons = 0x7f080088; - public static final int time = 0x7f080089; - public static final int title = 0x7f08008a; - public static final int title_template = 0x7f08008b; - public static final int topPanel = 0x7f0800a7; - public static final int up = 0x7f0800b9; - public static final int useLogo = 0x7f0800ba; - public static final int withText = 0x7f0800bb; - public static final int wrap_content = 0x7f0800c5; + public static final int shortcut = 0x7f080072; + public static final int showCustom = 0x7f080077; + public static final int showHome = 0x7f080078; + public static final int showTitle = 0x7f080079; + public static final int spacer = 0x7f08007a; + public static final int split_action_bar = 0x7f08007b; + public static final int src_atop = 0x7f08007c; + public static final int src_in = 0x7f08007d; + public static final int src_over = 0x7f08007e; + public static final int status_bar_latest_event_content = 0x7f080084; + public static final int submit_area = 0x7f080085; + public static final int tabMode = 0x7f080086; + public static final int text = 0x7f080087; + public static final int text2 = 0x7f080088; + public static final int textSpacerNoButtons = 0x7f080089; + public static final int time = 0x7f08008a; + public static final int title = 0x7f08008b; + public static final int title_template = 0x7f08008c; + public static final int topPanel = 0x7f0800a9; + public static final int up = 0x7f0800bb; + public static final int useLogo = 0x7f0800bc; + public static final int withText = 0x7f0800bd; + public static final int wrap_content = 0x7f0800c7; } public static final class integer { public static final int abc_config_activityDefaultDur = 0x7f090000; @@ -597,7 +597,7 @@ public final class R { public static final int select_dialog_item_material = 0x7f0a0029; public static final int select_dialog_multichoice_material = 0x7f0a002a; public static final int select_dialog_singlechoice_material = 0x7f0a002b; - public static final int support_simple_spinner_dropdown_item = 0x7f0a0031; + public static final int support_simple_spinner_dropdown_item = 0x7f0a0032; } public static final class string { public static final int abc_action_bar_home_description = 0x7f0d0000; diff --git a/app/build/intermediates/incremental/mergeDebugResources/merger.xml b/app/build/intermediates/incremental/mergeDebugResources/merger.xml index c0c3239..2b7f4fb 100644 --- a/app/build/intermediates/incremental/mergeDebugResources/merger.xml +++ b/app/build/intermediates/incremental/mergeDebugResources/merger.xml @@ -1352,7 +1352,7 @@ Icy Mountains Testcave Mysterious fireworld - #ffda45#891e4e#39be27#ffb405#daf10d#db911c0f#dbfff200#e5dc1522#db41e42b#db494b49#715f5f#60715f#db41e42b#b3d700#f0f41e02#f0f28117#f0d7b106Endless Roll0.0m%.1fm0.0m/s%.1fm/sFps: 00Fps: %d3Level UpGAME OVERYOU DID ITToolsTo menuRestartTry againNext levelLOADING...ContinueRestartExitPlayUnlock all levels (Yes! It\'s magic!)Gain 90 ep (Nope! No magic at all!)Test GL Stuff!!!Time (Lv12)Level: 24Level: %dResetToolshopRamp unlockedGreat world21/15%s%s unlocked!You unlocked a ToolslotLevel: %dBuyUpgradeBallClockHypnoPacmanSmileyRampSpringMagnetBombPower Mushroom%1$s (Lv%2$d)NoneTimeRadiusForceMax.This is a multiline placeholder\nfor all the tutorials I made!!!\nAwesome! - Isn\'t it?Welcome to Endless Roll!\nHave fun!This is the toolbar. Here you can select the tool you currently want to use.You can use the selected tool by clicking on the wanted position on the screen.Now place your ramp in front of the gap!Now place it in front of the obstacle!You can even set a Tool in mid-air.\nTry it out!Now try again!Congratulations!!!\nYou have leveled up!Now go to the toolshop by either clicking on the \'Spring unlocked\' or the toolshop button!Welcome to the toolshop!\nHere you can buy and upgrade all tools and you can customize your toolbar.Right! That is your toolbar.Here you can see all the tools you will be able to buy and use.Here one can buy and upgrade the selected tool.Now select the spring and buy it!Now tip on an unlocked slot of your toolbar to equip the spring!\n(It is the same where the ramp is attached at the moment)\nAfter that you will be able to complete the next level.SunWheelI\'m a text!85.1%Level: %dClick me!997.5Roll up the ramp to gain heightBlow up all obstacles near the bombShoots you in the airDifficult to handle, but if you master it you can do anythingThis will give you super-powers for a few seconds\?\?\?You will unlock this mysterious tool at level %d170dp \ No newline at end of file + 170dp170dp70dp60dp \ No newline at end of file diff --git a/app/build/intermediates/symbols/debug/R.txt b/app/build/intermediates/symbols/debug/R.txt index 1538c73..8a952c8 100644 --- a/app/build/intermediates/symbols/debug/R.txt +++ b/app/build/intermediates/symbols/debug/R.txt @@ -397,7 +397,10 @@ int dimen highlight_alpha_material_light 0x7f060047 int dimen notification_large_icon_height 0x7f060048 int dimen notification_large_icon_width 0x7f060049 int dimen notification_subtext_size 0x7f06004a -int dimen tool_inspector_width 0x7f06004b +int dimen shape_inspector_width 0x7f06004b +int dimen tool_button_height 0x7f06004c +int dimen tool_button_width 0x7f06004d +int dimen tool_inspector_width 0x7f06004e int drawable abc_ab_share_pack_mtrl_alpha 0x7f070000 int drawable abc_action_bar_item_background_material 0x7f070001 int drawable abc_btn_borderless_material 0x7f070002 @@ -656,93 +659,95 @@ int id settings_topbar 0x7f08006b int id shape_button_button 0x7f08006c int id shape_button_textview 0x7f08006d int id shape_shop_bottomRow 0x7f08006e -int id shape_shop_topRow 0x7f08006f -int id shape_shop_topbar 0x7f080070 -int id shortcut 0x7f080071 -int id shortmenu_continue 0x7f080072 -int id shortmenu_exit 0x7f080073 -int id shortmenu_restart 0x7f080074 -int id shortmenu_topbar 0x7f080075 -int id showCustom 0x7f080076 -int id showHome 0x7f080077 -int id showTitle 0x7f080078 -int id spacer 0x7f080079 -int id split_action_bar 0x7f08007a -int id src_atop 0x7f08007b -int id src_in 0x7f08007c -int id src_over 0x7f08007d -int id startscreen_gain_90_ep 0x7f08007e -int id startscreen_play 0x7f08007f -int id startscreen_settings 0x7f080080 -int id startscreen_to_gl_test_screen 0x7f080081 -int id startscreen_unlock_levels 0x7f080082 -int id status_bar_latest_event_content 0x7f080083 -int id submit_area 0x7f080084 -int id tabMode 0x7f080085 -int id text 0x7f080086 -int id text2 0x7f080087 -int id textSpacerNoButtons 0x7f080088 -int id time 0x7f080089 -int id title 0x7f08008a -int id title_template 0x7f08008b -int id toolProgressBar 0x7f08008c -int id toolProgressBarView 0x7f08008d -int id toolProgressButtonAnimation 0x7f08008e -int id tool_inspector_description 0x7f08008f -int id tool_inspector_imageview 0x7f080090 -int id tool_inspector_level_view 0x7f080091 -int id tool_inspector_pricebutton 0x7f080092 -int id tool_inspector_title 0x7f080093 -int id tool_upgrade_imageview 0x7f080094 -int id tool_upgrade_pricebutton 0x7f080095 -int id tool_upgrade_title 0x7f080096 -int id tool_upgrade_value_new 0x7f080097 -int id tool_upgrade_value_old 0x7f080098 -int id toolbutton_1 0x7f080099 -int id toolbutton_2 0x7f08009a -int id toolbutton_3 0x7f08009b -int id toolbutton_4 0x7f08009c -int id toolofferslot_slot 0x7f08009d -int id toolofferslot_title 0x7f08009e -int id toolshop_slot1 0x7f08009f -int id toolshop_slot2 0x7f0800a0 -int id toolshop_slot3 0x7f0800a1 -int id toolshop_slot4 0x7f0800a2 -int id toolshop_tool_offer_layout 0x7f0800a3 -int id toolshop_toolinspector 0x7f0800a4 -int id toolshop_topbar 0x7f0800a5 -int id toolslot_image 0x7f0800a6 -int id topPanel 0x7f0800a7 -int id topbar_energycount 0x7f0800a8 -int id topbar_energycount_decrease 0x7f0800a9 -int id topbar_energyview 0x7f0800aa -int id topbar_layout 0x7f0800ab -int id topbar_leveldisplay 0x7f0800ac -int id topbar_levellayout 0x7f0800ad -int id topbar_levelprogress 0x7f0800ae -int id topbar_settings 0x7f0800af -int id topbar_shapeshop 0x7f0800b0 -int id topbar_starcount 0x7f0800b1 -int id topbar_starcount_decrease 0x7f0800b2 -int id topbar_starview 0x7f0800b3 -int id topbar_toolshop 0x7f0800b4 -int id tutorial_image_view 0x7f0800b5 -int id tutorial_text_view 0x7f0800b6 -int id unlockmessage_message 0x7f0800b7 -int id unlockmessage_toolimage 0x7f0800b8 -int id up 0x7f0800b9 -int id useLogo 0x7f0800ba -int id withText 0x7f0800bb -int id worldbutton_energycount 0x7f0800bc -int id worldbutton_levelcount 0x7f0800bd -int id worldbutton_lock 0x7f0800be -int id worldbutton_preview 0x7f0800bf -int id worldbutton_starcount 0x7f0800c0 -int id worldbutton_tickView 0x7f0800c1 -int id worldbutton_title 0x7f0800c2 -int id worlds_layout 0x7f0800c3 -int id worlds_topbar 0x7f0800c4 -int id wrap_content 0x7f0800c5 +int id shape_shop_shape_inspector 0x7f08006f +int id shape_shop_topRow 0x7f080070 +int id shape_shop_topbar 0x7f080071 +int id shortcut 0x7f080072 +int id shortmenu_continue 0x7f080073 +int id shortmenu_exit 0x7f080074 +int id shortmenu_restart 0x7f080075 +int id shortmenu_topbar 0x7f080076 +int id showCustom 0x7f080077 +int id showHome 0x7f080078 +int id showTitle 0x7f080079 +int id spacer 0x7f08007a +int id split_action_bar 0x7f08007b +int id src_atop 0x7f08007c +int id src_in 0x7f08007d +int id src_over 0x7f08007e +int id startscreen_gain_90_ep 0x7f08007f +int id startscreen_play 0x7f080080 +int id startscreen_settings 0x7f080081 +int id startscreen_to_gl_test_screen 0x7f080082 +int id startscreen_unlock_levels 0x7f080083 +int id status_bar_latest_event_content 0x7f080084 +int id submit_area 0x7f080085 +int id tabMode 0x7f080086 +int id text 0x7f080087 +int id text2 0x7f080088 +int id textSpacerNoButtons 0x7f080089 +int id time 0x7f08008a +int id title 0x7f08008b +int id title_template 0x7f08008c +int id tool_button_animation_layer 0x7f08008d +int id tool_button_background_layer 0x7f08008e +int id tool_button_progress_bar 0x7f08008f +int id tool_inspector_description 0x7f080090 +int id tool_inspector_imageview 0x7f080091 +int id tool_inspector_level_view 0x7f080092 +int id tool_inspector_pricebutton 0x7f080093 +int id tool_inspector_title 0x7f080094 +int id tool_upgrade_imageview 0x7f080095 +int id tool_upgrade_pricebutton 0x7f080096 +int id tool_upgrade_title 0x7f080097 +int id tool_upgrade_value_new 0x7f080098 +int id tool_upgrade_value_old 0x7f080099 +int id toolbutton_1 0x7f08009a +int id toolbutton_2 0x7f08009b +int id toolbutton_3 0x7f08009c +int id toolbutton_4 0x7f08009d +int id toolofferslot_slot 0x7f08009e +int id toolofferslot_title 0x7f08009f +int id toolshop_slot1 0x7f0800a0 +int id toolshop_slot2 0x7f0800a1 +int id toolshop_slot3 0x7f0800a2 +int id toolshop_slot4 0x7f0800a3 +int id toolshop_tool_offer_bottom_row 0x7f0800a4 +int id toolshop_tool_offer_top_row 0x7f0800a5 +int id toolshop_toolinspector 0x7f0800a6 +int id toolshop_topbar 0x7f0800a7 +int id toolslot_image 0x7f0800a8 +int id topPanel 0x7f0800a9 +int id topbar_energycount 0x7f0800aa +int id topbar_energycount_decrease 0x7f0800ab +int id topbar_energyview 0x7f0800ac +int id topbar_layout 0x7f0800ad +int id topbar_leveldisplay 0x7f0800ae +int id topbar_levellayout 0x7f0800af +int id topbar_levelprogress 0x7f0800b0 +int id topbar_settings 0x7f0800b1 +int id topbar_shapeshop 0x7f0800b2 +int id topbar_starcount 0x7f0800b3 +int id topbar_starcount_decrease 0x7f0800b4 +int id topbar_starview 0x7f0800b5 +int id topbar_toolshop 0x7f0800b6 +int id tutorial_image_view 0x7f0800b7 +int id tutorial_text_view 0x7f0800b8 +int id unlockmessage_message 0x7f0800b9 +int id unlockmessage_toolimage 0x7f0800ba +int id up 0x7f0800bb +int id useLogo 0x7f0800bc +int id withText 0x7f0800bd +int id worldbutton_energycount 0x7f0800be +int id worldbutton_levelcount 0x7f0800bf +int id worldbutton_lock 0x7f0800c0 +int id worldbutton_preview 0x7f0800c1 +int id worldbutton_starcount 0x7f0800c2 +int id worldbutton_tickView 0x7f0800c3 +int id worldbutton_title 0x7f0800c4 +int id worlds_layout 0x7f0800c5 +int id worlds_topbar 0x7f0800c6 +int id wrap_content 0x7f0800c7 int integer abc_config_activityDefaultDur 0x7f090000 int integer abc_config_activityShortDur 0x7f090001 int integer abc_max_action_buttons 0x7f090002 @@ -794,22 +799,23 @@ int layout select_dialog_multichoice_material 0x7f0a002a int layout select_dialog_singlechoice_material 0x7f0a002b int layout settings 0x7f0a002c int layout shape_button 0x7f0a002d -int layout shape_shop 0x7f0a002e -int layout short_menu 0x7f0a002f -int layout start_screen 0x7f0a0030 -int layout support_simple_spinner_dropdown_item 0x7f0a0031 -int layout tool_inspector 0x7f0a0032 -int layout tool_offer_slot 0x7f0a0033 -int layout tool_slot 0x7f0a0034 -int layout tool_upgrade 0x7f0a0035 -int layout toolbutton 0x7f0a0036 -int layout toolbuttonbar 0x7f0a0037 -int layout toolshop 0x7f0a0038 -int layout topbar 0x7f0a0039 -int layout tutorial 0x7f0a003a -int layout unlock_message 0x7f0a003b -int layout world_button 0x7f0a003c -int layout worlds 0x7f0a003d +int layout shape_inspector 0x7f0a002e +int layout shape_shop 0x7f0a002f +int layout short_menu 0x7f0a0030 +int layout start_screen 0x7f0a0031 +int layout support_simple_spinner_dropdown_item 0x7f0a0032 +int layout tool_inspector 0x7f0a0033 +int layout tool_offer_slot 0x7f0a0034 +int layout tool_slot 0x7f0a0035 +int layout tool_upgrade 0x7f0a0036 +int layout toolbutton 0x7f0a0037 +int layout toolbuttonbar 0x7f0a0038 +int layout toolshop 0x7f0a0039 +int layout topbar 0x7f0a003a +int layout tutorial 0x7f0a003b +int layout unlock_message 0x7f0a003c +int layout world_button 0x7f0a003d +int layout worlds 0x7f0a003e int mipmap ic_launcher 0x7f0b0000 int raw background 0x7f0c0000 int raw ramp 0x7f0c0001 diff --git a/app/src/main/java/de/frajul/endlessroll/main/screens/PlayerShapeShopScreen.java b/app/src/main/java/de/frajul/endlessroll/main/screens/PlayerShapeShopScreen.java index 560864a..8f994be 100644 --- a/app/src/main/java/de/frajul/endlessroll/main/screens/PlayerShapeShopScreen.java +++ b/app/src/main/java/de/frajul/endlessroll/main/screens/PlayerShapeShopScreen.java @@ -14,7 +14,7 @@ import de.frajul.endlessroll.views.TopBar; /** * Created by Julian on 08.07.2016. */ -public class PlayerShapeShopScreen extends Screen implements PlayerShapeButtonOnClickListener { +public class PlayerShapeShopScreen extends Screen implements PlayerShapeButtonOnClickListener { private PlayerShapeButton activeButton; diff --git a/app/src/main/res/layout/shape_button.xml b/app/src/main/res/layout/shape_button.xml index 532103c..942fc0a 100644 --- a/app/src/main/res/layout/shape_button.xml +++ b/app/src/main/res/layout/shape_button.xml @@ -10,12 +10,12 @@ android:layout_height="wrap_content" android:layout_gravity="center_horizontal" android:text="@string/placeholder_button" - android:textSize="30sp"/> + android:textSize="28sp"/>