Added back-arrow on topBar

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

@@ -456,7 +456,7 @@ public final class R {
         public static final int abc_textfield_search_activated_mtrl_alpha = 0x7f070042;
         public static final int abc_textfield_search_default_mtrl_alpha = 0x7f070043;
         public static final int abc_textfield_search_material = 0x7f070044;
-        public static final int notification_template_icon_bg = 0x7f070065;
+        public static final int notification_template_icon_bg = 0x7f070061;
     }
     public static final class id {
         public static final int action0 = 0x7f080000;
@@ -496,62 +496,62 @@ public final class R {
         public static final int expanded_menu = 0x7f08002f;
         public static final int home = 0x7f080048;
         public static final int homeAsUp = 0x7f080049;
-        public static final int icon = 0x7f08004b;
+        public static final int icon = 0x7f08004a;
-        public static final int ifRoom = 0x7f08004c;
+        public static final int ifRoom = 0x7f08004b;
-        public static final int image = 0x7f08004d;
+        public static final int image = 0x7f08004c;
-        public static final int info = 0x7f08004f;
+        public static final int info = 0x7f08004d;
-        public static final int line1 = 0x7f08005c;
+        public static final int line1 = 0x7f08005a;
-        public static final int line3 = 0x7f08005d;
+        public static final int line3 = 0x7f08005b;
-        public static final int listMode = 0x7f080060;
+        public static final int listMode = 0x7f08005d;
-        public static final int list_item = 0x7f080061;
+        public static final int list_item = 0x7f08005e;
-        public static final int media_actions = 0x7f080062;
+        public static final int media_actions = 0x7f08005f;
-        public static final int middle = 0x7f080063;
+        public static final int middle = 0x7f080060;
-        public static final int multiply = 0x7f080064;
+        public static final int multiply = 0x7f080061;
-        public static final int never = 0x7f080065;
+        public static final int never = 0x7f080062;
-        public static final int none = 0x7f080066;
+        public static final int none = 0x7f080063;
-        public static final int normal = 0x7f080067;
+        public static final int normal = 0x7f080064;
-        public static final int parentPanel = 0x7f080068;
+        public static final int parentPanel = 0x7f080065;
-        public static final int progress_circular = 0x7f08006c;
+        public static final int progress_circular = 0x7f080069;
-        public static final int progress_horizontal = 0x7f08006d;
+        public static final int progress_horizontal = 0x7f08006a;
-        public static final int radio = 0x7f08006e;
+        public static final int radio = 0x7f08006b;
-        public static final int screen = 0x7f08006f;
+        public static final int screen = 0x7f08006c;
-        public static final int scrollIndicatorDown = 0x7f080070;
+        public static final int scrollIndicatorDown = 0x7f08006d;
-        public static final int scrollIndicatorUp = 0x7f080071;
+        public static final int scrollIndicatorUp = 0x7f08006e;
-        public static final int scrollView = 0x7f080072;
+        public static final int scrollView = 0x7f08006f;
-        public static final int search_badge = 0x7f080073;
+        public static final int search_badge = 0x7f080070;
-        public static final int search_bar = 0x7f080074;
+        public static final int search_bar = 0x7f080071;
-        public static final int search_button = 0x7f080075;
+        public static final int search_button = 0x7f080072;
-        public static final int search_close_btn = 0x7f080076;
+        public static final int search_close_btn = 0x7f080073;
-        public static final int search_edit_frame = 0x7f080077;
+        public static final int search_edit_frame = 0x7f080074;
-        public static final int search_go_btn = 0x7f080078;
+        public static final int search_go_btn = 0x7f080075;
-        public static final int search_mag_icon = 0x7f080079;
+        public static final int search_mag_icon = 0x7f080076;
-        public static final int search_plate = 0x7f08007a;
+        public static final int search_plate = 0x7f080077;
-        public static final int search_src_text = 0x7f08007b;
+        public static final int search_src_text = 0x7f080078;
-        public static final int search_voice_btn = 0x7f08007c;
+        public static final int search_voice_btn = 0x7f080079;
-        public static final int select_dialog_listview = 0x7f08007d;
+        public static final int select_dialog_listview = 0x7f08007a;
-        public static final int shortcut = 0x7f080091;
+        public static final int shortcut = 0x7f08008e;
-        public static final int showCustom = 0x7f080096;
+        public static final int showCustom = 0x7f080093;
-        public static final int showHome = 0x7f080097;
+        public static final int showHome = 0x7f080094;
-        public static final int showTitle = 0x7f080098;
+        public static final int showTitle = 0x7f080095;
-        public static final int spacer = 0x7f080099;
+        public static final int spacer = 0x7f080096;
-        public static final int split_action_bar = 0x7f08009a;
+        public static final int split_action_bar = 0x7f080097;
-        public static final int src_atop = 0x7f08009b;
+        public static final int src_atop = 0x7f080098;
-        public static final int src_in = 0x7f08009c;
+        public static final int src_in = 0x7f080099;
-        public static final int src_over = 0x7f08009d;
+        public static final int src_over = 0x7f08009a;
-        public static final int status_bar_latest_event_content = 0x7f0800a3;
+        public static final int status_bar_latest_event_content = 0x7f0800a0;
-        public static final int submit_area = 0x7f0800a4;
+        public static final int submit_area = 0x7f0800a1;
-        public static final int tabMode = 0x7f0800a5;
+        public static final int tabMode = 0x7f0800a2;
-        public static final int text = 0x7f0800a7;
+        public static final int text = 0x7f0800a4;
-        public static final int text2 = 0x7f0800a8;
+        public static final int text2 = 0x7f0800a5;
-        public static final int textSpacerNoButtons = 0x7f0800a9;
+        public static final int textSpacerNoButtons = 0x7f0800a6;
-        public static final int time = 0x7f0800aa;
+        public static final int time = 0x7f0800a7;
-        public static final int title = 0x7f0800ab;
+        public static final int title = 0x7f0800a8;
-        public static final int title_template = 0x7f0800ac;
+        public static final int title_template = 0x7f0800a9;
-        public static final int topPanel = 0x7f0800c9;
+        public static final int topPanel = 0x7f0800c1;
-        public static final int up = 0x7f0800db;
+        public static final int up = 0x7f0800d3;
-        public static final int useLogo = 0x7f0800dc;
+        public static final int useLogo = 0x7f0800d4;
-        public static final int withText = 0x7f0800dd;
+        public static final int withText = 0x7f0800d5;
-        public static final int wrap_content = 0x7f0800e6;
+        public static final int wrap_content = 0x7f0800de;
     }
     public static final class integer {
         public static final int abc_config_activityDefaultDur = 0x7f090000;
@@ -619,7 +619,7 @@ public final class R {
         public static final int abc_shareactionprovider_share_with = 0x7f0d0010;
         public static final int abc_shareactionprovider_share_with_application = 0x7f0d0011;
         public static final int abc_toolbar_collapse_description = 0x7f0d0012;
-        public static final int status_bar_notification_info_overflow = 0x7f0d005c;
+        public static final int status_bar_notification_info_overflow = 0x7f0d0058;
     }
     public static final class style {
         public static final int AlertDialog_AppCompat = 0x7f0e0000;

app/build/intermediates/manifests/full/debug/AndroidManifest.xml

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

app/build/intermediates/symbols/debug/R.txt

@@ -16,10 +16,9 @@ int anim pulse 0x7f01000e
 int anim rotate 0x7f01000f
 int anim scale_up 0x7f010010
 int anim shape_button_rotation 0x7f010011
-int anim shrink 0x7f010012
+int anim slide_in_left 0x7f010012
-int anim slide_in_left 0x7f010013
+int anim slide_in_right 0x7f010013
-int anim slide_in_right 0x7f010014
+int anim slide_in_top 0x7f010014
-int anim slide_in_top 0x7f010015
 int array world_names 0x7f020000
 int attr actionBarDivider 0x7f030000
 int attr actionBarItemBackground 0x7f030001
@@ -331,7 +330,6 @@ int color toolslotDisabledSelected 0x7f05005c
 int color toolslotEnabled 0x7f05005d
 int color toolslotEnabledSelected 0x7f05005e
 int color transparent 0x7f05005f
-int color white 0x7f050060
 int dimen abc_action_bar_content_inset_material 0x7f060000
 int dimen abc_action_bar_default_height_material 0x7f060001
 int dimen abc_action_bar_default_padding_end_material 0x7f060002
@@ -481,104 +479,94 @@ int drawable abc_textfield_default_mtrl_alpha 0x7f070041
 int drawable abc_textfield_search_activated_mtrl_alpha 0x7f070042
 int drawable abc_textfield_search_default_mtrl_alpha 0x7f070043
 int drawable abc_textfield_search_material 0x7f070044
-int drawable backgrounds_game_cave 0x7f070045
+int drawable backgrounds_game_grass 0x7f070045
-int drawable backgrounds_game_grass 0x7f070046
+int drawable backgrounds_game_snow 0x7f070046
-int drawable backgrounds_game_snow 0x7f070047
+int drawable backgrounds_menu_grasslands 0x7f070047
-int drawable backgrounds_menu_grasslands 0x7f070048
+int drawable currency_energy 0x7f070048
-int drawable black 0x7f070049
+int drawable currency_energy_atlas 0x7f070049
-int drawable currency_energy 0x7f07004a
+int drawable currency_energy_empty 0x7f07004a
-int drawable currency_energy_atlas 0x7f07004b
+int drawable currency_star 0x7f07004b
-int drawable currency_energy_empty 0x7f07004c
+int drawable currency_star_empty 0x7f07004c
-int drawable currency_star 0x7f07004d
+int drawable guis_arrow_back_disabled 0x7f07004d
-int drawable currency_star_empty 0x7f07004e
+int drawable guis_arrow_back_enabled 0x7f07004e
-int drawable guis_arrow_green 0x7f07004f
+int drawable guis_checkbox_checked 0x7f07004f
-int drawable guis_checkbox_checked 0x7f070050
+int drawable guis_checkbox_unchecked 0x7f070050
-int drawable guis_checkbox_unchecked 0x7f070051
+int drawable guis_goal 0x7f070051
-int drawable guis_clock 0x7f070052
+int drawable guis_lock_locked 0x7f070052
-int drawable guis_goal 0x7f070053
+int drawable guis_music_off 0x7f070053
-int drawable guis_lock_locked 0x7f070054
+int drawable guis_music_on 0x7f070054
-int drawable guis_magnet_field 0x7f070055
+int drawable guis_pausebutton 0x7f070055
-int drawable guis_music_off 0x7f070056
+int drawable guis_playerarrow 0x7f070056
-int drawable guis_music_on 0x7f070057
+int drawable guis_settings_disabled 0x7f070057
-int drawable guis_pausebutton 0x7f070058
+int drawable guis_settings_enabled 0x7f070058
-int drawable guis_playerarrow 0x7f070059
+int drawable guis_shape_shop_disabled 0x7f070059
-int drawable guis_radius 0x7f07005a
+int drawable guis_shape_shop_enabled 0x7f07005a
-int drawable guis_settings_disabled 0x7f07005b
+int drawable guis_sound_off 0x7f07005b
-int drawable guis_settings_enabled 0x7f07005c
+int drawable guis_sound_on 0x7f07005c
-int drawable guis_shape_shop_disabled 0x7f07005d
+int drawable guis_splitter 0x7f07005d
-int drawable guis_shape_shop_enabled 0x7f07005e
+int drawable guis_tick 0x7f07005e
-int drawable guis_sound_off 0x7f07005f
+int drawable guis_tool_shop_disabled 0x7f07005f
-int drawable guis_sound_on 0x7f070060
+int drawable guis_tool_shop_enabled 0x7f070060
-int drawable guis_splitter 0x7f070061
+int drawable notification_template_icon_bg 0x7f070061
-int drawable guis_tick 0x7f070062
+int drawable obstacles_grass 0x7f070062
-int drawable guis_tool_shop_disabled 0x7f070063
+int drawable obstacles_snow 0x7f070063
-int drawable guis_tool_shop_enabled 0x7f070064
+int drawable playershapes_ball 0x7f070064
-int drawable notification_template_icon_bg 0x7f070065
+int drawable playershapes_clock 0x7f070065
-int drawable obstacles_grass 0x7f070066
+int drawable playershapes_hypno_spiral 0x7f070066
-int drawable obstacles_snow 0x7f070067
+int drawable playershapes_locked 0x7f070067
-int drawable playershapes_ball 0x7f070068
+int drawable playershapes_pacman 0x7f070068
-int drawable playershapes_clock 0x7f070069
+int drawable playershapes_smiley 0x7f070069
-int drawable playershapes_hypno_spiral 0x7f07006a
+int drawable playershapes_sun 0x7f07006a
-int drawable playershapes_locked 0x7f07006b
+int drawable playershapes_wheel 0x7f07006b
-int drawable playershapes_pacman 0x7f07006c
+int drawable terrain_c_grass 0x7f07006c
-int drawable playershapes_smiley 0x7f07006d
+int drawable terrain_c_ice 0x7f07006d
-int drawable playershapes_sun 0x7f07006e
+int drawable terrain_t_grass 0x7f07006e
-int drawable playershapes_wheel 0x7f07006f
+int drawable terrain_t_ice 0x7f07006f
-int drawable terrain_c_grass 0x7f070070
+int drawable tools_bomb 0x7f070070
-int drawable terrain_c_ice 0x7f070071
+int drawable tools_bomb_button 0x7f070071
-int drawable terrain_t_grass 0x7f070072
+int drawable tools_button_empty 0x7f070072
-int drawable terrain_t_ice 0x7f070073
+int drawable tools_button_locked 0x7f070073
-int drawable tools_bomb 0x7f070074
+int drawable tools_button_unlocked 0x7f070074
-int drawable tools_bomb_button 0x7f070075
+int drawable tools_magnet 0x7f070075
-int drawable tools_button_empty 0x7f070076
+int drawable tools_magnet_button 0x7f070076
-int drawable tools_button_locked 0x7f070077
+int drawable tools_power_mushroom 0x7f070077
-int drawable tools_button_unlocked 0x7f070078
+int drawable tools_power_mushroom_button 0x7f070078
-int drawable tools_magnet 0x7f070079
+int drawable tools_ramp 0x7f070079
-int drawable tools_magnet_button 0x7f07007a
+int drawable tools_ramp_button 0x7f07007a
-int drawable tools_power_mushroom 0x7f07007b
+int drawable tools_spring 0x7f07007b
-int drawable tools_power_mushroom_button 0x7f07007c
+int drawable tools_spring_button 0x7f07007c
-int drawable tools_ramp 0x7f07007d
+int drawable tools_stasis 0x7f07007d
-int drawable tools_ramp_button 0x7f07007e
+int drawable tools_stasis_button 0x7f07007e
-int drawable tools_spring 0x7f07007f
+int drawable tutorial_place_ramp_air_1 0x7f07007f
-int drawable tools_spring_button 0x7f070080
+int drawable tutorial_place_ramp_air_2 0x7f070080
-int drawable tools_stasis 0x7f070081
+int drawable tutorial_place_ramp_gap 0x7f070081
-int drawable tools_stasis_button 0x7f070082
+int drawable tutorial_place_ramp_obstacle 0x7f070082
-int drawable tutorial_place_ramp_air_1 0x7f070083
+int drawable tutorial_place_tools 0x7f070083
-int drawable tutorial_place_ramp_air_2 0x7f070084
+int drawable tutorial_switch_tools 0x7f070084
-int drawable tutorial_place_ramp_gap 0x7f070085
+int drawable tutorial_to_toolshop 0x7f070085
-int drawable tutorial_place_ramp_obstacle 0x7f070086
+int drawable world_previews_grasslands 0x7f070086
-int drawable tutorial_place_tools 0x7f070087
+int drawable world_previews_icymountains 0x7f070087
-int drawable tutorial_switch_tools 0x7f070088
+int drawable xml_background_bountymessage 0x7f070088
-int drawable tutorial_to_toolshop 0x7f070089
+int drawable xml_background_dialog_button 0x7f070089
-int drawable tutorial_toolshop_all_tools 0x7f07008a
+int drawable xml_background_exit_confirm_dialog 0x7f07008a
-int drawable tutorial_toolshop_equip_spring 0x7f07008b
+int drawable xml_background_game_over_message_button 0x7f07008b
-int drawable tutorial_toolshop_inspector 0x7f07008c
+int drawable xml_background_levelbutton 0x7f07008c
-int drawable tutorial_toolshop_select_buy_spring 0x7f07008d
+int drawable xml_background_toolslot 0x7f07008d
-int drawable tutorial_toolshop_toolbar 0x7f07008e
+int drawable xml_background_topbar 0x7f07008e
-int drawable world_previews_grasslands 0x7f07008f
+int drawable xml_background_tutorialimageview 0x7f07008f
-int drawable world_previews_icymountains 0x7f070090
+int drawable xml_background_tutorialtextview 0x7f070090
-int drawable xml_background_bountymessage 0x7f070091
+int drawable xml_background_worldbutton 0x7f070091
-int drawable xml_background_dialog_button 0x7f070092
+int drawable xml_layers_levelprogressbar 0x7f070092
-int drawable xml_background_exit_confirm_dialog 0x7f070093
+int drawable xml_layers_toolprogressbar 0x7f070093
-int drawable xml_background_game_over_message_button 0x7f070094
+int drawable xml_selector_backbutton 0x7f070094
-int drawable xml_background_levelbutton 0x7f070095
+int drawable xml_selector_gamebutton 0x7f070095
-int drawable xml_background_toolslot 0x7f070096
+int drawable xml_selector_music 0x7f070096
-int drawable xml_background_toolupgrade 0x7f070097
+int drawable xml_selector_pricebutton 0x7f070097
-int drawable xml_background_topbar 0x7f070098
+int drawable xml_selector_settings_button 0x7f070098
-int drawable xml_background_tutorialimageview 0x7f070099
+int drawable xml_selector_settingsbutton 0x7f070099
-int drawable xml_background_tutorialtextview 0x7f07009a
+int drawable xml_selector_shapeshopbutton 0x7f07009a
-int drawable xml_background_worldbutton 0x7f07009b
+int drawable xml_selector_sound 0x7f07009b
-int drawable xml_layers_levelprogressbar 0x7f07009c
+int drawable xml_selector_toolshopbutton 0x7f07009c
-int drawable xml_layers_toolprogressbar 0x7f07009d
-int drawable xml_selector_gamebutton 0x7f07009e
-int drawable xml_selector_music 0x7f07009f
-int drawable xml_selector_pricebutton 0x7f0700a0
-int drawable xml_selector_settings_button 0x7f0700a1
-int drawable xml_selector_settingsbutton 0x7f0700a2
-int drawable xml_selector_shapeshopbutton 0x7f0700a3
-int drawable xml_selector_sound 0x7f0700a4
-int drawable xml_selector_toolshopbutton 0x7f0700a5
-int drawable xml_shape_inspector_checkbox 0x7f0700a6
 int id action0 0x7f080000
 int id action_bar 0x7f080001
 int id action_bar_activity_content 0x7f080002
@@ -653,163 +641,155 @@ int id goal_message_to_menu 0x7f080046
 int id goal_message_topbar 0x7f080047
 int id home 0x7f080048
 int id homeAsUp 0x7f080049
-int id horizontalScrollView 0x7f08004a
+int id icon 0x7f08004a
-int id icon 0x7f08004b
+int id ifRoom 0x7f08004b
-int id ifRoom 0x7f08004c
+int id image 0x7f08004c
-int id image 0x7f08004d
+int id info 0x7f08004d
-int id imageView 0x7f08004e
+int id levelbutton_energy 0x7f08004e
-int id info 0x7f08004f
+int id levelbutton_lock 0x7f08004f
-int id levelbutton_energy 0x7f080050
+int id levelbutton_star1 0x7f080050
-int id levelbutton_lock 0x7f080051
+int id levelbutton_star2 0x7f080051
-int id levelbutton_star1 0x7f080052
+int id levelbutton_star3 0x7f080052
-int id levelbutton_star2 0x7f080053
+int id levelbutton_textview 0x7f080053
-int id levelbutton_star3 0x7f080054
+int id levels_bottom_row 0x7f080054
-int id levelbutton_textview 0x7f080055
+int id levels_top_row 0x7f080055
-int id levels_bottom_row 0x7f080056
+int id levels_topbar 0x7f080056
-int id levels_top_row 0x7f080057
+int id levelup_level 0x7f080057
-int id levels_topbar 0x7f080058
+int id levelup_text 0x7f080058
-int id levelup_level 0x7f080059
+int id levelup_unlocklist 0x7f080059
-int id levelup_text 0x7f08005a
+int id line1 0x7f08005a
-int id levelup_unlocklist 0x7f08005b
+int id line3 0x7f08005b
-int id line1 0x7f08005c
+int id linearLayout4 0x7f08005c
-int id line3 0x7f08005d
+int id listMode 0x7f08005d
-int id linearLayout 0x7f08005e
+int id list_item 0x7f08005e
-int id linearLayout4 0x7f08005f
+int id media_actions 0x7f08005f
-int id listMode 0x7f080060
+int id middle 0x7f080060
-int id list_item 0x7f080061
+int id multiply 0x7f080061
-int id media_actions 0x7f080062
+int id never 0x7f080062
-int id middle 0x7f080063
+int id none 0x7f080063
-int id multiply 0x7f080064
+int id normal 0x7f080064
-int id never 0x7f080065
+int id parentPanel 0x7f080065
-int id none 0x7f080066
+int id price_button_currency 0x7f080066
-int id normal 0x7f080067
+int id price_button_price 0x7f080067
-int id parentPanel 0x7f080068
+int id price_button_title 0x7f080068
-int id price_button_currency 0x7f080069
+int id progress_circular 0x7f080069
-int id price_button_price 0x7f08006a
+int id progress_horizontal 0x7f08006a
-int id price_button_title 0x7f08006b
+int id radio 0x7f08006b
-int id progress_circular 0x7f08006c
+int id screen 0x7f08006c
-int id progress_horizontal 0x7f08006d
+int id scrollIndicatorDown 0x7f08006d
-int id radio 0x7f08006e
+int id scrollIndicatorUp 0x7f08006e
-int id screen 0x7f08006f
+int id scrollView 0x7f08006f
-int id scrollIndicatorDown 0x7f080070
+int id search_badge 0x7f080070
-int id scrollIndicatorUp 0x7f080071
+int id search_bar 0x7f080071
-int id scrollView 0x7f080072
+int id search_button 0x7f080072
-int id search_badge 0x7f080073
+int id search_close_btn 0x7f080073
-int id search_bar 0x7f080074
+int id search_edit_frame 0x7f080074
-int id search_button 0x7f080075
+int id search_go_btn 0x7f080075
-int id search_close_btn 0x7f080076
+int id search_mag_icon 0x7f080076
-int id search_edit_frame 0x7f080077
+int id search_plate 0x7f080077
-int id search_go_btn 0x7f080078
+int id search_src_text 0x7f080078
-int id search_mag_icon 0x7f080079
+int id search_voice_btn 0x7f080079
-int id search_plate 0x7f08007a
+int id select_dialog_listview 0x7f08007a
-int id search_src_text 0x7f08007b
+int id settings_credits 0x7f08007b
-int id search_voice_btn 0x7f08007c
+int id settings_music_label 0x7f08007c
-int id select_dialog_listview 0x7f08007d
+int id settings_musictoggle 0x7f08007d
-int id settings_credits 0x7f08007e
+int id settings_reset 0x7f08007e
-int id settings_music_label 0x7f08007f
+int id settings_sounds_label 0x7f08007f
-int id settings_musictoggle 0x7f080080
+int id settings_soundtoggle 0x7f080080
-int id settings_reset 0x7f080081
+int id settings_topbar 0x7f080081
-int id settings_sounds_label 0x7f080082
+int id shape_button_button 0x7f080082
-int id settings_soundtoggle 0x7f080083
+int id shape_button_textview 0x7f080083
-int id settings_topbar 0x7f080084
+int id shape_inspector_check_box 0x7f080084
-int id shape_button_button 0x7f080085
+int id shape_inspector_check_box_image 0x7f080085
-int id shape_button_textview 0x7f080086
+int id shape_inspector_check_box_text 0x7f080086
-int id shape_inspector_check_box 0x7f080087
+int id shape_inspector_description 0x7f080087
-int id shape_inspector_check_box_image 0x7f080088
+int id shape_inspector_imageview 0x7f080088
-int id shape_inspector_check_box_text 0x7f080089
+int id shape_inspector_title 0x7f080089
-int id shape_inspector_description 0x7f08008a
+int id shape_shop_bottomRow 0x7f08008a
-int id shape_inspector_imageview 0x7f08008b
+int id shape_shop_shape_inspector 0x7f08008b
-int id shape_inspector_title 0x7f08008c
+int id shape_shop_topRow 0x7f08008c
-int id shape_shop_bottomRow 0x7f08008d
+int id shape_shop_topbar 0x7f08008d
-int id shape_shop_shape_inspector 0x7f08008e
+int id shortcut 0x7f08008e
-int id shape_shop_topRow 0x7f08008f
+int id shortmenu_continue 0x7f08008f
-int id shape_shop_topbar 0x7f080090
+int id shortmenu_exit 0x7f080090
-int id shortcut 0x7f080091
+int id shortmenu_restart 0x7f080091
-int id shortmenu_continue 0x7f080092
+int id shortmenu_topbar 0x7f080092
-int id shortmenu_exit 0x7f080093
+int id showCustom 0x7f080093
-int id shortmenu_restart 0x7f080094
+int id showHome 0x7f080094
-int id shortmenu_topbar 0x7f080095
+int id showTitle 0x7f080095
-int id showCustom 0x7f080096
+int id spacer 0x7f080096
-int id showHome 0x7f080097
+int id split_action_bar 0x7f080097
-int id showTitle 0x7f080098
+int id src_atop 0x7f080098
-int id spacer 0x7f080099
+int id src_in 0x7f080099
-int id split_action_bar 0x7f08009a
+int id src_over 0x7f08009a
-int id src_atop 0x7f08009b
+int id startscreen_finish_world_1 0x7f08009b
-int id src_in 0x7f08009c
+int id startscreen_gain_90_ep 0x7f08009c
-int id src_over 0x7f08009d
+int id startscreen_play 0x7f08009d
-int id startscreen_finish_world_1 0x7f08009e
+int id startscreen_to_gl_test_screen 0x7f08009e
-int id startscreen_gain_90_ep 0x7f08009f
+int id startscreen_unlock_levels 0x7f08009f
-int id startscreen_play 0x7f0800a0
+int id status_bar_latest_event_content 0x7f0800a0
-int id startscreen_to_gl_test_screen 0x7f0800a1
+int id submit_area 0x7f0800a1
-int id startscreen_unlock_levels 0x7f0800a2
+int id tabMode 0x7f0800a2
-int id status_bar_latest_event_content 0x7f0800a3
+int id task_completed_unlock_list 0x7f0800a3
-int id submit_area 0x7f0800a4
+int id text 0x7f0800a4
-int id tabMode 0x7f0800a5
+int id text2 0x7f0800a5
-int id task_completed_unlock_list 0x7f0800a6
+int id textSpacerNoButtons 0x7f0800a6
-int id text 0x7f0800a7
+int id time 0x7f0800a7
-int id text2 0x7f0800a8
+int id title 0x7f0800a8
-int id textSpacerNoButtons 0x7f0800a9
+int id title_template 0x7f0800a9
-int id time 0x7f0800aa
+int id tool_button_animation_layer 0x7f0800aa
-int id title 0x7f0800ab
+int id tool_button_background_layer 0x7f0800ab
-int id title_template 0x7f0800ac
+int id tool_button_progress_bar 0x7f0800ac
-int id tool_button_animation_layer 0x7f0800ad
+int id tool_inspector_description 0x7f0800ad
-int id tool_button_background_layer 0x7f0800ae
+int id tool_inspector_imageview 0x7f0800ae
-int id tool_button_progress_bar 0x7f0800af
+int id tool_inspector_level_view 0x7f0800af
-int id tool_inspector_description 0x7f0800b0
+int id tool_inspector_pricebutton 0x7f0800b0
-int id tool_inspector_imageview 0x7f0800b1
+int id tool_inspector_title 0x7f0800b1
-int id tool_inspector_level_view 0x7f0800b2
+int id toolbutton_1 0x7f0800b2
-int id tool_inspector_pricebutton 0x7f0800b3
+int id toolbutton_2 0x7f0800b3
-int id tool_inspector_title 0x7f0800b4
+int id toolbutton_3 0x7f0800b4
-int id tool_upgrade_imageview 0x7f0800b5
+int id toolbutton_4 0x7f0800b5
-int id tool_upgrade_pricebutton 0x7f0800b6
+int id toolofferslot_slot 0x7f0800b6
-int id tool_upgrade_title 0x7f0800b7
+int id toolofferslot_title 0x7f0800b7
-int id tool_upgrade_value_new 0x7f0800b8
+int id toolshop_slot1 0x7f0800b8
-int id tool_upgrade_value_old 0x7f0800b9
+int id toolshop_slot2 0x7f0800b9
-int id toolbutton_1 0x7f0800ba
+int id toolshop_slot3 0x7f0800ba
-int id toolbutton_2 0x7f0800bb
+int id toolshop_slot4 0x7f0800bb
-int id toolbutton_3 0x7f0800bc
+int id toolshop_tool_offer_bottom_row 0x7f0800bc
-int id toolbutton_4 0x7f0800bd
+int id toolshop_tool_offer_top_row 0x7f0800bd
-int id toolofferslot_slot 0x7f0800be
+int id toolshop_toolinspector 0x7f0800be
-int id toolofferslot_title 0x7f0800bf
+int id toolshop_topbar 0x7f0800bf
-int id toolshop_slot1 0x7f0800c0
+int id toolslot_image 0x7f0800c0
-int id toolshop_slot2 0x7f0800c1
+int id topPanel 0x7f0800c1
-int id toolshop_slot3 0x7f0800c2
+int id topbar_back_button 0x7f0800c2
-int id toolshop_slot4 0x7f0800c3
+int id topbar_energycount 0x7f0800c3
-int id toolshop_tool_offer_bottom_row 0x7f0800c4
+int id topbar_energycount_decrease 0x7f0800c4
-int id toolshop_tool_offer_top_row 0x7f0800c5
+int id topbar_energyview 0x7f0800c5
-int id toolshop_toolinspector 0x7f0800c6
+int id topbar_leveldisplay 0x7f0800c6
-int id toolshop_topbar 0x7f0800c7
+int id topbar_levellayout 0x7f0800c7
-int id toolslot_image 0x7f0800c8
+int id topbar_levelprogress 0x7f0800c8
-int id topPanel 0x7f0800c9
+int id topbar_settings 0x7f0800c9
-int id topbar_energycount 0x7f0800ca
+int id topbar_shapeshop 0x7f0800ca
-int id topbar_energycount_decrease 0x7f0800cb
+int id topbar_starcount 0x7f0800cb
-int id topbar_energyview 0x7f0800cc
+int id topbar_starcount_decrease 0x7f0800cc
-int id topbar_layout 0x7f0800cd
+int id topbar_starview 0x7f0800cd
-int id topbar_leveldisplay 0x7f0800ce
+int id topbar_toolshop 0x7f0800ce
-int id topbar_levellayout 0x7f0800cf
+int id tutorial_image_view 0x7f0800cf
-int id topbar_levelprogress 0x7f0800d0
+int id tutorial_text_view 0x7f0800d0
-int id topbar_settings 0x7f0800d1
+int id unlockmessage_message 0x7f0800d1
-int id topbar_shapeshop 0x7f0800d2
+int id unlockmessage_toolimage 0x7f0800d2
-int id topbar_starcount 0x7f0800d3
+int id up 0x7f0800d3
-int id topbar_starcount_decrease 0x7f0800d4
+int id useLogo 0x7f0800d4
-int id topbar_starview 0x7f0800d5
+int id withText 0x7f0800d5
-int id topbar_toolshop 0x7f0800d6
+int id worldbutton_energycount 0x7f0800d6
-int id tutorial_image_view 0x7f0800d7
+int id worldbutton_levelcount 0x7f0800d7
-int id tutorial_text_view 0x7f0800d8
+int id worldbutton_lock 0x7f0800d8
-int id unlockmessage_message 0x7f0800d9
+int id worldbutton_preview 0x7f0800d9
-int id unlockmessage_toolimage 0x7f0800da
+int id worldbutton_starcount 0x7f0800da
-int id up 0x7f0800db
+int id worldbutton_title 0x7f0800db
-int id useLogo 0x7f0800dc
+int id worlds_layout 0x7f0800dc
-int id withText 0x7f0800dd
+int id worlds_topbar 0x7f0800dd
-int id worldbutton_energycount 0x7f0800de
+int id wrap_content 0x7f0800de
-int id worldbutton_levelcount 0x7f0800df
-int id worldbutton_lock 0x7f0800e0
-int id worldbutton_preview 0x7f0800e1
-int id worldbutton_starcount 0x7f0800e2
-int id worldbutton_title 0x7f0800e3
-int id worlds_layout 0x7f0800e4
-int id worlds_topbar 0x7f0800e5
-int id wrap_content 0x7f0800e6
 int integer abc_config_activityDefaultDur 0x7f090000
 int integer abc_config_activityShortDur 0x7f090001
 int integer abc_max_action_buttons 0x7f090002
@@ -875,15 +855,14 @@ int layout task_completed_message 0x7f0a0038
 int layout tool_inspector 0x7f0a0039
 int layout tool_offer_slot 0x7f0a003a
 int layout tool_slot 0x7f0a003b
-int layout tool_upgrade 0x7f0a003c
+int layout toolbutton 0x7f0a003c
-int layout toolbutton 0x7f0a003d
+int layout toolbuttonbar 0x7f0a003d
-int layout toolbuttonbar 0x7f0a003e
+int layout toolshop 0x7f0a003e
-int layout toolshop 0x7f0a003f
+int layout topbar 0x7f0a003f
-int layout topbar 0x7f0a0040
+int layout tutorial 0x7f0a0040
-int layout tutorial 0x7f0a0041
+int layout unlock_message 0x7f0a0041
-int layout unlock_message 0x7f0a0042
+int layout world_button 0x7f0a0042
-int layout world_button 0x7f0a0043
+int layout worlds 0x7f0a0043
-int layout worlds 0x7f0a0044
 int mipmap ic_launcher 0x7f0b0000
 int raw music_game_1 0x7f0c0000
 int raw music_game_2 0x7f0c0001
@@ -953,94 +932,81 @@ int string level_button_format_d 0x7f0d0030
 int string levelup 0x7f0d0031
 int string message_game_over 0x7f0d0032
 int string message_level_finished 0x7f0d0033
-int string message_next_level 0x7f0d0034
+int string message_restart 0x7f0d0034
-int string message_restart 0x7f0d0035
+int string message_to_menu 0x7f0d0035
-int string message_to_menu 0x7f0d0036
+int string message_try_again 0x7f0d0036
-int string message_tools 0x7f0d0037
+int string placeholder_button 0x7f0d0037
-int string message_try_again 0x7f0d0038
+int string placeholder_number 0x7f0d0038
-int string placeholder_button 0x7f0d0039
+int string placeholder_textview 0x7f0d0039
-int string placeholder_number 0x7f0d003a
+int string playershape_description_ball 0x7f0d003a
-int string placeholder_percent 0x7f0d003b
+int string playershape_description_clock 0x7f0d003b
-int string placeholder_textview 0x7f0d003c
+int string playershape_description_hypno_spiral 0x7f0d003c
-int string playershape_description_ball 0x7f0d003d
+int string playershape_description_locked 0x7f0d003d
-int string playershape_description_clock 0x7f0d003e
+int string playershape_description_pacman 0x7f0d003e
-int string playershape_description_hypno_spiral 0x7f0d003f
+int string playershape_description_smiley 0x7f0d003f
-int string playershape_description_locked 0x7f0d0040
+int string playershape_description_sun 0x7f0d0040
-int string playershape_description_pacman 0x7f0d0041
+int string playershape_description_wheel 0x7f0d0041
-int string playershape_description_smiley 0x7f0d0042
+int string playershape_name_ball 0x7f0d0042
-int string playershape_description_sun 0x7f0d0043
+int string playershape_name_clock 0x7f0d0043
-int string playershape_description_wheel 0x7f0d0044
+int string playershape_name_hypno_spiral 0x7f0d0044
-int string playershape_name_ball 0x7f0d0045
+int string playershape_name_locked 0x7f0d0045
-int string playershape_name_clock 0x7f0d0046
+int string playershape_name_pacman 0x7f0d0046
-int string playershape_name_hypno_spiral 0x7f0d0047
+int string playershape_name_smiley 0x7f0d0047
-int string playershape_name_locked 0x7f0d0048
+int string playershape_name_sun 0x7f0d0048
-int string playershape_name_pacman 0x7f0d0049
+int string playershape_name_wheel 0x7f0d0049
-int string playershape_name_smiley 0x7f0d004a
+int string pre_start_screen_loading 0x7f0d004a
-int string playershape_name_sun 0x7f0d004b
+int string price_button_buy 0x7f0d004b
-int string playershape_name_wheel 0x7f0d004c
+int string price_button_upgrade 0x7f0d004c
-int string pre_start_screen_loading 0x7f0d004d
+int string settings_credits 0x7f0d004d
-int string price_button_buy 0x7f0d004e
+int string settings_music 0x7f0d004e
-int string price_button_upgrade 0x7f0d004f
+int string settings_reset 0x7f0d004f
-int string settings_credits 0x7f0d0050
+int string settings_sounds 0x7f0d0050
-int string settings_music 0x7f0d0051
+int string short_menu_continue 0x7f0d0051
-int string settings_reset 0x7f0d0052
+int string short_menu_exit 0x7f0d0052
-int string settings_sounds 0x7f0d0053
+int string start_screen_finish_world_1 0x7f0d0053
-int string short_menu_continue 0x7f0d0054
+int string start_screen_gain_90_ep 0x7f0d0054
-int string short_menu_exit 0x7f0d0055
+int string start_screen_play 0x7f0d0055
-int string short_menu_restart 0x7f0d0056
+int string start_screen_to_gl_test_screen 0x7f0d0056
-int string start_screen_finish_world_1 0x7f0d0057
+int string start_screen_unlock_all_levels 0x7f0d0057
-int string start_screen_gain_90_ep 0x7f0d0058
+int string status_bar_notification_info_overflow 0x7f0d0058
-int string start_screen_play 0x7f0d0059
+int string task_collect_energy_format_d 0x7f0d0059
-int string start_screen_to_gl_test_screen 0x7f0d005a
+int string task_collect_energy_progress_format_ddd 0x7f0d005a
-int string start_screen_unlock_all_levels 0x7f0d005b
+int string task_collect_stars_format_d 0x7f0d005b
-int string status_bar_notification_info_overflow 0x7f0d005c
+int string task_collect_stars_progress_format_ddd 0x7f0d005c
-int string task_collect_energy_format_d 0x7f0d005d
+int string task_complete_world_format_d 0x7f0d005d
-int string task_collect_energy_progress_format_ddd 0x7f0d005e
+int string task_empty 0x7f0d005e
-int string task_collect_stars_format_d 0x7f0d005f
+int string tool_description_bomb 0x7f0d005f
-int string task_collect_stars_progress_format_ddd 0x7f0d0060
+int string tool_description_locked_format_d 0x7f0d0060
-int string task_complete_world_format_d 0x7f0d0061
+int string tool_description_magnet 0x7f0d0061
-int string task_completed 0x7f0d0062
+int string tool_description_power_mushroom 0x7f0d0062
-int string task_empty 0x7f0d0063
+int string tool_description_ramp 0x7f0d0063
-int string tool_description_bomb 0x7f0d0064
+int string tool_description_spring 0x7f0d0064
-int string tool_description_locked_format_d 0x7f0d0065
+int string tool_description_stasis 0x7f0d0065
-int string tool_description_magnet 0x7f0d0066
+int string tool_level_format_d 0x7f0d0066
-int string tool_description_power_mushroom 0x7f0d0067
+int string tool_name_bomb 0x7f0d0067
-int string tool_description_ramp 0x7f0d0068
+int string tool_name_locked 0x7f0d0068
-int string tool_description_spring 0x7f0d0069
+int string tool_name_magnet 0x7f0d0069
-int string tool_description_stasis 0x7f0d006a
+int string tool_name_power_mushroom 0x7f0d006a
-int string tool_level_format_d 0x7f0d006b
+int string tool_name_ramp 0x7f0d006b
-int string tool_name_bomb 0x7f0d006c
+int string tool_name_spring 0x7f0d006c
-int string tool_name_locked 0x7f0d006d
+int string tool_name_stasis 0x7f0d006d
-int string tool_name_magnet 0x7f0d006e
+int string topbar_level_format_d 0x7f0d006e
-int string tool_name_power_mushroom 0x7f0d006f
+int string topbar_level_placeholder 0x7f0d006f
-int string tool_name_ramp 0x7f0d0070
+int string tutorial_leveled_up_to_toolshop 0x7f0d0070
-int string tool_name_spring 0x7f0d0071
+int string tutorial_place_ramp_air 0x7f0d0071
-int string tool_name_stasis 0x7f0d0072
+int string tutorial_place_ramp_air_2 0x7f0d0072
-int string tool_upgrade_force 0x7f0d0073
+int string tutorial_place_ramp_gap 0x7f0d0073
-int string tool_upgrade_none 0x7f0d0074
+int string tutorial_place_ramp_obstacle 0x7f0d0074
-int string tool_upgrade_radius 0x7f0d0075
+int string tutorial_place_tools 0x7f0d0075
-int string tool_upgrade_time 0x7f0d0076
+int string tutorial_placeholder 0x7f0d0076
-int string tool_upgrade_title_format_sd 0x7f0d0077
+int string tutorial_spring_equipped 0x7f0d0077
-int string tool_upgrade_title_placeholder 0x7f0d0078
+int string tutorial_switch_tools_switch 0x7f0d0078
-int string tool_upgrade_value_max 0x7f0d0079
+int string tutorial_switch_tools_two_neccessary 0x7f0d0079
-int string topbar_level_format_d 0x7f0d007a
+int string tutorial_welcome 0x7f0d007a
-int string topbar_level_placeholder 0x7f0d007b
+int string unlock_message_placeholder 0x7f0d007b
-int string topbar_toolshop 0x7f0d007c
+int string world_button_count_format_dd 0x7f0d007c
-int string tutorial_leveled_up_to_toolshop 0x7f0d007d
+int string world_button_progress_placeholder 0x7f0d007d
-int string tutorial_place_ramp_air 0x7f0d007e
+int string world_button_title_placeholder 0x7f0d007e
-int string tutorial_place_ramp_air_2 0x7f0d007f
-int string tutorial_place_ramp_gap 0x7f0d0080
-int string tutorial_place_ramp_obstacle 0x7f0d0081
-int string tutorial_place_tools 0x7f0d0082
-int string tutorial_placeholder 0x7f0d0083
-int string tutorial_spring_equipped 0x7f0d0084
-int string tutorial_switch_tools_switch 0x7f0d0085
-int string tutorial_switch_tools_two_neccessary 0x7f0d0086
-int string tutorial_welcome 0x7f0d0087
-int string unlock_message_placeholder 0x7f0d0088
-int string world_button_count_format_dd 0x7f0d0089
-int string world_button_progress_placeholder 0x7f0d008a
-int string world_button_title_placeholder 0x7f0d008b
 int style AlertDialog_AppCompat 0x7f0e0000
 int style AlertDialog_AppCompat_Light 0x7f0e0001
 int style Animation_AppCompat_Dialog 0x7f0e0002

app/src/main/java/de/frajul/endlessroll/main/GameActivity.java

@@ -341,4 +341,8 @@ public class GameActivity extends Activity implements ExceptionHandler, User.LvU
     public TutorialManager getTutorialManager() {
         return tutorialManager;
     }
+
+    public GameScreen getGameScreen() {
+        return gameScreen;
+    }
 }

app/src/main/java/de/frajul/endlessroll/main/game/Game.java

@@ -22,6 +22,7 @@ import de.frajul.endlessroll.main.GameActivity;
 import de.frajul.endlessroll.main.GameHandler;
 import de.frajul.endlessroll.main.GameLog;
 import de.frajul.endlessroll.main.physics.Physics;
+import de.frajul.endlessroll.main.screens.GameScreen;
 import de.frajul.endlessroll.main.screens.Screen;
 import de.frajul.endlessroll.rendering.Rendering;
 import de.frajul.endlessroll.sqlDatabase.MyDatabase;
@@ -52,14 +53,14 @@ public class Game extends Rendering<GameScene> {
     private List<Integer> collectedStars = new ArrayList<>();
     private boolean energyCollected;
 
-    public Game(GameHandler handler, GameActivity gameActivity) throws Exception {
+    public Game(GameHandler handler, GameScreen gameScreen, GameActivity gameActivity) throws Exception {
         super(gameActivity);
         this.handler = handler;
         this.gameActivity = gameActivity;
         physics = new Physics();
         collisionManager = new CollisionManager(this);
         particleSystem = new ParticleSystem(getContext());
-        viewManager = new ViewManager(this, handler, gameActivity);
+        viewManager = new ViewManager(this, gameScreen, handler, gameActivity);
     }
 
     @Override

app/src/main/java/de/frajul/endlessroll/main/screens/GameScreen.java

@@ -24,7 +24,7 @@ public class GameScreen extends GLScreen<RelativeLayout> {
 
     public GameScreen(GameActivity gameActivity, MyGlSurfaceView glSurfaceView) throws Exception {
         super(ScreenType.GAME, gameActivity, R.layout.game, glSurfaceView);
-        game = new Game(gameViewHandler, gameActivity);
+        game = new Game(gameViewHandler, this, gameActivity);
         glView.addRendering(game);
     }
 

app/src/main/java/de/frajul/endlessroll/main/screens/Screen.java

@@ -54,7 +54,7 @@ public abstract class Screen<V extends ViewGroup> {
     }
 
     protected TopBar createTopBar(@IdRes int id) {
-        return new TopBar(gameActivity, type, layout.findViewById(id));
+        return new TopBar(gameActivity, this, layout.findViewById(id));
     }
 
     public void setCaller(ScreenType caller) {

app/src/main/java/de/frajul/endlessroll/main/tutorial/ToolShopTutorial.java

@@ -34,7 +34,7 @@ public class ToolShopTutorial {
 
     public void onTopBarUpdate(TopBar topBar) {
         if (!finished && isSpringUnlocked()) {
-            boolean notOnToolShopScreen = topBar.getParent() != Screen.ScreenType.TOOL_SHOP;
+            boolean notOnToolShopScreen = topBar.getParentType() != Screen.ScreenType.TOOL_SHOP;
             if (notOnToolShopScreen && topBar.isToolShopButtonEnabled())
                 topBar.startToolShopButtonPulse();
         }

app/src/main/java/de/frajul/endlessroll/views/GameOverMessage.java

@@ -10,6 +10,7 @@ import android.widget.TextView;
 import de.frajul.endlessroll.R;
 import de.frajul.endlessroll.main.GameActivity;
 import de.frajul.endlessroll.main.game.Game;
+import de.frajul.endlessroll.main.screens.GameScreen;
 import de.frajul.endlessroll.main.screens.Screen;
 
 /**
@@ -26,14 +27,14 @@ public class GameOverMessage implements View.OnClickListener {
     private Button tryAgain;
     private Button toMenu;
 
-    public GameOverMessage(Game game, GameActivity gameActivity, View layout) {
+    public GameOverMessage(Game game, GameScreen gameScreen, GameActivity gameActivity, View layout) {
         this.game = game;
         this.gameActivity = gameActivity;
         this.layout = layout;
         layout.setVisibility(View.GONE);
         Typeface typeface = gameActivity.getTypeface();
         fadeIn = AnimationUtils.loadAnimation(gameActivity, R.anim.fade_in);
-        topBar = new TopBar(gameActivity, Screen.ScreenType.GAME,
+        topBar = new TopBar(gameActivity, gameScreen,
                 layout.findViewById(R.id.game_over_message_topbar));
         topBar.setShopsEnabled(true);
         TextView title = (TextView) layout.findViewById(R.id.game_over_message_title);

app/src/main/java/de/frajul/endlessroll/views/GoalMessage.java

@@ -12,6 +12,7 @@ import de.frajul.endlessroll.levels.Level;
 import de.frajul.endlessroll.levels.LevelPack;
 import de.frajul.endlessroll.main.GameActivity;
 import de.frajul.endlessroll.main.game.Game;
+import de.frajul.endlessroll.main.screens.GameScreen;
 import de.frajul.endlessroll.main.screens.Screen;
 
 /**
@@ -30,7 +31,7 @@ public class GoalMessage implements GoalMessageLevelButtonOnClickListener, View.
     private GoalMessageLevelButton nextLevel;
     private Button toMenu;
 
-    public GoalMessage(Game game, GameActivity gameActivity, View layout) {
+    public GoalMessage(Game game, GameScreen gameScreen, GameActivity gameActivity, View layout) {
         this.game = game;
         this.gameActivity = gameActivity;
         this.layout = layout;
@@ -38,7 +39,7 @@ public class GoalMessage implements GoalMessageLevelButtonOnClickListener, View.
         Typeface typeface = gameActivity.getTypeface();
         fadeIn = AnimationUtils.loadAnimation(gameActivity, R.anim.fade_in);
 
-        topBar = new TopBar(gameActivity, Screen.ScreenType.GAME,
+        topBar = new TopBar(gameActivity, gameScreen,
                 layout.findViewById(R.id.goal_message_topbar));
         topBar.setShopsEnabled(true);
         TextView title = (TextView) layout.findViewById(R.id.goal_message_title);

app/src/main/java/de/frajul/endlessroll/views/ShortMenu.java

@@ -12,6 +12,7 @@ import java.util.Random;
 import de.frajul.endlessroll.R;
 import de.frajul.endlessroll.main.GameActivity;
 import de.frajul.endlessroll.main.game.Game;
+import de.frajul.endlessroll.main.screens.GameScreen;
 import de.frajul.endlessroll.main.screens.Screen;
 
 /**
@@ -31,11 +32,11 @@ public class ShortMenu implements View.OnClickListener {
     private TextView restartView;
     private TextView exitView;
 
-    public ShortMenu(final Game game, GameActivity gameActivity, View layout) {
+    public ShortMenu(final Game game, GameScreen gameScreen, GameActivity gameActivity, View layout) {
         this.game = game;
         this.layout = layout;
         Typeface typeface = gameActivity.getTypeface();
-        topBar = new TopBar(gameActivity, Screen.ScreenType.GAME,
+        topBar = new TopBar(gameActivity, gameScreen,
                 layout.findViewById(R.id.shortmenu_topbar));
         continueView = (TextView) layout.findViewById(R.id.shortmenu_continue);
         continueView.setTypeface(typeface);

app/src/main/java/de/frajul/endlessroll/views/TopBar.java

@@ -20,7 +20,7 @@ public class TopBar implements View.OnClickListener {
 
     private GameActivity gameActivity;
     private View layout;
-    private Screen.ScreenType parent;
+    private Screen parent;
     private Screen.ScreenType customCallerForScreenSwitch = Screen.ScreenType.NONE;
 
     private Animation starDecreaseAnimation;
@@ -31,13 +31,14 @@ public class TopBar implements View.OnClickListener {
     private ProgressBar levelProgress;
     private TextView starCount;
     private TextView energyCount;
+    private Button backButton;
     private Button settingsButton;
     private Button toolshopButton;
     private Button shapeshopButton;
     private TextView starCountDecrease;
     private TextView energyCountDecrease;
 
-    public TopBar(GameActivity gameActivity, Screen.ScreenType parent, View layout) {
+    public TopBar(GameActivity gameActivity, Screen parent, View layout) {
         this.gameActivity = gameActivity;
         this.parent = parent;
         this.layout = layout;
@@ -54,19 +55,22 @@ public class TopBar implements View.OnClickListener {
         starCount.setTypeface(typeface);
         energyCount = (TextView) layout.findViewById(R.id.topbar_energycount);
         energyCount.setTypeface(typeface);
+        backButton = (Button) layout.findViewById(R.id.topbar_back_button);
+        backButton.setOnClickListener(this);
         settingsButton = (Button) layout.findViewById(R.id.topbar_settings);
         settingsButton.setOnClickListener(this);
         toolshopButton = (Button) layout.findViewById(R.id.topbar_toolshop);
         toolshopButton.setOnClickListener(this);
         shapeshopButton = (Button) layout.findViewById(R.id.topbar_shapeshop);
         shapeshopButton.setOnClickListener(this);
-        if(parent == Screen.ScreenType.SETTINGS)
+        if (parent.getType() == Screen.ScreenType.SETTINGS)
             settingsButton.setEnabled(false);
-        if(parent == Screen.ScreenType.TOOL_SHOP)
+        if (parent.getType() == Screen.ScreenType.TOOL_SHOP)
             toolshopButton.setEnabled(false);
-        if(parent == Screen.ScreenType.SHAPE_SHOP)
+        if (parent.getType() == Screen.ScreenType.SHAPE_SHOP)
             shapeshopButton.setEnabled(false);
-        if (parent == Screen.ScreenType.GAME) {
+        if (parent.getType() == Screen.ScreenType.GAME) {
+            backButton.setEnabled(false);
             toolshopButton.setEnabled(false);
             shapeshopButton.setEnabled(false);
         }
@@ -118,6 +122,9 @@ public class TopBar implements View.OnClickListener {
 
     @Override
     public void onClick(View v) {
+        if (v.equals(backButton)) {
+            parent.onBackKeyDown();
+        }
         if (v.equals(toolshopButton)) {
             flipToScreen(Screen.ScreenType.TOOL_SHOP);
         } else if (v.equals(shapeshopButton)) {
@@ -133,8 +140,8 @@ public class TopBar implements View.OnClickListener {
         gameActivity.flipToScreen(screenType);
     }
 
-    public Screen.ScreenType getParent() {
+    public Screen.ScreenType getParentType() {
-        return parent;
+        return parent.getType();
     }
 
     public boolean isToolShopButtonEnabled() {

app/src/main/java/de/frajul/endlessroll/views/ViewManager.java

@@ -13,6 +13,7 @@ import de.frajul.endlessroll.main.GameActivity;
 import de.frajul.endlessroll.main.GameHandler;
 import de.frajul.endlessroll.main.game.Game;
 import de.frajul.endlessroll.main.game.Timer;
+import de.frajul.endlessroll.main.screens.GameScreen;
 import de.frajul.endlessroll.user.User;
 
 /**
@@ -35,7 +36,7 @@ public class ViewManager implements View.OnClickListener {
 
     private String fpsFormat, playerProgressFormat, playerSpeedFormat;
 
-    public ViewManager(final Game game, final GameHandler gameViewHandler, final GameActivity gameActivity) {
+    public ViewManager(final Game game, final GameScreen gameScreen, final GameHandler gameViewHandler, final GameActivity gameActivity) {
         this.game = game;
         this.gameViewHandler = gameViewHandler;
 
@@ -46,12 +47,14 @@ public class ViewManager implements View.OnClickListener {
                 toolButtonBar = new ToolButtonBar(game,
                         gameActivity.getUser().getToolSlotSettings(),
                         (LinearLayout) layout.findViewById(R.id.game_toolbuttonbar));
-                shortMenu = new ShortMenu(game, gameActivity,
+                shortMenu = new ShortMenu(game, gameScreen, gameActivity,
                         layout.findViewById(R.id.game_shortmenu));
-                gameOverMessage = new GameOverMessage(game, gameActivity,
+                gameOverMessage = new GameOverMessage(game, gameScreen, gameActivity,
                         layout.findViewById(R.id.game_game_over_message));
-                goalMessage = new GoalMessage(game, gameActivity, layout.findViewById(R.id.game_goal_message));
+                goalMessage = new GoalMessage(game, gameScreen, gameActivity,
-                countdown = new Countdown(game, gameActivity.getSoundManager(), gameActivity.getTypeface(),
+                        layout.findViewById(R.id.game_goal_message));
+                countdown = new Countdown(game, gameActivity.getSoundManager(),
+                        gameActivity.getTypeface(),
                         (TextView) layout.findViewById(R.id.game_countdown));
             }
         });
@@ -66,12 +69,12 @@ public class ViewManager implements View.OnClickListener {
         playerSpeedFormat = game.getContext().getString(R.string.game_playerspeed_format_f);
     }
 
-    public void prepareToBeShown(){
+    public void prepareToBeShown() {
-        if(shortMenu.isVisible())
+        if (shortMenu.isVisible())
             shortMenu.prepareToBeShown();
-        if(gameOverMessage.isVisible())
+        if (gameOverMessage.isVisible())
             gameOverMessage.prepareToBeShown();
-        if(goalMessage.isVisible())
+        if (goalMessage.isVisible())
             goalMessage.prepareToBeShown();
     }
 
@@ -92,7 +95,7 @@ public class ViewManager implements View.OnClickListener {
         });
     }
 
-    public void onGoalMessageKeyBack(){
+    public void onGoalMessageKeyBack() {
         goalMessage.onKeyBack();
     }
 
@@ -105,7 +108,7 @@ public class ViewManager implements View.OnClickListener {
         });
     }
 
-    public void showGoalMessage(final LevelPack levelPack, final Level level){
+    public void showGoalMessage(final LevelPack levelPack, final Level level) {
         gameViewHandler.startInUiThread(new Runnable() {
             @Override
             public void run() {
@@ -150,7 +153,7 @@ public class ViewManager implements View.OnClickListener {
         return ((int) (value * 20)) / 10f;
     }
 
-    public boolean isShortMenuVisible(){
+    public boolean isShortMenuVisible() {
         return shortMenu.isVisible();
     }
 

app/src/main/res/drawable/xml_selector_backbutton.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" tools:context=".main.GameActivity">
+    <item android:state_enabled="true">
+        <bitmap android:src="@drawable/guis_arrow_back_enabled"/>
+    </item>
+    <item android:state_enabled="false">
+        <bitmap android:src="@drawable/guis_arrow_back_disabled"/>
+    </item>
+</selector>

app/src/main/res/layout/topbar.xml

@@ -4,21 +4,33 @@
     android:layout_height="wrap_content"
     android:background="@drawable/xml_background_topbar">
 
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <Button
+        android:id="@+id/topbar_back_button"
+        android:layout_width="35dp"
+        android:layout_height="35dp"
+        android:layout_alignParentStart="true"
+        android:layout_centerVertical="true"
+        android:layout_marginEnd="5dp"
+        android:layout_marginLeft="3dp"
+        android:layout_marginRight="5dp"
+        android:layout_marginStart="3dp"
+        android:adjustViewBounds="true"
+        android:background="@drawable/xml_selector_backbutton"/>
+
+    <LinearLayout
         android:id="@+id/topbar_levellayout"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentStart="true"
         android:layout_centerVertical="true"
         android:layout_marginEnd="20dp"
-        android:layout_marginStart="5dp"
+        android:layout_toEndOf="@id/topbar_back_button"
         android:orientation="vertical">
 
         <TextView
             android:id="@+id/topbar_leveldisplay"
-            android:layout_marginTop="-5dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginTop="-5dp"
             android:text="@string/topbar_level_placeholder"
             android:textSize="25sp"/>
 
@@ -28,8 +40,8 @@
             android:layout_width="match_parent"
             android:layout_height="6dp"
             android:layout_marginBottom="5dp"
-            android:progressDrawable="@drawable/xml_layers_levelprogressbar"
+            android:progress="50"
-            android:progress="50"/>
+            android:progressDrawable="@drawable/xml_layers_levelprogressbar"/>
 
     </LinearLayout>
 
@@ -118,5 +130,4 @@
         android:text="@string/placeholder_number"
         android:textSize="20sp"
         android:visibility="invisible"/>
-
 </RelativeLayout>