diff --git a/mobile/build/intermediates/merged_res_blame_folder/debug/mergeDebugResources/out/multi-v2/mergeDebugResources.json b/mobile/build/intermediates/merged_res_blame_folder/debug/mergeDebugResources/out/multi-v2/mergeDebugResources.json index 4d24b723..4ab8cc3a 100644 --- a/mobile/build/intermediates/merged_res_blame_folder/debug/mergeDebugResources/out/multi-v2/mergeDebugResources.json +++ b/mobile/build/intermediates/merged_res_blame_folder/debug/mergeDebugResources/out/multi-v2/mergeDebugResources.json @@ -146,30 +146,6 @@ } ] }, - { - "outputFile": "de.deskhub.staff-debug-53:/values-night-v8_values-night-v8.arsc.flat", - "map": [ - { - "source": "C:\\Users\\Viper\\Desktop\\deskhub\\mobile\\src\\main\\res\\values-night\\themes.xml", - "from": { - "startLines": "1", - "startColumns": "4", - "startOffsets": "17", - "endLines": "7", - "endColumns": "12", - "endOffsets": "412" - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endLines": "8", - "endColumns": "12", - "endOffsets": "444" - } - } - ] - }, { "outputFile": "C:\\Users\\Viper\\.gradle\\daemon\\8.7\\de.deskhub.staff-debug-53:\\values-cs_values-cs.arsc.flat", "map": [ @@ -2666,7 +2642,7 @@ "startOffsets": "17", "endLines": "7", "endColumns": "12", - "endOffsets": "417" + "endOffsets": "418" }, "to": { "startLines": "227", @@ -2674,7 +2650,7 @@ "startOffsets": "14514", "endLines": "233", "endColumns": "12", - "endOffsets": "14908" + "endOffsets": "14909" } }, { @@ -2733,10 +2709,10 @@ "to": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,73,74,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,100,103,104,105,106,107,108,109,187,216,217,221,222,226,234,235", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "150,210,282,370,435,501,570,633,703,771,843,913,974,1048,1121,1182,1243,1305,1369,1431,1492,1560,1660,1720,1786,1859,1928,1985,2037,2099,2171,2247,2312,2371,2430,2490,2550,2610,2670,2730,2790,2850,2910,2970,3030,3089,3149,3209,3269,3329,3389,3449,3509,3569,3629,3689,3748,3808,3868,3927,3986,4045,4104,4163,4635,4670,4867,4922,4985,5040,5098,5156,5217,5280,5337,5388,5438,5499,5556,5622,5656,5691,6059,6257,6324,6396,6465,6534,6608,6680,12115,13756,13873,14074,14184,14385,14913,14985", + "startOffsets": "150,210,282,370,435,501,570,633,703,771,843,913,974,1048,1121,1182,1243,1305,1369,1431,1492,1560,1660,1720,1786,1859,1928,1985,2037,2099,2171,2247,2312,2371,2430,2490,2550,2610,2670,2730,2790,2850,2910,2970,3030,3089,3149,3209,3269,3329,3389,3449,3509,3569,3629,3689,3748,3808,3868,3927,3986,4045,4104,4163,4635,4670,4867,4922,4985,5040,5098,5156,5217,5280,5337,5388,5438,5499,5556,5622,5656,5691,6059,6257,6324,6396,6465,6534,6608,6680,12115,13756,13873,14074,14184,14385,14914,14986", "endLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,73,74,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,100,103,104,105,106,107,108,109,187,216,220,221,225,226,234,235", "endColumns": "59,71,87,64,65,68,62,69,67,71,69,60,73,72,60,60,61,63,61,60,67,99,59,65,72,68,56,51,61,71,75,64,58,58,59,59,59,59,59,59,59,59,59,59,58,59,59,59,59,59,59,59,59,59,59,58,59,59,58,58,58,58,58,58,34,34,54,62,54,57,57,60,62,56,50,49,60,56,65,33,34,34,69,66,71,68,68,73,71,87,70,116,12,109,12,128,71,66", - "endOffsets": "205,277,365,430,496,565,628,698,766,838,908,969,1043,1116,1177,1238,1300,1364,1426,1487,1555,1655,1715,1781,1854,1923,1980,2032,2094,2166,2242,2307,2366,2425,2485,2545,2605,2665,2725,2785,2845,2905,2965,3025,3084,3144,3204,3264,3324,3384,3444,3504,3564,3624,3684,3743,3803,3863,3922,3981,4040,4099,4158,4217,4665,4700,4917,4980,5035,5093,5151,5212,5275,5332,5383,5433,5494,5551,5617,5651,5686,5721,6124,6319,6391,6460,6529,6603,6675,6763,12181,13868,14069,14179,14380,14509,14980,15047" + "endOffsets": "205,277,365,430,496,565,628,698,766,838,908,969,1043,1116,1177,1238,1300,1364,1426,1487,1555,1655,1715,1781,1854,1923,1980,2032,2094,2166,2242,2307,2366,2425,2485,2545,2605,2665,2725,2785,2845,2905,2965,3025,3084,3144,3204,3264,3324,3384,3444,3504,3564,3624,3684,3743,3803,3863,3922,3981,4040,4099,4158,4217,4665,4700,4917,4980,5035,5093,5151,5212,5275,5332,5383,5433,5494,5551,5617,5651,5686,5721,6124,6319,6391,6460,6529,6603,6675,6763,12181,13868,14069,14179,14380,14509,14981,15048" } }, { @@ -6517,12 +6493,12 @@ "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" }, "to": { - "startLines": "66,67,68,70,71,98,110,111,112,113,114,115,116,178,179,180,181,182,184,185,186,188,189,190,193,209,212", + "startLines": "66,67,68,70,71,98,110,111,112,113,114,115,116,178,179,180,181,182,184,185,186,188,189,190,194,210,213", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "4222,4296,4354,4475,4526,5933,6768,6833,6887,6953,7054,7112,7164,11665,11727,11781,11831,11885,11987,12033,12075,12186,12233,12269,12470,13450,13561", - "endLines": "66,67,68,70,71,98,110,111,112,113,114,115,116,178,179,180,181,182,184,185,186,188,189,190,195,211,215", + "startOffsets": "4222,4296,4354,4475,4526,5933,6768,6833,6887,6953,7054,7112,7164,11665,11727,11781,11831,11885,11987,12033,12075,12186,12233,12269,12583,13563,13674", + "endLines": "66,67,68,70,71,98,110,111,112,113,114,115,116,178,179,180,181,182,184,185,186,188,189,190,196,212,216", "endColumns": "73,57,54,50,54,52,64,53,65,100,57,51,59,61,53,49,53,45,45,41,39,46,35,89,12,12,12", - "endOffsets": "4291,4349,4404,4521,4576,5981,6828,6882,6948,7049,7107,7159,7219,11722,11776,11826,11880,11926,12028,12070,12110,12228,12264,12354,12577,13556,13751" + "endOffsets": "4291,4349,4404,4521,4576,5981,6828,6882,6948,7049,7107,7159,7219,11722,11776,11826,11880,11926,12028,12070,12110,12228,12264,12354,12690,13669,13864" } }, { @@ -6573,20 +6549,17 @@ { "source": "C:\\Users\\Viper\\Desktop\\deskhub\\mobile\\src\\main\\res\\values\\themes.xml", "from": { - "startLines": "1", - "startColumns": "4", - "startOffsets": "17", - "endLines": "7", - "endColumns": "12", - "endOffsets": "418" + "startLines": "-1", + "startColumns": "-1", + "startOffsets": "-1" }, "to": { - "startLines": "227", + "startLines": "228", "startColumns": "4", - "startOffsets": "14514", - "endLines": "233", + "startOffsets": "14627", + "endLines": "234", "endColumns": "12", - "endOffsets": "14909" + "endOffsets": "15022" } }, { @@ -6612,12 +6585,12 @@ "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" }, "to": { - "startLines": "99,117,118,119,120,121,122,123,124,125,126,129,130,131,132,133,134,135,136,137,138,139,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,196,206", + "startLines": "99,117,118,119,120,121,122,123,124,125,126,129,130,131,132,133,134,135,136,137,138,139,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,197,207", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "5986,7224,7312,7398,7479,7563,7632,7697,7780,7886,7972,8092,8146,8215,8276,8345,8434,8529,8603,8700,8793,8891,9040,9131,9219,9315,9413,9477,9545,9632,9726,9793,9865,9937,10038,10147,10223,10292,10340,10406,10470,10544,10601,10658,10730,10780,10834,10905,10976,11046,11115,11173,11249,11320,11394,11480,11530,11600,12582,13297", - "endLines": "99,117,118,119,120,121,122,123,124,125,128,129,130,131,132,133,134,135,136,137,138,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,205,208", + "startOffsets": "5986,7224,7312,7398,7479,7563,7632,7697,7780,7886,7972,8092,8146,8215,8276,8345,8434,8529,8603,8700,8793,8891,9040,9131,9219,9315,9413,9477,9545,9632,9726,9793,9865,9937,10038,10147,10223,10292,10340,10406,10470,10544,10601,10658,10730,10780,10834,10905,10976,11046,11115,11173,11249,11320,11394,11480,11530,11600,12695,13410", + "endLines": "99,117,118,119,120,121,122,123,124,125,128,129,130,131,132,133,134,135,136,137,138,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,206,209", "endColumns": "72,87,85,80,83,68,64,82,105,85,13,53,68,60,68,88,94,73,96,92,97,13,90,87,95,97,63,67,86,93,66,71,71,100,108,75,68,47,65,63,73,56,56,71,49,53,70,70,69,68,57,75,70,73,85,49,69,64,12,12", - "endOffsets": "6054,7307,7393,7474,7558,7627,7692,7775,7881,7967,8087,8141,8210,8271,8340,8429,8524,8598,8695,8788,8886,9035,9126,9214,9310,9408,9472,9540,9627,9721,9788,9860,9932,10033,10142,10218,10287,10335,10401,10465,10539,10596,10653,10725,10775,10829,10900,10971,11041,11110,11168,11244,11315,11389,11475,11525,11595,11660,13292,13445" + "endOffsets": "6054,7307,7393,7474,7558,7627,7692,7775,7881,7967,8087,8141,8210,8271,8340,8429,8524,8598,8695,8788,8886,9035,9126,9214,9310,9408,9472,9540,9627,9721,9788,9860,9932,10033,10142,10218,10287,10335,10401,10465,10539,10596,10653,10725,10775,10829,10900,10971,11041,11110,11168,11244,11315,11389,11475,11525,11595,11660,13405,13558" } }, { @@ -6643,12 +6616,12 @@ "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" }, "to": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,73,74,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,100,103,104,105,106,107,108,109,187,216,217,221,222,226,234,235", + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,73,74,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,100,103,104,105,106,107,108,109,187,217,218,222,223,227,235,236", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "150,210,282,370,435,501,570,633,703,771,843,913,974,1048,1121,1182,1243,1305,1369,1431,1492,1560,1660,1720,1786,1859,1928,1985,2037,2099,2171,2247,2312,2371,2430,2490,2550,2610,2670,2730,2790,2850,2910,2970,3030,3089,3149,3209,3269,3329,3389,3449,3509,3569,3629,3689,3748,3808,3868,3927,3986,4045,4104,4163,4635,4670,4867,4922,4985,5040,5098,5156,5217,5280,5337,5388,5438,5499,5556,5622,5656,5691,6059,6257,6324,6396,6465,6534,6608,6680,12115,13756,13873,14074,14184,14385,14914,14986", - "endLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,73,74,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,100,103,104,105,106,107,108,109,187,216,220,221,225,226,234,235", + "startOffsets": "150,210,282,370,435,501,570,633,703,771,843,913,974,1048,1121,1182,1243,1305,1369,1431,1492,1560,1660,1720,1786,1859,1928,1985,2037,2099,2171,2247,2312,2371,2430,2490,2550,2610,2670,2730,2790,2850,2910,2970,3030,3089,3149,3209,3269,3329,3389,3449,3509,3569,3629,3689,3748,3808,3868,3927,3986,4045,4104,4163,4635,4670,4867,4922,4985,5040,5098,5156,5217,5280,5337,5388,5438,5499,5556,5622,5656,5691,6059,6257,6324,6396,6465,6534,6608,6680,12115,13869,13986,14187,14297,14498,15027,15099", + "endLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,73,74,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,100,103,104,105,106,107,108,109,187,217,221,222,226,227,235,236", "endColumns": "59,71,87,64,65,68,62,69,67,71,69,60,73,72,60,60,61,63,61,60,67,99,59,65,72,68,56,51,61,71,75,64,58,58,59,59,59,59,59,59,59,59,59,59,58,59,59,59,59,59,59,59,59,59,59,58,59,59,58,58,58,58,58,58,34,34,54,62,54,57,57,60,62,56,50,49,60,56,65,33,34,34,69,66,71,68,68,73,71,87,70,116,12,109,12,128,71,66", - "endOffsets": "205,277,365,430,496,565,628,698,766,838,908,969,1043,1116,1177,1238,1300,1364,1426,1487,1555,1655,1715,1781,1854,1923,1980,2032,2094,2166,2242,2307,2366,2425,2485,2545,2605,2665,2725,2785,2845,2905,2965,3025,3084,3144,3204,3264,3324,3384,3444,3504,3564,3624,3684,3743,3803,3863,3922,3981,4040,4099,4158,4217,4665,4700,4917,4980,5035,5093,5151,5212,5275,5332,5383,5433,5494,5551,5617,5651,5686,5721,6124,6319,6391,6460,6529,6603,6675,6763,12181,13868,14069,14179,14380,14509,14981,15048" + "endOffsets": "205,277,365,430,496,565,628,698,766,838,908,969,1043,1116,1177,1238,1300,1364,1426,1487,1555,1655,1715,1781,1854,1923,1980,2032,2094,2166,2242,2307,2366,2425,2485,2545,2605,2665,2725,2785,2845,2905,2965,3025,3084,3144,3204,3264,3324,3384,3444,3504,3564,3624,3684,3743,3803,3863,3922,3981,4040,4099,4158,4217,4665,4700,4917,4980,5035,5093,5151,5212,5275,5332,5383,5433,5494,5551,5617,5651,5686,5721,6124,6319,6391,6460,6529,6603,6675,6763,12181,13981,14182,14292,14493,14622,15094,15161" } }, { @@ -6714,16 +6687,18 @@ { "source": "C:\\Users\\Viper\\Desktop\\deskhub\\mobile\\src\\main\\res\\values\\strings.xml", "from": { - "startLines": "-1,-1", - "startColumns": "-1,-1", - "startOffsets": "-1,-1" + "startLines": "-1,-1,3", + "startColumns": "-1,-1,4", + "startOffsets": "-1,-1,120", + "endColumns": "-1,-1,112", + "endOffsets": "-1,-1,228" }, "to": { - "startLines": "102,183", - "startColumns": "4,4", - "startOffsets": "6212,11931", - "endColumns": "44,55", - "endOffsets": "6252,11982" + "startLines": "102,183,193", + "startColumns": "4,4,4", + "startOffsets": "6212,11931,12470", + "endColumns": "44,55,112", + "endOffsets": "6252,11982,12578" } } ]