From 757c13c31c07121b70f8fd5c7198e6b47be84b23 Mon Sep 17 00:00:00 2001 From: = <=> Date: Sun, 22 Oct 2017 18:48:00 +0200 Subject: [PATCH] First implementation of Shape shop --- app/build.gradle | 4 +- .../debug/android/support/v7/appcompat/R.java | 4 +- .../assets/debug/levelpacks/Grasslands.xml | 20 +- .../debug/particleEffects/collectStar.pe | 2 +- .../assets/debug/particleEffects/explosion.pe | 2 +- .../assets/debug/particleEffects/magnet.pe | 2 +- .../blame/res/debug/multi/values.json | 3184 +++++++++-------- .../blame/res/debug/single/anim.json | 4 + .../blame/res/debug/single/drawable.json | 40 +- .../blame/res/debug/single/layout.json | 20 +- .../mergeDebugResources/merger.xml | 4 +- .../manifests/full/debug/AndroidManifest.xml | 4 +- .../res/merged/debug/layout/topbar.xml | 21 +- .../res/merged/debug/values/values.xml | 5 + .../intermediates/res/resources-debug.ap_ | Bin 3664764 -> 3669516 bytes app/build/intermediates/symbols/debug/R.txt | 281 +- app/src/main/assets/levelpacks/Grasslands.xml | 20 +- .../assets/particleEffects/collectEnergy.pe | 2 +- .../assets/particleEffects/collectStar.pe | 2 +- .../main/assets/particleEffects/explosion.pe | 2 +- app/src/main/assets/particleEffects/fire.pe | 2 +- .../main/assets/particleEffects/firework.pe | 2 +- app/src/main/assets/particleEffects/magnet.pe | 2 +- .../entities/shapes/PlayerShape.java | 57 + .../PlayerShapeButtonOnClickListener.java | 13 + .../main/screens/PlayerShapeShopScreen.java | 70 + .../endlessroll/views/PlayerShapeButton.java | 63 + .../main/res/anim/shape_button_rotation.xml | 12 + .../drawable/xml_selector_shapeshopbutton.xml | 9 + ...on.xml => xml_selector_toolshopbutton.xml} | 4 +- app/src/main/res/layout/shape_button.xml | 22 + app/src/main/res/layout/shape_shop.xml | 55 + app/src/main/res/layout/topbar.xml | 21 +- app/src/main/res/values/strings.xml | 6 + particlelab/src/main/assets/allSettings.pe | 2 +- particlelab/src/main/assets/colors.pe | 2 +- particlelab/src/main/assets/conti.pe | 2 +- particlelab/src/main/assets/explosion.pe | 2 +- particlelab/src/main/assets/fire.pe | 2 +- particlelab/src/main/assets/firework.pe | 2 +- particlelab/src/main/assets/gravity.pe | 2 +- particlelab/src/main/assets/magnet.pe | 2 +- particlelab/src/main/assets/offset.pe | 2 +- particlelab/src/main/assets/oneDirection.pe | 2 +- particlelab/src/main/assets/pe.pe | 2 +- particlelab/src/main/assets/rotation.pe | 2 +- particlelab/src/main/assets/test.txt | 2 +- .../src/main/res/drawable/custom_button.xml | 12 +- .../res/drawable/tool_slot_background.xml | 6 +- .../res/drawable/toolprogressbarlayers.xml | 8 +- .../drawable/unlock_message_background.xml | 6 +- .../res/drawable/worldbutton_background.xml | 6 +- 52 files changed, 2237 insertions(+), 1788 deletions(-) create mode 100644 app/src/main/java/de/frajul/endlessroll/entities/shapes/PlayerShape.java create mode 100644 app/src/main/java/de/frajul/endlessroll/entities/shapes/PlayerShapeButtonOnClickListener.java create mode 100644 app/src/main/java/de/frajul/endlessroll/main/screens/PlayerShapeShopScreen.java create mode 100644 app/src/main/java/de/frajul/endlessroll/views/PlayerShapeButton.java create mode 100644 app/src/main/res/anim/shape_button_rotation.xml create mode 100644 app/src/main/res/drawable/xml_selector_shapeshopbutton.xml rename app/src/main/res/drawable/{xml_selector_shopbutton.xml => xml_selector_toolshopbutton.xml} (70%) create mode 100644 app/src/main/res/layout/shape_button.xml create mode 100644 app/src/main/res/layout/shape_shop.xml diff --git a/app/build.gradle b/app/build.gradle index 706a6f1..6e4cd60 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ android { applicationId 'de.frajul.endlessroll' minSdkVersion 12 targetSdkVersion 23 - versionCode 2 - versionName '1.0' + versionCode 3 + versionName '0.3.1' } buildTypes { release { 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 e00c4f6..9ad272e 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 @@ -456,7 +456,7 @@ public final class R { public static final int abc_textfield_search_activated_mtrl_alpha = 0x7f020042; public static final int abc_textfield_search_default_mtrl_alpha = 0x7f020043; public static final int abc_textfield_search_material = 0x7f020044; - public static final int notification_template_icon_bg = 0x7f020091; + public static final int notification_template_icon_bg = 0x7f020092; } public static final class id { public static final int action0 = 0x7f0e006c; @@ -597,7 +597,7 @@ public final class R { 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 = 0x7f04002f; + public static final int support_simple_spinner_dropdown_item = 0x7f040031; } 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 b055fe3..8c339f5 100644 --- a/app/build/intermediates/assets/debug/levelpacks/Grasslands.xml +++ b/app/build/intermediates/assets/debug/levelpacks/Grasslands.xml @@ -637,34 +637,34 @@ - + - + - + - + - + - + - + - + - + - + diff --git a/app/build/intermediates/assets/debug/particleEffects/collectStar.pe b/app/build/intermediates/assets/debug/particleEffects/collectStar.pe index 245517a..8f8bb0c 100644 --- a/app/build/intermediates/assets/debug/particleEffects/collectStar.pe +++ b/app/build/intermediates/assets/debug/particleEffects/collectStar.pe @@ -38,7 +38,7 @@ active: false - Y Offset - active: false - Spawn Shape - -shape: point +spawnShape: point - Spawn Width - lowMin: 0.0 lowMax: 0.0 diff --git a/app/build/intermediates/assets/debug/particleEffects/explosion.pe b/app/build/intermediates/assets/debug/particleEffects/explosion.pe index c606a0e..79e7eb6 100644 --- a/app/build/intermediates/assets/debug/particleEffects/explosion.pe +++ b/app/build/intermediates/assets/debug/particleEffects/explosion.pe @@ -44,7 +44,7 @@ active: false - Y Offset - active: false - Spawn Shape - -shape: square +spawnShape: square - Spawn Width - lowMin: 200.0 lowMax: 200.0 diff --git a/app/build/intermediates/assets/debug/particleEffects/magnet.pe b/app/build/intermediates/assets/debug/particleEffects/magnet.pe index 93bf1e5..329a102 100644 --- a/app/build/intermediates/assets/debug/particleEffects/magnet.pe +++ b/app/build/intermediates/assets/debug/particleEffects/magnet.pe @@ -38,7 +38,7 @@ active: false - Y Offset - active: false - Spawn Shape - -shape: point +spawnShape: point - Spawn Width - lowMin: 0.0 lowMax: 0.0 diff --git a/app/build/intermediates/blame/res/debug/multi/values.json b/app/build/intermediates/blame/res/debug/multi/values.json index 2b2ec8f..c5a449e 100644 --- a/app/build/intermediates/blame/res/debug/multi/values.json +++ b/app/build/intermediates/blame/res/debug/multi/values.json @@ -2648,68 +2648,103 @@ "startLine": 256, "startColumn": 4, "startOffset": 30741, - "endColumn": 63, - "endOffset": 30800 + "endColumn": 54, + "endOffset": 30791 }, "from": { - "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" + "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml", + "position": { + "startLine": 44, + "startColumn": 4, + "startOffset": 2595, + "endColumn": 54, + "endOffset": 2645 + } } }, { "to": { "startLine": 257, "startColumn": 4, - "startOffset": 30805, - "endColumn": 48, - "endOffset": 30849 + "startOffset": 30796, + "endColumn": 56, + "endOffset": 30848 }, "from": { - "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" + "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml", + "position": { + "startLine": 45, + "startColumn": 4, + "startOffset": 2651, + "endColumn": 56, + "endOffset": 2703 + } } }, { "to": { "startLine": 258, "startColumn": 4, - "startOffset": 30854, - "endColumn": 56, - "endOffset": 30906 + "startOffset": 30853, + "endColumn": 63, + "endOffset": 30912 }, "from": { - "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" + "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml", + "position": { + "startLine": 46, + "startColumn": 4, + "startOffset": 2709, + "endColumn": 63, + "endOffset": 2768 + } } }, { "to": { "startLine": 259, "startColumn": 4, - "startOffset": 30911, - "endColumn": 48, - "endOffset": 30955 + "startOffset": 30917, + "endColumn": 58, + "endOffset": 30971 }, "from": { - "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" + "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml", + "position": { + "startLine": 47, + "startColumn": 4, + "startOffset": 2774, + "endColumn": 58, + "endOffset": 2828 + } } }, { "to": { "startLine": 260, "startColumn": 4, - "startOffset": 30960, - "endColumn": 56, - "endOffset": 31012 + "startOffset": 30976, + "endColumn": 58, + "endOffset": 31030 }, "from": { - "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" + "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml", + "position": { + "startLine": 48, + "startColumn": 4, + "startOffset": 2834, + "endColumn": 58, + "endOffset": 2888 + } } }, { "to": { "startLine": 261, "startColumn": 4, - "startOffset": 31017, - "endColumn": 48, - "endOffset": 31061 + "startOffset": 31035, + "endColumn": 63, + "endOffset": 31094 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -2719,9 +2754,9 @@ "to": { "startLine": 262, "startColumn": 4, - "startOffset": 31066, - "endColumn": 54, - "endOffset": 31116 + "startOffset": 31099, + "endColumn": 48, + "endOffset": 31143 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -2731,9 +2766,9 @@ "to": { "startLine": 263, "startColumn": 4, - "startOffset": 31121, - "endColumn": 87, - "endOffset": 31204 + "startOffset": 31148, + "endColumn": 56, + "endOffset": 31200 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -2743,9 +2778,9 @@ "to": { "startLine": 264, "startColumn": 4, - "startOffset": 31209, - "endColumn": 50, - "endOffset": 31255 + "startOffset": 31205, + "endColumn": 48, + "endOffset": 31249 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -2755,9 +2790,9 @@ "to": { "startLine": 265, "startColumn": 4, - "startOffset": 31260, - "endColumn": 75, - "endOffset": 31331 + "startOffset": 31254, + "endColumn": 56, + "endOffset": 31306 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -2767,9 +2802,9 @@ "to": { "startLine": 266, "startColumn": 4, - "startOffset": 31336, - "endColumn": 96, - "endOffset": 31428 + "startOffset": 31311, + "endColumn": 48, + "endOffset": 31355 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -2779,21 +2814,21 @@ "to": { "startLine": 267, "startColumn": 4, - "startOffset": 31433, - "endColumn": 70, - "endOffset": 31499 + "startOffset": 31360, + "endColumn": 54, + "endOffset": 31410 }, "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": 268, "startColumn": 4, - "startOffset": 31504, - "endColumn": 61, - "endOffset": 31561 + "startOffset": 31415, + "endColumn": 87, + "endOffset": 31498 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -2803,9 +2838,9 @@ "to": { "startLine": 269, "startColumn": 4, - "startOffset": 31566, - "endColumn": 47, - "endOffset": 31609 + "startOffset": 31503, + "endColumn": 50, + "endOffset": 31549 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -2815,9 +2850,9 @@ "to": { "startLine": 270, "startColumn": 4, - "startOffset": 31614, - "endColumn": 51, - "endOffset": 31661 + "startOffset": 31554, + "endColumn": 75, + "endOffset": 31625 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -2827,40 +2862,33 @@ "to": { "startLine": 271, "startColumn": 4, - "startOffset": 31666, - "endColumn": 67, - "endOffset": 31729 - }, - "from": { - "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml", - "position": { - "startLine": 49, - "startColumn": 4, - "startOffset": 2853, - "endColumn": 67, - "endOffset": 2916 - } - } - }, - { - "to": { - "startLine": 272, - "startColumn": 4, - "startOffset": 31734, - "endColumn": 47, - "endOffset": 31777 + "startOffset": 31630, + "endColumn": 96, + "endOffset": 31722 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" } }, + { + "to": { + "startLine": 272, + "startColumn": 4, + "startOffset": 31727, + "endColumn": 70, + "endOffset": 31793 + }, + "from": { + "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" + } + }, { "to": { "startLine": 273, "startColumn": 4, - "startOffset": 31782, - "endColumn": 51, - "endOffset": 31829 + "startOffset": 31798, + "endColumn": 61, + "endOffset": 31855 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -2870,9 +2898,9 @@ "to": { "startLine": 274, "startColumn": 4, - "startOffset": 31834, - "endColumn": 52, - "endOffset": 31882 + "startOffset": 31860, + "endColumn": 47, + "endOffset": 31903 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -2882,9 +2910,9 @@ "to": { "startLine": 275, "startColumn": 4, - "startOffset": 31887, - "endColumn": 52, - "endOffset": 31935 + "startOffset": 31908, + "endColumn": 51, + "endOffset": 31955 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -2894,9 +2922,9 @@ "to": { "startLine": 276, "startColumn": 4, - "startOffset": 31940, - "endColumn": 50, - "endOffset": 31986 + "startOffset": 31960, + "endColumn": 67, + "endOffset": 32023 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -2906,9 +2934,9 @@ "to": { "startLine": 277, "startColumn": 4, - "startOffset": 31991, - "endColumn": 54, - "endOffset": 32041 + "startOffset": 32028, + "endColumn": 47, + "endOffset": 32071 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -2918,9 +2946,9 @@ "to": { "startLine": 278, "startColumn": 4, - "startOffset": 32046, - "endColumn": 50, - "endOffset": 32092 + "startOffset": 32076, + "endColumn": 51, + "endOffset": 32123 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -2930,9 +2958,9 @@ "to": { "startLine": 279, "startColumn": 4, - "startOffset": 32097, - "endColumn": 70, - "endOffset": 32163 + "startOffset": 32128, + "endColumn": 52, + "endOffset": 32176 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -2942,9 +2970,9 @@ "to": { "startLine": 280, "startColumn": 4, - "startOffset": 32168, - "endColumn": 70, - "endOffset": 32234 + "startOffset": 32181, + "endColumn": 52, + "endOffset": 32229 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -2954,9 +2982,9 @@ "to": { "startLine": 281, "startColumn": 4, - "startOffset": 32239, - "endColumn": 55, - "endOffset": 32290 + "startOffset": 32234, + "endColumn": 50, + "endOffset": 32280 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -2966,9 +2994,9 @@ "to": { "startLine": 282, "startColumn": 4, - "startOffset": 32295, - "endColumn": 59, - "endOffset": 32350 + "startOffset": 32285, + "endColumn": 54, + "endOffset": 32335 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -2978,9 +3006,9 @@ "to": { "startLine": 283, "startColumn": 4, - "startOffset": 32355, - "endColumn": 62, - "endOffset": 32413 + "startOffset": 32340, + "endColumn": 50, + "endOffset": 32386 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -2990,9 +3018,9 @@ "to": { "startLine": 284, "startColumn": 4, - "startOffset": 32418, - "endColumn": 52, - "endOffset": 32466 + "startOffset": 32391, + "endColumn": 70, + "endOffset": 32457 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -3002,9 +3030,9 @@ "to": { "startLine": 285, "startColumn": 4, - "startOffset": 32471, - "endColumn": 88, - "endOffset": 32555 + "startOffset": 32462, + "endColumn": 70, + "endOffset": 32528 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -3014,9 +3042,9 @@ "to": { "startLine": 286, "startColumn": 4, - "startOffset": 32560, - "endColumn": 100, - "endOffset": 32656 + "startOffset": 32533, + "endColumn": 55, + "endOffset": 32584 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -3026,9 +3054,9 @@ "to": { "startLine": 287, "startColumn": 4, - "startOffset": 32661, - "endColumn": 68, - "endOffset": 32725 + "startOffset": 32589, + "endColumn": 59, + "endOffset": 32644 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -3038,9 +3066,9 @@ "to": { "startLine": 288, "startColumn": 4, - "startOffset": 32730, - "endColumn": 92, - "endOffset": 32818 + "startOffset": 32649, + "endColumn": 62, + "endOffset": 32707 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -3050,9 +3078,9 @@ "to": { "startLine": 289, "startColumn": 4, - "startOffset": 32823, - "endColumn": 95, - "endOffset": 32914 + "startOffset": 32712, + "endColumn": 52, + "endOffset": 32760 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -3062,9 +3090,9 @@ "to": { "startLine": 290, "startColumn": 4, - "startOffset": 32919, - "endColumn": 128, - "endOffset": 33043 + "startOffset": 32765, + "endColumn": 88, + "endOffset": 32849 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -3074,9 +3102,9 @@ "to": { "startLine": 291, "startColumn": 4, - "startOffset": 33048, - "endColumn": 136, - "endOffset": 33180 + "startOffset": 32854, + "endColumn": 100, + "endOffset": 32950 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -3086,9 +3114,9 @@ "to": { "startLine": 292, "startColumn": 4, - "startOffset": 33185, - "endColumn": 141, - "endOffset": 33322 + "startOffset": 32955, + "endColumn": 68, + "endOffset": 33019 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -3098,9 +3126,9 @@ "to": { "startLine": 293, "startColumn": 4, - "startOffset": 33327, - "endColumn": 121, - "endOffset": 33444 + "startOffset": 33024, + "endColumn": 92, + "endOffset": 33112 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -3110,9 +3138,9 @@ "to": { "startLine": 294, "startColumn": 4, - "startOffset": 33449, - "endColumn": 119, - "endOffset": 33564 + "startOffset": 33117, + "endColumn": 95, + "endOffset": 33208 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -3122,9 +3150,9 @@ "to": { "startLine": 295, "startColumn": 4, - "startOffset": 33569, - "endColumn": 239, - "endOffset": 33804 + "startOffset": 33213, + "endColumn": 128, + "endOffset": 33337 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -3134,9 +3162,9 @@ "to": { "startLine": 296, "startColumn": 4, - "startOffset": 33809, - "endColumn": 103, - "endOffset": 33908 + "startOffset": 33342, + "endColumn": 136, + "endOffset": 33474 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -3146,9 +3174,9 @@ "to": { "startLine": 297, "startColumn": 4, - "startOffset": 33913, - "endColumn": 97, - "endOffset": 34006 + "startOffset": 33479, + "endColumn": 141, + "endOffset": 33616 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -3158,9 +3186,9 @@ "to": { "startLine": 298, "startColumn": 4, - "startOffset": 34011, - "endColumn": 82, - "endOffset": 34089 + "startOffset": 33621, + "endColumn": 121, + "endOffset": 33738 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -3170,9 +3198,9 @@ "to": { "startLine": 299, "startColumn": 4, - "startOffset": 34094, - "endColumn": 154, - "endOffset": 34244 + "startOffset": 33743, + "endColumn": 119, + "endOffset": 33858 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -3182,9 +3210,9 @@ "to": { "startLine": 300, "startColumn": 4, - "startOffset": 34249, - "endColumn": 80, - "endOffset": 34325 + "startOffset": 33863, + "endColumn": 239, + "endOffset": 34098 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -3194,9 +3222,9 @@ "to": { "startLine": 301, "startColumn": 4, - "startOffset": 34330, - "endColumn": 68, - "endOffset": 34394 + "startOffset": 34103, + "endColumn": 103, + "endOffset": 34202 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -3206,9 +3234,9 @@ "to": { "startLine": 302, "startColumn": 4, - "startOffset": 34399, - "endColumn": 67, - "endOffset": 34462 + "startOffset": 34207, + "endColumn": 97, + "endOffset": 34300 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -3218,9 +3246,9 @@ "to": { "startLine": 303, "startColumn": 4, - "startOffset": 34467, - "endColumn": 70, - "endOffset": 34533 + "startOffset": 34305, + "endColumn": 82, + "endOffset": 34383 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" @@ -3230,45 +3258,69 @@ "to": { "startLine": 304, "startColumn": 4, - "startOffset": 34538, - "endColumn": 77, - "endOffset": 34611 + "startOffset": 34388, + "endColumn": 154, + "endOffset": 34538 }, "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": 305, "startColumn": 4, - "startOffset": 34616, - "endColumn": 89, - "endOffset": 34701 + "startOffset": 34543, + "endColumn": 80, + "endOffset": 34619 }, "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": 306, "startColumn": 4, - "startOffset": 34706, - "endColumn": 87, - "endOffset": 34789 + "startOffset": 34624, + "endColumn": 68, + "endOffset": 34688 }, "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": 307, "startColumn": 4, - "startOffset": 34794, - "endColumn": 95, - "endOffset": 34885 + "startOffset": 34693, + "endColumn": 67, + "endOffset": 34756 + }, + "from": { + "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" + } + }, + { + "to": { + "startLine": 308, + "startColumn": 4, + "startOffset": 34761, + "endColumn": 70, + "endOffset": 34827 + }, + "from": { + "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\strings.xml" + } + }, + { + "to": { + "startLine": 309, + "startColumn": 4, + "startOffset": 34832, + "endColumn": 77, + "endOffset": 34905 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3276,12 +3328,48 @@ }, { "to": { - "startLine": 308, + "startLine": 310, "startColumn": 4, - "startOffset": 34890, - "endLine": 311, + "startOffset": 34910, + "endColumn": 89, + "endOffset": 34995 + }, + "from": { + "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" + } + }, + { + "to": { + "startLine": 311, + "startColumn": 4, + "startOffset": 35000, + "endColumn": 87, + "endOffset": 35083 + }, + "from": { + "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" + } + }, + { + "to": { + "startLine": 312, + "startColumn": 4, + "startOffset": 35088, + "endColumn": 95, + "endOffset": 35179 + }, + "from": { + "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" + } + }, + { + "to": { + "startLine": 313, + "startColumn": 4, + "startOffset": 35184, + "endLine": 316, "endColumn": 12, - "endOffset": 35089 + "endOffset": 35383 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\styles.xml" @@ -3289,37 +3377,12 @@ }, { "to": { - "startLine": 312, + "startLine": 317, "startColumn": 4, - "startOffset": 35094, - "endLine": 318, - "endColumn": 12, - "endOffset": 35590 - }, - "from": { - "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" - } - }, - { - "to": { - "startLine": 319, - "startColumn": 4, - "startOffset": 35595, - "endColumn": 88, - "endOffset": 35679 - }, - "from": { - "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" - } - }, - { - "to": { - "startLine": 320, - "startColumn": 4, - "startOffset": 35684, + "startOffset": 35388, "endLine": 323, "endColumn": 12, - "endOffset": 35926 + "endOffset": 35884 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3329,10 +3392,9 @@ "to": { "startLine": 324, "startColumn": 4, - "startOffset": 35931, - "endLine": 327, - "endColumn": 12, - "endOffset": 36207 + "startOffset": 35889, + "endColumn": 88, + "endOffset": 35973 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3340,12 +3402,25 @@ }, { "to": { - "startLine": 328, + "startLine": 325, "startColumn": 4, - "startOffset": 36212, + "startOffset": 35978, + "endLine": 328, + "endColumn": 12, + "endOffset": 36220 + }, + "from": { + "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" + } + }, + { + "to": { + "startLine": 329, + "startColumn": 4, + "startOffset": 36225, "endLine": 332, "endColumn": 12, - "endOffset": 36492 + "endOffset": 36501 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3355,10 +3430,10 @@ "to": { "startLine": 333, "startColumn": 4, - "startOffset": 36497, - "endLine": 338, + "startOffset": 36506, + "endLine": 337, "endColumn": 12, - "endOffset": 36885 + "endOffset": 36786 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3366,12 +3441,12 @@ }, { "to": { - "startLine": 339, + "startLine": 338, "startColumn": 4, - "startOffset": 36890, - "endLine": 345, + "startOffset": 36791, + "endLine": 343, "endColumn": 12, - "endOffset": 37362 + "endOffset": 37179 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3379,12 +3454,12 @@ }, { "to": { - "startLine": 346, + "startLine": 344, "startColumn": 4, - "startOffset": 37367, - "endLine": 349, + "startOffset": 37184, + "endLine": 350, "endColumn": 12, - "endOffset": 37584 + "endOffset": 37656 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3392,12 +3467,12 @@ }, { "to": { - "startLine": 350, + "startLine": 351, "startColumn": 4, - "startOffset": 37589, - "endLine": 353, + "startOffset": 37661, + "endLine": 354, "endColumn": 12, - "endOffset": 37806 + "endOffset": 37878 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3405,12 +3480,12 @@ }, { "to": { - "startLine": 354, + "startLine": 355, "startColumn": 4, - "startOffset": 37811, + "startOffset": 37883, "endLine": 358, "endColumn": 12, - "endOffset": 38074 + "endOffset": 38100 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3420,10 +3495,10 @@ "to": { "startLine": 359, "startColumn": 4, - "startOffset": 38079, - "endLine": 362, + "startOffset": 38105, + "endLine": 363, "endColumn": 12, - "endOffset": 38301 + "endOffset": 38368 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3431,12 +3506,12 @@ }, { "to": { - "startLine": 363, + "startLine": 364, "startColumn": 4, - "startOffset": 38306, - "endLine": 366, + "startOffset": 38373, + "endLine": 367, "endColumn": 12, - "endOffset": 38531 + "endOffset": 38595 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3444,12 +3519,12 @@ }, { "to": { - "startLine": 367, + "startLine": 368, "startColumn": 4, - "startOffset": 38536, - "endLine": 370, + "startOffset": 38600, + "endLine": 371, "endColumn": 12, - "endOffset": 38761 + "endOffset": 38825 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3457,12 +3532,12 @@ }, { "to": { - "startLine": 371, + "startLine": 372, "startColumn": 4, - "startOffset": 38766, - "endLine": 374, + "startOffset": 38830, + "endLine": 375, "endColumn": 12, - "endOffset": 38991 + "endOffset": 39055 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3470,12 +3545,12 @@ }, { "to": { - "startLine": 375, + "startLine": 376, "startColumn": 4, - "startOffset": 38996, - "endLine": 378, + "startOffset": 39060, + "endLine": 379, "endColumn": 12, - "endOffset": 39221 + "endOffset": 39285 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3483,12 +3558,12 @@ }, { "to": { - "startLine": 379, + "startLine": 380, "startColumn": 4, - "startOffset": 39226, - "endLine": 382, + "startOffset": 39290, + "endLine": 383, "endColumn": 12, - "endOffset": 39448 + "endOffset": 39515 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3496,12 +3571,12 @@ }, { "to": { - "startLine": 383, + "startLine": 384, "startColumn": 4, - "startOffset": 39453, - "endLine": 386, + "startOffset": 39520, + "endLine": 387, "endColumn": 12, - "endOffset": 39687 + "endOffset": 39742 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3509,12 +3584,12 @@ }, { "to": { - "startLine": 387, + "startLine": 388, "startColumn": 4, - "startOffset": 39692, - "endLine": 390, + "startOffset": 39747, + "endLine": 391, "endColumn": 12, - "endOffset": 39913 + "endOffset": 39981 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3522,12 +3597,12 @@ }, { "to": { - "startLine": 391, + "startLine": 392, "startColumn": 4, - "startOffset": 39918, - "endLine": 394, + "startOffset": 39986, + "endLine": 395, "endColumn": 12, - "endOffset": 40158 + "endOffset": 40207 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3535,12 +3610,12 @@ }, { "to": { - "startLine": 395, + "startLine": 396, "startColumn": 4, - "startOffset": 40163, - "endLine": 396, + "startOffset": 40212, + "endLine": 399, "endColumn": 12, - "endOffset": 40288 + "endOffset": 40452 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3548,12 +3623,12 @@ }, { "to": { - "startLine": 397, + "startLine": 400, "startColumn": 4, - "startOffset": 40293, - "endLine": 398, + "startOffset": 40457, + "endLine": 401, "endColumn": 12, - "endOffset": 40418 + "endOffset": 40582 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3561,12 +3636,12 @@ }, { "to": { - "startLine": 399, + "startLine": 402, "startColumn": 4, - "startOffset": 40423, - "endLine": 402, + "startOffset": 40587, + "endLine": 403, "endColumn": 12, - "endOffset": 40648 + "endOffset": 40712 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3574,12 +3649,12 @@ }, { "to": { - "startLine": 403, + "startLine": 404, "startColumn": 4, - "startOffset": 40653, - "endLine": 406, + "startOffset": 40717, + "endLine": 407, "endColumn": 12, - "endOffset": 40896 + "endOffset": 40942 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3587,12 +3662,12 @@ }, { "to": { - "startLine": 407, + "startLine": 408, "startColumn": 4, - "startOffset": 40901, - "endLine": 410, + "startOffset": 40947, + "endLine": 411, "endColumn": 12, - "endOffset": 41115 + "endOffset": 41190 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3600,12 +3675,12 @@ }, { "to": { - "startLine": 411, + "startLine": 412, "startColumn": 4, - "startOffset": 41120, + "startOffset": 41195, "endLine": 415, "endColumn": 12, - "endOffset": 41398 + "endOffset": 41409 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3615,10 +3690,10 @@ "to": { "startLine": 416, "startColumn": 4, - "startOffset": 41403, - "endLine": 419, + "startOffset": 41414, + "endLine": 420, "endColumn": 12, - "endOffset": 41606 + "endOffset": 41692 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3626,12 +3701,12 @@ }, { "to": { - "startLine": 420, + "startLine": 421, "startColumn": 4, - "startOffset": 41611, - "endLine": 422, + "startOffset": 41697, + "endLine": 424, "endColumn": 12, - "endOffset": 41737 + "endOffset": 41900 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3639,12 +3714,12 @@ }, { "to": { - "startLine": 423, + "startLine": 425, "startColumn": 4, - "startOffset": 41742, - "endLine": 426, + "startOffset": 41905, + "endLine": 427, "endColumn": 12, - "endOffset": 41964 + "endOffset": 42031 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3652,12 +3727,12 @@ }, { "to": { - "startLine": 427, + "startLine": 428, "startColumn": 4, - "startOffset": 41969, - "endLine": 430, + "startOffset": 42036, + "endLine": 431, "endColumn": 12, - "endOffset": 42210 + "endOffset": 42258 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3665,12 +3740,12 @@ }, { "to": { - "startLine": 431, + "startLine": 432, "startColumn": 4, - "startOffset": 42215, - "endLine": 434, + "startOffset": 42263, + "endLine": 435, "endColumn": 12, - "endOffset": 42435 + "endOffset": 42504 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3678,12 +3753,12 @@ }, { "to": { - "startLine": 435, + "startLine": 436, "startColumn": 4, - "startOffset": 42440, - "endLine": 438, + "startOffset": 42509, + "endLine": 439, "endColumn": 12, - "endOffset": 42682 + "endOffset": 42729 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3691,12 +3766,12 @@ }, { "to": { - "startLine": 439, + "startLine": 440, "startColumn": 4, - "startOffset": 42687, - "endLine": 442, + "startOffset": 42734, + "endLine": 443, "endColumn": 12, - "endOffset": 42903 + "endOffset": 42976 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3704,12 +3779,12 @@ }, { "to": { - "startLine": 443, + "startLine": 444, "startColumn": 4, - "startOffset": 42908, - "endLine": 446, + "startOffset": 42981, + "endLine": 447, "endColumn": 12, - "endOffset": 43148 + "endOffset": 43197 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3717,12 +3792,12 @@ }, { "to": { - "startLine": 447, + "startLine": 448, "startColumn": 4, - "startOffset": 43153, - "endLine": 450, + "startOffset": 43202, + "endLine": 451, "endColumn": 12, - "endOffset": 43422 + "endOffset": 43442 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3730,12 +3805,12 @@ }, { "to": { - "startLine": 451, + "startLine": 452, "startColumn": 4, - "startOffset": 43427, - "endLine": 454, + "startOffset": 43447, + "endLine": 455, "endColumn": 12, - "endOffset": 43723 + "endOffset": 43716 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3743,12 +3818,12 @@ }, { "to": { - "startLine": 455, + "startLine": 456, "startColumn": 4, - "startOffset": 43728, - "endLine": 458, + "startOffset": 43721, + "endLine": 459, "endColumn": 12, - "endOffset": 44047 + "endOffset": 44017 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3756,12 +3831,12 @@ }, { "to": { - "startLine": 459, + "startLine": 460, "startColumn": 4, - "startOffset": 44052, - "endLine": 462, + "startOffset": 44022, + "endLine": 463, "endColumn": 12, - "endOffset": 44338 + "endOffset": 44341 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3769,24 +3844,12 @@ }, { "to": { - "startLine": 463, + "startLine": 464, "startColumn": 4, - "startOffset": 44343, - "endLine": 466, + "startOffset": 44346, + "endLine": 467, "endColumn": 12, - "endOffset": 44652 - }, - "from": { - "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" - } - }, - { - "to": { - "startLine": 467, - "startColumn": 4, - "startOffset": 44657, - "endColumn": 136, - "endOffset": 44789 + "endOffset": 44632 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3796,34 +3859,22 @@ "to": { "startLine": 468, "startColumn": 4, - "startOffset": 44794, - "endColumn": 130, - "endOffset": 44920 - }, - "from": { - "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" - } - }, - { - "to": { - "startLine": 469, - "startColumn": 4, - "startOffset": 44925, - "endColumn": 104, - "endOffset": 45025 - }, - "from": { - "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" - } - }, - { - "to": { - "startLine": 470, - "startColumn": 4, - "startOffset": 45030, - "endLine": 472, + "startOffset": 44637, + "endLine": 471, "endColumn": 12, - "endOffset": 45229 + "endOffset": 44946 + }, + "from": { + "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" + } + }, + { + "to": { + "startLine": 472, + "startColumn": 4, + "startOffset": 44951, + "endColumn": 136, + "endOffset": 45083 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3833,10 +3884,9 @@ "to": { "startLine": 473, "startColumn": 4, - "startOffset": 45234, - "endLine": 475, - "endColumn": 12, - "endOffset": 45437 + "startOffset": 45088, + "endColumn": 130, + "endOffset": 45214 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3844,12 +3894,24 @@ }, { "to": { - "startLine": 476, + "startLine": 474, "startColumn": 4, - "startOffset": 45442, + "startOffset": 45219, + "endColumn": 104, + "endOffset": 45319 + }, + "from": { + "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" + } + }, + { + "to": { + "startLine": 475, + "startColumn": 4, + "startOffset": 45324, "endLine": 477, "endColumn": 12, - "endOffset": 45561 + "endOffset": 45523 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3859,22 +3921,10 @@ "to": { "startLine": 478, "startColumn": 4, - "startOffset": 45566, - "endLine": 479, + "startOffset": 45528, + "endLine": 480, "endColumn": 12, - "endOffset": 45685 - }, - "from": { - "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" - } - }, - { - "to": { - "startLine": 480, - "startColumn": 4, - "startOffset": 45690, - "endColumn": 104, - "endOffset": 45790 + "endOffset": 45731 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3884,9 +3934,10 @@ "to": { "startLine": 481, "startColumn": 4, - "startOffset": 45795, - "endColumn": 116, - "endOffset": 45907 + "startOffset": 45736, + "endLine": 482, + "endColumn": 12, + "endOffset": 45855 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3894,12 +3945,12 @@ }, { "to": { - "startLine": 482, + "startLine": 483, "startColumn": 4, - "startOffset": 45912, + "startOffset": 45860, "endLine": 484, "endColumn": 12, - "endOffset": 46121 + "endOffset": 45979 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3909,10 +3960,21 @@ "to": { "startLine": 485, "startColumn": 4, - "startOffset": 46126, - "endLine": 486, - "endColumn": 12, - "endOffset": 46267 + "startOffset": 45984, + "endColumn": 104, + "endOffset": 46084 + }, + "from": { + "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" + } + }, + { + "to": { + "startLine": 486, + "startColumn": 4, + "startOffset": 46089, + "endColumn": 116, + "endOffset": 46201 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3922,10 +3984,10 @@ "to": { "startLine": 487, "startColumn": 4, - "startOffset": 46272, - "endLine": 488, + "startOffset": 46206, + "endLine": 489, "endColumn": 12, - "endOffset": 46407 + "endOffset": 46415 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3933,12 +3995,12 @@ }, { "to": { - "startLine": 489, + "startLine": 490, "startColumn": 4, - "startOffset": 46412, - "endLine": 490, + "startOffset": 46420, + "endLine": 491, "endColumn": 12, - "endOffset": 46493 + "endOffset": 46561 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3946,12 +4008,25 @@ }, { "to": { - "startLine": 491, + "startLine": 492, "startColumn": 4, - "startOffset": 46498, + "startOffset": 46566, + "endLine": 493, + "endColumn": 12, + "endOffset": 46701 + }, + "from": { + "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" + } + }, + { + "to": { + "startLine": 494, + "startColumn": 4, + "startOffset": 46706, "endLine": 495, "endColumn": 12, - "endOffset": 46841 + "endOffset": 46787 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3961,22 +4036,10 @@ "to": { "startLine": 496, "startColumn": 4, - "startOffset": 46846, - "endColumn": 87, - "endOffset": 46929 - }, - "from": { - "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" - } - }, - { - "to": { - "startLine": 497, - "startColumn": 4, - "startOffset": 46934, + "startOffset": 46792, "endLine": 500, "endColumn": 12, - "endOffset": 47159 + "endOffset": 47135 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3986,10 +4049,9 @@ "to": { "startLine": 501, "startColumn": 4, - "startOffset": 47164, - "endLine": 506, - "endColumn": 12, - "endOffset": 47577 + "startOffset": 47140, + "endColumn": 87, + "endOffset": 47223 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -3997,12 +4059,12 @@ }, { "to": { - "startLine": 507, + "startLine": 502, "startColumn": 4, - "startOffset": 47582, - "endLine": 510, + "startOffset": 47228, + "endLine": 505, "endColumn": 12, - "endOffset": 47810 + "endOffset": 47453 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4010,11 +4072,12 @@ }, { "to": { - "startLine": 511, + "startLine": 506, "startColumn": 4, - "startOffset": 47815, - "endColumn": 81, - "endOffset": 47892 + "startOffset": 47458, + "endLine": 511, + "endColumn": 12, + "endOffset": 47871 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4024,10 +4087,10 @@ "to": { "startLine": 512, "startColumn": 4, - "startOffset": 47897, - "endLine": 513, + "startOffset": 47876, + "endLine": 515, "endColumn": 12, - "endOffset": 47990 + "endOffset": 48104 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4035,12 +4098,24 @@ }, { "to": { - "startLine": 514, + "startLine": 516, "startColumn": 4, - "startOffset": 47995, - "endLine": 524, + "startOffset": 48109, + "endColumn": 81, + "endOffset": 48186 + }, + "from": { + "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" + } + }, + { + "to": { + "startLine": 517, + "startColumn": 4, + "startOffset": 48191, + "endLine": 518, "endColumn": 12, - "endOffset": 48582 + "endOffset": 48284 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4048,24 +4123,12 @@ }, { "to": { - "startLine": 525, + "startLine": 519, "startColumn": 4, - "startOffset": 48587, - "endColumn": 99, - "endOffset": 48682 - }, - "from": { - "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" - } - }, - { - "to": { - "startLine": 526, - "startColumn": 4, - "startOffset": 48687, + "startOffset": 48289, "endLine": 529, "endColumn": 12, - "endOffset": 48918 + "endOffset": 48876 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4075,10 +4138,9 @@ "to": { "startLine": 530, "startColumn": 4, - "startOffset": 48923, - "endLine": 535, - "endColumn": 12, - "endOffset": 49342 + "startOffset": 48881, + "endColumn": 99, + "endOffset": 48976 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4086,12 +4148,12 @@ }, { "to": { - "startLine": 536, + "startLine": 531, "startColumn": 4, - "startOffset": 49347, - "endLine": 539, + "startOffset": 48981, + "endLine": 534, "endColumn": 12, - "endOffset": 49581 + "endOffset": 49212 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4099,11 +4161,12 @@ }, { "to": { - "startLine": 540, + "startLine": 535, "startColumn": 4, - "startOffset": 49586, - "endColumn": 93, - "endOffset": 49675 + "startOffset": 49217, + "endLine": 540, + "endColumn": 12, + "endOffset": 49636 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4113,9 +4176,10 @@ "to": { "startLine": 541, "startColumn": 4, - "startOffset": 49680, - "endColumn": 88, - "endOffset": 49764 + "startOffset": 49641, + "endLine": 544, + "endColumn": 12, + "endOffset": 49875 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4123,12 +4187,11 @@ }, { "to": { - "startLine": 542, + "startLine": 545, "startColumn": 4, - "startOffset": 49769, - "endLine": 545, - "endColumn": 12, - "endOffset": 50001 + "startOffset": 49880, + "endColumn": 93, + "endOffset": 49969 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4138,10 +4201,9 @@ "to": { "startLine": 546, "startColumn": 4, - "startOffset": 50006, - "endLine": 571, - "endColumn": 12, - "endOffset": 51924 + "startOffset": 49974, + "endColumn": 88, + "endOffset": 50058 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4149,12 +4211,12 @@ }, { "to": { - "startLine": 572, + "startLine": 547, "startColumn": 4, - "startOffset": 51929, - "endLine": 575, + "startOffset": 50063, + "endLine": 550, "endColumn": 12, - "endOffset": 52166 + "endOffset": 50295 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4162,12 +4224,12 @@ }, { "to": { - "startLine": 576, + "startLine": 551, "startColumn": 4, - "startOffset": 52171, - "endLine": 602, + "startOffset": 50300, + "endLine": 576, "endColumn": 12, - "endOffset": 54220 + "endOffset": 52218 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4175,12 +4237,12 @@ }, { "to": { - "startLine": 603, + "startLine": 577, "startColumn": 4, - "startOffset": 54225, - "endLine": 754, + "startOffset": 52223, + "endLine": 580, "endColumn": 12, - "endOffset": 63337 + "endOffset": 52460 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4188,12 +4250,12 @@ }, { "to": { - "startLine": 755, + "startLine": 581, "startColumn": 4, - "startOffset": 63342, - "endLine": 776, + "startOffset": 52465, + "endLine": 607, "endColumn": 12, - "endOffset": 64604 + "endOffset": 54514 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4201,12 +4263,12 @@ }, { "to": { - "startLine": 777, + "startLine": 608, "startColumn": 4, - "startOffset": 64609, - "endLine": 928, + "startOffset": 54519, + "endLine": 759, "endColumn": 12, - "endOffset": 73831 + "endOffset": 63631 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4214,12 +4276,12 @@ }, { "to": { - "startLine": 929, + "startLine": 760, "startColumn": 4, - "startOffset": 73836, - "endLine": 950, + "startOffset": 63636, + "endLine": 781, "endColumn": 12, - "endOffset": 75112 + "endOffset": 64898 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4227,12 +4289,12 @@ }, { "to": { - "startLine": 951, + "startLine": 782, "startColumn": 4, - "startOffset": 75117, - "endLine": 957, + "startOffset": 64903, + "endLine": 933, "endColumn": 12, - "endOffset": 75648 + "endOffset": 74125 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4240,12 +4302,25 @@ }, { "to": { - "startLine": 958, + "startLine": 934, "startColumn": 4, - "startOffset": 75653, + "startOffset": 74130, + "endLine": 955, + "endColumn": 12, + "endOffset": 75406 + }, + "from": { + "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" + } + }, + { + "to": { + "startLine": 956, + "startColumn": 4, + "startOffset": 75411, "endLine": 962, "endColumn": 12, - "endOffset": 75978 + "endOffset": 75942 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4255,10 +4330,10 @@ "to": { "startLine": 963, "startColumn": 4, - "startOffset": 75983, - "endLine": 983, + "startOffset": 75947, + "endLine": 967, "endColumn": 12, - "endOffset": 77101 + "endOffset": 76272 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4266,12 +4341,12 @@ }, { "to": { - "startLine": 984, + "startLine": 968, "startColumn": 4, - "startOffset": 77106, + "startOffset": 76277, "endLine": 988, "endColumn": 12, - "endOffset": 77357 + "endOffset": 77395 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4281,10 +4356,10 @@ "to": { "startLine": 989, "startColumn": 4, - "startOffset": 77362, + "startOffset": 77400, "endLine": 993, "endColumn": 12, - "endOffset": 77593 + "endOffset": 77651 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4294,10 +4369,10 @@ "to": { "startLine": 994, "startColumn": 4, - "startOffset": 77598, - "endLine": 1003, + "startOffset": 77656, + "endLine": 998, "endColumn": 12, - "endOffset": 78140 + "endOffset": 77887 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4305,12 +4380,12 @@ }, { "to": { - "startLine": 1004, + "startLine": 999, "startColumn": 4, - "startOffset": 78145, - "endLine": 1012, + "startOffset": 77892, + "endLine": 1008, "endColumn": 12, - "endOffset": 78634 + "endOffset": 78434 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4318,12 +4393,12 @@ }, { "to": { - "startLine": 1013, + "startLine": 1009, "startColumn": 4, - "startOffset": 78639, - "endLine": 1021, + "startOffset": 78439, + "endLine": 1017, "endColumn": 12, - "endOffset": 79239 + "endOffset": 78928 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4331,12 +4406,12 @@ }, { "to": { - "startLine": 1022, + "startLine": 1018, "startColumn": 4, - "startOffset": 79244, - "endLine": 1024, + "startOffset": 78933, + "endLine": 1026, "endColumn": 12, - "endOffset": 79387 + "endOffset": 79533 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4344,12 +4419,12 @@ }, { "to": { - "startLine": 1025, + "startLine": 1027, "startColumn": 4, - "startOffset": 79392, - "endLine": 1031, + "startOffset": 79538, + "endLine": 1029, "endColumn": 12, - "endOffset": 79975 + "endOffset": 79681 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4357,12 +4432,12 @@ }, { "to": { - "startLine": 1032, + "startLine": 1030, "startColumn": 4, - "startOffset": 79980, - "endLine": 1039, + "startOffset": 79686, + "endLine": 1036, "endColumn": 12, - "endOffset": 80539 + "endOffset": 80269 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4370,12 +4445,12 @@ }, { "to": { - "startLine": 1040, + "startLine": 1037, "startColumn": 4, - "startOffset": 80544, - "endLine": 1046, + "startOffset": 80274, + "endLine": 1044, "endColumn": 12, - "endOffset": 80914 + "endOffset": 80833 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4383,11 +4458,24 @@ }, { "to": { - "startLine": 1047, + "startLine": 1045, "startColumn": 4, - "startOffset": 80919, + "startOffset": 80838, + "endLine": 1051, + "endColumn": 12, + "endOffset": 81208 + }, + "from": { + "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" + } + }, + { + "to": { + "startLine": 1052, + "startColumn": 4, + "startOffset": 81213, "endColumn": 117, - "endOffset": 81032 + "endOffset": 81326 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4395,12 +4483,12 @@ }, { "to": { - "startLine": 1048, + "startLine": 1053, "startColumn": 4, - "startOffset": 81037, - "endLine": 1056, + "startOffset": 81331, + "endLine": 1061, "endColumn": 12, - "endOffset": 81570 + "endOffset": 81864 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4408,12 +4496,12 @@ }, { "to": { - "startLine": 1057, + "startLine": 1062, "startColumn": 4, - "startOffset": 81575, - "endLine": 1059, + "startOffset": 81869, + "endLine": 1064, "endColumn": 12, - "endOffset": 81727 + "endOffset": 82021 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4421,25 +4509,12 @@ }, { "to": { - "startLine": 1060, + "startLine": 1065, "startColumn": 4, - "startOffset": 81732, - "endLine": 1062, - "endColumn": 12, - "endOffset": 81871 - }, - "from": { - "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" - } - }, - { - "to": { - "startLine": 1063, - "startColumn": 4, - "startOffset": 81876, + "startOffset": 82026, "endLine": 1067, "endColumn": 12, - "endOffset": 82191 + "endOffset": 82165 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4449,10 +4524,10 @@ "to": { "startLine": 1068, "startColumn": 4, - "startOffset": 82196, - "endLine": 1071, + "startOffset": 82170, + "endLine": 1072, "endColumn": 12, - "endOffset": 82447 + "endOffset": 82485 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4460,12 +4535,12 @@ }, { "to": { - "startLine": 1072, + "startLine": 1073, "startColumn": 4, - "startOffset": 82452, - "endLine": 1075, + "startOffset": 82490, + "endLine": 1076, "endColumn": 12, - "endOffset": 82617 + "endOffset": 82741 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4473,12 +4548,12 @@ }, { "to": { - "startLine": 1076, + "startLine": 1077, "startColumn": 4, - "startOffset": 82622, - "endLine": 1078, + "startOffset": 82746, + "endLine": 1080, "endColumn": 12, - "endOffset": 82758 + "endOffset": 82911 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4486,24 +4561,12 @@ }, { "to": { - "startLine": 1079, + "startLine": 1081, "startColumn": 4, - "startOffset": 82763, - "endColumn": 63, - "endOffset": 82822 - }, - "from": { - "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" - } - }, - { - "to": { - "startLine": 1080, - "startColumn": 4, - "startOffset": 82827, + "startOffset": 82916, "endLine": 1083, "endColumn": 12, - "endOffset": 83104 + "endOffset": 83052 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4513,10 +4576,9 @@ "to": { "startLine": 1084, "startColumn": 4, - "startOffset": 83109, - "endLine": 1087, - "endColumn": 12, - "endOffset": 83390 + "startOffset": 83057, + "endColumn": 63, + "endOffset": 83116 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4524,12 +4586,12 @@ }, { "to": { - "startLine": 1088, + "startLine": 1085, "startColumn": 4, - "startOffset": 83395, - "endLine": 1097, + "startOffset": 83121, + "endLine": 1088, "endColumn": 12, - "endOffset": 84066 + "endOffset": 83398 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4537,12 +4599,25 @@ }, { "to": { - "startLine": 1098, + "startLine": 1089, "startColumn": 4, - "startOffset": 84071, + "startOffset": 83403, + "endLine": 1092, + "endColumn": 12, + "endOffset": 83684 + }, + "from": { + "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" + } + }, + { + "to": { + "startLine": 1093, + "startColumn": 4, + "startOffset": 83689, "endLine": 1102, "endColumn": 12, - "endOffset": 84330 + "endOffset": 84360 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4552,10 +4627,10 @@ "to": { "startLine": 1103, "startColumn": 4, - "startOffset": 84335, - "endLine": 1109, + "startOffset": 84365, + "endLine": 1107, "endColumn": 12, - "endOffset": 84668 + "endOffset": 84624 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4563,12 +4638,12 @@ }, { "to": { - "startLine": 1110, + "startLine": 1108, "startColumn": 4, - "startOffset": 84673, - "endLine": 1115, + "startOffset": 84629, + "endLine": 1114, "endColumn": 12, - "endOffset": 85021 + "endOffset": 84962 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4576,11 +4651,24 @@ }, { "to": { - "startLine": 1116, + "startLine": 1115, "startColumn": 4, - "startOffset": 85026, + "startOffset": 84967, + "endLine": 1120, + "endColumn": 12, + "endOffset": 85315 + }, + "from": { + "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" + } + }, + { + "to": { + "startLine": 1121, + "startColumn": 4, + "startOffset": 85320, "endColumn": 93, - "endOffset": 85115 + "endOffset": 85409 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4588,12 +4676,12 @@ }, { "to": { - "startLine": 1117, + "startLine": 1122, "startColumn": 4, - "startOffset": 85120, - "endLine": 1119, + "startOffset": 85414, + "endLine": 1124, "endColumn": 12, - "endOffset": 85301 + "endOffset": 85595 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4601,25 +4689,12 @@ }, { "to": { - "startLine": 1120, + "startLine": 1125, "startColumn": 4, - "startOffset": 85306, - "endLine": 1123, - "endColumn": 12, - "endOffset": 85607 - }, - "from": { - "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" - } - }, - { - "to": { - "startLine": 1124, - "startColumn": 4, - "startOffset": 85612, + "startOffset": 85600, "endLine": 1128, "endColumn": 12, - "endOffset": 85869 + "endOffset": 85901 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4629,10 +4704,10 @@ "to": { "startLine": 1129, "startColumn": 4, - "startOffset": 85874, - "endLine": 1130, + "startOffset": 85906, + "endLine": 1133, "endColumn": 12, - "endOffset": 85994 + "endOffset": 86163 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4640,25 +4715,12 @@ }, { "to": { - "startLine": 1131, + "startLine": 1134, "startColumn": 4, - "startOffset": 85999, - "endLine": 1132, - "endColumn": 12, - "endOffset": 86121 - }, - "from": { - "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" - } - }, - { - "to": { - "startLine": 1133, - "startColumn": 4, - "startOffset": 86126, + "startOffset": 86168, "endLine": 1135, "endColumn": 12, - "endOffset": 86360 + "endOffset": 86288 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4668,10 +4730,10 @@ "to": { "startLine": 1136, "startColumn": 4, - "startOffset": 86365, - "endLine": 1138, + "startOffset": 86293, + "endLine": 1137, "endColumn": 12, - "endOffset": 86571 + "endOffset": 86415 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4679,12 +4741,12 @@ }, { "to": { - "startLine": 1139, + "startLine": 1138, "startColumn": 4, - "startOffset": 86576, + "startOffset": 86420, "endLine": 1140, "endColumn": 12, - "endOffset": 86690 + "endOffset": 86654 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4694,10 +4756,10 @@ "to": { "startLine": 1141, "startColumn": 4, - "startOffset": 86695, - "endLine": 1144, + "startOffset": 86659, + "endLine": 1143, "endColumn": 12, - "endOffset": 86883 + "endOffset": 86865 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4705,12 +4767,12 @@ }, { "to": { - "startLine": 1145, + "startLine": 1144, "startColumn": 4, - "startOffset": 86888, - "endLine": 1151, + "startOffset": 86870, + "endLine": 1145, "endColumn": 12, - "endOffset": 87338 + "endOffset": 86984 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4718,12 +4780,12 @@ }, { "to": { - "startLine": 1152, + "startLine": 1146, "startColumn": 4, - "startOffset": 87343, - "endLine": 1154, + "startOffset": 86989, + "endLine": 1149, "endColumn": 12, - "endOffset": 87519 + "endOffset": 87177 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4731,12 +4793,12 @@ }, { "to": { - "startLine": 1155, + "startLine": 1150, "startColumn": 4, - "startOffset": 87524, - "endLine": 1157, + "startOffset": 87182, + "endLine": 1156, "endColumn": 12, - "endOffset": 87641 + "endOffset": 87632 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4744,12 +4806,12 @@ }, { "to": { - "startLine": 1158, + "startLine": 1157, "startColumn": 4, - "startOffset": 87646, - "endLine": 1161, + "startOffset": 87637, + "endLine": 1159, "endColumn": 12, - "endOffset": 87900 + "endOffset": 87813 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4757,12 +4819,12 @@ }, { "to": { - "startLine": 1162, + "startLine": 1160, "startColumn": 4, - "startOffset": 87905, - "endLine": 1163, + "startOffset": 87818, + "endLine": 1162, "endColumn": 12, - "endOffset": 88013 + "endOffset": 87935 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4770,12 +4832,12 @@ }, { "to": { - "startLine": 1164, + "startLine": 1163, "startColumn": 4, - "startOffset": 88018, - "endLine": 1167, + "startOffset": 87940, + "endLine": 1166, "endColumn": 12, - "endOffset": 88200 + "endOffset": 88194 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4783,12 +4845,12 @@ }, { "to": { - "startLine": 1168, + "startLine": 1167, "startColumn": 4, - "startOffset": 88205, - "endLine": 1169, + "startOffset": 88199, + "endLine": 1168, "endColumn": 12, - "endOffset": 88302 + "endOffset": 88307 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4796,12 +4858,12 @@ }, { "to": { - "startLine": 1170, + "startLine": 1169, "startColumn": 4, - "startOffset": 88307, - "endLine": 1175, + "startOffset": 88312, + "endLine": 1172, "endColumn": 12, - "endOffset": 88746 + "endOffset": 88494 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4809,12 +4871,12 @@ }, { "to": { - "startLine": 1176, + "startLine": 1173, "startColumn": 4, - "startOffset": 88751, - "endLine": 1177, + "startOffset": 88499, + "endLine": 1174, "endColumn": 12, - "endOffset": 88870 + "endOffset": 88596 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4822,12 +4884,12 @@ }, { "to": { - "startLine": 1178, + "startLine": 1175, "startColumn": 4, - "startOffset": 88875, - "endLine": 1181, + "startOffset": 88601, + "endLine": 1180, "endColumn": 12, - "endOffset": 89155 + "endOffset": 89040 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4835,12 +4897,12 @@ }, { "to": { - "startLine": 1182, + "startLine": 1181, "startColumn": 4, - "startOffset": 89160, - "endLine": 1193, + "startOffset": 89045, + "endLine": 1182, "endColumn": 12, - "endOffset": 90042 + "endOffset": 89164 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4848,10 +4910,23 @@ }, { "to": { - "startLine": 1194, + "startLine": 1183, "startColumn": 4, - "startOffset": 90047, - "endLine": 1199, + "startOffset": 89169, + "endLine": 1186, + "endColumn": 12, + "endOffset": 89449 + }, + "from": { + "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" + } + }, + { + "to": { + "startLine": 1187, + "startColumn": 4, + "startOffset": 89454, + "endLine": 1198, "endColumn": 12, "endOffset": 90336 }, @@ -4861,12 +4936,12 @@ }, { "to": { - "startLine": 1200, + "startLine": 1199, "startColumn": 4, "startOffset": 90341, - "endLine": 1208, + "endLine": 1204, "endColumn": 12, - "endOffset": 90906 + "endOffset": 90630 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4874,12 +4949,12 @@ }, { "to": { - "startLine": 1209, + "startLine": 1205, "startColumn": 4, - "startOffset": 90911, - "endLine": 1219, + "startOffset": 90635, + "endLine": 1213, "endColumn": 12, - "endOffset": 91638 + "endOffset": 91200 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4887,12 +4962,12 @@ }, { "to": { - "startLine": 1220, + "startLine": 1214, "startColumn": 4, - "startOffset": 91643, - "endLine": 1222, + "startOffset": 91205, + "endLine": 1224, "endColumn": 12, - "endOffset": 91810 + "endOffset": 91932 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4900,12 +4975,12 @@ }, { "to": { - "startLine": 1223, + "startLine": 1225, "startColumn": 4, - "startOffset": 91815, + "startOffset": 91937, "endLine": 1227, "endColumn": 12, - "endOffset": 92146 + "endOffset": 92104 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4915,10 +4990,10 @@ "to": { "startLine": 1228, "startColumn": 4, - "startOffset": 92151, - "endLine": 1239, + "startOffset": 92109, + "endLine": 1232, "endColumn": 12, - "endOffset": 93013 + "endOffset": 92440 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4926,12 +5001,12 @@ }, { "to": { - "startLine": 1240, + "startLine": 1233, "startColumn": 4, - "startOffset": 93018, + "startOffset": 92445, "endLine": 1244, "endColumn": 12, - "endOffset": 93291 + "endOffset": 93307 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4941,10 +5016,23 @@ "to": { "startLine": 1245, "startColumn": 4, - "startOffset": 93296, - "endLine": 1253, + "startOffset": 93312, + "endLine": 1249, "endColumn": 12, - "endOffset": 93733 + "endOffset": 93585 + }, + "from": { + "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" + } + }, + { + "to": { + "startLine": 1250, + "startColumn": 4, + "startOffset": 93590, + "endLine": 1258, + "endColumn": 12, + "endOffset": 94027 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\styles.xml" @@ -4952,12 +5040,12 @@ }, { "to": { - "startLine": 1254, + "startLine": 1259, "startColumn": 4, - "startOffset": 93738, - "endLine": 1291, + "startOffset": 94032, + "endLine": 1296, "endColumn": 12, - "endOffset": 96533 + "endOffset": 96827 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4965,12 +5053,12 @@ }, { "to": { - "startLine": 1292, + "startLine": 1297, "startColumn": 4, - "startOffset": 96538, - "endLine": 1330, + "startOffset": 96832, + "endLine": 1335, "endColumn": 12, - "endOffset": 99473 + "endOffset": 99767 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4978,11 +5066,11 @@ }, { "to": { - "startLine": 1331, + "startLine": 1336, "startColumn": 4, - "startOffset": 99478, + "startOffset": 99772, "endColumn": 61, - "endOffset": 99535 + "endOffset": 99829 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -4990,12 +5078,12 @@ }, { "to": { - "startLine": 1332, + "startLine": 1337, "startColumn": 4, - "startOffset": 99540, - "endLine": 1341, + "startOffset": 99834, + "endLine": 1346, "endColumn": 12, - "endOffset": 100113 + "endOffset": 100407 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5003,12 +5091,12 @@ }, { "to": { - "startLine": 1342, + "startLine": 1347, "startColumn": 4, - "startOffset": 100118, - "endLine": 1350, + "startOffset": 100412, + "endLine": 1355, "endColumn": 12, - "endOffset": 100697 + "endOffset": 100991 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5016,11 +5104,11 @@ }, { "to": { - "startLine": 1351, + "startLine": 1356, "startColumn": 4, - "startOffset": 100702, + "startOffset": 100996, "endColumn": 85, - "endOffset": 100783 + "endOffset": 101077 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5028,12 +5116,12 @@ }, { "to": { - "startLine": 1352, + "startLine": 1357, "startColumn": 4, - "startOffset": 100788, - "endLine": 1353, + "startOffset": 101082, + "endLine": 1358, "endColumn": 12, - "endOffset": 100896 + "endOffset": 101190 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5041,12 +5129,12 @@ }, { "to": { - "startLine": 1354, + "startLine": 1359, "startColumn": 4, - "startOffset": 100901, - "endLine": 1357, + "startOffset": 101195, + "endLine": 1362, "endColumn": 12, - "endOffset": 101125 + "endOffset": 101419 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5054,12 +5142,12 @@ }, { "to": { - "startLine": 1358, + "startLine": 1363, "startColumn": 4, - "startOffset": 101130, - "endLine": 1360, + "startOffset": 101424, + "endLine": 1365, "endColumn": 12, - "endOffset": 101285 + "endOffset": 101579 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5067,12 +5155,12 @@ }, { "to": { - "startLine": 1361, + "startLine": 1366, "startColumn": 4, - "startOffset": 101290, - "endLine": 1363, + "startOffset": 101584, + "endLine": 1368, "endColumn": 12, - "endOffset": 101437 + "endOffset": 101731 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5080,12 +5168,12 @@ }, { "to": { - "startLine": 1364, + "startLine": 1369, "startColumn": 4, - "startOffset": 101442, - "endLine": 1366, + "startOffset": 101736, + "endLine": 1371, "endColumn": 12, - "endOffset": 101608 + "endOffset": 101902 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5093,12 +5181,12 @@ }, { "to": { - "startLine": 1367, + "startLine": 1372, "startColumn": 4, - "startOffset": 101613, - "endLine": 1369, + "startOffset": 101907, + "endLine": 1374, "endColumn": 12, - "endOffset": 101775 + "endOffset": 102069 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5106,12 +5194,12 @@ }, { "to": { - "startLine": 1370, + "startLine": 1375, "startColumn": 4, - "startOffset": 101780, - "endLine": 1373, + "startOffset": 102074, + "endLine": 1378, "endColumn": 12, - "endOffset": 102018 + "endOffset": 102312 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5119,12 +5207,12 @@ }, { "to": { - "startLine": 1374, + "startLine": 1379, "startColumn": 4, - "startOffset": 102023, - "endLine": 1376, + "startOffset": 102317, + "endLine": 1381, "endColumn": 12, - "endOffset": 102188 + "endOffset": 102482 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5132,12 +5220,12 @@ }, { "to": { - "startLine": 1377, + "startLine": 1382, "startColumn": 4, - "startOffset": 102193, - "endLine": 1379, + "startOffset": 102487, + "endLine": 1384, "endColumn": 12, - "endOffset": 102361 + "endOffset": 102655 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5145,12 +5233,12 @@ }, { "to": { - "startLine": 1380, + "startLine": 1385, "startColumn": 4, - "startOffset": 102366, - "endLine": 1382, + "startOffset": 102660, + "endLine": 1387, "endColumn": 12, - "endOffset": 102532 + "endOffset": 102826 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5158,12 +5246,12 @@ }, { "to": { - "startLine": 1383, + "startLine": 1388, "startColumn": 4, - "startOffset": 102537, - "endLine": 1386, + "startOffset": 102831, + "endLine": 1391, "endColumn": 12, - "endOffset": 102806 + "endOffset": 103100 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5171,12 +5259,12 @@ }, { "to": { - "startLine": 1387, + "startLine": 1392, "startColumn": 4, - "startOffset": 102811, - "endLine": 1389, + "startOffset": 103105, + "endLine": 1394, "endColumn": 12, - "endOffset": 103005 + "endOffset": 103299 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5184,37 +5272,12 @@ }, { "to": { - "startLine": 1390, + "startLine": 1395, "startColumn": 4, - "startOffset": 103010, - "endLine": 1393, + "startOffset": 103304, + "endLine": 1398, "endColumn": 12, - "endOffset": 103210 - }, - "from": { - "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" - } - }, - { - "to": { - "startLine": 1394, - "startColumn": 4, - "startOffset": 103215, - "endLine": 1397, - "endColumn": 12, - "endOffset": 103540 - }, - "from": { - "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" - } - }, - { - "to": { - "startLine": 1398, - "startColumn": 4, - "startOffset": 103545, - "endColumn": 83, - "endOffset": 103624 + "endOffset": 103504 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5224,45 +5287,10 @@ "to": { "startLine": 1399, "startColumn": 4, - "startOffset": 103629, - "endColumn": 95, - "endOffset": 103720 - }, - "from": { - "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" - } - }, - { - "to": { - "startLine": 1400, - "startColumn": 4, - "startOffset": 103725, - "endColumn": 95, - "endOffset": 103816 - }, - "from": { - "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" - } - }, - { - "to": { - "startLine": 1401, - "startColumn": 4, - "startOffset": 103821, - "endColumn": 97, - "endOffset": 103914 - }, - "from": { - "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" - } - }, - { - "to": { - "startLine": 1402, - "startColumn": 4, - "startOffset": 103919, - "endColumn": 99, - "endOffset": 104014 + "startOffset": 103509, + "endLine": 1402, + "endColumn": 12, + "endOffset": 103834 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5272,9 +5300,9 @@ "to": { "startLine": 1403, "startColumn": 4, - "startOffset": 104019, - "endColumn": 101, - "endOffset": 104116 + "startOffset": 103839, + "endColumn": 83, + "endOffset": 103918 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5284,9 +5312,9 @@ "to": { "startLine": 1404, "startColumn": 4, - "startOffset": 104121, - "endColumn": 101, - "endOffset": 104218 + "startOffset": 103923, + "endColumn": 95, + "endOffset": 104014 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5296,9 +5324,9 @@ "to": { "startLine": 1405, "startColumn": 4, - "startOffset": 104223, - "endColumn": 101, - "endOffset": 104320 + "startOffset": 104019, + "endColumn": 95, + "endOffset": 104110 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5308,9 +5336,9 @@ "to": { "startLine": 1406, "startColumn": 4, - "startOffset": 104325, - "endColumn": 101, - "endOffset": 104422 + "startOffset": 104115, + "endColumn": 97, + "endOffset": 104208 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5320,9 +5348,9 @@ "to": { "startLine": 1407, "startColumn": 4, - "startOffset": 104427, - "endColumn": 101, - "endOffset": 104524 + "startOffset": 104213, + "endColumn": 99, + "endOffset": 104308 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5332,9 +5360,9 @@ "to": { "startLine": 1408, "startColumn": 4, - "startOffset": 104529, - "endColumn": 99, - "endOffset": 104624 + "startOffset": 104313, + "endColumn": 101, + "endOffset": 104410 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5344,9 +5372,9 @@ "to": { "startLine": 1409, "startColumn": 4, - "startOffset": 104629, - "endColumn": 95, - "endOffset": 104720 + "startOffset": 104415, + "endColumn": 101, + "endOffset": 104512 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5356,9 +5384,9 @@ "to": { "startLine": 1410, "startColumn": 4, - "startOffset": 104725, - "endColumn": 111, - "endOffset": 104832 + "startOffset": 104517, + "endColumn": 101, + "endOffset": 104614 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5368,9 +5396,9 @@ "to": { "startLine": 1411, "startColumn": 4, - "startOffset": 104837, - "endColumn": 128, - "endOffset": 104961 + "startOffset": 104619, + "endColumn": 101, + "endOffset": 104716 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5380,9 +5408,9 @@ "to": { "startLine": 1412, "startColumn": 4, - "startOffset": 104966, - "endColumn": 122, - "endOffset": 105084 + "startOffset": 104721, + "endColumn": 101, + "endOffset": 104818 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5392,10 +5420,21 @@ "to": { "startLine": 1413, "startColumn": 4, - "startOffset": 105089, - "endLine": 1414, - "endColumn": 12, - "endOffset": 105238 + "startOffset": 104823, + "endColumn": 99, + "endOffset": 104918 + }, + "from": { + "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" + } + }, + { + "to": { + "startLine": 1414, + "startColumn": 4, + "startOffset": 104923, + "endColumn": 95, + "endOffset": 105014 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5405,10 +5444,21 @@ "to": { "startLine": 1415, "startColumn": 4, - "startOffset": 105243, - "endLine": 1416, - "endColumn": 12, - "endOffset": 105392 + "startOffset": 105019, + "endColumn": 111, + "endOffset": 105126 + }, + "from": { + "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" + } + }, + { + "to": { + "startLine": 1416, + "startColumn": 4, + "startOffset": 105131, + "endColumn": 128, + "endOffset": 105255 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5418,9 +5468,9 @@ "to": { "startLine": 1417, "startColumn": 4, - "startOffset": 105397, - "endColumn": 97, - "endOffset": 105490 + "startOffset": 105260, + "endColumn": 122, + "endOffset": 105378 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5430,21 +5480,10 @@ "to": { "startLine": 1418, "startColumn": 4, - "startOffset": 105495, - "endColumn": 113, - "endOffset": 105604 - }, - "from": { - "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" - } - }, - { - "to": { - "startLine": 1419, - "startColumn": 4, - "startOffset": 105609, - "endColumn": 93, - "endOffset": 105698 + "startOffset": 105383, + "endLine": 1419, + "endColumn": 12, + "endOffset": 105532 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5454,10 +5493,10 @@ "to": { "startLine": 1420, "startColumn": 4, - "startOffset": 105703, + "startOffset": 105537, "endLine": 1421, "endColumn": 12, - "endOffset": 105838 + "endOffset": 105686 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5467,10 +5506,21 @@ "to": { "startLine": 1422, "startColumn": 4, - "startOffset": 105843, - "endLine": 1423, - "endColumn": 12, - "endOffset": 105972 + "startOffset": 105691, + "endColumn": 97, + "endOffset": 105784 + }, + "from": { + "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" + } + }, + { + "to": { + "startLine": 1423, + "startColumn": 4, + "startOffset": 105789, + "endColumn": 113, + "endOffset": 105898 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5480,9 +5530,9 @@ "to": { "startLine": 1424, "startColumn": 4, - "startOffset": 105977, - "endColumn": 95, - "endOffset": 106068 + "startOffset": 105903, + "endColumn": 93, + "endOffset": 105992 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5492,21 +5542,10 @@ "to": { "startLine": 1425, "startColumn": 4, - "startOffset": 106073, - "endColumn": 111, - "endOffset": 106180 - }, - "from": { - "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" - } - }, - { - "to": { - "startLine": 1426, - "startColumn": 4, - "startOffset": 106185, - "endColumn": 99, - "endOffset": 106280 + "startOffset": 105997, + "endLine": 1426, + "endColumn": 12, + "endOffset": 106132 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5516,21 +5555,10 @@ "to": { "startLine": 1427, "startColumn": 4, - "startOffset": 106285, - "endColumn": 115, - "endOffset": 106396 - }, - "from": { - "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" - } - }, - { - "to": { - "startLine": 1428, - "startColumn": 4, - "startOffset": 106401, - "endColumn": 95, - "endOffset": 106492 + "startOffset": 106137, + "endLine": 1428, + "endColumn": 12, + "endOffset": 106266 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5540,9 +5568,9 @@ "to": { "startLine": 1429, "startColumn": 4, - "startOffset": 106497, - "endColumn": 111, - "endOffset": 106604 + "startOffset": 106271, + "endColumn": 95, + "endOffset": 106362 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5552,10 +5580,21 @@ "to": { "startLine": 1430, "startColumn": 4, - "startOffset": 106609, - "endLine": 1431, - "endColumn": 12, - "endOffset": 106744 + "startOffset": 106367, + "endColumn": 111, + "endOffset": 106474 + }, + "from": { + "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" + } + }, + { + "to": { + "startLine": 1431, + "startColumn": 4, + "startOffset": 106479, + "endColumn": 99, + "endOffset": 106574 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5565,9 +5604,9 @@ "to": { "startLine": 1432, "startColumn": 4, - "startOffset": 106749, - "endColumn": 135, - "endOffset": 106880 + "startOffset": 106579, + "endColumn": 115, + "endOffset": 106690 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5577,10 +5616,21 @@ "to": { "startLine": 1433, "startColumn": 4, - "startOffset": 106885, - "endLine": 1434, - "endColumn": 12, - "endOffset": 107044 + "startOffset": 106695, + "endColumn": 95, + "endOffset": 106786 + }, + "from": { + "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" + } + }, + { + "to": { + "startLine": 1434, + "startColumn": 4, + "startOffset": 106791, + "endColumn": 111, + "endOffset": 106898 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5590,9 +5640,10 @@ "to": { "startLine": 1435, "startColumn": 4, - "startOffset": 107049, - "endColumn": 129, - "endOffset": 107174 + "startOffset": 106903, + "endLine": 1436, + "endColumn": 12, + "endOffset": 107038 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5600,12 +5651,11 @@ }, { "to": { - "startLine": 1436, + "startLine": 1437, "startColumn": 4, - "startOffset": 107179, - "endLine": 1437, - "endColumn": 12, - "endOffset": 107332 + "startOffset": 107043, + "endColumn": 135, + "endOffset": 107174 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5615,10 +5665,10 @@ "to": { "startLine": 1438, "startColumn": 4, - "startOffset": 107337, + "startOffset": 107179, "endLine": 1439, "endColumn": 12, - "endOffset": 107482 + "endOffset": 107338 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5628,9 +5678,9 @@ "to": { "startLine": 1440, "startColumn": 4, - "startOffset": 107487, - "endColumn": 140, - "endOffset": 107623 + "startOffset": 107343, + "endColumn": 129, + "endOffset": 107468 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5640,10 +5690,10 @@ "to": { "startLine": 1441, "startColumn": 4, - "startOffset": 107628, + "startOffset": 107473, "endLine": 1442, "endColumn": 12, - "endOffset": 107767 + "endOffset": 107626 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5653,21 +5703,10 @@ "to": { "startLine": 1443, "startColumn": 4, - "startOffset": 107772, - "endColumn": 134, - "endOffset": 107902 - }, - "from": { - "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" - } - }, - { - "to": { - "startLine": 1444, - "startColumn": 4, - "startOffset": 107907, - "endColumn": 111, - "endOffset": 108014 + "startOffset": 107631, + "endLine": 1444, + "endColumn": 12, + "endOffset": 107776 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5677,9 +5716,9 @@ "to": { "startLine": 1445, "startColumn": 4, - "startOffset": 108019, - "endColumn": 127, - "endOffset": 108142 + "startOffset": 107781, + "endColumn": 140, + "endOffset": 107917 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5689,10 +5728,10 @@ "to": { "startLine": 1446, "startColumn": 4, - "startOffset": 108147, + "startOffset": 107922, "endLine": 1447, "endColumn": 12, - "endOffset": 108278 + "endOffset": 108061 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5702,10 +5741,21 @@ "to": { "startLine": 1448, "startColumn": 4, - "startOffset": 108283, - "endLine": 1449, - "endColumn": 12, - "endOffset": 108420 + "startOffset": 108066, + "endColumn": 134, + "endOffset": 108196 + }, + "from": { + "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" + } + }, + { + "to": { + "startLine": 1449, + "startColumn": 4, + "startOffset": 108201, + "endColumn": 111, + "endOffset": 108308 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5715,10 +5765,9 @@ "to": { "startLine": 1450, "startColumn": 4, - "startOffset": 108425, - "endLine": 1451, - "endColumn": 12, - "endOffset": 108562 + "startOffset": 108313, + "endColumn": 127, + "endOffset": 108436 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5726,11 +5775,12 @@ }, { "to": { - "startLine": 1452, + "startLine": 1451, "startColumn": 4, - "startOffset": 108567, - "endColumn": 111, - "endOffset": 108674 + "startOffset": 108441, + "endLine": 1452, + "endColumn": 12, + "endOffset": 108572 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5740,21 +5790,10 @@ "to": { "startLine": 1453, "startColumn": 4, - "startOffset": 108679, - "endColumn": 139, - "endOffset": 108814 - }, - "from": { - "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" - } - }, - { - "to": { - "startLine": 1454, - "startColumn": 4, - "startOffset": 108819, - "endColumn": 67, - "endOffset": 108882 + "startOffset": 108577, + "endLine": 1454, + "endColumn": 12, + "endOffset": 108714 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5764,21 +5803,10 @@ "to": { "startLine": 1455, "startColumn": 4, - "startOffset": 108887, - "endColumn": 72, - "endOffset": 108955 - }, - "from": { - "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" - } - }, - { - "to": { - "startLine": 1456, - "startColumn": 4, - "startOffset": 108960, - "endColumn": 73, - "endOffset": 109029 + "startOffset": 108719, + "endLine": 1456, + "endColumn": 12, + "endOffset": 108856 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5788,9 +5816,9 @@ "to": { "startLine": 1457, "startColumn": 4, - "startOffset": 109034, - "endColumn": 72, - "endOffset": 109102 + "startOffset": 108861, + "endColumn": 111, + "endOffset": 108968 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5800,9 +5828,9 @@ "to": { "startLine": 1458, "startColumn": 4, - "startOffset": 109107, - "endColumn": 73, - "endOffset": 109176 + "startOffset": 108973, + "endColumn": 139, + "endOffset": 109108 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5812,10 +5840,21 @@ "to": { "startLine": 1459, "startColumn": 4, + "startOffset": 109113, + "endColumn": 67, + "endOffset": 109176 + }, + "from": { + "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" + } + }, + { + "to": { + "startLine": 1460, + "startColumn": 4, "startOffset": 109181, - "endLine": 1460, - "endColumn": 12, - "endOffset": 109322 + "endColumn": 72, + "endOffset": 109249 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5825,10 +5864,21 @@ "to": { "startLine": 1461, "startColumn": 4, - "startOffset": 109327, - "endLine": 1462, - "endColumn": 12, - "endOffset": 109466 + "startOffset": 109254, + "endColumn": 73, + "endOffset": 109323 + }, + "from": { + "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" + } + }, + { + "to": { + "startLine": 1462, + "startColumn": 4, + "startOffset": 109328, + "endColumn": 72, + "endOffset": 109396 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5838,10 +5888,9 @@ "to": { "startLine": 1463, "startColumn": 4, - "startOffset": 109471, - "endLine": 1464, - "endColumn": 12, - "endOffset": 109604 + "startOffset": 109401, + "endColumn": 73, + "endOffset": 109470 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5849,11 +5898,12 @@ }, { "to": { - "startLine": 1465, + "startLine": 1464, "startColumn": 4, - "startOffset": 109609, - "endColumn": 65, - "endOffset": 109670 + "startOffset": 109475, + "endLine": 1465, + "endColumn": 12, + "endOffset": 109616 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5863,45 +5913,23 @@ "to": { "startLine": 1466, "startColumn": 4, - "startOffset": 109675, - "endColumn": 89, + "startOffset": 109621, + "endLine": 1467, + "endColumn": 12, "endOffset": 109760 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" } }, - { - "to": { - "startLine": 1467, - "startColumn": 4, - "startOffset": 109765, - "endColumn": 79, - "endOffset": 109840 - }, - "from": { - "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" - } - }, { "to": { "startLine": 1468, "startColumn": 4, - "startOffset": 109845, - "endColumn": 91, - "endOffset": 109932 - }, - "from": { - "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" - } - }, - { - "to": { - "startLine": 1469, - "startColumn": 4, - "startOffset": 109937, - "endColumn": 97, - "endOffset": 110030 + "startOffset": 109765, + "endLine": 1469, + "endColumn": 12, + "endOffset": 109898 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5911,10 +5939,21 @@ "to": { "startLine": 1470, "startColumn": 4, - "startOffset": 110035, - "endLine": 1471, - "endColumn": 12, - "endOffset": 110140 + "startOffset": 109903, + "endColumn": 65, + "endOffset": 109964 + }, + "from": { + "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" + } + }, + { + "to": { + "startLine": 1471, + "startColumn": 4, + "startOffset": 109969, + "endColumn": 89, + "endOffset": 110054 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5924,9 +5963,9 @@ "to": { "startLine": 1472, "startColumn": 4, - "startOffset": 110145, - "endColumn": 77, - "endOffset": 110218 + "startOffset": 110059, + "endColumn": 79, + "endOffset": 110134 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5936,9 +5975,9 @@ "to": { "startLine": 1473, "startColumn": 4, - "startOffset": 110223, - "endColumn": 105, - "endOffset": 110324 + "startOffset": 110139, + "endColumn": 91, + "endOffset": 110226 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5948,9 +5987,9 @@ "to": { "startLine": 1474, "startColumn": 4, - "startOffset": 110329, - "endColumn": 91, - "endOffset": 110416 + "startOffset": 110231, + "endColumn": 97, + "endOffset": 110324 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5960,21 +5999,10 @@ "to": { "startLine": 1475, "startColumn": 4, - "startOffset": 110421, - "endColumn": 103, - "endOffset": 110520 - }, - "from": { - "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" - } - }, - { - "to": { - "startLine": 1476, - "startColumn": 4, - "startOffset": 110525, - "endColumn": 109, - "endOffset": 110630 + "startOffset": 110329, + "endLine": 1476, + "endColumn": 12, + "endOffset": 110434 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5984,10 +6012,21 @@ "to": { "startLine": 1477, "startColumn": 4, - "startOffset": 110635, - "endLine": 1478, - "endColumn": 12, - "endOffset": 110752 + "startOffset": 110439, + "endColumn": 77, + "endOffset": 110512 + }, + "from": { + "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" + } + }, + { + "to": { + "startLine": 1478, + "startColumn": 4, + "startOffset": 110517, + "endColumn": 105, + "endOffset": 110618 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -5997,10 +6036,9 @@ "to": { "startLine": 1479, "startColumn": 4, - "startOffset": 110757, - "endLine": 1482, - "endColumn": 12, - "endOffset": 110915 + "startOffset": 110623, + "endColumn": 91, + "endOffset": 110710 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6008,12 +6046,11 @@ }, { "to": { - "startLine": 1483, + "startLine": 1480, "startColumn": 4, - "startOffset": 110920, - "endLine": 1486, - "endColumn": 12, - "endOffset": 111072 + "startOffset": 110715, + "endColumn": 103, + "endOffset": 110814 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6021,11 +6058,37 @@ }, { "to": { - "startLine": 1487, + "startLine": 1481, "startColumn": 4, - "startOffset": 111077, - "endColumn": 79, - "endOffset": 111152 + "startOffset": 110819, + "endColumn": 109, + "endOffset": 110924 + }, + "from": { + "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" + } + }, + { + "to": { + "startLine": 1482, + "startColumn": 4, + "startOffset": 110929, + "endLine": 1483, + "endColumn": 12, + "endOffset": 111046 + }, + "from": { + "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" + } + }, + { + "to": { + "startLine": 1484, + "startColumn": 4, + "startOffset": 111051, + "endLine": 1487, + "endColumn": 12, + "endOffset": 111209 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6035,45 +6098,10 @@ "to": { "startLine": 1488, "startColumn": 4, - "startOffset": 111157, - "endColumn": 99, - "endOffset": 111252 - }, - "from": { - "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" - } - }, - { - "to": { - "startLine": 1489, - "startColumn": 4, - "startOffset": 111257, - "endColumn": 89, - "endOffset": 111342 - }, - "from": { - "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" - } - }, - { - "to": { - "startLine": 1490, - "startColumn": 4, - "startOffset": 111347, - "endColumn": 109, - "endOffset": 111452 - }, - "from": { - "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" - } - }, - { - "to": { - "startLine": 1491, - "startColumn": 4, - "startOffset": 111457, - "endColumn": 91, - "endOffset": 111544 + "startOffset": 111214, + "endLine": 1491, + "endColumn": 12, + "endOffset": 111366 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6083,10 +6111,70 @@ "to": { "startLine": 1492, "startColumn": 4, - "startOffset": 111549, - "endLine": 1496, + "startOffset": 111371, + "endColumn": 79, + "endOffset": 111446 + }, + "from": { + "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" + } + }, + { + "to": { + "startLine": 1493, + "startColumn": 4, + "startOffset": 111451, + "endColumn": 99, + "endOffset": 111546 + }, + "from": { + "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" + } + }, + { + "to": { + "startLine": 1494, + "startColumn": 4, + "startOffset": 111551, + "endColumn": 89, + "endOffset": 111636 + }, + "from": { + "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" + } + }, + { + "to": { + "startLine": 1495, + "startColumn": 4, + "startOffset": 111641, + "endColumn": 109, + "endOffset": 111746 + }, + "from": { + "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" + } + }, + { + "to": { + "startLine": 1496, + "startColumn": 4, + "startOffset": 111751, + "endColumn": 91, + "endOffset": 111838 + }, + "from": { + "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" + } + }, + { + "to": { + "startLine": 1497, + "startColumn": 4, + "startOffset": 111843, + "endLine": 1501, "endColumn": 12, - "endOffset": 111786 + "endOffset": 112080 }, "from": { "file": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\values\\styles.xml" @@ -6094,12 +6182,12 @@ }, { "to": { - "startLine": 1497, + "startLine": 1502, "startColumn": 4, - "startOffset": 111791, - "endLine": 1498, + "startOffset": 112085, + "endLine": 1503, "endColumn": 12, - "endOffset": 111886 + "endOffset": 112180 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6107,12 +6195,12 @@ }, { "to": { - "startLine": 1499, + "startLine": 1504, "startColumn": 4, - "startOffset": 111891, - "endLine": 1500, + "startOffset": 112185, + "endLine": 1505, "endColumn": 12, - "endOffset": 111998 + "endOffset": 112292 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6120,50 +6208,12 @@ }, { "to": { - "startLine": 1501, + "startLine": 1506, "startColumn": 4, - "startOffset": 112003, - "endLine": 1502, + "startOffset": 112297, + "endLine": 1507, "endColumn": 12, - "endOffset": 112112 - }, - "from": { - "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" - } - }, - { - "to": { - "startLine": 1503, - "startColumn": 4, - "startOffset": 112117, - "endLine": 1504, - "endColumn": 12, - "endOffset": 112228 - }, - "from": { - "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" - } - }, - { - "to": { - "startLine": 1505, - "startColumn": 4, - "startOffset": 112233, - "endLine": 1506, - "endColumn": 12, - "endOffset": 112344 - }, - "from": { - "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" - } - }, - { - "to": { - "startLine": 1507, - "startColumn": 4, - "startOffset": 112349, - "endColumn": 93, - "endOffset": 112438 + "endOffset": 112406 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6173,21 +6223,10 @@ "to": { "startLine": 1508, "startColumn": 4, - "startOffset": 112443, - "endColumn": 113, - "endOffset": 112552 - }, - "from": { - "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" - } - }, - { - "to": { - "startLine": 1509, - "startColumn": 4, - "startOffset": 112557, - "endColumn": 111, - "endOffset": 112664 + "startOffset": 112411, + "endLine": 1509, + "endColumn": 12, + "endOffset": 112522 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6197,10 +6236,10 @@ "to": { "startLine": 1510, "startColumn": 4, - "startOffset": 112669, + "startOffset": 112527, "endLine": 1511, "endColumn": 12, - "endOffset": 112766 + "endOffset": 112638 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6210,10 +6249,21 @@ "to": { "startLine": 1512, "startColumn": 4, - "startOffset": 112771, - "endLine": 1513, - "endColumn": 12, - "endOffset": 112886 + "startOffset": 112643, + "endColumn": 93, + "endOffset": 112732 + }, + "from": { + "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" + } + }, + { + "to": { + "startLine": 1513, + "startColumn": 4, + "startOffset": 112737, + "endColumn": 113, + "endOffset": 112846 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6223,10 +6273,9 @@ "to": { "startLine": 1514, "startColumn": 4, - "startOffset": 112891, - "endLine": 1515, - "endColumn": 12, - "endOffset": 113008 + "startOffset": 112851, + "endColumn": 111, + "endOffset": 112958 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6234,11 +6283,12 @@ }, { "to": { - "startLine": 1516, + "startLine": 1515, "startColumn": 4, - "startOffset": 113013, - "endColumn": 81, - "endOffset": 113090 + "startOffset": 112963, + "endLine": 1516, + "endColumn": 12, + "endOffset": 113060 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6248,21 +6298,10 @@ "to": { "startLine": 1517, "startColumn": 4, - "startOffset": 113095, - "endColumn": 103, - "endOffset": 113194 - }, - "from": { - "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" - } - }, - { - "to": { - "startLine": 1518, - "startColumn": 4, - "startOffset": 113199, - "endColumn": 119, - "endOffset": 113314 + "startOffset": 113065, + "endLine": 1518, + "endColumn": 12, + "endOffset": 113180 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6272,21 +6311,10 @@ "to": { "startLine": 1519, "startColumn": 4, - "startOffset": 113319, - "endColumn": 125, - "endOffset": 113440 - }, - "from": { - "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" - } - }, - { - "to": { - "startLine": 1520, - "startColumn": 4, - "startOffset": 113445, - "endColumn": 97, - "endOffset": 113538 + "startOffset": 113185, + "endLine": 1520, + "endColumn": 12, + "endOffset": 113302 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6296,9 +6324,9 @@ "to": { "startLine": 1521, "startColumn": 4, - "startOffset": 113543, - "endColumn": 93, - "endOffset": 113632 + "startOffset": 113307, + "endColumn": 81, + "endOffset": 113384 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6308,9 +6336,9 @@ "to": { "startLine": 1522, "startColumn": 4, - "startOffset": 113637, - "endColumn": 87, - "endOffset": 113720 + "startOffset": 113389, + "endColumn": 103, + "endOffset": 113488 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6320,9 +6348,9 @@ "to": { "startLine": 1523, "startColumn": 4, - "startOffset": 113725, - "endColumn": 111, - "endOffset": 113832 + "startOffset": 113493, + "endColumn": 119, + "endOffset": 113608 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6332,9 +6360,9 @@ "to": { "startLine": 1524, "startColumn": 4, - "startOffset": 113837, - "endColumn": 115, - "endOffset": 113948 + "startOffset": 113613, + "endColumn": 125, + "endOffset": 113734 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6344,9 +6372,9 @@ "to": { "startLine": 1525, "startColumn": 4, - "startOffset": 113953, - "endColumn": 121, - "endOffset": 114070 + "startOffset": 113739, + "endColumn": 97, + "endOffset": 113832 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6356,9 +6384,9 @@ "to": { "startLine": 1526, "startColumn": 4, - "startOffset": 114075, - "endColumn": 111, - "endOffset": 114182 + "startOffset": 113837, + "endColumn": 93, + "endOffset": 113926 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6368,10 +6396,33 @@ "to": { "startLine": 1527, "startColumn": 4, - "startOffset": 114187, - "endLine": 1529, - "endColumn": 12, - "endOffset": 114357 + "startOffset": 113931, + "endColumn": 87, + "endOffset": 114014 + }, + "from": { + "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" + } + }, + { + "to": { + "startLine": 1528, + "startColumn": 4, + "startOffset": 114019, + "endColumn": 111, + "endOffset": 114126 + }, + "from": { + "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" + } + }, + { + "to": { + "startLine": 1529, + "startColumn": 4, + "startOffset": 114131, + "endColumn": 115, + "endOffset": 114242 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6381,9 +6432,9 @@ "to": { "startLine": 1530, "startColumn": 4, - "startOffset": 114362, - "endColumn": 115, - "endOffset": 114473 + "startOffset": 114247, + "endColumn": 121, + "endOffset": 114364 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6393,9 +6444,9 @@ "to": { "startLine": 1531, "startColumn": 4, - "startOffset": 114478, - "endColumn": 85, - "endOffset": 114559 + "startOffset": 114369, + "endColumn": 111, + "endOffset": 114476 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6405,22 +6456,10 @@ "to": { "startLine": 1532, "startColumn": 4, - "startOffset": 114564, - "endColumn": 91, - "endOffset": 114651 - }, - "from": { - "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" - } - }, - { - "to": { - "startLine": 1533, - "startColumn": 4, - "startOffset": 114656, + "startOffset": 114481, "endLine": 1534, "endColumn": 12, - "endOffset": 114763 + "endOffset": 114651 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6430,10 +6469,21 @@ "to": { "startLine": 1535, "startColumn": 4, - "startOffset": 114768, - "endLine": 1536, - "endColumn": 12, - "endOffset": 114887 + "startOffset": 114656, + "endColumn": 115, + "endOffset": 114767 + }, + "from": { + "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" + } + }, + { + "to": { + "startLine": 1536, + "startColumn": 4, + "startOffset": 114772, + "endColumn": 85, + "endOffset": 114853 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6443,9 +6493,9 @@ "to": { "startLine": 1537, "startColumn": 4, - "startOffset": 114892, - "endColumn": 66, - "endOffset": 114954 + "startOffset": 114858, + "endColumn": 91, + "endOffset": 114945 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6455,10 +6505,10 @@ "to": { "startLine": 1538, "startColumn": 4, - "startOffset": 114959, + "startOffset": 114950, "endLine": 1539, "endColumn": 12, - "endOffset": 115080 + "endOffset": 115057 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6468,9 +6518,10 @@ "to": { "startLine": 1540, "startColumn": 4, - "startOffset": 115085, - "endColumn": 67, - "endOffset": 115148 + "startOffset": 115062, + "endLine": 1541, + "endColumn": 12, + "endOffset": 115181 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6478,12 +6529,11 @@ }, { "to": { - "startLine": 1541, + "startLine": 1542, "startColumn": 4, - "startOffset": 115153, - "endLine": 1542, - "endColumn": 12, - "endOffset": 115276 + "startOffset": 115186, + "endColumn": 66, + "endOffset": 115248 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6493,10 +6543,10 @@ "to": { "startLine": 1543, "startColumn": 4, - "startOffset": 115281, + "startOffset": 115253, "endLine": 1544, "endColumn": 12, - "endOffset": 115420 + "endOffset": 115374 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6506,10 +6556,9 @@ "to": { "startLine": 1545, "startColumn": 4, - "startOffset": 115425, - "endLine": 1546, - "endColumn": 12, - "endOffset": 115548 + "startOffset": 115379, + "endColumn": 67, + "endOffset": 115442 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6517,11 +6566,12 @@ }, { "to": { - "startLine": 1547, + "startLine": 1546, "startColumn": 4, - "startOffset": 115553, - "endColumn": 68, - "endOffset": 115617 + "startOffset": 115447, + "endLine": 1547, + "endColumn": 12, + "endOffset": 115570 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6531,21 +6581,10 @@ "to": { "startLine": 1548, "startColumn": 4, - "startOffset": 115622, - "endColumn": 94, - "endOffset": 115712 - }, - "from": { - "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" - } - }, - { - "to": { - "startLine": 1549, - "startColumn": 4, - "startOffset": 115717, - "endColumn": 114, - "endOffset": 115827 + "startOffset": 115575, + "endLine": 1549, + "endColumn": 12, + "endOffset": 115714 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6555,21 +6594,10 @@ "to": { "startLine": 1550, "startColumn": 4, - "startOffset": 115832, - "endColumn": 112, - "endOffset": 115940 - }, - "from": { - "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" - } - }, - { - "to": { - "startLine": 1551, - "startColumn": 4, - "startOffset": 115945, - "endColumn": 98, - "endOffset": 116039 + "startOffset": 115719, + "endLine": 1551, + "endColumn": 12, + "endOffset": 115842 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6579,9 +6607,9 @@ "to": { "startLine": 1552, "startColumn": 4, - "startOffset": 116044, - "endColumn": 108, - "endOffset": 116148 + "startOffset": 115847, + "endColumn": 68, + "endOffset": 115911 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6591,9 +6619,9 @@ "to": { "startLine": 1553, "startColumn": 4, - "startOffset": 116153, - "endColumn": 110, - "endOffset": 116259 + "startOffset": 115916, + "endColumn": 94, + "endOffset": 116006 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6603,9 +6631,9 @@ "to": { "startLine": 1554, "startColumn": 4, - "startOffset": 116264, - "endColumn": 110, - "endOffset": 116370 + "startOffset": 116011, + "endColumn": 114, + "endOffset": 116121 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6615,9 +6643,9 @@ "to": { "startLine": 1555, "startColumn": 4, - "startOffset": 116375, - "endColumn": 100, - "endOffset": 116471 + "startOffset": 116126, + "endColumn": 112, + "endOffset": 116234 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6627,9 +6655,9 @@ "to": { "startLine": 1556, "startColumn": 4, - "startOffset": 116476, - "endColumn": 104, - "endOffset": 116576 + "startOffset": 116239, + "endColumn": 98, + "endOffset": 116333 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6639,10 +6667,21 @@ "to": { "startLine": 1557, "startColumn": 4, - "startOffset": 116581, - "endLine": 1558, - "endColumn": 12, - "endOffset": 116688 + "startOffset": 116338, + "endColumn": 108, + "endOffset": 116442 + }, + "from": { + "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" + } + }, + { + "to": { + "startLine": 1558, + "startColumn": 4, + "startOffset": 116447, + "endColumn": 110, + "endOffset": 116553 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6652,10 +6691,21 @@ "to": { "startLine": 1559, "startColumn": 4, - "startOffset": 116693, - "endLine": 1560, - "endColumn": 12, - "endOffset": 116818 + "startOffset": 116558, + "endColumn": 110, + "endOffset": 116664 + }, + "from": { + "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" + } + }, + { + "to": { + "startLine": 1560, + "startColumn": 4, + "startOffset": 116669, + "endColumn": 100, + "endOffset": 116765 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6665,9 +6715,9 @@ "to": { "startLine": 1561, "startColumn": 4, - "startOffset": 116823, - "endColumn": 90, - "endOffset": 116909 + "startOffset": 116770, + "endColumn": 104, + "endOffset": 116870 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6677,22 +6727,10 @@ "to": { "startLine": 1562, "startColumn": 4, - "startOffset": 116914, - "endColumn": 122, - "endOffset": 117032 - }, - "from": { - "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" - } - }, - { - "to": { - "startLine": 1563, - "startColumn": 4, - "startOffset": 117037, - "endLine": 1564, + "startOffset": 116875, + "endLine": 1563, "endColumn": 12, - "endOffset": 117144 + "endOffset": 116982 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6700,11 +6738,12 @@ }, { "to": { - "startLine": 1565, + "startLine": 1564, "startColumn": 4, - "startOffset": 117149, - "endColumn": 85, - "endOffset": 117230 + "startOffset": 116987, + "endLine": 1565, + "endColumn": 12, + "endOffset": 117112 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6714,9 +6753,9 @@ "to": { "startLine": 1566, "startColumn": 4, - "startOffset": 117235, - "endColumn": 103, - "endOffset": 117334 + "startOffset": 117117, + "endColumn": 90, + "endOffset": 117203 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6726,10 +6765,9 @@ "to": { "startLine": 1567, "startColumn": 4, - "startOffset": 117339, - "endLine": 1568, - "endColumn": 12, - "endOffset": 117442 + "startOffset": 117208, + "endColumn": 122, + "endOffset": 117326 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6737,12 +6775,24 @@ }, { "to": { - "startLine": 1569, + "startLine": 1568, "startColumn": 4, - "startOffset": 117447, - "endLine": 1570, + "startOffset": 117331, + "endLine": 1569, "endColumn": 12, - "endOffset": 117542 + "endOffset": 117438 + }, + "from": { + "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" + } + }, + { + "to": { + "startLine": 1570, + "startColumn": 4, + "startOffset": 117443, + "endColumn": 85, + "endOffset": 117524 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6752,10 +6802,9 @@ "to": { "startLine": 1571, "startColumn": 4, - "startOffset": 117547, - "endLine": 1572, - "endColumn": 12, - "endOffset": 117660 + "startOffset": 117529, + "endColumn": 103, + "endOffset": 117628 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6763,12 +6812,12 @@ }, { "to": { - "startLine": 1573, + "startLine": 1572, "startColumn": 4, - "startOffset": 117665, - "endLine": 1574, + "startOffset": 117633, + "endLine": 1573, "endColumn": 12, - "endOffset": 117764 + "endOffset": 117736 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6776,12 +6825,12 @@ }, { "to": { - "startLine": 1575, + "startLine": 1574, "startColumn": 4, - "startOffset": 117769, - "endLine": 1576, + "startOffset": 117741, + "endLine": 1575, "endColumn": 12, - "endOffset": 117868 + "endOffset": 117836 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6789,12 +6838,12 @@ }, { "to": { - "startLine": 1577, + "startLine": 1576, "startColumn": 4, - "startOffset": 117873, - "endLine": 1578, + "startOffset": 117841, + "endLine": 1577, "endColumn": 12, - "endOffset": 117994 + "endOffset": 117954 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6802,11 +6851,12 @@ }, { "to": { - "startLine": 1579, + "startLine": 1578, "startColumn": 4, - "startOffset": 117999, - "endColumn": 87, - "endOffset": 118082 + "startOffset": 117959, + "endLine": 1579, + "endColumn": 12, + "endOffset": 118058 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6816,21 +6866,10 @@ "to": { "startLine": 1580, "startColumn": 4, - "startOffset": 118087, - "endColumn": 89, - "endOffset": 118172 - }, - "from": { - "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" - } - }, - { - "to": { - "startLine": 1581, - "startColumn": 4, - "startOffset": 118177, - "endColumn": 109, - "endOffset": 118282 + "startOffset": 118063, + "endLine": 1581, + "endColumn": 12, + "endOffset": 118162 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6840,21 +6879,10 @@ "to": { "startLine": 1582, "startColumn": 4, - "startOffset": 118287, - "endColumn": 83, - "endOffset": 118366 - }, - "from": { - "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" - } - }, - { - "to": { - "startLine": 1583, - "startColumn": 4, - "startOffset": 118371, - "endColumn": 83, - "endOffset": 118450 + "startOffset": 118167, + "endLine": 1583, + "endColumn": 12, + "endOffset": 118288 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6864,9 +6892,9 @@ "to": { "startLine": 1584, "startColumn": 4, - "startOffset": 118455, - "endColumn": 53, - "endOffset": 118504 + "startOffset": 118293, + "endColumn": 87, + "endOffset": 118376 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6876,9 +6904,9 @@ "to": { "startLine": 1585, "startColumn": 4, - "startOffset": 118509, - "endColumn": 63, - "endOffset": 118568 + "startOffset": 118381, + "endColumn": 89, + "endOffset": 118466 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6888,9 +6916,9 @@ "to": { "startLine": 1586, "startColumn": 4, - "startOffset": 118573, - "endColumn": 105, - "endOffset": 118674 + "startOffset": 118471, + "endColumn": 109, + "endOffset": 118576 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6900,9 +6928,9 @@ "to": { "startLine": 1587, "startColumn": 4, - "startOffset": 118679, - "endColumn": 109, - "endOffset": 118784 + "startOffset": 118581, + "endColumn": 83, + "endOffset": 118660 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6912,9 +6940,9 @@ "to": { "startLine": 1588, "startColumn": 4, - "startOffset": 118789, + "startOffset": 118665, "endColumn": 83, - "endOffset": 118868 + "endOffset": 118744 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" @@ -6924,9 +6952,69 @@ "to": { "startLine": 1589, "startColumn": 4, - "startOffset": 118873, + "startOffset": 118749, + "endColumn": 53, + "endOffset": 118798 + }, + "from": { + "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" + } + }, + { + "to": { + "startLine": 1590, + "startColumn": 4, + "startOffset": 118803, + "endColumn": 63, + "endOffset": 118862 + }, + "from": { + "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" + } + }, + { + "to": { + "startLine": 1591, + "startColumn": 4, + "startOffset": 118867, + "endColumn": 105, + "endOffset": 118968 + }, + "from": { + "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" + } + }, + { + "to": { + "startLine": 1592, + "startColumn": 4, + "startOffset": 118973, + "endColumn": 109, + "endOffset": 119078 + }, + "from": { + "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" + } + }, + { + "to": { + "startLine": 1593, + "startColumn": 4, + "startOffset": 119083, + "endColumn": 83, + "endOffset": 119162 + }, + "from": { + "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" + } + }, + { + "to": { + "startLine": 1594, + "startColumn": 4, + "startOffset": 119167, "endColumn": 119, - "endOffset": 118988 + "endOffset": 119282 }, "from": { "file": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\values\\values.xml" diff --git a/app/build/intermediates/blame/res/debug/single/anim.json b/app/build/intermediates/blame/res/debug/single/anim.json index 883b615..c2a95db 100644 --- a/app/build/intermediates/blame/res/debug/single/anim.json +++ b/app/build/intermediates/blame/res/debug/single/anim.json @@ -23,6 +23,10 @@ "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\anim\\scale_up.xml", "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\anim\\scale_up.xml" }, + { + "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\anim\\shape_button_rotation.xml", + "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\anim\\shape_button_rotation.xml" + }, { "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\anim\\decrease.xml", "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\anim\\decrease.xml" diff --git a/app/build/intermediates/blame/res/debug/single/drawable.json b/app/build/intermediates/blame/res/debug/single/drawable.json index 6199d68..142526a 100644 --- a/app/build/intermediates/blame/res/debug/single/drawable.json +++ b/app/build/intermediates/blame/res/debug/single/drawable.json @@ -31,22 +31,22 @@ "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" }, - { - "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\guis_arrow_green.png", - "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\guis_arrow_green.png" - }, { "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\\guis_arrow_green.png", + "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\guis_arrow_green.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\\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\\tools_magnet_button.png", "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tools_magnet_button.png" @@ -84,16 +84,16 @@ "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\xml_selector_settingsbutton.xml" }, { - "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\guis_shape_shop_enabled.png", - "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\guis_shape_shop_enabled.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_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\\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\\guis_shape_shop_enabled.png", + "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\guis_shape_shop_enabled.png" }, { "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\currency_star_empty.png", @@ -151,14 +151,14 @@ "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\\guis_lock_locked.png", - "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\guis_lock_locked.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\\guis_lock_locked.png", + "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\guis_lock_locked.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" @@ -171,10 +171,6 @@ "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\\xml_selector_shopbutton.xml", - "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\xml_selector_shopbutton.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" @@ -271,6 +267,10 @@ "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\xml_background_toolupgrade.xml", "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\xml_background_toolupgrade.xml" }, + { + "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\xml_selector_toolshopbutton.xml", + "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\xml_selector_toolshopbutton.xml" + }, { "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tools_power_mushroom.png", "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tools_power_mushroom.png" @@ -367,6 +367,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\\xml_selector_shapeshopbutton.xml", + "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\xml_selector_shapeshopbutton.xml" + }, { "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tools_button_locked.png", "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tools_button_locked.png" diff --git a/app/build/intermediates/blame/res/debug/single/layout.json b/app/build/intermediates/blame/res/debug/single/layout.json index 7ca2a64..7670878 100644 --- a/app/build/intermediates/blame/res/debug/single/layout.json +++ b/app/build/intermediates/blame/res/debug/single/layout.json @@ -3,22 +3,22 @@ "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\levels.xml", "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\layout\\levels.xml" }, - { - "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\tutorial.xml", - "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\layout\\tutorial.xml" - }, { "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\toolshop.xml", "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\layout\\toolshop.xml" }, { - "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\worlds.xml", - "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\layout\\worlds.xml" + "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\tutorial.xml", + "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\layout\\tutorial.xml" }, { "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\abc_screen_simple_overlay_action_mode.xml", "source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\layout\\abc_screen_simple_overlay_action_mode.xml" }, + { + "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\worlds.xml", + "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\layout\\worlds.xml" + }, { "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\abc_screen_simple.xml", "source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\layout\\abc_screen_simple.xml" @@ -51,6 +51,10 @@ "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\game.xml", "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\layout\\game.xml" }, + { + "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\shape_shop.xml", + "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\layout\\shape_shop.xml" + }, { "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\toolbuttonbar.xml", "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\layout\\toolbuttonbar.xml" @@ -103,6 +107,10 @@ "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\abc_expanded_menu_layout.xml", "source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\layout\\abc_expanded_menu_layout.xml" }, + { + "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\shape_button.xml", + "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\layout\\shape_button.xml" + }, { "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\unlock_message.xml", "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\layout\\unlock_message.xml" diff --git a/app/build/intermediates/incremental/mergeDebugResources/merger.xml b/app/build/intermediates/incremental/mergeDebugResources/merger.xml index 211ecba..3454f68 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 -