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

Changed particle effects

Browse Source 
Message renamed to GameOverMessage + improved look
Added first implementation of GoalScreen
Cleaned up and improved look of levelButton, worldButton and their screens
This commit is contained in:
= 2017-11-04 17:28:46 +01:00
parent 4e758353b8
commit 8d4caeaf69
37 changed files with 825 additions and 689 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

240
app/build/generated/source/r/debug/android/support/v7/appcompat/R.java
View File

@ -258,56 +258,56 @@ public final class R {
public static final int background_floating_material_light = 0x7f050011; public static final int background_floating_material_light = 0x7f050011;
public static final int background_material_dark = 0x7f050013; public static final int background_material_dark = 0x7f050013;
public static final int background_material_light = 0x7f050014; public static final int background_material_light = 0x7f050014;
public static final int bright_foreground_disabled_material_dark = 0x7f050016; public static final int bright_foreground_disabled_material_dark = 0x7f050017;
public static final int bright_foreground_disabled_material_light = 0x7f050017; public static final int bright_foreground_disabled_material_light = 0x7f050018;
public static final int bright_foreground_inverse_material_dark = 0x7f050018; public static final int bright_foreground_inverse_material_dark = 0x7f050019;
public static final int bright_foreground_inverse_material_light = 0x7f050019; public static final int bright_foreground_inverse_material_light = 0x7f05001a;
public static final int bright_foreground_material_dark = 0x7f05001a; public static final int bright_foreground_material_dark = 0x7f05001b;
public static final int bright_foreground_material_light = 0x7f05001b; public static final int bright_foreground_material_light = 0x7f05001c;
public static final int button_material_dark = 0x7f05001c; public static final int button_material_dark = 0x7f05001d;
public static final int button_material_light = 0x7f05001d; public static final int button_material_light = 0x7f05001e;
public static final int dim_foreground_disabled_material_dark = 0x7f050021; public static final int dim_foreground_disabled_material_dark = 0x7f050022;
public static final int dim_foreground_disabled_material_light = 0x7f050022; public static final int dim_foreground_disabled_material_light = 0x7f050023;
public static final int dim_foreground_material_dark = 0x7f050023; public static final int dim_foreground_material_dark = 0x7f050024;
public static final int dim_foreground_material_light = 0x7f050024; public static final int dim_foreground_material_light = 0x7f050025;
public static final int foreground_material_dark = 0x7f050025; public static final int foreground_material_dark = 0x7f050026;
public static final int foreground_material_light = 0x7f050026; public static final int foreground_material_light = 0x7f050027;
public static final int highlighted_text_material_dark = 0x7f050028; public static final int highlighted_text_material_dark = 0x7f05002a;
public static final int highlighted_text_material_light = 0x7f050029; public static final int highlighted_text_material_light = 0x7f05002b;
public static final int hint_foreground_material_dark = 0x7f05002a; public static final int hint_foreground_material_dark = 0x7f05002c;
public static final int hint_foreground_material_light = 0x7f05002b; public static final int hint_foreground_material_light = 0x7f05002d;
public static final int material_blue_grey_800 = 0x7f05002d; public static final int material_blue_grey_800 = 0x7f05002f;
public static final int material_blue_grey_900 = 0x7f05002e; public static final int material_blue_grey_900 = 0x7f050030;
public static final int material_blue_grey_950 = 0x7f05002f; public static final int material_blue_grey_950 = 0x7f050031;
public static final int material_deep_teal_200 = 0x7f050030; public static final int material_deep_teal_200 = 0x7f050032;
public static final int material_deep_teal_500 = 0x7f050031; public static final int material_deep_teal_500 = 0x7f050033;
public static final int material_grey_100 = 0x7f050032; public static final int material_grey_100 = 0x7f050034;
public static final int material_grey_300 = 0x7f050033; public static final int material_grey_300 = 0x7f050035;
public static final int material_grey_50 = 0x7f050034; public static final int material_grey_50 = 0x7f050036;
public static final int material_grey_600 = 0x7f050035; public static final int material_grey_600 = 0x7f050037;
public static final int material_grey_800 = 0x7f050036; public static final int material_grey_800 = 0x7f050038;
public static final int material_grey_850 = 0x7f050037; public static final int material_grey_850 = 0x7f050039;
public static final int material_grey_900 = 0x7f050038; public static final int material_grey_900 = 0x7f05003a;
public static final int primary_dark_material_dark = 0x7f05003a; public static final int primary_dark_material_dark = 0x7f05003c;
public static final int primary_dark_material_light = 0x7f05003b; public static final int primary_dark_material_light = 0x7f05003d;
public static final int primary_material_dark = 0x7f05003c; public static final int primary_material_dark = 0x7f05003e;
public static final int primary_material_light = 0x7f05003d; public static final int primary_material_light = 0x7f05003f;
public static final int primary_text_default_material_dark = 0x7f05003e; public static final int primary_text_default_material_dark = 0x7f050040;
public static final int primary_text_default_material_light = 0x7f05003f; public static final int primary_text_default_material_light = 0x7f050041;
public static final int primary_text_disabled_material_dark = 0x7f050040; public static final int primary_text_disabled_material_dark = 0x7f050042;
public static final int primary_text_disabled_material_light = 0x7f050041; public static final int primary_text_disabled_material_light = 0x7f050043;
public static final int ripple_material_dark = 0x7f050043; public static final int ripple_material_dark = 0x7f050045;
public static final int ripple_material_light = 0x7f050044; public static final int ripple_material_light = 0x7f050046;
public static final int secondary_text_default_material_dark = 0x7f050045; public static final int secondary_text_default_material_dark = 0x7f050047;
public static final int secondary_text_default_material_light = 0x7f050046; public static final int secondary_text_default_material_light = 0x7f050048;
public static final int secondary_text_disabled_material_dark = 0x7f050047; public static final int secondary_text_disabled_material_dark = 0x7f050049;
public static final int secondary_text_disabled_material_light = 0x7f050048; public static final int secondary_text_disabled_material_light = 0x7f05004a;
public static final int switch_thumb_disabled_material_dark = 0x7f050049; public static final int switch_thumb_disabled_material_dark = 0x7f05004b;
public static final int switch_thumb_disabled_material_light = 0x7f05004a; public static final int switch_thumb_disabled_material_light = 0x7f05004c;
public static final int switch_thumb_material_dark = 0x7f05004b; public static final int switch_thumb_material_dark = 0x7f05004d;
public static final int switch_thumb_material_light = 0x7f05004c; public static final int switch_thumb_material_light = 0x7f05004e;
public static final int switch_thumb_normal_material_dark = 0x7f05004d; public static final int switch_thumb_normal_material_dark = 0x7f05004f;
public static final int switch_thumb_normal_material_light = 0x7f05004e; public static final int switch_thumb_normal_material_light = 0x7f050050;
} }
public static final class dimen { public static final class dimen {
public static final int abc_action_bar_content_inset_material = 0x7f060000; public static final int abc_action_bar_content_inset_material = 0x7f060000;
@ -494,64 +494,64 @@ public final class R {
public static final int end_padder = 0x7f080020; public static final int end_padder = 0x7f080020;
public static final int expand_activities_button = 0x7f080024; public static final int expand_activities_button = 0x7f080024;
public static final int expanded_menu = 0x7f080025; public static final int expanded_menu = 0x7f080025;
public static final int home = 0x7f08002e; public static final int home = 0x7f080037;
public static final int homeAsUp = 0x7f08002f; public static final int homeAsUp = 0x7f080038;
public static final int icon = 0x7f080031; public static final int icon = 0x7f08003a;
public static final int ifRoom = 0x7f080032; public static final int ifRoom = 0x7f08003b;
public static final int image = 0x7f080033; public static final int image = 0x7f08003c;
public static final int info = 0x7f080036; public static final int info = 0x7f08003e;
public static final int line1 = 0x7f080044; public static final int line1 = 0x7f08004b;
public static final int line3 = 0x7f080045; public static final int line3 = 0x7f08004c;
public static final int listMode = 0x7f080048; public static final int listMode = 0x7f08004f;
public static final int list_item = 0x7f080049; public static final int list_item = 0x7f080050;
public static final int media_actions = 0x7f08004a; public static final int media_actions = 0x7f080051;
public static final int middle = 0x7f080050; public static final int middle = 0x7f080052;
public static final int multiply = 0x7f080051; public static final int multiply = 0x7f080053;
public static final int never = 0x7f080052; public static final int never = 0x7f080054;
public static final int none = 0x7f080053; public static final int none = 0x7f080055;
public static final int normal = 0x7f080054; public static final int normal = 0x7f080056;
public static final int parentPanel = 0x7f080055; public static final int parentPanel = 0x7f080057;
public static final int progress_circular = 0x7f080059; public static final int progress_circular = 0x7f08005b;
public static final int progress_horizontal = 0x7f08005a; public static final int progress_horizontal = 0x7f08005c;
public static final int radio = 0x7f08005b; public static final int radio = 0x7f08005d;
public static final int screen = 0x7f08005c; public static final int screen = 0x7f08005e;
public static final int scrollIndicatorDown = 0x7f08005d; public static final int scrollIndicatorDown = 0x7f08005f;
public static final int scrollIndicatorUp = 0x7f08005e; public static final int scrollIndicatorUp = 0x7f080060;
public static final int scrollView = 0x7f08005f; public static final int scrollView = 0x7f080061;
public static final int search_badge = 0x7f080060; public static final int search_badge = 0x7f080062;
public static final int search_bar = 0x7f080061; public static final int search_bar = 0x7f080063;
public static final int search_button = 0x7f080062; public static final int search_button = 0x7f080064;
public static final int search_close_btn = 0x7f080063; public static final int search_close_btn = 0x7f080065;
public static final int search_edit_frame = 0x7f080064; public static final int search_edit_frame = 0x7f080066;
public static final int search_go_btn = 0x7f080065; public static final int search_go_btn = 0x7f080067;
public static final int search_mag_icon = 0x7f080066; public static final int search_mag_icon = 0x7f080068;
public static final int search_plate = 0x7f080067; public static final int search_plate = 0x7f080069;
public static final int search_src_text = 0x7f080068; public static final int search_src_text = 0x7f08006a;
public static final int search_voice_btn = 0x7f080069; public static final int search_voice_btn = 0x7f08006b;
public static final int select_dialog_listview = 0x7f08006a; public static final int select_dialog_listview = 0x7f08006c;
public static final int shortcut = 0x7f08007a; public static final int shortcut = 0x7f08007c;
public static final int showCustom = 0x7f08007f; public static final int showCustom = 0x7f080081;
public static final int showHome = 0x7f080080; public static final int showHome = 0x7f080082;
public static final int showTitle = 0x7f080081; public static final int showTitle = 0x7f080083;
public static final int spacer = 0x7f080082; public static final int spacer = 0x7f080084;
public static final int split_action_bar = 0x7f080083; public static final int split_action_bar = 0x7f080085;
public static final int src_atop = 0x7f080084; public static final int src_atop = 0x7f080086;
public static final int src_in = 0x7f080085; public static final int src_in = 0x7f080087;
public static final int src_over = 0x7f080086; public static final int src_over = 0x7f080088;
public static final int status_bar_latest_event_content = 0x7f08008c; public static final int status_bar_latest_event_content = 0x7f08008e;
public static final int submit_area = 0x7f08008d; public static final int submit_area = 0x7f08008f;
public static final int tabMode = 0x7f08008e; public static final int tabMode = 0x7f080090;
public static final int text = 0x7f080092; public static final int text = 0x7f080094;
public static final int text2 = 0x7f080093; public static final int text2 = 0x7f080095;
public static final int textSpacerNoButtons = 0x7f080094; public static final int textSpacerNoButtons = 0x7f080096;
public static final int time = 0x7f080095; public static final int time = 0x7f080097;
public static final int title = 0x7f080096; public static final int title = 0x7f080098;
public static final int title_template = 0x7f080097; public static final int title_template = 0x7f080099;
public static final int topPanel = 0x7f0800b4; public static final int topPanel = 0x7f0800b6;
public static final int up = 0x7f0800c6; public static final int up = 0x7f0800c8;
public static final int useLogo = 0x7f0800c7; public static final int useLogo = 0x7f0800c9;
public static final int withText = 0x7f0800c8; public static final int withText = 0x7f0800ca;
public static final int wrap_content = 0x7f0800d2; public static final int wrap_content = 0x7f0800d3;
} }
public static final class integer { public static final class integer {
public static final int abc_config_activityDefaultDur = 0x7f090000; 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_dropdown_item_icons_2line = 0x7f0a0016;
public static final int abc_search_view = 0x7f0a0017; public static final int abc_search_view = 0x7f0a0017;
public static final int abc_select_dialog_material = 0x7f0a0018; public static final int abc_select_dialog_material = 0x7f0a0018;
public static final int notification_media_action = 0x7f0a0020; public static final int notification_media_action = 0x7f0a0021;
public static final int notification_media_cancel_action = 0x7f0a0021; public static final int notification_media_cancel_action = 0x7f0a0022;
public static final int notification_template_big_media = 0x7f0a0022; public static final int notification_template_big_media = 0x7f0a0023;
public static final int notification_template_big_media_narrow = 0x7f0a0023; public static final int notification_template_big_media_narrow = 0x7f0a0024;
public static final int notification_template_lines = 0x7f0a0024; public static final int notification_template_lines = 0x7f0a0025;
public static final int notification_template_media = 0x7f0a0025; public static final int notification_template_media = 0x7f0a0026;
public static final int notification_template_part_chronometer = 0x7f0a0026; public static final int notification_template_part_chronometer = 0x7f0a0027;
public static final int notification_template_part_time = 0x7f0a0027; public static final int notification_template_part_time = 0x7f0a0028;
public static final int select_dialog_item_material = 0x7f0a002a; public static final int select_dialog_item_material = 0x7f0a002b;
public static final int select_dialog_multichoice_material = 0x7f0a002b; public static final int select_dialog_multichoice_material = 0x7f0a002c;
public static final int select_dialog_singlechoice_material = 0x7f0a002c; public static final int select_dialog_singlechoice_material = 0x7f0a002d;
public static final int support_simple_spinner_dropdown_item = 0x7f0a0034; public static final int support_simple_spinner_dropdown_item = 0x7f0a0035;
} }
public static final class string { public static final class string {
public static final int abc_action_bar_home_description = 0x7f0d0000; public static final int abc_action_bar_home_description = 0x7f0d0000;

12
app/build/intermediates/assets/debug/particleEffects/collectStar.pe
View File

@ -38,7 +38,7 @@ active: false
- Y Offset - - Y Offset -
active: false active: false
- Spawn Shape - - Spawn Shape -
spawnShape: point shape: point
- Spawn Width - - Spawn Width -
lowMin: 0.0 lowMin: 0.0
lowMax: 0.0 lowMax: 0.0
@ -110,20 +110,16 @@ active: false
- Gravity - - Gravity -
active: false active: false
- Tint - - Tint -
colorsCount: 9 colorsCount: 6
colors0: 1.0 colors0: 1.0
colors1: 0.92941177 colors1: 0.92941177
colors2: 0.047058824 colors2: 0.047058824
colors3: 1.0 colors3: 1.0
colors4: 0.92941177 colors4: 0.92941177
colors5: 0.047058824 colors5: 0.047058824
colors6: 1.0 timelineCount: 2
colors7: 0.78039217
colors8: 0.047058824
timelineCount: 3
timeline0: 0.0 timeline0: 0.0
timeline1: 0.7521515 timeline1: 1.0
timeline2: 1.0
- Transparency - - Transparency -
lowMin: 0.0 lowMin: 0.0
lowMax: 0.0 lowMax: 0.0

2
app/build/intermediates/assets/debug/particleEffects/explosion.pe
View File

@ -44,7 +44,7 @@ active: false
- Y Offset - - Y Offset -
active: false active: false
- Spawn Shape - - Spawn Shape -
spawnShape: square shape: square
- Spawn Width - - Spawn Width -
lowMin: 200.0 lowMin: 200.0
lowMax: 200.0 lowMax: 200.0

2
app/build/intermediates/assets/debug/particleEffects/magnet.pe
View File

@ -38,7 +38,7 @@ active: false
- Y Offset - - Y Offset -
active: false active: false
- Spawn Shape - - Spawn Shape -
spawnShape: point shape: point
- Spawn Width - - Spawn Width -
lowMin: 0.0 lowMin: 0.0
lowMax: 0.0 lowMax: 0.0

2
app/build/intermediates/incremental/mergeDebugAssets/merger.xml
View File

@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?> <?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/fire.pe" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\fire.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"/></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"/></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>

6
app/build/intermediates/incremental/mergeDebugResources/merger.xml
View File

File diff suppressed because one or more lines are too long

1
app/build/intermediates/manifests/full/debug/AndroidManifest.xml
View File

@ -18,6 +18,7 @@
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:label="@string/app_name" android:label="@string/app_name"
android:supportsRtl="true" android:supportsRtl="true"
android:testOnly="true"
android:theme="@style/AppTheme" > android:theme="@style/AppTheme" >
<activity <activity
android:name="de.frajul.endlessroll.main.GameActivity" android:name="de.frajul.endlessroll.main.GameActivity"

624
app/build/intermediates/symbols/debug/R.txt
View File

@ -257,73 +257,74 @@ int color background_levelup_message 0x7f050012
int color background_material_dark 0x7f050013 int color background_material_dark 0x7f050013
int color background_material_light 0x7f050014 int color background_material_light 0x7f050014
int color background_short_menu 0x7f050015 int color background_short_menu 0x7f050015
int color bright_foreground_disabled_material_dark 0x7f050016 int color background_tutorial 0x7f050016
int color bright_foreground_disabled_material_light 0x7f050017 int color bright_foreground_disabled_material_dark 0x7f050017
int color bright_foreground_inverse_material_dark 0x7f050018 int color bright_foreground_disabled_material_light 0x7f050018
int color bright_foreground_inverse_material_light 0x7f050019 int color bright_foreground_inverse_material_dark 0x7f050019
int color bright_foreground_material_dark 0x7f05001a int color bright_foreground_inverse_material_light 0x7f05001a
int color bright_foreground_material_light 0x7f05001b int color bright_foreground_material_dark 0x7f05001b
int color button_material_dark 0x7f05001c int color bright_foreground_material_light 0x7f05001c
int color button_material_light 0x7f05001d int color button_material_dark 0x7f05001d
int color countdown1 0x7f05001e int color button_material_light 0x7f05001e
int color countdown2 0x7f05001f int color countdown1 0x7f05001f
int color countdown3 0x7f050020 int color countdown2 0x7f050020
int color dim_foreground_disabled_material_dark 0x7f050021 int color countdown3 0x7f050021
int color dim_foreground_disabled_material_light 0x7f050022 int color dim_foreground_disabled_material_dark 0x7f050022
int color dim_foreground_material_dark 0x7f050023 int color dim_foreground_disabled_material_light 0x7f050023
int color dim_foreground_material_light 0x7f050024 int color dim_foreground_material_dark 0x7f050024
int color foreground_material_dark 0x7f050025 int color dim_foreground_material_light 0x7f050025
int color foreground_material_light 0x7f050026 int color foreground_material_dark 0x7f050026
int color game_progress_text 0x7f050027 int color foreground_material_light 0x7f050027
int color highlighted_text_material_dark 0x7f050028 int color game_over 0x7f050028
int color highlighted_text_material_light 0x7f050029 int color game_progress_text 0x7f050029
int color hint_foreground_material_dark 0x7f05002a int color highlighted_text_material_dark 0x7f05002a
int color hint_foreground_material_light 0x7f05002b int color highlighted_text_material_light 0x7f05002b
int color loose 0x7f05002c int color hint_foreground_material_dark 0x7f05002c
int color material_blue_grey_800 0x7f05002d int color hint_foreground_material_light 0x7f05002d
int color material_blue_grey_900 0x7f05002e int color level_finished 0x7f05002e
int color material_blue_grey_950 0x7f05002f int color material_blue_grey_800 0x7f05002f
int color material_deep_teal_200 0x7f050030 int color material_blue_grey_900 0x7f050030
int color material_deep_teal_500 0x7f050031 int color material_blue_grey_950 0x7f050031
int color material_grey_100 0x7f050032 int color material_deep_teal_200 0x7f050032
int color material_grey_300 0x7f050033 int color material_deep_teal_500 0x7f050033
int color material_grey_50 0x7f050034 int color material_grey_100 0x7f050034
int color material_grey_600 0x7f050035 int color material_grey_300 0x7f050035
int color material_grey_800 0x7f050036 int color material_grey_50 0x7f050036
int color material_grey_850 0x7f050037 int color material_grey_600 0x7f050037
int color material_grey_900 0x7f050038 int color material_grey_800 0x7f050038
int color message_views 0x7f050039 int color material_grey_850 0x7f050039
int color primary_dark_material_dark 0x7f05003a int color material_grey_900 0x7f05003a
int color primary_dark_material_light 0x7f05003b int color message_views 0x7f05003b
int color primary_material_dark 0x7f05003c int color primary_dark_material_dark 0x7f05003c
int color primary_material_light 0x7f05003d int color primary_dark_material_light 0x7f05003d
int color primary_text_default_material_dark 0x7f05003e int color primary_material_dark 0x7f05003e
int color primary_text_default_material_light 0x7f05003f int color primary_material_light 0x7f05003f
int color primary_text_disabled_material_dark 0x7f050040 int color primary_text_default_material_dark 0x7f050040
int color primary_text_disabled_material_light 0x7f050041 int color primary_text_default_material_light 0x7f050041
int color retry 0x7f050042 int color primary_text_disabled_material_dark 0x7f050042
int color ripple_material_dark 0x7f050043 int color primary_text_disabled_material_light 0x7f050043
int color ripple_material_light 0x7f050044 int color retry 0x7f050044
int color secondary_text_default_material_dark 0x7f050045 int color ripple_material_dark 0x7f050045
int color secondary_text_default_material_light 0x7f050046 int color ripple_material_light 0x7f050046
int color secondary_text_disabled_material_dark 0x7f050047 int color secondary_text_default_material_dark 0x7f050047
int color secondary_text_disabled_material_light 0x7f050048 int color secondary_text_default_material_light 0x7f050048
int color switch_thumb_disabled_material_dark 0x7f050049 int color secondary_text_disabled_material_dark 0x7f050049
int color switch_thumb_disabled_material_light 0x7f05004a int color secondary_text_disabled_material_light 0x7f05004a
int color switch_thumb_material_dark 0x7f05004b int color switch_thumb_disabled_material_dark 0x7f05004b
int color switch_thumb_material_light 0x7f05004c int color switch_thumb_disabled_material_light 0x7f05004c
int color switch_thumb_normal_material_dark 0x7f05004d int color switch_thumb_material_dark 0x7f05004d
int color switch_thumb_normal_material_light 0x7f05004e int color switch_thumb_material_light 0x7f05004e
int color toolbuttonActiveNotReady 0x7f05004f int color switch_thumb_normal_material_dark 0x7f05004f
int color toolbuttonActiveReady 0x7f050050 int color switch_thumb_normal_material_light 0x7f050050
int color toolbuttonInactiveNotReady 0x7f050051 int color toolbuttonActiveNotReady 0x7f050051
int color toolbuttonInactiveReady 0x7f050052 int color toolbuttonActiveReady 0x7f050052
int color toolbuttonLocked 0x7f050053 int color toolbuttonInactiveNotReady 0x7f050053
int color toolslotDisabled 0x7f050054 int color toolbuttonInactiveReady 0x7f050054
int color toolslotDisabledSelected 0x7f050055 int color toolbuttonLocked 0x7f050055
int color toolslotEnabled 0x7f050056 int color toolslotDisabled 0x7f050056
int color toolslotEnabledSelected 0x7f050057 int color toolslotDisabledSelected 0x7f050057
int color win 0x7f050058 int color toolslotEnabled 0x7f050058
int color toolslotEnabledSelected 0x7f050059
int dimen abc_action_bar_content_inset_material 0x7f060000 int dimen abc_action_bar_content_inset_material 0x7f060000
int dimen abc_action_bar_default_height_material 0x7f060001 int dimen abc_action_bar_default_height_material 0x7f060001
int dimen abc_action_bar_default_padding_end_material 0x7f060002 int dimen abc_action_bar_default_padding_end_material 0x7f060002
@ -529,11 +530,11 @@ int drawable tools_spring_button 0x7f07007a
int drawable tools_stasis 0x7f07007b int drawable tools_stasis 0x7f07007b
int drawable tools_stasis_button 0x7f07007c int drawable tools_stasis_button 0x7f07007c
int drawable tutorial_place_ramp_air_1 0x7f07007d int drawable tutorial_place_ramp_air_1 0x7f07007d
int drawable tutorial_place_ramp_gap 0x7f07007e int drawable tutorial_place_ramp_air_2 0x7f07007e
int drawable tutorial_place_ramp_obstacle 0x7f07007f int drawable tutorial_place_ramp_gap 0x7f07007f
int drawable tutorial_place_tools 0x7f070080 int drawable tutorial_place_ramp_obstacle 0x7f070080
int drawable tutorial_to_toolshop 0x7f070081 int drawable tutorial_place_tools 0x7f070081
int drawable tutorial_toolbar 0x7f070082 int drawable tutorial_to_toolshop 0x7f070082
int drawable tutorial_toolshop_all_tools 0x7f070083 int drawable tutorial_toolshop_all_tools 0x7f070083
int drawable tutorial_toolshop_equip_spring 0x7f070084 int drawable tutorial_toolshop_equip_spring 0x7f070084
int drawable tutorial_toolshop_inspector 0x7f070085 int drawable tutorial_toolshop_inspector 0x7f070085
@ -543,19 +544,20 @@ int drawable world_previews_grass 0x7f070088
int drawable xml_background_bountymessage 0x7f070089 int drawable xml_background_bountymessage 0x7f070089
int drawable xml_background_dialog_button 0x7f07008a int drawable xml_background_dialog_button 0x7f07008a
int drawable xml_background_exit_confirm_dialog 0x7f07008b int drawable xml_background_exit_confirm_dialog 0x7f07008b
int drawable xml_background_levelbutton 0x7f07008c int drawable xml_background_game_over_message_button 0x7f07008c
int drawable xml_background_toolslot 0x7f07008d int drawable xml_background_levelbutton 0x7f07008d
int drawable xml_background_toolupgrade 0x7f07008e int drawable xml_background_toolslot 0x7f07008e
int drawable xml_background_tutorialtextview 0x7f07008f int drawable xml_background_toolupgrade 0x7f07008f
int drawable xml_background_worldbutton 0x7f070090 int drawable xml_background_tutorialtextview 0x7f070090
int drawable xml_layers_toolprogressbar 0x7f070091 int drawable xml_background_worldbutton 0x7f070091
int drawable xml_selector_gamebutton 0x7f070092 int drawable xml_layers_toolprogressbar 0x7f070092
int drawable xml_selector_pricebutton 0x7f070093 int drawable xml_selector_gamebutton 0x7f070093
int drawable xml_selector_settingsbutton 0x7f070094 int drawable xml_selector_pricebutton 0x7f070094
int drawable xml_selector_shapeshopbutton 0x7f070095 int drawable xml_selector_settingsbutton 0x7f070095
int drawable xml_selector_sound 0x7f070096 int drawable xml_selector_shapeshopbutton 0x7f070096
int drawable xml_selector_toolshopbutton 0x7f070097 int drawable xml_selector_sound 0x7f070097
int drawable xml_shape_inspector_checkbox 0x7f070098 int drawable xml_selector_toolshopbutton 0x7f070098
int drawable xml_shape_inspector_checkbox 0x7f070099
int id action0 0x7f080000 int id action0 0x7f080000
int id action_bar 0x7f080001 int id action_bar 0x7f080001
int id action_bar_activity_content 0x7f080002 int id action_bar_activity_content 0x7f080002
@ -596,177 +598,178 @@ int id expand_activities_button 0x7f080024
int id expanded_menu 0x7f080025 int id expanded_menu 0x7f080025
int id game_countdown 0x7f080026 int id game_countdown 0x7f080026
int id game_fps 0x7f080027 int id game_fps 0x7f080027
int id game_message 0x7f080028 int id game_game_over_message 0x7f080028
int id game_pausebutton 0x7f080029 int id game_over_message_title 0x7f080029
int id game_playerprogress 0x7f08002a int id game_over_message_to_menu 0x7f08002a
int id game_playerspeed 0x7f08002b int id game_over_message_topbar 0x7f08002b
int id game_shortmenu 0x7f08002c int id game_over_message_try_again 0x7f08002c
int id game_toolbuttonbar 0x7f08002d int id game_pausebutton 0x7f08002d
int id home 0x7f08002e int id game_playerprogress 0x7f08002e
int id homeAsUp 0x7f08002f int id game_playerspeed 0x7f08002f
int id horizontalScrollView 0x7f080030 int id game_shortmenu 0x7f080030
int id icon 0x7f080031 int id game_toolbuttonbar 0x7f080031
int id ifRoom 0x7f080032 int id goal_screen_bottom_layout 0x7f080032
int id image 0x7f080033 int id goal_screen_next_level 0x7f080033
int id imageView 0x7f080034 int id goal_screen_restart 0x7f080034
int id imageView4 0x7f080035 int id goal_screen_title 0x7f080035
int id info 0x7f080036 int id goal_screen_topbar 0x7f080036
int id levelbutton_energy 0x7f080037 int id home 0x7f080037
int id levelbutton_lock 0x7f080038 int id homeAsUp 0x7f080038
int id levelbutton_star1 0x7f080039 int id horizontalScrollView 0x7f080039
int id levelbutton_star2 0x7f08003a int id icon 0x7f08003a
int id levelbutton_star3 0x7f08003b int id ifRoom 0x7f08003b
int id levelbutton_starView 0x7f08003c int id image 0x7f08003c
int id levelbutton_textview 0x7f08003d int id imageView 0x7f08003d
int id levels_bottomRow 0x7f08003e int id info 0x7f08003e
int id levels_topRow 0x7f08003f int id levelbutton_energy 0x7f08003f
int id levels_topbar 0x7f080040 int id levelbutton_lock 0x7f080040
int id levelup_level 0x7f080041 int id levelbutton_star1 0x7f080041
int id levelup_text 0x7f080042 int id levelbutton_star2 0x7f080042
int id levelup_unlocklist 0x7f080043 int id levelbutton_star3 0x7f080043
int id line1 0x7f080044 int id levelbutton_textview 0x7f080044
int id line3 0x7f080045 int id levels_bottom_row 0x7f080045
int id linearLayout 0x7f080046 int id levels_top_row 0x7f080046
int id linearLayout4 0x7f080047 int id levels_topbar 0x7f080047
int id listMode 0x7f080048 int id levelup_level 0x7f080048
int id list_item 0x7f080049 int id levelup_text 0x7f080049
int id media_actions 0x7f08004a int id levelup_unlocklist 0x7f08004a
int id message_next_level 0x7f08004b int id line1 0x7f08004b
int id message_restart 0x7f08004c int id line3 0x7f08004c
int id message_title 0x7f08004d int id linearLayout 0x7f08004d
int id message_to_menu 0x7f08004e int id linearLayout4 0x7f08004e
int id message_tools 0x7f08004f int id listMode 0x7f08004f
int id middle 0x7f080050 int id list_item 0x7f080050
int id multiply 0x7f080051 int id media_actions 0x7f080051
int id never 0x7f080052 int id middle 0x7f080052
int id none 0x7f080053 int id multiply 0x7f080053
int id normal 0x7f080054 int id never 0x7f080054
int id parentPanel 0x7f080055 int id none 0x7f080055
int id price_button_currency 0x7f080056 int id normal 0x7f080056
int id price_button_price 0x7f080057 int id parentPanel 0x7f080057
int id price_button_title 0x7f080058 int id price_button_currency 0x7f080058
int id progress_circular 0x7f080059 int id price_button_price 0x7f080059
int id progress_horizontal 0x7f08005a int id price_button_title 0x7f08005a
int id radio 0x7f08005b int id progress_circular 0x7f08005b
int id screen 0x7f08005c int id progress_horizontal 0x7f08005c
int id scrollIndicatorDown 0x7f08005d int id radio 0x7f08005d
int id scrollIndicatorUp 0x7f08005e int id screen 0x7f08005e
int id scrollView 0x7f08005f int id scrollIndicatorDown 0x7f08005f
int id search_badge 0x7f080060 int id scrollIndicatorUp 0x7f080060
int id search_bar 0x7f080061 int id scrollView 0x7f080061
int id search_button 0x7f080062 int id search_badge 0x7f080062
int id search_close_btn 0x7f080063 int id search_bar 0x7f080063
int id search_edit_frame 0x7f080064 int id search_button 0x7f080064
int id search_go_btn 0x7f080065 int id search_close_btn 0x7f080065
int id search_mag_icon 0x7f080066 int id search_edit_frame 0x7f080066
int id search_plate 0x7f080067 int id search_go_btn 0x7f080067
int id search_src_text 0x7f080068 int id search_mag_icon 0x7f080068
int id search_voice_btn 0x7f080069 int id search_plate 0x7f080069
int id select_dialog_listview 0x7f08006a int id search_src_text 0x7f08006a
int id settings_reset 0x7f08006b int id search_voice_btn 0x7f08006b
int id settings_soundtoggle 0x7f08006c int id select_dialog_listview 0x7f08006c
int id settings_topbar 0x7f08006d int id settings_reset 0x7f08006d
int id shape_button_button 0x7f08006e int id settings_soundtoggle 0x7f08006e
int id shape_button_textview 0x7f08006f int id settings_topbar 0x7f08006f
int id shape_inspector_check_box 0x7f080070 int id shape_button_button 0x7f080070
int id shape_inspector_check_box_image 0x7f080071 int id shape_button_textview 0x7f080071
int id shape_inspector_check_box_text 0x7f080072 int id shape_inspector_check_box 0x7f080072
int id shape_inspector_description 0x7f080073 int id shape_inspector_check_box_image 0x7f080073
int id shape_inspector_imageview 0x7f080074 int id shape_inspector_check_box_text 0x7f080074
int id shape_inspector_title 0x7f080075 int id shape_inspector_description 0x7f080075
int id shape_shop_bottomRow 0x7f080076 int id shape_inspector_imageview 0x7f080076
int id shape_shop_shape_inspector 0x7f080077 int id shape_inspector_title 0x7f080077
int id shape_shop_topRow 0x7f080078 int id shape_shop_bottomRow 0x7f080078
int id shape_shop_topbar 0x7f080079 int id shape_shop_shape_inspector 0x7f080079
int id shortcut 0x7f08007a int id shape_shop_topRow 0x7f08007a
int id shortmenu_continue 0x7f08007b int id shape_shop_topbar 0x7f08007b
int id shortmenu_exit 0x7f08007c int id shortcut 0x7f08007c
int id shortmenu_restart 0x7f08007d int id shortmenu_continue 0x7f08007d
int id shortmenu_topbar 0x7f08007e int id shortmenu_exit 0x7f08007e
int id showCustom 0x7f08007f int id shortmenu_restart 0x7f08007f
int id showHome 0x7f080080 int id shortmenu_topbar 0x7f080080
int id showTitle 0x7f080081 int id showCustom 0x7f080081
int id spacer 0x7f080082 int id showHome 0x7f080082
int id split_action_bar 0x7f080083 int id showTitle 0x7f080083
int id src_atop 0x7f080084 int id spacer 0x7f080084
int id src_in 0x7f080085 int id split_action_bar 0x7f080085
int id src_over 0x7f080086 int id src_atop 0x7f080086
int id startscreen_gain_90_ep 0x7f080087 int id src_in 0x7f080087
int id startscreen_play 0x7f080088 int id src_over 0x7f080088
int id startscreen_settings 0x7f080089 int id startscreen_gain_90_ep 0x7f080089
int id startscreen_to_gl_test_screen 0x7f08008a int id startscreen_play 0x7f08008a
int id startscreen_unlock_levels 0x7f08008b int id startscreen_settings 0x7f08008b
int id status_bar_latest_event_content 0x7f08008c int id startscreen_to_gl_test_screen 0x7f08008c
int id submit_area 0x7f08008d int id startscreen_unlock_levels 0x7f08008d
int id tabMode 0x7f08008e int id status_bar_latest_event_content 0x7f08008e
int id task_completed_text 0x7f08008f int id submit_area 0x7f08008f
int id task_completed_title 0x7f080090 int id tabMode 0x7f080090
int id task_completed_unlock_list 0x7f080091 int id task_completed_text 0x7f080091
int id text 0x7f080092 int id task_completed_title 0x7f080092
int id text2 0x7f080093 int id task_completed_unlock_list 0x7f080093
int id textSpacerNoButtons 0x7f080094 int id text 0x7f080094
int id time 0x7f080095 int id text2 0x7f080095
int id title 0x7f080096 int id textSpacerNoButtons 0x7f080096
int id title_template 0x7f080097 int id time 0x7f080097
int id tool_button_animation_layer 0x7f080098 int id title 0x7f080098
int id tool_button_background_layer 0x7f080099 int id title_template 0x7f080099
int id tool_button_progress_bar 0x7f08009a int id tool_button_animation_layer 0x7f08009a
int id tool_inspector_description 0x7f08009b int id tool_button_background_layer 0x7f08009b
int id tool_inspector_imageview 0x7f08009c int id tool_button_progress_bar 0x7f08009c
int id tool_inspector_level_view 0x7f08009d int id tool_inspector_description 0x7f08009d
int id tool_inspector_pricebutton 0x7f08009e int id tool_inspector_imageview 0x7f08009e
int id tool_inspector_title 0x7f08009f int id tool_inspector_level_view 0x7f08009f
int id tool_upgrade_imageview 0x7f0800a0 int id tool_inspector_pricebutton 0x7f0800a0
int id tool_upgrade_pricebutton 0x7f0800a1 int id tool_inspector_title 0x7f0800a1
int id tool_upgrade_title 0x7f0800a2 int id tool_upgrade_imageview 0x7f0800a2
int id tool_upgrade_value_new 0x7f0800a3 int id tool_upgrade_pricebutton 0x7f0800a3
int id tool_upgrade_value_old 0x7f0800a4 int id tool_upgrade_title 0x7f0800a4
int id toolbutton_1 0x7f0800a5 int id tool_upgrade_value_new 0x7f0800a5
int id toolbutton_2 0x7f0800a6 int id tool_upgrade_value_old 0x7f0800a6
int id toolbutton_3 0x7f0800a7 int id toolbutton_1 0x7f0800a7
int id toolbutton_4 0x7f0800a8 int id toolbutton_2 0x7f0800a8
int id toolofferslot_slot 0x7f0800a9 int id toolbutton_3 0x7f0800a9
int id toolofferslot_title 0x7f0800aa int id toolbutton_4 0x7f0800aa
int id toolshop_slot1 0x7f0800ab int id toolofferslot_slot 0x7f0800ab
int id toolshop_slot2 0x7f0800ac int id toolofferslot_title 0x7f0800ac
int id toolshop_slot3 0x7f0800ad int id toolshop_slot1 0x7f0800ad
int id toolshop_slot4 0x7f0800ae int id toolshop_slot2 0x7f0800ae
int id toolshop_tool_offer_bottom_row 0x7f0800af int id toolshop_slot3 0x7f0800af
int id toolshop_tool_offer_top_row 0x7f0800b0 int id toolshop_slot4 0x7f0800b0
int id toolshop_toolinspector 0x7f0800b1 int id toolshop_tool_offer_bottom_row 0x7f0800b1
int id toolshop_topbar 0x7f0800b2 int id toolshop_tool_offer_top_row 0x7f0800b2
int id toolslot_image 0x7f0800b3 int id toolshop_toolinspector 0x7f0800b3
int id topPanel 0x7f0800b4 int id toolshop_topbar 0x7f0800b4
int id topbar_energycount 0x7f0800b5 int id toolslot_image 0x7f0800b5
int id topbar_energycount_decrease 0x7f0800b6 int id topPanel 0x7f0800b6
int id topbar_energyview 0x7f0800b7 int id topbar_energycount 0x7f0800b7
int id topbar_layout 0x7f0800b8 int id topbar_energycount_decrease 0x7f0800b8
int id topbar_leveldisplay 0x7f0800b9 int id topbar_energyview 0x7f0800b9
int id topbar_levellayout 0x7f0800ba int id topbar_layout 0x7f0800ba
int id topbar_levelprogress 0x7f0800bb int id topbar_leveldisplay 0x7f0800bb
int id topbar_settings 0x7f0800bc int id topbar_levellayout 0x7f0800bc
int id topbar_shapeshop 0x7f0800bd int id topbar_levelprogress 0x7f0800bd
int id topbar_starcount 0x7f0800be int id topbar_settings 0x7f0800be
int id topbar_starcount_decrease 0x7f0800bf int id topbar_shapeshop 0x7f0800bf
int id topbar_starview 0x7f0800c0 int id topbar_starcount 0x7f0800c0
int id topbar_toolshop 0x7f0800c1 int id topbar_starcount_decrease 0x7f0800c1
int id tutorial_image_view 0x7f0800c2 int id topbar_starview 0x7f0800c2
int id tutorial_text_view 0x7f0800c3 int id topbar_toolshop 0x7f0800c3
int id unlockmessage_message 0x7f0800c4 int id tutorial_image_view 0x7f0800c4
int id unlockmessage_toolimage 0x7f0800c5 int id tutorial_text_view 0x7f0800c5
int id up 0x7f0800c6 int id unlockmessage_message 0x7f0800c6
int id useLogo 0x7f0800c7 int id unlockmessage_toolimage 0x7f0800c7
int id withText 0x7f0800c8 int id up 0x7f0800c8
int id worldbutton_energycount 0x7f0800c9 int id useLogo 0x7f0800c9
int id worldbutton_levelcount 0x7f0800ca int id withText 0x7f0800ca
int id worldbutton_lock 0x7f0800cb int id worldbutton_energycount 0x7f0800cb
int id worldbutton_preview 0x7f0800cc int id worldbutton_levelcount 0x7f0800cc
int id worldbutton_starcount 0x7f0800cd int id worldbutton_lock 0x7f0800cd
int id worldbutton_tickView 0x7f0800ce int id worldbutton_preview 0x7f0800ce
int id worldbutton_title 0x7f0800cf int id worldbutton_starcount 0x7f0800cf
int id worlds_layout 0x7f0800d0 int id worldbutton_title 0x7f0800d0
int id worlds_topbar 0x7f0800d1 int id worlds_layout 0x7f0800d1
int id wrap_content 0x7f0800d2 int id worlds_topbar 0x7f0800d2
int id wrap_content 0x7f0800d3
int integer abc_config_activityDefaultDur 0x7f090000 int integer abc_config_activityDefaultDur 0x7f090000
int integer abc_config_activityShortDur 0x7f090001 int integer abc_config_activityShortDur 0x7f090001
int integer abc_max_action_buttons 0x7f090002 int integer abc_max_action_buttons 0x7f090002
@ -799,45 +802,46 @@ int layout abc_search_view 0x7f0a0017
int layout abc_select_dialog_material 0x7f0a0018 int layout abc_select_dialog_material 0x7f0a0018
int layout exit_confirm_dialog 0x7f0a0019 int layout exit_confirm_dialog 0x7f0a0019
int layout game 0x7f0a001a int layout game 0x7f0a001a
int layout gl_test_screen 0x7f0a001b int layout game_over_message 0x7f0a001b
int layout levelbutton 0x7f0a001c int layout gl_test_screen 0x7f0a001c
int layout levels 0x7f0a001d int layout goal_screen 0x7f0a001d
int layout levelup_message 0x7f0a001e int layout levelbutton 0x7f0a001e
int layout message 0x7f0a001f int layout levels 0x7f0a001f
int layout notification_media_action 0x7f0a0020 int layout levelup_message 0x7f0a0020
int layout notification_media_cancel_action 0x7f0a0021 int layout notification_media_action 0x7f0a0021
int layout notification_template_big_media 0x7f0a0022 int layout notification_media_cancel_action 0x7f0a0022
int layout notification_template_big_media_narrow 0x7f0a0023 int layout notification_template_big_media 0x7f0a0023
int layout notification_template_lines 0x7f0a0024 int layout notification_template_big_media_narrow 0x7f0a0024
int layout notification_template_media 0x7f0a0025 int layout notification_template_lines 0x7f0a0025
int layout notification_template_part_chronometer 0x7f0a0026 int layout notification_template_media 0x7f0a0026
int layout notification_template_part_time 0x7f0a0027 int layout notification_template_part_chronometer 0x7f0a0027
int layout pre_start_screen 0x7f0a0028 int layout notification_template_part_time 0x7f0a0028
int layout price_button 0x7f0a0029 int layout pre_start_screen 0x7f0a0029
int layout select_dialog_item_material 0x7f0a002a int layout price_button 0x7f0a002a
int layout select_dialog_multichoice_material 0x7f0a002b int layout select_dialog_item_material 0x7f0a002b
int layout select_dialog_singlechoice_material 0x7f0a002c int layout select_dialog_multichoice_material 0x7f0a002c
int layout settings 0x7f0a002d int layout select_dialog_singlechoice_material 0x7f0a002d
int layout shape_button 0x7f0a002e int layout settings 0x7f0a002e
int layout shape_inspector 0x7f0a002f int layout shape_button 0x7f0a002f
int layout shape_inspector_check_box 0x7f0a0030 int layout shape_inspector 0x7f0a0030
int layout shape_shop 0x7f0a0031 int layout shape_inspector_check_box 0x7f0a0031
int layout short_menu 0x7f0a0032 int layout shape_shop 0x7f0a0032
int layout start_screen 0x7f0a0033 int layout short_menu 0x7f0a0033
int layout support_simple_spinner_dropdown_item 0x7f0a0034 int layout start_screen 0x7f0a0034
int layout task_completed_message 0x7f0a0035 int layout support_simple_spinner_dropdown_item 0x7f0a0035
int layout tool_inspector 0x7f0a0036 int layout task_completed_message 0x7f0a0036
int layout tool_offer_slot 0x7f0a0037 int layout tool_inspector 0x7f0a0037
int layout tool_slot 0x7f0a0038 int layout tool_offer_slot 0x7f0a0038
int layout tool_upgrade 0x7f0a0039 int layout tool_slot 0x7f0a0039
int layout toolbutton 0x7f0a003a int layout tool_upgrade 0x7f0a003a
int layout toolbuttonbar 0x7f0a003b int layout toolbutton 0x7f0a003b
int layout toolshop 0x7f0a003c int layout toolbuttonbar 0x7f0a003c
int layout topbar 0x7f0a003d int layout toolshop 0x7f0a003d
int layout tutorial 0x7f0a003e int layout topbar 0x7f0a003e
int layout unlock_message 0x7f0a003f int layout tutorial 0x7f0a003f
int layout world_button 0x7f0a0040 int layout unlock_message 0x7f0a0040
int layout worlds 0x7f0a0041 int layout world_button 0x7f0a0041
int layout worlds 0x7f0a0042
int mipmap ic_launcher 0x7f0b0000 int mipmap ic_launcher 0x7f0b0000
int raw background 0x7f0c0000 int raw background 0x7f0c0000
int raw ramp 0x7f0c0001 int raw ramp 0x7f0c0001
@ -878,12 +882,12 @@ int string game_playerspeed_placeholder 0x7f0d0021
int string level_button_format_d 0x7f0d0022 int string level_button_format_d 0x7f0d0022
int string levelup 0x7f0d0023 int string levelup 0x7f0d0023
int string message_game_over 0x7f0d0024 int string message_game_over 0x7f0d0024
int string message_next_level 0x7f0d0025 int string message_level_finished 0x7f0d0025
int string message_restart 0x7f0d0026 int string message_next_level 0x7f0d0026
int string message_to_menu 0x7f0d0027 int string message_restart 0x7f0d0027
int string message_tools 0x7f0d0028 int string message_to_menu 0x7f0d0028
int string message_try_again 0x7f0d0029 int string message_tools 0x7f0d0029
int string message_win 0x7f0d002a int string message_try_again 0x7f0d002a
int string placeholder_button 0x7f0d002b int string placeholder_button 0x7f0d002b
int string placeholder_number 0x7f0d002c int string placeholder_number 0x7f0d002c
int string placeholder_percent 0x7f0d002d int string placeholder_percent 0x7f0d002d
@ -956,15 +960,15 @@ int string tutorial_place_ramp_obstacle 0x7f0d006f
int string tutorial_place_tools 0x7f0d0070 int string tutorial_place_tools 0x7f0d0070
int string tutorial_placeholder 0x7f0d0071 int string tutorial_placeholder 0x7f0d0071
int string tutorial_to_toolshop 0x7f0d0072 int string tutorial_to_toolshop 0x7f0d0072
int string tutorial_toolbar 0x7f0d0073 int string tutorial_toolshop_all_tools 0x7f0d0073
int string tutorial_toolshop_all_tools 0x7f0d0074 int string tutorial_toolshop_equip_spring 0x7f0d0074
int string tutorial_toolshop_equip_spring 0x7f0d0075 int string tutorial_toolshop_inspector 0x7f0d0075
int string tutorial_toolshop_inspector 0x7f0d0076 int string tutorial_toolshop_select_buy_spring 0x7f0d0076
int string tutorial_toolshop_select_buy_spring 0x7f0d0077 int string tutorial_toolshop_toolbar 0x7f0d0077
int string tutorial_toolshop_toolbar 0x7f0d0078 int string tutorial_toolshop_welcome 0x7f0d0078
int string tutorial_toolshop_welcome 0x7f0d0079 int string tutorial_welcome 0x7f0d0079
int string tutorial_welcome 0x7f0d007a int string unlock_message_placeholder 0x7f0d007a
int string unlock_message_placeholder 0x7f0d007b int string world_button_count_format_dd 0x7f0d007b
int string world_button_progress_placeholder 0x7f0d007c int string world_button_progress_placeholder 0x7f0d007c
int string world_button_title_placeholder 0x7f0d007d int string world_button_title_placeholder 0x7f0d007d
int style AlertDialog_AppCompat 0x7f0e0000 int style AlertDialog_AppCompat 0x7f0e0000

2
app/src/main/assets/particleEffects/collectEnergy.pe
View File

@ -34,7 +34,7 @@ active: false
- Y Offset - - Y Offset -
active: false active: false
- Spawn Shape - - Spawn Shape -
spawnShape: point shape: point
- Spawn Width - - Spawn Width -
lowMin: 0.0 lowMin: 0.0
lowMax: 0.0 lowMax: 0.0

12
app/src/main/assets/particleEffects/collectStar.pe
View File

@ -38,7 +38,7 @@ active: false
- Y Offset - - Y Offset -
active: false active: false
- Spawn Shape - - Spawn Shape -
spawnShape: point shape: point
- Spawn Width - - Spawn Width -
lowMin: 0.0 lowMin: 0.0
lowMax: 0.0 lowMax: 0.0
@ -110,20 +110,16 @@ active: false
- Gravity - - Gravity -
active: false active: false
- Tint - - Tint -
colorsCount: 9 colorsCount: 6
colors0: 1.0 colors0: 1.0
colors1: 0.92941177 colors1: 0.92941177
colors2: 0.047058824 colors2: 0.047058824
colors3: 1.0 colors3: 1.0
colors4: 0.92941177 colors4: 0.92941177
colors5: 0.047058824 colors5: 0.047058824
colors6: 1.0 timelineCount: 2
colors7: 0.78039217
colors8: 0.047058824
timelineCount: 3
timeline0: 0.0 timeline0: 0.0
timeline1: 0.7521515 timeline1: 1.0
timeline2: 1.0
- Transparency - - Transparency -
lowMin: 0.0 lowMin: 0.0
lowMax: 0.0 lowMax: 0.0

2
app/src/main/assets/particleEffects/explosion.pe
View File

@ -44,7 +44,7 @@ active: false
- Y Offset - - Y Offset -
active: false active: false
- Spawn Shape - - Spawn Shape -
spawnShape: square shape: square
- Spawn Width - - Spawn Width -
lowMin: 200.0 lowMin: 200.0
lowMax: 200.0 lowMax: 200.0

2
app/src/main/assets/particleEffects/firework.pe
View File

@ -34,7 +34,7 @@ active: false
- Y Offset - - Y Offset -
active: false active: false
- Spawn Shape - - Spawn Shape -
spawnShape: point shape: point
- Spawn Width - - Spawn Width -
lowMin: 0.0 lowMin: 0.0
lowMax: 0.0 lowMax: 0.0

2
app/src/main/assets/particleEffects/magnet.pe
View File

@ -38,7 +38,7 @@ active: false
- Y Offset - - Y Offset -
active: false active: false
- Spawn Shape - - Spawn Shape -
spawnShape: point shape: point
- Spawn Width - - Spawn Width -
lowMin: 0.0 lowMin: 0.0
lowMax: 0.0 lowMax: 0.0

2
app/src/main/assets/particleEffects/fire.pe → app/src/main/assets/particleEffects/superPower.pe
View File

@ -46,7 +46,7 @@ active: false
- Y Offset - - Y Offset -
active: false active: false
- Spawn Shape - - Spawn Shape -
spawnShape: point shape: point
- Spawn Width - - Spawn Width -
lowMin: 0.0 lowMin: 0.0
lowMax: 0.0 lowMax: 0.0

15
app/src/main/java/de/frajul/endlessroll/entities/tools/Stasis.java
View File

@ -15,8 +15,8 @@ public class Stasis extends PlayerInfluenceTool {
private ParticleSource particleSource; private ParticleSource particleSource;
private boolean firstCollision = true; private boolean firstCollision = true;
private final static float Y_SLOW_FACTOR = .2f; private final static float Y_SLOW_FACTOR = .4f; //Final .2f
private final static float X_SLOW_FACTOR = .8f; private final static float X_SLOW_FACTOR = .9f; //Final .8f
public Stasis(Vector position, ParticleSystem particleSystem) { public Stasis(Vector position, ParticleSystem particleSystem) {
super(ToolType.STASIS, position, super(ToolType.STASIS, position,
@ -27,7 +27,8 @@ public class Stasis extends PlayerInfluenceTool {
animation.setRequiredDelta(300); animation.setRequiredDelta(300);
animation.setIndexSequence(new int[]{1, 1, 2, 3, 2, 4, 4, 3, 2, 2, 3, 3}); animation.setIndexSequence(new int[]{1, 1, 2, 3, 2, 4, 4, 3, 2, 2, 3, 3});
super.setFloating(true); super.setFloating(true);
particleSource = new ParticleSource(new Vector(position), particleSystem.magnet); particleSource = new ParticleSource(new Vector(position), particleSystem.stasis);
particleSource.setSpawnSize(new Vector(super.width, super.height));
particleSource.start(); particleSource.start();
} }
@ -54,10 +55,12 @@ public class Stasis extends PlayerInfluenceTool {
@Override @Override
public void influencePlayerValues(Player player) { public void influencePlayerValues(Player player) {
player.manipulateAllForces(Y_SLOW_FACTOR); float forceValue = ToolType.STASIS.getCurrentUpgradeValue(ToolUpgradeType.FORCE);
player.getMovement().setX(player.getMovement().getX() * .8f); float finalXSlow = X_SLOW_FACTOR - forceValue / 20f;
player.manipulateAllForces(Y_SLOW_FACTOR / forceValue);
player.getMovement().setX(player.getMovement().getX() * finalXSlow);
if (firstCollision) { if (firstCollision) {
player.getMovement().y *= Y_SLOW_FACTOR; player.getMovement().y *= Y_SLOW_FACTOR / forceValue;
firstCollision = false; firstCollision = false;
} }

60
app/src/main/java/de/frajul/endlessroll/main/screens/GoalScreen.java Normal file
View File

@ -0,0 +1,60 @@
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());
}
}

11
app/src/main/java/de/frajul/endlessroll/views/LevelButtonOnClickListener.java Normal file
View File

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

11
app/src/main/java/de/frajul/endlessroll/views/WorldButtonOnClickListener.java Normal file
View File

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

BIN
app/src/main/res/drawable/tools_stasis_button.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 62 KiB

BIN
app/src/main/res/drawable/tutorial_place_ramp_air_1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 164 KiB

After

Width:  |  Height:  |  Size: 149 KiB

BIN
app/src/main/res/drawable/tutorial_place_ramp_air_2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 124 KiB

BIN
app/src/main/res/drawable/tutorial_place_ramp_gap.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 166 KiB

After

Width:  |  Height:  |  Size: 106 KiB

BIN
app/src/main/res/drawable/tutorial_place_ramp_obstacle.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 150 KiB

After

Width:  |  Height:  |  Size: 111 KiB

BIN
app/src/main/res/drawable/tutorial_place_tools.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 175 KiB

After

Width:  |  Height:  |  Size: 105 KiB

BIN
app/src/main/res/drawable/tutorial_toolbar.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 165 KiB

16
app/src/main/res/drawable/xml_background_game_over_message_button.xml Normal file
View File

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="false">
<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>
</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>
</item>
</selector>

4
app/src/main/res/layout/game.xml
View File

@ -64,8 +64,8 @@
android:visibility="invisible"/> android:visibility="invisible"/>
<include <include
android:id="@+id/game_message" android:id="@+id/game_game_over_message"
layout="@layout/message" layout="@layout/game_over_message"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"

63
app/src/main/res/layout/game_over_message.xml Normal file
View File

@ -0,0 +1,63 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/background_levelup_message"
android:orientation="vertical">
<include
android:id="@+id/game_over_message_topbar"
layout="@layout/topbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@+id/game_over_message_title">
<Button
android:id="@+id/game_over_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>
<TextView
android:id="@+id/game_over_message_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="@string/message_game_over"
android:textColor="@color/game_over"
android:textSize="55sp"/>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@+id/game_over_message_title">
<Button
android:id="@+id/game_over_message_try_again"
android:layout_width="wrap_content"
android:background="@drawable/xml_background_game_over_message_button"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="@string/message_try_again"
android:textColor="@color/message_views"
android:textSize="40sp"/>
</RelativeLayout>
</RelativeLayout>
</LinearLayout>

59
app/src/main/res/layout/goal_screen.xml Normal file
View File

@ -0,0 +1,59 @@
<?xml version="1.0" encoding="utf-8"?>
<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:orientation="vertical">
<include
android:id="@+id/goal_screen_topbar"
layout="@layout/topbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@id/goal_screen_bottom_layout">
<TextView
android:id="@+id/goal_screen_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:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true">
<include
android:id="@+id/goal_screen_restart"
layout="@layout/levelbutton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_margin="5dp"/>
<include
android:id="@+id/goal_screen_next_level"
layout="@layout/levelbutton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_margin="5dp"/>
</RelativeLayout>
</RelativeLayout>
</LinearLayout>

19
app/src/main/res/layout/levelbutton.xml
View File

@ -2,23 +2,29 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"
android:background="@drawable/xml_background_levelbutton" android:background="@drawable/xml_background_levelbutton"
android:layout_margin="10dp"> android:layout_margin="10dp">
<LinearLayout
android:layout_width="wrap_content"
android:orientation="vertical"
android:layout_height="wrap_content"
android:layout_centerInParent="true">
<TextView <TextView
android:id="@+id/levelbutton_textview" android:id="@+id/levelbutton_textview"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/placeholder_button" android:text="@string/placeholder_button"
android:textSize="30sp" android:textSize="30sp"
android:layout_centerHorizontal="true"/> android:layout_gravity="center_horizontal"/>
<LinearLayout <LinearLayout
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="140dp" android:layout_width="140dp"
android:layout_height="70dp" android:layout_height="50dp"
android:layout_alignParentBottom="true" android:layout_gravity="center_horizontal">
android:layout_centerHorizontal="true">
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -49,6 +55,8 @@
android:layout_weight="1"/> android:layout_weight="1"/>
</LinearLayout> </LinearLayout>
</LinearLayout>
<ImageView <ImageView
android:id="@+id/levelbutton_lock" android:id="@+id/levelbutton_lock"
@ -56,7 +64,6 @@
android:layout_height="100dp" android:layout_height="100dp"
android:src="@drawable/guis_lock_locked" android:src="@drawable/guis_lock_locked"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:visibility="invisible" android:visibility="invisible"/>
android:layout_weight="1"/>
</RelativeLayout> </RelativeLayout>

56
app/src/main/res/layout/levels.xml
View File

@ -8,10 +8,8 @@
<include <include
android:id="@+id/levels_topbar" android:id="@+id/levels_topbar"
layout="@layout/topbar" layout="@layout/topbar"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"/>
android:layout_gravity="top"
android:layout_marginBottom="5dp"/>
<HorizontalScrollView <HorizontalScrollView
android:id="@+id/horizontalScrollView" android:id="@+id/horizontalScrollView"
@ -19,37 +17,33 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="center"> android:layout_gravity="center">
<TableLayout <RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:stretchColumns="*">
<TableRow
android:id="@+id/levels_topRow"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1">
<!--Will be removed before levelbuttons are added. Just there because android 7.0 doesn't like empty tableRows ;-) -->
<TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"/> android:layout_height="match_parent">
</TableRow> <LinearLayout
<TableRow
android:id="@+id/levels_bottomRow"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1">
<!--Will be removed before levelbuttons are added. Just there because android 7.0 doesn't like empty tableRows ;-) -->
<TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"
</TableRow> android:layout_centerVertical="true"
android:orientation="vertical">
<LinearLayout
android:id="@+id/levels_top_row"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="horizontal"/>
<LinearLayout
android:id="@+id/levels_bottom_row"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="horizontal"/>
</LinearLayout>
</RelativeLayout>
</TableLayout>
</HorizontalScrollView> </HorizontalScrollView>
</LinearLayout> </LinearLayout>

66
app/src/main/res/layout/message.xml
View File

@ -1,66 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/message_game_over"
android:id="@+id/message_title"
android:layout_centerVertical="true"
android:layout_centerHorizontal="true"
android:textSize="55sp"/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_above="@+id/message_title"
android:layout_centerHorizontal="true">
<TextView
android:id="@+id/message_tools"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="200dp"
android:text="@string/message_tools"
android:textColor="@color/message_views"
android:textSize="40sp"/>
<TextView
android:id="@+id/message_to_menu"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/message_to_menu"
android:textColor="@color/message_views"
android:textSize="40sp"/>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_marginTop="20dp"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_below="@+id/message_title"
android:layout_centerHorizontal="true">
<TextView
android:id="@+id/message_restart"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/message_restart"
android:textColor="@color/message_views"
android:textSize="40sp"
android:layout_marginEnd="120dp"/>
<TextView
android:id="@+id/message_next_level"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/message_next_level"
android:textColor="@color/message_views"
android:textSize="40sp"/>
</LinearLayout>
</RelativeLayout>

6
app/src/main/res/layout/short_menu.xml
View File

@ -23,7 +23,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/short_menu_continue" android:text="@string/short_menu_continue"
android:textSize="40sp" android:textSize="40sp"
android:textColor="@color/win" android:textColor="@color/level_finished"
android:id="@+id/shortmenu_continue"/> android:id="@+id/shortmenu_continue"/>
<TextView <TextView
@ -31,7 +31,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/message_restart" android:text="@string/message_restart"
android:textSize="40sp" android:textSize="40sp"
android:textColor="@color/win" android:textColor="@color/level_finished"
android:id="@+id/shortmenu_restart"/> android:id="@+id/shortmenu_restart"/>
<TextView <TextView
@ -39,7 +39,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/short_menu_exit" android:text="@string/short_menu_exit"
android:textSize="40sp" android:textSize="40sp"
android:textColor="@color/win" android:textColor="@color/level_finished"
android:id="@+id/shortmenu_exit"/> android:id="@+id/shortmenu_exit"/>
</LinearLayout> </LinearLayout>
</FrameLayout> </FrameLayout>

3
app/src/main/res/layout/tutorial.xml
View File

@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout 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_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent"
android:background="@color/background_tutorial">
<RelativeLayout <RelativeLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"

120
app/src/main/res/layout/world_button.xml
View File

@ -1,115 +1,93 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="260dp" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:background="@drawable/xml_background_worldbutton"> android:background="@drawable/xml_background_worldbutton"
android:orientation="vertical"
android:padding="15dp">
<TextView <TextView
android:id="@+id/worldbutton_title" android:id="@+id/worldbutton_title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentTop="true" android:layout_gravity="center_horizontal"
android:layout_centerHorizontal="true"
android:text="@string/world_button_title_placeholder" android:text="@string/world_button_title_placeholder"
android:textColor="#ff2200" android:textColor="#ff2200"
android:textSize="30sp" android:textSize="30sp"/>
android:textStyle="bold|italic"/>
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal">
<ImageView <ImageView
android:id="@+id/worldbutton_preview" android:id="@+id/worldbutton_preview"
android:layout_width="150dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/worldbutton_title" android:layout_centerInParent="true"
android:layout_centerHorizontal="true"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:src="@drawable/world_previews_grass" android:src="@drawable/world_previews_grass"/>
android:layout_width="150dp"/>
<ImageView
<RelativeLayout android:id="@+id/worldbutton_lock"
android:layout_width="wrap_content" android:layout_width="150dp"
android:layout_height="wrap_content" android:layout_height="150dp"
android:layout_alignParentBottom="true" android:layout_centerInParent="true"
android:layout_alignParentEnd="true" android:src="@drawable/guis_lock_locked"
android:layout_alignParentLeft="true" android:visibility="visible"/>
android:layout_alignParentRight="true" </RelativeLayout>
android:layout_alignParentStart="true">
<LinearLayout
<RelativeLayout android:layout_width="wrap_content"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:layout_gravity="center_horizontal"
android:layout_centerHorizontal="true"> android:orientation="horizontal">
<ImageView <ImageView
android:id="@+id/worldbutton_tickView"
android:layout_width="30sp" android:layout_width="30sp"
android:layout_height="30sp" android:layout_height="30sp"
android:layout_alignParentStart="true" android:layout_gravity="center_vertical"
android:src="@drawable/guis_tick"/> android:src="@drawable/guis_tick"/>
<TextView <TextView
android:id="@+id/worldbutton_levelcount" android:id="@+id/worldbutton_levelcount"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginEnd="10dp"
android:text="@string/world_button_progress_placeholder" android:text="@string/world_button_progress_placeholder"
android:textSize="20sp" android:textSize="20sp"/>
android:textStyle="bold"
android:layout_centerVertical="true"
android:layout_toRightOf="@+id/worldbutton_tickView"
android:layout_toEndOf="@+id/worldbutton_tickView"
android:layout_marginRight="10dp"/>
<ImageView <ImageView
android:id="@+id/levelbutton_starView"
android:layout_width="30sp" android:layout_width="30sp"
android:layout_height="30sp" android:layout_height="30sp"
android:layout_centerVertical="true" android:layout_gravity="center_vertical"
android:layout_toRightOf="@+id/worldbutton_levelcount"
android:layout_toEndOf="@+id/worldbutton_levelcount"
android:src="@drawable/currency_star"/> android:src="@drawable/currency_star"/>
<TextView <TextView
android:id="@+id/worldbutton_starcount" android:id="@+id/worldbutton_starcount"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_gravity="center_vertical"
android:layout_toEndOf="@+id/levelbutton_starView" android:layout_marginEnd="10dp"
android:layout_toRightOf="@+id/levelbutton_starView"
android:text="@string/world_button_progress_placeholder" android:text="@string/world_button_progress_placeholder"
android:textSize="20sp" android:textSize="20sp"/>
android:textStyle="bold"
android:layout_marginRight="10dp"/> <ImageView
android:layout_width="30sp"
android:layout_height="30sp"
android:layout_gravity="center_vertical"
android:src="@drawable/currency_energy"/>
<TextView <TextView
android:id="@+id/worldbutton_energycount" android:id="@+id/worldbutton_energycount"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_gravity="center_vertical"
android:layout_toEndOf="@+id/imageView4"
android:layout_toRightOf="@+id/imageView4"
android:text="@string/world_button_progress_placeholder" android:text="@string/world_button_progress_placeholder"
android:textSize="20sp" android:textSize="20sp"/>
android:textStyle="bold"/>
<ImageView </LinearLayout>
android:id="@+id/imageView4"
android:layout_width="30sp"
android:layout_height="30sp"
android:layout_centerVertical="true"
android:layout_toEndOf="@+id/worldbutton_starcount"
android:layout_toRightOf="@+id/worldbutton_starcount"
android:src="@drawable/currency_energy"/>
</RelativeLayout> </LinearLayout>
</RelativeLayout>
<ImageView
android:id="@+id/worldbutton_lock"
android:layout_width="150dp"
android:layout_height="150dp"
android:src="@drawable/guis_lock_locked"
android:visibility="visible"
android:layout_alignBottom="@+id/worldbutton_preview"
android:layout_alignLeft="@+id/worldbutton_preview"
android:layout_alignStart="@+id/worldbutton_preview"/>
</RelativeLayout>

5
app/src/main/res/values/colors.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<color name="win">#ffda45</color> <color name="level_finished">#ffda45</color>
<color name="loose">#891e4e</color> <color name="game_over">#f11e6f</color>
<color name="retry">#39be27</color> <color name="retry">#39be27</color>
<color name="game_progress_text">#ffb405</color> <color name="game_progress_text">#ffb405</color>
<color name="message_views">#daf10d</color> <color name="message_views">#daf10d</color>
@ -19,4 +19,5 @@
<color name="countdown1">#f0d7b106</color> <color name="countdown1">#f0d7b106</color>
<color name="background_levelup_message">#9d000000</color> <color name="background_levelup_message">#9d000000</color>
<color name="background_short_menu">#5b000000</color> <color name="background_short_menu">#5b000000</color>
<color name="background_tutorial">#3d000000</color>
</resources> </resources>

15
app/src/main/res/values/strings.xml
View File

@ -15,11 +15,11 @@
<string name="task_completed">Task completed</string> <string name="task_completed">Task completed</string>
<string name="levelup">Level Up</string> <string name="levelup">Level Up</string>
<string name="message_game_over">GAME OVER</string> <string name="message_game_over">GAME OVER</string>
<string name="message_win">YOU DID IT</string> <string name="message_level_finished">LEVEL FINISHED</string>
<string name="message_tools">Tools</string> <string name="message_tools">Tools</string>
<string name="message_to_menu">To menu</string> <string name="message_to_menu">To menu</string>
<string name="message_restart">Restart</string>
<string name="message_try_again">Try again</string> <string name="message_try_again">Try again</string>
<string name="message_restart">Restart</string>
<string name="message_next_level">Next level</string> <string name="message_next_level">Next level</string>
<string name="pre_start_screen_loading">LOADING...</string> <string name="pre_start_screen_loading">LOADING...</string>
<string name="short_menu_continue">Continue</string> <string name="short_menu_continue">Continue</string>
@ -68,6 +68,8 @@
<string name="task_collect_energy_format_d">Collect %d energy</string> <string name="task_collect_energy_format_d">Collect %d energy</string>
<string name="task_complete_world_format_d">Finish the %d. world</string> <string name="task_complete_world_format_d">Finish the %d. world</string>
<string name="world_button_count_format_dd">%d/%d</string>
<string name="tool_description_locked_format_d">You will unlock this mysterious tool at level %d</string> <string name="tool_description_locked_format_d">You will unlock this mysterious tool at level %d</string>
<string name="tool_description_ramp">Roll up the ramp to gain height</string> <string name="tool_description_ramp">Roll up the ramp to gain height</string>
<string name="tool_description_spring">Shoots you in the air</string> <string name="tool_description_spring">Shoots you in the air</string>
@ -96,11 +98,10 @@
<string name="tutorial_placeholder">This is a multiline placeholder\nfor all the tutorials I made!!!\nAwesome! - Isn\'t it?</string> <string name="tutorial_placeholder">This is a multiline placeholder\nfor all the tutorials I made!!!\nAwesome! - Isn\'t it?</string>
<string name="tutorial_welcome">Welcome to Endless Roll!\nHave fun!</string> <string name="tutorial_welcome">Welcome to Endless Roll!\nHave fun!</string>
<string name="tutorial_toolbar">This is the toolbar. Here you can select the tool you currently want to use.</string> <string name="tutorial_place_tools">Click anywhere on the screen to place the ramp</string>
<string name="tutorial_place_tools">You can use the selected tool by clicking on the wanted position on the screen.</string> <string name="tutorial_place_ramp_gap">Try to place your ramp in front of the gap</string>
<string name="tutorial_place_ramp_gap">Now place your ramp in front of the gap!</string> <string name="tutorial_place_ramp_obstacle">Great job!\nNow place it in front of the obstacle</string>
<string name="tutorial_place_ramp_obstacle">Now place it in front of the obstacle!</string> <string name="tutorial_place_ramp_air">You can even set a Tool in mid-air.\nTime carefully!</string>
<string name="tutorial_place_ramp_air">You can even set a Tool in mid-air.\nTry it out!</string>
<string name="tutorial_place_ramp_air_2">Now try again!</string> <string name="tutorial_place_ramp_air_2">Now try again!</string>
<string name="tutorial_leveled_up">Congratulations!!!\nYou have leveled up!</string> <string name="tutorial_leveled_up">Congratulations!!!\nYou have leveled up!</string>
<string name="tutorial_to_toolshop">Now go to the toolshop by either clicking on the \'Spring unlocked\' or the toolshop button!</string> <string name="tutorial_to_toolshop">Now go to the toolshop by either clicking on the \'Spring unlocked\' or the toolshop button!</string>