|
|
|
@ -1,16 +1,14 @@
|
|
|
|
|
{
|
|
|
|
|
"logs": [
|
|
|
|
|
{
|
|
|
|
|
"outputFile": "net.micode.notes.app-mergeDebugResources-2:/values/values.xml",
|
|
|
|
|
"outputFile": "C:\\Users\\24486\\.gradle\\daemon\\8.0\\net.micode.notes.app-mergeDebugResources-2:\\values\\values.xml",
|
|
|
|
|
"map": [
|
|
|
|
|
{
|
|
|
|
|
"source": "E:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\MicodeNotes\\src\\Notes-master3\\app\\src\\main\\res\\values\\colors.xml",
|
|
|
|
|
"from": {
|
|
|
|
|
"startLines": "18",
|
|
|
|
|
"startColumns": "4",
|
|
|
|
|
"startOffsets": "730",
|
|
|
|
|
"endColumns": "56",
|
|
|
|
|
"endOffsets": "782"
|
|
|
|
|
"startLines": "-1",
|
|
|
|
|
"startColumns": "-1",
|
|
|
|
|
"startOffsets": "-1"
|
|
|
|
|
},
|
|
|
|
|
"to": {
|
|
|
|
|
"startLines": "12",
|
|
|
|
@ -23,12 +21,12 @@
|
|
|
|
|
{
|
|
|
|
|
"source": "E:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\MicodeNotes\\src\\Notes-master3\\app\\src\\main\\res\\values\\styles.xml",
|
|
|
|
|
"from": {
|
|
|
|
|
"startLines": "50,55,64,60,22,26,30,35,40,18,45",
|
|
|
|
|
"startColumns": "4,4,4,4,4,4,4,4,4,4,4",
|
|
|
|
|
"startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905",
|
|
|
|
|
"endLines": "53,58,67,62,25,29,33,38,43,21,48",
|
|
|
|
|
"endColumns": "12,12,12,12,12,12,12,12,12,12,12",
|
|
|
|
|
"endOffsets": "2314,2531,2910,2696,1098,1287,1476,1685,1897,911,2104"
|
|
|
|
|
"startLines": "-1,-1,64,-1,-1,-1,-1,-1,-1,-1,-1",
|
|
|
|
|
"startColumns": "-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1",
|
|
|
|
|
"startOffsets": "-1,-1,2704,-1,-1,-1,-1,-1,-1,-1,-1",
|
|
|
|
|
"endLines": "-1,-1,67,-1,-1,-1,-1,-1,-1,-1,-1",
|
|
|
|
|
"endColumns": "-1,-1,12,-1,-1,-1,-1,-1,-1,-1,-1",
|
|
|
|
|
"endOffsets": "-1,-1,2910,-1,-1,-1,-1,-1,-1,-1,-1"
|
|
|
|
|
},
|
|
|
|
|
"to": {
|
|
|
|
|
"startLines": "125,129,133,137,140,144,148,152,156,160,164",
|
|
|
|
@ -42,12 +40,9 @@
|
|
|
|
|
{
|
|
|
|
|
"source": "E:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\MicodeNotes\\src\\Notes-master3\\app\\src\\main\\res\\values\\arrays.xml",
|
|
|
|
|
"from": {
|
|
|
|
|
"startLines": "19,26",
|
|
|
|
|
"startColumns": "4,4",
|
|
|
|
|
"startOffsets": "758,1073",
|
|
|
|
|
"endLines": "24,29",
|
|
|
|
|
"endColumns": "19,19",
|
|
|
|
|
"endOffsets": "1065,1191"
|
|
|
|
|
"startLines": "-1,-1",
|
|
|
|
|
"startColumns": "-1,-1",
|
|
|
|
|
"startOffsets": "-1,-1"
|
|
|
|
|
},
|
|
|
|
|
"to": {
|
|
|
|
|
"startLines": "2,8",
|
|
|
|
@ -61,11 +56,9 @@
|
|
|
|
|
{
|
|
|
|
|
"source": "E:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\MicodeNotes\\src\\Notes-master3\\app\\src\\main\\res\\values\\dimens.xml",
|
|
|
|
|
"from": {
|
|
|
|
|
"startLines": "19,20,21,22,18",
|
|
|
|
|
"startColumns": "4,4,4,4,4",
|
|
|
|
|
"startOffsets": "783,836,890,944,730",
|
|
|
|
|
"endColumns": "51,52,52,51,51",
|
|
|
|
|
"endOffsets": "830,884,938,991,777"
|
|
|
|
|
"startLines": "-1,-1,-1,-1,-1",
|
|
|
|
|
"startColumns": "-1,-1,-1,-1,-1",
|
|
|
|
|
"startOffsets": "-1,-1,-1,-1,-1"
|
|
|
|
|
},
|
|
|
|
|
"to": {
|
|
|
|
|
"startLines": "13,14,15,16,17",
|
|
|
|
@ -78,12 +71,95 @@
|
|
|
|
|
{
|
|
|
|
|
"source": "E:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\MicodeNotes\\src\\Notes-master3\\app\\src\\main\\res\\values\\strings.xml",
|
|
|
|
|
"from": {
|
|
|
|
|
"startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
|
|
|
|
|
"startLines": "-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,-1,-1,-1,-1,-1",
|
|
|
|
|
"startColumns": "-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,-1,-1,-1,-1,-1",
|
|
|
|
|
"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,-1,-1,-1,-1,-1"
|
|
|
|
|
},
|
|
|
|
|
"to": {
|
|
|
|
|
"startLines": "18,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,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
|
|
|
|
|
"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,4,4,4,4,4",
|
|
|
|
|
"startOffsets": "8136,3970,4234,4137,4067,846,890,943,7624,7674,8077,8025,1308,4694,4789,4622,4537,4453,5668,5584,5481,4967,2043,1991,3461,1515,1569,5029,2138,4318,7738,3898,3649,2198,2519,2825,2257,3389,3327,3269,3043,2990,2885,2939,3094,3145,2567,3831,3206,3699,2471,2769,2680,2621,3586,2420,3540,2315,2359,3763,1459,1784,1894,1736,1840,1679,1630,1252,1198,6131,6063,6375,7525,6744,6662,6819,6909,7153,7073,6216,6292,6602,6440,6521,6007,7298,7421,7983,7854,7796,7908,1393,4898,5394,5805,5735,5886,5334,5278,5215,5154,996,1107",
|
|
|
|
|
"endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
|
|
|
|
|
"startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034",
|
|
|
|
|
"endLines": "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,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
|
|
|
|
|
"endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
|
|
|
|
|
"endOffsets": "8544,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,1834,1942,1778,1888,1730,1673,1302,1246,6210,6125,6434,7616,6813,6738,6903,7067,7292,7147,6286,6369,6656,6515,6596,6057,7415,7519,8019,7902,7848,7977,1453,4961,5475,5880,5799,5975,5388,5328,5272,5209,1101,1192"
|
|
|
|
|
"endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119"
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
]
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"outputFile": "net.micode.notes.app-mergeDebugResources-2:/values/values.xml",
|
|
|
|
|
"map": [
|
|
|
|
|
{
|
|
|
|
|
"source": "E:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\MicodeNotes\\src\\Notes-master3\\app\\src\\main\\res\\values\\colors.xml",
|
|
|
|
|
"from": {
|
|
|
|
|
"startLines": "-1",
|
|
|
|
|
"startColumns": "-1",
|
|
|
|
|
"startOffsets": "-1"
|
|
|
|
|
},
|
|
|
|
|
"to": {
|
|
|
|
|
"startLines": "12",
|
|
|
|
|
"startColumns": "4",
|
|
|
|
|
"startOffsets": "420",
|
|
|
|
|
"endColumns": "56",
|
|
|
|
|
"endOffsets": "472"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"source": "E:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\MicodeNotes\\src\\Notes-master3\\app\\src\\main\\res\\values\\styles.xml",
|
|
|
|
|
"from": {
|
|
|
|
|
"startLines": "-1,-1,64,-1,-1,-1,-1,-1,-1,-1,-1",
|
|
|
|
|
"startColumns": "-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1",
|
|
|
|
|
"startOffsets": "-1,-1,2704,-1,-1,-1,-1,-1,-1,-1,-1",
|
|
|
|
|
"endLines": "-1,-1,67,-1,-1,-1,-1,-1,-1,-1,-1",
|
|
|
|
|
"endColumns": "-1,-1,12,-1,-1,-1,-1,-1,-1,-1,-1",
|
|
|
|
|
"endOffsets": "-1,-1,2913,-1,-1,-1,-1,-1,-1,-1,-1"
|
|
|
|
|
},
|
|
|
|
|
"to": {
|
|
|
|
|
"startLines": "125,129,133,137,140,144,148,152,156,160,164",
|
|
|
|
|
"startColumns": "4,4,4,4,4,4,4,4,4,4,4",
|
|
|
|
|
"startOffsets": "8124,8328,8539,8749,8909,9092,9277,9462,9665,9871,10054",
|
|
|
|
|
"endLines": "128,132,136,139,143,147,151,155,159,163,167",
|
|
|
|
|
"endColumns": "12,12,12,12,12,12,12,12,12,12,12",
|
|
|
|
|
"endOffsets": "8323,8534,8744,8904,9087,9272,9457,9660,9866,10049,10250"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"source": "E:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\MicodeNotes\\src\\Notes-master3\\app\\src\\main\\res\\values\\arrays.xml",
|
|
|
|
|
"from": {
|
|
|
|
|
"startLines": "-1,-1",
|
|
|
|
|
"startColumns": "-1,-1",
|
|
|
|
|
"startOffsets": "-1,-1"
|
|
|
|
|
},
|
|
|
|
|
"to": {
|
|
|
|
|
"startLines": "2,8",
|
|
|
|
|
"startColumns": "4,4",
|
|
|
|
|
"startOffsets": "105,300",
|
|
|
|
|
"endLines": "7,11",
|
|
|
|
|
"endColumns": "19,19",
|
|
|
|
|
"endOffsets": "295,415"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"source": "E:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\MicodeNotes\\src\\Notes-master3\\app\\src\\main\\res\\values\\dimens.xml",
|
|
|
|
|
"from": {
|
|
|
|
|
"startLines": "-1,-1,-1,-1,-1",
|
|
|
|
|
"startColumns": "-1,-1,-1,-1,-1",
|
|
|
|
|
"startOffsets": "-1,-1,-1,-1,-1"
|
|
|
|
|
},
|
|
|
|
|
"to": {
|
|
|
|
|
"startLines": "13,14,15,16,17",
|
|
|
|
|
"startColumns": "4,4,4,4,4",
|
|
|
|
|
"startOffsets": "477,529,582,635,687",
|
|
|
|
|
"endColumns": "51,52,52,51,51",
|
|
|
|
|
"endOffsets": "524,577,630,682,734"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"source": "E:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\MicodeNotes\\src\\Notes-master3\\app\\src\\main\\res\\values\\strings.xml",
|
|
|
|
|
"from": {
|
|
|
|
|
"startLines": "-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,-1,-1,-1,-1,-1",
|
|
|
|
|
"startColumns": "-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,-1,-1,-1,-1,-1",
|
|
|
|
|
"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,-1,-1,-1,-1,-1"
|
|
|
|
|
},
|
|
|
|
|
"to": {
|
|
|
|
|
"startLines": "18,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,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
|
|
|
|
|