First implementation of innovations in Tool Shop

This commit is contained in:
= 2017-10-27 23:20:10 +02:00
parent 0bc6a09d17
commit 5467c1dd97
19 changed files with 351 additions and 422 deletions

View File

@ -88,6 +88,7 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes-jar" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />

View File

@ -502,56 +502,56 @@ public final class R {
public static final int info = 0x7f080033;
public static final int line1 = 0x7f080042;
public static final int line3 = 0x7f080043;
public static final int listMode = 0x7f080047;
public static final int list_item = 0x7f080048;
public static final int media_actions = 0x7f080049;
public static final int middle = 0x7f08004f;
public static final int multiply = 0x7f080050;
public static final int never = 0x7f080051;
public static final int none = 0x7f080052;
public static final int normal = 0x7f080053;
public static final int parentPanel = 0x7f080054;
public static final int progress_circular = 0x7f080058;
public static final int progress_horizontal = 0x7f080059;
public static final int radio = 0x7f08005a;
public static final int screen = 0x7f08005b;
public static final int scrollIndicatorDown = 0x7f08005c;
public static final int scrollIndicatorUp = 0x7f08005d;
public static final int scrollView = 0x7f08005e;
public static final int search_badge = 0x7f08005f;
public static final int search_bar = 0x7f080060;
public static final int search_button = 0x7f080061;
public static final int search_close_btn = 0x7f080062;
public static final int search_edit_frame = 0x7f080063;
public static final int search_go_btn = 0x7f080064;
public static final int search_mag_icon = 0x7f080065;
public static final int search_plate = 0x7f080066;
public static final int search_src_text = 0x7f080067;
public static final int search_voice_btn = 0x7f080068;
public static final int select_dialog_listview = 0x7f080069;
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 = 0x7f0800a8;
public static final int up = 0x7f0800ba;
public static final int useLogo = 0x7f0800bb;
public static final int withText = 0x7f0800bc;
public static final int wrap_content = 0x7f0800c6;
public static final int listMode = 0x7f080046;
public static final int list_item = 0x7f080047;
public static final int media_actions = 0x7f080048;
public static final int middle = 0x7f08004e;
public static final int multiply = 0x7f08004f;
public static final int never = 0x7f080050;
public static final int none = 0x7f080051;
public static final int normal = 0x7f080052;
public static final int parentPanel = 0x7f080053;
public static final int progress_circular = 0x7f080057;
public static final int progress_horizontal = 0x7f080058;
public static final int radio = 0x7f080059;
public static final int screen = 0x7f08005a;
public static final int scrollIndicatorDown = 0x7f08005b;
public static final int scrollIndicatorUp = 0x7f08005c;
public static final int scrollView = 0x7f08005d;
public static final int search_badge = 0x7f08005e;
public static final int search_bar = 0x7f08005f;
public static final int search_button = 0x7f080060;
public static final int search_close_btn = 0x7f080061;
public static final int search_edit_frame = 0x7f080062;
public static final int search_go_btn = 0x7f080063;
public static final int search_mag_icon = 0x7f080064;
public static final int search_plate = 0x7f080065;
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 class integer {
public static final int abc_config_activityDefaultDur = 0x7f090000;
@ -619,7 +619,7 @@ public final class R {
public static final int abc_shareactionprovider_share_with = 0x7f0d0010;
public static final int abc_shareactionprovider_share_with_application = 0x7f0d0011;
public static final int abc_toolbar_collapse_description = 0x7f0d0012;
public static final int status_bar_notification_info_overflow = 0x7f0d003c;
public static final int status_bar_notification_info_overflow = 0x7f0d003d;
}
public static final class style {
public static final int AlertDialog_AppCompat = 0x7f0e0000;

File diff suppressed because one or more lines are too long

View File

@ -397,6 +397,7 @@ 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 drawable abc_ab_share_pack_mtrl_alpha 0x7f070000
int drawable abc_action_bar_item_background_material 0x7f070001
int drawable abc_btn_borderless_material 0x7f070002
@ -613,136 +614,135 @@ int id levelup_unlocklist 0x7f080041
int id line1 0x7f080042
int id line3 0x7f080043
int id linearLayout 0x7f080044
int id linearLayout3 0x7f080045
int id linearLayout4 0x7f080046
int id listMode 0x7f080047
int id list_item 0x7f080048
int id media_actions 0x7f080049
int id message_next_level 0x7f08004a
int id message_restart 0x7f08004b
int id message_title 0x7f08004c
int id message_to_menu 0x7f08004d
int id message_tools 0x7f08004e
int id middle 0x7f08004f
int id multiply 0x7f080050
int id never 0x7f080051
int id none 0x7f080052
int id normal 0x7f080053
int id parentPanel 0x7f080054
int id price_button_currency 0x7f080055
int id price_button_price 0x7f080056
int id price_button_title 0x7f080057
int id progress_circular 0x7f080058
int id progress_horizontal 0x7f080059
int id radio 0x7f08005a
int id screen 0x7f08005b
int id scrollIndicatorDown 0x7f08005c
int id scrollIndicatorUp 0x7f08005d
int id scrollView 0x7f08005e
int id search_badge 0x7f08005f
int id search_bar 0x7f080060
int id search_button 0x7f080061
int id search_close_btn 0x7f080062
int id search_edit_frame 0x7f080063
int id search_go_btn 0x7f080064
int id search_mag_icon 0x7f080065
int id search_plate 0x7f080066
int id search_src_text 0x7f080067
int id search_voice_btn 0x7f080068
int id select_dialog_listview 0x7f080069
int id settings_reset 0x7f08006a
int id settings_soundtoggle 0x7f08006b
int id settings_topbar 0x7f08006c
int id shape_button_button 0x7f08006d
int id shape_button_textview 0x7f08006e
int id shape_shop_bottomRow 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 toolProgressBar 0x7f08008d
int id toolProgressBarView 0x7f08008e
int id toolProgressButtonAnimation 0x7f08008f
int id linearLayout4 0x7f080045
int id listMode 0x7f080046
int id list_item 0x7f080047
int id media_actions 0x7f080048
int id message_next_level 0x7f080049
int id message_restart 0x7f08004a
int id message_title 0x7f08004b
int id message_to_menu 0x7f08004c
int id message_tools 0x7f08004d
int id middle 0x7f08004e
int id multiply 0x7f08004f
int id never 0x7f080050
int id none 0x7f080051
int id normal 0x7f080052
int id parentPanel 0x7f080053
int id price_button_currency 0x7f080054
int id price_button_price 0x7f080055
int id price_button_title 0x7f080056
int id progress_circular 0x7f080057
int id progress_horizontal 0x7f080058
int id radio 0x7f080059
int id screen 0x7f08005a
int id scrollIndicatorDown 0x7f08005b
int id scrollIndicatorUp 0x7f08005c
int id scrollView 0x7f08005d
int id search_badge 0x7f08005e
int id search_bar 0x7f08005f
int id search_button 0x7f080060
int id search_close_btn 0x7f080061
int id search_edit_frame 0x7f080062
int id search_go_btn 0x7f080063
int id search_mag_icon 0x7f080064
int id search_plate 0x7f080065
int id search_src_text 0x7f080066
int id search_voice_btn 0x7f080067
int id select_dialog_listview 0x7f080068
int id settings_reset 0x7f080069
int id settings_soundtoggle 0x7f08006a
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_pricebutton 0x7f080091
int id tool_inspector_title 0x7f080092
int id tool_inspector_toolupgrade0 0x7f080093
int id tool_inspector_toolupgrade1 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_layout 0x7f0800a4
int id toolshop_toolinspector 0x7f0800a5
int id toolshop_topbar 0x7f0800a6
int id toolslot_image 0x7f0800a7
int id topPanel 0x7f0800a8
int id topbar_energycount 0x7f0800a9
int id topbar_energycount_decrease 0x7f0800aa
int id topbar_energyview 0x7f0800ab
int id topbar_layout 0x7f0800ac
int id topbar_leveldisplay 0x7f0800ad
int id topbar_levellayout 0x7f0800ae
int id topbar_levelprogress 0x7f0800af
int id topbar_settings 0x7f0800b0
int id topbar_shapeshop 0x7f0800b1
int id topbar_starcount 0x7f0800b2
int id topbar_starcount_decrease 0x7f0800b3
int id topbar_starview 0x7f0800b4
int id topbar_toolshop 0x7f0800b5
int id tutorial_image_view 0x7f0800b6
int id tutorial_text_view 0x7f0800b7
int id unlockmessage_message 0x7f0800b8
int id unlockmessage_toolimage 0x7f0800b9
int id up 0x7f0800ba
int id useLogo 0x7f0800bb
int id withText 0x7f0800bc
int id worldbutton_energycount 0x7f0800bd
int id worldbutton_levelcount 0x7f0800be
int id worldbutton_lock 0x7f0800bf
int id worldbutton_preview 0x7f0800c0
int id worldbutton_starcount 0x7f0800c1
int id worldbutton_tickView 0x7f0800c2
int id worldbutton_title 0x7f0800c3
int id worlds_layout 0x7f0800c4
int id worlds_topbar 0x7f0800c5
int id wrap_content 0x7f0800c6
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 integer abc_config_activityDefaultDur 0x7f090000
int integer abc_config_activityShortDur 0x7f090001
int integer abc_max_action_buttons 0x7f090002
@ -836,80 +836,87 @@ int string app_name 0x7f0d0013
int string bounty_message_resource_format_s 0x7f0d0014
int string bounty_message_tool_format_s 0x7f0d0015
int string bounty_message_tool_slot 0x7f0d0016
int string button_placeholder 0x7f0d0017
int string game_countdown_placeholder 0x7f0d0018
int string game_fps_format_d 0x7f0d0019
int string game_fps_placeholder 0x7f0d001a
int string game_playerprogress_format_f 0x7f0d001b
int string game_playerprogress_placeholder 0x7f0d001c
int string game_playerspeed_format_f 0x7f0d001d
int string game_playerspeed_placeholder 0x7f0d001e
int string level_button_format_d 0x7f0d001f
int string levelup 0x7f0d0020
int string message_game_over 0x7f0d0021
int string message_next_level 0x7f0d0022
int string message_restart 0x7f0d0023
int string message_to_menu 0x7f0d0024
int string message_tools 0x7f0d0025
int string message_try_again 0x7f0d0026
int string message_win 0x7f0d0027
int string number_placeholder 0x7f0d0028
int string percent_placeholder 0x7f0d0029
int string playershape_name_ball 0x7f0d002a
int string playershape_name_clock 0x7f0d002b
int string playershape_name_hypno_spiral 0x7f0d002c
int string playershape_name_pacman 0x7f0d002d
int string playershape_name_smiley 0x7f0d002e
int string playershape_name_sun 0x7f0d002f
int string playershape_name_wheel 0x7f0d0030
int string pre_start_screen_loading 0x7f0d0031
int string price_button_buy 0x7f0d0032
int string price_button_upgrade 0x7f0d0033
int string settings_reset 0x7f0d0034
int string short_menu_continue 0x7f0d0035
int string short_menu_exit 0x7f0d0036
int string short_menu_restart 0x7f0d0037
int string start_screen_gain_90_ep 0x7f0d0038
int string start_screen_play 0x7f0d0039
int string start_screen_to_gl_test_screen 0x7f0d003a
int string start_screen_unlock_all_levels 0x7f0d003b
int string status_bar_notification_info_overflow 0x7f0d003c
int string textview_placeholder 0x7f0d003d
int string tool_name_bomb 0x7f0d003e
int string tool_name_magnet 0x7f0d003f
int string tool_name_power_mushroom 0x7f0d0040
int string tool_name_ramp 0x7f0d0041
int string tool_name_spring 0x7f0d0042
int string tool_name_unknown 0x7f0d0043
int string tool_upgrade_force 0x7f0d0044
int string tool_upgrade_none 0x7f0d0045
int string tool_upgrade_radius 0x7f0d0046
int string tool_upgrade_time 0x7f0d0047
int string tool_upgrade_title_format_sd 0x7f0d0048
int string tool_upgrade_title_placeholder 0x7f0d0049
int string tool_upgrade_value_max 0x7f0d004a
int string topbar_level_format_d 0x7f0d004b
int string topbar_level_placeholder 0x7f0d004c
int string topbar_toolshop 0x7f0d004d
int string tutorial_leveled_up 0x7f0d004e
int string tutorial_place_ramp_air 0x7f0d004f
int string tutorial_place_ramp_air_2 0x7f0d0050
int string tutorial_place_ramp_gap 0x7f0d0051
int string tutorial_place_ramp_obstacle 0x7f0d0052
int string tutorial_place_tools 0x7f0d0053
int string tutorial_placeholder 0x7f0d0054
int string tutorial_to_toolshop 0x7f0d0055
int string tutorial_toolbar 0x7f0d0056
int string tutorial_toolshop_all_tools 0x7f0d0057
int string tutorial_toolshop_equip_spring 0x7f0d0058
int string tutorial_toolshop_inspector 0x7f0d0059
int string tutorial_toolshop_select_buy_spring 0x7f0d005a
int string tutorial_toolshop_toolbar 0x7f0d005b
int string tutorial_toolshop_welcome 0x7f0d005c
int string tutorial_welcome 0x7f0d005d
int string unlock_message_placeholder 0x7f0d005e
int string world_button_progress_placeholder 0x7f0d005f
int string world_button_title_placeholder 0x7f0d0060
int string game_countdown_placeholder 0x7f0d0017
int string game_fps_format_d 0x7f0d0018
int string game_fps_placeholder 0x7f0d0019
int string game_playerprogress_format_f 0x7f0d001a
int string game_playerprogress_placeholder 0x7f0d001b
int string game_playerspeed_format_f 0x7f0d001c
int string game_playerspeed_placeholder 0x7f0d001d
int string level_button_format_d 0x7f0d001e
int string levelup 0x7f0d001f
int string message_game_over 0x7f0d0020
int string message_next_level 0x7f0d0021
int string message_restart 0x7f0d0022
int string message_to_menu 0x7f0d0023
int string message_tools 0x7f0d0024
int string message_try_again 0x7f0d0025
int string message_win 0x7f0d0026
int string placeholder_button 0x7f0d0027
int string placeholder_number 0x7f0d0028
int string placeholder_percent 0x7f0d0029
int string placeholder_textview 0x7f0d002a
int string playershape_name_ball 0x7f0d002b
int string playershape_name_clock 0x7f0d002c
int string playershape_name_hypno_spiral 0x7f0d002d
int string playershape_name_pacman 0x7f0d002e
int string playershape_name_smiley 0x7f0d002f
int string playershape_name_sun 0x7f0d0030
int string playershape_name_wheel 0x7f0d0031
int string pre_start_screen_loading 0x7f0d0032
int string price_button_buy 0x7f0d0033
int string price_button_upgrade 0x7f0d0034
int string settings_reset 0x7f0d0035
int string short_menu_continue 0x7f0d0036
int string short_menu_exit 0x7f0d0037
int string short_menu_restart 0x7f0d0038
int string start_screen_gain_90_ep 0x7f0d0039
int string start_screen_play 0x7f0d003a
int string start_screen_to_gl_test_screen 0x7f0d003b
int string start_screen_unlock_all_levels 0x7f0d003c
int string status_bar_notification_info_overflow 0x7f0d003d
int string tool_description_bomb 0x7f0d003e
int string tool_description_locked 0x7f0d003f
int string tool_description_magnet 0x7f0d0040
int string tool_description_power_mushroom 0x7f0d0041
int string tool_description_ramp 0x7f0d0042
int string tool_description_spring 0x7f0d0043
int string tool_level_format_d 0x7f0d0044
int string tool_name_bomb 0x7f0d0045
int string tool_name_locked 0x7f0d0046
int string tool_name_magnet 0x7f0d0047
int string tool_name_power_mushroom 0x7f0d0048
int string tool_name_ramp 0x7f0d0049
int string tool_name_spring 0x7f0d004a
int string tool_upgrade_force 0x7f0d004b
int string tool_upgrade_none 0x7f0d004c
int string tool_upgrade_radius 0x7f0d004d
int string tool_upgrade_time 0x7f0d004e
int string tool_upgrade_title_format_sd 0x7f0d004f
int string tool_upgrade_title_placeholder 0x7f0d0050
int string tool_upgrade_value_max 0x7f0d0051
int string topbar_level_format_d 0x7f0d0052
int string topbar_level_placeholder 0x7f0d0053
int string topbar_toolshop 0x7f0d0054
int string tutorial_leveled_up 0x7f0d0055
int string tutorial_place_ramp_air 0x7f0d0056
int string tutorial_place_ramp_air_2 0x7f0d0057
int string tutorial_place_ramp_gap 0x7f0d0058
int string tutorial_place_ramp_obstacle 0x7f0d0059
int string tutorial_place_tools 0x7f0d005a
int string tutorial_placeholder 0x7f0d005b
int string tutorial_to_toolshop 0x7f0d005c
int string tutorial_toolbar 0x7f0d005d
int string tutorial_toolshop_all_tools 0x7f0d005e
int string tutorial_toolshop_equip_spring 0x7f0d005f
int string tutorial_toolshop_inspector 0x7f0d0060
int string tutorial_toolshop_select_buy_spring 0x7f0d0061
int string tutorial_toolshop_toolbar 0x7f0d0062
int string tutorial_toolshop_welcome 0x7f0d0063
int string tutorial_welcome 0x7f0d0064
int string unlock_message_placeholder 0x7f0d0065
int string world_button_progress_placeholder 0x7f0d0066
int string world_button_title_placeholder 0x7f0d0067
int style AlertDialog_AppCompat 0x7f0e0000
int style AlertDialog_AppCompat_Light 0x7f0e0001
int style Animation_AppCompat_Dialog 0x7f0e0002

View File

@ -33,10 +33,6 @@ public class ToolUpgrade {
return getValueAtLevel(currentLevel);
}
public float getValueAtNextLevel() {
return getValueAtLevel(currentLevel + 1);
}
public int getMaxLevel() {
return maxLevel;
}

View File

@ -20,11 +20,10 @@ public class ToolInspector implements View.OnClickListener {
private ToolShopScreen toolShopScreen;
private TextView title;
private TextView levelView;
private ImageView imageView;
private PriceButton priceButton;
private ToolUpgradeView toolUpgradeView0;
private ToolUpgradeView toolUpgradeView1;
private TextView description;
private ToolType toolType;
private boolean locked;
@ -35,47 +34,54 @@ public class ToolInspector implements View.OnClickListener {
Typeface typeface = gameActivity.getTypeface();
title = (TextView) layout.findViewById(R.id.tool_inspector_title);
title.setTypeface(typeface);
levelView = (TextView) layout.findViewById(R.id.tool_inspector_level_view);
levelView.setTypeface(typeface);
imageView = (ImageView) layout.findViewById(R.id.tool_inspector_imageview);
priceButton = new PriceButton(gameActivity, typeface,
layout.findViewById(R.id.tool_inspector_pricebutton), this);
toolUpgradeView0 = new ToolUpgradeView(this, gameActivity, typeface,
layout.findViewById(R.id.tool_inspector_toolupgrade0));
toolUpgradeView1 = new ToolUpgradeView(this, gameActivity, typeface,
layout.findViewById(R.id.tool_inspector_toolupgrade1));
description = (TextView) layout.findViewById(R.id.tool_inspector_description);
description.setTypeface(typeface);
}
public void update(ToolType toolType, boolean locked) {
this.toolType = toolType;
this.locked = locked;
this.title.setText(locked ? R.string.tool_name_unknown : toolType.getName());
this.imageView.setImageDrawable(gameActivity.getResources().getDrawable(
title.setText(locked ? R.string.tool_name_locked : toolType.getName());
levelView.setText(gameActivity.getString(R.string.tool_level_format_d, toolType.getUpgrade().getCurrentLevel()));
levelView.setVisibility(locked ? View.INVISIBLE : View.VISIBLE);
imageView.setImageDrawable(gameActivity.getResources().getDrawable(
locked ? R.drawable.tools_button_locked : toolType.getButtonDrawable()));
priceButton.init(R.string.price_button_buy, toolType.getPrice(), R.drawable.currency_star);
priceButton.setLayoutVisible(toolType.isBought() || locked ? View.GONE : View.VISIBLE);
priceButton.setLayoutEnabled(toolType.getPrice() <= gameActivity.getUser().getStarCount());
description.setText(locked ? R.string.tool_description_locked : toolType.getDescription());
toolUpgradeView0.update(toolType.getUpgrades()[0], toolType.isBought(),
gameActivity.getUser().getEnergyCount());
toolUpgradeView0.setLayoutVisiblity(locked ? View.GONE : View.VISIBLE);
if (toolType.getUpgrades().length <= 1 || locked)
toolUpgradeView1.setLayoutVisiblity(View.GONE);
else {
toolUpgradeView1.setLayoutVisiblity(View.VISIBLE);
toolUpgradeView1.update(toolType.getUpgrades()[1], toolType.isBought(),
gameActivity.getUser().getEnergyCount());
if (!toolType.isBought()) {
priceButton
.init(R.string.price_button_buy, toolType.getPrice(), R.drawable.currency_star);
priceButton.setLayoutVisible(locked ? View.GONE : View.VISIBLE);
priceButton
.setLayoutEnabled(toolType.getPrice() <= gameActivity.getUser().getStarCount());
} else {
priceButton.init(R.string.price_button_upgrade, toolType.getUpgrade().getPrice(),
R.drawable.currency_energy);
priceButton.setLayoutVisible(toolType.getUpgrade().getCurrentLevel() == toolType.getUpgrade().getMaxLevel() ? View.GONE : View.VISIBLE);
priceButton.setLayoutEnabled(
toolType.getUpgrade().getPrice() <= gameActivity.getUser().getEnergyCount());
}
}
public void onToolUpgraded(int price) {
private void onToolUpgraded(int price) {
toolType.getUpgrade().setCurrentLevel(toolType.getUpgrade().getCurrentLevel()+1);
toolShopScreen.onToolUpgraded(price);
update(toolType, locked);
}
@Override
public void onClick(View v) {
if(!toolType.isBought()){
toolType.setBought(true);
update(toolType, locked);
toolShopScreen.onToolBought(toolType.getPrice(), toolType);
}else{
onToolUpgraded(toolType.getUpgrade().getPrice());
}
}
}

View File

@ -1,84 +0,0 @@
package de.frajul.endlessroll.views;
import android.content.Context;
import android.graphics.Typeface;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
import de.frajul.endlessroll.R;
import de.frajul.endlessroll.entities.tools.ToolUpgrade;
/**
* Created by Julian on 01.08.2016.
*/
public class ToolUpgradeView implements View.OnClickListener {
private ToolInspector toolInspector;
private Context context;
private View layout;
private TextView title;
private ImageView imageView;
private TextView valueOld;
private TextView valueNew;
private PriceButton priceButton;
private ToolUpgrade upgrade;
private boolean toolBought;
private int availableEnergy;
public ToolUpgradeView(ToolInspector toolInspector, Context context, Typeface typeface, View layout) {
this.toolInspector = toolInspector;
this.context = context;
this.layout = layout;
title = (TextView) layout.findViewById(R.id.tool_upgrade_title);
title.setTypeface(typeface);
imageView = (ImageView) layout.findViewById(R.id.tool_upgrade_imageview);
valueOld = (TextView) layout.findViewById(R.id.tool_upgrade_value_old);
valueOld.setTypeface(typeface);
valueNew = (TextView) layout.findViewById(R.id.tool_upgrade_value_new);
valueNew.setTypeface(typeface);
priceButton = new PriceButton(context, typeface,
layout.findViewById(R.id.tool_upgrade_pricebutton), this);
}
public void update(ToolUpgrade toolUpgrade, boolean toolBought, int availableEnergy) {
this.upgrade = toolUpgrade;
this.toolBought = toolBought;
this.availableEnergy = availableEnergy;
this.title.setText(context.getString(R.string.tool_upgrade_title_format_sd,
context.getString(toolUpgrade.getType().getName()), toolUpgrade.getCurrentLevel()));
this.imageView.setImageDrawable(
context.getResources().getDrawable(toolUpgrade.getType().getDrawable()));
updateValueViews();
priceButton.init(R.string.price_button_upgrade, toolUpgrade.getPrice(),
R.drawable.currency_energy);
priceButton.setLayoutVisible(isAtMaxLevel() ? View.GONE : View.VISIBLE);
priceButton.setLayoutEnabled(toolBought && toolUpgrade.getPrice() <= availableEnergy);
}
public void setLayoutVisiblity(int visiblity) {
layout.setVisibility(visiblity);
}
private void updateValueViews() {
String unit = upgrade.getType().getUnit();
valueOld.setText(upgrade.getValueAtCurrentLevel() + unit);
valueNew.setText(upgrade.getValueAtNextLevel() + unit);
if (isAtMaxLevel())
valueNew.setText(R.string.tool_upgrade_value_max);
}
private boolean isAtMaxLevel() {
return upgrade.getCurrentLevel() >= upgrade.getMaxLevel();
}
@Override
public void onClick(View v) {
upgrade.setCurrentLevel(upgrade.getCurrentLevel() + 1);
update(upgrade, toolBought, availableEnergy);
toolInspector.onToolUpgraded(upgrade.getPrice());
}
}

View File

@ -9,7 +9,7 @@
android:id="@+id/levelbutton_textview"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/button_placeholder"
android:text="@string/placeholder_button"
android:textSize="30sp"
android:layout_centerHorizontal="true"/>

View File

@ -17,7 +17,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="@string/number_placeholder"
android:text="@string/placeholder_number"
android:textColor="#ffae00"
android:textSize="60sp"
android:textStyle="bold"

View File

@ -13,7 +13,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="@string/button_placeholder"
android:text="@string/placeholder_button"
android:textSize="13sp"/>
<LinearLayout
@ -27,7 +27,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="2dp"
android:text="@string/number_placeholder"
android:text="@string/placeholder_number"
android:textSize="15sp"/>
<ImageView

View File

@ -9,7 +9,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="@string/button_placeholder"
android:text="@string/placeholder_button"
android:textSize="30sp"/>
<Button

View File

@ -1,25 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="@dimen/tool_inspector_width"
android:layout_height="match_parent"
android:background="#e6ffc936">
android:background="#e6ffc936"
android:orientation="vertical"
android:padding="10dp">
<TextView
android:id="@+id/tool_inspector_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:layout_gravity="center"
android:text="@string/textview_placeholder"
android:layout_gravity="center_horizontal"
android:text="@string/placeholder_textview"
android:textAlignment="center"
android:textSize="28sp"/>
<LinearLayout
android:id="@+id/linearLayout3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tool_inspector_title"
android:layout_centerHorizontal="true"
android:layout_gravity="center_horizontal"
android:orientation="horizontal">
<ImageView
@ -40,34 +39,25 @@
</LinearLayout>
<RelativeLayout
<TextView
android:id="@+id/tool_inspector_level_view"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_below="@+id/linearLayout3"
android:layout_centerInParent="true">
android:layout_height="wrap_content"
android:text="@string/placeholder_textview"
android:textSize="22sp"/>
<LinearLayout
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
android:id="@+id/tool_inspector_description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:orientation="vertical">
<include
android:id="@+id/tool_inspector_toolupgrade0"
layout="@layout/tool_upgrade"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"/>
<include
android:id="@+id/tool_inspector_toolupgrade1"
layout="@layout/tool_upgrade"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="5dp"/>
</LinearLayout>
android:text="A simple tool which will get you in the air"
android:textAlignment="center"
android:textSize="20sp"/>
</RelativeLayout>
</RelativeLayout>
</LinearLayout>

View File

@ -8,7 +8,7 @@
android:id="@+id/toolofferslot_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/textview_placeholder"
android:text="@string/placeholder_textview"
android:layout_gravity="center_horizontal"
android:textSize="25sp"/>

View File

@ -44,7 +44,7 @@
android:id="@+id/tool_upgrade_value_old"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/percent_placeholder"
android:text="@string/placeholder_percent"
android:textSize="16sp"/>
<ImageView
@ -60,7 +60,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:text="@string/percent_placeholder"
android:text="@string/placeholder_percent"
android:textSize="16sp"/>
</LinearLayout>

View File

@ -83,7 +83,7 @@
<include
android:id="@+id/toolshop_toolinspector"
layout="@layout/tool_inspector"
android:layout_width="170dp"
android:layout_width="@dimen/tool_inspector_width"
android:layout_height="match_parent"
android:layout_alignParentRight="true"/>
</RelativeLayout>

View File

@ -58,7 +58,7 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toEndOf="@+id/topbar_starview"
android:text="@string/number_placeholder"
android:text="@string/placeholder_number"
android:textSize="25sp"/>
<TextView
@ -67,7 +67,7 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toEndOf="@+id/topbar_energyview"
android:text="@string/number_placeholder"
android:text="@string/placeholder_number"
android:textSize="25sp"/>
<Button
@ -75,7 +75,7 @@
android:layout_width="35dp"
android:layout_height="35dp"
android:layout_centerVertical="true"
android:layout_marginRight="5dp"
android:layout_marginRight="10dp"
android:layout_alignParentEnd="true"
android:background="@drawable/xml_selector_settingsbutton"/>
@ -86,7 +86,7 @@
android:layout_height="40dp"
android:layout_centerVertical="true"
android:layout_toLeftOf="@+id/topbar_settings"
android:layout_marginRight="10dp"
android:layout_marginRight="20dp"
android:background="@drawable/xml_selector_toolshopbutton"/>
<Button
@ -96,7 +96,7 @@
android:layout_height="40dp"
android:layout_toLeftOf="@+id/topbar_toolshop"
android:layout_centerVertical="true"
android:layout_marginRight="10dp"
android:layout_marginRight="20dp"
android:background="@drawable/xml_selector_shapeshopbutton"/>
<TextView
@ -105,7 +105,7 @@
android:layout_height="wrap_content"
android:layout_alignEnd="@+id/topbar_starcount"
android:layout_centerVertical="true"
android:text="@string/number_placeholder"
android:text="@string/placeholder_number"
android:textSize="20sp"
android:visibility="invisible"/>
@ -115,7 +115,7 @@
android:layout_height="wrap_content"
android:layout_alignEnd="@+id/topbar_energycount"
android:layout_centerVertical="true"
android:text="@string/number_placeholder"
android:text="@string/placeholder_number"
android:textSize="20sp"
android:visibility="invisible"/>

View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="tool_inspector_width">170dp</dimen>
</resources>

View File

@ -1,9 +1,9 @@
<resources>
<string name="app_name">Endless Roll</string>
<string name="button_placeholder">Click me!</string>
<string name="textview_placeholder">I\'m a text!</string>
<string name="number_placeholder">997.5</string>
<string name="percent_placeholder">85.1%</string>
<string name="placeholder_button">Click me!</string>
<string name="placeholder_textview">I\'m a text!</string>
<string name="placeholder_number">997.5</string>
<string name="placeholder_percent">85.1%</string>
<string name="game_playerprogress_placeholder">0.0m</string>
<string name="game_playerprogress_format_f">%.1fm</string>
@ -50,12 +50,19 @@
<string name="playershape_name_wheel">Wheel</string>
<string name="playershape_name_sun">Sun</string>
<string name="tool_name_unknown">\?\?\?</string>
<string name="tool_description_locked">You will unlock this mysterious tool later</string>
<string name="tool_description_ramp">A simple tool that will get you in the air</string>
<string name="tool_description_spring">It will get you way higher than the Ramp</string>
<string name="tool_description_magnet">Difficult to handle, but if you master it...</string>
<string name="tool_description_bomb">Blow up all obstacles near the bomb</string>
<string name="tool_description_power_mushroom">This will give you super-powers for 5 seconds</string>
<string name="tool_name_locked">\?\?\?</string>
<string name="tool_name_ramp">Ramp</string>
<string name="tool_name_spring">Spring</string>
<string name="tool_name_magnet">Magnet</string>
<string name="tool_name_bomb">Bomb</string>
<string name="tool_name_power_mushroom">Power Mushroom</string>
<string name="tool_level_format_d">Level: %d</string>
<string name="tool_upgrade_title_format_sd">%1$s (Lv%2$d)</string>
<string name="tool_upgrade_none">None</string>
<string name="tool_upgrade_time">Time</string>

View File

@ -88,8 +88,10 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes-jar" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />