MoveEdges are outer limit of Movement
Textures renamed and reorganized New (not optimal) obstacleTextures added
This commit is contained in:
=
parent
45b9c41ea4
commit
decbf80ed5
16
app/app.iml
16
app/app.iml
@ -66,14 +66,6 @@
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
|
||||
@ -82,6 +74,14 @@
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/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/builds" />
|
||||
|
||||
@ -456,7 +456,7 @@ 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 = 0x7f020074;
|
||||
public static final int notification_template_icon_bg = 0x7f020073;
|
||||
}
|
||||
public static final class id {
|
||||
public static final int action0 = 0x7f0d0069;
|
||||
|
||||
@ -1615,54 +1615,53 @@ containing a value of this type.
|
||||
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 background=0x7f020045;
|
||||
public static final int background_cave=0x7f020046;
|
||||
public static final int background_icymountains=0x7f020047;
|
||||
public static final int ball=0x7f020048;
|
||||
public static final int blueparticle=0x7f020049;
|
||||
public static final int bomb=0x7f02004a;
|
||||
public static final int bombbutton=0x7f02004b;
|
||||
public static final int custom_button=0x7f02004c;
|
||||
public static final int emptybutton=0x7f02004d;
|
||||
public static final int goal=0x7f02004e;
|
||||
public static final int grasslands_preview=0x7f02004f;
|
||||
public static final int levelbutton_background=0x7f020050;
|
||||
public static final int levelupbackground=0x7f020051;
|
||||
public static final int lock=0x7f020052;
|
||||
public static final int lockedbutton=0x7f020053;
|
||||
public static final int magnet=0x7f020054;
|
||||
public static final int magnetbutton=0x7f020055;
|
||||
public static final int menu_background=0x7f020056;
|
||||
public static final int notification_template_icon_bg=0x7f020074;
|
||||
public static final int obstacle=0x7f020057;
|
||||
public static final int pausebutton=0x7f020058;
|
||||
public static final int playerarrow=0x7f020059;
|
||||
public static final int purple=0x7f02005a;
|
||||
public static final int ramp=0x7f02005b;
|
||||
public static final int rampbutton=0x7f02005c;
|
||||
public static final int redparticle=0x7f02005d;
|
||||
public static final int shortmenubackground=0x7f02005e;
|
||||
public static final int sound_off=0x7f02005f;
|
||||
public static final int sound_on=0x7f020060;
|
||||
public static final int sound_toggle=0x7f020061;
|
||||
public static final int splitter=0x7f020062;
|
||||
public static final int spring=0x7f020063;
|
||||
public static final int springbutton=0x7f020064;
|
||||
public static final int star=0x7f020065;
|
||||
public static final int star_icon=0x7f020066;
|
||||
public static final int stars_0=0x7f020067;
|
||||
public static final int stars_1=0x7f020068;
|
||||
public static final int stars_2=0x7f020069;
|
||||
public static final int stars_3=0x7f02006a;
|
||||
public static final int terrain=0x7f02006b;
|
||||
public static final int test=0x7f02006c;
|
||||
public static final int tool_slot_background=0x7f02006d;
|
||||
public static final int toolprogressbarlayers=0x7f02006e;
|
||||
public static final int unlock_message_background=0x7f02006f;
|
||||
public static final int unlocked=0x7f020070;
|
||||
public static final int unlockedbutton=0x7f020071;
|
||||
public static final int worldbutton_background=0x7f020072;
|
||||
public static final int yellowparticle=0x7f020073;
|
||||
public static final int backgrounds_game_cave=0x7f020045;
|
||||
public static final int backgrounds_game_grass=0x7f020046;
|
||||
public static final int backgrounds_game_mountains=0x7f020047;
|
||||
public static final int backgrounds_menu_grass=0x7f020048;
|
||||
public static final int backgrounds_menu_levelup=0x7f020049;
|
||||
public static final int backgrounds_menu_shortmenu=0x7f02004a;
|
||||
public static final int goal=0x7f02004b;
|
||||
public static final int guis_pausebutton=0x7f02004c;
|
||||
public static final int guis_playerarrow=0x7f02004d;
|
||||
public static final int guis_sound_off=0x7f02004e;
|
||||
public static final int guis_sound_on=0x7f02004f;
|
||||
public static final int lock_locked=0x7f020050;
|
||||
public static final int lock_unlocked=0x7f020051;
|
||||
public static final int notification_template_icon_bg=0x7f020073;
|
||||
public static final int obstacle=0x7f020052;
|
||||
public static final int obstacles_cave=0x7f020053;
|
||||
public static final int obstacles_grass=0x7f020054;
|
||||
public static final int obstacles_mountains=0x7f020055;
|
||||
public static final int playershapes_ball=0x7f020056;
|
||||
public static final int previews_grass=0x7f020057;
|
||||
public static final int purple=0x7f020058;
|
||||
public static final int ramp=0x7f020059;
|
||||
public static final int rampbutton=0x7f02005a;
|
||||
public static final int splitter=0x7f02005b;
|
||||
public static final int star=0x7f02005c;
|
||||
public static final int star_icon=0x7f02005d;
|
||||
public static final int stars_0=0x7f02005e;
|
||||
public static final int stars_1=0x7f02005f;
|
||||
public static final int stars_2=0x7f020060;
|
||||
public static final int stars_3=0x7f020061;
|
||||
public static final int terrain_t_grass=0x7f020062;
|
||||
public static final int tools_bomb=0x7f020063;
|
||||
public static final int tools_bombbutton=0x7f020064;
|
||||
public static final int tools_emptybutton=0x7f020065;
|
||||
public static final int tools_lockedbutton=0x7f020066;
|
||||
public static final int tools_magnet=0x7f020067;
|
||||
public static final int tools_magnetbutton=0x7f020068;
|
||||
public static final int tools_spring=0x7f020069;
|
||||
public static final int tools_springbutton=0x7f02006a;
|
||||
public static final int tools_unlockedbutton=0x7f02006b;
|
||||
public static final int xml_custom_button=0x7f02006c;
|
||||
public static final int xml_levelbutton_background=0x7f02006d;
|
||||
public static final int xml_sound_toggle=0x7f02006e;
|
||||
public static final int xml_tool_slot_background=0x7f02006f;
|
||||
public static final int xml_toolprogressbarlayers=0x7f020070;
|
||||
public static final int xml_unlock_message_background=0x7f020071;
|
||||
public static final int xml_worldbutton_background=0x7f020072;
|
||||
}
|
||||
public static final class id {
|
||||
public static final int action0=0x7f0d0069;
|
||||
|
||||
@ -66,7 +66,7 @@
|
||||
</ceilingTiles>
|
||||
<obstacles class="java.util.ArrayList">
|
||||
<obstacleData floating="true" moving="true" deadly="true" leftEdge="1.9166656" rightEdge="2.4166656" height="0.5" y="0.2766666">
|
||||
<moveComponent width="0.0" height="1.717" x="2.1666656" y="0.2766666" speed="0.0"/>
|
||||
<moveComponent width="0.0" height="1.717" x="2.1666656" y="0.2766666" speed="0.664"/>
|
||||
</obstacleData>
|
||||
<obstacleData floating="false" moving="true" deadly="false" leftEdge="5.3966713" rightEdge="5.8966713" height="0.5" y="-0.35000002">
|
||||
<moveComponent width="2.841" height="0.0" x="5.6466713" y="-0.35000002" speed="0.0"/>
|
||||
@ -88,8 +88,11 @@
|
||||
<tileData x="0.0" width="6.0"/>
|
||||
</ceilingTiles>
|
||||
<obstacles class="java.util.ArrayList">
|
||||
<obstacleData floating="true" moving="true" deadly="false" leftEdge="-0.15199986" rightEdge="0.19200015" height="0.357" y="0.026666664">
|
||||
<moveComponent width="1.288" height="1.111" x="0.020000145" y="0.026666664" speed="0.5"/>
|
||||
<obstacleData floating="false" moving="true" deadly="false" leftEdge="-0.55199987" rightEdge="-0.20799984" height="0.357" y="-0.42150003">
|
||||
<moveComponent width="0.0" height="1.086" x="-0.37999985" y="-0.42150003" speed="0.5"/>
|
||||
</obstacleData>
|
||||
<obstacleData floating="true" moving="true" deadly="false" leftEdge="-1.6233331" rightEdge="-1.1233331" height="0.5" y="-0.35000002">
|
||||
<moveComponent width="0.0" height="1.275" x="-1.3733331" y="-0.35000002" speed="0.508"/>
|
||||
</obstacleData>
|
||||
</obstacles>
|
||||
<stars class="java.util.ArrayList"/>
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,27 +1,23 @@
|
||||
[
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\unlockedbutton.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\unlockedbutton.png"
|
||||
"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\\abc_cab_background_internal_bg.xml",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.1\\res\\drawable\\abc_cab_background_internal_bg.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\shortmenubackground.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\shortmenubackground.png"
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\backgrounds_game_grass.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\backgrounds_game_grass.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\background.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\background.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\emptybutton.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\emptybutton.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\worldbutton_background.xml",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\worldbutton_background.xml"
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\xml_tool_slot_background.xml",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\xml_tool_slot_background.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\ramp.png",
|
||||
@ -31,18 +27,14 @@
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_dialog_material_background_dark.xml",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.1\\res\\drawable\\abc_dialog_material_background_dark.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\xml_unlock_message_background.xml",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\xml_unlock_message_background.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_tab_indicator_material.xml",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.1\\res\\drawable\\abc_tab_indicator_material.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\springbutton.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\springbutton.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\playerarrow.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\playerarrow.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_btn_borderless_material.xml",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.1\\res\\drawable\\abc_btn_borderless_material.xml"
|
||||
@ -59,22 +51,6 @@
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_btn_check_material.xml",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.1\\res\\drawable\\abc_btn_check_material.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\sound_on.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\sound_on.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\magnetbutton.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\magnetbutton.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\yellowparticle.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\yellowparticle.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\spring.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\spring.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_spinner_textfield_background_material.xml",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.1\\res\\drawable\\abc_spinner_textfield_background_material.xml"
|
||||
@ -83,29 +59,29 @@
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_textfield_search_material.xml",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.1\\res\\drawable\\abc_textfield_search_material.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\lock_unlocked.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\lock_unlocked.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\obstacle.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\obstacle.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\custom_button.xml",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\custom_button.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\toolprogressbarlayers.xml",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\toolprogressbarlayers.xml"
|
||||
"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"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\purple.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\purple.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\grasslands_preview.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\grasslands_preview.png"
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\guis_pausebutton.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\guis_pausebutton.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\lockedbutton.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\lockedbutton.png"
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\xml_sound_toggle.xml",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\xml_sound_toggle.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\goal.png",
|
||||
@ -115,45 +91,49 @@
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\stars_2.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\stars_2.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\obstacles_mountains.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\obstacles_mountains.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_btn_colored_material.xml",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.1\\res\\drawable\\abc_btn_colored_material.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\bombbutton.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\bombbutton.png"
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\lock_locked.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\lock_locked.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\xml_toolprogressbarlayers.xml",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\xml_toolprogressbarlayers.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\backgrounds_menu_levelup.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\backgrounds_menu_levelup.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_dialog_material_background_light.xml",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.1\\res\\drawable\\abc_dialog_material_background_light.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\unlocked.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\unlocked.png"
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\terrain_t_grass.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\terrain_t_grass.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\sound_toggle.xml",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\sound_toggle.xml"
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tools_lockedbutton.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tools_lockedbutton.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\unlock_message_background.xml",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\unlock_message_background.xml"
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tools_magnet.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tools_magnet.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\stars_1.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\stars_1.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\ball.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\ball.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tool_slot_background.xml",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tool_slot_background.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\sound_off.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\sound_off.png"
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\playershapes_ball.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\playershapes_ball.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_btn_default_mtrl_shape.xml",
|
||||
@ -164,45 +144,37 @@
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\star.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\magnet.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\magnet.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\menu_background.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\menu_background.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\terrain.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\terrain.png"
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\backgrounds_menu_grass.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\backgrounds_menu_grass.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_edit_text_material.xml",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.1\\res\\drawable\\abc_edit_text_material.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\background_cave.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\background_cave.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\blueparticle.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\blueparticle.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_item_background_holo_light.xml",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.1\\res\\drawable\\abc_item_background_holo_light.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\test.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\test.png"
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\xml_levelbutton_background.xml",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\xml_levelbutton_background.xml"
|
||||
},
|
||||
{
|
||||
"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\\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\\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\\abc_ratingbar_full_material.xml",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.1\\res\\drawable\\abc_ratingbar_full_material.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\levelupbackground.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\levelupbackground.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\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.1\\res\\drawable\\abc_list_selector_background_transition_holo_dark.xml"
|
||||
@ -212,29 +184,37 @@
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\splitter.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\bomb.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\bomb.png"
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\xml_worldbutton_background.xml",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\xml_worldbutton_background.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tools_spring.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tools_spring.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\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.1\\res\\drawable\\abc_cab_background_top_material.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_text_cursor_material.xml",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.1\\res\\drawable\\abc_text_cursor_material.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\lock.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\lock.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\stars_3.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\stars_3.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_text_cursor_material.xml",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.1\\res\\drawable\\abc_text_cursor_material.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_list_selector_background_transition_holo_light.xml",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.1\\res\\drawable\\abc_list_selector_background_transition_holo_light.xml"
|
||||
},
|
||||
{
|
||||
"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\\stars_0.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\stars_0.png"
|
||||
@ -248,25 +228,41 @@
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.1\\res\\drawable\\abc_switch_thumb_material.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\pausebutton.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\pausebutton.png"
|
||||
"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"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\levelbutton_background.xml",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\levelbutton_background.xml"
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\guis_sound_off.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\guis_sound_off.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\redparticle.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\redparticle.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\background_icymountains.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\background_icymountains.png"
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tools_magnetbutton.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tools_magnetbutton.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_seekbar_track_material.xml",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.1\\res\\drawable\\abc_seekbar_track_material.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\backgrounds_menu_shortmenu.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\backgrounds_menu_shortmenu.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\obstacles_cave.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\obstacles_cave.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\backgrounds_game_cave.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\backgrounds_game_cave.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\previews_grass.png",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\previews_grass.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\xml_custom_button.xml",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\xml_custom_button.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_item_background_holo_dark.xml",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.1\\res\\drawable\\abc_item_background_holo_dark.xml"
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="23.1.1"><source path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\build\intermediates\exploded-aar\com.android.support\support-v4\23.1.1\assets"/></dataSet><dataSet config="23.1.1"><source path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\build\intermediates\exploded-aar\com.android.support\appcompat-v7\23.1.1\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="levelpacks/Testcave.xml" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\levelpacks\Testcave.xml"/><file name="levelpack_01.xml" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\levelpack_01.xml"/><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="testlevelpack.xml" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\testlevelpack.xml"/><file name="levelpacks/Icy Mountains.xml" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\levelpacks\Icy Mountains.xml"/></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="23.1.1"><source path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\build\intermediates\exploded-aar\com.android.support\support-v4\23.1.1\assets"/></dataSet><dataSet config="23.1.1"><source path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\build\intermediates\exploded-aar\com.android.support\appcompat-v7\23.1.1\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="levelpacks/Icy Mountains.xml" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\levelpacks\Icy Mountains.xml"/><file name="levelpacks/Testcave.xml" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\levelpacks\Testcave.xml"/><file name="levelpack_01.xml" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\levelpack_01.xml"/><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="testlevelpack.xml" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\testlevelpack.xml"/></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
Binary file not shown.
|
Before Width: | Height: | Size: 80 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 6.3 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 701 B |
Binary file not shown.
|
Before Width: | Height: | Size: 99 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 38 KiB |
@ -1,30 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android" tools:context=".main.GameActivity">
|
||||
<item android:state_pressed="true" android:state_enabled="true">
|
||||
<shape>
|
||||
<corners android:radius="20dp" />
|
||||
<padding android:bottom="10dp" android:left="10dp" android:right="10dp" android:top="10dp" />
|
||||
<stroke android:width="1dp" android:color="#992f2f" />
|
||||
|
||||
<solid android:color="#ef4444" />
|
||||
</shape>
|
||||
</item>
|
||||
<item android:state_pressed="false" android:state_enabled="true">
|
||||
<shape>
|
||||
<corners android:radius="20dp" />
|
||||
<padding android:bottom="10dp" android:left="10dp" android:right="10dp" android:top="10dp" />
|
||||
<stroke android:width="1dp" android:color="#992f2f" />
|
||||
|
||||
<gradient android:angle="270" android:endColor="#992f2f" android:startColor="#ef4444" />
|
||||
</shape>
|
||||
</item>
|
||||
<item android:state_enabled="false">
|
||||
<shape>
|
||||
<corners android:radius="20dp" />
|
||||
<padding android:bottom="10dp" android:left="10dp" android:right="10dp" android:top="10dp" />
|
||||
<stroke android:width="1dp" android:color="#992f2f" />
|
||||
|
||||
<gradient android:angle="270" android:endColor="#a15d5d" android:startColor="#b73d3d" />
|
||||
</shape>
|
||||
</item>
|
||||
</selector>
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 6.8 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 81 KiB |
@ -1,24 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<corners android:radius="47dp" />
|
||||
<gradient
|
||||
android:centerColor="#669dd4"
|
||||
android:centerX="50%"
|
||||
android:centerY="50%"
|
||||
android:endColor="#F7F9FF"
|
||||
android:gradientRadius="300"
|
||||
android:startColor="#a07bbc"
|
||||
android:type="radial" />
|
||||
<padding
|
||||
android:bottom="0dp"
|
||||
android:left="0dp"
|
||||
android:right="0dp"
|
||||
android:top="20dp" />
|
||||
<size
|
||||
android:width="200dp"
|
||||
android:height="150dp" />
|
||||
<stroke
|
||||
android:width="10dp"
|
||||
android:color="#b11a1a" />
|
||||
</shape>
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 511 B |
Binary file not shown.
|
Before Width: | Height: | Size: 8.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 17 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 38 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 17 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 140 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 10 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 12 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 580 B |
Binary file not shown.
|
Before Width: | Height: | Size: 1.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.0 KiB |
@ -1,10 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<item android:state_checked="false"
|
||||
android:drawable="@drawable/sound_off" />
|
||||
|
||||
<item android:state_checked="true"
|
||||
android:drawable="@drawable/sound_on" />
|
||||
|
||||
</selector>
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 37 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 80 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 34 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 17 KiB |
@ -1,15 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<corners android:radius="3dp" />
|
||||
<solid
|
||||
android:color="#715f5f"/>
|
||||
<padding
|
||||
android:bottom="2dp"
|
||||
android:left="2dp"
|
||||
android:right="2dp"
|
||||
android:top="2dp" />
|
||||
<stroke
|
||||
android:width="2dp"
|
||||
android:color="#635e5e" />
|
||||
</shape>
|
||||
@ -1,21 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:id="@android:id/background">
|
||||
<shape android:shape="rectangle">
|
||||
<solid android:color="#00fff700" />
|
||||
<corners android:radius="200dp" />
|
||||
</shape>
|
||||
</item>
|
||||
|
||||
<item android:id="@android:id/progress">
|
||||
<clip android:gravity="right">
|
||||
<shape android:shape="rectangle">
|
||||
<gradient
|
||||
android:angle="45"
|
||||
android:endColor="#a06c6c6c"
|
||||
android:startColor="#a0ababab" />
|
||||
<corners android:radius="200dp" />
|
||||
</shape>
|
||||
</clip>
|
||||
</item>
|
||||
</layer-list>
|
||||
@ -1,20 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<corners android:radius="30dp" />
|
||||
<gradient
|
||||
android:centerX="50%"
|
||||
android:centerY="50%"
|
||||
android:endColor="#82f7f9ff"
|
||||
android:startColor="#820077ff"
|
||||
android:angle="45"
|
||||
android:type="linear" />
|
||||
<padding
|
||||
android:bottom="5dp"
|
||||
android:left="10dp"
|
||||
android:right="15dp"
|
||||
android:top="5dp" />
|
||||
<stroke
|
||||
android:width="2dp"
|
||||
android:color="#7826adbc" />
|
||||
</shape>
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 8.3 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 17 KiB |
@ -1,20 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<corners android:radius="20dp" />
|
||||
<gradient
|
||||
android:centerX="0%"
|
||||
android:centerY="0%"
|
||||
android:endColor="#ff71a5"
|
||||
android:startColor="#d7fd00"
|
||||
android:angle="315"
|
||||
android:type="linear" />
|
||||
<padding
|
||||
android:bottom="10dp"
|
||||
android:left="0dp"
|
||||
android:right="0dp"
|
||||
android:top="10dp" />
|
||||
<stroke
|
||||
android:width="4dp"
|
||||
android:color="#74ff71d0" />
|
||||
</shape>
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.9 KiB |
@ -12,7 +12,7 @@
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_alignParentTop="true"
|
||||
android:layout_margin="10dp"
|
||||
android:src="@drawable/pausebutton" />
|
||||
android:src="@drawable/guis_pausebutton" />
|
||||
|
||||
<include
|
||||
android:id="@+id/game_toolbuttonbar"
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/levelbutton_background"
|
||||
android:background="@drawable/xml_levelbutton_background"
|
||||
android:layout_margin="10dp">
|
||||
|
||||
<TextView
|
||||
@ -26,7 +26,7 @@
|
||||
android:id="@+id/levelbutton_lock"
|
||||
android:layout_width="100dp"
|
||||
android:layout_height="100dp"
|
||||
android:src="@drawable/lock"
|
||||
android:src="@drawable/lock_locked"
|
||||
android:layout_centerInParent="true"
|
||||
android:visibility="invisible"/>
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical"
|
||||
android:background="@drawable/menu_background">
|
||||
android:background="@drawable/backgrounds_menu_grass">
|
||||
|
||||
<include
|
||||
layout="@layout/topbar"
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical"
|
||||
android:id="@+id/levelup_mainlayout"
|
||||
android:background="@drawable/levelupbackground">
|
||||
android:background="@drawable/backgrounds_menu_levelup">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="@drawable/shortmenubackground">
|
||||
android:background="@drawable/backgrounds_menu_shortmenu">
|
||||
|
||||
<include
|
||||
android:layout_width="match_parent"
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
android:layout_width="110dp"
|
||||
android:layout_height="110dp"
|
||||
android:text="Play"
|
||||
android:background="@drawable/ball"
|
||||
android:background="@drawable/playershapes_ball"
|
||||
android:layout_alignParentTop="true"
|
||||
android:layout_centerHorizontal="true"
|
||||
android:layout_marginTop="44dp"
|
||||
@ -29,7 +29,7 @@
|
||||
android:id="@+id/startscreen_sound"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/sound_toggle"
|
||||
android:background="@drawable/xml_sound_toggle"
|
||||
android:textOff=""
|
||||
android:textOn=""
|
||||
android:layout_below="@+id/startscreen_play"
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
android:layout_width="70dp"
|
||||
android:layout_height="70dp"
|
||||
android:layout_gravity="center"
|
||||
android:background="@drawable/tool_slot_background"
|
||||
android:background="@drawable/xml_tool_slot_background"
|
||||
android:src="@drawable/rampbutton" />
|
||||
|
||||
</FrameLayout>
|
||||
@ -25,7 +25,7 @@
|
||||
android:layout_centerInParent="true"
|
||||
android:max="100"
|
||||
android:progress="100"
|
||||
android:progressDrawable="@drawable/toolprogressbarlayers" />
|
||||
android:progressDrawable="@drawable/xml_toolprogressbarlayers" />
|
||||
|
||||
|
||||
</RelativeLayout>
|
||||
@ -2,7 +2,7 @@
|
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="@drawable/menu_background">
|
||||
android:background="@drawable/backgrounds_menu_grass">
|
||||
|
||||
<include
|
||||
android:id="@+id/toolshop_topbar"
|
||||
|
||||
@ -60,7 +60,7 @@
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_margin="5dp"
|
||||
android:layout_toStartOf="@+id/topbar_toolshop"
|
||||
android:background="@drawable/sound_toggle"
|
||||
android:background="@drawable/xml_sound_toggle"
|
||||
android:textOff=""
|
||||
android:textOn="" />
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:orientation="horizontal" android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/unlock_message_background">
|
||||
android:background="@drawable/xml_unlock_message_background">
|
||||
|
||||
<ImageView
|
||||
android:layout_width="40dp"
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="220dp"
|
||||
android:layout_height="match_parent"
|
||||
android:background="@drawable/worldbutton_background">
|
||||
android:background="@drawable/xml_worldbutton_background">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/worldbutton_title"
|
||||
@ -23,7 +23,7 @@
|
||||
android:layout_centerHorizontal="true"
|
||||
android:layout_marginTop="10dp"
|
||||
android:adjustViewBounds="true"
|
||||
android:src="@drawable/grasslands_preview" />
|
||||
android:src="@drawable/previews_grass" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/worldbutton_lock"
|
||||
@ -32,7 +32,7 @@
|
||||
android:layout_alignBottom="@+id/worldbutton_preview"
|
||||
android:layout_alignLeft="@+id/worldbutton_preview"
|
||||
android:layout_alignStart="@+id/worldbutton_preview"
|
||||
android:src="@drawable/lock"
|
||||
android:src="@drawable/lock_locked"
|
||||
android:visibility="visible" />
|
||||
|
||||
<RelativeLayout
|
||||
@ -82,7 +82,7 @@
|
||||
<ImageView
|
||||
android:layout_width="30sp"
|
||||
android:layout_height="30sp"
|
||||
android:src="@drawable/unlocked"
|
||||
android:src="@drawable/lock_unlocked"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_alignParentStart="true"
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="@drawable/menu_background">
|
||||
android:background="@drawable/backgrounds_menu_grass">
|
||||
|
||||
<include
|
||||
android:id="@+id/worlds_topbar"
|
||||
|
||||
@ -231,7 +231,7 @@
|
||||
<style name="Animation.AppCompat.Dialog" parent="Base.Animation.AppCompat.Dialog"/>
|
||||
<style name="Animation.AppCompat.DropDownUp" parent="Base.Animation.AppCompat.DropDownUp"/>
|
||||
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
|
||||
|
||||
<!-- Customize your theme here. -->
|
||||
<item name="colorPrimary">@color/colorPrimary</item>
|
||||
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
|
||||
<item name="colorAccent">@color/colorAccent</item>
|
||||
@ -443,7 +443,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>
|
||||
@ -493,7 +493,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">
|
||||
@ -524,7 +524,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">
|
||||
@ -534,7 +534,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>
|
||||
@ -545,7 +545,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>
|
||||
@ -562,10 +562,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>
|
||||
@ -578,14 +578,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>
|
||||
@ -594,33 +594,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>
|
||||
|
||||
@ -629,7 +629,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>
|
||||
@ -650,7 +650,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>
|
||||
@ -663,7 +663,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>
|
||||
|
||||
@ -673,7 +673,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>
|
||||
@ -708,7 +709,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>
|
||||
@ -719,7 +720,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>
|
||||
@ -736,7 +737,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>
|
||||
@ -749,17 +750,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>
|
||||
@ -768,33 +769,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>
|
||||
|
||||
@ -803,7 +804,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>
|
||||
@ -824,7 +825,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>
|
||||
@ -837,7 +838,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>
|
||||
|
||||
@ -847,7 +848,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>
|
||||
@ -1172,7 +1174,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>
|
||||
@ -1181,7 +1183,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>
|
||||
@ -1194,7 +1196,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>
|
||||
@ -1210,7 +1212,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>
|
||||
@ -1219,7 +1221,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>
|
||||
@ -1233,7 +1235,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>
|
||||
@ -1248,12 +1250,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>
|
||||
@ -1262,7 +1264,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>
|
||||
@ -1501,7 +1503,7 @@
|
||||
<style name="Widget.AppCompat.Toolbar" parent="Base.Widget.AppCompat.Toolbar"/>
|
||||
<style name="Widget.AppCompat.Toolbar.Button.Navigation" parent="Base.Widget.AppCompat.Toolbar.Button.Navigation"/>
|
||||
<style name="customButton">
|
||||
<item name="android:background">@drawable/custom_button</item>
|
||||
<item name="android:background">@drawable/xml_custom_button</item>
|
||||
<item name="android:textColor">@android:color/white</item>
|
||||
<item name="android:textSize">15sp</item>
|
||||
<item name="android:shadowColor">#646363</item>
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@ -463,54 +463,53 @@ int drawable abc_textfield_default_mtrl_alpha 0x7f020041
|
||||
int drawable abc_textfield_search_activated_mtrl_alpha 0x7f020042
|
||||
int drawable abc_textfield_search_default_mtrl_alpha 0x7f020043
|
||||
int drawable abc_textfield_search_material 0x7f020044
|
||||
int drawable background 0x7f020045
|
||||
int drawable background_cave 0x7f020046
|
||||
int drawable background_icymountains 0x7f020047
|
||||
int drawable ball 0x7f020048
|
||||
int drawable blueparticle 0x7f020049
|
||||
int drawable bomb 0x7f02004a
|
||||
int drawable bombbutton 0x7f02004b
|
||||
int drawable custom_button 0x7f02004c
|
||||
int drawable emptybutton 0x7f02004d
|
||||
int drawable goal 0x7f02004e
|
||||
int drawable grasslands_preview 0x7f02004f
|
||||
int drawable levelbutton_background 0x7f020050
|
||||
int drawable levelupbackground 0x7f020051
|
||||
int drawable lock 0x7f020052
|
||||
int drawable lockedbutton 0x7f020053
|
||||
int drawable magnet 0x7f020054
|
||||
int drawable magnetbutton 0x7f020055
|
||||
int drawable menu_background 0x7f020056
|
||||
int drawable notification_template_icon_bg 0x7f020074
|
||||
int drawable obstacle 0x7f020057
|
||||
int drawable pausebutton 0x7f020058
|
||||
int drawable playerarrow 0x7f020059
|
||||
int drawable purple 0x7f02005a
|
||||
int drawable ramp 0x7f02005b
|
||||
int drawable rampbutton 0x7f02005c
|
||||
int drawable redparticle 0x7f02005d
|
||||
int drawable shortmenubackground 0x7f02005e
|
||||
int drawable sound_off 0x7f02005f
|
||||
int drawable sound_on 0x7f020060
|
||||
int drawable sound_toggle 0x7f020061
|
||||
int drawable splitter 0x7f020062
|
||||
int drawable spring 0x7f020063
|
||||
int drawable springbutton 0x7f020064
|
||||
int drawable star 0x7f020065
|
||||
int drawable star_icon 0x7f020066
|
||||
int drawable stars_0 0x7f020067
|
||||
int drawable stars_1 0x7f020068
|
||||
int drawable stars_2 0x7f020069
|
||||
int drawable stars_3 0x7f02006a
|
||||
int drawable terrain 0x7f02006b
|
||||
int drawable test 0x7f02006c
|
||||
int drawable tool_slot_background 0x7f02006d
|
||||
int drawable toolprogressbarlayers 0x7f02006e
|
||||
int drawable unlock_message_background 0x7f02006f
|
||||
int drawable unlocked 0x7f020070
|
||||
int drawable unlockedbutton 0x7f020071
|
||||
int drawable worldbutton_background 0x7f020072
|
||||
int drawable yellowparticle 0x7f020073
|
||||
int drawable backgrounds_game_cave 0x7f020045
|
||||
int drawable backgrounds_game_grass 0x7f020046
|
||||
int drawable backgrounds_game_mountains 0x7f020047
|
||||
int drawable backgrounds_menu_grass 0x7f020048
|
||||
int drawable backgrounds_menu_levelup 0x7f020049
|
||||
int drawable backgrounds_menu_shortmenu 0x7f02004a
|
||||
int drawable goal 0x7f02004b
|
||||
int drawable guis_pausebutton 0x7f02004c
|
||||
int drawable guis_playerarrow 0x7f02004d
|
||||
int drawable guis_sound_off 0x7f02004e
|
||||
int drawable guis_sound_on 0x7f02004f
|
||||
int drawable lock_locked 0x7f020050
|
||||
int drawable lock_unlocked 0x7f020051
|
||||
int drawable notification_template_icon_bg 0x7f020073
|
||||
int drawable obstacle 0x7f020052
|
||||
int drawable obstacles_cave 0x7f020053
|
||||
int drawable obstacles_grass 0x7f020054
|
||||
int drawable obstacles_mountains 0x7f020055
|
||||
int drawable playershapes_ball 0x7f020056
|
||||
int drawable previews_grass 0x7f020057
|
||||
int drawable purple 0x7f020058
|
||||
int drawable ramp 0x7f020059
|
||||
int drawable rampbutton 0x7f02005a
|
||||
int drawable splitter 0x7f02005b
|
||||
int drawable star 0x7f02005c
|
||||
int drawable star_icon 0x7f02005d
|
||||
int drawable stars_0 0x7f02005e
|
||||
int drawable stars_1 0x7f02005f
|
||||
int drawable stars_2 0x7f020060
|
||||
int drawable stars_3 0x7f020061
|
||||
int drawable terrain_t_grass 0x7f020062
|
||||
int drawable tools_bomb 0x7f020063
|
||||
int drawable tools_bombbutton 0x7f020064
|
||||
int drawable tools_emptybutton 0x7f020065
|
||||
int drawable tools_lockedbutton 0x7f020066
|
||||
int drawable tools_magnet 0x7f020067
|
||||
int drawable tools_magnetbutton 0x7f020068
|
||||
int drawable tools_spring 0x7f020069
|
||||
int drawable tools_springbutton 0x7f02006a
|
||||
int drawable tools_unlockedbutton 0x7f02006b
|
||||
int drawable xml_custom_button 0x7f02006c
|
||||
int drawable xml_levelbutton_background 0x7f02006d
|
||||
int drawable xml_sound_toggle 0x7f02006e
|
||||
int drawable xml_tool_slot_background 0x7f02006f
|
||||
int drawable xml_toolprogressbarlayers 0x7f020070
|
||||
int drawable xml_unlock_message_background 0x7f020071
|
||||
int drawable xml_worldbutton_background 0x7f020072
|
||||
int id action0 0x7f0d0069
|
||||
int id action_bar 0x7f0d0041
|
||||
int id action_bar_activity_content 0x7f0d0000
|
||||
|
||||
@ -66,7 +66,7 @@
|
||||
</ceilingTiles>
|
||||
<obstacles class="java.util.ArrayList">
|
||||
<obstacleData floating="true" moving="true" deadly="true" leftEdge="1.9166656" rightEdge="2.4166656" height="0.5" y="0.2766666">
|
||||
<moveComponent width="0.0" height="1.717" x="2.1666656" y="0.2766666" speed="0.0"/>
|
||||
<moveComponent width="0.0" height="1.717" x="2.1666656" y="0.2766666" speed="0.664"/>
|
||||
</obstacleData>
|
||||
<obstacleData floating="false" moving="true" deadly="false" leftEdge="5.3966713" rightEdge="5.8966713" height="0.5" y="-0.35000002">
|
||||
<moveComponent width="2.841" height="0.0" x="5.6466713" y="-0.35000002" speed="0.0"/>
|
||||
@ -88,8 +88,11 @@
|
||||
<tileData x="0.0" width="6.0"/>
|
||||
</ceilingTiles>
|
||||
<obstacles class="java.util.ArrayList">
|
||||
<obstacleData floating="true" moving="true" deadly="false" leftEdge="-0.15199986" rightEdge="0.19200015" height="0.357" y="0.026666664">
|
||||
<moveComponent width="1.288" height="1.111" x="0.020000145" y="0.026666664" speed="0.5"/>
|
||||
<obstacleData floating="false" moving="true" deadly="false" leftEdge="-0.55199987" rightEdge="-0.20799984" height="0.357" y="-0.42150003">
|
||||
<moveComponent width="0.0" height="1.086" x="-0.37999985" y="-0.42150003" speed="0.5"/>
|
||||
</obstacleData>
|
||||
<obstacleData floating="true" moving="true" deadly="false" leftEdge="-1.6233331" rightEdge="-1.1233331" height="0.5" y="-0.35000002">
|
||||
<moveComponent width="0.0" height="1.275" x="-1.3733331" y="-0.35000002" speed="0.508"/>
|
||||
</obstacleData>
|
||||
</obstacles>
|
||||
<stars class="java.util.ArrayList"/>
|
||||
|
||||
@ -30,6 +30,7 @@ public class Obstacle extends Entity {
|
||||
this.floating = data.isFloating();
|
||||
this.moving = data.isMoving();
|
||||
this.moveComponent = data.getMoveComponent();
|
||||
moveComponent.shrink(new Vector(super.getWidth(), super.getHeight()));
|
||||
|
||||
if (!floating)
|
||||
super.setToTerrain(terrainEdge);
|
||||
@ -55,7 +56,6 @@ public class Obstacle extends Entity {
|
||||
float distanceLeft = moveProgress * totalMoveDistance - distance;
|
||||
Vector direction = new Vector(nextVertex.getX(), nextVertex.getY()).translate(new Vector(lastVertex.getX(), lastVertex.getY()).negate());
|
||||
direction = direction.mul(0.5f * distanceLeft);
|
||||
GameLog.i("Direction: "+direction.toString());
|
||||
super.setPosition(moveComponent.getPositionOfVertex(lastVertex).translate(direction));
|
||||
return;
|
||||
}
|
||||
@ -73,10 +73,14 @@ public class Obstacle extends Entity {
|
||||
}
|
||||
|
||||
private void setTextureAtlasIndex() {
|
||||
if (deadly)
|
||||
if (deadly && floating)
|
||||
super.getTexture().setAtlasIndex(1);
|
||||
if (floating)
|
||||
else if(deadly)
|
||||
super.getTexture().setAtlasIndex(2);
|
||||
else if(floating)
|
||||
super.getTexture().setAtlasIndex(0);
|
||||
else
|
||||
super.getTexture().setAtlasIndex(3);
|
||||
}
|
||||
|
||||
public boolean isMoving() {
|
||||
|
||||
@ -21,22 +21,15 @@ public class TexturePack {
|
||||
public final Texture playerArrow;
|
||||
public final Texture player;
|
||||
public final Texture star;
|
||||
public final Texture blueParticle;
|
||||
public final Texture yellowParticle;
|
||||
public final Texture redParticle;
|
||||
|
||||
public TexturePack(Context context) {
|
||||
loader = new TextureLoader(context);
|
||||
goal = loadTexture(R.drawable.goal);
|
||||
player = loadTexture(R.drawable.ball);
|
||||
playerArrow = loadTexture(R.drawable.playerarrow);
|
||||
player = loadTexture(R.drawable.playershapes_ball);
|
||||
playerArrow = loadTexture(R.drawable.guis_playerarrow);
|
||||
|
||||
star = loadTexture(R.drawable.star);
|
||||
|
||||
blueParticle = loadTexture(R.drawable.blueparticle);
|
||||
yellowParticle = loadTexture(R.drawable.yellowparticle);
|
||||
redParticle = loadTexture(R.drawable.redparticle);
|
||||
|
||||
ToolType.loadAllToolTextures(this);
|
||||
World.loadAllSpecificTextures(this);
|
||||
}
|
||||
|
||||
@ -21,7 +21,7 @@ public class ToolSlot {
|
||||
|
||||
public int getDrawable(){
|
||||
if(locked)
|
||||
return R.drawable.lockedbutton;
|
||||
return R.drawable.tools_lockedbutton;
|
||||
else
|
||||
return toolType.getButtonDrawable();
|
||||
}
|
||||
|
||||
@ -13,10 +13,10 @@ public enum ToolType {
|
||||
|
||||
//Check newInstance when new Tool is added!
|
||||
RAMP("Ramp", R.drawable.ramp, R.drawable.rampbutton, R.raw.ramp, 3f, 0),
|
||||
SPRING("Spring", R.drawable.spring, R.drawable.springbutton, R.raw.ramp, 4f, 5),
|
||||
MAGNET("Magnet", R.drawable.magnet, R.drawable.magnetbutton, R.raw.ramp, 6f, 10),
|
||||
BOMB("Bomb", R.drawable.bomb, R.drawable.bombbutton, R.raw.ramp, 6f, 12),
|
||||
NONE("None", -1, R.drawable.emptybutton, -1, 0, 0);
|
||||
SPRING("Spring", R.drawable.tools_spring, R.drawable.tools_springbutton, R.raw.ramp, 4f, 5),
|
||||
MAGNET("Magnet", R.drawable.tools_magnet, R.drawable.tools_magnetbutton, R.raw.ramp, 6f, 10),
|
||||
BOMB("Bomb", R.drawable.tools_bomb, R.drawable.tools_bombbutton, R.raw.ramp, 6f, 12),
|
||||
NONE("None", -1, R.drawable.tools_emptybutton, -1, 0, 0);
|
||||
|
||||
private String name;
|
||||
private int toolTextureId;
|
||||
|
||||
@ -44,4 +44,13 @@ public class MoveComponent {
|
||||
return new Vector(x, y);
|
||||
}
|
||||
|
||||
public void shrink(Vector value){
|
||||
this.width -= value.getX();
|
||||
this.height -= value.getY();
|
||||
if(width < 0)
|
||||
width = 0;
|
||||
if(height < 0)
|
||||
height = 0;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -12,9 +12,9 @@ import com.example.julian.endlessroll.entities.textures.TexturePack;
|
||||
|
||||
public enum World {
|
||||
|
||||
GRASSLANDS(0, "Grasslands", R.drawable.grasslands_preview, R.drawable.background, R.drawable.terrain, R.drawable.obstacle),
|
||||
TESTCAVE(1, "Testcave", R.drawable.grasslands_preview, R.drawable.background_cave, R.drawable.terrain, R.drawable.obstacle),
|
||||
ICY_MOUNTAINS(2, "Icy Mountains", R.drawable.grasslands_preview, R.drawable.background_icymountains, R.drawable.terrain, R.drawable.obstacle);
|
||||
GRASSLANDS(0, "Grasslands", R.drawable.previews_grass, R.drawable.backgrounds_game_grass, R.drawable.terrain_t_grass, R.drawable.obstacles_grass),
|
||||
TESTCAVE(1, "Testcave", R.drawable.previews_grass, R.drawable.backgrounds_game_cave, R.drawable.terrain_t_grass, R.drawable.obstacles_cave),
|
||||
ICY_MOUNTAINS(2, "Icy Mountains", R.drawable.previews_grass, R.drawable.backgrounds_game_mountains, R.drawable.terrain_t_grass, R.drawable.obstacles_mountains);
|
||||
|
||||
private int index;
|
||||
private String name;
|
||||
|
||||
@ -28,7 +28,7 @@ public class BountyMessage {
|
||||
}
|
||||
|
||||
public BountyMessage(Context context) {
|
||||
this(context, R.drawable.unlockedbutton, "Tool-Slot unlocked");
|
||||
this(context, R.drawable.tools_unlockedbutton, "Tool-Slot unlocked");
|
||||
}
|
||||
|
||||
private BountyMessage(Context context, @DrawableRes int imageId, String text) {
|
||||
|
||||
@ -49,7 +49,7 @@ public class ToolButton {
|
||||
private ImageView createImageView(ToolType type, int id) {
|
||||
ImageView view = (ImageView) layout.findViewById(id);
|
||||
if (locked)
|
||||
view.setImageResource(R.drawable.lockedbutton);
|
||||
view.setImageResource(R.drawable.tools_lockedbutton);
|
||||
else
|
||||
view.setImageResource(type.getButtonDrawable());
|
||||
view.setBackgroundDrawable(createColoredBackground());
|
||||
|
||||
@ -59,7 +59,7 @@ public class ToolOfferSlot implements View.OnClickListener {
|
||||
this.locked = locked;
|
||||
if (locked) {
|
||||
title.setText("Level up to unlock");
|
||||
image.setImageResource(R.drawable.lockedbutton);
|
||||
image.setImageResource(R.drawable.tools_lockedbutton);
|
||||
} else {
|
||||
title.setText(toolType.getName());
|
||||
image.setImageResource(toolType.getButtonDrawable());
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 89 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 8.7 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 701 B |
Binary file not shown.
|
Before Width: | Height: | Size: 132 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 38 KiB |
@ -1,30 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android" tools:context=".main.GameActivity">
|
||||
<item android:state_pressed="true" android:state_enabled="true">
|
||||
<shape>
|
||||
<corners android:radius="20dp" />
|
||||
<padding android:bottom="10dp" android:left="10dp" android:right="10dp" android:top="10dp" />
|
||||
<stroke android:width="1dp" android:color="#992f2f" />
|
||||
|
||||
<solid android:color="#ef4444" />
|
||||
</shape>
|
||||
</item>
|
||||
<item android:state_pressed="false" android:state_enabled="true">
|
||||
<shape>
|
||||
<corners android:radius="20dp" />
|
||||
<padding android:bottom="10dp" android:left="10dp" android:right="10dp" android:top="10dp" />
|
||||
<stroke android:width="1dp" android:color="#992f2f" />
|
||||
|
||||
<gradient android:angle="270" android:endColor="#992f2f" android:startColor="#ef4444" />
|
||||
</shape>
|
||||
</item>
|
||||
<item android:state_enabled="false">
|
||||
<shape>
|
||||
<corners android:radius="20dp" />
|
||||
<padding android:bottom="10dp" android:left="10dp" android:right="10dp" android:top="10dp" />
|
||||
<stroke android:width="1dp" android:color="#992f2f" />
|
||||
|
||||
<gradient android:angle="270" android:endColor="#a15d5d" android:startColor="#b73d3d" />
|
||||
</shape>
|
||||
</item>
|
||||
</selector>
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 9.5 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 89 KiB |
@ -1,24 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<corners android:radius="47dp" />
|
||||
<gradient
|
||||
android:centerColor="#669dd4"
|
||||
android:centerX="50%"
|
||||
android:centerY="50%"
|
||||
android:endColor="#F7F9FF"
|
||||
android:gradientRadius="300"
|
||||
android:startColor="#a07bbc"
|
||||
android:type="radial" />
|
||||
<padding
|
||||
android:bottom="0dp"
|
||||
android:left="0dp"
|
||||
android:right="0dp"
|
||||
android:top="20dp" />
|
||||
<size
|
||||
android:width="200dp"
|
||||
android:height="150dp" />
|
||||
<stroke
|
||||
android:width="10dp"
|
||||
android:color="#b11a1a" />
|
||||
</shape>
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 899 B |
Binary file not shown.
|
Before Width: | Height: | Size: 12 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 17 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 46 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 17 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 154 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 16 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 12 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 923 B |
Binary file not shown.
|
Before Width: | Height: | Size: 1.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.8 KiB |
@ -1,10 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<item android:state_checked="false"
|
||||
android:drawable="@drawable/sound_off" />
|
||||
|
||||
<item android:state_checked="true"
|
||||
android:drawable="@drawable/sound_on" />
|
||||
|
||||
</selector>
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 61 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 80 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 34 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 22 KiB |
@ -1,15 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<corners android:radius="3dp" />
|
||||
<solid
|
||||
android:color="#715f5f"/>
|
||||
<padding
|
||||
android:bottom="2dp"
|
||||
android:left="2dp"
|
||||
android:right="2dp"
|
||||
android:top="2dp" />
|
||||
<stroke
|
||||
android:width="2dp"
|
||||
android:color="#635e5e" />
|
||||
</shape>
|
||||
@ -1,21 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:id="@android:id/background">
|
||||
<shape android:shape="rectangle">
|
||||
<solid android:color="#00fff700" />
|
||||
<corners android:radius="200dp" />
|
||||
</shape>
|
||||
</item>
|
||||
|
||||
<item android:id="@android:id/progress">
|
||||
<clip android:gravity="right">
|
||||
<shape android:shape="rectangle">
|
||||
<gradient
|
||||
android:angle="45"
|
||||
android:endColor="#a06c6c6c"
|
||||
android:startColor="#a0ababab" />
|
||||
<corners android:radius="200dp" />
|
||||
</shape>
|
||||
</clip>
|
||||
</item>
|
||||
</layer-list>
|
||||
@ -1,20 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<corners android:radius="30dp" />
|
||||
<gradient
|
||||
android:centerX="50%"
|
||||
android:centerY="50%"
|
||||
android:endColor="#82f7f9ff"
|
||||
android:startColor="#820077ff"
|
||||
android:angle="45"
|
||||
android:type="linear" />
|
||||
<padding
|
||||
android:bottom="5dp"
|
||||
android:left="10dp"
|
||||
android:right="15dp"
|
||||
android:top="5dp" />
|
||||
<stroke
|
||||
android:width="2dp"
|
||||
android:color="#7826adbc" />
|
||||
</shape>
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 9.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 17 KiB |
@ -1,20 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<corners android:radius="20dp" />
|
||||
<gradient
|
||||
android:centerX="0%"
|
||||
android:centerY="0%"
|
||||
android:endColor="#ff71a5"
|
||||
android:startColor="#d7fd00"
|
||||
android:angle="315"
|
||||
android:type="linear" />
|
||||
<padding
|
||||
android:bottom="10dp"
|
||||
android:left="0dp"
|
||||
android:right="0dp"
|
||||
android:top="10dp" />
|
||||
<stroke
|
||||
android:width="4dp"
|
||||
android:color="#74ff71d0" />
|
||||
</shape>
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user