All upgrades are used in calculations -> bomb still has to be balanced
added firework on goal and different goal screen (with button to toolshop), but not happy with second one Have to change it in layout file TopBarData has been removed -> All data (DataStorageHandler, TutorialManager, LevelManager, SoundManager, Typeface, User) is stored in the GameActivity and can be recieved by getters Toolshop-tutorial can now be reset and works instantaniously
This commit is contained in:
=
parent
4b4d81d8c7
commit
b8322c9f05
@ -238,20 +238,20 @@ public final class R {
|
||||
public static final int abc_config_showMenuShortcutsWhenKeyboardPresent = 0x7f080007;
|
||||
}
|
||||
public static final class color {
|
||||
public static final int abc_background_cache_hint_selector_material_dark = 0x7f0c0048;
|
||||
public static final int abc_background_cache_hint_selector_material_light = 0x7f0c0049;
|
||||
public static final int abc_color_highlight_material = 0x7f0c004a;
|
||||
public static final int abc_background_cache_hint_selector_material_dark = 0x7f0c0049;
|
||||
public static final int abc_background_cache_hint_selector_material_light = 0x7f0c004a;
|
||||
public static final int abc_color_highlight_material = 0x7f0c004b;
|
||||
public static final int abc_input_method_navigation_guard = 0x7f0c0000;
|
||||
public static final int abc_primary_text_disable_only_material_dark = 0x7f0c004b;
|
||||
public static final int abc_primary_text_disable_only_material_light = 0x7f0c004c;
|
||||
public static final int abc_primary_text_material_dark = 0x7f0c004d;
|
||||
public static final int abc_primary_text_material_light = 0x7f0c004e;
|
||||
public static final int abc_search_url_text = 0x7f0c004f;
|
||||
public static final int abc_primary_text_disable_only_material_dark = 0x7f0c004c;
|
||||
public static final int abc_primary_text_disable_only_material_light = 0x7f0c004d;
|
||||
public static final int abc_primary_text_material_dark = 0x7f0c004e;
|
||||
public static final int abc_primary_text_material_light = 0x7f0c004f;
|
||||
public static final int abc_search_url_text = 0x7f0c0050;
|
||||
public static final int abc_search_url_text_normal = 0x7f0c0001;
|
||||
public static final int abc_search_url_text_pressed = 0x7f0c0002;
|
||||
public static final int abc_search_url_text_selected = 0x7f0c0003;
|
||||
public static final int abc_secondary_text_material_dark = 0x7f0c0050;
|
||||
public static final int abc_secondary_text_material_light = 0x7f0c0051;
|
||||
public static final int abc_secondary_text_material_dark = 0x7f0c0051;
|
||||
public static final int abc_secondary_text_material_light = 0x7f0c0052;
|
||||
public static final int accent_material_dark = 0x7f0c0004;
|
||||
public static final int accent_material_light = 0x7f0c0005;
|
||||
public static final int background_floating_material_dark = 0x7f0c0006;
|
||||
@ -304,8 +304,8 @@ public final class R {
|
||||
public static final int secondary_text_disabled_material_light = 0x7f0c003a;
|
||||
public static final int switch_thumb_disabled_material_dark = 0x7f0c003b;
|
||||
public static final int switch_thumb_disabled_material_light = 0x7f0c003c;
|
||||
public static final int switch_thumb_material_dark = 0x7f0c0052;
|
||||
public static final int switch_thumb_material_light = 0x7f0c0053;
|
||||
public static final int switch_thumb_material_dark = 0x7f0c0053;
|
||||
public static final int switch_thumb_material_light = 0x7f0c0054;
|
||||
public static final int switch_thumb_normal_material_dark = 0x7f0c003d;
|
||||
public static final int switch_thumb_normal_material_light = 0x7f0c003e;
|
||||
}
|
||||
@ -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 = 0x7f02007d;
|
||||
public static final int notification_template_icon_bg = 0x7f02007b;
|
||||
}
|
||||
public static final class id {
|
||||
public static final int action0 = 0x7f0d006b;
|
||||
public static final int action0 = 0x7f0d006c;
|
||||
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 = 0x7f0d006f;
|
||||
public static final int action_divider = 0x7f0d0070;
|
||||
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 = 0x7f0d006c;
|
||||
public static final int cancel_action = 0x7f0d006d;
|
||||
public static final int checkbox = 0x7f0d0039;
|
||||
public static final int chronometer = 0x7f0d0072;
|
||||
public static final int chronometer = 0x7f0d0073;
|
||||
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 = 0x7f0d0077;
|
||||
public static final int end_padder = 0x7f0d0078;
|
||||
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 = 0x7f0d0076;
|
||||
public static final int line1 = 0x7f0d0070;
|
||||
public static final int line3 = 0x7f0d0074;
|
||||
public static final int info = 0x7f0d0077;
|
||||
public static final int line1 = 0x7f0d0071;
|
||||
public static final int line3 = 0x7f0d0075;
|
||||
public static final int listMode = 0x7f0d0009;
|
||||
public static final int list_item = 0x7f0d0028;
|
||||
public static final int media_actions = 0x7f0d006e;
|
||||
public static final int media_actions = 0x7f0d006f;
|
||||
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 = 0x7f0d006d;
|
||||
public static final int status_bar_latest_event_content = 0x7f0d006e;
|
||||
public static final int submit_area = 0x7f0d004c;
|
||||
public static final int tabMode = 0x7f0d000b;
|
||||
public static final int text = 0x7f0d0075;
|
||||
public static final int text2 = 0x7f0d0073;
|
||||
public static final int text = 0x7f0d0076;
|
||||
public static final int text2 = 0x7f0d0074;
|
||||
public static final int textSpacerNoButtons = 0x7f0d0034;
|
||||
public static final int time = 0x7f0d0071;
|
||||
public static final int time = 0x7f0d0072;
|
||||
public static final int title = 0x7f0d002a;
|
||||
public static final int title_template = 0x7f0d002f;
|
||||
public static final int topPanel = 0x7f0d002e;
|
||||
@ -594,10 +594,10 @@ public final class R {
|
||||
public static final int notification_template_media = 0x7f040023;
|
||||
public static final int notification_template_part_chronometer = 0x7f040024;
|
||||
public static final int notification_template_part_time = 0x7f040025;
|
||||
public static final int select_dialog_item_material = 0x7f040027;
|
||||
public static final int select_dialog_multichoice_material = 0x7f040028;
|
||||
public static final int select_dialog_singlechoice_material = 0x7f040029;
|
||||
public static final int support_simple_spinner_dropdown_item = 0x7f04002c;
|
||||
public static final int select_dialog_item_material = 0x7f040028;
|
||||
public static final int select_dialog_multichoice_material = 0x7f040029;
|
||||
public static final int select_dialog_singlechoice_material = 0x7f04002a;
|
||||
public static final int support_simple_spinner_dropdown_item = 0x7f04002d;
|
||||
}
|
||||
public static final class string {
|
||||
public static final int abc_action_bar_home_description = 0x7f070000;
|
||||
|
||||
@ -2,12 +2,24 @@ precision mediump float;
|
||||
|
||||
uniform sampler2D texture;
|
||||
uniform vec3 color;
|
||||
uniform float alpha;
|
||||
|
||||
varying vec2 pass_TexCoords;
|
||||
|
||||
vec3 saturateColor(in vec3 color, in float a);
|
||||
|
||||
void main() {
|
||||
|
||||
gl_FragColor.a = texture2D(texture, pass_TexCoords).a;
|
||||
gl_FragColor.rgb = color;
|
||||
float a = texture2D(texture, pass_TexCoords).a * alpha;
|
||||
gl_FragColor = vec4(saturateColor(color, a), a);
|
||||
|
||||
}
|
||||
|
||||
vec3 saturateColor(in vec3 color, in float a){
|
||||
|
||||
float grayscale = (color.r * 0.299 + color.g * 0.587 + color. b * 0.114);
|
||||
float alpha = ((1.1 - a) * 0.5) * 40.0;
|
||||
|
||||
return alpha * color + (1.0 - alpha) * vec3(grayscale, grayscale, grayscale);
|
||||
|
||||
}
|
||||
@ -12,7 +12,15 @@
|
||||
"endOffset": 326
|
||||
},
|
||||
"from": {
|
||||
"file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values-v14\\values-v14.xml"
|
||||
"file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values-v14\\values-v14.xml",
|
||||
"position": {
|
||||
"startLine": 4,
|
||||
"startColumn": 4,
|
||||
"startOffset": 239,
|
||||
"endLine": 8,
|
||||
"endColumn": 12,
|
||||
"endOffset": 510
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
@ -24,7 +32,14 @@
|
||||
"endOffset": 397
|
||||
},
|
||||
"from": {
|
||||
"file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values-v14\\values-v14.xml"
|
||||
"file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values-v14\\values-v14.xml",
|
||||
"position": {
|
||||
"startLine": 11,
|
||||
"startColumn": 4,
|
||||
"startOffset": 694,
|
||||
"endColumn": 70,
|
||||
"endOffset": 760
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
@ -36,7 +51,14 @@
|
||||
"endOffset": 480
|
||||
},
|
||||
"from": {
|
||||
"file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values-v14\\values-v14.xml"
|
||||
"file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values-v14\\values-v14.xml",
|
||||
"position": {
|
||||
"startLine": 12,
|
||||
"startColumn": 4,
|
||||
"startOffset": 765,
|
||||
"endColumn": 82,
|
||||
"endOffset": 843
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
@ -49,7 +71,15 @@
|
||||
"endOffset": 890
|
||||
},
|
||||
"from": {
|
||||
"file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values-v14\\values-v14.xml"
|
||||
"file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values-v14\\values-v14.xml",
|
||||
"position": {
|
||||
"startLine": 13,
|
||||
"startColumn": 4,
|
||||
"startOffset": 848,
|
||||
"endLine": 18,
|
||||
"endColumn": 12,
|
||||
"endOffset": 1253
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
@ -62,7 +92,15 @@
|
||||
"endOffset": 1312
|
||||
},
|
||||
"from": {
|
||||
"file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values-v14\\values-v14.xml"
|
||||
"file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values-v14\\values-v14.xml",
|
||||
"position": {
|
||||
"startLine": 19,
|
||||
"startColumn": 4,
|
||||
"startOffset": 1258,
|
||||
"endLine": 24,
|
||||
"endColumn": 12,
|
||||
"endOffset": 1675
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
@ -74,7 +112,14 @@
|
||||
"endOffset": 1432
|
||||
},
|
||||
"from": {
|
||||
"file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values-v14\\values-v14.xml"
|
||||
"file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values-v14\\values-v14.xml",
|
||||
"position": {
|
||||
"startLine": 27,
|
||||
"startColumn": 4,
|
||||
"startOffset": 1854,
|
||||
"endColumn": 119,
|
||||
"endOffset": 1969
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
@ -86,7 +131,14 @@
|
||||
"endOffset": 1495
|
||||
},
|
||||
"from": {
|
||||
"file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values-v14\\values-v14.xml"
|
||||
"file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values-v14\\values-v14.xml",
|
||||
"position": {
|
||||
"startLine": 28,
|
||||
"startColumn": 4,
|
||||
"startOffset": 1974,
|
||||
"endColumn": 62,
|
||||
"endOffset": 2032
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
@ -99,7 +151,15 @@
|
||||
"endOffset": 1649
|
||||
},
|
||||
"from": {
|
||||
"file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values-v14\\values-v14.xml"
|
||||
"file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values-v14\\values-v14.xml",
|
||||
"position": {
|
||||
"startLine": 29,
|
||||
"startColumn": 4,
|
||||
"startOffset": 2037,
|
||||
"endLine": 31,
|
||||
"endColumn": 12,
|
||||
"endOffset": 2186
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
@ -111,7 +171,14 @@
|
||||
"endOffset": 1712
|
||||
},
|
||||
"from": {
|
||||
"file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values-v14\\values-v14.xml"
|
||||
"file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values-v14\\values-v14.xml",
|
||||
"position": {
|
||||
"startLine": 32,
|
||||
"startColumn": 4,
|
||||
"startOffset": 2191,
|
||||
"endColumn": 62,
|
||||
"endOffset": 2249
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
@ -123,7 +190,14 @@
|
||||
"endOffset": 1844
|
||||
},
|
||||
"from": {
|
||||
"file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values-v14\\values-v14.xml"
|
||||
"file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values-v14\\values-v14.xml",
|
||||
"position": {
|
||||
"startLine": 33,
|
||||
"startColumn": 4,
|
||||
"startOffset": 2254,
|
||||
"endColumn": 131,
|
||||
"endOffset": 2381
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -3,14 +3,14 @@
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\guis_sound_on.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\guis_sound_on.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tools_bomb.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tools_bomb.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\xml_selector_gamebutton.xml",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\xml_selector_gamebutton.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tools_bomb.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tools_bomb.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_cab_background_internal_bg.xml",
|
||||
"source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_cab_background_internal_bg.xml"
|
||||
@ -63,14 +63,14 @@
|
||||
"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\\xml_selector_pricebutton.xml",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\xml_selector_pricebutton.xml"
|
||||
},
|
||||
{
|
||||
"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"
|
||||
@ -179,34 +179,34 @@
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\magnet_field.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\magnet_field.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\backgrounds_game_mountains.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\backgrounds_game_mountains.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\arrow_green.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\arrow_green.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\guis_playerarrow.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\guis_playerarrow.png"
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\backgrounds_game_mountains.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\backgrounds_game_mountains.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tools_unlockedbutton.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tools_unlockedbutton.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\guis_playerarrow.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\guis_playerarrow.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_ratingbar_full_material.xml",
|
||||
"source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_ratingbar_full_material.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_list_selector_background_transition_holo_dark.xml",
|
||||
"source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_list_selector_background_transition_holo_dark.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tools_ramp.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tools_ramp.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_list_selector_background_transition_holo_dark.xml",
|
||||
"source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_list_selector_background_transition_holo_dark.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\splitter.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\splitter.png"
|
||||
@ -219,14 +219,14 @@
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tip_icon.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tip_icon.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tools_emptybutton.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tools_emptybutton.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_cab_background_top_material.xml",
|
||||
"source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_cab_background_top_material.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tools_emptybutton.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tools_emptybutton.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_text_cursor_material.xml",
|
||||
"source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_text_cursor_material.xml"
|
||||
@ -243,14 +243,14 @@
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\obstacles_grass.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\obstacles_grass.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_switch_thumb_material.xml",
|
||||
"source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_switch_thumb_material.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_list_selector_holo_light.xml",
|
||||
"source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_list_selector_holo_light.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_switch_thumb_material.xml",
|
||||
"source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_switch_thumb_material.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tools_bombbutton.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tools_bombbutton.png"
|
||||
|
||||
@ -3,22 +3,22 @@
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\levels.xml",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\layout\\levels.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\tutorial.xml",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\layout\\tutorial.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\toolshop.xml",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\layout\\toolshop.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\worlds.xml",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\layout\\worlds.xml"
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\tutorial.xml",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\layout\\tutorial.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\abc_screen_simple_overlay_action_mode.xml",
|
||||
"source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\layout\\abc_screen_simple_overlay_action_mode.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\worlds.xml",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\layout\\worlds.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\abc_screen_simple.xml",
|
||||
"source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\layout\\abc_screen_simple.xml"
|
||||
@ -131,6 +131,10 @@
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\abc_action_mode_close_item_material.xml",
|
||||
"source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\layout\\abc_action_mode_close_item_material.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\pre_start_screen.xml",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\layout\\pre_start_screen.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\notification_media_action.xml",
|
||||
"source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\layout\\notification_media_action.xml"
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="output"><source path="C:\Users\Julian\.android\build-cache\7988038707870a182a4d2c219c6a86a58ec3478f\output\assets"/></dataSet><dataSet config="output"><source path="C:\Users\Julian\.android\build-cache\2232000db64551c7682d41127fbc27c912efcc3d\output\assets"/></dataSet><dataSet config="main"><source path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets"><file name="fontBaron.ttf" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\fontBaron.ttf"/><file name="levelpacks/Grasslands.xml" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\levelpacks\Grasslands.xml"/><file name="particleEffects/collectEnergy.pe" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\collectEnergy.pe"/><file name="particleEffects/collectStar.pe" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\collectStar.pe"/><file name="particleEffects/explosion.pe" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\explosion.pe"/><file name="particleEffects/magnet.pe" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\magnet.pe"/><file name="particleEffects/particle.png" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\particle.png"/><file name="particleEffects/star.png" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\star.png"/><file name="shader/entityFragmentShader.glsl" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\shader\entityFragmentShader.glsl"/><file name="shader/entityVertexShader.glsl" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\shader\entityVertexShader.glsl"/><file name="shader/particleFragmentShader.glsl" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\shader\particleFragmentShader.glsl"/><file name="shader/simpleFragmentShader.glsl" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\shader\simpleFragmentShader.glsl"/><file name="shader/simpleVertexShader.glsl" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\shader\simpleVertexShader.glsl"/><file name="shader/terrainVertexShader.glsl" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\shader\terrainVertexShader.glsl"/></source><source path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\build\generated\assets\shaders\debug"/></dataSet><dataSet config="debug"><source path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\debug\assets"/></dataSet></merger>
|
||||
<merger version="3"><dataSet config="output"><source path="C:\Users\Julian\.android\build-cache\7988038707870a182a4d2c219c6a86a58ec3478f\output\assets"/></dataSet><dataSet config="output"><source path="C:\Users\Julian\.android\build-cache\2232000db64551c7682d41127fbc27c912efcc3d\output\assets"/></dataSet><dataSet config="main"><source path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets"><file name="fontBaron.ttf" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\fontBaron.ttf"/><file name="levelpacks/Grasslands.xml" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\levelpacks\Grasslands.xml"/><file name="particleEffects/collectEnergy.pe" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\collectEnergy.pe"/><file name="particleEffects/collectStar.pe" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\collectStar.pe"/><file name="particleEffects/explosion.pe" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\explosion.pe"/><file name="particleEffects/magnet.pe" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\magnet.pe"/><file name="particleEffects/particle.png" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\particle.png"/><file name="particleEffects/star.png" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\star.png"/><file name="shader/entityFragmentShader.glsl" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\shader\entityFragmentShader.glsl"/><file name="shader/entityVertexShader.glsl" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\shader\entityVertexShader.glsl"/><file name="shader/particleFragmentShader.glsl" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\shader\particleFragmentShader.glsl"/><file name="shader/simpleFragmentShader.glsl" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\shader\simpleFragmentShader.glsl"/><file name="shader/simpleVertexShader.glsl" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\shader\simpleVertexShader.glsl"/><file name="shader/terrainVertexShader.glsl" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\shader\terrainVertexShader.glsl"/><file name="particleEffects/firework.pe" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\firework.pe"/></source><source path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\build\generated\assets\shaders\debug"/></dataSet><dataSet config="debug"><source path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\debug\assets"/></dataSet></merger>
|
||||
File diff suppressed because one or more lines are too long
@ -13,33 +13,51 @@
|
||||
android:textSize="55sp"/>
|
||||
|
||||
<Button
|
||||
android:id="@+id/message_nextlevelbutton"
|
||||
style="@style/GameButton"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Restart"
|
||||
android:id="@+id/message_leftbutton"
|
||||
style="@style/GameButton"
|
||||
android:layout_marginTop="37dp"
|
||||
android:layout_below="@+id/message_title"
|
||||
android:layout_alignStart="@+id/message_title"/>
|
||||
android:layout_toLeftOf="@+id/message_title"
|
||||
android:layout_toStartOf="@+id/message_title"
|
||||
android:text="Next level"/>
|
||||
|
||||
<Button
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Exit"
|
||||
style="@style/GameButton"
|
||||
android:id="@+id/message_exitbutton"
|
||||
android:layout_alignTop="@+id/message_leftbutton"
|
||||
android:layout_alignEnd="@+id/message_title"/>
|
||||
|
||||
<Button
|
||||
style="@style/GameButton"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Try again"
|
||||
android:text="To menu"
|
||||
android:layout_alignBaseline="@+id/message_restartbutton"
|
||||
android:layout_alignBottom="@+id/message_restartbutton"
|
||||
android:layout_alignLeft="@+id/message_toolshopbutton"
|
||||
android:layout_alignStart="@+id/message_toolshopbutton"/>
|
||||
|
||||
<Button
|
||||
android:id="@+id/message_toolshopbutton"
|
||||
style="@style/GameButton"
|
||||
android:id="@+id/message_tryagainbutton"
|
||||
android:visibility="visible"
|
||||
android:layout_marginTop="3dp"
|
||||
android:layout_below="@+id/message_leftbutton"
|
||||
android:layout_alignStart="@+id/message_leftbutton"/>
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="21dp"
|
||||
android:layout_marginStart="21dp"
|
||||
android:text="Tools"
|
||||
android:layout_above="@+id/message_title"
|
||||
android:layout_toRightOf="@+id/message_title"
|
||||
android:layout_toEndOf="@+id/message_title"
|
||||
android:layout_marginBottom="14dp"/>
|
||||
|
||||
<Button
|
||||
android:id="@+id/message_restartbutton"
|
||||
style="@style/GameButton"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignLeft="@+id/message_title"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:layout_alignStart="@+id/message_title"
|
||||
android:layout_marginBottom="14dp"
|
||||
android:layout_marginLeft="50dp"
|
||||
android:layout_marginStart="50dp"
|
||||
android:text="Restart level"
|
||||
android:visibility="visible"/>
|
||||
|
||||
</RelativeLayout>
|
||||
@ -25,9 +25,9 @@
|
||||
android:background="@drawable/playershapes_ball"
|
||||
android:text="Play"
|
||||
android:textSize="25sp"
|
||||
android:textColor="#ffffff"
|
||||
android:layout_alignParentTop="true"
|
||||
android:layout_centerHorizontal="true"/>
|
||||
android:layout_centerHorizontal="true"
|
||||
android:textColor="#ffffff"/>
|
||||
|
||||
<Button
|
||||
android:id="@+id/startscreen_comingsoon"
|
||||
|
||||
@ -58,7 +58,7 @@
|
||||
<style name="Base.Theme.AppCompat.Light" parent="Base.V21.Theme.AppCompat.Light"/>
|
||||
<style name="Base.Theme.AppCompat.Light.Dialog" parent="Base.V21.Theme.AppCompat.Light.Dialog"/>
|
||||
<style name="Base.V21.Theme.AppCompat" parent="Base.V7.Theme.AppCompat">
|
||||
|
||||
<!-- Action Bar styling attributes -->
|
||||
<item name="actionBarSize">?android:attr/actionBarSize</item>
|
||||
<item name="actionBarDivider">?android:attr/actionBarDivider</item>
|
||||
<item name="actionBarItemBackground">@drawable/abc_action_bar_item_background_material</item>
|
||||
@ -68,12 +68,12 @@
|
||||
<item name="actionOverflowButtonStyle">?android:attr/actionOverflowButtonStyle</item>
|
||||
<item name="homeAsUpIndicator">?android:attr/homeAsUpIndicator</item>
|
||||
|
||||
|
||||
<!-- For PopupMenu -->
|
||||
<item name="listPreferredItemHeightSmall">?android:attr/listPreferredItemHeightSmall</item>
|
||||
<item name="textAppearanceLargePopupMenu">?android:attr/textAppearanceLargePopupMenu</item>
|
||||
<item name="textAppearanceSmallPopupMenu">?android:attr/textAppearanceSmallPopupMenu</item>
|
||||
|
||||
|
||||
<!-- General view attributes -->
|
||||
<item name="selectableItemBackground">?android:attr/selectableItemBackground</item>
|
||||
<item name="selectableItemBackgroundBorderless">?android:attr/selectableItemBackgroundBorderless</item>
|
||||
<item name="borderlessButtonStyle">?android:borderlessButtonStyle</item>
|
||||
@ -83,7 +83,7 @@
|
||||
<item name="editTextColor">?android:attr/editTextColor</item>
|
||||
<item name="listChoiceBackgroundIndicator">?android:attr/listChoiceBackgroundIndicator</item>
|
||||
|
||||
|
||||
<!-- Copy the platform default styles for the AppCompat widgets -->
|
||||
<item name="buttonStyle">?android:attr/buttonStyle</item>
|
||||
<item name="buttonStyleSmall">?android:attr/buttonStyleSmall</item>
|
||||
<item name="checkboxStyle">?android:attr/checkboxStyle</item>
|
||||
@ -92,7 +92,7 @@
|
||||
<item name="ratingBarStyle">?android:attr/ratingBarStyle</item>
|
||||
<item name="spinnerStyle">?android:attr/spinnerStyle</item>
|
||||
|
||||
|
||||
<!-- Copy our color theme attributes to the framework -->
|
||||
<item name="android:colorPrimary">?attr/colorPrimary</item>
|
||||
<item name="android:colorPrimaryDark">?attr/colorPrimaryDark</item>
|
||||
<item name="android:colorAccent">?attr/colorAccent</item>
|
||||
@ -105,7 +105,7 @@
|
||||
<item name="android:windowElevation">@dimen/abc_floating_window_z</item>
|
||||
</style>
|
||||
<style name="Base.V21.Theme.AppCompat.Light" parent="Base.V7.Theme.AppCompat.Light">
|
||||
|
||||
<!-- Action Bar styling attributes -->
|
||||
<item name="actionBarSize">?android:attr/actionBarSize</item>
|
||||
<item name="actionBarDivider">?android:attr/actionBarDivider</item>
|
||||
<item name="actionBarItemBackground">@drawable/abc_action_bar_item_background_material</item>
|
||||
@ -115,12 +115,12 @@
|
||||
<item name="actionOverflowButtonStyle">?android:attr/actionOverflowButtonStyle</item>
|
||||
<item name="homeAsUpIndicator">?android:attr/homeAsUpIndicator</item>
|
||||
|
||||
|
||||
<!-- For PopupMenu -->
|
||||
<item name="listPreferredItemHeightSmall">?android:attr/listPreferredItemHeightSmall</item>
|
||||
<item name="textAppearanceLargePopupMenu">?android:attr/textAppearanceLargePopupMenu</item>
|
||||
<item name="textAppearanceSmallPopupMenu">?android:attr/textAppearanceSmallPopupMenu</item>
|
||||
|
||||
|
||||
<!-- General view attributes -->
|
||||
<item name="selectableItemBackground">?android:attr/selectableItemBackground</item>
|
||||
<item name="selectableItemBackgroundBorderless">?android:attr/selectableItemBackgroundBorderless</item>
|
||||
<item name="borderlessButtonStyle">?android:borderlessButtonStyle</item>
|
||||
@ -130,7 +130,7 @@
|
||||
<item name="editTextColor">?android:attr/editTextColor</item>
|
||||
<item name="listChoiceBackgroundIndicator">?android:attr/listChoiceBackgroundIndicator</item>
|
||||
|
||||
|
||||
<!-- Copy the platform default styles for the AppCompat widgets -->
|
||||
<item name="buttonStyle">?android:attr/buttonStyle</item>
|
||||
<item name="buttonStyleSmall">?android:attr/buttonStyleSmall</item>
|
||||
<item name="checkboxStyle">?android:attr/checkboxStyle</item>
|
||||
@ -139,7 +139,7 @@
|
||||
<item name="ratingBarStyle">?android:attr/ratingBarStyle</item>
|
||||
<item name="spinnerStyle">?android:attr/spinnerStyle</item>
|
||||
|
||||
|
||||
<!-- Copy our color theme attributes to the framework -->
|
||||
<item name="android:colorPrimary">?attr/colorPrimary</item>
|
||||
<item name="android:colorPrimaryDark">?attr/colorPrimaryDark</item>
|
||||
<item name="android:colorAccent">?attr/colorAccent</item>
|
||||
@ -225,7 +225,7 @@
|
||||
<item name="android:buttonBarButtonStyle">?attr/buttonBarButtonStyle</item>
|
||||
</style>
|
||||
<style name="Platform.ThemeOverlay.AppCompat" parent="">
|
||||
|
||||
<!-- Copy our color theme attributes to the framework -->
|
||||
<item name="android:colorPrimary">?attr/colorPrimary</item>
|
||||
<item name="android:colorPrimaryDark">?attr/colorPrimaryDark</item>
|
||||
<item name="android:colorAccent">?attr/colorAccent</item>
|
||||
|
||||
@ -81,6 +81,7 @@
|
||||
<color name="toolbuttonInactiveReady">#dbfff200</color>
|
||||
<color name="toolbuttonLocked">#db494b49</color>
|
||||
<color name="toolslotDisabled">#715f5f</color>
|
||||
<color name="toolslotDisabledSelected">#60715f</color>
|
||||
<color name="toolslotEnabled">#db41e42b</color>
|
||||
<color name="toolslotEnabledSelected">#b3d700</color>
|
||||
<color name="win">#ffda45</color>
|
||||
@ -438,7 +439,7 @@
|
||||
<item name="actionBarWidgetTheme">@null</item>
|
||||
<item name="actionBarTheme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
|
||||
|
||||
|
||||
<!-- Panel attributes -->
|
||||
<item name="listChoiceBackgroundIndicator">@drawable/abc_list_selector_holo_dark</item>
|
||||
|
||||
<item name="colorPrimaryDark">@color/primary_dark_material_dark</item>
|
||||
@ -488,7 +489,7 @@
|
||||
<item name="colorButtonNormal">@color/button_material_dark</item>
|
||||
<item name="colorSwitchThumbNormal">@color/switch_thumb_material_dark</item>
|
||||
|
||||
|
||||
<!-- Used by MediaRouter -->
|
||||
<item name="isLightTheme">false</item>
|
||||
</style>
|
||||
<style name="Base.ThemeOverlay.AppCompat.Dark.ActionBar">
|
||||
@ -519,7 +520,7 @@
|
||||
<item name="colorButtonNormal">@color/button_material_light</item>
|
||||
<item name="colorSwitchThumbNormal">@color/switch_thumb_material_light</item>
|
||||
|
||||
|
||||
<!-- Used by MediaRouter -->
|
||||
<item name="isLightTheme">true</item>
|
||||
</style>
|
||||
<style name="Base.V7.Theme.AppCompat" parent="Platform.AppCompat">
|
||||
@ -529,7 +530,7 @@
|
||||
<item name="windowActionModeOverlay">false</item>
|
||||
<item name="actionBarPopupTheme">@null</item>
|
||||
|
||||
|
||||
<!-- Used by MediaRouter -->
|
||||
<item name="isLightTheme">false</item>
|
||||
|
||||
<item name="selectableItemBackground">@drawable/abc_item_background_holo_dark</item>
|
||||
@ -540,7 +541,7 @@
|
||||
<item name="dividerVertical">@drawable/abc_list_divider_mtrl_alpha</item>
|
||||
<item name="dividerHorizontal">@drawable/abc_list_divider_mtrl_alpha</item>
|
||||
|
||||
|
||||
<!-- Action Bar Styles -->
|
||||
<item name="actionBarTabStyle">@style/Widget.AppCompat.ActionBar.TabView</item>
|
||||
<item name="actionBarTabBarStyle">@style/Widget.AppCompat.ActionBar.TabBar</item>
|
||||
<item name="actionBarTabTextStyle">@style/Widget.AppCompat.ActionBar.TabText</item>
|
||||
@ -557,10 +558,10 @@
|
||||
<item name="actionMenuTextAppearance">@style/TextAppearance.AppCompat.Widget.ActionBar.Menu</item>
|
||||
<item name="actionMenuTextColor">?android:attr/textColorPrimaryDisableOnly</item>
|
||||
|
||||
|
||||
<!-- Dropdown Spinner Attributes -->
|
||||
<item name="actionDropDownStyle">@style/Widget.AppCompat.Spinner.DropDown.ActionBar</item>
|
||||
|
||||
|
||||
<!-- Action Mode -->
|
||||
<item name="actionModeStyle">@style/Widget.AppCompat.ActionMode</item>
|
||||
<item name="actionModeBackground">@drawable/abc_cab_background_top_material</item>
|
||||
<item name="actionModeSplitBackground">?attr/colorPrimaryDark</item>
|
||||
@ -573,14 +574,14 @@
|
||||
<item name="actionModeSelectAllDrawable">@drawable/abc_ic_menu_selectall_mtrl_alpha</item>
|
||||
<item name="actionModeShareDrawable">@drawable/abc_ic_menu_share_mtrl_alpha</item>
|
||||
|
||||
|
||||
<!-- Panel attributes -->
|
||||
<item name="panelMenuListWidth">@dimen/abc_panel_menu_list_width</item>
|
||||
<item name="panelMenuListTheme">@style/Theme.AppCompat.CompactMenu</item>
|
||||
<item name="panelBackground">@drawable/abc_menu_hardkey_panel_mtrl_mult</item>
|
||||
<item name="android:panelBackground">@android:color/transparent</item>
|
||||
<item name="listChoiceBackgroundIndicator">@drawable/abc_list_selector_holo_dark</item>
|
||||
|
||||
|
||||
<!-- List attributes -->
|
||||
<item name="textAppearanceListItem">@style/TextAppearance.AppCompat.Subhead</item>
|
||||
<item name="textAppearanceListItemSmall">@style/TextAppearance.AppCompat.Subhead</item>
|
||||
<item name="listPreferredItemHeight">64dp</item>
|
||||
@ -589,33 +590,33 @@
|
||||
<item name="listPreferredItemPaddingLeft">@dimen/abc_list_item_padding_horizontal_material</item>
|
||||
<item name="listPreferredItemPaddingRight">@dimen/abc_list_item_padding_horizontal_material</item>
|
||||
|
||||
|
||||
<!-- Spinner styles -->
|
||||
<item name="spinnerStyle">@style/Widget.AppCompat.Spinner</item>
|
||||
<item name="android:spinnerItemStyle">@style/Widget.AppCompat.TextView.SpinnerItem</item>
|
||||
<item name="android:dropDownListViewStyle">@style/Widget.AppCompat.ListView.DropDown</item>
|
||||
|
||||
|
||||
<!-- Required for use of support_simple_spinner_dropdown_item.xml -->
|
||||
<item name="spinnerDropDownItemStyle">@style/Widget.AppCompat.DropDownItem.Spinner</item>
|
||||
<item name="dropdownListPreferredItemHeight">?attr/listPreferredItemHeightSmall</item>
|
||||
|
||||
|
||||
<!-- Popup Menu styles -->
|
||||
<item name="popupMenuStyle">@style/Widget.AppCompat.PopupMenu</item>
|
||||
<item name="textAppearanceLargePopupMenu">@style/TextAppearance.AppCompat.Widget.PopupMenu.Large</item>
|
||||
<item name="textAppearanceSmallPopupMenu">@style/TextAppearance.AppCompat.Widget.PopupMenu.Small</item>
|
||||
<item name="listPopupWindowStyle">@style/Widget.AppCompat.ListPopupWindow</item>
|
||||
<item name="dropDownListViewStyle">?android:attr/dropDownListViewStyle</item>
|
||||
|
||||
|
||||
<!-- SearchView attributes -->
|
||||
<item name="searchViewStyle">@style/Widget.AppCompat.SearchView</item>
|
||||
<item name="android:dropDownItemStyle">@style/Widget.AppCompat.DropDownItem.Spinner</item>
|
||||
<item name="textColorSearchUrl">@color/abc_search_url_text</item>
|
||||
<item name="textAppearanceSearchResultTitle">@style/TextAppearance.AppCompat.SearchResult.Title</item>
|
||||
<item name="textAppearanceSearchResultSubtitle">@style/TextAppearance.AppCompat.SearchResult.Subtitle</item>
|
||||
|
||||
|
||||
<!-- ShareActionProvider attributes -->
|
||||
<item name="activityChooserViewStyle">@style/Widget.AppCompat.ActivityChooserView</item>
|
||||
|
||||
|
||||
<!-- Toolbar styles -->
|
||||
<item name="toolbarStyle">@style/Widget.AppCompat.Toolbar</item>
|
||||
<item name="toolbarNavigationButtonStyle">@style/Widget.AppCompat.Toolbar.Button.Navigation</item>
|
||||
|
||||
@ -624,7 +625,7 @@
|
||||
<item name="editTextColor">?android:attr/textColorPrimary</item>
|
||||
<item name="autoCompleteTextViewStyle">@style/Widget.AppCompat.AutoCompleteTextView</item>
|
||||
|
||||
|
||||
<!-- Color palette -->
|
||||
<item name="colorPrimaryDark">@color/primary_dark_material_dark</item>
|
||||
<item name="colorPrimary">@color/primary_material_dark</item>
|
||||
<item name="colorAccent">@color/accent_material_dark</item>
|
||||
@ -645,7 +646,7 @@
|
||||
<item name="ratingBarStyle">@style/Widget.AppCompat.RatingBar</item>
|
||||
<item name="seekBarStyle">@style/Widget.AppCompat.SeekBar</item>
|
||||
|
||||
|
||||
<!-- Button styles -->
|
||||
<item name="buttonStyle">@style/Widget.AppCompat.Button</item>
|
||||
<item name="buttonStyleSmall">@style/Widget.AppCompat.Button.Small</item>
|
||||
<item name="android:textAppearanceButton">@style/TextAppearance.AppCompat.Widget.Button</item>
|
||||
@ -658,7 +659,7 @@
|
||||
<item name="buttonBarNegativeButtonStyle">?attr/buttonBarButtonStyle</item>
|
||||
<item name="buttonBarNeutralButtonStyle">?attr/buttonBarButtonStyle</item>
|
||||
|
||||
|
||||
<!-- Dialog attributes -->
|
||||
<item name="dialogTheme">@style/Theme.AppCompat.Dialog</item>
|
||||
<item name="dialogPreferredPadding">@dimen/abc_dialog_padding_material</item>
|
||||
|
||||
@ -668,7 +669,8 @@
|
||||
<item name="textColorAlertDialogListItem">@color/abc_primary_text_material_dark</item>
|
||||
<item name="listDividerAlertDialog">@null</item>
|
||||
|
||||
|
||||
<!-- Define these here; ContextThemeWrappers around themes that define them should
|
||||
always clear these values. -->
|
||||
<item name="windowFixedWidthMajor">0dp</item>
|
||||
<item name="windowFixedWidthMinor">0dp</item>
|
||||
<item name="windowFixedHeightMajor">0dp</item>
|
||||
@ -703,7 +705,7 @@
|
||||
<item name="windowActionModeOverlay">false</item>
|
||||
<item name="actionBarPopupTheme">@null</item>
|
||||
|
||||
|
||||
<!-- Used by MediaRouter -->
|
||||
<item name="isLightTheme">true</item>
|
||||
|
||||
<item name="selectableItemBackground">@drawable/abc_item_background_holo_light</item>
|
||||
@ -714,7 +716,7 @@
|
||||
<item name="dividerVertical">@drawable/abc_list_divider_mtrl_alpha</item>
|
||||
<item name="dividerHorizontal">@drawable/abc_list_divider_mtrl_alpha</item>
|
||||
|
||||
|
||||
<!-- Action Bar Styles -->
|
||||
<item name="actionBarTabStyle">@style/Widget.AppCompat.Light.ActionBar.TabView</item>
|
||||
<item name="actionBarTabBarStyle">@style/Widget.AppCompat.Light.ActionBar.TabBar</item>
|
||||
<item name="actionBarTabTextStyle">@style/Widget.AppCompat.Light.ActionBar.TabText</item>
|
||||
@ -731,7 +733,7 @@
|
||||
<item name="actionMenuTextAppearance">@style/TextAppearance.AppCompat.Widget.ActionBar.Menu</item>
|
||||
<item name="actionMenuTextColor">?android:attr/textColorPrimaryDisableOnly</item>
|
||||
|
||||
|
||||
<!-- Action Mode -->
|
||||
<item name="actionModeStyle">@style/Widget.AppCompat.ActionMode</item>
|
||||
<item name="actionModeBackground">@drawable/abc_cab_background_top_material</item>
|
||||
<item name="actionModeSplitBackground">?attr/colorPrimaryDark</item>
|
||||
@ -744,17 +746,17 @@
|
||||
<item name="actionModeSelectAllDrawable">@drawable/abc_ic_menu_selectall_mtrl_alpha</item>
|
||||
<item name="actionModeShareDrawable">@drawable/abc_ic_menu_share_mtrl_alpha</item>
|
||||
|
||||
|
||||
<!-- Dropdown Spinner Attributes -->
|
||||
<item name="actionDropDownStyle">@style/Widget.AppCompat.Light.Spinner.DropDown.ActionBar</item>
|
||||
|
||||
|
||||
<!-- Panel attributes -->
|
||||
<item name="panelMenuListWidth">@dimen/abc_panel_menu_list_width</item>
|
||||
<item name="panelMenuListTheme">@style/Theme.AppCompat.CompactMenu</item>
|
||||
<item name="panelBackground">@drawable/abc_menu_hardkey_panel_mtrl_mult</item>
|
||||
<item name="android:panelBackground">@android:color/transparent</item>
|
||||
<item name="listChoiceBackgroundIndicator">@drawable/abc_list_selector_holo_light</item>
|
||||
|
||||
|
||||
<!-- List attributes -->
|
||||
<item name="textAppearanceListItem">@style/TextAppearance.AppCompat.Subhead</item>
|
||||
<item name="textAppearanceListItemSmall">@style/TextAppearance.AppCompat.Subhead</item>
|
||||
<item name="listPreferredItemHeight">64dp</item>
|
||||
@ -763,33 +765,33 @@
|
||||
<item name="listPreferredItemPaddingLeft">@dimen/abc_list_item_padding_horizontal_material</item>
|
||||
<item name="listPreferredItemPaddingRight">@dimen/abc_list_item_padding_horizontal_material</item>
|
||||
|
||||
|
||||
<!-- Spinner styles -->
|
||||
<item name="spinnerStyle">@style/Widget.AppCompat.Spinner</item>
|
||||
<item name="android:spinnerItemStyle">@style/Widget.AppCompat.TextView.SpinnerItem</item>
|
||||
<item name="android:dropDownListViewStyle">@style/Widget.AppCompat.ListView.DropDown</item>
|
||||
|
||||
|
||||
<!-- Required for use of support_simple_spinner_dropdown_item.xml -->
|
||||
<item name="spinnerDropDownItemStyle">@style/Widget.AppCompat.DropDownItem.Spinner</item>
|
||||
<item name="dropdownListPreferredItemHeight">?attr/listPreferredItemHeightSmall</item>
|
||||
|
||||
|
||||
<!-- Popup Menu styles -->
|
||||
<item name="popupMenuStyle">@style/Widget.AppCompat.Light.PopupMenu</item>
|
||||
<item name="textAppearanceLargePopupMenu">@style/TextAppearance.AppCompat.Light.Widget.PopupMenu.Large</item>
|
||||
<item name="textAppearanceSmallPopupMenu">@style/TextAppearance.AppCompat.Light.Widget.PopupMenu.Small</item>
|
||||
<item name="listPopupWindowStyle">@style/Widget.AppCompat.ListPopupWindow</item>
|
||||
<item name="dropDownListViewStyle">?android:attr/dropDownListViewStyle</item>
|
||||
|
||||
|
||||
<!-- SearchView attributes -->
|
||||
<item name="searchViewStyle">@style/Widget.AppCompat.Light.SearchView</item>
|
||||
<item name="android:dropDownItemStyle">@style/Widget.AppCompat.DropDownItem.Spinner</item>
|
||||
<item name="textColorSearchUrl">@color/abc_search_url_text</item>
|
||||
<item name="textAppearanceSearchResultTitle">@style/TextAppearance.AppCompat.SearchResult.Title</item>
|
||||
<item name="textAppearanceSearchResultSubtitle">@style/TextAppearance.AppCompat.SearchResult.Subtitle</item>
|
||||
|
||||
|
||||
<!-- ShareActionProvider attributes -->
|
||||
<item name="activityChooserViewStyle">@style/Widget.AppCompat.ActivityChooserView</item>
|
||||
|
||||
|
||||
<!-- Toolbar styles -->
|
||||
<item name="toolbarStyle">@style/Widget.AppCompat.Toolbar</item>
|
||||
<item name="toolbarNavigationButtonStyle">@style/Widget.AppCompat.Toolbar.Button.Navigation</item>
|
||||
|
||||
@ -798,7 +800,7 @@
|
||||
<item name="editTextColor">?android:attr/textColorPrimary</item>
|
||||
<item name="autoCompleteTextViewStyle">@style/Widget.AppCompat.AutoCompleteTextView</item>
|
||||
|
||||
|
||||
<!-- Color palette -->
|
||||
<item name="colorPrimaryDark">@color/primary_dark_material_light</item>
|
||||
<item name="colorPrimary">@color/primary_material_light</item>
|
||||
<item name="colorAccent">@color/accent_material_light</item>
|
||||
@ -819,7 +821,7 @@
|
||||
<item name="ratingBarStyle">@style/Widget.AppCompat.RatingBar</item>
|
||||
<item name="seekBarStyle">@style/Widget.AppCompat.SeekBar</item>
|
||||
|
||||
|
||||
<!-- Button styles -->
|
||||
<item name="buttonStyle">@style/Widget.AppCompat.Button</item>
|
||||
<item name="buttonStyleSmall">@style/Widget.AppCompat.Button.Small</item>
|
||||
<item name="android:textAppearanceButton">@style/TextAppearance.AppCompat.Widget.Button</item>
|
||||
@ -832,7 +834,7 @@
|
||||
<item name="buttonBarNegativeButtonStyle">?attr/buttonBarButtonStyle</item>
|
||||
<item name="buttonBarNeutralButtonStyle">?attr/buttonBarButtonStyle</item>
|
||||
|
||||
|
||||
<!-- Dialog attributes -->
|
||||
<item name="dialogTheme">@style/Theme.AppCompat.Light.Dialog</item>
|
||||
<item name="dialogPreferredPadding">@dimen/abc_dialog_padding_material</item>
|
||||
|
||||
@ -842,7 +844,8 @@
|
||||
<item name="textColorAlertDialogListItem">@color/abc_primary_text_material_light</item>
|
||||
<item name="listDividerAlertDialog">@null</item>
|
||||
|
||||
|
||||
<!-- Define these here; ContextThemeWrappers around themes that define them should
|
||||
always clear these values. -->
|
||||
<item name="windowFixedWidthMajor">0dp</item>
|
||||
<item name="windowFixedWidthMinor">0dp</item>
|
||||
<item name="windowFixedHeightMajor">0dp</item>
|
||||
@ -1176,7 +1179,7 @@
|
||||
<style name="Platform.AppCompat" parent="android:Theme">
|
||||
<item name="android:windowNoTitle">true</item>
|
||||
|
||||
|
||||
<!-- Window colors -->
|
||||
<item name="android:colorForeground">@color/foreground_material_dark</item>
|
||||
<item name="android:colorForegroundInverse">@color/foreground_material_light</item>
|
||||
<item name="android:colorBackground">@color/background_material_dark</item>
|
||||
@ -1185,7 +1188,7 @@
|
||||
<item name="android:backgroundDimAmount">0.6</item>
|
||||
<item name="android:windowBackground">@color/background_material_dark</item>
|
||||
|
||||
|
||||
<!-- Text colors -->
|
||||
<item name="android:textColorPrimary">@color/abc_primary_text_material_dark</item>
|
||||
<item name="android:textColorPrimaryInverse">@color/abc_primary_text_material_light</item>
|
||||
<item name="android:textColorPrimaryDisableOnly">@color/abc_primary_text_disable_only_material_dark</item>
|
||||
@ -1198,7 +1201,7 @@
|
||||
<item name="android:textColorHighlight">@color/highlighted_text_material_dark</item>
|
||||
<item name="android:textColorLink">?attr/colorAccent</item>
|
||||
|
||||
|
||||
<!-- Text styles -->
|
||||
<item name="android:textAppearance">@style/TextAppearance.AppCompat</item>
|
||||
<item name="android:textAppearanceInverse">@style/TextAppearance.AppCompat.Inverse</item>
|
||||
<item name="android:textAppearanceLarge">@style/TextAppearance.AppCompat.Large</item>
|
||||
@ -1214,7 +1217,7 @@
|
||||
<style name="Platform.AppCompat.Light" parent="android:Theme.Light">
|
||||
<item name="android:windowNoTitle">true</item>
|
||||
|
||||
|
||||
<!-- Window colors -->
|
||||
<item name="android:colorForeground">@color/foreground_material_light</item>
|
||||
<item name="android:colorForegroundInverse">@color/foreground_material_dark</item>
|
||||
<item name="android:colorBackground">@color/background_material_light</item>
|
||||
@ -1223,7 +1226,7 @@
|
||||
<item name="android:backgroundDimAmount">0.6</item>
|
||||
<item name="android:windowBackground">@color/background_material_light</item>
|
||||
|
||||
|
||||
<!-- Text colors -->
|
||||
<item name="android:textColorPrimary">@color/abc_primary_text_material_light</item>
|
||||
<item name="android:textColorPrimaryInverse">@color/abc_primary_text_material_dark</item>
|
||||
<item name="android:textColorSecondary">@color/abc_secondary_text_material_light</item>
|
||||
@ -1237,7 +1240,7 @@
|
||||
<item name="android:textColorHighlight">@color/highlighted_text_material_light</item>
|
||||
<item name="android:textColorLink">?attr/colorAccent</item>
|
||||
|
||||
|
||||
<!-- Text styles -->
|
||||
<item name="android:textAppearance">@style/TextAppearance.AppCompat</item>
|
||||
<item name="android:textAppearanceInverse">@style/TextAppearance.AppCompat.Inverse</item>
|
||||
<item name="android:textAppearanceLarge">@style/TextAppearance.AppCompat.Large</item>
|
||||
@ -1252,12 +1255,12 @@
|
||||
</style>
|
||||
<style name="Platform.ThemeOverlay.AppCompat" parent=""/>
|
||||
<style name="Platform.ThemeOverlay.AppCompat.Dark">
|
||||
|
||||
<!-- Action Bar styles -->
|
||||
<item name="actionBarItemBackground">@drawable/abc_item_background_holo_dark</item>
|
||||
<item name="actionDropDownStyle">@style/Widget.AppCompat.Spinner.DropDown.ActionBar</item>
|
||||
<item name="selectableItemBackground">@drawable/abc_item_background_holo_dark</item>
|
||||
|
||||
|
||||
<!-- SearchView styles -->
|
||||
<item name="android:autoCompleteTextViewStyle">@style/Widget.AppCompat.AutoCompleteTextView</item>
|
||||
<item name="android:dropDownItemStyle">@style/Widget.AppCompat.DropDownItem.Spinner</item>
|
||||
</style>
|
||||
@ -1266,7 +1269,7 @@
|
||||
<item name="actionDropDownStyle">@style/Widget.AppCompat.Light.Spinner.DropDown.ActionBar</item>
|
||||
<item name="selectableItemBackground">@drawable/abc_item_background_holo_light</item>
|
||||
|
||||
|
||||
<!-- SearchView attributes -->
|
||||
<item name="android:autoCompleteTextViewStyle">@style/Widget.AppCompat.Light.AutoCompleteTextView</item>
|
||||
<item name="android:dropDownItemStyle">@style/Widget.AppCompat.DropDownItem.Spinner</item>
|
||||
</style>
|
||||
|
||||
Binary file not shown.
@ -232,20 +232,20 @@ int bool abc_config_actionMenuItemAllCaps 0x7f080005
|
||||
int bool abc_config_allowActionMenuItemTextWithIcon 0x7f080002
|
||||
int bool abc_config_closeDialogWhenTouchOutside 0x7f080006
|
||||
int bool abc_config_showMenuShortcutsWhenKeyboardPresent 0x7f080007
|
||||
int color abc_background_cache_hint_selector_material_dark 0x7f0c0048
|
||||
int color abc_background_cache_hint_selector_material_light 0x7f0c0049
|
||||
int color abc_color_highlight_material 0x7f0c004a
|
||||
int color abc_background_cache_hint_selector_material_dark 0x7f0c0049
|
||||
int color abc_background_cache_hint_selector_material_light 0x7f0c004a
|
||||
int color abc_color_highlight_material 0x7f0c004b
|
||||
int color abc_input_method_navigation_guard 0x7f0c0000
|
||||
int color abc_primary_text_disable_only_material_dark 0x7f0c004b
|
||||
int color abc_primary_text_disable_only_material_light 0x7f0c004c
|
||||
int color abc_primary_text_material_dark 0x7f0c004d
|
||||
int color abc_primary_text_material_light 0x7f0c004e
|
||||
int color abc_search_url_text 0x7f0c004f
|
||||
int color abc_primary_text_disable_only_material_dark 0x7f0c004c
|
||||
int color abc_primary_text_disable_only_material_light 0x7f0c004d
|
||||
int color abc_primary_text_material_dark 0x7f0c004e
|
||||
int color abc_primary_text_material_light 0x7f0c004f
|
||||
int color abc_search_url_text 0x7f0c0050
|
||||
int color abc_search_url_text_normal 0x7f0c0001
|
||||
int color abc_search_url_text_pressed 0x7f0c0002
|
||||
int color abc_search_url_text_selected 0x7f0c0003
|
||||
int color abc_secondary_text_material_dark 0x7f0c0050
|
||||
int color abc_secondary_text_material_light 0x7f0c0051
|
||||
int color abc_secondary_text_material_dark 0x7f0c0051
|
||||
int color abc_secondary_text_material_light 0x7f0c0052
|
||||
int color accent_material_dark 0x7f0c0004
|
||||
int color accent_material_light 0x7f0c0005
|
||||
int color background_floating_material_dark 0x7f0c0006
|
||||
@ -303,8 +303,8 @@ int color secondary_text_disabled_material_dark 0x7f0c0039
|
||||
int color secondary_text_disabled_material_light 0x7f0c003a
|
||||
int color switch_thumb_disabled_material_dark 0x7f0c003b
|
||||
int color switch_thumb_disabled_material_light 0x7f0c003c
|
||||
int color switch_thumb_material_dark 0x7f0c0052
|
||||
int color switch_thumb_material_light 0x7f0c0053
|
||||
int color switch_thumb_material_dark 0x7f0c0053
|
||||
int color switch_thumb_material_light 0x7f0c0054
|
||||
int color switch_thumb_normal_material_dark 0x7f0c003d
|
||||
int color switch_thumb_normal_material_light 0x7f0c003e
|
||||
int color toolbuttonActiveNotReady 0x7f0c003f
|
||||
@ -313,9 +313,10 @@ int color toolbuttonInactiveNotReady 0x7f0c0041
|
||||
int color toolbuttonInactiveReady 0x7f0c0042
|
||||
int color toolbuttonLocked 0x7f0c0043
|
||||
int color toolslotDisabled 0x7f0c0044
|
||||
int color toolslotEnabled 0x7f0c0045
|
||||
int color toolslotEnabledSelected 0x7f0c0046
|
||||
int color win 0x7f0c0047
|
||||
int color toolslotDisabledSelected 0x7f0c0045
|
||||
int color toolslotEnabled 0x7f0c0046
|
||||
int color toolslotEnabledSelected 0x7f0c0047
|
||||
int color win 0x7f0c0048
|
||||
int dimen abc_action_bar_content_inset_material 0x7f09000d
|
||||
int dimen abc_action_bar_default_height_material 0x7f090001
|
||||
int dimen abc_action_bar_default_padding_end_material 0x7f09000e
|
||||
@ -473,51 +474,49 @@ int drawable currency_energy_atlas 0x7f02004e
|
||||
int drawable currency_energy_empty 0x7f02004f
|
||||
int drawable currency_star 0x7f020050
|
||||
int drawable currency_star_empty 0x7f020051
|
||||
int drawable energy_icon 0x7f020052
|
||||
int drawable goal 0x7f020053
|
||||
int drawable guis_pausebutton 0x7f020054
|
||||
int drawable guis_playerarrow 0x7f020055
|
||||
int drawable guis_sound_off 0x7f020056
|
||||
int drawable guis_sound_on 0x7f020057
|
||||
int drawable lock_locked 0x7f020058
|
||||
int drawable lock_unlocked 0x7f020059
|
||||
int drawable magnet_field 0x7f02005a
|
||||
int drawable notification_template_icon_bg 0x7f02007d
|
||||
int drawable obstacles_cave 0x7f02005b
|
||||
int drawable obstacles_grass 0x7f02005c
|
||||
int drawable obstacles_mountains 0x7f02005d
|
||||
int drawable playershapes_ball 0x7f02005e
|
||||
int drawable previews_grass 0x7f02005f
|
||||
int drawable purple 0x7f020060
|
||||
int drawable radius 0x7f020061
|
||||
int drawable splitter 0x7f020062
|
||||
int drawable star_icon 0x7f020063
|
||||
int drawable terrain_c_grass 0x7f020064
|
||||
int drawable terrain_t_grass 0x7f020065
|
||||
int drawable tick 0x7f020066
|
||||
int drawable tip_icon 0x7f020067
|
||||
int drawable tools_bomb 0x7f020068
|
||||
int drawable tools_bombbutton 0x7f020069
|
||||
int drawable tools_emptybutton 0x7f02006a
|
||||
int drawable tools_lockedbutton 0x7f02006b
|
||||
int drawable tools_magnet 0x7f02006c
|
||||
int drawable tools_magnetbutton 0x7f02006d
|
||||
int drawable tools_ramp 0x7f02006e
|
||||
int drawable tools_rampbutton 0x7f02006f
|
||||
int drawable tools_spring 0x7f020070
|
||||
int drawable tools_springbutton 0x7f020071
|
||||
int drawable tools_unlockedbutton 0x7f020072
|
||||
int drawable xml_background_bountymessage 0x7f020073
|
||||
int drawable xml_background_levelbutton 0x7f020074
|
||||
int drawable xml_background_toolslot 0x7f020075
|
||||
int drawable xml_background_toolupgrade 0x7f020076
|
||||
int drawable xml_background_tutorialtextview 0x7f020077
|
||||
int drawable xml_background_worldbutton 0x7f020078
|
||||
int drawable xml_layers_toolprogressbar 0x7f020079
|
||||
int drawable xml_selector_gamebutton 0x7f02007a
|
||||
int drawable xml_selector_pricebutton 0x7f02007b
|
||||
int drawable xml_selector_sound 0x7f02007c
|
||||
int id action0 0x7f0d006b
|
||||
int drawable goal 0x7f020052
|
||||
int drawable guis_pausebutton 0x7f020053
|
||||
int drawable guis_playerarrow 0x7f020054
|
||||
int drawable guis_sound_off 0x7f020055
|
||||
int drawable guis_sound_on 0x7f020056
|
||||
int drawable lock_locked 0x7f020057
|
||||
int drawable lock_unlocked 0x7f020058
|
||||
int drawable magnet_field 0x7f020059
|
||||
int drawable notification_template_icon_bg 0x7f02007b
|
||||
int drawable obstacles_cave 0x7f02005a
|
||||
int drawable obstacles_grass 0x7f02005b
|
||||
int drawable obstacles_mountains 0x7f02005c
|
||||
int drawable playershapes_ball 0x7f02005d
|
||||
int drawable previews_grass 0x7f02005e
|
||||
int drawable purple 0x7f02005f
|
||||
int drawable radius 0x7f020060
|
||||
int drawable splitter 0x7f020061
|
||||
int drawable terrain_c_grass 0x7f020062
|
||||
int drawable terrain_t_grass 0x7f020063
|
||||
int drawable tick 0x7f020064
|
||||
int drawable tip_icon 0x7f020065
|
||||
int drawable tools_bomb 0x7f020066
|
||||
int drawable tools_bombbutton 0x7f020067
|
||||
int drawable tools_emptybutton 0x7f020068
|
||||
int drawable tools_lockedbutton 0x7f020069
|
||||
int drawable tools_magnet 0x7f02006a
|
||||
int drawable tools_magnetbutton 0x7f02006b
|
||||
int drawable tools_ramp 0x7f02006c
|
||||
int drawable tools_rampbutton 0x7f02006d
|
||||
int drawable tools_spring 0x7f02006e
|
||||
int drawable tools_springbutton 0x7f02006f
|
||||
int drawable tools_unlockedbutton 0x7f020070
|
||||
int drawable xml_background_bountymessage 0x7f020071
|
||||
int drawable xml_background_levelbutton 0x7f020072
|
||||
int drawable xml_background_toolslot 0x7f020073
|
||||
int drawable xml_background_toolupgrade 0x7f020074
|
||||
int drawable xml_background_tutorialtextview 0x7f020075
|
||||
int drawable xml_background_worldbutton 0x7f020076
|
||||
int drawable xml_layers_toolprogressbar 0x7f020077
|
||||
int drawable xml_selector_gamebutton 0x7f020078
|
||||
int drawable xml_selector_pricebutton 0x7f020079
|
||||
int drawable xml_selector_sound 0x7f02007a
|
||||
int id action0 0x7f0d006c
|
||||
int id action_bar 0x7f0d0041
|
||||
int id action_bar_activity_content 0x7f0d0000
|
||||
int id action_bar_container 0x7f0d0040
|
||||
@ -526,7 +525,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 0x7f0d006f
|
||||
int id action_divider 0x7f0d0070
|
||||
int id action_menu_divider 0x7f0d0002
|
||||
int id action_menu_presenter 0x7f0d0003
|
||||
int id action_mode_bar 0x7f0d003e
|
||||
@ -537,9 +536,9 @@ int id alertTitle 0x7f0d0030
|
||||
int id always 0x7f0d001b
|
||||
int id beginning 0x7f0d0018
|
||||
int id buttonPanel 0x7f0d002b
|
||||
int id cancel_action 0x7f0d006c
|
||||
int id cancel_action 0x7f0d006d
|
||||
int id checkbox 0x7f0d0039
|
||||
int id chronometer 0x7f0d0072
|
||||
int id chronometer 0x7f0d0073
|
||||
int id collapseActionView 0x7f0d001c
|
||||
int id contentPanel 0x7f0d0031
|
||||
int id custom 0x7f0d0037
|
||||
@ -549,7 +548,7 @@ int id default_activity_button 0x7f0d0027
|
||||
int id disableHome 0x7f0d000c
|
||||
int id edit_query 0x7f0d0043
|
||||
int id end 0x7f0d0019
|
||||
int id end_padder 0x7f0d0077
|
||||
int id end_padder 0x7f0d0078
|
||||
int id expand_activities_button 0x7f0d0025
|
||||
int id expanded_menu 0x7f0d0038
|
||||
int id game_countdown 0x7f0d0057
|
||||
@ -567,15 +566,15 @@ int id icon 0x7f0d0029
|
||||
int id ifRoom 0x7f0d001d
|
||||
int id image 0x7f0d0026
|
||||
int id imageView 0x7f0d0065
|
||||
int id imageView3 0x7f0d00b1
|
||||
int id imageView4 0x7f0d00c2
|
||||
int id info 0x7f0d0076
|
||||
int id imageView3 0x7f0d00b2
|
||||
int id imageView4 0x7f0d00c7
|
||||
int id info 0x7f0d0077
|
||||
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 0x7f0d00bf
|
||||
int id levelbutton_starView 0x7f0d00c4
|
||||
int id levelbutton_textview 0x7f0d0058
|
||||
int id levels_bottomRow 0x7f0d0061
|
||||
int id levels_topRow 0x7f0d0060
|
||||
@ -584,27 +583,28 @@ 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 linearLayout 0x7f0d0078
|
||||
int id linearLayout3 0x7f0d0085
|
||||
int id linearLayout4 0x7f0d009b
|
||||
int id line1 0x7f0d0071
|
||||
int id line3 0x7f0d0075
|
||||
int id linearLayout 0x7f0d0079
|
||||
int id linearLayout3 0x7f0d0086
|
||||
int id linearLayout4 0x7f0d009c
|
||||
int id listMode 0x7f0d0009
|
||||
int id list_item 0x7f0d0028
|
||||
int id media_actions 0x7f0d006e
|
||||
int id media_actions 0x7f0d006f
|
||||
int id message_exitbutton 0x7f0d0069
|
||||
int id message_leftbutton 0x7f0d0068
|
||||
int id message_nextlevelbutton 0x7f0d0068
|
||||
int id message_restartbutton 0x7f0d006a
|
||||
int id message_title 0x7f0d0067
|
||||
int id message_tryagainbutton 0x7f0d006a
|
||||
int id message_toolshopbutton 0x7f0d006b
|
||||
int id middle 0x7f0d001a
|
||||
int id multiply 0x7f0d0013
|
||||
int id never 0x7f0d001e
|
||||
int id none 0x7f0d000e
|
||||
int id normal 0x7f0d000a
|
||||
int id parentPanel 0x7f0d002d
|
||||
int id price_button_currency 0x7f0d007b
|
||||
int id price_button_price 0x7f0d007a
|
||||
int id price_button_title 0x7f0d0079
|
||||
int id price_button_currency 0x7f0d007c
|
||||
int id price_button_price 0x7f0d007b
|
||||
int id price_button_title 0x7f0d007a
|
||||
int id progress_circular 0x7f0d0005
|
||||
int id progress_horizontal 0x7f0d0006
|
||||
int id radio 0x7f0d003b
|
||||
@ -624,10 +624,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 0x7f0d007d
|
||||
int id shortmenu_exit 0x7f0d007f
|
||||
int id shortmenu_restart 0x7f0d007e
|
||||
int id shortmenu_topbar 0x7f0d007c
|
||||
int id shortmenu_continue 0x7f0d007e
|
||||
int id shortmenu_exit 0x7f0d0080
|
||||
int id shortmenu_restart 0x7f0d007f
|
||||
int id shortmenu_topbar 0x7f0d007d
|
||||
int id showCustom 0x7f0d000f
|
||||
int id showHome 0x7f0d0010
|
||||
int id showTitle 0x7f0d0011
|
||||
@ -636,84 +636,88 @@ 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 0x7f0d0082
|
||||
int id startscreen_maxcheat 0x7f0d0083
|
||||
int id startscreen_play 0x7f0d0081
|
||||
int id startscreen_sound 0x7f0d0080
|
||||
int id status_bar_latest_event_content 0x7f0d006d
|
||||
int id startscreen_comingsoon 0x7f0d0083
|
||||
int id startscreen_maxcheat 0x7f0d0084
|
||||
int id startscreen_play 0x7f0d0082
|
||||
int id startscreen_sound 0x7f0d0081
|
||||
int id status_bar_latest_event_content 0x7f0d006e
|
||||
int id submit_area 0x7f0d004c
|
||||
int id tabMode 0x7f0d000b
|
||||
int id text 0x7f0d0075
|
||||
int id text2 0x7f0d0073
|
||||
int id text 0x7f0d0076
|
||||
int id text2 0x7f0d0074
|
||||
int id textSpacerNoButtons 0x7f0d0034
|
||||
int id textView3 0x7f0d00b7
|
||||
int id time 0x7f0d0071
|
||||
int id textView3 0x7f0d00b8
|
||||
int id time 0x7f0d0072
|
||||
int id title 0x7f0d002a
|
||||
int id title_template 0x7f0d002f
|
||||
int id toolProgressBar 0x7f0d0094
|
||||
int id toolProgressBarView 0x7f0d0092
|
||||
int id toolProgressButtonAnimation 0x7f0d0093
|
||||
int id tool_inspector_imageview 0x7f0d0086
|
||||
int id tool_inspector_pricebutton 0x7f0d0087
|
||||
int id tool_inspector_title 0x7f0d0084
|
||||
int id tool_inspector_toolupgrade0 0x7f0d0088
|
||||
int id tool_inspector_toolupgrade1 0x7f0d0089
|
||||
int id tool_upgrade_imageview 0x7f0d008e
|
||||
int id tool_upgrade_pricebutton 0x7f0d0091
|
||||
int id tool_upgrade_title 0x7f0d008d
|
||||
int id tool_upgrade_value_new 0x7f0d0090
|
||||
int id tool_upgrade_value_old 0x7f0d008f
|
||||
int id toolbutton_1 0x7f0d0095
|
||||
int id toolbutton_2 0x7f0d0096
|
||||
int id toolbutton_3 0x7f0d0097
|
||||
int id toolbutton_4 0x7f0d0098
|
||||
int id toolofferslot_slot 0x7f0d008b
|
||||
int id toolofferslot_title 0x7f0d008a
|
||||
int id toolshop_slot1 0x7f0d009c
|
||||
int id toolshop_slot2 0x7f0d009d
|
||||
int id toolshop_slot3 0x7f0d009e
|
||||
int id toolshop_slot4 0x7f0d009f
|
||||
int id toolshop_tool_offer_layout 0x7f0d00a0
|
||||
int id toolshop_toolinspector 0x7f0d009a
|
||||
int id toolshop_topbar 0x7f0d0099
|
||||
int id toolslot_image 0x7f0d008c
|
||||
int id toolProgressBar 0x7f0d0095
|
||||
int id toolProgressBarView 0x7f0d0093
|
||||
int id toolProgressButtonAnimation 0x7f0d0094
|
||||
int id tool_inspector_imageview 0x7f0d0087
|
||||
int id tool_inspector_pricebutton 0x7f0d0088
|
||||
int id tool_inspector_title 0x7f0d0085
|
||||
int id tool_inspector_toolupgrade0 0x7f0d0089
|
||||
int id tool_inspector_toolupgrade1 0x7f0d008a
|
||||
int id tool_upgrade_imageview 0x7f0d008f
|
||||
int id tool_upgrade_pricebutton 0x7f0d0092
|
||||
int id tool_upgrade_title 0x7f0d008e
|
||||
int id tool_upgrade_value_new 0x7f0d0091
|
||||
int id tool_upgrade_value_old 0x7f0d0090
|
||||
int id toolbutton_1 0x7f0d0096
|
||||
int id toolbutton_2 0x7f0d0097
|
||||
int id toolbutton_3 0x7f0d0098
|
||||
int id toolbutton_4 0x7f0d0099
|
||||
int id toolofferslot_slot 0x7f0d008c
|
||||
int id toolofferslot_title 0x7f0d008b
|
||||
int id toolshop_slot1 0x7f0d009d
|
||||
int id toolshop_slot2 0x7f0d009e
|
||||
int id toolshop_slot3 0x7f0d009f
|
||||
int id toolshop_slot4 0x7f0d00a0
|
||||
int id toolshop_tool_offer_layout 0x7f0d00a1
|
||||
int id toolshop_toolinspector 0x7f0d009b
|
||||
int id toolshop_topbar 0x7f0d009a
|
||||
int id toolslot_image 0x7f0d008d
|
||||
int id topPanel 0x7f0d002e
|
||||
int id topbar_energycount 0x7f0d00a8
|
||||
int id topbar_energycount_decrease 0x7f0d00ac
|
||||
int id topbar_energyview 0x7f0d00a7
|
||||
int id topbar_layout 0x7f0d00a1
|
||||
int id topbar_leveldisplay 0x7f0d00a3
|
||||
int id topbar_levellayout 0x7f0d00a2
|
||||
int id topbar_levelprogress 0x7f0d00a4
|
||||
int id topbar_resetButton 0x7f0d00ad
|
||||
int id topbar_soundtoggle 0x7f0d00a9
|
||||
int id topbar_starcount 0x7f0d00a6
|
||||
int id topbar_starcount_decrease 0x7f0d00ab
|
||||
int id topbar_starview 0x7f0d00a5
|
||||
int id topbar_toolshop 0x7f0d00aa
|
||||
int id tutorial_empty 0x7f0d00ae
|
||||
int id tutorial_go_to_toolshop 0x7f0d00b8
|
||||
int id tutorial_leveled_up 0x7f0d00b6
|
||||
int id tutorial_place_ramp 0x7f0d00b2
|
||||
int id tutorial_place_ramp_2 0x7f0d00b3
|
||||
int id tutorial_ramp_in_air 0x7f0d00b4
|
||||
int id tutorial_ramp_in_air_2 0x7f0d00b5
|
||||
int id tutorial_tools 0x7f0d00b0
|
||||
int id tutorial_welcome 0x7f0d00af
|
||||
int id unlockmessage_message 0x7f0d00ba
|
||||
int id unlockmessage_toolimage 0x7f0d00b9
|
||||
int id topbar_energycount 0x7f0d00a9
|
||||
int id topbar_energycount_decrease 0x7f0d00ad
|
||||
int id topbar_energyview 0x7f0d00a8
|
||||
int id topbar_layout 0x7f0d00a2
|
||||
int id topbar_leveldisplay 0x7f0d00a4
|
||||
int id topbar_levellayout 0x7f0d00a3
|
||||
int id topbar_levelprogress 0x7f0d00a5
|
||||
int id topbar_resetButton 0x7f0d00ae
|
||||
int id topbar_soundtoggle 0x7f0d00aa
|
||||
int id topbar_starcount 0x7f0d00a7
|
||||
int id topbar_starcount_decrease 0x7f0d00ac
|
||||
int id topbar_starview 0x7f0d00a6
|
||||
int id topbar_toolshop 0x7f0d00ab
|
||||
int id tutorial_empty 0x7f0d00af
|
||||
int id tutorial_go_to_toolshop 0x7f0d00b9
|
||||
int id tutorial_leveled_up 0x7f0d00b7
|
||||
int id tutorial_place_ramp 0x7f0d00b3
|
||||
int id tutorial_place_ramp_2 0x7f0d00b4
|
||||
int id tutorial_ramp_in_air 0x7f0d00b5
|
||||
int id tutorial_ramp_in_air_2 0x7f0d00b6
|
||||
int id tutorial_tools 0x7f0d00b1
|
||||
int id tutorial_toolshop_all_tools_and_inspector 0x7f0d00bb
|
||||
int id tutorial_toolshop_buy_spring 0x7f0d00bc
|
||||
int id tutorial_toolshop_equip_spring 0x7f0d00bd
|
||||
int id tutorial_toolshop_welcome 0x7f0d00ba
|
||||
int id tutorial_welcome 0x7f0d00b0
|
||||
int id unlockmessage_message 0x7f0d00bf
|
||||
int id unlockmessage_toolimage 0x7f0d00be
|
||||
int id up 0x7f0d0008
|
||||
int id useLogo 0x7f0d0012
|
||||
int id withText 0x7f0d001f
|
||||
int id worldbutton_energycount 0x7f0d00c1
|
||||
int id worldbutton_levelcount 0x7f0d00be
|
||||
int id worldbutton_lock 0x7f0d00c3
|
||||
int id worldbutton_preview 0x7f0d00bc
|
||||
int id worldbutton_starcount 0x7f0d00c0
|
||||
int id worldbutton_tickView 0x7f0d00bd
|
||||
int id worldbutton_title 0x7f0d00bb
|
||||
int id worlds_layout 0x7f0d00c5
|
||||
int id worlds_topbar 0x7f0d00c4
|
||||
int id worldbutton_energycount 0x7f0d00c6
|
||||
int id worldbutton_levelcount 0x7f0d00c3
|
||||
int id worldbutton_lock 0x7f0d00c8
|
||||
int id worldbutton_preview 0x7f0d00c1
|
||||
int id worldbutton_starcount 0x7f0d00c5
|
||||
int id worldbutton_tickView 0x7f0d00c2
|
||||
int id worldbutton_title 0x7f0d00c0
|
||||
int id worlds_layout 0x7f0d00ca
|
||||
int id worlds_topbar 0x7f0d00c9
|
||||
int id wrap_content 0x7f0d0020
|
||||
int integer abc_config_activityDefaultDur 0x7f0b0001
|
||||
int integer abc_config_activityShortDur 0x7f0b0002
|
||||
@ -758,25 +762,26 @@ int layout notification_template_lines 0x7f040022
|
||||
int layout notification_template_media 0x7f040023
|
||||
int layout notification_template_part_chronometer 0x7f040024
|
||||
int layout notification_template_part_time 0x7f040025
|
||||
int layout price_button 0x7f040026
|
||||
int layout select_dialog_item_material 0x7f040027
|
||||
int layout select_dialog_multichoice_material 0x7f040028
|
||||
int layout select_dialog_singlechoice_material 0x7f040029
|
||||
int layout short_menu 0x7f04002a
|
||||
int layout start_screen 0x7f04002b
|
||||
int layout support_simple_spinner_dropdown_item 0x7f04002c
|
||||
int layout tool_inspector 0x7f04002d
|
||||
int layout tool_offer_slot 0x7f04002e
|
||||
int layout tool_slot 0x7f04002f
|
||||
int layout tool_upgrade 0x7f040030
|
||||
int layout toolbutton 0x7f040031
|
||||
int layout toolbuttonbar 0x7f040032
|
||||
int layout toolshop 0x7f040033
|
||||
int layout topbar 0x7f040034
|
||||
int layout tutorial 0x7f040035
|
||||
int layout unlock_message 0x7f040036
|
||||
int layout world_button 0x7f040037
|
||||
int layout worlds 0x7f040038
|
||||
int layout pre_start_screen 0x7f040026
|
||||
int layout price_button 0x7f040027
|
||||
int layout select_dialog_item_material 0x7f040028
|
||||
int layout select_dialog_multichoice_material 0x7f040029
|
||||
int layout select_dialog_singlechoice_material 0x7f04002a
|
||||
int layout short_menu 0x7f04002b
|
||||
int layout start_screen 0x7f04002c
|
||||
int layout support_simple_spinner_dropdown_item 0x7f04002d
|
||||
int layout tool_inspector 0x7f04002e
|
||||
int layout tool_offer_slot 0x7f04002f
|
||||
int layout tool_slot 0x7f040030
|
||||
int layout tool_upgrade 0x7f040031
|
||||
int layout toolbutton 0x7f040032
|
||||
int layout toolbuttonbar 0x7f040033
|
||||
int layout toolshop 0x7f040034
|
||||
int layout topbar 0x7f040035
|
||||
int layout tutorial 0x7f040036
|
||||
int layout unlock_message 0x7f040037
|
||||
int layout world_button 0x7f040038
|
||||
int layout worlds 0x7f040039
|
||||
int mipmap ic_launcher 0x7f030000
|
||||
int raw background 0x7f060000
|
||||
int raw ramp 0x7f060001
|
||||
|
||||
160
app/src/main/assets/particleEffects/firework.pe
Normal file
160
app/src/main/assets/particleEffects/firework.pe
Normal file
@ -0,0 +1,160 @@
|
||||
Untitled
|
||||
- Delay -
|
||||
active: false
|
||||
- Duration -
|
||||
lowMin: 100.0
|
||||
lowMax: 100.0
|
||||
- Count -
|
||||
min: 0
|
||||
max: 10000
|
||||
- Emission -
|
||||
lowMin: 0.0
|
||||
lowMax: 0.0
|
||||
highMin: 1000.0
|
||||
highMax: 1000.0
|
||||
relative: false
|
||||
scalingCount: 1
|
||||
scaling0: 1.0
|
||||
timelineCount: 1
|
||||
timeline0: 0.0
|
||||
- Life -
|
||||
lowMin: 0.0
|
||||
lowMax: 0.0
|
||||
highMin: 2000.0
|
||||
highMax: 2000.0
|
||||
relative: false
|
||||
scalingCount: 1
|
||||
scaling0: 1.0
|
||||
timelineCount: 1
|
||||
timeline0: 0.0
|
||||
- Life Offset -
|
||||
active: false
|
||||
- X Offset -
|
||||
active: false
|
||||
- Y Offset -
|
||||
active: false
|
||||
- Spawn Shape -
|
||||
shape: point
|
||||
- Spawn Width -
|
||||
lowMin: 0.0
|
||||
lowMax: 0.0
|
||||
highMin: 100.0
|
||||
highMax: 100.0
|
||||
relative: false
|
||||
scalingCount: 1
|
||||
scaling0: 1.0
|
||||
timelineCount: 1
|
||||
timeline0: 0.0
|
||||
- Spawn Height -
|
||||
lowMin: 0.0
|
||||
lowMax: 0.0
|
||||
highMin: 50.0
|
||||
highMax: 50.0
|
||||
relative: false
|
||||
scalingCount: 1
|
||||
scaling0: 1.0
|
||||
timelineCount: 1
|
||||
timeline0: 0.0
|
||||
- Scale -
|
||||
lowMin: 10.0
|
||||
lowMax: 15.0
|
||||
highMin: 15.0
|
||||
highMax: 45.0
|
||||
relative: false
|
||||
scalingCount: 3
|
||||
scaling0: 0.0
|
||||
scaling1: 0.0
|
||||
scaling2: 1.0
|
||||
timelineCount: 3
|
||||
timeline0: 0.0
|
||||
timeline1: 0.28767124
|
||||
timeline2: 1.0
|
||||
- Velocity -
|
||||
active: true
|
||||
lowMin: 0.0
|
||||
lowMax: 300.0
|
||||
highMin: 800.0
|
||||
highMax: 800.0
|
||||
relative: false
|
||||
scalingCount: 3
|
||||
scaling0: 1.0
|
||||
scaling1: 1.0
|
||||
scaling2: 0.0
|
||||
timelineCount: 3
|
||||
timeline0: 0.0
|
||||
timeline1: 0.29791272
|
||||
timeline2: 0.2989127
|
||||
- Angle -
|
||||
active: true
|
||||
lowMin: 89.0
|
||||
lowMax: 91.0
|
||||
highMin: 0.0
|
||||
highMax: 360.0
|
||||
relative: false
|
||||
scalingCount: 3
|
||||
scaling0: 0.0
|
||||
scaling1: 0.0
|
||||
scaling2: 1.0
|
||||
timelineCount: 3
|
||||
timeline0: 0.0
|
||||
timeline1: 0.30260533
|
||||
timeline2: 0.30360532
|
||||
- Rotation -
|
||||
active: false
|
||||
- Wind -
|
||||
active: false
|
||||
- Gravity -
|
||||
active: true
|
||||
lowMin: 0.0
|
||||
lowMax: 0.0
|
||||
highMin: -50.0
|
||||
highMax: -100.0
|
||||
relative: false
|
||||
scalingCount: 4
|
||||
scaling0: 0.0
|
||||
scaling1: 0.0
|
||||
scaling2: 0.5294118
|
||||
scaling3: 1.0
|
||||
timelineCount: 4
|
||||
timeline0: 0.0
|
||||
timeline1: 0.29981026
|
||||
timeline2: 0.65753424
|
||||
timeline3: 0.75342464
|
||||
- Tint -
|
||||
colorsCount: 9
|
||||
colors0: 0.0
|
||||
colors1: 0.4
|
||||
colors2: 1.0
|
||||
colors3: 1.0
|
||||
colors4: 0.0
|
||||
colors5: 0.0
|
||||
colors6: 1.0
|
||||
colors7: 1.0
|
||||
colors8: 1.0
|
||||
timelineCount: 3
|
||||
timeline0: 0.0
|
||||
timeline1: 0.35800344
|
||||
timeline2: 1.0
|
||||
- Transparency -
|
||||
lowMin: 0.0
|
||||
lowMax: 0.0
|
||||
highMin: 1.0
|
||||
highMax: 1.0
|
||||
relative: false
|
||||
scalingCount: 3
|
||||
scaling0: 1.0
|
||||
scaling1: 1.0
|
||||
scaling2: 0.0
|
||||
timelineCount: 3
|
||||
timeline0: 0.0
|
||||
timeline1: 0.70547944
|
||||
timeline2: 1.0
|
||||
- Options -
|
||||
attached: false
|
||||
continuous: false
|
||||
aligned: false
|
||||
additive: true
|
||||
behind: false
|
||||
premultipliedAlpha: false
|
||||
- Image Path -
|
||||
particle.png
|
||||
@ -2,12 +2,24 @@ precision mediump float;
|
||||
|
||||
uniform sampler2D texture;
|
||||
uniform vec3 color;
|
||||
uniform float alpha;
|
||||
|
||||
varying vec2 pass_TexCoords;
|
||||
|
||||
vec3 saturateColor(in vec3 color, in float a);
|
||||
|
||||
void main() {
|
||||
|
||||
gl_FragColor.a = texture2D(texture, pass_TexCoords).a;
|
||||
gl_FragColor.rgb = color;
|
||||
float a = texture2D(texture, pass_TexCoords).a * alpha;
|
||||
gl_FragColor = vec4(saturateColor(color, a), a);
|
||||
|
||||
}
|
||||
|
||||
vec3 saturateColor(in vec3 color, in float a){
|
||||
|
||||
float grayscale = (color.r * 0.299 + color.g * 0.587 + color. b * 0.114);
|
||||
float alpha = ((1.1 - a) * 0.5) * 40.0;
|
||||
|
||||
return alpha * color + (1.0 - alpha) * vec3(grayscale, grayscale, grayscale);
|
||||
|
||||
}
|
||||
@ -0,0 +1,53 @@
|
||||
package de.frajul.endlessroll.entities.particles;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
import de.frajul.endlessroll.data.Vector;
|
||||
import de.frajul.endlessroll.entities.particles.Particle;
|
||||
import de.frajul.endlessroll.entities.particles.ParticleEffect;
|
||||
import de.frajul.endlessroll.entities.particles.ParticleSource;
|
||||
import de.frajul.endlessroll.main.game.Camera;
|
||||
|
||||
/**
|
||||
* Created by Julian on 15.07.2017.
|
||||
*/
|
||||
|
||||
public class Firework {
|
||||
|
||||
private ParticleEffect effect;
|
||||
private Camera camera;
|
||||
private Random random;
|
||||
|
||||
public Firework(ParticleEffect effect, Camera camera){
|
||||
this.effect = effect;
|
||||
this.camera = camera;
|
||||
this.random = new Random();
|
||||
}
|
||||
|
||||
public void start(){
|
||||
randomExplosion(500);
|
||||
randomExplosion(1000);
|
||||
randomExplosion(2000);
|
||||
randomExplosion(3500);
|
||||
randomExplosion(3590);
|
||||
randomExplosion(4800);
|
||||
randomExplosion(5600);
|
||||
randomExplosion(6900);
|
||||
randomExplosion(7000);
|
||||
}
|
||||
|
||||
private void randomExplosion(float delay){
|
||||
ParticleSource explosion = new ParticleSource(randomPosition(), effect);
|
||||
explosion.setDelayMS(delay);
|
||||
explosion.start();
|
||||
}
|
||||
|
||||
private Vector randomPosition(){
|
||||
float x = camera.getX() + (random.nextFloat() - 0.5f) * 2.5f;
|
||||
float y = camera.getY() + (random.nextFloat() * 0.5f) - 1f;
|
||||
return new Vector(x, y);
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,27 @@
|
||||
package de.frajul.endlessroll.main.screens;
|
||||
|
||||
import android.widget.RelativeLayout;
|
||||
|
||||
import de.frajul.endlessroll.R;
|
||||
import de.frajul.endlessroll.main.GameActivity;
|
||||
|
||||
/**
|
||||
* Created by Julian on 15.07.2017.
|
||||
*/
|
||||
|
||||
public class PreStartScreen extends Screen<RelativeLayout> {
|
||||
|
||||
public PreStartScreen(GameActivity gameActivity) {
|
||||
super(ScreenType.PRE_START, gameActivity, R.layout.pre_start_screen);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void prepareToBeShown() {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onBackKeyDown() {
|
||||
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,61 @@
|
||||
package de.frajul.endlessroll.main.tutorial;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import de.frajul.endlessroll.R;
|
||||
import de.frajul.endlessroll.entities.tools.ToolType;
|
||||
|
||||
/**
|
||||
* Created by Julian on 10.06.2017.
|
||||
*/
|
||||
|
||||
public class ToolShopTutorial extends Tutorial {
|
||||
|
||||
private List<BreakPoint> atStartBreakPoints = new ArrayList<>();
|
||||
private List<BreakPoint> afterSpringBoughtBreakPoints = new ArrayList<>();
|
||||
|
||||
private boolean firstPartShown;
|
||||
|
||||
public ToolShopTutorial() {
|
||||
super(-1, -1, new BreakPoint(0, R.id.tutorial_toolshop_welcome),
|
||||
new BreakPoint(0, R.id.tutorial_toolshop_all_tools_and_inspector),
|
||||
new BreakPoint(0, R.id.tutorial_toolshop_buy_spring),
|
||||
new BreakPoint(1, R.id.tutorial_toolshop_equip_spring));
|
||||
for (BreakPoint breakPoint : super.getBreakPoints()) {
|
||||
if (breakPoint.getX() == 0)
|
||||
atStartBreakPoints.add(breakPoint);
|
||||
else
|
||||
afterSpringBoughtBreakPoints.add(breakPoint);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void reset() {
|
||||
currentBreakPoints.clear();
|
||||
firstPartShown = false;
|
||||
}
|
||||
|
||||
public void onToolShopPrepare(boolean isSpringUnlocked) {
|
||||
currentBreakPoints.clear();
|
||||
if (isSpringUnlocked && !firstPartShown) {
|
||||
currentBreakPoints.addAll(atStartBreakPoints);
|
||||
firstPartShown = true;
|
||||
}
|
||||
}
|
||||
|
||||
public void onToolBought(ToolType type) {
|
||||
currentBreakPoints.clear();
|
||||
if (type == ToolType.SPRING) {
|
||||
currentBreakPoints = afterSpringBoughtBreakPoints;
|
||||
}
|
||||
}
|
||||
|
||||
public boolean isFirstPartShown() {
|
||||
return firstPartShown;
|
||||
}
|
||||
|
||||
public void setFirstPartShown(boolean firstPartShown) {
|
||||
this.firstPartShown = firstPartShown;
|
||||
}
|
||||
}
|
||||
@ -1,6 +1,5 @@
|
||||
package de.frajul.endlessroll.views;
|
||||
|
||||
import android.content.Context;
|
||||
import android.graphics.Typeface;
|
||||
import android.view.View;
|
||||
import android.widget.ImageView;
|
||||
@ -8,8 +7,8 @@ import android.widget.TextView;
|
||||
|
||||
import de.frajul.endlessroll.R;
|
||||
import de.frajul.endlessroll.entities.tools.ToolType;
|
||||
import de.frajul.endlessroll.main.GameActivity;
|
||||
import de.frajul.endlessroll.main.screens.ToolShopScreen;
|
||||
import de.frajul.endlessroll.user.User;
|
||||
|
||||
/**
|
||||
* Created by Julian on 03.06.2017.
|
||||
@ -17,9 +16,8 @@ import de.frajul.endlessroll.user.User;
|
||||
|
||||
public class ToolInspector implements View.OnClickListener {
|
||||
|
||||
private GameActivity gameActivity;
|
||||
private ToolShopScreen toolShopScreen;
|
||||
private User user;
|
||||
private Context context;
|
||||
|
||||
private TextView title;
|
||||
private ImageView imageView;
|
||||
@ -31,18 +29,18 @@ public class ToolInspector implements View.OnClickListener {
|
||||
private ToolType toolType;
|
||||
private boolean locked;
|
||||
|
||||
public ToolInspector(ToolShopScreen toolShopScreen, User user, Context context, Typeface typeface, View layout) {
|
||||
public ToolInspector(ToolShopScreen toolShopScreen, GameActivity gameActivity, View layout) {
|
||||
this.toolShopScreen = toolShopScreen;
|
||||
this.user = user;
|
||||
this.context = context;
|
||||
this.gameActivity = gameActivity;
|
||||
Typeface typeface = gameActivity.getTypeface();
|
||||
title = (TextView) layout.findViewById(R.id.tool_inspector_title);
|
||||
title.setTypeface(typeface);
|
||||
imageView = (ImageView) layout.findViewById(R.id.tool_inspector_imageview);
|
||||
priceButton = new PriceButton(context, typeface,
|
||||
priceButton = new PriceButton(gameActivity, typeface,
|
||||
layout.findViewById(R.id.tool_inspector_pricebutton), this);
|
||||
toolUpgradeView0 = new ToolUpgradeView(this, context, typeface,
|
||||
toolUpgradeView0 = new ToolUpgradeView(this, gameActivity, typeface,
|
||||
layout.findViewById(R.id.tool_inspector_toolupgrade0));
|
||||
toolUpgradeView1 = new ToolUpgradeView(this, context, typeface,
|
||||
toolUpgradeView1 = new ToolUpgradeView(this, gameActivity, typeface,
|
||||
layout.findViewById(R.id.tool_inspector_toolupgrade1));
|
||||
}
|
||||
|
||||
@ -50,22 +48,22 @@ public class ToolInspector implements View.OnClickListener {
|
||||
this.toolType = toolType;
|
||||
this.locked = locked;
|
||||
this.title.setText(locked ? "???" : toolType.getName());
|
||||
this.imageView.setImageDrawable(context.getResources().getDrawable(
|
||||
this.imageView.setImageDrawable(gameActivity.getResources().getDrawable(
|
||||
locked ? R.drawable.tools_lockedbutton : toolType.getButtonDrawable()));
|
||||
priceButton.init("Buy", toolType.getPrice(), R.drawable.currency_star);
|
||||
priceButton.setLayoutVisible(toolType.isBought() || locked ? View.GONE : View.VISIBLE);
|
||||
priceButton.setLayoutEnabled(toolType.getPrice() <= user.getStarCount());
|
||||
priceButton.setLayoutEnabled(toolType.getPrice() <= gameActivity.getUser().getStarCount());
|
||||
|
||||
toolUpgradeView0
|
||||
.update(toolType.getUpgrades()[0], toolType.isBought(), user.getEnergyCount());
|
||||
toolUpgradeView0.update(toolType.getUpgrades()[0], toolType.isBought(),
|
||||
gameActivity.getUser().getEnergyCount());
|
||||
toolUpgradeView0.setLayoutVisiblity(locked ? View.GONE : View.VISIBLE);
|
||||
|
||||
if (toolType.getUpgrades().length <= 1 || locked)
|
||||
toolUpgradeView1.setLayoutVisiblity(View.GONE);
|
||||
else {
|
||||
toolUpgradeView1.setLayoutVisiblity(View.VISIBLE);
|
||||
toolUpgradeView1
|
||||
.update(toolType.getUpgrades()[1], toolType.isBought(), user.getEnergyCount());
|
||||
toolUpgradeView1.update(toolType.getUpgrades()[1], toolType.isBought(),
|
||||
gameActivity.getUser().getEnergyCount());
|
||||
}
|
||||
}
|
||||
|
||||
@ -78,6 +76,6 @@ public class ToolInspector implements View.OnClickListener {
|
||||
public void onClick(View v) {
|
||||
toolType.setBought(true);
|
||||
update(toolType, locked);
|
||||
toolShopScreen.onToolBought(toolType.getPrice());
|
||||
toolShopScreen.onToolBought(toolType.getPrice(), toolType);
|
||||
}
|
||||
}
|
||||
|
||||
@ -13,33 +13,51 @@
|
||||
android:textSize="55sp"/>
|
||||
|
||||
<Button
|
||||
android:id="@+id/message_nextlevelbutton"
|
||||
style="@style/GameButton"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Restart"
|
||||
android:id="@+id/message_leftbutton"
|
||||
style="@style/GameButton"
|
||||
android:layout_marginTop="37dp"
|
||||
android:layout_below="@+id/message_title"
|
||||
android:layout_alignStart="@+id/message_title"/>
|
||||
android:layout_toLeftOf="@+id/message_title"
|
||||
android:layout_toStartOf="@+id/message_title"
|
||||
android:text="Next level"/>
|
||||
|
||||
<Button
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Exit"
|
||||
style="@style/GameButton"
|
||||
android:id="@+id/message_exitbutton"
|
||||
android:layout_alignTop="@+id/message_leftbutton"
|
||||
android:layout_alignEnd="@+id/message_title"/>
|
||||
|
||||
<Button
|
||||
style="@style/GameButton"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Try again"
|
||||
android:text="To menu"
|
||||
android:layout_alignBaseline="@+id/message_restartbutton"
|
||||
android:layout_alignBottom="@+id/message_restartbutton"
|
||||
android:layout_alignLeft="@+id/message_toolshopbutton"
|
||||
android:layout_alignStart="@+id/message_toolshopbutton"/>
|
||||
|
||||
<Button
|
||||
android:id="@+id/message_toolshopbutton"
|
||||
style="@style/GameButton"
|
||||
android:id="@+id/message_tryagainbutton"
|
||||
android:visibility="visible"
|
||||
android:layout_marginTop="3dp"
|
||||
android:layout_below="@+id/message_leftbutton"
|
||||
android:layout_alignStart="@+id/message_leftbutton"/>
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="21dp"
|
||||
android:layout_marginStart="21dp"
|
||||
android:text="Tools"
|
||||
android:layout_above="@+id/message_title"
|
||||
android:layout_toRightOf="@+id/message_title"
|
||||
android:layout_toEndOf="@+id/message_title"
|
||||
android:layout_marginBottom="14dp"/>
|
||||
|
||||
<Button
|
||||
android:id="@+id/message_restartbutton"
|
||||
style="@style/GameButton"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignLeft="@+id/message_title"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:layout_alignStart="@+id/message_title"
|
||||
android:layout_marginBottom="14dp"
|
||||
android:layout_marginLeft="50dp"
|
||||
android:layout_marginStart="50dp"
|
||||
android:text="Restart level"
|
||||
android:visibility="visible"/>
|
||||
|
||||
</RelativeLayout>
|
||||
15
app/src/main/res/layout/pre_start_screen.xml
Normal file
15
app/src/main/res/layout/pre_start_screen.xml
Normal file
@ -0,0 +1,15 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="#00ef78">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_centerInParent="true"
|
||||
android:text="LOADING"
|
||||
android:textAllCaps="false"
|
||||
android:textSize="30sp"
|
||||
android:textStyle="bold"/>
|
||||
</RelativeLayout>
|
||||
@ -195,4 +195,102 @@
|
||||
android:text="Now go to the toolshop"/>
|
||||
</RelativeLayout>
|
||||
|
||||
<!--Toolshop welcome-->
|
||||
<RelativeLayout
|
||||
android:id="@+id/tutorial_toolshop_welcome"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:visibility="gone">
|
||||
|
||||
<TextView
|
||||
style="@style/TutorialTextView"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_alignParentStart="true"
|
||||
android:layout_alignParentTop="true"
|
||||
android:layout_marginLeft="34dp"
|
||||
android:layout_marginStart="34dp"
|
||||
android:layout_marginTop="111dp"
|
||||
android:text="Welcome to the toolshop!"/>
|
||||
</RelativeLayout>
|
||||
|
||||
<!--Toolshop all tools and inspector-->
|
||||
<RelativeLayout
|
||||
android:id="@+id/tutorial_toolshop_all_tools_and_inspector"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:visibility="gone">
|
||||
|
||||
<TextView
|
||||
style="@style/TutorialTextView"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_alignParentStart="true"
|
||||
android:layout_alignParentTop="true"
|
||||
android:layout_marginLeft="34dp"
|
||||
android:layout_marginStart="34dp"
|
||||
android:layout_marginTop="111dp"
|
||||
android:text="Here you can see all the tools you'll be able to buy"/>
|
||||
<TextView
|
||||
style="@style/TutorialTextView"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_alignParentStart="true"
|
||||
android:layout_alignParentTop="true"
|
||||
android:text="Here you can buy and upgrade the selected tool"/>
|
||||
</RelativeLayout>
|
||||
|
||||
<!--Toolshop buy spring-->
|
||||
<RelativeLayout
|
||||
android:id="@+id/tutorial_toolshop_buy_spring"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:visibility="gone">
|
||||
|
||||
<TextView
|
||||
style="@style/TutorialTextView"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_alignParentStart="true"
|
||||
android:layout_alignParentTop="true"
|
||||
android:layout_marginLeft="34dp"
|
||||
android:layout_marginStart="34dp"
|
||||
android:layout_marginTop="111dp"
|
||||
android:text="Now select the spring and buy it"/>
|
||||
</RelativeLayout>
|
||||
|
||||
<!--Toolshop equip spring-->
|
||||
<RelativeLayout
|
||||
android:id="@+id/tutorial_toolshop_equip_spring"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:visibility="gone">
|
||||
|
||||
<TextView
|
||||
style="@style/TutorialTextView"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_alignParentStart="true"
|
||||
android:layout_alignParentTop="true"
|
||||
android:layout_marginLeft="34dp"
|
||||
android:layout_marginStart="34dp"
|
||||
android:layout_marginTop="111dp"
|
||||
android:text="Now tip on an unlocked slot of your toolbar to equip the spring"/>
|
||||
|
||||
<TextView
|
||||
style="@style/TutorialTextView"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_alignParentStart="true"
|
||||
android:layout_alignParentTop="true"
|
||||
android:text="After that you'll be able to complete the next level"/>
|
||||
|
||||
</RelativeLayout>
|
||||
|
||||
</RelativeLayout>
|
||||
@ -9,6 +9,7 @@
|
||||
<color name="toolbuttonActiveReady">#db41e42b</color>
|
||||
<color name="toolbuttonLocked">#db494b49</color>
|
||||
<color name="toolslotDisabled">#715f5f</color>
|
||||
<color name="toolslotDisabledSelected">#60715f</color>
|
||||
<color name="toolslotEnabled">#db41e42b</color>
|
||||
<color name="toolslotEnabledSelected">#b3d700</color>
|
||||
<color name="countdown3">#f0f41e02</color>
|
||||
|
||||
@ -5,7 +5,7 @@ buildscript {
|
||||
jcenter()
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:2.3.2'
|
||||
classpath 'com.android.tools.build:gradle:2.3.3'
|
||||
|
||||
// NOTE: Do not place your application dependencies here; they belong
|
||||
// in the individual module build.gradle files
|
||||
|
||||
@ -76,14 +76,19 @@
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
|
||||
</content>
|
||||
|
||||
199
particlelab/src/main/assets/firework.pe
Normal file
199
particlelab/src/main/assets/firework.pe
Normal file
@ -0,0 +1,199 @@
|
||||
Untitled
|
||||
- Delay -
|
||||
active: true
|
||||
lowMin: 1600.0
|
||||
lowMax: 1600.0
|
||||
- Duration -
|
||||
lowMin: 500.0
|
||||
lowMax: 500.0
|
||||
- Count -
|
||||
min: 0
|
||||
max: 500
|
||||
- Emission -
|
||||
lowMin: 0.0
|
||||
lowMax: 0.0
|
||||
highMin: 700.0
|
||||
highMax: 700.0
|
||||
relative: false
|
||||
scalingCount: 3
|
||||
scaling0: 0.47058824
|
||||
scaling1: 1.0
|
||||
scaling2: 0.1764706
|
||||
timelineCount: 3
|
||||
timeline0: 0.0
|
||||
timeline1: 0.6917808
|
||||
timeline2: 1.0
|
||||
- Life -
|
||||
lowMin: 0.0
|
||||
lowMax: 0.0
|
||||
highMin: 1500.0
|
||||
highMax: 1500.0
|
||||
relative: false
|
||||
scalingCount: 3
|
||||
scaling0: 1.0
|
||||
scaling1: 1.0
|
||||
scaling2: 1.0
|
||||
timelineCount: 3
|
||||
timeline0: 0.0
|
||||
timeline1: 0.66
|
||||
timeline2: 1.0
|
||||
- Life Offset -
|
||||
active: true
|
||||
lowMin: 0.0
|
||||
lowMax: 0.0
|
||||
highMin: 0.0
|
||||
highMax: 0.0
|
||||
relative: false
|
||||
scalingCount: 1
|
||||
scaling0: 1.0
|
||||
timelineCount: 1
|
||||
timeline0: 0.0
|
||||
- X Offset -
|
||||
active: false
|
||||
- Y Offset -
|
||||
active: false
|
||||
- Spawn Shape -
|
||||
shape: point
|
||||
- Spawn Width -
|
||||
lowMin: 0.0
|
||||
lowMax: 0.0
|
||||
highMin: 0.0
|
||||
highMax: 0.0
|
||||
relative: false
|
||||
scalingCount: 1
|
||||
scaling0: 1.0
|
||||
timelineCount: 1
|
||||
timeline0: 0.0
|
||||
- Spawn Height -
|
||||
lowMin: 0.0
|
||||
lowMax: 0.0
|
||||
highMin: 0.0
|
||||
highMax: 0.0
|
||||
relative: false
|
||||
scalingCount: 1
|
||||
scaling0: 1.0
|
||||
timelineCount: 1
|
||||
timeline0: 0.0
|
||||
- Scale -
|
||||
lowMin: 35.0
|
||||
lowMax: 50.0
|
||||
highMin: 50.0
|
||||
highMax: 80.0
|
||||
relative: false
|
||||
scalingCount: 3
|
||||
scaling0: 0.0
|
||||
scaling1: 0.37254903
|
||||
scaling2: 1.0
|
||||
timelineCount: 3
|
||||
timeline0: 0.0
|
||||
timeline1: 0.6643836
|
||||
timeline2: 1.0
|
||||
- Velocity -
|
||||
active: true
|
||||
lowMin: 0.0
|
||||
lowMax: 0.0
|
||||
highMin: 500.0
|
||||
highMax: 1400.0
|
||||
relative: false
|
||||
scalingCount: 4
|
||||
scaling0: 1.0
|
||||
scaling1: 1.0
|
||||
scaling2: 0.29411766
|
||||
scaling3: 0.0
|
||||
timelineCount: 4
|
||||
timeline0: 0.0
|
||||
timeline1: 0.17123288
|
||||
timeline2: 0.28767124
|
||||
timeline3: 1.0
|
||||
- Angle -
|
||||
active: true
|
||||
lowMin: 0.0
|
||||
lowMax: 360.0
|
||||
highMin: 0.0
|
||||
highMax: 360.0
|
||||
relative: false
|
||||
scalingCount: 3
|
||||
scaling0: 1.0
|
||||
scaling1: 1.0
|
||||
scaling2: 0.0
|
||||
timelineCount: 3
|
||||
timeline0: 0.0
|
||||
timeline1: 0.47260273
|
||||
timeline2: 0.60273975
|
||||
- Rotation -
|
||||
active: false
|
||||
- Wind -
|
||||
active: false
|
||||
- Gravity -
|
||||
active: true
|
||||
lowMin: 0.0
|
||||
lowMax: 0.0
|
||||
highMin: -10.0
|
||||
highMax: -400.0
|
||||
relative: false
|
||||
scalingCount: 3
|
||||
scaling0: 0.0
|
||||
scaling1: 0.0
|
||||
scaling2: 1.0
|
||||
timelineCount: 3
|
||||
timeline0: 0.0
|
||||
timeline1: 0.6712329
|
||||
timeline2: 0.8835617
|
||||
- Tint -
|
||||
colorsCount: 24
|
||||
colors0: 1.0
|
||||
colors1: 0.047058824
|
||||
colors2: 0.047058824
|
||||
colors3: 1.0
|
||||
colors4: 0.047058824
|
||||
colors5: 0.047058824
|
||||
colors6: 0.047058824
|
||||
colors7: 0.6392157
|
||||
colors8: 1.0
|
||||
colors9: 1.0
|
||||
colors10: 0.047058824
|
||||
colors11: 0.047058824
|
||||
colors12: 0.7176471
|
||||
colors13: 1.0
|
||||
colors14: 0.047058824
|
||||
colors15: 1.0
|
||||
colors16: 0.047058824
|
||||
colors17: 0.047058824
|
||||
colors18: 1.0
|
||||
colors19: 0.047058824
|
||||
colors20: 0.047058824
|
||||
colors21: 0.9411765
|
||||
colors22: 1.0
|
||||
colors23: 0.047058824
|
||||
timelineCount: 8
|
||||
timeline0: 0.0
|
||||
timeline1: 0.13769363
|
||||
timeline2: 0.20481928
|
||||
timeline3: 0.4664372
|
||||
timeline4: 0.5834768
|
||||
timeline5: 0.70051634
|
||||
timeline6: 0.80206543
|
||||
timeline7: 1.0
|
||||
- Transparency -
|
||||
lowMin: 0.0
|
||||
lowMax: 0.0
|
||||
highMin: 1.0
|
||||
highMax: 1.0
|
||||
relative: false
|
||||
scalingCount: 3
|
||||
scaling0: 0.877193
|
||||
scaling1: 0.8245614
|
||||
scaling2: 0.0
|
||||
timelineCount: 3
|
||||
timeline0: 0.0
|
||||
timeline1: 0.55479455
|
||||
timeline2: 1.0
|
||||
- Options -
|
||||
attached: false
|
||||
continuous: true
|
||||
aligned: false
|
||||
additive: true
|
||||
behind: false
|
||||
premultipliedAlpha: false
|
||||
- Image Path -
|
||||
particle.png
|
||||
Loading…
x
Reference in New Issue
Block a user