Finished toolbars opengl-rendering!!! and removed old ones

This commit is contained in:
=
2018-05-11 15:01:00 +02:00
parent 7f7b53b8a0
commit cd1932a9df
20 changed files with 224 additions and 482 deletions

View File

@ -547,11 +547,11 @@ public final class R {
public static final int time = 0x7f0800a6;
public static final int title = 0x7f0800a7;
public static final int title_template = 0x7f0800a8;
public static final int topPanel = 0x7f0800c0;
public static final int up = 0x7f0800d2;
public static final int useLogo = 0x7f0800d3;
public static final int withText = 0x7f0800d4;
public static final int wrap_content = 0x7f0800dd;
public static final int topPanel = 0x7f0800b9;
public static final int up = 0x7f0800cb;
public static final int useLogo = 0x7f0800cc;
public static final int withText = 0x7f0800cd;
public static final int wrap_content = 0x7f0800d6;
}
public static final class integer {
public static final int abc_config_activityDefaultDur = 0x7f090000;

File diff suppressed because one or more lines are too long

View File

@ -18,7 +18,6 @@
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"

View File

@ -564,16 +564,15 @@ int drawable xml_background_tutorialimageview 0x7f070099
int drawable xml_background_tutorialtextview 0x7f07009a
int drawable xml_background_worldbutton 0x7f07009b
int drawable xml_layers_levelprogressbar 0x7f07009c
int drawable xml_layers_toolprogressbar 0x7f07009d
int drawable xml_selector_backbutton 0x7f07009e
int drawable xml_selector_gamebutton 0x7f07009f
int drawable xml_selector_music 0x7f0700a0
int drawable xml_selector_pricebutton 0x7f0700a1
int drawable xml_selector_settings_button 0x7f0700a2
int drawable xml_selector_settingsbutton 0x7f0700a3
int drawable xml_selector_shapeshopbutton 0x7f0700a4
int drawable xml_selector_sound 0x7f0700a5
int drawable xml_selector_toolshopbutton 0x7f0700a6
int drawable xml_selector_backbutton 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 id action0 0x7f080000
int id action_bar 0x7f080001
int id action_bar_activity_content 0x7f080002
@ -743,59 +742,52 @@ int id textSpacerNoButtons 0x7f0800a5
int id time 0x7f0800a6
int id title 0x7f0800a7
int id title_template 0x7f0800a8
int id tool_button_animation_layer 0x7f0800a9
int id tool_button_background_layer 0x7f0800aa
int id tool_button_progress_bar 0x7f0800ab
int id tool_inspector_description 0x7f0800ac
int id tool_inspector_imageview 0x7f0800ad
int id tool_inspector_level_view 0x7f0800ae
int id tool_inspector_pricebutton 0x7f0800af
int id tool_inspector_title 0x7f0800b0
int id toolbutton_1 0x7f0800b1
int id toolbutton_2 0x7f0800b2
int id toolbutton_3 0x7f0800b3
int id toolbutton_4 0x7f0800b4
int id toolofferslot_slot 0x7f0800b5
int id toolofferslot_title 0x7f0800b6
int id toolshop_slot1 0x7f0800b7
int id toolshop_slot2 0x7f0800b8
int id toolshop_slot3 0x7f0800b9
int id toolshop_slot4 0x7f0800ba
int id toolshop_tool_offer_bottom_row 0x7f0800bb
int id toolshop_tool_offer_top_row 0x7f0800bc
int id toolshop_toolinspector 0x7f0800bd
int id toolshop_topbar 0x7f0800be
int id toolslot_image 0x7f0800bf
int id topPanel 0x7f0800c0
int id topbar_back_button 0x7f0800c1
int id topbar_energycount 0x7f0800c2
int id topbar_energycount_decrease 0x7f0800c3
int id topbar_energyview 0x7f0800c4
int id topbar_leveldisplay 0x7f0800c5
int id topbar_levellayout 0x7f0800c6
int id topbar_levelprogress 0x7f0800c7
int id topbar_settings 0x7f0800c8
int id topbar_shapeshop 0x7f0800c9
int id topbar_starcount 0x7f0800ca
int id topbar_starcount_decrease 0x7f0800cb
int id topbar_starview 0x7f0800cc
int id topbar_toolshop 0x7f0800cd
int id tutorial_image_view 0x7f0800ce
int id tutorial_text_view 0x7f0800cf
int id unlockmessage_message 0x7f0800d0
int id unlockmessage_toolimage 0x7f0800d1
int id up 0x7f0800d2
int id useLogo 0x7f0800d3
int id withText 0x7f0800d4
int id worldbutton_energycount 0x7f0800d5
int id worldbutton_levelcount 0x7f0800d6
int id worldbutton_lock 0x7f0800d7
int id worldbutton_preview 0x7f0800d8
int id worldbutton_starcount 0x7f0800d9
int id worldbutton_title 0x7f0800da
int id worlds_layout 0x7f0800db
int id worlds_topbar 0x7f0800dc
int id wrap_content 0x7f0800dd
int id tool_inspector_description 0x7f0800a9
int id tool_inspector_imageview 0x7f0800aa
int id tool_inspector_level_view 0x7f0800ab
int id tool_inspector_pricebutton 0x7f0800ac
int id tool_inspector_title 0x7f0800ad
int id toolofferslot_slot 0x7f0800ae
int id toolofferslot_title 0x7f0800af
int id toolshop_slot1 0x7f0800b0
int id toolshop_slot2 0x7f0800b1
int id toolshop_slot3 0x7f0800b2
int id toolshop_slot4 0x7f0800b3
int id toolshop_tool_offer_bottom_row 0x7f0800b4
int id toolshop_tool_offer_top_row 0x7f0800b5
int id toolshop_toolinspector 0x7f0800b6
int id toolshop_topbar 0x7f0800b7
int id toolslot_image 0x7f0800b8
int id topPanel 0x7f0800b9
int id topbar_back_button 0x7f0800ba
int id topbar_energycount 0x7f0800bb
int id topbar_energycount_decrease 0x7f0800bc
int id topbar_energyview 0x7f0800bd
int id topbar_leveldisplay 0x7f0800be
int id topbar_levellayout 0x7f0800bf
int id topbar_levelprogress 0x7f0800c0
int id topbar_settings 0x7f0800c1
int id topbar_shapeshop 0x7f0800c2
int id topbar_starcount 0x7f0800c3
int id topbar_starcount_decrease 0x7f0800c4
int id topbar_starview 0x7f0800c5
int id topbar_toolshop 0x7f0800c6
int id tutorial_image_view 0x7f0800c7
int id tutorial_text_view 0x7f0800c8
int id unlockmessage_message 0x7f0800c9
int id unlockmessage_toolimage 0x7f0800ca
int id up 0x7f0800cb
int id useLogo 0x7f0800cc
int id withText 0x7f0800cd
int id worldbutton_energycount 0x7f0800ce
int id worldbutton_levelcount 0x7f0800cf
int id worldbutton_lock 0x7f0800d0
int id worldbutton_preview 0x7f0800d1
int id worldbutton_starcount 0x7f0800d2
int id worldbutton_title 0x7f0800d3
int id worlds_layout 0x7f0800d4
int id worlds_topbar 0x7f0800d5
int id wrap_content 0x7f0800d6
int integer abc_config_activityDefaultDur 0x7f090000
int integer abc_config_activityShortDur 0x7f090001
int integer abc_max_action_buttons 0x7f090002
@ -862,14 +854,12 @@ int layout task_completed_message 0x7f0a0039
int layout tool_inspector 0x7f0a003a
int layout tool_offer_slot 0x7f0a003b
int layout tool_slot 0x7f0a003c
int layout toolbutton 0x7f0a003d
int layout toolbuttonbar 0x7f0a003e
int layout toolshop 0x7f0a003f
int layout topbar 0x7f0a0040
int layout tutorial 0x7f0a0041
int layout unlock_message 0x7f0a0042
int layout world_button 0x7f0a0043
int layout worlds 0x7f0a0044
int layout toolshop 0x7f0a003d
int layout topbar 0x7f0a003e
int layout tutorial 0x7f0a003f
int layout unlock_message 0x7f0a0040
int layout world_button 0x7f0a0041
int layout worlds 0x7f0a0042
int mipmap ic_launcher 0x7f0b0000
int raw music_game_1 0x7f0c0000
int raw music_game_2 0x7f0c0001