From 472c36aec7d84575c363a2943f4200d3b95a744a Mon Sep 17 00:00:00 2001 From: = <=> Date: Fri, 4 Aug 2017 17:34:38 +0200 Subject: [PATCH] Introduced scalable obstacles, even though the texture could be polished a bit more --- .../debug/android/support/v7/appcompat/R.java | 24 +- .../assets/debug/levelpacks/Grasslands.xml | 2 +- .../blame/res/debug/multi/values.json | 2557 ++++++++--------- .../blame/res/debug/single/drawable.json | 300 +- .../blame/res/debug/single/layout.json | 4 + .../incremental/mergeDebugAssets/merger.xml | 2 +- .../mergeDebugResources/merger.xml | 4 +- .../res/merged/debug/layout/start_screen.xml | 32 +- .../res/merged/debug/values/values.xml | 5 +- .../intermediates/res/resources-debug.ap_ | Bin 4226589 -> 4254111 bytes app/build/intermediates/symbols/debug/R.txt | 255 +- app/src/main/assets/levelpacks/Grasslands.xml | 2 +- .../assets/shader/obstacleFragmentShader.glsl | 97 + .../frajul/endlessroll/entities/Obstacle.java | 101 + .../main/game/TestScreenScene.java | 37 + .../main/screens/GLTestScreen.java | 34 + .../main/screens/TestScreenRendering.java | 57 + .../rendering/shader/ObstacleShader.java | 71 + app/src/main/res/drawable/obstacles_grass.png | Bin 205988 -> 41279 bytes app/src/main/res/layout/gl_test_screen.xml | 5 + app/src/main/res/layout/start_screen.xml | 32 +- app/src/main/res/values/strings.xml | 3 +- 22 files changed, 2026 insertions(+), 1598 deletions(-) create mode 100644 app/src/main/assets/shader/obstacleFragmentShader.glsl create mode 100644 app/src/main/java/de/frajul/endlessroll/entities/Obstacle.java create mode 100644 app/src/main/java/de/frajul/endlessroll/main/game/TestScreenScene.java create mode 100644 app/src/main/java/de/frajul/endlessroll/main/screens/GLTestScreen.java create mode 100644 app/src/main/java/de/frajul/endlessroll/main/screens/TestScreenRendering.java create mode 100644 app/src/main/java/de/frajul/endlessroll/rendering/shader/ObstacleShader.java create mode 100644 app/src/main/res/layout/gl_test_screen.xml diff --git a/app/build/generated/source/r/debug/android/support/v7/appcompat/R.java b/app/build/generated/source/r/debug/android/support/v7/appcompat/R.java index de42b7b..703956c 100644 --- a/app/build/generated/source/r/debug/android/support/v7/appcompat/R.java +++ b/app/build/generated/source/r/debug/android/support/v7/appcompat/R.java @@ -586,18 +586,18 @@ public final class R { public static final int abc_search_dropdown_item_icons_2line = 0x7f040016; public static final int abc_search_view = 0x7f040017; public static final int abc_select_dialog_material = 0x7f040018; - public static final int notification_media_action = 0x7f04001e; - public static final int notification_media_cancel_action = 0x7f04001f; - public static final int notification_template_big_media = 0x7f040020; - public static final int notification_template_big_media_narrow = 0x7f040021; - public static final int notification_template_lines = 0x7f040022; - public static final int notification_template_media = 0x7f040023; - public static final int notification_template_part_chronometer = 0x7f040024; - public static final int notification_template_part_time = 0x7f040025; - public static final int select_dialog_item_material = 0x7f040028; - public static final int select_dialog_multichoice_material = 0x7f040029; - public static final int select_dialog_singlechoice_material = 0x7f04002a; - public static final int support_simple_spinner_dropdown_item = 0x7f04002d; + public static final int notification_media_action = 0x7f04001f; + public static final int notification_media_cancel_action = 0x7f040020; + public static final int notification_template_big_media = 0x7f040021; + public static final int notification_template_big_media_narrow = 0x7f040022; + public static final int notification_template_lines = 0x7f040023; + public static final int notification_template_media = 0x7f040024; + public static final int notification_template_part_chronometer = 0x7f040025; + public static final int notification_template_part_time = 0x7f040026; + public static final int select_dialog_item_material = 0x7f040029; + public static final int select_dialog_multichoice_material = 0x7f04002a; + public static final int select_dialog_singlechoice_material = 0x7f04002b; + public static final int support_simple_spinner_dropdown_item = 0x7f04002e; } public static final class string { public static final int abc_action_bar_home_description = 0x7f070000; diff --git a/app/build/intermediates/assets/debug/levelpacks/Grasslands.xml b/app/build/intermediates/assets/debug/levelpacks/Grasslands.xml index 4d51c2a..8214a4e 100644 --- a/app/build/intermediates/assets/debug/levelpacks/Grasslands.xml +++ b/app/build/intermediates/assets/debug/levelpacks/Grasslands.xml @@ -177,7 +177,7 @@ - + diff --git a/app/build/intermediates/blame/res/debug/multi/values.json b/app/build/intermediates/blame/res/debug/multi/values.json index fb6ed2c..9325fb1 100644 --- a/app/build/intermediates/blame/res/debug/multi/values.json +++ b/app/build/intermediates/blame/res/debug/multi/values.json @@ -12,15 +12,7 @@ "endOffset": 279 }, "from": { - "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\array.xml", - "position": { - "startLine": 2, - "startColumn": 4, - "startOffset": 57, - "endLine": 8, - "endColumn": 19, - "endOffset": 287 - } + "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\array.xml" } }, { @@ -2511,14 +2503,7 @@ "endOffset": 30087 }, "from": { - "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml", - "position": { - "startLine": 10, - "startColumn": 4, - "startOffset": 495, - "endColumn": 61, - "endOffset": 552 - } + "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" } }, { @@ -2766,8 +2751,8 @@ "startLine": 264, "startColumn": 4, "startOffset": 31211, - "endColumn": 96, - "endOffset": 31303 + "endColumn": 75, + "endOffset": 31282 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -2777,33 +2762,33 @@ "to": { "startLine": 265, "startColumn": 4, - "startOffset": 31308, - "endColumn": 70, - "endOffset": 31374 - }, - "from": { - "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" - } - }, - { - "to": { - "startLine": 266, - "startColumn": 4, - "startOffset": 31379, - "endColumn": 61, - "endOffset": 31436 + "startOffset": 31287, + "endColumn": 96, + "endOffset": 31379 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" } }, + { + "to": { + "startLine": 266, + "startColumn": 4, + "startOffset": 31384, + "endColumn": 70, + "endOffset": 31450 + }, + "from": { + "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" + } + }, { "to": { "startLine": 267, "startColumn": 4, - "startOffset": 31441, - "endColumn": 47, - "endOffset": 31484 + "startOffset": 31455, + "endColumn": 61, + "endOffset": 31512 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -2813,9 +2798,9 @@ "to": { "startLine": 268, "startColumn": 4, - "startOffset": 31489, - "endColumn": 51, - "endOffset": 31536 + "startOffset": 31517, + "endColumn": 47, + "endOffset": 31560 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -2825,9 +2810,9 @@ "to": { "startLine": 269, "startColumn": 4, - "startOffset": 31541, - "endColumn": 47, - "endOffset": 31584 + "startOffset": 31565, + "endColumn": 51, + "endOffset": 31612 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -2837,9 +2822,9 @@ "to": { "startLine": 270, "startColumn": 4, - "startOffset": 31589, - "endColumn": 51, - "endOffset": 31636 + "startOffset": 31617, + "endColumn": 47, + "endOffset": 31660 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -2849,9 +2834,9 @@ "to": { "startLine": 271, "startColumn": 4, - "startOffset": 31641, - "endColumn": 52, - "endOffset": 31689 + "startOffset": 31665, + "endColumn": 51, + "endOffset": 31712 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -2861,9 +2846,9 @@ "to": { "startLine": 272, "startColumn": 4, - "startOffset": 31694, + "startOffset": 31717, "endColumn": 52, - "endOffset": 31742 + "endOffset": 31765 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -2873,9 +2858,9 @@ "to": { "startLine": 273, "startColumn": 4, - "startOffset": 31747, - "endColumn": 50, - "endOffset": 31793 + "startOffset": 31770, + "endColumn": 52, + "endOffset": 31818 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -2885,9 +2870,9 @@ "to": { "startLine": 274, "startColumn": 4, - "startOffset": 31798, - "endColumn": 54, - "endOffset": 31848 + "startOffset": 31823, + "endColumn": 50, + "endOffset": 31869 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -2897,9 +2882,9 @@ "to": { "startLine": 275, "startColumn": 4, - "startOffset": 31853, - "endColumn": 50, - "endOffset": 31899 + "startOffset": 31874, + "endColumn": 54, + "endOffset": 31924 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -2909,9 +2894,9 @@ "to": { "startLine": 276, "startColumn": 4, - "startOffset": 31904, - "endColumn": 70, - "endOffset": 31970 + "startOffset": 31929, + "endColumn": 50, + "endOffset": 31975 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -2921,9 +2906,9 @@ "to": { "startLine": 277, "startColumn": 4, - "startOffset": 31975, + "startOffset": 31980, "endColumn": 70, - "endOffset": 32041 + "endOffset": 32046 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -2933,9 +2918,9 @@ "to": { "startLine": 278, "startColumn": 4, - "startOffset": 32046, - "endColumn": 55, - "endOffset": 32097 + "startOffset": 32051, + "endColumn": 70, + "endOffset": 32117 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -2945,9 +2930,9 @@ "to": { "startLine": 279, "startColumn": 4, - "startOffset": 32102, - "endColumn": 59, - "endOffset": 32157 + "startOffset": 32122, + "endColumn": 55, + "endOffset": 32173 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -2957,9 +2942,9 @@ "to": { "startLine": 280, "startColumn": 4, - "startOffset": 32162, - "endColumn": 62, - "endOffset": 32220 + "startOffset": 32178, + "endColumn": 59, + "endOffset": 32233 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -2969,9 +2954,9 @@ "to": { "startLine": 281, "startColumn": 4, - "startOffset": 32225, - "endColumn": 46, - "endOffset": 32267 + "startOffset": 32238, + "endColumn": 62, + "endOffset": 32296 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -2981,9 +2966,9 @@ "to": { "startLine": 282, "startColumn": 4, - "startOffset": 32272, - "endColumn": 52, - "endOffset": 32320 + "startOffset": 32301, + "endColumn": 46, + "endOffset": 32343 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -2993,9 +2978,9 @@ "to": { "startLine": 283, "startColumn": 4, - "startOffset": 32325, - "endColumn": 88, - "endOffset": 32409 + "startOffset": 32348, + "endColumn": 52, + "endOffset": 32396 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -3005,9 +2990,9 @@ "to": { "startLine": 284, "startColumn": 4, - "startOffset": 32414, - "endColumn": 100, - "endOffset": 32510 + "startOffset": 32401, + "endColumn": 88, + "endOffset": 32485 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -3017,9 +3002,9 @@ "to": { "startLine": 285, "startColumn": 4, - "startOffset": 32515, - "endColumn": 68, - "endOffset": 32579 + "startOffset": 32490, + "endColumn": 100, + "endOffset": 32586 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -3029,9 +3014,9 @@ "to": { "startLine": 286, "startColumn": 4, - "startOffset": 32584, - "endColumn": 92, - "endOffset": 32672 + "startOffset": 32591, + "endColumn": 68, + "endOffset": 32655 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -3041,9 +3026,9 @@ "to": { "startLine": 287, "startColumn": 4, - "startOffset": 32677, - "endColumn": 95, - "endOffset": 32768 + "startOffset": 32660, + "endColumn": 92, + "endOffset": 32748 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -3053,9 +3038,9 @@ "to": { "startLine": 288, "startColumn": 4, - "startOffset": 32773, - "endColumn": 128, - "endOffset": 32897 + "startOffset": 32753, + "endColumn": 95, + "endOffset": 32844 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -3065,9 +3050,9 @@ "to": { "startLine": 289, "startColumn": 4, - "startOffset": 32902, - "endColumn": 136, - "endOffset": 33034 + "startOffset": 32849, + "endColumn": 128, + "endOffset": 32973 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -3077,9 +3062,9 @@ "to": { "startLine": 290, "startColumn": 4, - "startOffset": 33039, - "endColumn": 141, - "endOffset": 33176 + "startOffset": 32978, + "endColumn": 136, + "endOffset": 33110 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -3089,9 +3074,9 @@ "to": { "startLine": 291, "startColumn": 4, - "startOffset": 33181, - "endColumn": 121, - "endOffset": 33298 + "startOffset": 33115, + "endColumn": 141, + "endOffset": 33252 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -3101,9 +3086,9 @@ "to": { "startLine": 292, "startColumn": 4, - "startOffset": 33303, - "endColumn": 119, - "endOffset": 33418 + "startOffset": 33257, + "endColumn": 121, + "endOffset": 33374 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -3113,9 +3098,9 @@ "to": { "startLine": 293, "startColumn": 4, - "startOffset": 33423, - "endColumn": 239, - "endOffset": 33658 + "startOffset": 33379, + "endColumn": 119, + "endOffset": 33494 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -3125,9 +3110,9 @@ "to": { "startLine": 294, "startColumn": 4, - "startOffset": 33663, - "endColumn": 103, - "endOffset": 33762 + "startOffset": 33499, + "endColumn": 239, + "endOffset": 33734 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -3137,9 +3122,9 @@ "to": { "startLine": 295, "startColumn": 4, - "startOffset": 33767, - "endColumn": 97, - "endOffset": 33860 + "startOffset": 33739, + "endColumn": 103, + "endOffset": 33838 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -3149,9 +3134,9 @@ "to": { "startLine": 296, "startColumn": 4, - "startOffset": 33865, - "endColumn": 82, - "endOffset": 33943 + "startOffset": 33843, + "endColumn": 97, + "endOffset": 33936 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -3161,9 +3146,9 @@ "to": { "startLine": 297, "startColumn": 4, - "startOffset": 33948, - "endColumn": 154, - "endOffset": 34098 + "startOffset": 33941, + "endColumn": 82, + "endOffset": 34019 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -3173,9 +3158,9 @@ "to": { "startLine": 298, "startColumn": 4, - "startOffset": 34103, - "endColumn": 80, - "endOffset": 34179 + "startOffset": 34024, + "endColumn": 154, + "endOffset": 34174 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -3185,9 +3170,9 @@ "to": { "startLine": 299, "startColumn": 4, - "startOffset": 34184, - "endColumn": 68, - "endOffset": 34248 + "startOffset": 34179, + "endColumn": 80, + "endOffset": 34255 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -3197,9 +3182,9 @@ "to": { "startLine": 300, "startColumn": 4, - "startOffset": 34253, - "endColumn": 67, - "endOffset": 34316 + "startOffset": 34260, + "endColumn": 68, + "endOffset": 34324 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -3209,9 +3194,9 @@ "to": { "startLine": 301, "startColumn": 4, - "startOffset": 34321, - "endColumn": 70, - "endOffset": 34387 + "startOffset": 34329, + "endColumn": 67, + "endOffset": 34392 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -3221,21 +3206,21 @@ "to": { "startLine": 302, "startColumn": 4, - "startOffset": 34392, - "endColumn": 77, - "endOffset": 34465 + "startOffset": 34397, + "endColumn": 70, + "endOffset": 34463 }, "from": { - "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" + "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" } }, { "to": { "startLine": 303, "startColumn": 4, - "startOffset": 34470, - "endColumn": 89, - "endOffset": 34555 + "startOffset": 34468, + "endColumn": 77, + "endOffset": 34541 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3245,9 +3230,9 @@ "to": { "startLine": 304, "startColumn": 4, - "startOffset": 34560, - "endColumn": 87, - "endOffset": 34643 + "startOffset": 34546, + "endColumn": 89, + "endOffset": 34631 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3257,9 +3242,9 @@ "to": { "startLine": 305, "startColumn": 4, - "startOffset": 34648, - "endColumn": 95, - "endOffset": 34739 + "startOffset": 34636, + "endColumn": 87, + "endOffset": 34719 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3269,23 +3254,9 @@ "to": { "startLine": 306, "startColumn": 4, - "startOffset": 34744, - "endLine": 309, - "endColumn": 12, - "endOffset": 34943 - }, - "from": { - "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\styles.xml" - } - }, - { - "to": { - "startLine": 310, - "startColumn": 4, - "startOffset": 34948, - "endLine": 316, - "endColumn": 12, - "endOffset": 35444 + "startOffset": 34724, + "endColumn": 95, + "endOffset": 34815 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3293,11 +3264,25 @@ }, { "to": { - "startLine": 317, + "startLine": 307, "startColumn": 4, - "startOffset": 35449, - "endColumn": 88, - "endOffset": 35533 + "startOffset": 34820, + "endLine": 310, + "endColumn": 12, + "endOffset": 35019 + }, + "from": { + "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\styles.xml" + } + }, + { + "to": { + "startLine": 311, + "startColumn": 4, + "startOffset": 35024, + "endLine": 317, + "endColumn": 12, + "endOffset": 35520 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3307,10 +3292,9 @@ "to": { "startLine": 318, "startColumn": 4, - "startOffset": 35538, - "endLine": 321, - "endColumn": 12, - "endOffset": 35780 + "startOffset": 35525, + "endColumn": 88, + "endOffset": 35609 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3318,12 +3302,12 @@ }, { "to": { - "startLine": 322, + "startLine": 319, "startColumn": 4, - "startOffset": 35785, - "endLine": 325, + "startOffset": 35614, + "endLine": 322, "endColumn": 12, - "endOffset": 36061 + "endOffset": 35856 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3331,12 +3315,12 @@ }, { "to": { - "startLine": 326, + "startLine": 323, "startColumn": 4, - "startOffset": 36066, - "endLine": 330, + "startOffset": 35861, + "endLine": 326, "endColumn": 12, - "endOffset": 36346 + "endOffset": 36137 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3344,12 +3328,12 @@ }, { "to": { - "startLine": 331, + "startLine": 327, "startColumn": 4, - "startOffset": 36351, - "endLine": 336, + "startOffset": 36142, + "endLine": 331, "endColumn": 12, - "endOffset": 36739 + "endOffset": 36422 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3357,12 +3341,12 @@ }, { "to": { - "startLine": 337, + "startLine": 332, "startColumn": 4, - "startOffset": 36744, - "endLine": 343, + "startOffset": 36427, + "endLine": 337, "endColumn": 12, - "endOffset": 37216 + "endOffset": 36815 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3370,12 +3354,12 @@ }, { "to": { - "startLine": 344, + "startLine": 338, "startColumn": 4, - "startOffset": 37221, - "endLine": 347, + "startOffset": 36820, + "endLine": 344, "endColumn": 12, - "endOffset": 37438 + "endOffset": 37292 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3383,12 +3367,12 @@ }, { "to": { - "startLine": 348, + "startLine": 345, "startColumn": 4, - "startOffset": 37443, - "endLine": 351, + "startOffset": 37297, + "endLine": 348, "endColumn": 12, - "endOffset": 37660 + "endOffset": 37514 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3396,12 +3380,12 @@ }, { "to": { - "startLine": 352, + "startLine": 349, "startColumn": 4, - "startOffset": 37665, - "endLine": 356, + "startOffset": 37519, + "endLine": 352, "endColumn": 12, - "endOffset": 37928 + "endOffset": 37736 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3409,12 +3393,12 @@ }, { "to": { - "startLine": 357, + "startLine": 353, "startColumn": 4, - "startOffset": 37933, - "endLine": 360, + "startOffset": 37741, + "endLine": 357, "endColumn": 12, - "endOffset": 38155 + "endOffset": 38004 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3422,12 +3406,12 @@ }, { "to": { - "startLine": 361, + "startLine": 358, "startColumn": 4, - "startOffset": 38160, - "endLine": 364, + "startOffset": 38009, + "endLine": 361, "endColumn": 12, - "endOffset": 38385 + "endOffset": 38231 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3435,12 +3419,12 @@ }, { "to": { - "startLine": 365, + "startLine": 362, "startColumn": 4, - "startOffset": 38390, - "endLine": 368, + "startOffset": 38236, + "endLine": 365, "endColumn": 12, - "endOffset": 38615 + "endOffset": 38461 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3448,12 +3432,12 @@ }, { "to": { - "startLine": 369, + "startLine": 366, "startColumn": 4, - "startOffset": 38620, - "endLine": 372, + "startOffset": 38466, + "endLine": 369, "endColumn": 12, - "endOffset": 38845 + "endOffset": 38691 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3461,12 +3445,12 @@ }, { "to": { - "startLine": 373, + "startLine": 370, "startColumn": 4, - "startOffset": 38850, - "endLine": 376, + "startOffset": 38696, + "endLine": 373, "endColumn": 12, - "endOffset": 39075 + "endOffset": 38921 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3474,12 +3458,12 @@ }, { "to": { - "startLine": 377, + "startLine": 374, "startColumn": 4, - "startOffset": 39080, - "endLine": 380, + "startOffset": 38926, + "endLine": 377, "endColumn": 12, - "endOffset": 39302 + "endOffset": 39151 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3487,12 +3471,12 @@ }, { "to": { - "startLine": 381, + "startLine": 378, "startColumn": 4, - "startOffset": 39307, - "endLine": 384, + "startOffset": 39156, + "endLine": 381, "endColumn": 12, - "endOffset": 39541 + "endOffset": 39378 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3500,12 +3484,12 @@ }, { "to": { - "startLine": 385, + "startLine": 382, "startColumn": 4, - "startOffset": 39546, - "endLine": 388, + "startOffset": 39383, + "endLine": 385, "endColumn": 12, - "endOffset": 39767 + "endOffset": 39617 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3513,12 +3497,12 @@ }, { "to": { - "startLine": 389, + "startLine": 386, "startColumn": 4, - "startOffset": 39772, - "endLine": 392, + "startOffset": 39622, + "endLine": 389, "endColumn": 12, - "endOffset": 40012 + "endOffset": 39843 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3526,12 +3510,12 @@ }, { "to": { - "startLine": 393, + "startLine": 390, "startColumn": 4, - "startOffset": 40017, - "endLine": 394, + "startOffset": 39848, + "endLine": 393, "endColumn": 12, - "endOffset": 40142 + "endOffset": 40088 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3539,12 +3523,12 @@ }, { "to": { - "startLine": 395, + "startLine": 394, "startColumn": 4, - "startOffset": 40147, - "endLine": 396, + "startOffset": 40093, + "endLine": 395, "endColumn": 12, - "endOffset": 40272 + "endOffset": 40218 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3552,12 +3536,12 @@ }, { "to": { - "startLine": 397, + "startLine": 396, "startColumn": 4, - "startOffset": 40277, - "endLine": 400, + "startOffset": 40223, + "endLine": 397, "endColumn": 12, - "endOffset": 40502 + "endOffset": 40348 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3565,12 +3549,12 @@ }, { "to": { - "startLine": 401, + "startLine": 398, "startColumn": 4, - "startOffset": 40507, - "endLine": 404, + "startOffset": 40353, + "endLine": 401, "endColumn": 12, - "endOffset": 40750 + "endOffset": 40578 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3578,12 +3562,12 @@ }, { "to": { - "startLine": 405, + "startLine": 402, "startColumn": 4, - "startOffset": 40755, - "endLine": 408, + "startOffset": 40583, + "endLine": 405, "endColumn": 12, - "endOffset": 40969 + "endOffset": 40826 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3591,12 +3575,12 @@ }, { "to": { - "startLine": 409, + "startLine": 406, "startColumn": 4, - "startOffset": 40974, - "endLine": 413, + "startOffset": 40831, + "endLine": 409, "endColumn": 12, - "endOffset": 41252 + "endOffset": 41045 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3604,12 +3588,12 @@ }, { "to": { - "startLine": 414, + "startLine": 410, "startColumn": 4, - "startOffset": 41257, - "endLine": 417, + "startOffset": 41050, + "endLine": 414, "endColumn": 12, - "endOffset": 41460 + "endOffset": 41328 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3617,12 +3601,12 @@ }, { "to": { - "startLine": 418, + "startLine": 415, "startColumn": 4, - "startOffset": 41465, - "endLine": 420, + "startOffset": 41333, + "endLine": 418, "endColumn": 12, - "endOffset": 41591 + "endOffset": 41536 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3630,12 +3614,12 @@ }, { "to": { - "startLine": 421, + "startLine": 419, "startColumn": 4, - "startOffset": 41596, - "endLine": 424, + "startOffset": 41541, + "endLine": 421, "endColumn": 12, - "endOffset": 41818 + "endOffset": 41667 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3643,12 +3627,12 @@ }, { "to": { - "startLine": 425, + "startLine": 422, "startColumn": 4, - "startOffset": 41823, - "endLine": 428, + "startOffset": 41672, + "endLine": 425, "endColumn": 12, - "endOffset": 42064 + "endOffset": 41894 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3656,12 +3640,12 @@ }, { "to": { - "startLine": 429, + "startLine": 426, "startColumn": 4, - "startOffset": 42069, - "endLine": 432, + "startOffset": 41899, + "endLine": 429, "endColumn": 12, - "endOffset": 42289 + "endOffset": 42140 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3669,12 +3653,12 @@ }, { "to": { - "startLine": 433, + "startLine": 430, "startColumn": 4, - "startOffset": 42294, - "endLine": 436, + "startOffset": 42145, + "endLine": 433, "endColumn": 12, - "endOffset": 42536 + "endOffset": 42365 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3682,12 +3666,12 @@ }, { "to": { - "startLine": 437, + "startLine": 434, "startColumn": 4, - "startOffset": 42541, - "endLine": 440, + "startOffset": 42370, + "endLine": 437, "endColumn": 12, - "endOffset": 42757 + "endOffset": 42612 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3695,12 +3679,12 @@ }, { "to": { - "startLine": 441, + "startLine": 438, "startColumn": 4, - "startOffset": 42762, - "endLine": 444, + "startOffset": 42617, + "endLine": 441, "endColumn": 12, - "endOffset": 43002 + "endOffset": 42833 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3708,12 +3692,12 @@ }, { "to": { - "startLine": 445, + "startLine": 442, "startColumn": 4, - "startOffset": 43007, - "endLine": 448, + "startOffset": 42838, + "endLine": 445, "endColumn": 12, - "endOffset": 43276 + "endOffset": 43078 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3721,12 +3705,12 @@ }, { "to": { - "startLine": 449, + "startLine": 446, "startColumn": 4, - "startOffset": 43281, - "endLine": 452, + "startOffset": 43083, + "endLine": 449, "endColumn": 12, - "endOffset": 43577 + "endOffset": 43352 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3734,12 +3718,12 @@ }, { "to": { - "startLine": 453, + "startLine": 450, "startColumn": 4, - "startOffset": 43582, - "endLine": 456, + "startOffset": 43357, + "endLine": 453, "endColumn": 12, - "endOffset": 43901 + "endOffset": 43653 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3747,12 +3731,12 @@ }, { "to": { - "startLine": 457, + "startLine": 454, "startColumn": 4, - "startOffset": 43906, - "endLine": 460, + "startOffset": 43658, + "endLine": 457, "endColumn": 12, - "endOffset": 44192 + "endOffset": 43977 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3760,12 +3744,12 @@ }, { "to": { - "startLine": 461, + "startLine": 458, "startColumn": 4, - "startOffset": 44197, - "endLine": 464, + "startOffset": 43982, + "endLine": 461, "endColumn": 12, - "endOffset": 44506 + "endOffset": 44268 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3773,11 +3757,12 @@ }, { "to": { - "startLine": 465, + "startLine": 462, "startColumn": 4, - "startOffset": 44511, - "endColumn": 136, - "endOffset": 44643 + "startOffset": 44273, + "endLine": 465, + "endColumn": 12, + "endOffset": 44582 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3787,9 +3772,9 @@ "to": { "startLine": 466, "startColumn": 4, - "startOffset": 44648, - "endColumn": 130, - "endOffset": 44774 + "startOffset": 44587, + "endColumn": 136, + "endOffset": 44719 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3799,9 +3784,9 @@ "to": { "startLine": 467, "startColumn": 4, - "startOffset": 44779, - "endColumn": 104, - "endOffset": 44879 + "startOffset": 44724, + "endColumn": 130, + "endOffset": 44850 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3811,61 +3796,61 @@ "to": { "startLine": 468, "startColumn": 4, - "startOffset": 44884, - "endLine": 470, - "endColumn": 12, - "endOffset": 45083 - }, - "from": { - "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" - } - }, - { - "to": { - "startLine": 471, - "startColumn": 4, - "startOffset": 45088, - "endLine": 473, - "endColumn": 12, - "endOffset": 45291 - }, - "from": { - "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" - } - }, - { - "to": { - "startLine": 474, - "startColumn": 4, - "startOffset": 45296, - "endLine": 475, - "endColumn": 12, - "endOffset": 45415 - }, - "from": { - "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" - } - }, - { - "to": { - "startLine": 476, - "startColumn": 4, - "startOffset": 45420, - "endLine": 477, - "endColumn": 12, - "endOffset": 45539 - }, - "from": { - "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" - } - }, - { - "to": { - "startLine": 478, - "startColumn": 4, - "startOffset": 45544, + "startOffset": 44855, "endColumn": 104, - "endOffset": 45644 + "endOffset": 44955 + }, + "from": { + "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" + } + }, + { + "to": { + "startLine": 469, + "startColumn": 4, + "startOffset": 44960, + "endLine": 471, + "endColumn": 12, + "endOffset": 45159 + }, + "from": { + "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" + } + }, + { + "to": { + "startLine": 472, + "startColumn": 4, + "startOffset": 45164, + "endLine": 474, + "endColumn": 12, + "endOffset": 45367 + }, + "from": { + "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" + } + }, + { + "to": { + "startLine": 475, + "startColumn": 4, + "startOffset": 45372, + "endLine": 476, + "endColumn": 12, + "endOffset": 45491 + }, + "from": { + "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" + } + }, + { + "to": { + "startLine": 477, + "startColumn": 4, + "startOffset": 45496, + "endLine": 478, + "endColumn": 12, + "endOffset": 45615 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3875,9 +3860,9 @@ "to": { "startLine": 479, "startColumn": 4, - "startOffset": 45649, - "endColumn": 116, - "endOffset": 45761 + "startOffset": 45620, + "endColumn": 104, + "endOffset": 45720 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3887,10 +3872,9 @@ "to": { "startLine": 480, "startColumn": 4, - "startOffset": 45766, - "endLine": 482, - "endColumn": 12, - "endOffset": 45975 + "startOffset": 45725, + "endColumn": 116, + "endOffset": 45837 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3898,12 +3882,12 @@ }, { "to": { - "startLine": 483, + "startLine": 481, "startColumn": 4, - "startOffset": 45980, - "endLine": 484, + "startOffset": 45842, + "endLine": 483, "endColumn": 12, - "endOffset": 46121 + "endOffset": 46051 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3911,12 +3895,12 @@ }, { "to": { - "startLine": 485, + "startLine": 484, "startColumn": 4, - "startOffset": 46126, - "endLine": 486, + "startOffset": 46056, + "endLine": 485, "endColumn": 12, - "endOffset": 46261 + "endOffset": 46197 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3924,12 +3908,12 @@ }, { "to": { - "startLine": 487, + "startLine": 486, "startColumn": 4, - "startOffset": 46266, - "endLine": 488, + "startOffset": 46202, + "endLine": 487, "endColumn": 12, - "endOffset": 46347 + "endOffset": 46337 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3937,12 +3921,12 @@ }, { "to": { - "startLine": 489, + "startLine": 488, "startColumn": 4, - "startOffset": 46352, - "endLine": 493, + "startOffset": 46342, + "endLine": 489, "endColumn": 12, - "endOffset": 46695 + "endOffset": 46423 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3950,11 +3934,12 @@ }, { "to": { - "startLine": 494, + "startLine": 490, "startColumn": 4, - "startOffset": 46700, - "endColumn": 87, - "endOffset": 46783 + "startOffset": 46428, + "endLine": 494, + "endColumn": 12, + "endOffset": 46771 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3964,10 +3949,9 @@ "to": { "startLine": 495, "startColumn": 4, - "startOffset": 46788, - "endLine": 498, - "endColumn": 12, - "endOffset": 47013 + "startOffset": 46776, + "endColumn": 87, + "endOffset": 46859 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3975,12 +3959,12 @@ }, { "to": { - "startLine": 499, + "startLine": 496, "startColumn": 4, - "startOffset": 47018, - "endLine": 504, + "startOffset": 46864, + "endLine": 499, "endColumn": 12, - "endOffset": 47431 + "endOffset": 47089 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3988,12 +3972,12 @@ }, { "to": { - "startLine": 505, + "startLine": 500, "startColumn": 4, - "startOffset": 47436, - "endLine": 508, + "startOffset": 47094, + "endLine": 505, "endColumn": 12, - "endOffset": 47664 + "endOffset": 47507 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4001,11 +3985,12 @@ }, { "to": { - "startLine": 509, + "startLine": 506, "startColumn": 4, - "startOffset": 47669, - "endColumn": 81, - "endOffset": 47746 + "startOffset": 47512, + "endLine": 509, + "endColumn": 12, + "endOffset": 47740 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4015,10 +4000,9 @@ "to": { "startLine": 510, "startColumn": 4, - "startOffset": 47751, - "endLine": 511, - "endColumn": 12, - "endOffset": 47844 + "startOffset": 47745, + "endColumn": 81, + "endOffset": 47822 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4026,12 +4010,12 @@ }, { "to": { - "startLine": 512, + "startLine": 511, "startColumn": 4, - "startOffset": 47849, - "endLine": 522, + "startOffset": 47827, + "endLine": 512, "endColumn": 12, - "endOffset": 48436 + "endOffset": 47920 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4039,11 +4023,12 @@ }, { "to": { - "startLine": 523, + "startLine": 513, "startColumn": 4, - "startOffset": 48441, - "endColumn": 99, - "endOffset": 48536 + "startOffset": 47925, + "endLine": 523, + "endColumn": 12, + "endOffset": 48512 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4053,10 +4038,9 @@ "to": { "startLine": 524, "startColumn": 4, - "startOffset": 48541, - "endLine": 527, - "endColumn": 12, - "endOffset": 48772 + "startOffset": 48517, + "endColumn": 99, + "endOffset": 48612 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4064,12 +4048,12 @@ }, { "to": { - "startLine": 528, + "startLine": 525, "startColumn": 4, - "startOffset": 48777, - "endLine": 533, + "startOffset": 48617, + "endLine": 528, "endColumn": 12, - "endOffset": 49196 + "endOffset": 48848 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4077,12 +4061,12 @@ }, { "to": { - "startLine": 534, + "startLine": 529, "startColumn": 4, - "startOffset": 49201, - "endLine": 537, + "startOffset": 48853, + "endLine": 534, "endColumn": 12, - "endOffset": 49435 + "endOffset": 49272 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4090,11 +4074,12 @@ }, { "to": { - "startLine": 538, + "startLine": 535, "startColumn": 4, - "startOffset": 49440, - "endColumn": 93, - "endOffset": 49529 + "startOffset": 49277, + "endLine": 538, + "endColumn": 12, + "endOffset": 49511 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4104,9 +4089,9 @@ "to": { "startLine": 539, "startColumn": 4, - "startOffset": 49534, - "endColumn": 88, - "endOffset": 49618 + "startOffset": 49516, + "endColumn": 93, + "endOffset": 49605 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4116,10 +4101,9 @@ "to": { "startLine": 540, "startColumn": 4, - "startOffset": 49623, - "endLine": 543, - "endColumn": 12, - "endOffset": 49855 + "startOffset": 49610, + "endColumn": 88, + "endOffset": 49694 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4127,12 +4111,12 @@ }, { "to": { - "startLine": 544, + "startLine": 541, "startColumn": 4, - "startOffset": 49860, - "endLine": 569, + "startOffset": 49699, + "endLine": 544, "endColumn": 12, - "endOffset": 51778 + "endOffset": 49931 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4140,12 +4124,12 @@ }, { "to": { - "startLine": 570, + "startLine": 545, "startColumn": 4, - "startOffset": 51783, - "endLine": 573, + "startOffset": 49936, + "endLine": 570, "endColumn": 12, - "endOffset": 52020 + "endOffset": 51854 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4153,12 +4137,12 @@ }, { "to": { - "startLine": 574, + "startLine": 571, "startColumn": 4, - "startOffset": 52025, - "endLine": 600, + "startOffset": 51859, + "endLine": 574, "endColumn": 12, - "endOffset": 54074 + "endOffset": 52096 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4166,12 +4150,12 @@ }, { "to": { - "startLine": 601, + "startLine": 575, "startColumn": 4, - "startOffset": 54079, - "endLine": 752, + "startOffset": 52101, + "endLine": 601, "endColumn": 12, - "endOffset": 63191 + "endOffset": 54150 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4179,12 +4163,12 @@ }, { "to": { - "startLine": 753, + "startLine": 602, "startColumn": 4, - "startOffset": 63196, - "endLine": 774, + "startOffset": 54155, + "endLine": 753, "endColumn": 12, - "endOffset": 64458 + "endOffset": 63267 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4192,12 +4176,12 @@ }, { "to": { - "startLine": 775, + "startLine": 754, "startColumn": 4, - "startOffset": 64463, - "endLine": 926, + "startOffset": 63272, + "endLine": 775, "endColumn": 12, - "endOffset": 73685 + "endOffset": 64534 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4205,12 +4189,12 @@ }, { "to": { - "startLine": 927, + "startLine": 776, "startColumn": 4, - "startOffset": 73690, - "endLine": 948, + "startOffset": 64539, + "endLine": 927, "endColumn": 12, - "endOffset": 74966 + "endOffset": 73761 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4218,12 +4202,12 @@ }, { "to": { - "startLine": 949, + "startLine": 928, "startColumn": 4, - "startOffset": 74971, - "endLine": 955, + "startOffset": 73766, + "endLine": 949, "endColumn": 12, - "endOffset": 75502 + "endOffset": 75042 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4231,12 +4215,12 @@ }, { "to": { - "startLine": 956, + "startLine": 950, "startColumn": 4, - "startOffset": 75507, - "endLine": 960, + "startOffset": 75047, + "endLine": 956, "endColumn": 12, - "endOffset": 75832 + "endOffset": 75578 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4244,12 +4228,12 @@ }, { "to": { - "startLine": 961, + "startLine": 957, "startColumn": 4, - "startOffset": 75837, - "endLine": 981, + "startOffset": 75583, + "endLine": 961, "endColumn": 12, - "endOffset": 76955 + "endOffset": 75908 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4257,12 +4241,12 @@ }, { "to": { - "startLine": 982, + "startLine": 962, "startColumn": 4, - "startOffset": 76960, - "endLine": 986, + "startOffset": 75913, + "endLine": 982, "endColumn": 12, - "endOffset": 77211 + "endOffset": 77031 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4270,12 +4254,12 @@ }, { "to": { - "startLine": 987, + "startLine": 983, "startColumn": 4, - "startOffset": 77216, - "endLine": 991, + "startOffset": 77036, + "endLine": 987, "endColumn": 12, - "endOffset": 77447 + "endOffset": 77287 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4283,12 +4267,12 @@ }, { "to": { - "startLine": 992, + "startLine": 988, "startColumn": 4, - "startOffset": 77452, - "endLine": 1001, + "startOffset": 77292, + "endLine": 992, "endColumn": 12, - "endOffset": 77994 + "endOffset": 77523 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4296,12 +4280,12 @@ }, { "to": { - "startLine": 1002, + "startLine": 993, "startColumn": 4, - "startOffset": 77999, - "endLine": 1010, + "startOffset": 77528, + "endLine": 1002, "endColumn": 12, - "endOffset": 78488 + "endOffset": 78070 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4309,12 +4293,12 @@ }, { "to": { - "startLine": 1011, + "startLine": 1003, "startColumn": 4, - "startOffset": 78493, - "endLine": 1019, + "startOffset": 78075, + "endLine": 1011, "endColumn": 12, - "endOffset": 79093 + "endOffset": 78564 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4322,12 +4306,12 @@ }, { "to": { - "startLine": 1020, + "startLine": 1012, "startColumn": 4, - "startOffset": 79098, - "endLine": 1022, + "startOffset": 78569, + "endLine": 1020, "endColumn": 12, - "endOffset": 79241 + "endOffset": 79169 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4335,12 +4319,12 @@ }, { "to": { - "startLine": 1023, + "startLine": 1021, "startColumn": 4, - "startOffset": 79246, - "endLine": 1029, + "startOffset": 79174, + "endLine": 1023, "endColumn": 12, - "endOffset": 79829 + "endOffset": 79317 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4348,12 +4332,12 @@ }, { "to": { - "startLine": 1030, + "startLine": 1024, "startColumn": 4, - "startOffset": 79834, - "endLine": 1037, + "startOffset": 79322, + "endLine": 1030, "endColumn": 12, - "endOffset": 80393 + "endOffset": 79905 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4361,12 +4345,12 @@ }, { "to": { - "startLine": 1038, + "startLine": 1031, "startColumn": 4, - "startOffset": 80398, - "endLine": 1044, + "startOffset": 79910, + "endLine": 1038, "endColumn": 12, - "endOffset": 80768 + "endOffset": 80469 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4374,11 +4358,12 @@ }, { "to": { - "startLine": 1045, + "startLine": 1039, "startColumn": 4, - "startOffset": 80773, - "endColumn": 117, - "endOffset": 80886 + "startOffset": 80474, + "endLine": 1045, + "endColumn": 12, + "endOffset": 80844 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4388,10 +4373,9 @@ "to": { "startLine": 1046, "startColumn": 4, - "startOffset": 80891, - "endLine": 1054, - "endColumn": 12, - "endOffset": 81424 + "startOffset": 80849, + "endColumn": 117, + "endOffset": 80962 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4399,12 +4383,12 @@ }, { "to": { - "startLine": 1055, + "startLine": 1047, "startColumn": 4, - "startOffset": 81429, - "endLine": 1057, + "startOffset": 80967, + "endLine": 1055, "endColumn": 12, - "endOffset": 81581 + "endOffset": 81500 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4412,12 +4396,12 @@ }, { "to": { - "startLine": 1058, + "startLine": 1056, "startColumn": 4, - "startOffset": 81586, - "endLine": 1060, + "startOffset": 81505, + "endLine": 1058, "endColumn": 12, - "endOffset": 81725 + "endOffset": 81657 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4425,12 +4409,12 @@ }, { "to": { - "startLine": 1061, + "startLine": 1059, "startColumn": 4, - "startOffset": 81730, - "endLine": 1065, + "startOffset": 81662, + "endLine": 1061, "endColumn": 12, - "endOffset": 82045 + "endOffset": 81801 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4438,12 +4422,12 @@ }, { "to": { - "startLine": 1066, + "startLine": 1062, "startColumn": 4, - "startOffset": 82050, - "endLine": 1069, + "startOffset": 81806, + "endLine": 1066, "endColumn": 12, - "endOffset": 82301 + "endOffset": 82121 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4451,12 +4435,12 @@ }, { "to": { - "startLine": 1070, + "startLine": 1067, "startColumn": 4, - "startOffset": 82306, - "endLine": 1073, + "startOffset": 82126, + "endLine": 1070, "endColumn": 12, - "endOffset": 82471 + "endOffset": 82377 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4464,12 +4448,12 @@ }, { "to": { - "startLine": 1074, + "startLine": 1071, "startColumn": 4, - "startOffset": 82476, - "endLine": 1076, + "startOffset": 82382, + "endLine": 1074, "endColumn": 12, - "endOffset": 82612 + "endOffset": 82547 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4477,11 +4461,12 @@ }, { "to": { - "startLine": 1077, + "startLine": 1075, "startColumn": 4, - "startOffset": 82617, - "endColumn": 63, - "endOffset": 82676 + "startOffset": 82552, + "endLine": 1077, + "endColumn": 12, + "endOffset": 82688 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4491,10 +4476,9 @@ "to": { "startLine": 1078, "startColumn": 4, - "startOffset": 82681, - "endLine": 1081, - "endColumn": 12, - "endOffset": 82958 + "startOffset": 82693, + "endColumn": 63, + "endOffset": 82752 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4502,12 +4486,12 @@ }, { "to": { - "startLine": 1082, + "startLine": 1079, "startColumn": 4, - "startOffset": 82963, - "endLine": 1085, + "startOffset": 82757, + "endLine": 1082, "endColumn": 12, - "endOffset": 83244 + "endOffset": 83034 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4515,12 +4499,12 @@ }, { "to": { - "startLine": 1086, + "startLine": 1083, "startColumn": 4, - "startOffset": 83249, - "endLine": 1095, + "startOffset": 83039, + "endLine": 1086, "endColumn": 12, - "endOffset": 83920 + "endOffset": 83320 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4528,12 +4512,12 @@ }, { "to": { - "startLine": 1096, + "startLine": 1087, "startColumn": 4, - "startOffset": 83925, - "endLine": 1100, + "startOffset": 83325, + "endLine": 1096, "endColumn": 12, - "endOffset": 84184 + "endOffset": 83996 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4541,12 +4525,12 @@ }, { "to": { - "startLine": 1101, + "startLine": 1097, "startColumn": 4, - "startOffset": 84189, - "endLine": 1107, + "startOffset": 84001, + "endLine": 1101, "endColumn": 12, - "endOffset": 84522 + "endOffset": 84260 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4554,12 +4538,12 @@ }, { "to": { - "startLine": 1108, + "startLine": 1102, "startColumn": 4, - "startOffset": 84527, - "endLine": 1113, + "startOffset": 84265, + "endLine": 1108, "endColumn": 12, - "endOffset": 84875 + "endOffset": 84598 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4567,11 +4551,12 @@ }, { "to": { - "startLine": 1114, + "startLine": 1109, "startColumn": 4, - "startOffset": 84880, - "endColumn": 93, - "endOffset": 84969 + "startOffset": 84603, + "endLine": 1114, + "endColumn": 12, + "endOffset": 84951 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4581,10 +4566,9 @@ "to": { "startLine": 1115, "startColumn": 4, - "startOffset": 84974, - "endLine": 1117, - "endColumn": 12, - "endOffset": 85155 + "startOffset": 84956, + "endColumn": 93, + "endOffset": 85045 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4592,12 +4576,12 @@ }, { "to": { - "startLine": 1118, + "startLine": 1116, "startColumn": 4, - "startOffset": 85160, - "endLine": 1121, + "startOffset": 85050, + "endLine": 1118, "endColumn": 12, - "endOffset": 85461 + "endOffset": 85231 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4605,12 +4589,12 @@ }, { "to": { - "startLine": 1122, + "startLine": 1119, "startColumn": 4, - "startOffset": 85466, - "endLine": 1126, + "startOffset": 85236, + "endLine": 1122, "endColumn": 12, - "endOffset": 85723 + "endOffset": 85537 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4618,12 +4602,12 @@ }, { "to": { - "startLine": 1127, + "startLine": 1123, "startColumn": 4, - "startOffset": 85728, - "endLine": 1128, + "startOffset": 85542, + "endLine": 1127, "endColumn": 12, - "endOffset": 85848 + "endOffset": 85799 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4631,12 +4615,12 @@ }, { "to": { - "startLine": 1129, + "startLine": 1128, "startColumn": 4, - "startOffset": 85853, - "endLine": 1130, + "startOffset": 85804, + "endLine": 1129, "endColumn": 12, - "endOffset": 85975 + "endOffset": 85924 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4644,12 +4628,12 @@ }, { "to": { - "startLine": 1131, + "startLine": 1130, "startColumn": 4, - "startOffset": 85980, - "endLine": 1133, + "startOffset": 85929, + "endLine": 1131, "endColumn": 12, - "endOffset": 86214 + "endOffset": 86051 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4657,12 +4641,12 @@ }, { "to": { - "startLine": 1134, + "startLine": 1132, "startColumn": 4, - "startOffset": 86219, - "endLine": 1136, + "startOffset": 86056, + "endLine": 1134, "endColumn": 12, - "endOffset": 86425 + "endOffset": 86290 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4670,12 +4654,12 @@ }, { "to": { - "startLine": 1137, + "startLine": 1135, "startColumn": 4, - "startOffset": 86430, - "endLine": 1138, + "startOffset": 86295, + "endLine": 1137, "endColumn": 12, - "endOffset": 86544 + "endOffset": 86501 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4683,12 +4667,12 @@ }, { "to": { - "startLine": 1139, + "startLine": 1138, "startColumn": 4, - "startOffset": 86549, - "endLine": 1142, + "startOffset": 86506, + "endLine": 1139, "endColumn": 12, - "endOffset": 86737 + "endOffset": 86620 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4696,12 +4680,12 @@ }, { "to": { - "startLine": 1143, + "startLine": 1140, "startColumn": 4, - "startOffset": 86742, - "endLine": 1149, + "startOffset": 86625, + "endLine": 1143, "endColumn": 12, - "endOffset": 87192 + "endOffset": 86813 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4709,12 +4693,12 @@ }, { "to": { - "startLine": 1150, + "startLine": 1144, "startColumn": 4, - "startOffset": 87197, - "endLine": 1152, + "startOffset": 86818, + "endLine": 1150, "endColumn": 12, - "endOffset": 87373 + "endOffset": 87268 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4722,12 +4706,12 @@ }, { "to": { - "startLine": 1153, + "startLine": 1151, "startColumn": 4, - "startOffset": 87378, - "endLine": 1155, + "startOffset": 87273, + "endLine": 1153, "endColumn": 12, - "endOffset": 87495 + "endOffset": 87449 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4735,12 +4719,12 @@ }, { "to": { - "startLine": 1156, + "startLine": 1154, "startColumn": 4, - "startOffset": 87500, - "endLine": 1159, + "startOffset": 87454, + "endLine": 1156, "endColumn": 12, - "endOffset": 87754 + "endOffset": 87571 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4748,12 +4732,12 @@ }, { "to": { - "startLine": 1160, + "startLine": 1157, "startColumn": 4, - "startOffset": 87759, - "endLine": 1161, + "startOffset": 87576, + "endLine": 1160, "endColumn": 12, - "endOffset": 87867 + "endOffset": 87830 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4761,12 +4745,12 @@ }, { "to": { - "startLine": 1162, + "startLine": 1161, "startColumn": 4, - "startOffset": 87872, - "endLine": 1165, + "startOffset": 87835, + "endLine": 1162, "endColumn": 12, - "endOffset": 88054 + "endOffset": 87943 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4774,12 +4758,12 @@ }, { "to": { - "startLine": 1166, + "startLine": 1163, "startColumn": 4, - "startOffset": 88059, - "endLine": 1167, + "startOffset": 87948, + "endLine": 1166, "endColumn": 12, - "endOffset": 88156 + "endOffset": 88130 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4787,12 +4771,12 @@ }, { "to": { - "startLine": 1168, + "startLine": 1167, "startColumn": 4, - "startOffset": 88161, - "endLine": 1173, + "startOffset": 88135, + "endLine": 1168, "endColumn": 12, - "endOffset": 88600 + "endOffset": 88232 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4800,12 +4784,12 @@ }, { "to": { - "startLine": 1174, + "startLine": 1169, "startColumn": 4, - "startOffset": 88605, - "endLine": 1175, + "startOffset": 88237, + "endLine": 1174, "endColumn": 12, - "endOffset": 88724 + "endOffset": 88676 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4813,12 +4797,12 @@ }, { "to": { - "startLine": 1176, + "startLine": 1175, "startColumn": 4, - "startOffset": 88729, - "endLine": 1179, + "startOffset": 88681, + "endLine": 1176, "endColumn": 12, - "endOffset": 89009 + "endOffset": 88800 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4826,12 +4810,12 @@ }, { "to": { - "startLine": 1180, + "startLine": 1177, "startColumn": 4, - "startOffset": 89014, - "endLine": 1191, + "startOffset": 88805, + "endLine": 1180, "endColumn": 12, - "endOffset": 89896 + "endOffset": 89085 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4839,12 +4823,12 @@ }, { "to": { - "startLine": 1192, + "startLine": 1181, "startColumn": 4, - "startOffset": 89901, - "endLine": 1197, + "startOffset": 89090, + "endLine": 1192, "endColumn": 12, - "endOffset": 90190 + "endOffset": 89972 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4852,12 +4836,12 @@ }, { "to": { - "startLine": 1198, + "startLine": 1193, "startColumn": 4, - "startOffset": 90195, - "endLine": 1206, + "startOffset": 89977, + "endLine": 1198, "endColumn": 12, - "endOffset": 90760 + "endOffset": 90266 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4865,12 +4849,12 @@ }, { "to": { - "startLine": 1207, + "startLine": 1199, "startColumn": 4, - "startOffset": 90765, - "endLine": 1217, + "startOffset": 90271, + "endLine": 1207, "endColumn": 12, - "endOffset": 91492 + "endOffset": 90836 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4878,12 +4862,12 @@ }, { "to": { - "startLine": 1218, + "startLine": 1208, "startColumn": 4, - "startOffset": 91497, - "endLine": 1220, + "startOffset": 90841, + "endLine": 1218, "endColumn": 12, - "endOffset": 91664 + "endOffset": 91568 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4891,12 +4875,12 @@ }, { "to": { - "startLine": 1221, + "startLine": 1219, "startColumn": 4, - "startOffset": 91669, - "endLine": 1225, + "startOffset": 91573, + "endLine": 1221, "endColumn": 12, - "endOffset": 92000 + "endOffset": 91740 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4904,12 +4888,12 @@ }, { "to": { - "startLine": 1226, + "startLine": 1222, "startColumn": 4, - "startOffset": 92005, - "endLine": 1237, + "startOffset": 91745, + "endLine": 1226, "endColumn": 12, - "endOffset": 92867 + "endOffset": 92076 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4917,12 +4901,12 @@ }, { "to": { - "startLine": 1238, + "startLine": 1227, "startColumn": 4, - "startOffset": 92872, - "endLine": 1242, + "startOffset": 92081, + "endLine": 1238, "endColumn": 12, - "endOffset": 93145 + "endOffset": 92943 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4930,12 +4914,25 @@ }, { "to": { - "startLine": 1243, + "startLine": 1239, "startColumn": 4, - "startOffset": 93150, - "endLine": 1251, + "startOffset": 92948, + "endLine": 1243, "endColumn": 12, - "endOffset": 93587 + "endOffset": 93221 + }, + "from": { + "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" + } + }, + { + "to": { + "startLine": 1244, + "startColumn": 4, + "startOffset": 93226, + "endLine": 1252, + "endColumn": 12, + "endOffset": 93663 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\styles.xml" @@ -4943,12 +4940,12 @@ }, { "to": { - "startLine": 1252, + "startLine": 1253, "startColumn": 4, - "startOffset": 93592, - "endLine": 1289, + "startOffset": 93668, + "endLine": 1290, "endColumn": 12, - "endOffset": 96387 + "endOffset": 96463 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4956,24 +4953,12 @@ }, { "to": { - "startLine": 1290, + "startLine": 1291, "startColumn": 4, - "startOffset": 96392, - "endLine": 1328, + "startOffset": 96468, + "endLine": 1329, "endColumn": 12, - "endOffset": 99327 - }, - "from": { - "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" - } - }, - { - "to": { - "startLine": 1329, - "startColumn": 4, - "startOffset": 99332, - "endColumn": 61, - "endOffset": 99389 + "endOffset": 99403 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4983,10 +4968,9 @@ "to": { "startLine": 1330, "startColumn": 4, - "startOffset": 99394, - "endLine": 1339, - "endColumn": 12, - "endOffset": 99967 + "startOffset": 99408, + "endColumn": 61, + "endOffset": 99465 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4994,12 +4978,12 @@ }, { "to": { - "startLine": 1340, + "startLine": 1331, "startColumn": 4, - "startOffset": 99972, - "endLine": 1348, + "startOffset": 99470, + "endLine": 1340, "endColumn": 12, - "endOffset": 100551 + "endOffset": 100043 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5007,11 +4991,12 @@ }, { "to": { - "startLine": 1349, + "startLine": 1341, "startColumn": 4, - "startOffset": 100556, - "endColumn": 85, - "endOffset": 100637 + "startOffset": 100048, + "endLine": 1349, + "endColumn": 12, + "endOffset": 100627 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5021,10 +5006,9 @@ "to": { "startLine": 1350, "startColumn": 4, - "startOffset": 100642, - "endLine": 1351, - "endColumn": 12, - "endOffset": 100750 + "startOffset": 100632, + "endColumn": 85, + "endOffset": 100713 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5032,12 +5016,12 @@ }, { "to": { - "startLine": 1352, + "startLine": 1351, "startColumn": 4, - "startOffset": 100755, - "endLine": 1355, + "startOffset": 100718, + "endLine": 1352, "endColumn": 12, - "endOffset": 100979 + "endOffset": 100826 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5045,12 +5029,12 @@ }, { "to": { - "startLine": 1356, + "startLine": 1353, "startColumn": 4, - "startOffset": 100984, - "endLine": 1358, + "startOffset": 100831, + "endLine": 1356, "endColumn": 12, - "endOffset": 101139 + "endOffset": 101055 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5058,12 +5042,12 @@ }, { "to": { - "startLine": 1359, + "startLine": 1357, "startColumn": 4, - "startOffset": 101144, - "endLine": 1361, + "startOffset": 101060, + "endLine": 1359, "endColumn": 12, - "endOffset": 101291 + "endOffset": 101215 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5071,12 +5055,12 @@ }, { "to": { - "startLine": 1362, + "startLine": 1360, "startColumn": 4, - "startOffset": 101296, - "endLine": 1364, + "startOffset": 101220, + "endLine": 1362, "endColumn": 12, - "endOffset": 101462 + "endOffset": 101367 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5084,12 +5068,12 @@ }, { "to": { - "startLine": 1365, + "startLine": 1363, "startColumn": 4, - "startOffset": 101467, - "endLine": 1367, + "startOffset": 101372, + "endLine": 1365, "endColumn": 12, - "endOffset": 101629 + "endOffset": 101538 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5097,12 +5081,12 @@ }, { "to": { - "startLine": 1368, + "startLine": 1366, "startColumn": 4, - "startOffset": 101634, - "endLine": 1371, + "startOffset": 101543, + "endLine": 1368, "endColumn": 12, - "endOffset": 101872 + "endOffset": 101705 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5110,12 +5094,12 @@ }, { "to": { - "startLine": 1372, + "startLine": 1369, "startColumn": 4, - "startOffset": 101877, - "endLine": 1374, + "startOffset": 101710, + "endLine": 1372, "endColumn": 12, - "endOffset": 102042 + "endOffset": 101948 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5123,12 +5107,12 @@ }, { "to": { - "startLine": 1375, + "startLine": 1373, "startColumn": 4, - "startOffset": 102047, - "endLine": 1377, + "startOffset": 101953, + "endLine": 1375, "endColumn": 12, - "endOffset": 102215 + "endOffset": 102118 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5136,12 +5120,12 @@ }, { "to": { - "startLine": 1378, + "startLine": 1376, "startColumn": 4, - "startOffset": 102220, - "endLine": 1380, + "startOffset": 102123, + "endLine": 1378, "endColumn": 12, - "endOffset": 102386 + "endOffset": 102291 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5149,12 +5133,12 @@ }, { "to": { - "startLine": 1381, + "startLine": 1379, "startColumn": 4, - "startOffset": 102391, - "endLine": 1384, + "startOffset": 102296, + "endLine": 1381, "endColumn": 12, - "endOffset": 102660 + "endOffset": 102462 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5162,12 +5146,12 @@ }, { "to": { - "startLine": 1385, + "startLine": 1382, "startColumn": 4, - "startOffset": 102665, - "endLine": 1387, + "startOffset": 102467, + "endLine": 1385, "endColumn": 12, - "endOffset": 102859 + "endOffset": 102736 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5175,12 +5159,12 @@ }, { "to": { - "startLine": 1388, + "startLine": 1386, "startColumn": 4, - "startOffset": 102864, - "endLine": 1391, + "startOffset": 102741, + "endLine": 1388, "endColumn": 12, - "endOffset": 103064 + "endOffset": 102935 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5188,12 +5172,12 @@ }, { "to": { - "startLine": 1392, + "startLine": 1389, "startColumn": 4, - "startOffset": 103069, - "endLine": 1395, + "startOffset": 102940, + "endLine": 1392, "endColumn": 12, - "endOffset": 103394 + "endOffset": 103140 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5201,11 +5185,12 @@ }, { "to": { - "startLine": 1396, + "startLine": 1393, "startColumn": 4, - "startOffset": 103399, - "endColumn": 83, - "endOffset": 103478 + "startOffset": 103145, + "endLine": 1396, + "endColumn": 12, + "endOffset": 103470 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5215,9 +5200,9 @@ "to": { "startLine": 1397, "startColumn": 4, - "startOffset": 103483, - "endColumn": 95, - "endOffset": 103574 + "startOffset": 103475, + "endColumn": 83, + "endOffset": 103554 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5227,9 +5212,9 @@ "to": { "startLine": 1398, "startColumn": 4, - "startOffset": 103579, + "startOffset": 103559, "endColumn": 95, - "endOffset": 103670 + "endOffset": 103650 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5239,9 +5224,9 @@ "to": { "startLine": 1399, "startColumn": 4, - "startOffset": 103675, - "endColumn": 97, - "endOffset": 103768 + "startOffset": 103655, + "endColumn": 95, + "endOffset": 103746 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5251,9 +5236,9 @@ "to": { "startLine": 1400, "startColumn": 4, - "startOffset": 103773, - "endColumn": 99, - "endOffset": 103868 + "startOffset": 103751, + "endColumn": 97, + "endOffset": 103844 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5263,9 +5248,9 @@ "to": { "startLine": 1401, "startColumn": 4, - "startOffset": 103873, - "endColumn": 101, - "endOffset": 103970 + "startOffset": 103849, + "endColumn": 99, + "endOffset": 103944 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5275,9 +5260,9 @@ "to": { "startLine": 1402, "startColumn": 4, - "startOffset": 103975, + "startOffset": 103949, "endColumn": 101, - "endOffset": 104072 + "endOffset": 104046 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5287,9 +5272,9 @@ "to": { "startLine": 1403, "startColumn": 4, - "startOffset": 104077, + "startOffset": 104051, "endColumn": 101, - "endOffset": 104174 + "endOffset": 104148 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5299,9 +5284,9 @@ "to": { "startLine": 1404, "startColumn": 4, - "startOffset": 104179, + "startOffset": 104153, "endColumn": 101, - "endOffset": 104276 + "endOffset": 104250 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5311,9 +5296,9 @@ "to": { "startLine": 1405, "startColumn": 4, - "startOffset": 104281, + "startOffset": 104255, "endColumn": 101, - "endOffset": 104378 + "endOffset": 104352 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5323,9 +5308,9 @@ "to": { "startLine": 1406, "startColumn": 4, - "startOffset": 104383, - "endColumn": 99, - "endOffset": 104478 + "startOffset": 104357, + "endColumn": 101, + "endOffset": 104454 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5335,9 +5320,9 @@ "to": { "startLine": 1407, "startColumn": 4, - "startOffset": 104483, - "endColumn": 95, - "endOffset": 104574 + "startOffset": 104459, + "endColumn": 99, + "endOffset": 104554 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5347,9 +5332,9 @@ "to": { "startLine": 1408, "startColumn": 4, - "startOffset": 104579, - "endColumn": 111, - "endOffset": 104686 + "startOffset": 104559, + "endColumn": 95, + "endOffset": 104650 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5359,9 +5344,9 @@ "to": { "startLine": 1409, "startColumn": 4, - "startOffset": 104691, - "endColumn": 128, - "endOffset": 104815 + "startOffset": 104655, + "endColumn": 111, + "endOffset": 104762 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5371,9 +5356,9 @@ "to": { "startLine": 1410, "startColumn": 4, - "startOffset": 104820, - "endColumn": 122, - "endOffset": 104938 + "startOffset": 104767, + "endColumn": 128, + "endOffset": 104891 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5383,10 +5368,9 @@ "to": { "startLine": 1411, "startColumn": 4, - "startOffset": 104943, - "endLine": 1412, - "endColumn": 12, - "endOffset": 105092 + "startOffset": 104896, + "endColumn": 122, + "endOffset": 105014 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5394,12 +5378,12 @@ }, { "to": { - "startLine": 1413, + "startLine": 1412, "startColumn": 4, - "startOffset": 105097, - "endLine": 1414, + "startOffset": 105019, + "endLine": 1413, "endColumn": 12, - "endOffset": 105246 + "endOffset": 105168 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5407,11 +5391,12 @@ }, { "to": { - "startLine": 1415, + "startLine": 1414, "startColumn": 4, - "startOffset": 105251, - "endColumn": 97, - "endOffset": 105344 + "startOffset": 105173, + "endLine": 1415, + "endColumn": 12, + "endOffset": 105322 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5421,9 +5406,9 @@ "to": { "startLine": 1416, "startColumn": 4, - "startOffset": 105349, - "endColumn": 113, - "endOffset": 105458 + "startOffset": 105327, + "endColumn": 97, + "endOffset": 105420 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5433,9 +5418,9 @@ "to": { "startLine": 1417, "startColumn": 4, - "startOffset": 105463, - "endColumn": 93, - "endOffset": 105552 + "startOffset": 105425, + "endColumn": 113, + "endOffset": 105534 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5445,10 +5430,9 @@ "to": { "startLine": 1418, "startColumn": 4, - "startOffset": 105557, - "endLine": 1419, - "endColumn": 12, - "endOffset": 105692 + "startOffset": 105539, + "endColumn": 93, + "endOffset": 105628 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5456,12 +5440,12 @@ }, { "to": { - "startLine": 1420, + "startLine": 1419, "startColumn": 4, - "startOffset": 105697, - "endLine": 1421, + "startOffset": 105633, + "endLine": 1420, "endColumn": 12, - "endOffset": 105826 + "endOffset": 105768 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5469,11 +5453,12 @@ }, { "to": { - "startLine": 1422, + "startLine": 1421, "startColumn": 4, - "startOffset": 105831, - "endColumn": 95, - "endOffset": 105922 + "startOffset": 105773, + "endLine": 1422, + "endColumn": 12, + "endOffset": 105902 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5483,9 +5468,9 @@ "to": { "startLine": 1423, "startColumn": 4, - "startOffset": 105927, - "endColumn": 111, - "endOffset": 106034 + "startOffset": 105907, + "endColumn": 95, + "endOffset": 105998 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5495,9 +5480,9 @@ "to": { "startLine": 1424, "startColumn": 4, - "startOffset": 106039, - "endColumn": 99, - "endOffset": 106134 + "startOffset": 106003, + "endColumn": 111, + "endOffset": 106110 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5507,9 +5492,9 @@ "to": { "startLine": 1425, "startColumn": 4, - "startOffset": 106139, - "endColumn": 115, - "endOffset": 106250 + "startOffset": 106115, + "endColumn": 99, + "endOffset": 106210 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5519,9 +5504,9 @@ "to": { "startLine": 1426, "startColumn": 4, - "startOffset": 106255, - "endColumn": 95, - "endOffset": 106346 + "startOffset": 106215, + "endColumn": 115, + "endOffset": 106326 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5531,9 +5516,9 @@ "to": { "startLine": 1427, "startColumn": 4, - "startOffset": 106351, - "endColumn": 111, - "endOffset": 106458 + "startOffset": 106331, + "endColumn": 95, + "endOffset": 106422 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5543,10 +5528,9 @@ "to": { "startLine": 1428, "startColumn": 4, - "startOffset": 106463, - "endLine": 1429, - "endColumn": 12, - "endOffset": 106598 + "startOffset": 106427, + "endColumn": 111, + "endOffset": 106534 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5554,11 +5538,12 @@ }, { "to": { - "startLine": 1430, + "startLine": 1429, "startColumn": 4, - "startOffset": 106603, - "endColumn": 135, - "endOffset": 106734 + "startOffset": 106539, + "endLine": 1430, + "endColumn": 12, + "endOffset": 106674 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5568,10 +5553,9 @@ "to": { "startLine": 1431, "startColumn": 4, - "startOffset": 106739, - "endLine": 1432, - "endColumn": 12, - "endOffset": 106898 + "startOffset": 106679, + "endColumn": 135, + "endOffset": 106810 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5579,11 +5563,12 @@ }, { "to": { - "startLine": 1433, + "startLine": 1432, "startColumn": 4, - "startOffset": 106903, - "endColumn": 129, - "endOffset": 107028 + "startOffset": 106815, + "endLine": 1433, + "endColumn": 12, + "endOffset": 106974 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5593,10 +5578,9 @@ "to": { "startLine": 1434, "startColumn": 4, - "startOffset": 107033, - "endLine": 1435, - "endColumn": 12, - "endOffset": 107186 + "startOffset": 106979, + "endColumn": 129, + "endOffset": 107104 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5604,12 +5588,12 @@ }, { "to": { - "startLine": 1436, + "startLine": 1435, "startColumn": 4, - "startOffset": 107191, - "endLine": 1437, + "startOffset": 107109, + "endLine": 1436, "endColumn": 12, - "endOffset": 107336 + "endOffset": 107262 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5617,11 +5601,12 @@ }, { "to": { - "startLine": 1438, + "startLine": 1437, "startColumn": 4, - "startOffset": 107341, - "endColumn": 140, - "endOffset": 107477 + "startOffset": 107267, + "endLine": 1438, + "endColumn": 12, + "endOffset": 107412 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5631,10 +5616,9 @@ "to": { "startLine": 1439, "startColumn": 4, - "startOffset": 107482, - "endLine": 1440, - "endColumn": 12, - "endOffset": 107621 + "startOffset": 107417, + "endColumn": 140, + "endOffset": 107553 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5642,11 +5626,12 @@ }, { "to": { - "startLine": 1441, + "startLine": 1440, "startColumn": 4, - "startOffset": 107626, - "endColumn": 134, - "endOffset": 107756 + "startOffset": 107558, + "endLine": 1441, + "endColumn": 12, + "endOffset": 107697 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5656,9 +5641,9 @@ "to": { "startLine": 1442, "startColumn": 4, - "startOffset": 107761, - "endColumn": 111, - "endOffset": 107868 + "startOffset": 107702, + "endColumn": 134, + "endOffset": 107832 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5668,9 +5653,9 @@ "to": { "startLine": 1443, "startColumn": 4, - "startOffset": 107873, - "endColumn": 127, - "endOffset": 107996 + "startOffset": 107837, + "endColumn": 111, + "endOffset": 107944 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5680,10 +5665,9 @@ "to": { "startLine": 1444, "startColumn": 4, - "startOffset": 108001, - "endLine": 1445, - "endColumn": 12, - "endOffset": 108132 + "startOffset": 107949, + "endColumn": 127, + "endOffset": 108072 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5691,12 +5675,12 @@ }, { "to": { - "startLine": 1446, + "startLine": 1445, "startColumn": 4, - "startOffset": 108137, - "endLine": 1447, + "startOffset": 108077, + "endLine": 1446, "endColumn": 12, - "endOffset": 108274 + "endOffset": 108208 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5704,12 +5688,12 @@ }, { "to": { - "startLine": 1448, + "startLine": 1447, "startColumn": 4, - "startOffset": 108279, - "endLine": 1449, + "startOffset": 108213, + "endLine": 1448, "endColumn": 12, - "endOffset": 108416 + "endOffset": 108350 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5717,11 +5701,12 @@ }, { "to": { - "startLine": 1450, + "startLine": 1449, "startColumn": 4, - "startOffset": 108421, - "endColumn": 111, - "endOffset": 108528 + "startOffset": 108355, + "endLine": 1450, + "endColumn": 12, + "endOffset": 108492 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5731,9 +5716,9 @@ "to": { "startLine": 1451, "startColumn": 4, - "startOffset": 108533, - "endColumn": 139, - "endOffset": 108668 + "startOffset": 108497, + "endColumn": 111, + "endOffset": 108604 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5743,9 +5728,9 @@ "to": { "startLine": 1452, "startColumn": 4, - "startOffset": 108673, - "endColumn": 67, - "endOffset": 108736 + "startOffset": 108609, + "endColumn": 139, + "endOffset": 108744 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5755,9 +5740,9 @@ "to": { "startLine": 1453, "startColumn": 4, - "startOffset": 108741, - "endColumn": 72, - "endOffset": 108809 + "startOffset": 108749, + "endColumn": 67, + "endOffset": 108812 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5767,9 +5752,9 @@ "to": { "startLine": 1454, "startColumn": 4, - "startOffset": 108814, - "endColumn": 73, - "endOffset": 108883 + "startOffset": 108817, + "endColumn": 72, + "endOffset": 108885 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5779,9 +5764,9 @@ "to": { "startLine": 1455, "startColumn": 4, - "startOffset": 108888, - "endColumn": 72, - "endOffset": 108956 + "startOffset": 108890, + "endColumn": 73, + "endOffset": 108959 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5791,9 +5776,9 @@ "to": { "startLine": 1456, "startColumn": 4, - "startOffset": 108961, - "endColumn": 73, - "endOffset": 109030 + "startOffset": 108964, + "endColumn": 72, + "endOffset": 109032 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5803,10 +5788,9 @@ "to": { "startLine": 1457, "startColumn": 4, - "startOffset": 109035, - "endLine": 1458, - "endColumn": 12, - "endOffset": 109176 + "startOffset": 109037, + "endColumn": 73, + "endOffset": 109106 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5814,12 +5798,12 @@ }, { "to": { - "startLine": 1459, + "startLine": 1458, "startColumn": 4, - "startOffset": 109181, - "endLine": 1460, + "startOffset": 109111, + "endLine": 1459, "endColumn": 12, - "endOffset": 109320 + "endOffset": 109252 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5827,12 +5811,12 @@ }, { "to": { - "startLine": 1461, + "startLine": 1460, "startColumn": 4, - "startOffset": 109325, - "endLine": 1462, + "startOffset": 109257, + "endLine": 1461, "endColumn": 12, - "endOffset": 109458 + "endOffset": 109396 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5840,11 +5824,12 @@ }, { "to": { - "startLine": 1463, + "startLine": 1462, "startColumn": 4, - "startOffset": 109463, - "endColumn": 65, - "endOffset": 109524 + "startOffset": 109401, + "endLine": 1463, + "endColumn": 12, + "endOffset": 109534 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5854,9 +5839,9 @@ "to": { "startLine": 1464, "startColumn": 4, - "startOffset": 109529, - "endColumn": 89, - "endOffset": 109614 + "startOffset": 109539, + "endColumn": 65, + "endOffset": 109600 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5866,9 +5851,9 @@ "to": { "startLine": 1465, "startColumn": 4, - "startOffset": 109619, - "endColumn": 79, - "endOffset": 109694 + "startOffset": 109605, + "endColumn": 89, + "endOffset": 109690 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5878,9 +5863,9 @@ "to": { "startLine": 1466, "startColumn": 4, - "startOffset": 109699, - "endColumn": 91, - "endOffset": 109786 + "startOffset": 109695, + "endColumn": 79, + "endOffset": 109770 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5890,9 +5875,9 @@ "to": { "startLine": 1467, "startColumn": 4, - "startOffset": 109791, - "endColumn": 97, - "endOffset": 109884 + "startOffset": 109775, + "endColumn": 91, + "endOffset": 109862 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5902,10 +5887,9 @@ "to": { "startLine": 1468, "startColumn": 4, - "startOffset": 109889, - "endLine": 1469, - "endColumn": 12, - "endOffset": 109994 + "startOffset": 109867, + "endColumn": 97, + "endOffset": 109960 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5913,11 +5897,12 @@ }, { "to": { - "startLine": 1470, + "startLine": 1469, "startColumn": 4, - "startOffset": 109999, - "endColumn": 77, - "endOffset": 110072 + "startOffset": 109965, + "endLine": 1470, + "endColumn": 12, + "endOffset": 110070 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5927,9 +5912,9 @@ "to": { "startLine": 1471, "startColumn": 4, - "startOffset": 110077, - "endColumn": 105, - "endOffset": 110178 + "startOffset": 110075, + "endColumn": 77, + "endOffset": 110148 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5939,9 +5924,9 @@ "to": { "startLine": 1472, "startColumn": 4, - "startOffset": 110183, - "endColumn": 91, - "endOffset": 110270 + "startOffset": 110153, + "endColumn": 105, + "endOffset": 110254 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5951,9 +5936,9 @@ "to": { "startLine": 1473, "startColumn": 4, - "startOffset": 110275, - "endColumn": 103, - "endOffset": 110374 + "startOffset": 110259, + "endColumn": 91, + "endOffset": 110346 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5963,9 +5948,9 @@ "to": { "startLine": 1474, "startColumn": 4, - "startOffset": 110379, - "endColumn": 109, - "endOffset": 110484 + "startOffset": 110351, + "endColumn": 103, + "endOffset": 110450 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5975,10 +5960,9 @@ "to": { "startLine": 1475, "startColumn": 4, - "startOffset": 110489, - "endLine": 1476, - "endColumn": 12, - "endOffset": 110606 + "startOffset": 110455, + "endColumn": 109, + "endOffset": 110560 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5986,12 +5970,12 @@ }, { "to": { - "startLine": 1477, + "startLine": 1476, "startColumn": 4, - "startOffset": 110611, - "endLine": 1480, + "startOffset": 110565, + "endLine": 1477, "endColumn": 12, - "endOffset": 110769 + "endOffset": 110682 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5999,12 +5983,12 @@ }, { "to": { - "startLine": 1481, + "startLine": 1478, "startColumn": 4, - "startOffset": 110774, - "endLine": 1484, + "startOffset": 110687, + "endLine": 1481, "endColumn": 12, - "endOffset": 110926 + "endOffset": 110845 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6012,11 +5996,12 @@ }, { "to": { - "startLine": 1485, + "startLine": 1482, "startColumn": 4, - "startOffset": 110931, - "endColumn": 79, - "endOffset": 111006 + "startOffset": 110850, + "endLine": 1485, + "endColumn": 12, + "endOffset": 111002 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6026,9 +6011,9 @@ "to": { "startLine": 1486, "startColumn": 4, - "startOffset": 111011, - "endColumn": 99, - "endOffset": 111106 + "startOffset": 111007, + "endColumn": 79, + "endOffset": 111082 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6038,9 +6023,9 @@ "to": { "startLine": 1487, "startColumn": 4, - "startOffset": 111111, - "endColumn": 89, - "endOffset": 111196 + "startOffset": 111087, + "endColumn": 99, + "endOffset": 111182 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6050,9 +6035,9 @@ "to": { "startLine": 1488, "startColumn": 4, - "startOffset": 111201, - "endColumn": 109, - "endOffset": 111306 + "startOffset": 111187, + "endColumn": 89, + "endOffset": 111272 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6062,9 +6047,9 @@ "to": { "startLine": 1489, "startColumn": 4, - "startOffset": 111311, - "endColumn": 91, - "endOffset": 111398 + "startOffset": 111277, + "endColumn": 109, + "endOffset": 111382 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6074,10 +6059,22 @@ "to": { "startLine": 1490, "startColumn": 4, - "startOffset": 111403, - "endLine": 1494, + "startOffset": 111387, + "endColumn": 91, + "endOffset": 111474 + }, + "from": { + "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" + } + }, + { + "to": { + "startLine": 1491, + "startColumn": 4, + "startOffset": 111479, + "endLine": 1495, "endColumn": 12, - "endOffset": 111640 + "endOffset": 111716 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\styles.xml" @@ -6085,12 +6082,12 @@ }, { "to": { - "startLine": 1495, + "startLine": 1496, "startColumn": 4, - "startOffset": 111645, - "endLine": 1496, + "startOffset": 111721, + "endLine": 1497, "endColumn": 12, - "endOffset": 111740 + "endOffset": 111816 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6098,12 +6095,12 @@ }, { "to": { - "startLine": 1497, + "startLine": 1498, "startColumn": 4, - "startOffset": 111745, - "endLine": 1498, + "startOffset": 111821, + "endLine": 1499, "endColumn": 12, - "endOffset": 111852 + "endOffset": 111928 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6111,12 +6108,12 @@ }, { "to": { - "startLine": 1499, + "startLine": 1500, "startColumn": 4, - "startOffset": 111857, - "endLine": 1500, + "startOffset": 111933, + "endLine": 1501, "endColumn": 12, - "endOffset": 111966 + "endOffset": 112042 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6124,12 +6121,12 @@ }, { "to": { - "startLine": 1501, + "startLine": 1502, "startColumn": 4, - "startOffset": 111971, - "endLine": 1502, + "startOffset": 112047, + "endLine": 1503, "endColumn": 12, - "endOffset": 112082 + "endOffset": 112158 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6137,24 +6134,12 @@ }, { "to": { - "startLine": 1503, + "startLine": 1504, "startColumn": 4, - "startOffset": 112087, - "endLine": 1504, + "startOffset": 112163, + "endLine": 1505, "endColumn": 12, - "endOffset": 112198 - }, - "from": { - "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" - } - }, - { - "to": { - "startLine": 1505, - "startColumn": 4, - "startOffset": 112203, - "endColumn": 93, - "endOffset": 112292 + "endOffset": 112274 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6164,9 +6149,9 @@ "to": { "startLine": 1506, "startColumn": 4, - "startOffset": 112297, - "endColumn": 113, - "endOffset": 112406 + "startOffset": 112279, + "endColumn": 93, + "endOffset": 112368 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6176,9 +6161,9 @@ "to": { "startLine": 1507, "startColumn": 4, - "startOffset": 112411, - "endColumn": 111, - "endOffset": 112518 + "startOffset": 112373, + "endColumn": 113, + "endOffset": 112482 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6188,10 +6173,9 @@ "to": { "startLine": 1508, "startColumn": 4, - "startOffset": 112523, - "endLine": 1509, - "endColumn": 12, - "endOffset": 112620 + "startOffset": 112487, + "endColumn": 111, + "endOffset": 112594 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6199,12 +6183,12 @@ }, { "to": { - "startLine": 1510, + "startLine": 1509, "startColumn": 4, - "startOffset": 112625, - "endLine": 1511, + "startOffset": 112599, + "endLine": 1510, "endColumn": 12, - "endOffset": 112740 + "endOffset": 112696 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6212,12 +6196,12 @@ }, { "to": { - "startLine": 1512, + "startLine": 1511, "startColumn": 4, - "startOffset": 112745, - "endLine": 1513, + "startOffset": 112701, + "endLine": 1512, "endColumn": 12, - "endOffset": 112862 + "endOffset": 112816 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6225,11 +6209,12 @@ }, { "to": { - "startLine": 1514, + "startLine": 1513, "startColumn": 4, - "startOffset": 112867, - "endColumn": 81, - "endOffset": 112944 + "startOffset": 112821, + "endLine": 1514, + "endColumn": 12, + "endOffset": 112938 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6239,9 +6224,9 @@ "to": { "startLine": 1515, "startColumn": 4, - "startOffset": 112949, - "endColumn": 103, - "endOffset": 113048 + "startOffset": 112943, + "endColumn": 81, + "endOffset": 113020 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6251,9 +6236,9 @@ "to": { "startLine": 1516, "startColumn": 4, - "startOffset": 113053, - "endColumn": 119, - "endOffset": 113168 + "startOffset": 113025, + "endColumn": 103, + "endOffset": 113124 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6263,9 +6248,9 @@ "to": { "startLine": 1517, "startColumn": 4, - "startOffset": 113173, - "endColumn": 125, - "endOffset": 113294 + "startOffset": 113129, + "endColumn": 119, + "endOffset": 113244 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6275,9 +6260,9 @@ "to": { "startLine": 1518, "startColumn": 4, - "startOffset": 113299, - "endColumn": 97, - "endOffset": 113392 + "startOffset": 113249, + "endColumn": 125, + "endOffset": 113370 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6287,9 +6272,9 @@ "to": { "startLine": 1519, "startColumn": 4, - "startOffset": 113397, - "endColumn": 93, - "endOffset": 113486 + "startOffset": 113375, + "endColumn": 97, + "endOffset": 113468 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6299,9 +6284,9 @@ "to": { "startLine": 1520, "startColumn": 4, - "startOffset": 113491, - "endColumn": 87, - "endOffset": 113574 + "startOffset": 113473, + "endColumn": 93, + "endOffset": 113562 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6311,9 +6296,9 @@ "to": { "startLine": 1521, "startColumn": 4, - "startOffset": 113579, - "endColumn": 111, - "endOffset": 113686 + "startOffset": 113567, + "endColumn": 87, + "endOffset": 113650 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6323,9 +6308,9 @@ "to": { "startLine": 1522, "startColumn": 4, - "startOffset": 113691, - "endColumn": 115, - "endOffset": 113802 + "startOffset": 113655, + "endColumn": 111, + "endOffset": 113762 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6335,9 +6320,9 @@ "to": { "startLine": 1523, "startColumn": 4, - "startOffset": 113807, - "endColumn": 121, - "endOffset": 113924 + "startOffset": 113767, + "endColumn": 115, + "endOffset": 113878 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6347,9 +6332,9 @@ "to": { "startLine": 1524, "startColumn": 4, - "startOffset": 113929, - "endColumn": 111, - "endOffset": 114036 + "startOffset": 113883, + "endColumn": 121, + "endOffset": 114000 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6359,10 +6344,9 @@ "to": { "startLine": 1525, "startColumn": 4, - "startOffset": 114041, - "endLine": 1527, - "endColumn": 12, - "endOffset": 114211 + "startOffset": 114005, + "endColumn": 111, + "endOffset": 114112 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6370,11 +6354,12 @@ }, { "to": { - "startLine": 1528, + "startLine": 1526, "startColumn": 4, - "startOffset": 114216, - "endColumn": 115, - "endOffset": 114327 + "startOffset": 114117, + "endLine": 1528, + "endColumn": 12, + "endOffset": 114287 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6384,9 +6369,9 @@ "to": { "startLine": 1529, "startColumn": 4, - "startOffset": 114332, - "endColumn": 85, - "endOffset": 114413 + "startOffset": 114292, + "endColumn": 115, + "endOffset": 114403 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6396,9 +6381,9 @@ "to": { "startLine": 1530, "startColumn": 4, - "startOffset": 114418, - "endColumn": 91, - "endOffset": 114505 + "startOffset": 114408, + "endColumn": 85, + "endOffset": 114489 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6408,10 +6393,9 @@ "to": { "startLine": 1531, "startColumn": 4, - "startOffset": 114510, - "endLine": 1532, - "endColumn": 12, - "endOffset": 114617 + "startOffset": 114494, + "endColumn": 91, + "endOffset": 114581 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6419,12 +6403,12 @@ }, { "to": { - "startLine": 1533, + "startLine": 1532, "startColumn": 4, - "startOffset": 114622, - "endLine": 1534, + "startOffset": 114586, + "endLine": 1533, "endColumn": 12, - "endOffset": 114741 + "endOffset": 114693 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6432,11 +6416,12 @@ }, { "to": { - "startLine": 1535, + "startLine": 1534, "startColumn": 4, - "startOffset": 114746, - "endColumn": 66, - "endOffset": 114808 + "startOffset": 114698, + "endLine": 1535, + "endColumn": 12, + "endOffset": 114817 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6446,10 +6431,9 @@ "to": { "startLine": 1536, "startColumn": 4, - "startOffset": 114813, - "endLine": 1537, - "endColumn": 12, - "endOffset": 114934 + "startOffset": 114822, + "endColumn": 66, + "endOffset": 114884 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6457,11 +6441,12 @@ }, { "to": { - "startLine": 1538, + "startLine": 1537, "startColumn": 4, - "startOffset": 114939, - "endColumn": 67, - "endOffset": 115002 + "startOffset": 114889, + "endLine": 1538, + "endColumn": 12, + "endOffset": 115010 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6471,10 +6456,9 @@ "to": { "startLine": 1539, "startColumn": 4, - "startOffset": 115007, - "endLine": 1540, - "endColumn": 12, - "endOffset": 115130 + "startOffset": 115015, + "endColumn": 67, + "endOffset": 115078 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6482,12 +6466,12 @@ }, { "to": { - "startLine": 1541, + "startLine": 1540, "startColumn": 4, - "startOffset": 115135, - "endLine": 1542, + "startOffset": 115083, + "endLine": 1541, "endColumn": 12, - "endOffset": 115274 + "endOffset": 115206 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6495,12 +6479,12 @@ }, { "to": { - "startLine": 1543, + "startLine": 1542, "startColumn": 4, - "startOffset": 115279, - "endLine": 1544, + "startOffset": 115211, + "endLine": 1543, "endColumn": 12, - "endOffset": 115402 + "endOffset": 115350 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6508,11 +6492,12 @@ }, { "to": { - "startLine": 1545, + "startLine": 1544, "startColumn": 4, - "startOffset": 115407, - "endColumn": 68, - "endOffset": 115471 + "startOffset": 115355, + "endLine": 1545, + "endColumn": 12, + "endOffset": 115478 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6522,9 +6507,9 @@ "to": { "startLine": 1546, "startColumn": 4, - "startOffset": 115476, - "endColumn": 94, - "endOffset": 115566 + "startOffset": 115483, + "endColumn": 68, + "endOffset": 115547 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6534,9 +6519,9 @@ "to": { "startLine": 1547, "startColumn": 4, - "startOffset": 115571, - "endColumn": 114, - "endOffset": 115681 + "startOffset": 115552, + "endColumn": 94, + "endOffset": 115642 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6546,9 +6531,9 @@ "to": { "startLine": 1548, "startColumn": 4, - "startOffset": 115686, - "endColumn": 112, - "endOffset": 115794 + "startOffset": 115647, + "endColumn": 114, + "endOffset": 115757 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6558,9 +6543,9 @@ "to": { "startLine": 1549, "startColumn": 4, - "startOffset": 115799, - "endColumn": 98, - "endOffset": 115893 + "startOffset": 115762, + "endColumn": 112, + "endOffset": 115870 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6570,9 +6555,9 @@ "to": { "startLine": 1550, "startColumn": 4, - "startOffset": 115898, - "endColumn": 108, - "endOffset": 116002 + "startOffset": 115875, + "endColumn": 98, + "endOffset": 115969 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6582,9 +6567,9 @@ "to": { "startLine": 1551, "startColumn": 4, - "startOffset": 116007, - "endColumn": 110, - "endOffset": 116113 + "startOffset": 115974, + "endColumn": 108, + "endOffset": 116078 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6594,9 +6579,9 @@ "to": { "startLine": 1552, "startColumn": 4, - "startOffset": 116118, + "startOffset": 116083, "endColumn": 110, - "endOffset": 116224 + "endOffset": 116189 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6606,9 +6591,9 @@ "to": { "startLine": 1553, "startColumn": 4, - "startOffset": 116229, - "endColumn": 100, - "endOffset": 116325 + "startOffset": 116194, + "endColumn": 110, + "endOffset": 116300 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6618,9 +6603,9 @@ "to": { "startLine": 1554, "startColumn": 4, - "startOffset": 116330, - "endColumn": 104, - "endOffset": 116430 + "startOffset": 116305, + "endColumn": 100, + "endOffset": 116401 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6630,10 +6615,9 @@ "to": { "startLine": 1555, "startColumn": 4, - "startOffset": 116435, - "endLine": 1556, - "endColumn": 12, - "endOffset": 116542 + "startOffset": 116406, + "endColumn": 104, + "endOffset": 116506 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6641,12 +6625,12 @@ }, { "to": { - "startLine": 1557, + "startLine": 1556, "startColumn": 4, - "startOffset": 116547, - "endLine": 1558, + "startOffset": 116511, + "endLine": 1557, "endColumn": 12, - "endOffset": 116672 + "endOffset": 116618 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6654,11 +6638,12 @@ }, { "to": { - "startLine": 1559, + "startLine": 1558, "startColumn": 4, - "startOffset": 116677, - "endColumn": 90, - "endOffset": 116763 + "startOffset": 116623, + "endLine": 1559, + "endColumn": 12, + "endOffset": 116748 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6668,9 +6653,9 @@ "to": { "startLine": 1560, "startColumn": 4, - "startOffset": 116768, - "endColumn": 122, - "endOffset": 116886 + "startOffset": 116753, + "endColumn": 90, + "endOffset": 116839 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6680,10 +6665,9 @@ "to": { "startLine": 1561, "startColumn": 4, - "startOffset": 116891, - "endLine": 1562, - "endColumn": 12, - "endOffset": 116998 + "startOffset": 116844, + "endColumn": 122, + "endOffset": 116962 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6691,11 +6675,12 @@ }, { "to": { - "startLine": 1563, + "startLine": 1562, "startColumn": 4, - "startOffset": 117003, - "endColumn": 85, - "endOffset": 117084 + "startOffset": 116967, + "endLine": 1563, + "endColumn": 12, + "endOffset": 117074 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6705,9 +6690,9 @@ "to": { "startLine": 1564, "startColumn": 4, - "startOffset": 117089, - "endColumn": 103, - "endOffset": 117188 + "startOffset": 117079, + "endColumn": 85, + "endOffset": 117160 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6717,10 +6702,9 @@ "to": { "startLine": 1565, "startColumn": 4, - "startOffset": 117193, - "endLine": 1566, - "endColumn": 12, - "endOffset": 117296 + "startOffset": 117165, + "endColumn": 103, + "endOffset": 117264 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6728,12 +6712,12 @@ }, { "to": { - "startLine": 1567, + "startLine": 1566, "startColumn": 4, - "startOffset": 117301, - "endLine": 1568, + "startOffset": 117269, + "endLine": 1567, "endColumn": 12, - "endOffset": 117396 + "endOffset": 117372 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6741,12 +6725,12 @@ }, { "to": { - "startLine": 1569, + "startLine": 1568, "startColumn": 4, - "startOffset": 117401, - "endLine": 1570, + "startOffset": 117377, + "endLine": 1569, "endColumn": 12, - "endOffset": 117514 + "endOffset": 117472 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6754,12 +6738,12 @@ }, { "to": { - "startLine": 1571, + "startLine": 1570, "startColumn": 4, - "startOffset": 117519, - "endLine": 1572, + "startOffset": 117477, + "endLine": 1571, "endColumn": 12, - "endOffset": 117618 + "endOffset": 117590 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6767,12 +6751,12 @@ }, { "to": { - "startLine": 1573, + "startLine": 1572, "startColumn": 4, - "startOffset": 117623, - "endLine": 1574, + "startOffset": 117595, + "endLine": 1573, "endColumn": 12, - "endOffset": 117722 + "endOffset": 117694 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6780,12 +6764,12 @@ }, { "to": { - "startLine": 1575, + "startLine": 1574, "startColumn": 4, - "startOffset": 117727, - "endLine": 1576, + "startOffset": 117699, + "endLine": 1575, "endColumn": 12, - "endOffset": 117848 + "endOffset": 117798 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6793,11 +6777,12 @@ }, { "to": { - "startLine": 1577, + "startLine": 1576, "startColumn": 4, - "startOffset": 117853, - "endColumn": 87, - "endOffset": 117936 + "startOffset": 117803, + "endLine": 1577, + "endColumn": 12, + "endOffset": 117924 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6807,9 +6792,9 @@ "to": { "startLine": 1578, "startColumn": 4, - "startOffset": 117941, - "endColumn": 89, - "endOffset": 118026 + "startOffset": 117929, + "endColumn": 87, + "endOffset": 118012 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6819,9 +6804,9 @@ "to": { "startLine": 1579, "startColumn": 4, - "startOffset": 118031, - "endColumn": 109, - "endOffset": 118136 + "startOffset": 118017, + "endColumn": 89, + "endOffset": 118102 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6831,9 +6816,9 @@ "to": { "startLine": 1580, "startColumn": 4, - "startOffset": 118141, - "endColumn": 83, - "endOffset": 118220 + "startOffset": 118107, + "endColumn": 109, + "endOffset": 118212 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6843,9 +6828,9 @@ "to": { "startLine": 1581, "startColumn": 4, - "startOffset": 118225, + "startOffset": 118217, "endColumn": 83, - "endOffset": 118304 + "endOffset": 118296 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6855,9 +6840,9 @@ "to": { "startLine": 1582, "startColumn": 4, - "startOffset": 118309, - "endColumn": 53, - "endOffset": 118358 + "startOffset": 118301, + "endColumn": 83, + "endOffset": 118380 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6867,9 +6852,9 @@ "to": { "startLine": 1583, "startColumn": 4, - "startOffset": 118363, - "endColumn": 63, - "endOffset": 118422 + "startOffset": 118385, + "endColumn": 53, + "endOffset": 118434 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6879,9 +6864,9 @@ "to": { "startLine": 1584, "startColumn": 4, - "startOffset": 118427, - "endColumn": 105, - "endOffset": 118528 + "startOffset": 118439, + "endColumn": 63, + "endOffset": 118498 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6891,9 +6876,9 @@ "to": { "startLine": 1585, "startColumn": 4, - "startOffset": 118533, - "endColumn": 109, - "endOffset": 118638 + "startOffset": 118503, + "endColumn": 105, + "endOffset": 118604 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6903,9 +6888,9 @@ "to": { "startLine": 1586, "startColumn": 4, - "startOffset": 118643, - "endColumn": 83, - "endOffset": 118722 + "startOffset": 118609, + "endColumn": 109, + "endOffset": 118714 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6915,9 +6900,21 @@ "to": { "startLine": 1587, "startColumn": 4, - "startOffset": 118727, + "startOffset": 118719, + "endColumn": 83, + "endOffset": 118798 + }, + "from": { + "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" + } + }, + { + "to": { + "startLine": 1588, + "startColumn": 4, + "startOffset": 118803, "endColumn": 119, - "endOffset": 118842 + "endOffset": 118918 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" diff --git a/app/build/intermediates/blame/res/debug/single/drawable.json b/app/build/intermediates/blame/res/debug/single/drawable.json index fb11344..deabeda 100644 --- a/app/build/intermediates/blame/res/debug/single/drawable.json +++ b/app/build/intermediates/blame/res/debug/single/drawable.json @@ -7,26 +7,10 @@ "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\xml_selector_gamebutton.xml", "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\xml_selector_gamebutton.xml" }, - { - "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tools_bomb.png", - "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tools_bomb.png" - }, - { - "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_cab_background_internal_bg.xml", - "source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_cab_background_internal_bg.xml" - }, { "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\\tutorial_toolshop_all_tools.png", - "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tutorial_toolshop_all_tools.png" - }, - { - "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\playershapes_hypno_spiral.png", - "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\playershapes_hypno_spiral.png" - }, { "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tutorial_toolshop_select_buy_spring.png", "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tutorial_toolshop_select_buy_spring.png" @@ -35,14 +19,6 @@ "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tutorial_place_ramp_air_1.png", "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tutorial_place_ramp_air_1.png" }, - { - "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_dialog_material_background_dark.xml", - "source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_dialog_material_background_dark.xml" - }, - { - "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_tab_indicator_material.xml", - "source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_tab_indicator_material.xml" - }, { "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_btn_borderless_material.xml", "source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_btn_borderless_material.xml" @@ -51,6 +27,154 @@ "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_list_selector_holo_dark.xml", "source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_list_selector_holo_dark.xml" }, + { + "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tutorial_to_toolshop.png", + "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tutorial_to_toolshop.png" + }, + { + "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tutorial_place_ramp_obstacle.png", + "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tutorial_place_ramp_obstacle.png" + }, + { + "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tick.png", + "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tick.png" + }, + { + "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\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\\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\\tools_rampbutton.png", + "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tools_rampbutton.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\\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\\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\\terrain_c_grass.png", + "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\terrain_c_grass.png" + }, + { + "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\xml_layers_toolprogressbar.xml", + "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\xml_layers_toolprogressbar.xml" + }, + { + "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_edit_text_material.xml", + "source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_edit_text_material.xml" + }, + { + "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_item_background_holo_light.xml", + "source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_item_background_holo_light.xml" + }, + { + "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tutorial_toolshop_equip_spring.png", + "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tutorial_toolshop_equip_spring.png" + }, + { + "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\currency_star_empty.png", + "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\currency_star_empty.png" + }, + { + "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\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\\tutorial_toolshop_toolbar.png", + "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tutorial_toolshop_toolbar.png" + }, + { + "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tools_ramp.png", + "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tools_ramp.png" + }, + { + "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_list_selector_background_transition_holo_dark.xml", + "source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_list_selector_background_transition_holo_dark.xml" + }, + { + "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\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\\tip_icon.png", + "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tip_icon.png" + }, + { + "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_cab_background_top_material.xml", + "source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_cab_background_top_material.xml" + }, + { + "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_text_cursor_material.xml", + "source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_text_cursor_material.xml" + }, + { + "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_switch_thumb_material.xml", + "source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_switch_thumb_material.xml" + }, + { + "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\xml_background_bountymessage.xml", + "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\xml_background_bountymessage.xml" + }, + { + "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\currency_energy.png", + "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\currency_energy.png" + }, + { + "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\xml_background_worldbutton.xml", + "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\xml_background_worldbutton.xml" + }, + { + "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\currency_star.png", + "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\currency_star.png" + }, + { + "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_seekbar_track_material.xml", + "source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\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\\tools_bomb.png", + "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tools_bomb.png" + }, + { + "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_cab_background_internal_bg.xml", + "source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_cab_background_internal_bg.xml" + }, + { + "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tutorial_toolshop_all_tools.png", + "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tutorial_toolshop_all_tools.png" + }, + { + "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\playershapes_hypno_spiral.png", + "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\playershapes_hypno_spiral.png" + }, + { + "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_dialog_material_background_dark.xml", + "source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_dialog_material_background_dark.xml" + }, + { + "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_tab_indicator_material.xml", + "source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_tab_indicator_material.xml" + }, { "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_seekbar_thumb_material.xml", "source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_seekbar_thumb_material.xml" @@ -63,21 +187,13 @@ "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\xml_background_tutorialtextview.xml", "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\xml_background_tutorialtextview.xml" }, - { - "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_spinner_textfield_background_material.xml", - "source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_spinner_textfield_background_material.xml" - }, { "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_textfield_search_material.xml", "source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_textfield_search_material.xml" }, { - "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tutorial_place_ramp_obstacle.png", - "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tutorial_place_ramp_obstacle.png" - }, - { - "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tutorial_to_toolshop.png", - "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tutorial_to_toolshop.png" + "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_spinner_textfield_background_material.xml", + "source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_spinner_textfield_background_material.xml" }, { "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\lock_unlocked.png", @@ -91,22 +207,10 @@ "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\xml_selector_pricebutton.xml", "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\xml_selector_pricebutton.xml" }, - { - "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tick.png", - "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tick.png" - }, { "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tools_springbutton.png", "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tools_springbutton.png" }, - { - "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\\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\\tutorial_toolbar.png", "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tutorial_toolbar.png" @@ -115,26 +219,14 @@ "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tutorial_place_ramp_gap.png", "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tutorial_place_ramp_gap.png" }, - { - "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tools_rampbutton.png", - "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tools_rampbutton.png" - }, { "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\goal.png", "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\goal.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\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_btn_colored_material.xml" }, - { - "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\\radius.png", "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\radius.png" @@ -163,14 +255,6 @@ "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\\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\\terrain_c_grass.png", - "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\terrain_c_grass.png" - }, { "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" @@ -187,18 +271,10 @@ "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\currency_energy_empty.png", "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\currency_energy_empty.png" }, - { - "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\xml_layers_toolprogressbar.xml", - "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\xml_layers_toolprogressbar.xml" - }, { "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\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_edit_text_material.xml" - }, { "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\xml_selector_sound.xml", "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\xml_selector_sound.xml" @@ -207,22 +283,10 @@ "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\playershapes_pacman.png", "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\playershapes_pacman.png" }, - { - "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_item_background_holo_light.xml", - "source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_item_background_holo_light.xml" - }, { "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tutorial_toolshop_inspector.png", "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tutorial_toolshop_inspector.png" }, - { - "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tutorial_toolshop_equip_spring.png", - "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tutorial_toolshop_equip_spring.png" - }, - { - "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\currency_star_empty.png", - "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\currency_star_empty.png" - }, { "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\magnet_field.png", "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\magnet_field.png" @@ -235,14 +299,6 @@ "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\arrow_green.png", "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\arrow_green.png" }, - { - "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\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\\tutorial_toolshop_toolbar.png", - "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tutorial_toolshop_toolbar.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" @@ -255,38 +311,14 @@ "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_ratingbar_full_material.xml", "source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_ratingbar_full_material.xml" }, - { - "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tools_ramp.png", - "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tools_ramp.png" - }, - { - "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_list_selector_background_transition_holo_dark.xml", - "source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_list_selector_background_transition_holo_dark.xml" - }, { "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\splitter.png", "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\splitter.png" }, - { - "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\\tip_icon.png", - "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tip_icon.png" - }, - { - "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_cab_background_top_material.xml", - "source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_cab_background_top_material.xml" - }, { "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tools_emptybutton.png", "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tools_emptybutton.png" }, - { - "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_text_cursor_material.xml", - "source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_text_cursor_material.xml" - }, { "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\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_list_selector_background_transition_holo_light.xml" @@ -303,18 +335,10 @@ "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_list_selector_holo_light.xml", "source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_list_selector_holo_light.xml" }, - { - "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_switch_thumb_material.xml", - "source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_switch_thumb_material.xml" - }, { "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tools_bombbutton.png", "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tools_bombbutton.png" }, - { - "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\xml_background_bountymessage.xml", - "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\xml_background_bountymessage.xml" - }, { "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\playershapes_clock.png", "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\playershapes_clock.png" @@ -323,34 +347,10 @@ "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\\currency_energy.png", - "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\currency_energy.png" - }, - { - "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\xml_background_worldbutton.xml", - "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\xml_background_worldbutton.xml" - }, { "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\\currency_star.png", - "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\currency_star.png" - }, - { - "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_seekbar_track_material.xml", - "source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\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" diff --git a/app/build/intermediates/blame/res/debug/single/layout.json b/app/build/intermediates/blame/res/debug/single/layout.json index 841bd1c..6c3888f 100644 --- a/app/build/intermediates/blame/res/debug/single/layout.json +++ b/app/build/intermediates/blame/res/debug/single/layout.json @@ -223,6 +223,10 @@ "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\abc_alert_dialog_button_bar_material.xml", "source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\layout\\abc_alert_dialog_button_bar_material.xml" }, + { + "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\gl_test_screen.xml", + "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\layout\\gl_test_screen.xml" + }, { "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\abc_action_menu_item_layout.xml", "source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\layout\\abc_action_menu_item_layout.xml" diff --git a/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/app/build/intermediates/incremental/mergeDebugAssets/merger.xml index 0819bff..d754f1f 100644 --- a/app/build/intermediates/incremental/mergeDebugAssets/merger.xml +++ b/app/build/intermediates/incremental/mergeDebugAssets/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/app/build/intermediates/incremental/mergeDebugResources/merger.xml b/app/build/intermediates/incremental/mergeDebugResources/merger.xml index 7b65382..622410f 100644 --- a/app/build/intermediates/incremental/mergeDebugResources/merger.xml +++ b/app/build/intermediates/incremental/mergeDebugResources/merger.xml @@ -1346,7 +1346,7 @@ ?android:attr/actionMenuTextAppearance @drawable/abc_control_background_material -