diff --git a/app/app.iml b/app/app.iml
index a90aae5..7e28fff 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -66,14 +66,6 @@
-
-
-
-
-
-
-
-
@@ -82,6 +74,14 @@
+
+
+
+
+
+
+
+
diff --git a/app/build/generated/source/r/debug/android/support/v7/appcompat/R.java b/app/build/generated/source/r/debug/android/support/v7/appcompat/R.java
index 623c1c3..b0a6003 100644
--- a/app/build/generated/source/r/debug/android/support/v7/appcompat/R.java
+++ b/app/build/generated/source/r/debug/android/support/v7/appcompat/R.java
@@ -456,10 +456,10 @@ public final class R {
public static final int abc_textfield_search_activated_mtrl_alpha = 0x7f020042;
public static final int abc_textfield_search_default_mtrl_alpha = 0x7f020043;
public static final int abc_textfield_search_material = 0x7f020044;
- public static final int notification_template_icon_bg = 0x7f020072;
+ public static final int notification_template_icon_bg = 0x7f020074;
}
public static final class id {
- public static final int action0 = 0x7f0d006a;
+ public static final int action0 = 0x7f0d006b;
public static final int action_bar = 0x7f0d0041;
public static final int action_bar_activity_content = 0x7f0d0000;
public static final int action_bar_container = 0x7f0d0040;
@@ -468,7 +468,7 @@ public final class R {
public static final int action_bar_subtitle = 0x7f0d0022;
public static final int action_bar_title = 0x7f0d0021;
public static final int action_context_bar = 0x7f0d0042;
- public static final int action_divider = 0x7f0d006e;
+ public static final int action_divider = 0x7f0d006f;
public static final int action_menu_divider = 0x7f0d0002;
public static final int action_menu_presenter = 0x7f0d0003;
public static final int action_mode_bar = 0x7f0d003e;
@@ -479,9 +479,9 @@ public final class R {
public static final int always = 0x7f0d001b;
public static final int beginning = 0x7f0d0018;
public static final int buttonPanel = 0x7f0d002b;
- public static final int cancel_action = 0x7f0d006b;
+ public static final int cancel_action = 0x7f0d006c;
public static final int checkbox = 0x7f0d0039;
- public static final int chronometer = 0x7f0d0071;
+ public static final int chronometer = 0x7f0d0072;
public static final int collapseActionView = 0x7f0d001c;
public static final int contentPanel = 0x7f0d0031;
public static final int custom = 0x7f0d0037;
@@ -491,7 +491,7 @@ public final class R {
public static final int disableHome = 0x7f0d000c;
public static final int edit_query = 0x7f0d0043;
public static final int end = 0x7f0d0019;
- public static final int end_padder = 0x7f0d0076;
+ public static final int end_padder = 0x7f0d0077;
public static final int expand_activities_button = 0x7f0d0025;
public static final int expanded_menu = 0x7f0d0038;
public static final int home = 0x7f0d0004;
@@ -499,12 +499,12 @@ public final class R {
public static final int icon = 0x7f0d0029;
public static final int ifRoom = 0x7f0d001d;
public static final int image = 0x7f0d0026;
- public static final int info = 0x7f0d0075;
- public static final int line1 = 0x7f0d006f;
- public static final int line3 = 0x7f0d0073;
+ public static final int info = 0x7f0d0076;
+ public static final int line1 = 0x7f0d0070;
+ public static final int line3 = 0x7f0d0074;
public static final int listMode = 0x7f0d0009;
public static final int list_item = 0x7f0d0028;
- public static final int media_actions = 0x7f0d006d;
+ public static final int media_actions = 0x7f0d006e;
public static final int middle = 0x7f0d001a;
public static final int multiply = 0x7f0d0013;
public static final int never = 0x7f0d001e;
@@ -538,13 +538,13 @@ public final class R {
public static final int src_atop = 0x7f0d0015;
public static final int src_in = 0x7f0d0016;
public static final int src_over = 0x7f0d0017;
- public static final int status_bar_latest_event_content = 0x7f0d006c;
+ public static final int status_bar_latest_event_content = 0x7f0d006d;
public static final int submit_area = 0x7f0d004c;
public static final int tabMode = 0x7f0d000b;
- public static final int text = 0x7f0d0074;
- public static final int text2 = 0x7f0d0072;
+ public static final int text = 0x7f0d0075;
+ public static final int text2 = 0x7f0d0073;
public static final int textSpacerNoButtons = 0x7f0d0034;
- public static final int time = 0x7f0d0070;
+ public static final int time = 0x7f0d0071;
public static final int title = 0x7f0d002a;
public static final int title_template = 0x7f0d002f;
public static final int topPanel = 0x7f0d002e;
diff --git a/app/build/generated/source/r/debug/com/example/julian/endlessroll/R.java b/app/build/generated/source/r/debug/com/example/julian/endlessroll/R.java
index 61eaa73..1bb6af9 100644
--- a/app/build/generated/source/r/debug/com/example/julian/endlessroll/R.java
+++ b/app/build/generated/source/r/debug/com/example/julian/endlessroll/R.java
@@ -1623,47 +1623,49 @@ containing a value of this type.
public static final int backgrounds_menu_shortmenu=0x7f02004a;
public static final int currency_energy=0x7f02004b;
public static final int currency_energy_atlas=0x7f02004c;
- public static final int currency_star=0x7f02004d;
- public static final int goal=0x7f02004e;
- public static final int guis_pausebutton=0x7f02004f;
- public static final int guis_playerarrow=0x7f020050;
- public static final int guis_sound_off=0x7f020051;
- public static final int guis_sound_on=0x7f020052;
- public static final int lock_locked=0x7f020053;
- public static final int lock_unlocked=0x7f020054;
- public static final int notification_template_icon_bg=0x7f020072;
- public static final int obstacles_cave=0x7f020055;
- public static final int obstacles_grass=0x7f020056;
- public static final int obstacles_mountains=0x7f020057;
- public static final int playershapes_ball=0x7f020058;
- public static final int previews_grass=0x7f020059;
- public static final int purple=0x7f02005a;
- public static final int ramp=0x7f02005b;
- public static final int rampbutton=0x7f02005c;
- public static final int splitter=0x7f02005d;
- public static final int star_empty=0x7f02005e;
- public static final int star_icon=0x7f02005f;
- public static final int terrain_c_grass=0x7f020060;
- public static final int terrain_t_grass=0x7f020061;
- public static final int tools_bomb=0x7f020062;
- public static final int tools_bombbutton=0x7f020063;
- public static final int tools_emptybutton=0x7f020064;
- public static final int tools_lockedbutton=0x7f020065;
- public static final int tools_magnet=0x7f020066;
- public static final int tools_magnetbutton=0x7f020067;
- public static final int tools_spring=0x7f020068;
- public static final int tools_springbutton=0x7f020069;
- public static final int tools_unlockedbutton=0x7f02006a;
- public static final int xml_custom_button=0x7f02006b;
- public static final int xml_levelbutton_background=0x7f02006c;
- public static final int xml_sound_toggle=0x7f02006d;
- public static final int xml_tool_slot_background=0x7f02006e;
- public static final int xml_toolprogressbarlayers=0x7f02006f;
- public static final int xml_unlock_message_background=0x7f020070;
- public static final int xml_worldbutton_background=0x7f020071;
+ public static final int currency_energy_empty=0x7f02004d;
+ public static final int currency_star=0x7f02004e;
+ public static final int currency_star_empty=0x7f02004f;
+ public static final int goal=0x7f020050;
+ public static final int guis_pausebutton=0x7f020051;
+ public static final int guis_playerarrow=0x7f020052;
+ public static final int guis_sound_off=0x7f020053;
+ public static final int guis_sound_on=0x7f020054;
+ public static final int lock_locked=0x7f020055;
+ public static final int lock_unlocked=0x7f020056;
+ public static final int notification_template_icon_bg=0x7f020074;
+ public static final int obstacles_cave=0x7f020057;
+ public static final int obstacles_grass=0x7f020058;
+ public static final int obstacles_mountains=0x7f020059;
+ public static final int playershapes_ball=0x7f02005a;
+ public static final int previews_grass=0x7f02005b;
+ public static final int purple=0x7f02005c;
+ public static final int ramp=0x7f02005d;
+ public static final int rampbutton=0x7f02005e;
+ public static final int splitter=0x7f02005f;
+ public static final int star_icon=0x7f020060;
+ public static final int terrain_c_grass=0x7f020061;
+ public static final int terrain_t_grass=0x7f020062;
+ public static final int tick=0x7f020063;
+ public static final int tools_bomb=0x7f020064;
+ public static final int tools_bombbutton=0x7f020065;
+ public static final int tools_emptybutton=0x7f020066;
+ public static final int tools_lockedbutton=0x7f020067;
+ public static final int tools_magnet=0x7f020068;
+ public static final int tools_magnetbutton=0x7f020069;
+ public static final int tools_spring=0x7f02006a;
+ public static final int tools_springbutton=0x7f02006b;
+ public static final int tools_unlockedbutton=0x7f02006c;
+ public static final int xml_custom_button=0x7f02006d;
+ public static final int xml_levelbutton_background=0x7f02006e;
+ public static final int xml_sound_toggle=0x7f02006f;
+ public static final int xml_tool_slot_background=0x7f020070;
+ public static final int xml_toolprogressbarlayers=0x7f020071;
+ public static final int xml_unlock_message_background=0x7f020072;
+ public static final int xml_worldbutton_background=0x7f020073;
}
public static final class id {
- public static final int action0=0x7f0d006a;
+ public static final int action0=0x7f0d006b;
public static final int action_bar=0x7f0d0041;
public static final int action_bar_activity_content=0x7f0d0000;
public static final int action_bar_container=0x7f0d0040;
@@ -1672,7 +1674,7 @@ containing a value of this type.
public static final int action_bar_subtitle=0x7f0d0022;
public static final int action_bar_title=0x7f0d0021;
public static final int action_context_bar=0x7f0d0042;
- public static final int action_divider=0x7f0d006e;
+ public static final int action_divider=0x7f0d006f;
public static final int action_menu_divider=0x7f0d0002;
public static final int action_menu_presenter=0x7f0d0003;
public static final int action_mode_bar=0x7f0d003e;
@@ -1682,11 +1684,11 @@ containing a value of this type.
public static final int alertTitle=0x7f0d0030;
public static final int always=0x7f0d001b;
public static final int beginning=0x7f0d0018;
- public static final int button3=0x7f0d007f;
+ public static final int button3=0x7f0d0080;
public static final int buttonPanel=0x7f0d002b;
- public static final int cancel_action=0x7f0d006b;
+ public static final int cancel_action=0x7f0d006c;
public static final int checkbox=0x7f0d0039;
- public static final int chronometer=0x7f0d0071;
+ public static final int chronometer=0x7f0d0072;
public static final int collapseActionView=0x7f0d001c;
public static final int contentPanel=0x7f0d0031;
public static final int custom=0x7f0d0037;
@@ -1696,7 +1698,7 @@ containing a value of this type.
public static final int disableHome=0x7f0d000c;
public static final int edit_query=0x7f0d0043;
public static final int end=0x7f0d0019;
- public static final int end_padder=0x7f0d0076;
+ public static final int end_padder=0x7f0d0077;
public static final int expand_activities_button=0x7f0d0025;
public static final int expanded_menu=0x7f0d0038;
public static final int game_countdown=0x7f0d0057;
@@ -1709,35 +1711,36 @@ containing a value of this type.
public static final int game_toolbuttonbar=0x7f0d0051;
public static final int home=0x7f0d0004;
public static final int homeAsUp=0x7f0d000d;
- public static final int horizontalScrollView=0x7f0d005e;
+ public static final int horizontalScrollView=0x7f0d005f;
public static final int icon=0x7f0d0029;
public static final int ifRoom=0x7f0d001d;
public static final int image=0x7f0d0026;
- public static final int imageView=0x7f0d0064;
- public static final int imageView2=0x7f0d00a6;
- public static final int imageView3=0x7f0d00a4;
- public static final int info=0x7f0d0075;
- public static final int levelbutton_lock=0x7f0d005c;
+ public static final int imageView=0x7f0d0065;
+ public static final int imageView4=0x7f0d00a8;
+ public static final int info=0x7f0d0076;
+ public static final int levelbutton_energy=0x7f0d005c;
+ public static final int levelbutton_lock=0x7f0d005d;
public static final int levelbutton_star1=0x7f0d0059;
public static final int levelbutton_star2=0x7f0d005a;
public static final int levelbutton_star3=0x7f0d005b;
+ public static final int levelbutton_starView=0x7f0d00a5;
public static final int levelbutton_textview=0x7f0d0058;
- public static final int levels_bottomRow=0x7f0d0060;
- public static final int levels_topRow=0x7f0d005f;
- public static final int levels_topbar=0x7f0d005d;
- public static final int levelup_level=0x7f0d0062;
- public static final int levelup_mainlayout=0x7f0d0061;
- public static final int levelup_text=0x7f0d0063;
- public static final int levelup_unlocklist=0x7f0d0065;
- public static final int line1=0x7f0d006f;
- public static final int line3=0x7f0d0073;
+ public static final int levels_bottomRow=0x7f0d0061;
+ public static final int levels_topRow=0x7f0d0060;
+ public static final int levels_topbar=0x7f0d005e;
+ public static final int levelup_level=0x7f0d0063;
+ public static final int levelup_mainlayout=0x7f0d0062;
+ public static final int levelup_text=0x7f0d0064;
+ public static final int levelup_unlocklist=0x7f0d0066;
+ public static final int line1=0x7f0d0070;
+ public static final int line3=0x7f0d0074;
public static final int listMode=0x7f0d0009;
public static final int list_item=0x7f0d0028;
- public static final int media_actions=0x7f0d006d;
- public static final int message_exitbutton=0x7f0d0068;
- public static final int message_leftbutton=0x7f0d0067;
- public static final int message_title=0x7f0d0066;
- public static final int message_tryagainbutton=0x7f0d0069;
+ public static final int media_actions=0x7f0d006e;
+ public static final int message_exitbutton=0x7f0d0069;
+ public static final int message_leftbutton=0x7f0d0068;
+ public static final int message_title=0x7f0d0067;
+ public static final int message_tryagainbutton=0x7f0d006a;
public static final int middle=0x7f0d001a;
public static final int multiply=0x7f0d0013;
public static final int never=0x7f0d001e;
@@ -1763,10 +1766,10 @@ containing a value of this type.
public static final int search_voice_btn=0x7f0d004e;
public static final int select_dialog_listview=0x7f0d004f;
public static final int shortcut=0x7f0d003a;
- public static final int shortmenu_continue=0x7f0d0078;
- public static final int shortmenu_exit=0x7f0d007a;
- public static final int shortmenu_restart=0x7f0d0079;
- public static final int shortmenu_topbar=0x7f0d0077;
+ public static final int shortmenu_continue=0x7f0d0079;
+ public static final int shortmenu_exit=0x7f0d007b;
+ public static final int shortmenu_restart=0x7f0d007a;
+ public static final int shortmenu_topbar=0x7f0d0078;
public static final int showCustom=0x7f0d000f;
public static final int showHome=0x7f0d0010;
public static final int showTitle=0x7f0d0011;
@@ -1775,62 +1778,64 @@ containing a value of this type.
public static final int src_atop=0x7f0d0015;
public static final int src_in=0x7f0d0016;
public static final int src_over=0x7f0d0017;
- public static final int startscreen_comingsoon=0x7f0d007d;
- public static final int startscreen_maxcheat=0x7f0d007e;
- public static final int startscreen_play=0x7f0d007c;
- public static final int startscreen_sound=0x7f0d007b;
- public static final int status_bar_latest_event_content=0x7f0d006c;
+ public static final int startscreen_comingsoon=0x7f0d007e;
+ public static final int startscreen_maxcheat=0x7f0d007f;
+ public static final int startscreen_play=0x7f0d007d;
+ public static final int startscreen_sound=0x7f0d007c;
+ public static final int status_bar_latest_event_content=0x7f0d006d;
public static final int submit_area=0x7f0d004c;
public static final int tabMode=0x7f0d000b;
- public static final int text=0x7f0d0074;
- public static final int text2=0x7f0d0072;
+ public static final int text=0x7f0d0075;
+ public static final int text2=0x7f0d0073;
public static final int textSpacerNoButtons=0x7f0d0034;
- public static final int time=0x7f0d0070;
+ public static final int time=0x7f0d0071;
public static final int title=0x7f0d002a;
public static final int title_template=0x7f0d002f;
- public static final int toolProgressBar=0x7f0d0085;
- public static final int toolProgressBarView=0x7f0d0083;
- public static final int toolProgressButtonAnimation=0x7f0d0084;
- public static final int toolbutton_1=0x7f0d0086;
- public static final int toolbutton_2=0x7f0d0087;
- public static final int toolbutton_3=0x7f0d0088;
- public static final int toolbutton_4=0x7f0d0089;
- public static final int toolofferslot_slot=0x7f0d0081;
- public static final int toolofferslot_title=0x7f0d0080;
- public static final int toolshop_price_button=0x7f0d0091;
- public static final int toolshop_scrollview=0x7f0d008f;
- public static final int toolshop_slot1=0x7f0d008b;
- public static final int toolshop_slot2=0x7f0d008c;
- public static final int toolshop_slot3=0x7f0d008d;
- public static final int toolshop_slot4=0x7f0d008e;
- public static final int toolshop_tool_offer_layout=0x7f0d0090;
- public static final int toolshop_topbar=0x7f0d008a;
- public static final int toolslot_image=0x7f0d0082;
+ public static final int toolProgressBar=0x7f0d0086;
+ public static final int toolProgressBarView=0x7f0d0084;
+ public static final int toolProgressButtonAnimation=0x7f0d0085;
+ public static final int toolbutton_1=0x7f0d0087;
+ public static final int toolbutton_2=0x7f0d0088;
+ public static final int toolbutton_3=0x7f0d0089;
+ public static final int toolbutton_4=0x7f0d008a;
+ public static final int toolofferslot_slot=0x7f0d0082;
+ public static final int toolofferslot_title=0x7f0d0081;
+ public static final int toolshop_price_button=0x7f0d0092;
+ public static final int toolshop_scrollview=0x7f0d0090;
+ public static final int toolshop_slot1=0x7f0d008c;
+ public static final int toolshop_slot2=0x7f0d008d;
+ public static final int toolshop_slot3=0x7f0d008e;
+ public static final int toolshop_slot4=0x7f0d008f;
+ public static final int toolshop_tool_offer_layout=0x7f0d0091;
+ public static final int toolshop_topbar=0x7f0d008b;
+ public static final int toolslot_image=0x7f0d0083;
public static final int topPanel=0x7f0d002e;
- public static final int topbar_energycount=0x7f0d0099;
- public static final int topbar_energyview=0x7f0d0098;
- public static final int topbar_layout=0x7f0d0092;
- public static final int topbar_leveldisplay=0x7f0d0094;
- public static final int topbar_levellayout=0x7f0d0093;
- public static final int topbar_levelprogress=0x7f0d0095;
- public static final int topbar_resetButton=0x7f0d009d;
- public static final int topbar_soundtoggle=0x7f0d009a;
- public static final int topbar_starcount=0x7f0d0097;
- public static final int topbar_starcount_decrease=0x7f0d009c;
- public static final int topbar_starview=0x7f0d0096;
- public static final int topbar_toolshop=0x7f0d009b;
- public static final int unlockmessage_message=0x7f0d009f;
- public static final int unlockmessage_toolimage=0x7f0d009e;
+ public static final int topbar_energycount=0x7f0d009a;
+ public static final int topbar_energyview=0x7f0d0099;
+ public static final int topbar_layout=0x7f0d0093;
+ public static final int topbar_leveldisplay=0x7f0d0095;
+ public static final int topbar_levellayout=0x7f0d0094;
+ public static final int topbar_levelprogress=0x7f0d0096;
+ public static final int topbar_resetButton=0x7f0d009e;
+ public static final int topbar_soundtoggle=0x7f0d009b;
+ public static final int topbar_starcount=0x7f0d0098;
+ public static final int topbar_starcount_decrease=0x7f0d009d;
+ public static final int topbar_starview=0x7f0d0097;
+ public static final int topbar_toolshop=0x7f0d009c;
+ public static final int unlockmessage_message=0x7f0d00a0;
+ public static final int unlockmessage_toolimage=0x7f0d009f;
public static final int up=0x7f0d0008;
public static final int useLogo=0x7f0d0012;
public static final int withText=0x7f0d001f;
- public static final int worldbutton_levelcount=0x7f0d00a3;
- public static final int worldbutton_lock=0x7f0d00a2;
- public static final int worldbutton_preview=0x7f0d00a1;
- public static final int worldbutton_starcount=0x7f0d00a5;
- public static final int worldbutton_title=0x7f0d00a0;
- public static final int worlds_layout=0x7f0d00a8;
- public static final int worlds_topbar=0x7f0d00a7;
+ public static final int worldbutton_energycount=0x7f0d00a7;
+ public static final int worldbutton_levelcount=0x7f0d00a4;
+ public static final int worldbutton_lock=0x7f0d00a9;
+ public static final int worldbutton_preview=0x7f0d00a2;
+ public static final int worldbutton_starcount=0x7f0d00a6;
+ public static final int worldbutton_tickView=0x7f0d00a3;
+ public static final int worldbutton_title=0x7f0d00a1;
+ public static final int worlds_layout=0x7f0d00ab;
+ public static final int worlds_topbar=0x7f0d00aa;
public static final int wrap_content=0x7f0d0020;
}
public static final class integer {
diff --git a/app/build/intermediates/blame/res/debug/single/drawable.json b/app/build/intermediates/blame/res/debug/single/drawable.json
index 208abae..3639333 100644
--- a/app/build/intermediates/blame/res/debug/single/drawable.json
+++ b/app/build/intermediates/blame/res/debug/single/drawable.json
@@ -19,10 +19,6 @@
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\xml_tool_slot_background.xml",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\xml_tool_slot_background.xml"
},
- {
- "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\star_empty.png",
- "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\star_empty.png"
- },
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\ramp.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\ramp.png"
@@ -71,6 +67,10 @@
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\currency_energy_atlas.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\currency_energy_atlas.png"
},
+ {
+ "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tick.png",
+ "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tick.png"
+ },
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tools_springbutton.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tools_springbutton.png"
@@ -139,6 +139,10 @@
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_btn_default_mtrl_shape.xml",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.1\\res\\drawable\\abc_btn_default_mtrl_shape.xml"
},
+ {
+ "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\currency_energy_empty.png",
+ "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\currency_energy_empty.png"
+ },
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\backgrounds_menu_grass.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\backgrounds_menu_grass.png"
@@ -151,6 +155,10 @@
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_item_background_holo_light.xml",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.1\\res\\drawable\\abc_item_background_holo_light.xml"
},
+ {
+ "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\currency_star_empty.png",
+ "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\currency_star_empty.png"
+ },
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\xml_levelbutton_background.xml",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\xml_levelbutton_background.xml"
diff --git a/app/build/intermediates/incremental/mergeDebugResources/merger.xml b/app/build/intermediates/incremental/mergeDebugResources/merger.xml
index 512614b..1dbf491 100644
--- a/app/build/intermediates/incremental/mergeDebugResources/merger.xml
+++ b/app/build/intermediates/incremental/mergeDebugResources/merger.xml
@@ -1346,7 +1346,7 @@
?android:attr/actionMenuTextAppearance@drawable/abc_control_background_material
- "999+""TẮT""Gửi truy vấn""Xóa truy vấn""Chọn một ứng dụng""Tìm kiếm…""Chia sẻ với %s""Thêm tùy chọn""Xong""Tìm kiếm bằng giọng nói""%1$s, %2$s""Xem tất cả""BẬT""Tìm kiếm""%1$s, %2$s, %3$s""Tìm kiếm truy vấn""Chia sẻ với""Điều hướng lên trên""Điều hướng về trang chủ""Thu gọn"3truetrue45192dipfalse50%60%false192dip70%90%545%72%256dip"关闭""提交查询""转到上一层级""999+""更多选项""语音搜索""收起""转到主屏幕""%1$s：%2$s""分享方式""开启""搜索""选择应用""查看全部""%1$s - %2$s：%3$s""搜索查询""完成""清除查询""通过%s分享""搜索…""清除查詢""999 +""更多選項""提交查詢""收合""與「%s」分享""向上瀏覽""開啟""語音搜尋""顯示全部""搜尋…""選擇應用程式""搜尋""%1$s (%2$s)：%3$s""完成""%1$s：%2$s""搜尋查詢""分享對象""關閉""瀏覽主頁""提交查詢""%1$s - %2$s：%3$s""選擇分享對象""%1$s：%2$s""查看全部""選擇應用程式""清除查詢""更多選項""與「%s」分享""搜尋""搜尋查詢""語音搜尋""向上瀏覽""關閉""瀏覽首頁""完成""開啟""999+""收合""搜尋…""Iyasesha...""%1$s, %2$s""Hambisa umbuzo""Yabelana no-%s""%1$s, %2$s, %3$s""Izinketho eziningi""Kwenziwe""Umbuzo wosesho""Zulazulela phezulu""Sula inkinga""Sesha""VULIWE""Yabelana no-""Goqa""VALIWE""Ukusesha ngezwi""Khetha uhlelo lokusebenza""Zulazulela ekhaya""Buka konke""999+"#39be27#db41e42b#303f9f#e5dc1522#ffda45#db911c0f#db41e42b#b3d700#891e4e#f0f41e02#715f5f#f0d7b106#3f51b5#f0f28117#dbfff200#ff4081#db494b49EndlessRoll"999+""TẮT""Gửi truy vấn""Xóa truy vấn""Chọn một ứng dụng""Tìm kiếm…""Chia sẻ với %s""Thêm tùy chọn""Xong""Tìm kiếm bằng giọng nói""%1$s, %2$s""Xem tất cả""BẬT""Tìm kiếm""%1$s, %2$s, %3$s""Tìm kiếm truy vấn""Chia sẻ với""Điều hướng lên trên""Điều hướng về trang chủ""Thu gọn"3truetrue45192dipfalse50%60%false192dip70%90%545%72%256dip"关闭""提交查询""转到上一层级""999+""更多选项""语音搜索""收起""转到主屏幕""%1$s：%2$s""分享方式""开启""搜索""选择应用""查看全部""%1$s - %2$s：%3$s""搜索查询""完成""清除查询""通过%s分享""搜索…""清除查詢""999 +""更多選項""提交查詢""收合""與「%s」分享""向上瀏覽""開啟""語音搜尋""顯示全部""搜尋…""選擇應用程式""搜尋""%1$s (%2$s)：%3$s""完成""%1$s：%2$s""搜尋查詢""分享對象""關閉""瀏覽主頁""提交查詢""%1$s - %2$s：%3$s""選擇分享對象""%1$s：%2$s""查看全部""選擇應用程式""清除查詢""更多選項""與「%s」分享""搜尋""搜尋查詢""語音搜尋""向上瀏覽""關閉""瀏覽首頁""完成""開啟""999+""收合""搜尋…""Iyasesha...""%1$s, %2$s""Hambisa umbuzo""Yabelana no-%s""%1$s, %2$s, %3$s""Izinketho eziningi""Kwenziwe""Umbuzo wosesho""Zulazulela phezulu""Sula inkinga""Sesha""VULIWE""Yabelana no-""Goqa""VALIWE""Ukusesha ngezwi""Khetha uhlelo lokusebenza""Zulazulela ekhaya""Buka konke""999+"#39be27#db41e42b#303f9f#e5dc1522#ffda45#db911c0f#db41e42b#b3d700#891e4e#f0f41e02#715f5f#f0d7b106#3f51b5#f0f28117#dbfff200#ff4081#db494b49EndlessRoll
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/build/intermediates/res/merged/debug/layout/game.xml b/app/build/intermediates/res/merged/debug/layout/game.xml
index cea1347..664eb66 100644
--- a/app/build/intermediates/res/merged/debug/layout/game.xml
+++ b/app/build/intermediates/res/merged/debug/layout/game.xml
@@ -6,8 +6,8 @@
+
+
@@ -17,76 +17,103 @@
-
-
+ android:src="@drawable/previews_grass"
+ android:layout_width="150dp" />
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentRight="true"
+ android:layout_alignParentStart="true">
-
+ android:layout_centerHorizontal="true">
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/build/intermediates/res/resources-debug.ap_ b/app/build/intermediates/res/resources-debug.ap_
index 0d0ad4f..90801a3 100644
Binary files a/app/build/intermediates/res/resources-debug.ap_ and b/app/build/intermediates/res/resources-debug.ap_ differ
diff --git a/app/build/intermediates/symbols/debug/R.txt b/app/build/intermediates/symbols/debug/R.txt
index 9ab46d9..0a2d82e 100644
--- a/app/build/intermediates/symbols/debug/R.txt
+++ b/app/build/intermediates/symbols/debug/R.txt
@@ -471,45 +471,47 @@ int drawable backgrounds_menu_levelup 0x7f020049
int drawable backgrounds_menu_shortmenu 0x7f02004a
int drawable currency_energy 0x7f02004b
int drawable currency_energy_atlas 0x7f02004c
-int drawable currency_star 0x7f02004d
-int drawable goal 0x7f02004e
-int drawable guis_pausebutton 0x7f02004f
-int drawable guis_playerarrow 0x7f020050
-int drawable guis_sound_off 0x7f020051
-int drawable guis_sound_on 0x7f020052
-int drawable lock_locked 0x7f020053
-int drawable lock_unlocked 0x7f020054
-int drawable notification_template_icon_bg 0x7f020072
-int drawable obstacles_cave 0x7f020055
-int drawable obstacles_grass 0x7f020056
-int drawable obstacles_mountains 0x7f020057
-int drawable playershapes_ball 0x7f020058
-int drawable previews_grass 0x7f020059
-int drawable purple 0x7f02005a
-int drawable ramp 0x7f02005b
-int drawable rampbutton 0x7f02005c
-int drawable splitter 0x7f02005d
-int drawable star_empty 0x7f02005e
-int drawable star_icon 0x7f02005f
-int drawable terrain_c_grass 0x7f020060
-int drawable terrain_t_grass 0x7f020061
-int drawable tools_bomb 0x7f020062
-int drawable tools_bombbutton 0x7f020063
-int drawable tools_emptybutton 0x7f020064
-int drawable tools_lockedbutton 0x7f020065
-int drawable tools_magnet 0x7f020066
-int drawable tools_magnetbutton 0x7f020067
-int drawable tools_spring 0x7f020068
-int drawable tools_springbutton 0x7f020069
-int drawable tools_unlockedbutton 0x7f02006a
-int drawable xml_custom_button 0x7f02006b
-int drawable xml_levelbutton_background 0x7f02006c
-int drawable xml_sound_toggle 0x7f02006d
-int drawable xml_tool_slot_background 0x7f02006e
-int drawable xml_toolprogressbarlayers 0x7f02006f
-int drawable xml_unlock_message_background 0x7f020070
-int drawable xml_worldbutton_background 0x7f020071
-int id action0 0x7f0d006a
+int drawable currency_energy_empty 0x7f02004d
+int drawable currency_star 0x7f02004e
+int drawable currency_star_empty 0x7f02004f
+int drawable goal 0x7f020050
+int drawable guis_pausebutton 0x7f020051
+int drawable guis_playerarrow 0x7f020052
+int drawable guis_sound_off 0x7f020053
+int drawable guis_sound_on 0x7f020054
+int drawable lock_locked 0x7f020055
+int drawable lock_unlocked 0x7f020056
+int drawable notification_template_icon_bg 0x7f020074
+int drawable obstacles_cave 0x7f020057
+int drawable obstacles_grass 0x7f020058
+int drawable obstacles_mountains 0x7f020059
+int drawable playershapes_ball 0x7f02005a
+int drawable previews_grass 0x7f02005b
+int drawable purple 0x7f02005c
+int drawable ramp 0x7f02005d
+int drawable rampbutton 0x7f02005e
+int drawable splitter 0x7f02005f
+int drawable star_icon 0x7f020060
+int drawable terrain_c_grass 0x7f020061
+int drawable terrain_t_grass 0x7f020062
+int drawable tick 0x7f020063
+int drawable tools_bomb 0x7f020064
+int drawable tools_bombbutton 0x7f020065
+int drawable tools_emptybutton 0x7f020066
+int drawable tools_lockedbutton 0x7f020067
+int drawable tools_magnet 0x7f020068
+int drawable tools_magnetbutton 0x7f020069
+int drawable tools_spring 0x7f02006a
+int drawable tools_springbutton 0x7f02006b
+int drawable tools_unlockedbutton 0x7f02006c
+int drawable xml_custom_button 0x7f02006d
+int drawable xml_levelbutton_background 0x7f02006e
+int drawable xml_sound_toggle 0x7f02006f
+int drawable xml_tool_slot_background 0x7f020070
+int drawable xml_toolprogressbarlayers 0x7f020071
+int drawable xml_unlock_message_background 0x7f020072
+int drawable xml_worldbutton_background 0x7f020073
+int id action0 0x7f0d006b
int id action_bar 0x7f0d0041
int id action_bar_activity_content 0x7f0d0000
int id action_bar_container 0x7f0d0040
@@ -518,7 +520,7 @@ int id action_bar_spinner 0x7f0d0001
int id action_bar_subtitle 0x7f0d0022
int id action_bar_title 0x7f0d0021
int id action_context_bar 0x7f0d0042
-int id action_divider 0x7f0d006e
+int id action_divider 0x7f0d006f
int id action_menu_divider 0x7f0d0002
int id action_menu_presenter 0x7f0d0003
int id action_mode_bar 0x7f0d003e
@@ -528,11 +530,11 @@ int id activity_chooser_view_content 0x7f0d0024
int id alertTitle 0x7f0d0030
int id always 0x7f0d001b
int id beginning 0x7f0d0018
-int id button3 0x7f0d007f
+int id button3 0x7f0d0080
int id buttonPanel 0x7f0d002b
-int id cancel_action 0x7f0d006b
+int id cancel_action 0x7f0d006c
int id checkbox 0x7f0d0039
-int id chronometer 0x7f0d0071
+int id chronometer 0x7f0d0072
int id collapseActionView 0x7f0d001c
int id contentPanel 0x7f0d0031
int id custom 0x7f0d0037
@@ -542,7 +544,7 @@ int id default_activity_button 0x7f0d0027
int id disableHome 0x7f0d000c
int id edit_query 0x7f0d0043
int id end 0x7f0d0019
-int id end_padder 0x7f0d0076
+int id end_padder 0x7f0d0077
int id expand_activities_button 0x7f0d0025
int id expanded_menu 0x7f0d0038
int id game_countdown 0x7f0d0057
@@ -555,35 +557,36 @@ int id game_shortmenu 0x7f0d0055
int id game_toolbuttonbar 0x7f0d0051
int id home 0x7f0d0004
int id homeAsUp 0x7f0d000d
-int id horizontalScrollView 0x7f0d005e
+int id horizontalScrollView 0x7f0d005f
int id icon 0x7f0d0029
int id ifRoom 0x7f0d001d
int id image 0x7f0d0026
-int id imageView 0x7f0d0064
-int id imageView2 0x7f0d00a6
-int id imageView3 0x7f0d00a4
-int id info 0x7f0d0075
-int id levelbutton_lock 0x7f0d005c
+int id imageView 0x7f0d0065
+int id imageView4 0x7f0d00a8
+int id info 0x7f0d0076
+int id levelbutton_energy 0x7f0d005c
+int id levelbutton_lock 0x7f0d005d
int id levelbutton_star1 0x7f0d0059
int id levelbutton_star2 0x7f0d005a
int id levelbutton_star3 0x7f0d005b
+int id levelbutton_starView 0x7f0d00a5
int id levelbutton_textview 0x7f0d0058
-int id levels_bottomRow 0x7f0d0060
-int id levels_topRow 0x7f0d005f
-int id levels_topbar 0x7f0d005d
-int id levelup_level 0x7f0d0062
-int id levelup_mainlayout 0x7f0d0061
-int id levelup_text 0x7f0d0063
-int id levelup_unlocklist 0x7f0d0065
-int id line1 0x7f0d006f
-int id line3 0x7f0d0073
+int id levels_bottomRow 0x7f0d0061
+int id levels_topRow 0x7f0d0060
+int id levels_topbar 0x7f0d005e
+int id levelup_level 0x7f0d0063
+int id levelup_mainlayout 0x7f0d0062
+int id levelup_text 0x7f0d0064
+int id levelup_unlocklist 0x7f0d0066
+int id line1 0x7f0d0070
+int id line3 0x7f0d0074
int id listMode 0x7f0d0009
int id list_item 0x7f0d0028
-int id media_actions 0x7f0d006d
-int id message_exitbutton 0x7f0d0068
-int id message_leftbutton 0x7f0d0067
-int id message_title 0x7f0d0066
-int id message_tryagainbutton 0x7f0d0069
+int id media_actions 0x7f0d006e
+int id message_exitbutton 0x7f0d0069
+int id message_leftbutton 0x7f0d0068
+int id message_title 0x7f0d0067
+int id message_tryagainbutton 0x7f0d006a
int id middle 0x7f0d001a
int id multiply 0x7f0d0013
int id never 0x7f0d001e
@@ -609,10 +612,10 @@ int id search_src_text 0x7f0d004a
int id search_voice_btn 0x7f0d004e
int id select_dialog_listview 0x7f0d004f
int id shortcut 0x7f0d003a
-int id shortmenu_continue 0x7f0d0078
-int id shortmenu_exit 0x7f0d007a
-int id shortmenu_restart 0x7f0d0079
-int id shortmenu_topbar 0x7f0d0077
+int id shortmenu_continue 0x7f0d0079
+int id shortmenu_exit 0x7f0d007b
+int id shortmenu_restart 0x7f0d007a
+int id shortmenu_topbar 0x7f0d0078
int id showCustom 0x7f0d000f
int id showHome 0x7f0d0010
int id showTitle 0x7f0d0011
@@ -621,62 +624,64 @@ int id split_action_bar 0x7f0d0007
int id src_atop 0x7f0d0015
int id src_in 0x7f0d0016
int id src_over 0x7f0d0017
-int id startscreen_comingsoon 0x7f0d007d
-int id startscreen_maxcheat 0x7f0d007e
-int id startscreen_play 0x7f0d007c
-int id startscreen_sound 0x7f0d007b
-int id status_bar_latest_event_content 0x7f0d006c
+int id startscreen_comingsoon 0x7f0d007e
+int id startscreen_maxcheat 0x7f0d007f
+int id startscreen_play 0x7f0d007d
+int id startscreen_sound 0x7f0d007c
+int id status_bar_latest_event_content 0x7f0d006d
int id submit_area 0x7f0d004c
int id tabMode 0x7f0d000b
-int id text 0x7f0d0074
-int id text2 0x7f0d0072
+int id text 0x7f0d0075
+int id text2 0x7f0d0073
int id textSpacerNoButtons 0x7f0d0034
-int id time 0x7f0d0070
+int id time 0x7f0d0071
int id title 0x7f0d002a
int id title_template 0x7f0d002f
-int id toolProgressBar 0x7f0d0085
-int id toolProgressBarView 0x7f0d0083
-int id toolProgressButtonAnimation 0x7f0d0084
-int id toolbutton_1 0x7f0d0086
-int id toolbutton_2 0x7f0d0087
-int id toolbutton_3 0x7f0d0088
-int id toolbutton_4 0x7f0d0089
-int id toolofferslot_slot 0x7f0d0081
-int id toolofferslot_title 0x7f0d0080
-int id toolshop_price_button 0x7f0d0091
-int id toolshop_scrollview 0x7f0d008f
-int id toolshop_slot1 0x7f0d008b
-int id toolshop_slot2 0x7f0d008c
-int id toolshop_slot3 0x7f0d008d
-int id toolshop_slot4 0x7f0d008e
-int id toolshop_tool_offer_layout 0x7f0d0090
-int id toolshop_topbar 0x7f0d008a
-int id toolslot_image 0x7f0d0082
+int id toolProgressBar 0x7f0d0086
+int id toolProgressBarView 0x7f0d0084
+int id toolProgressButtonAnimation 0x7f0d0085
+int id toolbutton_1 0x7f0d0087
+int id toolbutton_2 0x7f0d0088
+int id toolbutton_3 0x7f0d0089
+int id toolbutton_4 0x7f0d008a
+int id toolofferslot_slot 0x7f0d0082
+int id toolofferslot_title 0x7f0d0081
+int id toolshop_price_button 0x7f0d0092
+int id toolshop_scrollview 0x7f0d0090
+int id toolshop_slot1 0x7f0d008c
+int id toolshop_slot2 0x7f0d008d
+int id toolshop_slot3 0x7f0d008e
+int id toolshop_slot4 0x7f0d008f
+int id toolshop_tool_offer_layout 0x7f0d0091
+int id toolshop_topbar 0x7f0d008b
+int id toolslot_image 0x7f0d0083
int id topPanel 0x7f0d002e
-int id topbar_energycount 0x7f0d0099
-int id topbar_energyview 0x7f0d0098
-int id topbar_layout 0x7f0d0092
-int id topbar_leveldisplay 0x7f0d0094
-int id topbar_levellayout 0x7f0d0093
-int id topbar_levelprogress 0x7f0d0095
-int id topbar_resetButton 0x7f0d009d
-int id topbar_soundtoggle 0x7f0d009a
-int id topbar_starcount 0x7f0d0097
-int id topbar_starcount_decrease 0x7f0d009c
-int id topbar_starview 0x7f0d0096
-int id topbar_toolshop 0x7f0d009b
-int id unlockmessage_message 0x7f0d009f
-int id unlockmessage_toolimage 0x7f0d009e
+int id topbar_energycount 0x7f0d009a
+int id topbar_energyview 0x7f0d0099
+int id topbar_layout 0x7f0d0093
+int id topbar_leveldisplay 0x7f0d0095
+int id topbar_levellayout 0x7f0d0094
+int id topbar_levelprogress 0x7f0d0096
+int id topbar_resetButton 0x7f0d009e
+int id topbar_soundtoggle 0x7f0d009b
+int id topbar_starcount 0x7f0d0098
+int id topbar_starcount_decrease 0x7f0d009d
+int id topbar_starview 0x7f0d0097
+int id topbar_toolshop 0x7f0d009c
+int id unlockmessage_message 0x7f0d00a0
+int id unlockmessage_toolimage 0x7f0d009f
int id up 0x7f0d0008
int id useLogo 0x7f0d0012
int id withText 0x7f0d001f
-int id worldbutton_levelcount 0x7f0d00a3
-int id worldbutton_lock 0x7f0d00a2
-int id worldbutton_preview 0x7f0d00a1
-int id worldbutton_starcount 0x7f0d00a5
-int id worldbutton_title 0x7f0d00a0
-int id worlds_layout 0x7f0d00a8
-int id worlds_topbar 0x7f0d00a7
+int id worldbutton_energycount 0x7f0d00a7
+int id worldbutton_levelcount 0x7f0d00a4
+int id worldbutton_lock 0x7f0d00a9
+int id worldbutton_preview 0x7f0d00a2
+int id worldbutton_starcount 0x7f0d00a6
+int id worldbutton_tickView 0x7f0d00a3
+int id worldbutton_title 0x7f0d00a1
+int id worlds_layout 0x7f0d00ab
+int id worlds_topbar 0x7f0d00aa
int id wrap_content 0x7f0d0020
int integer abc_config_activityDefaultDur 0x7f0b0001
int integer abc_config_activityShortDur 0x7f0b0002
diff --git a/app/src/main/java/com/example/julian/endlessroll/levels/LevelPack.java b/app/src/main/java/com/example/julian/endlessroll/levels/LevelPack.java
index 8e246ef..ec049c7 100644
--- a/app/src/main/java/com/example/julian/endlessroll/levels/LevelPack.java
+++ b/app/src/main/java/com/example/julian/endlessroll/levels/LevelPack.java
@@ -64,6 +64,17 @@ public class LevelPack {
return levels.size() * 3;
}
+ public int getCollectedEnergyCount(){
+ int count = 0;
+ for(Level level : levels)
+ count += level.isEnergyCollected() ? 1 : 0;
+ return count;
+ }
+
+ public int getAvailableEnergy(){
+ return levels.size();
+ }
+
public void tryToUnlockFirstLevel() {
Level firstLevel = getLevel(0);
if (firstLevel != null)
diff --git a/app/src/main/java/com/example/julian/endlessroll/main/GameActivity.java b/app/src/main/java/com/example/julian/endlessroll/main/GameActivity.java
index c812597..948a785 100644
--- a/app/src/main/java/com/example/julian/endlessroll/main/GameActivity.java
+++ b/app/src/main/java/com/example/julian/endlessroll/main/GameActivity.java
@@ -85,11 +85,8 @@ public class GameActivity extends Activity implements ExceptionHandler, User.LvU
relativeLayout.addView(flipper);
relativeLayout.addView(levelupMessage.getLayout());
//TODO: add Tutorial
- //TODO: add Energy count on TopBar
//TODO: show Energy on levelButton if collected
//TODO: Scroll up
- //TODO: World button tick for completed levels
- //TODO: World/level button: energy
//TODO: Goal animation!
//TODO: Goal screen animation!
setContentView(relativeLayout);
diff --git a/app/src/main/java/com/example/julian/endlessroll/main/game/Game.java b/app/src/main/java/com/example/julian/endlessroll/main/game/Game.java
index 360f8a1..a67e854 100644
--- a/app/src/main/java/com/example/julian/endlessroll/main/game/Game.java
+++ b/app/src/main/java/com/example/julian/endlessroll/main/game/Game.java
@@ -226,7 +226,7 @@ public class Game extends Rendering {
user.gainLvFinishedEp();
level.setFinished(true);
- for (int i = 1; i <= 3; i++) {
+ for (int i = 0; i <= 2; i++) {
if (collectedStars.contains(i)) {
level.setStarCollected(i, true);
user.onStarCollected();
diff --git a/app/src/main/java/com/example/julian/endlessroll/main/screens/LevelsScreen.java b/app/src/main/java/com/example/julian/endlessroll/main/screens/LevelsScreen.java
index ed0c387..7cd6823 100644
--- a/app/src/main/java/com/example/julian/endlessroll/main/screens/LevelsScreen.java
+++ b/app/src/main/java/com/example/julian/endlessroll/main/screens/LevelsScreen.java
@@ -54,7 +54,7 @@ public class LevelsScreen extends Screen implements View.OnClickLi
private void createButton(Context context, Level level, int levelCount) {
int levelNumber = level.getId();
LevelButton button = new LevelButton(context, typeface, this, levelNumber, level.isLocked());
- button.showCollectedStars(level.getCollectedStars());
+ button.showCollectedCurrency(level.getCollectedStars(), level.isEnergyCollected());
levelButtons.put(levelNumber, button);
int halfLevelCount = levelCount / 2;
if (levelCount % 2 == 1)
diff --git a/app/src/main/java/com/example/julian/endlessroll/views/LevelButton.java b/app/src/main/java/com/example/julian/endlessroll/views/LevelButton.java
index 717db82..6863ff5 100644
--- a/app/src/main/java/com/example/julian/endlessroll/views/LevelButton.java
+++ b/app/src/main/java/com/example/julian/endlessroll/views/LevelButton.java
@@ -18,6 +18,7 @@ public class LevelButton extends RelativeLayout {
private ImageView star1;
private ImageView star2;
private ImageView star3;
+ private ImageView energy;
private ImageView lockImage;
public LevelButton(Context context, Typeface typeface, OnClickListener clickListener, int level, boolean locked) {
@@ -31,6 +32,7 @@ public class LevelButton extends RelativeLayout {
star1 = (ImageView) super.findViewById(R.id.levelbutton_star1);
star2 = (ImageView) super.findViewById(R.id.levelbutton_star2);
star3 = (ImageView) super.findViewById(R.id.levelbutton_star3);
+ energy = (ImageView) super.findViewById(R.id.levelbutton_energy);
lockImage = (ImageView) super.findViewById(R.id.levelbutton_lock);
setLockVisible(locked);
@@ -42,13 +44,15 @@ public class LevelButton extends RelativeLayout {
lockImage.setVisibility(visibility);
}
- public void showCollectedStars(boolean[] stars) {
+ public 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 boolean isLocked() {
diff --git a/app/src/main/java/com/example/julian/endlessroll/views/WorldButton.java b/app/src/main/java/com/example/julian/endlessroll/views/WorldButton.java
index 45f1d52..dff69d1 100644
--- a/app/src/main/java/com/example/julian/endlessroll/views/WorldButton.java
+++ b/app/src/main/java/com/example/julian/endlessroll/views/WorldButton.java
@@ -25,6 +25,7 @@ public class WorldButton extends RelativeLayout {
private ImageView lockImage;
private TextView levelCount;
private TextView starCount;
+ private TextView energyCount;
public WorldButton(Context context, Typeface typeface, View.OnClickListener clickListener, LevelPack levelPack) {
super(context);
@@ -43,6 +44,8 @@ public class WorldButton extends RelativeLayout {
levelCount.setTypeface(typeface);
starCount = (TextView) super.findViewById(R.id.worldbutton_starcount);
starCount.setTypeface(typeface);
+ energyCount = (TextView) super.findViewById(R.id.worldbutton_energycount);
+ energyCount.setTypeface(typeface);
updateInformation();
}
@@ -52,6 +55,7 @@ public class WorldButton extends RelativeLayout {
previewImage.setImageDrawable(getContext().getResources().getDrawable(theme.getPreviewId()));
levelCount.setText(levelPack.getFinishedLevelCount() + "/" + levelPack.getLevels().size());
starCount.setText(levelPack.getCollectedStarCount() + "/" + levelPack.getAvailableStars());
+ energyCount.setText(levelPack.getCollectedEnergyCount() + "/" + levelPack.getAvailableEnergy());
setLockVisible(levelPack.isLocked());
}
diff --git a/app/src/main/res/drawable/currency_energy.png b/app/src/main/res/drawable/currency_energy.png
index a2bc361..d57b9b5 100644
Binary files a/app/src/main/res/drawable/currency_energy.png and b/app/src/main/res/drawable/currency_energy.png differ
diff --git a/app/src/main/res/drawable/currency_energy_atlas.png b/app/src/main/res/drawable/currency_energy_atlas.png
index 253948c..2d65092 100644
Binary files a/app/src/main/res/drawable/currency_energy_atlas.png and b/app/src/main/res/drawable/currency_energy_atlas.png differ
diff --git a/app/src/main/res/drawable/currency_energy_empty.png b/app/src/main/res/drawable/currency_energy_empty.png
new file mode 100644
index 0000000..e17b27e
Binary files /dev/null and b/app/src/main/res/drawable/currency_energy_empty.png differ
diff --git a/app/src/main/res/drawable/currency_star.png b/app/src/main/res/drawable/currency_star.png
index e341bbc..f4e10e2 100644
Binary files a/app/src/main/res/drawable/currency_star.png and b/app/src/main/res/drawable/currency_star.png differ
diff --git a/app/src/main/res/drawable/currency_star_empty.png b/app/src/main/res/drawable/currency_star_empty.png
new file mode 100644
index 0000000..98c486b
Binary files /dev/null and b/app/src/main/res/drawable/currency_star_empty.png differ
diff --git a/app/src/main/res/drawable/star_empty.png b/app/src/main/res/drawable/star_empty.png
deleted file mode 100644
index 4582ad8..0000000
Binary files a/app/src/main/res/drawable/star_empty.png and /dev/null differ
diff --git a/app/src/main/res/drawable/tick.png b/app/src/main/res/drawable/tick.png
new file mode 100644
index 0000000..14092c2
Binary files /dev/null and b/app/src/main/res/drawable/tick.png differ
diff --git a/app/src/main/res/layout/game.xml b/app/src/main/res/layout/game.xml
index cea1347..664eb66 100644
--- a/app/src/main/res/layout/game.xml
+++ b/app/src/main/res/layout/game.xml
@@ -6,8 +6,8 @@
+
+
@@ -17,76 +17,103 @@
-
-
+ android:src="@drawable/previews_grass"
+ android:layout_width="150dp" />
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentRight="true"
+ android:layout_alignParentStart="true">
-
+ android:layout_centerHorizontal="true">
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file