Changed GoalScreen to GoalMessage

Reduced firework
Changed taskCompletedMessageLook
This commit is contained in:
= 2017-11-22 11:38:54 +01:00
parent 8d4caeaf69
commit 9a2353b01c
18 changed files with 730 additions and 594 deletions

View File

@ -494,64 +494,64 @@ public final class R {
public static final int end_padder = 0x7f080020;
public static final int expand_activities_button = 0x7f080024;
public static final int expanded_menu = 0x7f080025;
public static final int home = 0x7f080037;
public static final int homeAsUp = 0x7f080038;
public static final int icon = 0x7f08003a;
public static final int ifRoom = 0x7f08003b;
public static final int image = 0x7f08003c;
public static final int info = 0x7f08003e;
public static final int line1 = 0x7f08004b;
public static final int line3 = 0x7f08004c;
public static final int listMode = 0x7f08004f;
public static final int list_item = 0x7f080050;
public static final int media_actions = 0x7f080051;
public static final int middle = 0x7f080052;
public static final int multiply = 0x7f080053;
public static final int never = 0x7f080054;
public static final int none = 0x7f080055;
public static final int normal = 0x7f080056;
public static final int parentPanel = 0x7f080057;
public static final int progress_circular = 0x7f08005b;
public static final int progress_horizontal = 0x7f08005c;
public static final int radio = 0x7f08005d;
public static final int screen = 0x7f08005e;
public static final int scrollIndicatorDown = 0x7f08005f;
public static final int scrollIndicatorUp = 0x7f080060;
public static final int scrollView = 0x7f080061;
public static final int search_badge = 0x7f080062;
public static final int search_bar = 0x7f080063;
public static final int search_button = 0x7f080064;
public static final int search_close_btn = 0x7f080065;
public static final int search_edit_frame = 0x7f080066;
public static final int search_go_btn = 0x7f080067;
public static final int search_mag_icon = 0x7f080068;
public static final int search_plate = 0x7f080069;
public static final int search_src_text = 0x7f08006a;
public static final int search_voice_btn = 0x7f08006b;
public static final int select_dialog_listview = 0x7f08006c;
public static final int shortcut = 0x7f08007c;
public static final int showCustom = 0x7f080081;
public static final int showHome = 0x7f080082;
public static final int showTitle = 0x7f080083;
public static final int spacer = 0x7f080084;
public static final int split_action_bar = 0x7f080085;
public static final int src_atop = 0x7f080086;
public static final int src_in = 0x7f080087;
public static final int src_over = 0x7f080088;
public static final int status_bar_latest_event_content = 0x7f08008e;
public static final int submit_area = 0x7f08008f;
public static final int tabMode = 0x7f080090;
public static final int text = 0x7f080094;
public static final int text2 = 0x7f080095;
public static final int textSpacerNoButtons = 0x7f080096;
public static final int time = 0x7f080097;
public static final int title = 0x7f080098;
public static final int title_template = 0x7f080099;
public static final int topPanel = 0x7f0800b6;
public static final int up = 0x7f0800c8;
public static final int useLogo = 0x7f0800c9;
public static final int withText = 0x7f0800ca;
public static final int wrap_content = 0x7f0800d3;
public static final int home = 0x7f08003f;
public static final int homeAsUp = 0x7f080040;
public static final int icon = 0x7f080042;
public static final int ifRoom = 0x7f080043;
public static final int image = 0x7f080044;
public static final int info = 0x7f080046;
public static final int line1 = 0x7f080053;
public static final int line3 = 0x7f080054;
public static final int listMode = 0x7f080057;
public static final int list_item = 0x7f080058;
public static final int media_actions = 0x7f080059;
public static final int middle = 0x7f08005a;
public static final int multiply = 0x7f08005b;
public static final int never = 0x7f08005c;
public static final int none = 0x7f08005d;
public static final int normal = 0x7f08005e;
public static final int parentPanel = 0x7f08005f;
public static final int progress_circular = 0x7f080063;
public static final int progress_horizontal = 0x7f080064;
public static final int radio = 0x7f080065;
public static final int screen = 0x7f080066;
public static final int scrollIndicatorDown = 0x7f080067;
public static final int scrollIndicatorUp = 0x7f080068;
public static final int scrollView = 0x7f080069;
public static final int search_badge = 0x7f08006a;
public static final int search_bar = 0x7f08006b;
public static final int search_button = 0x7f08006c;
public static final int search_close_btn = 0x7f08006d;
public static final int search_edit_frame = 0x7f08006e;
public static final int search_go_btn = 0x7f08006f;
public static final int search_mag_icon = 0x7f080070;
public static final int search_plate = 0x7f080071;
public static final int search_src_text = 0x7f080072;
public static final int search_voice_btn = 0x7f080073;
public static final int select_dialog_listview = 0x7f080074;
public static final int shortcut = 0x7f080084;
public static final int showCustom = 0x7f080089;
public static final int showHome = 0x7f08008a;
public static final int showTitle = 0x7f08008b;
public static final int spacer = 0x7f08008c;
public static final int split_action_bar = 0x7f08008d;
public static final int src_atop = 0x7f08008e;
public static final int src_in = 0x7f08008f;
public static final int src_over = 0x7f080090;
public static final int status_bar_latest_event_content = 0x7f080096;
public static final int submit_area = 0x7f080097;
public static final int tabMode = 0x7f080098;
public static final int text = 0x7f08009a;
public static final int text2 = 0x7f08009b;
public static final int textSpacerNoButtons = 0x7f08009c;
public static final int time = 0x7f08009d;
public static final int title = 0x7f08009e;
public static final int title_template = 0x7f08009f;
public static final int topPanel = 0x7f0800bc;
public static final int up = 0x7f0800ce;
public static final int useLogo = 0x7f0800cf;
public static final int withText = 0x7f0800d0;
public static final int wrap_content = 0x7f0800d9;
}
public static final class integer {
public static final int abc_config_activityDefaultDur = 0x7f090000;
@ -586,18 +586,18 @@ public final class R {
public static final int abc_search_dropdown_item_icons_2line = 0x7f0a0016;
public static final int abc_search_view = 0x7f0a0017;
public static final int abc_select_dialog_material = 0x7f0a0018;
public static final int notification_media_action = 0x7f0a0021;
public static final int notification_media_cancel_action = 0x7f0a0022;
public static final int notification_template_big_media = 0x7f0a0023;
public static final int notification_template_big_media_narrow = 0x7f0a0024;
public static final int notification_template_lines = 0x7f0a0025;
public static final int notification_template_media = 0x7f0a0026;
public static final int notification_template_part_chronometer = 0x7f0a0027;
public static final int notification_template_part_time = 0x7f0a0028;
public static final int select_dialog_item_material = 0x7f0a002b;
public static final int select_dialog_multichoice_material = 0x7f0a002c;
public static final int select_dialog_singlechoice_material = 0x7f0a002d;
public static final int support_simple_spinner_dropdown_item = 0x7f0a0035;
public static final int notification_media_action = 0x7f0a0022;
public static final int notification_media_cancel_action = 0x7f0a0023;
public static final int notification_template_big_media = 0x7f0a0024;
public static final int notification_template_big_media_narrow = 0x7f0a0025;
public static final int notification_template_lines = 0x7f0a0026;
public static final int notification_template_media = 0x7f0a0027;
public static final int notification_template_part_chronometer = 0x7f0a0028;
public static final int notification_template_part_time = 0x7f0a0029;
public static final int select_dialog_item_material = 0x7f0a002c;
public static final int select_dialog_multichoice_material = 0x7f0a002d;
public static final int select_dialog_singlechoice_material = 0x7f0a002e;
public static final int support_simple_spinner_dropdown_item = 0x7f0a0036;
}
public static final class string {
public static final int abc_action_bar_home_description = 0x7f0d0000;
@ -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 = 0x7f0d004a;
public static final int status_bar_notification_info_overflow = 0x7f0d004c;
}
public static final class style {
public static final int AlertDialog_AppCompat = 0x7f0e0000;

View File

@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main"><source path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets"><file name="fontBaron.ttf" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\fontBaron.ttf"/><file name="levelpacks/Grasslands.xml" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\levelpacks\Grasslands.xml"/><file name="particleEffects/collectEnergy.pe" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\collectEnergy.pe"/><file name="particleEffects/collectStar.pe" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\collectStar.pe"/><file name="particleEffects/explosion.pe" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\explosion.pe"/><file name="particleEffects/firework.pe" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\firework.pe"/><file name="particleEffects/magnet.pe" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\magnet.pe"/><file name="particleEffects/particle.png" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\particle.png"/><file name="particleEffects/star.png" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\star.png"/><file name="shader/entityFragmentShader.glsl" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\shader\entityFragmentShader.glsl"/><file name="shader/entityVertexShader.glsl" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\shader\entityVertexShader.glsl"/><file name="shader/obstacleFragmentShader.glsl" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\shader\obstacleFragmentShader.glsl"/><file name="shader/particleFragmentShader.glsl" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\shader\particleFragmentShader.glsl"/><file name="shader/simpleFragmentShader.glsl" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\shader\simpleFragmentShader.glsl"/><file name="shader/simpleVertexShader.glsl" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\shader\simpleVertexShader.glsl"/><file name="shader/terrainVertexShader.glsl" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\shader\terrainVertexShader.glsl"/><file name="particleEffects/test_fire.pe" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\test_fire.pe"/><file name="particleEffects/stasis.pe" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\stasis.pe"/><file name="particleEffects/superPower.pe" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\superPower.pe"/></source><source path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\build\generated\assets\shaders\debug"/></dataSet><dataSet config="debug"><source path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\debug\assets"/></dataSet></merger>
<merger version="3"><dataSet config="main"><source path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets"><file name="fontBaron.ttf" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\fontBaron.ttf"/><file name="levelpacks/Grasslands.xml" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\levelpacks\Grasslands.xml"/><file name="particleEffects/collectEnergy.pe" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\collectEnergy.pe"/><file name="particleEffects/collectStar.pe" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\collectStar.pe"/><file name="particleEffects/explosion.pe" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\explosion.pe"/><file name="particleEffects/firework.pe" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\firework.pe"/><file name="particleEffects/magnet.pe" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\magnet.pe"/><file name="particleEffects/particle.png" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\particle.png"/><file name="particleEffects/star.png" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\star.png"/><file name="shader/entityFragmentShader.glsl" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\shader\entityFragmentShader.glsl"/><file name="shader/entityVertexShader.glsl" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\shader\entityVertexShader.glsl"/><file name="shader/obstacleFragmentShader.glsl" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\shader\obstacleFragmentShader.glsl"/><file name="shader/particleFragmentShader.glsl" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\shader\particleFragmentShader.glsl"/><file name="shader/simpleFragmentShader.glsl" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\shader\simpleFragmentShader.glsl"/><file name="shader/simpleVertexShader.glsl" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\shader\simpleVertexShader.glsl"/><file name="shader/terrainVertexShader.glsl" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\shader\terrainVertexShader.glsl"/><file name="particleEffects/test_fire.pe" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\test_fire.pe"/><file name="particleEffects/stasis.pe" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\stasis.pe"/><file name="particleEffects/superPower.pe" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\superPower.pe"/><file name="levelpacks/Icy Mountains.xml" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\levelpacks\Icy Mountains.xml"/></source><source path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\build\generated\assets\shaders\debug"/></dataSet><dataSet config="debug"><source path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\debug\assets"/></dataSet></merger>

File diff suppressed because one or more lines are too long

View File

@ -599,177 +599,183 @@ int id expanded_menu 0x7f080025
int id game_countdown 0x7f080026
int id game_fps 0x7f080027
int id game_game_over_message 0x7f080028
int id game_over_message_title 0x7f080029
int id game_over_message_to_menu 0x7f08002a
int id game_over_message_topbar 0x7f08002b
int id game_over_message_try_again 0x7f08002c
int id game_pausebutton 0x7f08002d
int id game_playerprogress 0x7f08002e
int id game_playerspeed 0x7f08002f
int id game_shortmenu 0x7f080030
int id game_toolbuttonbar 0x7f080031
int id goal_screen_bottom_layout 0x7f080032
int id goal_screen_next_level 0x7f080033
int id goal_screen_restart 0x7f080034
int id goal_screen_title 0x7f080035
int id goal_screen_topbar 0x7f080036
int id home 0x7f080037
int id homeAsUp 0x7f080038
int id horizontalScrollView 0x7f080039
int id icon 0x7f08003a
int id ifRoom 0x7f08003b
int id image 0x7f08003c
int id imageView 0x7f08003d
int id info 0x7f08003e
int id levelbutton_energy 0x7f08003f
int id levelbutton_lock 0x7f080040
int id levelbutton_star1 0x7f080041
int id levelbutton_star2 0x7f080042
int id levelbutton_star3 0x7f080043
int id levelbutton_textview 0x7f080044
int id levels_bottom_row 0x7f080045
int id levels_top_row 0x7f080046
int id levels_topbar 0x7f080047
int id levelup_level 0x7f080048
int id levelup_text 0x7f080049
int id levelup_unlocklist 0x7f08004a
int id line1 0x7f08004b
int id line3 0x7f08004c
int id linearLayout 0x7f08004d
int id linearLayout4 0x7f08004e
int id listMode 0x7f08004f
int id list_item 0x7f080050
int id media_actions 0x7f080051
int id middle 0x7f080052
int id multiply 0x7f080053
int id never 0x7f080054
int id none 0x7f080055
int id normal 0x7f080056
int id parentPanel 0x7f080057
int id price_button_currency 0x7f080058
int id price_button_price 0x7f080059
int id price_button_title 0x7f08005a
int id progress_circular 0x7f08005b
int id progress_horizontal 0x7f08005c
int id radio 0x7f08005d
int id screen 0x7f08005e
int id scrollIndicatorDown 0x7f08005f
int id scrollIndicatorUp 0x7f080060
int id scrollView 0x7f080061
int id search_badge 0x7f080062
int id search_bar 0x7f080063
int id search_button 0x7f080064
int id search_close_btn 0x7f080065
int id search_edit_frame 0x7f080066
int id search_go_btn 0x7f080067
int id search_mag_icon 0x7f080068
int id search_plate 0x7f080069
int id search_src_text 0x7f08006a
int id search_voice_btn 0x7f08006b
int id select_dialog_listview 0x7f08006c
int id settings_reset 0x7f08006d
int id settings_soundtoggle 0x7f08006e
int id settings_topbar 0x7f08006f
int id shape_button_button 0x7f080070
int id shape_button_textview 0x7f080071
int id shape_inspector_check_box 0x7f080072
int id shape_inspector_check_box_image 0x7f080073
int id shape_inspector_check_box_text 0x7f080074
int id shape_inspector_description 0x7f080075
int id shape_inspector_imageview 0x7f080076
int id shape_inspector_title 0x7f080077
int id shape_shop_bottomRow 0x7f080078
int id shape_shop_shape_inspector 0x7f080079
int id shape_shop_topRow 0x7f08007a
int id shape_shop_topbar 0x7f08007b
int id shortcut 0x7f08007c
int id shortmenu_continue 0x7f08007d
int id shortmenu_exit 0x7f08007e
int id shortmenu_restart 0x7f08007f
int id shortmenu_topbar 0x7f080080
int id showCustom 0x7f080081
int id showHome 0x7f080082
int id showTitle 0x7f080083
int id spacer 0x7f080084
int id split_action_bar 0x7f080085
int id src_atop 0x7f080086
int id src_in 0x7f080087
int id src_over 0x7f080088
int id startscreen_gain_90_ep 0x7f080089
int id startscreen_play 0x7f08008a
int id startscreen_settings 0x7f08008b
int id startscreen_to_gl_test_screen 0x7f08008c
int id startscreen_unlock_levels 0x7f08008d
int id status_bar_latest_event_content 0x7f08008e
int id submit_area 0x7f08008f
int id tabMode 0x7f080090
int id task_completed_text 0x7f080091
int id task_completed_title 0x7f080092
int id task_completed_unlock_list 0x7f080093
int id text 0x7f080094
int id text2 0x7f080095
int id textSpacerNoButtons 0x7f080096
int id time 0x7f080097
int id title 0x7f080098
int id title_template 0x7f080099
int id tool_button_animation_layer 0x7f08009a
int id tool_button_background_layer 0x7f08009b
int id tool_button_progress_bar 0x7f08009c
int id tool_inspector_description 0x7f08009d
int id tool_inspector_imageview 0x7f08009e
int id tool_inspector_level_view 0x7f08009f
int id tool_inspector_pricebutton 0x7f0800a0
int id tool_inspector_title 0x7f0800a1
int id tool_upgrade_imageview 0x7f0800a2
int id tool_upgrade_pricebutton 0x7f0800a3
int id tool_upgrade_title 0x7f0800a4
int id tool_upgrade_value_new 0x7f0800a5
int id tool_upgrade_value_old 0x7f0800a6
int id toolbutton_1 0x7f0800a7
int id toolbutton_2 0x7f0800a8
int id toolbutton_3 0x7f0800a9
int id toolbutton_4 0x7f0800aa
int id toolofferslot_slot 0x7f0800ab
int id toolofferslot_title 0x7f0800ac
int id toolshop_slot1 0x7f0800ad
int id toolshop_slot2 0x7f0800ae
int id toolshop_slot3 0x7f0800af
int id toolshop_slot4 0x7f0800b0
int id toolshop_tool_offer_bottom_row 0x7f0800b1
int id toolshop_tool_offer_top_row 0x7f0800b2
int id toolshop_toolinspector 0x7f0800b3
int id toolshop_topbar 0x7f0800b4
int id toolslot_image 0x7f0800b5
int id topPanel 0x7f0800b6
int id topbar_energycount 0x7f0800b7
int id topbar_energycount_decrease 0x7f0800b8
int id topbar_energyview 0x7f0800b9
int id topbar_layout 0x7f0800ba
int id topbar_leveldisplay 0x7f0800bb
int id topbar_levellayout 0x7f0800bc
int id topbar_levelprogress 0x7f0800bd
int id topbar_settings 0x7f0800be
int id topbar_shapeshop 0x7f0800bf
int id topbar_starcount 0x7f0800c0
int id topbar_starcount_decrease 0x7f0800c1
int id topbar_starview 0x7f0800c2
int id topbar_toolshop 0x7f0800c3
int id tutorial_image_view 0x7f0800c4
int id tutorial_text_view 0x7f0800c5
int id unlockmessage_message 0x7f0800c6
int id unlockmessage_toolimage 0x7f0800c7
int id up 0x7f0800c8
int id useLogo 0x7f0800c9
int id withText 0x7f0800ca
int id worldbutton_energycount 0x7f0800cb
int id worldbutton_levelcount 0x7f0800cc
int id worldbutton_lock 0x7f0800cd
int id worldbutton_preview 0x7f0800ce
int id worldbutton_starcount 0x7f0800cf
int id worldbutton_title 0x7f0800d0
int id worlds_layout 0x7f0800d1
int id worlds_topbar 0x7f0800d2
int id wrap_content 0x7f0800d3
int id game_goal_message 0x7f080029
int id game_over_message_title 0x7f08002a
int id game_over_message_to_menu 0x7f08002b
int id game_over_message_topbar 0x7f08002c
int id game_over_message_try_again 0x7f08002d
int id game_pausebutton 0x7f08002e
int id game_playerprogress 0x7f08002f
int id game_playerspeed 0x7f080030
int id game_shortmenu 0x7f080031
int id game_toolbuttonbar 0x7f080032
int id goal_message_bottom_layout 0x7f080033
int id goal_message_levelbutton_energy 0x7f080034
int id goal_message_levelbutton_star1 0x7f080035
int id goal_message_levelbutton_star2 0x7f080036
int id goal_message_levelbutton_star3 0x7f080037
int id goal_message_levelbutton_textview 0x7f080038
int id goal_message_mid_layout 0x7f080039
int id goal_message_next_level 0x7f08003a
int id goal_message_restart 0x7f08003b
int id goal_message_title 0x7f08003c
int id goal_message_to_menu 0x7f08003d
int id goal_message_topbar 0x7f08003e
int id home 0x7f08003f
int id homeAsUp 0x7f080040
int id horizontalScrollView 0x7f080041
int id icon 0x7f080042
int id ifRoom 0x7f080043
int id image 0x7f080044
int id imageView 0x7f080045
int id info 0x7f080046
int id levelbutton_energy 0x7f080047
int id levelbutton_lock 0x7f080048
int id levelbutton_star1 0x7f080049
int id levelbutton_star2 0x7f08004a
int id levelbutton_star3 0x7f08004b
int id levelbutton_textview 0x7f08004c
int id levels_bottom_row 0x7f08004d
int id levels_top_row 0x7f08004e
int id levels_topbar 0x7f08004f
int id levelup_level 0x7f080050
int id levelup_text 0x7f080051
int id levelup_unlocklist 0x7f080052
int id line1 0x7f080053
int id line3 0x7f080054
int id linearLayout 0x7f080055
int id linearLayout4 0x7f080056
int id listMode 0x7f080057
int id list_item 0x7f080058
int id media_actions 0x7f080059
int id middle 0x7f08005a
int id multiply 0x7f08005b
int id never 0x7f08005c
int id none 0x7f08005d
int id normal 0x7f08005e
int id parentPanel 0x7f08005f
int id price_button_currency 0x7f080060
int id price_button_price 0x7f080061
int id price_button_title 0x7f080062
int id progress_circular 0x7f080063
int id progress_horizontal 0x7f080064
int id radio 0x7f080065
int id screen 0x7f080066
int id scrollIndicatorDown 0x7f080067
int id scrollIndicatorUp 0x7f080068
int id scrollView 0x7f080069
int id search_badge 0x7f08006a
int id search_bar 0x7f08006b
int id search_button 0x7f08006c
int id search_close_btn 0x7f08006d
int id search_edit_frame 0x7f08006e
int id search_go_btn 0x7f08006f
int id search_mag_icon 0x7f080070
int id search_plate 0x7f080071
int id search_src_text 0x7f080072
int id search_voice_btn 0x7f080073
int id select_dialog_listview 0x7f080074
int id settings_reset 0x7f080075
int id settings_soundtoggle 0x7f080076
int id settings_topbar 0x7f080077
int id shape_button_button 0x7f080078
int id shape_button_textview 0x7f080079
int id shape_inspector_check_box 0x7f08007a
int id shape_inspector_check_box_image 0x7f08007b
int id shape_inspector_check_box_text 0x7f08007c
int id shape_inspector_description 0x7f08007d
int id shape_inspector_imageview 0x7f08007e
int id shape_inspector_title 0x7f08007f
int id shape_shop_bottomRow 0x7f080080
int id shape_shop_shape_inspector 0x7f080081
int id shape_shop_topRow 0x7f080082
int id shape_shop_topbar 0x7f080083
int id shortcut 0x7f080084
int id shortmenu_continue 0x7f080085
int id shortmenu_exit 0x7f080086
int id shortmenu_restart 0x7f080087
int id shortmenu_topbar 0x7f080088
int id showCustom 0x7f080089
int id showHome 0x7f08008a
int id showTitle 0x7f08008b
int id spacer 0x7f08008c
int id split_action_bar 0x7f08008d
int id src_atop 0x7f08008e
int id src_in 0x7f08008f
int id src_over 0x7f080090
int id startscreen_gain_90_ep 0x7f080091
int id startscreen_play 0x7f080092
int id startscreen_settings 0x7f080093
int id startscreen_to_gl_test_screen 0x7f080094
int id startscreen_unlock_levels 0x7f080095
int id status_bar_latest_event_content 0x7f080096
int id submit_area 0x7f080097
int id tabMode 0x7f080098
int id task_completed_unlock_list 0x7f080099
int id text 0x7f08009a
int id text2 0x7f08009b
int id textSpacerNoButtons 0x7f08009c
int id time 0x7f08009d
int id title 0x7f08009e
int id title_template 0x7f08009f
int id tool_button_animation_layer 0x7f0800a0
int id tool_button_background_layer 0x7f0800a1
int id tool_button_progress_bar 0x7f0800a2
int id tool_inspector_description 0x7f0800a3
int id tool_inspector_imageview 0x7f0800a4
int id tool_inspector_level_view 0x7f0800a5
int id tool_inspector_pricebutton 0x7f0800a6
int id tool_inspector_title 0x7f0800a7
int id tool_upgrade_imageview 0x7f0800a8
int id tool_upgrade_pricebutton 0x7f0800a9
int id tool_upgrade_title 0x7f0800aa
int id tool_upgrade_value_new 0x7f0800ab
int id tool_upgrade_value_old 0x7f0800ac
int id toolbutton_1 0x7f0800ad
int id toolbutton_2 0x7f0800ae
int id toolbutton_3 0x7f0800af
int id toolbutton_4 0x7f0800b0
int id toolofferslot_slot 0x7f0800b1
int id toolofferslot_title 0x7f0800b2
int id toolshop_slot1 0x7f0800b3
int id toolshop_slot2 0x7f0800b4
int id toolshop_slot3 0x7f0800b5
int id toolshop_slot4 0x7f0800b6
int id toolshop_tool_offer_bottom_row 0x7f0800b7
int id toolshop_tool_offer_top_row 0x7f0800b8
int id toolshop_toolinspector 0x7f0800b9
int id toolshop_topbar 0x7f0800ba
int id toolslot_image 0x7f0800bb
int id topPanel 0x7f0800bc
int id topbar_energycount 0x7f0800bd
int id topbar_energycount_decrease 0x7f0800be
int id topbar_energyview 0x7f0800bf
int id topbar_layout 0x7f0800c0
int id topbar_leveldisplay 0x7f0800c1
int id topbar_levellayout 0x7f0800c2
int id topbar_levelprogress 0x7f0800c3
int id topbar_settings 0x7f0800c4
int id topbar_shapeshop 0x7f0800c5
int id topbar_starcount 0x7f0800c6
int id topbar_starcount_decrease 0x7f0800c7
int id topbar_starview 0x7f0800c8
int id topbar_toolshop 0x7f0800c9
int id tutorial_image_view 0x7f0800ca
int id tutorial_text_view 0x7f0800cb
int id unlockmessage_message 0x7f0800cc
int id unlockmessage_toolimage 0x7f0800cd
int id up 0x7f0800ce
int id useLogo 0x7f0800cf
int id withText 0x7f0800d0
int id worldbutton_energycount 0x7f0800d1
int id worldbutton_levelcount 0x7f0800d2
int id worldbutton_lock 0x7f0800d3
int id worldbutton_preview 0x7f0800d4
int id worldbutton_starcount 0x7f0800d5
int id worldbutton_title 0x7f0800d6
int id worlds_layout 0x7f0800d7
int id worlds_topbar 0x7f0800d8
int id wrap_content 0x7f0800d9
int integer abc_config_activityDefaultDur 0x7f090000
int integer abc_config_activityShortDur 0x7f090001
int integer abc_max_action_buttons 0x7f090002
@ -804,44 +810,45 @@ int layout exit_confirm_dialog 0x7f0a0019
int layout game 0x7f0a001a
int layout game_over_message 0x7f0a001b
int layout gl_test_screen 0x7f0a001c
int layout goal_screen 0x7f0a001d
int layout levelbutton 0x7f0a001e
int layout levels 0x7f0a001f
int layout levelup_message 0x7f0a0020
int layout notification_media_action 0x7f0a0021
int layout notification_media_cancel_action 0x7f0a0022
int layout notification_template_big_media 0x7f0a0023
int layout notification_template_big_media_narrow 0x7f0a0024
int layout notification_template_lines 0x7f0a0025
int layout notification_template_media 0x7f0a0026
int layout notification_template_part_chronometer 0x7f0a0027
int layout notification_template_part_time 0x7f0a0028
int layout pre_start_screen 0x7f0a0029
int layout price_button 0x7f0a002a
int layout select_dialog_item_material 0x7f0a002b
int layout select_dialog_multichoice_material 0x7f0a002c
int layout select_dialog_singlechoice_material 0x7f0a002d
int layout settings 0x7f0a002e
int layout shape_button 0x7f0a002f
int layout shape_inspector 0x7f0a0030
int layout shape_inspector_check_box 0x7f0a0031
int layout shape_shop 0x7f0a0032
int layout short_menu 0x7f0a0033
int layout start_screen 0x7f0a0034
int layout support_simple_spinner_dropdown_item 0x7f0a0035
int layout task_completed_message 0x7f0a0036
int layout tool_inspector 0x7f0a0037
int layout tool_offer_slot 0x7f0a0038
int layout tool_slot 0x7f0a0039
int layout tool_upgrade 0x7f0a003a
int layout toolbutton 0x7f0a003b
int layout toolbuttonbar 0x7f0a003c
int layout toolshop 0x7f0a003d
int layout topbar 0x7f0a003e
int layout tutorial 0x7f0a003f
int layout unlock_message 0x7f0a0040
int layout world_button 0x7f0a0041
int layout worlds 0x7f0a0042
int layout goal_message 0x7f0a001d
int layout goal_message_levelbutton 0x7f0a001e
int layout levelbutton 0x7f0a001f
int layout levels 0x7f0a0020
int layout levelup_message 0x7f0a0021
int layout notification_media_action 0x7f0a0022
int layout notification_media_cancel_action 0x7f0a0023
int layout notification_template_big_media 0x7f0a0024
int layout notification_template_big_media_narrow 0x7f0a0025
int layout notification_template_lines 0x7f0a0026
int layout notification_template_media 0x7f0a0027
int layout notification_template_part_chronometer 0x7f0a0028
int layout notification_template_part_time 0x7f0a0029
int layout pre_start_screen 0x7f0a002a
int layout price_button 0x7f0a002b
int layout select_dialog_item_material 0x7f0a002c
int layout select_dialog_multichoice_material 0x7f0a002d
int layout select_dialog_singlechoice_material 0x7f0a002e
int layout settings 0x7f0a002f
int layout shape_button 0x7f0a0030
int layout shape_inspector 0x7f0a0031
int layout shape_inspector_check_box 0x7f0a0032
int layout shape_shop 0x7f0a0033
int layout short_menu 0x7f0a0034
int layout start_screen 0x7f0a0035
int layout support_simple_spinner_dropdown_item 0x7f0a0036
int layout task_completed_message 0x7f0a0037
int layout tool_inspector 0x7f0a0038
int layout tool_offer_slot 0x7f0a0039
int layout tool_slot 0x7f0a003a
int layout tool_upgrade 0x7f0a003b
int layout toolbutton 0x7f0a003c
int layout toolbuttonbar 0x7f0a003d
int layout toolshop 0x7f0a003e
int layout topbar 0x7f0a003f
int layout tutorial 0x7f0a0040
int layout unlock_message 0x7f0a0041
int layout world_button 0x7f0a0042
int layout worlds 0x7f0a0043
int mipmap ic_launcher 0x7f0b0000
int raw background 0x7f0c0000
int raw ramp 0x7f0c0001
@ -879,98 +886,100 @@ int string game_playerprogress_format_f 0x7f0d001e
int string game_playerprogress_placeholder 0x7f0d001f
int string game_playerspeed_format_f 0x7f0d0020
int string game_playerspeed_placeholder 0x7f0d0021
int string level_button_format_d 0x7f0d0022
int string levelup 0x7f0d0023
int string message_game_over 0x7f0d0024
int string message_level_finished 0x7f0d0025
int string message_next_level 0x7f0d0026
int string message_restart 0x7f0d0027
int string message_to_menu 0x7f0d0028
int string message_tools 0x7f0d0029
int string message_try_again 0x7f0d002a
int string placeholder_button 0x7f0d002b
int string placeholder_number 0x7f0d002c
int string placeholder_percent 0x7f0d002d
int string placeholder_textview 0x7f0d002e
int string playershape_description_ball 0x7f0d002f
int string playershape_description_clock 0x7f0d0030
int string playershape_description_hypno_spiral 0x7f0d0031
int string playershape_description_locked 0x7f0d0032
int string playershape_description_pacman 0x7f0d0033
int string playershape_description_smiley 0x7f0d0034
int string playershape_description_sun 0x7f0d0035
int string playershape_description_wheel 0x7f0d0036
int string playershape_name_ball 0x7f0d0037
int string playershape_name_clock 0x7f0d0038
int string playershape_name_hypno_spiral 0x7f0d0039
int string playershape_name_locked 0x7f0d003a
int string playershape_name_pacman 0x7f0d003b
int string playershape_name_smiley 0x7f0d003c
int string playershape_name_sun 0x7f0d003d
int string playershape_name_wheel 0x7f0d003e
int string pre_start_screen_loading 0x7f0d003f
int string price_button_buy 0x7f0d0040
int string price_button_upgrade 0x7f0d0041
int string settings_reset 0x7f0d0042
int string short_menu_continue 0x7f0d0043
int string short_menu_exit 0x7f0d0044
int string short_menu_restart 0x7f0d0045
int string start_screen_gain_90_ep 0x7f0d0046
int string start_screen_play 0x7f0d0047
int string start_screen_to_gl_test_screen 0x7f0d0048
int string start_screen_unlock_all_levels 0x7f0d0049
int string status_bar_notification_info_overflow 0x7f0d004a
int string task_collect_energy_format_d 0x7f0d004b
int string task_collect_energy_progress_format_ddd 0x7f0d004c
int string task_collect_stars_format_d 0x7f0d004d
int string task_collect_stars_progress_format_ddd 0x7f0d004e
int string task_complete_world_format_d 0x7f0d004f
int string task_completed 0x7f0d0050
int string task_empty 0x7f0d0051
int string tool_description_bomb 0x7f0d0052
int string tool_description_locked_format_d 0x7f0d0053
int string tool_description_magnet 0x7f0d0054
int string tool_description_power_mushroom 0x7f0d0055
int string tool_description_ramp 0x7f0d0056
int string tool_description_spring 0x7f0d0057
int string tool_description_stasis 0x7f0d0058
int string tool_level_format_d 0x7f0d0059
int string tool_name_bomb 0x7f0d005a
int string tool_name_locked 0x7f0d005b
int string tool_name_magnet 0x7f0d005c
int string tool_name_power_mushroom 0x7f0d005d
int string tool_name_ramp 0x7f0d005e
int string tool_name_spring 0x7f0d005f
int string tool_name_stasis 0x7f0d0060
int string tool_upgrade_force 0x7f0d0061
int string tool_upgrade_none 0x7f0d0062
int string tool_upgrade_radius 0x7f0d0063
int string tool_upgrade_time 0x7f0d0064
int string tool_upgrade_title_format_sd 0x7f0d0065
int string tool_upgrade_title_placeholder 0x7f0d0066
int string tool_upgrade_value_max 0x7f0d0067
int string topbar_level_format_d 0x7f0d0068
int string topbar_level_placeholder 0x7f0d0069
int string topbar_toolshop 0x7f0d006a
int string tutorial_leveled_up 0x7f0d006b
int string tutorial_place_ramp_air 0x7f0d006c
int string tutorial_place_ramp_air_2 0x7f0d006d
int string tutorial_place_ramp_gap 0x7f0d006e
int string tutorial_place_ramp_obstacle 0x7f0d006f
int string tutorial_place_tools 0x7f0d0070
int string tutorial_placeholder 0x7f0d0071
int string tutorial_to_toolshop 0x7f0d0072
int string tutorial_toolshop_all_tools 0x7f0d0073
int string tutorial_toolshop_equip_spring 0x7f0d0074
int string tutorial_toolshop_inspector 0x7f0d0075
int string tutorial_toolshop_select_buy_spring 0x7f0d0076
int string tutorial_toolshop_toolbar 0x7f0d0077
int string tutorial_toolshop_welcome 0x7f0d0078
int string tutorial_welcome 0x7f0d0079
int string unlock_message_placeholder 0x7f0d007a
int string world_button_count_format_dd 0x7f0d007b
int string world_button_progress_placeholder 0x7f0d007c
int string world_button_title_placeholder 0x7f0d007d
int string goal_message_next_level_format_d 0x7f0d0022
int string goal_message_restart_format_d 0x7f0d0023
int string level_button_format_d 0x7f0d0024
int string levelup 0x7f0d0025
int string message_game_over 0x7f0d0026
int string message_level_finished 0x7f0d0027
int string message_next_level 0x7f0d0028
int string message_restart 0x7f0d0029
int string message_to_menu 0x7f0d002a
int string message_tools 0x7f0d002b
int string message_try_again 0x7f0d002c
int string placeholder_button 0x7f0d002d
int string placeholder_number 0x7f0d002e
int string placeholder_percent 0x7f0d002f
int string placeholder_textview 0x7f0d0030
int string playershape_description_ball 0x7f0d0031
int string playershape_description_clock 0x7f0d0032
int string playershape_description_hypno_spiral 0x7f0d0033
int string playershape_description_locked 0x7f0d0034
int string playershape_description_pacman 0x7f0d0035
int string playershape_description_smiley 0x7f0d0036
int string playershape_description_sun 0x7f0d0037
int string playershape_description_wheel 0x7f0d0038
int string playershape_name_ball 0x7f0d0039
int string playershape_name_clock 0x7f0d003a
int string playershape_name_hypno_spiral 0x7f0d003b
int string playershape_name_locked 0x7f0d003c
int string playershape_name_pacman 0x7f0d003d
int string playershape_name_smiley 0x7f0d003e
int string playershape_name_sun 0x7f0d003f
int string playershape_name_wheel 0x7f0d0040
int string pre_start_screen_loading 0x7f0d0041
int string price_button_buy 0x7f0d0042
int string price_button_upgrade 0x7f0d0043
int string settings_reset 0x7f0d0044
int string short_menu_continue 0x7f0d0045
int string short_menu_exit 0x7f0d0046
int string short_menu_restart 0x7f0d0047
int string start_screen_gain_90_ep 0x7f0d0048
int string start_screen_play 0x7f0d0049
int string start_screen_to_gl_test_screen 0x7f0d004a
int string start_screen_unlock_all_levels 0x7f0d004b
int string status_bar_notification_info_overflow 0x7f0d004c
int string task_collect_energy_format_d 0x7f0d004d
int string task_collect_energy_progress_format_ddd 0x7f0d004e
int string task_collect_stars_format_d 0x7f0d004f
int string task_collect_stars_progress_format_ddd 0x7f0d0050
int string task_complete_world_format_d 0x7f0d0051
int string task_completed 0x7f0d0052
int string task_empty 0x7f0d0053
int string tool_description_bomb 0x7f0d0054
int string tool_description_locked_format_d 0x7f0d0055
int string tool_description_magnet 0x7f0d0056
int string tool_description_power_mushroom 0x7f0d0057
int string tool_description_ramp 0x7f0d0058
int string tool_description_spring 0x7f0d0059
int string tool_description_stasis 0x7f0d005a
int string tool_level_format_d 0x7f0d005b
int string tool_name_bomb 0x7f0d005c
int string tool_name_locked 0x7f0d005d
int string tool_name_magnet 0x7f0d005e
int string tool_name_power_mushroom 0x7f0d005f
int string tool_name_ramp 0x7f0d0060
int string tool_name_spring 0x7f0d0061
int string tool_name_stasis 0x7f0d0062
int string tool_upgrade_force 0x7f0d0063
int string tool_upgrade_none 0x7f0d0064
int string tool_upgrade_radius 0x7f0d0065
int string tool_upgrade_time 0x7f0d0066
int string tool_upgrade_title_format_sd 0x7f0d0067
int string tool_upgrade_title_placeholder 0x7f0d0068
int string tool_upgrade_value_max 0x7f0d0069
int string topbar_level_format_d 0x7f0d006a
int string topbar_level_placeholder 0x7f0d006b
int string topbar_toolshop 0x7f0d006c
int string tutorial_leveled_up 0x7f0d006d
int string tutorial_place_ramp_air 0x7f0d006e
int string tutorial_place_ramp_air_2 0x7f0d006f
int string tutorial_place_ramp_gap 0x7f0d0070
int string tutorial_place_ramp_obstacle 0x7f0d0071
int string tutorial_place_tools 0x7f0d0072
int string tutorial_placeholder 0x7f0d0073
int string tutorial_to_toolshop 0x7f0d0074
int string tutorial_toolshop_all_tools 0x7f0d0075
int string tutorial_toolshop_equip_spring 0x7f0d0076
int string tutorial_toolshop_inspector 0x7f0d0077
int string tutorial_toolshop_select_buy_spring 0x7f0d0078
int string tutorial_toolshop_toolbar 0x7f0d0079
int string tutorial_toolshop_welcome 0x7f0d007a
int string tutorial_welcome 0x7f0d007b
int string unlock_message_placeholder 0x7f0d007c
int string world_button_count_format_dd 0x7f0d007d
int string world_button_progress_placeholder 0x7f0d007e
int string world_button_title_placeholder 0x7f0d007f
int style AlertDialog_AppCompat 0x7f0e0000
int style AlertDialog_AppCompat_Light 0x7f0e0001
int style Animation_AppCompat_Dialog 0x7f0e0002

View File

@ -3,9 +3,6 @@ package de.frajul.endlessroll.entities.particles;
import java.util.Random;
import de.frajul.endlessroll.data.Vector;
import de.frajul.endlessroll.entities.particles.Particle;
import de.frajul.endlessroll.entities.particles.ParticleEffect;
import de.frajul.endlessroll.entities.particles.ParticleSource;
import de.frajul.endlessroll.main.game.Camera;
/**
@ -18,36 +15,29 @@ public class Firework {
private Camera camera;
private Random random;
public Firework(ParticleEffect effect, Camera camera){
public Firework(ParticleEffect effect, Camera camera) {
this.effect = effect;
this.camera = camera;
this.random = new Random();
}
public void start(){
public void start() {
randomExplosion(0);
randomExplosion(500);
randomExplosion(1000);
randomExplosion(2000);
randomExplosion(3500);
randomExplosion(3590);
randomExplosion(4800);
randomExplosion(5600);
randomExplosion(6900);
randomExplosion(7000);
randomExplosion(700);
}
private void randomExplosion(float delay){
private void randomExplosion(float delay) {
ParticleSource explosion = new ParticleSource(randomPosition(), effect);
explosion.setDelayMS(delay);
explosion.start();
}
private Vector randomPosition(){
private Vector randomPosition() {
float x = camera.getX() + (random.nextFloat() - 0.5f) * 2.5f;
float y = camera.getY() + (random.nextFloat() * 0.5f) - 1f;
return new Vector(x, y);
}
}

View File

@ -1,60 +0,0 @@
package de.frajul.endlessroll.main.screens;
import android.view.View;
import android.widget.LinearLayout;
import android.widget.TextView;
import java.util.HashMap;
import java.util.Map;
import de.frajul.endlessroll.R;
import de.frajul.endlessroll.levels.Level;
import de.frajul.endlessroll.levels.LevelPack;
import de.frajul.endlessroll.main.GameActivity;
import de.frajul.endlessroll.main.game.Game;
import de.frajul.endlessroll.views.LevelButton;
import de.frajul.endlessroll.views.LevelButtonOnClickListener;
import de.frajul.endlessroll.views.TopBar;
/**
* Created by Julian on 23.04.2016.
*/
public class GoalScreen extends Screen<LinearLayout> implements LevelButtonOnClickListener {
private LevelPack levelPack;
private TopBar topBar;
private TextView title;
private LevelButton restart;
private LevelButton nextLevel;
public GoalScreen(GameActivity gameActivity) {
super(ScreenType.GOAL, gameActivity, R.layout.goal_screen);
topBar = super.createTopBar(R.id.goal_screen_topbar);
title = (TextView) layout.findViewById(R.id.goal_screen_title);
title.setTypeface(gameActivity.getTypeface());
restart = new LevelButton(gameActivity, this, layout.findViewById(R.id.goal_screen_restart));
nextLevel = new LevelButton(gameActivity, this, layout.findViewById(R.id.goal_screen_next_level));
}
public void onLevelFinished(LevelPack levelPack, Level level){
this.levelPack = levelPack;
restart.init(level);
nextLevel.init(levelPack.getNextLevel(level));
}
@Override
public void prepareToBeShown() {
topBar.update();
}
@Override
public void onBackKeyDown() {
flipTo(ScreenType.LEVELS);
}
@Override
public void onClick(LevelButton levelButton) {
gameActivity.startGame(levelPack, levelButton.getLevel());
}
}

View File

@ -0,0 +1,84 @@
package de.frajul.endlessroll.views;
import android.graphics.Typeface;
import android.view.View;
import android.view.animation.Animation;
import android.view.animation.AnimationUtils;
import android.widget.Button;
import android.widget.TextView;
import de.frajul.endlessroll.R;
import de.frajul.endlessroll.levels.Level;
import de.frajul.endlessroll.levels.LevelPack;
import de.frajul.endlessroll.main.GameActivity;
import de.frajul.endlessroll.main.game.Game;
import de.frajul.endlessroll.main.screens.Screen;
/**
* Created by Julian on 23.04.2016.
*/
public class GoalMessage implements GoalMessageLevelButtonOnClickListener, View.OnClickListener {
private Game game;
private GameActivity gameActivity;
private LevelPack levelPack;
private Animation fadeIn;
private View layout;
private TopBar topBar;
private GoalMessageLevelButton restart;
private GoalMessageLevelButton nextLevel;
private Button toMenu;
public GoalMessage(Game game, GameActivity gameActivity, View layout) {
this.game = game;
this.gameActivity = gameActivity;
this.layout = layout;
Typeface typeface = gameActivity.getTypeface();
fadeIn = AnimationUtils.loadAnimation(gameActivity, R.anim.fade_in);
topBar = new TopBar(gameActivity, Screen.ScreenType.GAME,
layout.findViewById(R.id.goal_message_topbar));
TextView title = (TextView) layout.findViewById(R.id.goal_message_title);
title.setTypeface(typeface);
restart = new GoalMessageLevelButton(gameActivity, this,
layout.findViewById(R.id.goal_message_restart));
nextLevel = new GoalMessageLevelButton(gameActivity, this,
layout.findViewById(R.id.goal_message_next_level));
toMenu = (Button) layout.findViewById(R.id.goal_message_to_menu);
toMenu.setTypeface(typeface);
toMenu.setOnClickListener(this);
}
public void fadeIn(LevelPack levelPack, Level level) {
this.levelPack = levelPack;
topBar.update();
restart.init(R.string.goal_message_restart_format_d, level);
boolean nextLevelVisible = !levelPack.isLastLevel(level);
nextLevel.setVisible(nextLevelVisible);
if (nextLevelVisible)
nextLevel
.init(R.string.goal_message_next_level_format_d, levelPack.getNextLevel(level));
layout.startAnimation(fadeIn);
}
private void hide() {
layout.clearAnimation();
layout.setVisibility(View.GONE);
}
@Override
public void onClick(View v) {
if (v.equals(toMenu)) {
hide();
game.toLevelsScreen();
}
}
@Override
public void onClick(GoalMessageLevelButton goalMessageLevelButton) {
hide();
gameActivity.startGame(levelPack, goalMessageLevelButton.getLevel());
}
}

View File

@ -0,0 +1,80 @@
package de.frajul.endlessroll.views;
import android.support.annotation.LayoutRes;
import android.support.annotation.StringRes;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
import de.frajul.endlessroll.R;
import de.frajul.endlessroll.levels.Level;
import de.frajul.endlessroll.main.GameActivity;
/**
* Created by Julian on 23.04.2016.
*/
public class GoalMessageLevelButton implements View.OnClickListener {
private GameActivity gameActivity;
private GoalMessageLevelButtonOnClickListener clickListener;
private Level level;
private View layout;
private TextView text;
private ImageView star1;
private ImageView star2;
private ImageView star3;
private ImageView energy;
public GoalMessageLevelButton(GameActivity gameActivity, GoalMessageLevelButtonOnClickListener clickListener, View layout) {
this.gameActivity = gameActivity;
this.clickListener = clickListener;
this.layout = layout;
layout.setOnClickListener(this);
findViews(layout);
}
private void findViews(View layout) {
text = (TextView) layout.findViewById(R.id.goal_message_levelbutton_textview);
text.setTypeface(gameActivity.getTypeface());
star1 = (ImageView) layout.findViewById(R.id.goal_message_levelbutton_star1);
star2 = (ImageView) layout.findViewById(R.id.goal_message_levelbutton_star2);
star3 = (ImageView) layout.findViewById(R.id.goal_message_levelbutton_star3);
energy = (ImageView) layout.findViewById(R.id.goal_message_levelbutton_energy);
}
public void setVisible(boolean visible){
layout.setVisibility(visible ? View.VISIBLE : View.INVISIBLE);
}
public void init(@StringRes int textId, Level level) {
this.level = level;
text.setText(gameActivity.getString(textId, level.getId()));
showCollectedCurrency(level.getCollectedStars(), level.isEnergyCollected());
}
private void showCollectedCurrency(boolean[] stars, boolean energy) {
if (stars[0])
this.star1.setImageResource(R.drawable.currency_star);
if (stars[1])
this.star2.setImageResource(R.drawable.currency_star);
if (stars[2])
this.star3.setImageResource(R.drawable.currency_star);
if (energy)
this.energy.setImageResource(R.drawable.currency_energy);
}
public Level getLevel() {
return level;
}
public View getView(){
return layout;
}
@Override
public void onClick(View v) {
clickListener.onClick(this);
}
}

View File

@ -0,0 +1,11 @@
package de.frajul.endlessroll.views;
/**
* Created by Julian on 04.11.2017.
*/
public interface GoalMessageLevelButtonOnClickListener {
public void onClick(GoalMessageLevelButton goalMessageLevelButton);
}

View File

@ -1,24 +1,15 @@
package de.frajul.endlessroll.views;
import android.graphics.Typeface;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.FrameLayout;
import android.widget.LinearLayout;
import android.widget.TextView;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import de.frajul.endlessroll.R;
import de.frajul.endlessroll.entities.Player;
import de.frajul.endlessroll.entities.shapes.PlayerShape;
import de.frajul.endlessroll.main.GameActivity;
import de.frajul.endlessroll.main.GameLog;
import de.frajul.endlessroll.main.game.Game;
import de.frajul.endlessroll.main.screens.Screen;
/**
@ -27,51 +18,40 @@ import de.frajul.endlessroll.main.screens.Screen;
public class TaskCompletedMessage implements View.OnClickListener, BountyMessage.ScreenSwitchCaller {
private GameActivity gameActivity;
private FrameLayout layout;
private View layout;
private TextView textView;
private LinearLayout messagesLayout;
private List<PlayerShape> unlockedShapes = new ArrayList<>();
public TaskCompletedMessage(GameActivity gameActivity) {
this.gameActivity = gameActivity;
Typeface typeface = gameActivity.getTypeface();
LayoutInflater inflater = LayoutInflater.from(gameActivity);
layout = (FrameLayout) inflater.inflate(R.layout.task_completed_message, null);
layout = inflater.inflate(R.layout.task_completed_message, null);
layout.setOnClickListener(this);
layout.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
ViewGroup.LayoutParams.MATCH_PARENT));
layout.setVisibility(View.GONE);
textView = (TextView) layout.findViewById(R.id.task_completed_text);
textView.setTypeface(typeface);
TextView title = (TextView) layout.findViewById(R.id.task_completed_title);
title.setTypeface(typeface);
messagesLayout = (LinearLayout) layout.findViewById(R.id.task_completed_unlock_list);
}
public void show(List<PlayerShape> shapes) {
unlockedShapes.clear();
unlockedShapes.addAll(shapes);
showNextShape();
}
private void showNextShape() {
messagesLayout.removeAllViews();
PlayerShape shape = unlockedShapes.remove(0);
textView.setText(
shape.getUnlockTask().toString(gameActivity, gameActivity.getLevelManager()));
BountyMessage message = createBountyMessage(shape);
messagesLayout.addView(message.getLayout());
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
params.setMargins(0, 8, 0, 8);
for (PlayerShape shape : shapes)
addShapeMessage(shape, params);
layout.setVisibility(View.VISIBLE);
}
private void addShapeMessage(PlayerShape shape, LinearLayout.LayoutParams params) {
BountyMessage message = createBountyMessage(shape);
messagesLayout.addView(message.getLayout(), params);
}
private BountyMessage createBountyMessage(PlayerShape shape) {
return new BountyMessage(gameActivity, BountyMessage.MessageType.SHAPE_UNLOCKED, null, this,
BountyMessage bountyMessage = new BountyMessage(gameActivity, BountyMessage.MessageType.SHAPE_UNLOCKED, null, this,
shape.getDrawableId());
return bountyMessage;
}
private void hide() {
@ -79,19 +59,15 @@ public class TaskCompletedMessage implements View.OnClickListener, BountyMessage
messagesLayout.removeAllViews();
}
public FrameLayout getLayout() {
public View getLayout() {
return layout;
}
@Override
public void onClick(View v) {
if (unlockedShapes.isEmpty())
hide();
else
showNextShape();
hide();
}
@Override
public void switchScreen(Screen.ScreenType screenType) {
gameActivity.flipToScreen(screenType);

View File

@ -4,13 +4,14 @@
<shape android:shape="rectangle">
<corners android:radius="10dp"/>
<padding android:bottom="0dp" android:left="5dp" android:right="5dp" android:top="0dp"/>
<solid android:color="#96ffffff"/> </shape>
<solid android:color="#3cffffff"/>
</shape>
</item>
<item android:state_pressed="true">
<shape android:shape="rectangle">
<corners android:radius="10dp"/>
<padding android:bottom="0dp" android:left="5dp" android:right="5dp" android:top="0dp"/>
<solid android:color="#96a7a7a7"/> </shape>
<solid android:color="#3ca7a7a7"/>
</shape>
</item>
</selector>

View File

@ -72,6 +72,15 @@
android:layout_centerVertical="true"
android:visibility="invisible"/>
<include
android:id="@+id/game_goal_message"
layout="@layout/goal_message"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:visibility="invisible"/>
<TextView
android:id="@+id/game_countdown"
android:layout_width="wrap_content"

View File

@ -2,11 +2,11 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/backgrounds_menu_grass"
android:background="@color/background_levelup_message"
android:orientation="vertical">
<include
android:id="@+id/goal_screen_topbar"
android:id="@+id/goal_message_topbar"
layout="@layout/topbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
@ -18,40 +18,55 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@id/goal_screen_bottom_layout">
android:layout_above="@id/goal_message_mid_layout">
<Button
android:id="@+id/goal_message_to_menu"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="@string/message_to_menu"
android:textColor="@color/message_views"
android:background="@drawable/xml_background_game_over_message_button"
android:textSize="40sp"/>
</RelativeLayout>
<RelativeLayout
android:id="@+id/goal_message_mid_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerInParent="true">
<TextView
android:id="@+id/goal_screen_title"
android:id="@+id/goal_message_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="@string/message_level_finished"
android:textColor="@color/level_finished"
android:textSize="55sp"/>
</RelativeLayout>
<RelativeLayout
android:id="@+id/goal_screen_bottom_layout"
android:id="@+id/goal_message_bottom_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true">
android:layout_alignParentBottom="true"
android:layout_margin="5dp">
<include
android:id="@+id/goal_screen_restart"
layout="@layout/levelbutton"
android:id="@+id/goal_message_restart"
layout="@layout/goal_message_levelbutton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_margin="5dp"/>
android:layout_alignParentStart="true"/>
<include
android:id="@+id/goal_screen_next_level"
layout="@layout/levelbutton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/goal_message_next_level"
layout="@layout/goal_message_levelbutton"
android:layout_alignParentEnd="true"
android:layout_margin="5dp"/>
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</RelativeLayout>
</RelativeLayout>

View File

@ -0,0 +1,54 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/xml_background_game_over_message_button"
android:orientation="vertical">
<TextView
android:id="@+id/goal_message_levelbutton_textview"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/placeholder_textview"
android:textSize="30sp"
android:textColor="@color/message_views"
android:layout_gravity="center_horizontal"
android:textAlignment="center"/>
<LinearLayout
android:orientation="horizontal"
android:layout_width="140dp"
android:layout_height="40dp"
android:layout_gravity="center_horizontal">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/currency_star_empty"
android:id="@+id/goal_message_levelbutton_star1"
android:layout_weight="1"/>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/currency_star_empty"
android:id="@+id/goal_message_levelbutton_star2"
android:layout_weight="1"/>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/currency_star_empty"
android:id="@+id/goal_message_levelbutton_star3"
android:layout_weight="1"/>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/currency_energy_empty"
android:id="@+id/goal_message_levelbutton_energy"
android:layout_weight="1"/>
</LinearLayout>
</LinearLayout>

View File

@ -2,7 +2,6 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:background="@drawable/xml_background_levelbutton"
android:layout_margin="10dp">

View File

@ -1,45 +1,54 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/background_short_menu">
android:background="@color/background_short_menu"
android:orientation="vertical">
<include
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/shortmenu_topbar"
layout="@layout/topbar"
android:layout_gravity="center_horizontal"
android:id="@+id/shortmenu_topbar"/>
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center_horizontal">
android:layout_height="wrap_content"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/short_menu_continue"
android:textSize="40sp"
android:textColor="@color/level_finished"
android:id="@+id/shortmenu_continue"/>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
android:layout_width="wrap_content"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/message_restart"
android:textSize="40sp"
android:textColor="@color/level_finished"
android:id="@+id/shortmenu_restart"/>
android:layout_centerInParent="true"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/short_menu_exit"
android:textSize="40sp"
android:textColor="@color/level_finished"
android:id="@+id/shortmenu_exit"/>
</LinearLayout>
</FrameLayout>
<TextView
android:id="@+id/shortmenu_continue"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="@string/short_menu_continue"
android:textColor="@color/level_finished"
android:textSize="40sp"/>
<TextView
android:id="@+id/shortmenu_restart"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="@string/message_restart"
android:textColor="@color/level_finished"
android:textSize="40sp"/>
<TextView
android:id="@+id/shortmenu_exit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="@string/short_menu_exit"
android:textColor="@color/level_finished"
android:textSize="40sp"/>
</LinearLayout>
</RelativeLayout>
</LinearLayout>

View File

@ -1,56 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="@color/background_levelup_message">
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:id="@+id/task_completed_unlock_list"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:orientation="vertical">
android:layout_centerInParent="true"
android:orientation="vertical"/>
<TextView
android:id="@+id/task_completed_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="@string/task_completed"
android:textColor="#ffae00"
android:textSize="45sp"
android:textStyle="bold"
android:layout_marginBottom="-10dp"/>
<TextView
android:id="@+id/task_completed_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="@string/placeholder_textview"
android:textColor="#ffe100"
android:textSize="35sp"
android:textStyle="bold"/>
<ImageView
android:layout_width="400dp"
android:layout_height="10dp"
android:id="@+id/imageView"
android:layout_gravity="center_horizontal"
android:src="@drawable/guis_splitter"
android:layout_marginTop="10dp"/>
<LinearLayout
android:id="@+id/task_completed_unlock_list"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:orientation="vertical"
android:layout_marginTop="10dp"
android:layout_marginRight="0dp">
</LinearLayout>
</LinearLayout>
</FrameLayout>
</RelativeLayout>

View File

@ -21,6 +21,8 @@
<string name="message_try_again">Try again</string>
<string name="message_restart">Restart</string>
<string name="message_next_level">Next level</string>
<string name="goal_message_restart_format_d">Restart Level %d</string>
<string name="goal_message_next_level_format_d">Next Level: %d</string>
<string name="pre_start_screen_loading">LOADING...</string>
<string name="short_menu_continue">Continue</string>
<string name="short_menu_restart">Restart</string>