diff --git a/android/.idea/runConfigurations.xml b/android/.idea/runConfigurations.xml
new file mode 100644
index 000000000..7f68460d8
--- /dev/null
+++ b/android/.idea/runConfigurations.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/debug.json b/android/app/build/intermediates/blame/res/debug/multi-v2/debug.json
index a1e9adbc3..7721ab304 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/debug.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/debug.json
@@ -1,6 +1,7 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-lv_values-lv.arsc.flat",
"map": [
{
@@ -56,6 +57,60 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-lv\\values-lv.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-w360dp-port-v13_values-w360dp-port-v13.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\19593d9c2c700c52ad03572ebfd537d5\\material-1.1.0-rc02\\res\\values-w360dp-port-v13\\values-w360dp-port-v13.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9",
+ "startColumns": "4,4,4,4,4,4,4,4",
+ "startOffsets": "55,114,170,226,293,358,413,478",
+ "endColumns": "58,55,55,66,64,54,64,68",
+ "endOffsets": "109,165,221,288,353,408,473,542"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-ru_values-ru.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-ru\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "247",
+ "endColumns": "215",
+ "endOffsets": "462"
+ },
+ "to": {
+ "startLines": "37",
+ "startColumns": "4",
+ "startOffsets": "3979",
+ "endColumns": "215",
+ "endOffsets": "4190"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-ru\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "207",
+ "endColumns": "100",
+ "endOffsets": "307"
+ },
+ "to": {
+ "startLines": "51",
+ "startColumns": "4",
+ "startOffsets": "6013",
+ "endColumns": "104",
+ "endOffsets": "6113"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-ru\\values-ru.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -64,6 +119,98 @@
"endOffsets": "151"
},
"to": {
+ "startLines": "53",
+ "startColumns": "4",
+ "startOffsets": "6199",
+ "endColumns": "100",
+ "endOffsets": "6295"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-ru\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,350,548,672,780,981,1108,1249,1378,1618,1723,1917,2041,2267,2451,2546,2632",
+ "endColumns": "104,197,123,107,200,126,140,128,239,104,193,123,225,183,94,85,110",
+ "endOffsets": "349,547,671,779,980,1107,1248,1377,1617,1722,1916,2040,2266,2450,2545,2631,2742"
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2822,2931,3129,3257,3369,3570,3701,3846,4195,4435,4544,4738,4866,5092,5280,5379,5469",
+ "endColumns": "108,197,127,111,200,130,144,132,239,108,193,127,225,187,98,89,114",
+ "endOffsets": "2926,3124,3252,3364,3565,3696,3841,3974,4430,4539,4733,4861,5087,5275,5374,5464,5579"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-ru\\values-ru.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,163,268,380",
+ "endColumns": "107,104,111,103",
+ "endOffsets": "158,263,375,479"
+ },
+ "to": {
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "5584,5692,5797,5909",
+ "endColumns": "107,104,111,103",
+ "endOffsets": "5687,5792,5904,6008"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-ru\\values-ru.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,220,322,421,507,612,733,812,889,981,1074,1169,1262,1358,1452,1548,1643,1735,1827,1915,2021,2128,2226,2335,2442,2556,2722,2822",
+ "endColumns": "114,101,98,85,104,120,78,76,91,92,94,92,95,93,95,94,91,91,87,105,106,97,108,106,113,165,99,80",
+ "endOffsets": "215,317,416,502,607,728,807,884,976,1069,1164,1257,1353,1447,1543,1638,1730,1822,1910,2016,2123,2221,2330,2437,2551,2717,2817,2898"
+ },
+ "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,52",
+ "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",
+ "startOffsets": "105,220,322,421,507,612,733,812,889,981,1074,1169,1262,1358,1452,1548,1643,1735,1827,1915,2021,2128,2226,2335,2442,2556,2722,6118",
+ "endColumns": "114,101,98,85,104,120,78,76,91,92,94,92,95,93,95,94,91,91,87,105,106,97,108,106,113,165,99,80",
+ "endOffsets": "215,317,416,502,607,728,807,884,976,1069,1164,1257,1353,1447,1543,1638,1730,1822,1910,2016,2123,2221,2330,2437,2551,2717,2817,6194"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-az_values-az.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-az\\values-az.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,215,316,426,514,621,735,817,896,987,1079,1173,1272,1373,1466,1561,1655,1746,1838,1922,2027,2133,2233,2342,2447,2549,2707,2813",
+ "endColumns": "109,100,109,87,106,113,81,78,90,91,93,98,100,92,94,93,90,91,83,104,105,99,108,104,101,157,105,82",
+ "endOffsets": "210,311,421,509,616,730,812,891,982,1074,1168,1267,1368,1461,1556,1650,1741,1833,1917,2022,2128,2228,2337,2442,2544,2702,2808,2891"
+ },
+ "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,52",
+ "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",
+ "startOffsets": "105,215,316,426,514,621,735,817,896,987,1079,1173,1272,1373,1466,1561,1655,1746,1838,1922,2027,2133,2233,2342,2447,2549,2707,6065",
+ "endColumns": "109,100,109,87,106,113,81,78,90,91,93,98,100,92,94,93,90,91,83,104,105,99,108,104,101,157,105,82",
+ "endOffsets": "210,311,421,509,616,730,812,891,982,1074,1168,1267,1368,1461,1556,1650,1741,1833,1917,2022,2128,2228,2337,2442,2544,2702,2808,6143"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-az\\values.xml",
+>>>>>>> origin/feature/pushNotifications
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,352,539,670,778,983,1114,1260,1391,1616,1724,1904,2039,2242,2424,2514,2605",
+ "endColumns": "106,186,130,107,204,130,145,130,224,107,179,134,202,181,89,90,105",
+ "endOffsets": "351,538,669,777,982,1113,1259,1390,1615,1723,1903,2038,2241,2423,2513,2604,2710"
+ },
+ "to": {
+<<<<<<< HEAD
"startLines": "53",
"startColumns": "4",
"startOffsets": "6388",
@@ -79,10 +226,45 @@
"startOffsets": "247",
"endColumns": "224",
"endOffsets": "471"
+=======
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2813,2924,3111,3246,3358,3563,3698,3848,4204,4429,4541,4721,4860,5063,5249,5343,5438",
+ "endColumns": "110,186,134,111,204,134,149,134,224,111,179,138,202,185,93,94,109",
+ "endOffsets": "2919,3106,3241,3353,3558,3693,3843,3978,4424,4536,4716,4855,5058,5244,5338,5433,5543"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-az\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "207",
+ "endColumns": "102",
+ "endOffsets": "309"
},
"to": {
- "startLines": "37",
+ "startLines": "51",
"startColumns": "4",
+ "startOffsets": "5958",
+ "endColumns": "106",
+ "endOffsets": "6060"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-az\\values-az.xml",
+ "from": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "100",
+ "endOffsets": "151"
+>>>>>>> origin/feature/pushNotifications
+ },
+ "to": {
+ "startLines": "53",
+ "startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "4152",
"endColumns": "224",
"endOffsets": "4372"
@@ -103,11 +285,51 @@
"startOffsets": "2989,3098,3291,3426,3536,3737,3870,4017,4377,4611,4722,4922,5059,5287,5472,5566,5664",
"endColumns": "108,192,134,109,200,132,146,134,233,110,199,136,227,184,93,97,117",
"endOffsets": "3093,3286,3421,3531,3732,3865,4012,4147,4606,4717,4917,5054,5282,5467,5561,5659,5777"
+=======
+ "startOffsets": "6148",
+ "endColumns": "100",
+ "endOffsets": "6244"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-az\\values-az.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,151,255,363",
+ "endColumns": "95,103,107,101",
+ "endOffsets": "146,250,358,460"
+ },
+ "to": {
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "5548,5644,5748,5856",
+ "endColumns": "95,103,107,101",
+ "endOffsets": "5639,5743,5851,5953"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-az\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "247",
+ "endColumns": "220",
+ "endOffsets": "467"
+ },
+ "to": {
+ "startLines": "37",
+ "startColumns": "4",
+ "startOffsets": "3983",
+ "endColumns": "220",
+ "endOffsets": "4199"
+>>>>>>> origin/feature/pushNotifications
}
}
]
},
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-fr-rCA_values-fr-rCA.arsc.flat",
"map": [
{
@@ -118,10 +340,23 @@
"startOffsets": "251",
"endColumns": "219",
"endOffsets": "470"
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-th_values-th.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-th\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "247",
+ "endColumns": "187",
+ "endOffsets": "434"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "37",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "4076",
"endColumns": "219",
"endOffsets": "4291"
@@ -129,6 +364,49 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-fr-rCA\\values-fr-rCA.xml",
+=======
+ "startOffsets": "3862",
+ "endColumns": "187",
+ "endOffsets": "4045"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-th\\values-th.xml",
+>>>>>>> origin/feature/pushNotifications
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,210,303,411,496,598,708,786,864,955,1047,1138,1232,1333,1426,1521,1615,1706,1797,1877,1980,2078,2176,2279,2385,2486,2639,2734",
+ "endColumns": "104,92,107,84,101,109,77,77,90,91,90,93,100,92,94,93,90,90,79,102,97,97,102,105,100,152,94,80",
+ "endOffsets": "205,298,406,491,593,703,781,859,950,1042,1133,1227,1328,1421,1516,1610,1701,1792,1872,1975,2073,2171,2274,2380,2481,2634,2729,2810"
+ },
+ "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,52",
+ "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",
+ "startOffsets": "105,210,303,411,496,598,708,786,864,955,1047,1138,1232,1333,1426,1521,1615,1706,1797,1877,1980,2078,2176,2279,2385,2486,2639,5865",
+ "endColumns": "104,92,107,84,101,109,77,77,90,91,90,93,100,92,94,93,90,90,79,102,97,97,102,105,100,152,94,80",
+ "endOffsets": "205,298,406,491,593,703,781,859,950,1042,1133,1227,1328,1421,1516,1610,1701,1792,1872,1975,2073,2171,2274,2380,2481,2634,2729,5941"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-th\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,349,528,649,754,949,1071,1216,1349,1552,1655,1833,1953,2152,2329,2419,2513",
+ "endColumns": "103,178,120,104,194,121,144,132,202,102,177,119,198,176,89,93,108",
+ "endOffsets": "348,527,648,753,948,1070,1215,1348,1551,1654,1832,1952,2151,2328,2418,2512,2621"
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2734,2842,3021,3146,3255,3450,3576,3725,4050,4253,4360,4538,4662,4861,5042,5136,5234",
+ "endColumns": "107,178,124,108,194,125,148,136,202,106,177,123,198,180,93,97,112",
+ "endOffsets": "2837,3016,3141,3250,3445,3571,3720,3857,4248,4355,4533,4657,4856,5037,5131,5229,5342"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-th\\values-th.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -139,6 +417,7 @@
"to": {
"startLines": "53",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "6379",
"endColumns": "100",
"endOffsets": "6475"
@@ -186,10 +465,82 @@
"startOffsets": "249,353,565,693,800,1030,1161,1308,1446,1700,1810,2026,2160,2379,2584,2683,2773",
"endColumns": "103,211,127,106,229,130,146,137,253,109,215,133,218,204,98,89,108",
"endOffsets": "352,564,692,799,1029,1160,1307,1445,1699,1809,2025,2159,2378,2583,2682,2772,2881"
+=======
+ "startOffsets": "5946",
+ "endColumns": "100",
+ "endOffsets": "6042"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-th\\values-th.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,158,257,368",
+ "endColumns": "102,98,110,96",
+ "endOffsets": "153,252,363,460"
+ },
+ "to": {
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "5347,5450,5549,5660",
+ "endColumns": "102,98,110,96",
+ "endOffsets": "5445,5544,5655,5752"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-th\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "207",
+ "endColumns": "103",
+ "endOffsets": "310"
+ },
+ "to": {
+ "startLines": "51",
+ "startColumns": "4",
+ "startOffsets": "5757",
+ "endColumns": "107",
+ "endOffsets": "5860"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-mk_values-mk.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-mk\\values-mk.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,213,317,425,511,619,738,822,904,995,1087,1183,1277,1378,1471,1566,1662,1753,1844,1930,2036,2142,2243,2350,2462,2566,2722,2820",
+ "endColumns": "107,103,107,85,107,118,83,81,90,91,95,93,100,92,94,95,90,90,85,105,105,100,106,111,103,155,97,83",
+ "endOffsets": "208,312,420,506,614,733,817,899,990,1082,1178,1272,1373,1466,1561,1657,1748,1839,1925,2031,2137,2238,2345,2457,2561,2717,2815,2899"
+ },
+ "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,52",
+ "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",
+ "startOffsets": "105,213,317,425,511,619,738,822,904,995,1087,1183,1277,1378,1471,1566,1662,1753,1844,1930,2036,2142,2243,2350,2462,2566,2722,6089",
+ "endColumns": "107,103,107,85,107,118,83,81,90,91,95,93,100,92,94,95,90,90,85,105,105,100,106,111,103,155,97,83",
+ "endOffsets": "208,312,420,506,614,733,817,899,990,1082,1178,1272,1373,1466,1561,1657,1748,1839,1925,2031,2137,2238,2345,2457,2561,2717,2815,6168"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-mk\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,350,543,674,782,986,1117,1263,1398,1614,1719,1916,2047,2259,2444,2539,2629",
+ "endColumns": "104,192,130,107,203,130,145,134,215,104,196,130,211,184,94,89,103",
+ "endOffsets": "349,542,673,781,985,1116,1262,1397,1613,1718,1915,2046,2258,2443,2538,2628,2732"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+<<<<<<< HEAD
"startOffsets": "2855,2963,3175,3307,3418,3648,3783,3934,4296,4550,4664,4880,5018,5237,5446,5549,5643",
"endColumns": "107,211,131,110,229,134,150,141,253,113,215,137,218,208,102,93,112",
"endOffsets": "2958,3170,3302,3413,3643,3778,3929,4071,4545,4659,4875,5013,5232,5441,5544,5638,5751"
@@ -219,6 +570,49 @@
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-en-rGB\\values.xml",
+=======
+ "startOffsets": "2820,2929,3122,3257,3369,3573,3708,3858,4193,4409,4518,4715,4850,5062,5251,5350,5444",
+ "endColumns": "108,192,134,111,203,134,149,138,215,108,196,134,211,188,98,93,107",
+ "endOffsets": "2924,3117,3252,3364,3568,3703,3853,3992,4404,4513,4710,4845,5057,5246,5345,5439,5547"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-mk\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "247",
+ "endColumns": "195",
+ "endOffsets": "442"
+ },
+ "to": {
+ "startLines": "37",
+ "startColumns": "4",
+ "startOffsets": "3997",
+ "endColumns": "195",
+ "endOffsets": "4188"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-mk\\values-mk.xml",
+ "from": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "100",
+ "endOffsets": "151"
+ },
+ "to": {
+ "startLines": "53",
+ "startColumns": "4",
+ "startOffsets": "6173",
+ "endColumns": "100",
+ "endOffsets": "6269"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-mk\\values.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "4",
"startColumns": "0",
@@ -229,6 +623,7 @@
"to": {
"startLines": "51",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "5812",
"endColumns": "111",
"endOffsets": "5919"
@@ -266,10 +661,41 @@
"startOffsets": "3902",
"endColumns": "196",
"endOffsets": "4094"
+=======
+ "startOffsets": "5985",
+ "endColumns": "103",
+ "endOffsets": "6084"
}
},
{
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-mk\\values-mk.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,168,273,388",
+ "endColumns": "112,104,114,99",
+ "endOffsets": "163,268,383,483"
+ },
+ "to": {
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "5552,5665,5770,5885",
+ "endColumns": "112,104,114,99",
+ "endOffsets": "5660,5765,5880,5980"
+>>>>>>> origin/feature/pushNotifications
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-lo_values-lo.arsc.flat",
+ "map": [
+ {
+<<<<<<< HEAD
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-en-rGB\\values-en-rGB.xml",
+=======
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-lo\\values-lo.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "2",
"startColumns": "4",
@@ -280,6 +706,7 @@
"to": {
"startLines": "53",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "6006",
"endColumns": "100",
"endOffsets": "6102"
@@ -394,16 +821,77 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-gl\\values-gl.xml",
- "from": {
- "startLines": "2",
- "startColumns": "4",
- "startOffsets": "55",
+=======
+ "startOffsets": "6110",
"endColumns": "100",
- "endOffsets": "151"
+ "endOffsets": "6206"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-lo\\values-lo.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,153,251,366",
+ "endColumns": "97,97,114,98",
+ "endOffsets": "148,246,361,460"
},
"to": {
- "startLines": "53",
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "5515,5613,5711,5826",
+ "endColumns": "97,97,114,98",
+ "endOffsets": "5608,5706,5821,5920"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-lo\\values-lo.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,208,311,424,509,613,724,802,880,971,1063,1155,1249,1350,1443,1538,1634,1725,1816,1896,2003,2107,2205,2308,2412,2516,2673,2772",
+ "endColumns": "102,102,112,84,103,110,77,77,90,91,91,93,100,92,94,95,90,90,79,106,103,97,102,103,103,156,98,80",
+ "endOffsets": "203,306,419,504,608,719,797,875,966,1058,1150,1244,1345,1438,1533,1629,1720,1811,1891,1998,2102,2200,2303,2407,2511,2668,2767,2848"
+ },
+ "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,52",
+ "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",
+ "startOffsets": "105,208,311,424,509,613,724,802,880,971,1063,1155,1249,1350,1443,1538,1634,1725,1816,1896,2003,2107,2205,2308,2412,2516,2673,6029",
+ "endColumns": "102,102,112,84,103,110,77,77,90,91,91,93,100,92,94,95,90,90,79,106,103,97,102,103,103,156,98,80",
+ "endOffsets": "203,306,419,504,608,719,797,875,966,1058,1150,1244,1345,1438,1533,1629,1720,1811,1891,1998,2102,2200,2303,2407,2511,2668,2767,6105"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-lo\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,351,553,681,786,997,1120,1254,1395,1606,1709,1906,2033,2263,2450,2544,2639",
+ "endColumns": "105,201,127,104,210,122,133,140,210,102,196,126,229,186,93,94,109",
+ "endOffsets": "350,552,680,785,996,1119,1253,1394,1605,1708,1905,2032,2262,2449,2543,2638,2748"
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2772,2882,3084,3216,3325,3536,3663,3801,4137,4348,4455,4652,4783,5013,5204,5302,5401",
+ "endColumns": "109,201,131,108,210,126,137,144,210,106,196,130,229,190,97,98,113",
+ "endOffsets": "2877,3079,3211,3320,3531,3658,3796,3941,4343,4450,4647,4778,5008,5199,5297,5396,5510"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-lo\\values.xml",
+>>>>>>> origin/feature/pushNotifications
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "207",
+ "endColumns": "99",
+ "endOffsets": "306"
+ },
+ "to": {
+ "startLines": "51",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "6236",
"endColumns": "100",
"endOffsets": "6332"
@@ -424,11 +912,34 @@
"startOffsets": "5623,5730,5832,5944",
"endColumns": "106,101,111,104",
"endOffsets": "5725,5827,5939,6044"
+=======
+ "startOffsets": "5925",
+ "endColumns": "103",
+ "endOffsets": "6024"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-lo\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "247",
+ "endColumns": "190",
+ "endOffsets": "437"
+ },
+ "to": {
+ "startLines": "37",
+ "startColumns": "4",
+ "startOffsets": "3946",
+ "endColumns": "190",
+ "endOffsets": "4132"
+>>>>>>> origin/feature/pushNotifications
}
}
]
},
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-hu_values-hu.arsc.flat",
"map": [
{
@@ -439,10 +950,23 @@
"startOffsets": "207",
"endColumns": "99",
"endOffsets": "306"
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-ko_values-ko.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-ko\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "247",
+ "endColumns": "179",
+ "endOffsets": "426"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "51",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "6191",
"endColumns": "103",
"endOffsets": "6290"
@@ -450,6 +974,15 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-hu\\values-hu.xml",
+=======
+ "startOffsets": "3738",
+ "endColumns": "179",
+ "endOffsets": "3913"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-ko\\values-ko.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "2,3,4,5",
"startColumns": "4,4,4,4",
@@ -458,6 +991,7 @@
"endOffsets": "146,247,362,465"
},
"to": {
+<<<<<<< HEAD
"startLines": "47,48,49,50",
"startColumns": "4,4,4,4",
"startOffsets": "5776,5872,5973,6088",
@@ -490,10 +1024,45 @@
"startOffsets": "105,213,305,420,504,619,742,819,895,986,1078,1173,1267,1368,1461,1556,1651,1742,1833,1915,2025,2135,2235,2346,2455,2574,2756,2859",
"endColumns": "107,91,114,83,114,122,76,75,90,91,94,93,100,92,94,94,90,90,81,109,109,99,110,108,118,181,102,82",
"endOffsets": "208,300,415,499,614,737,814,890,981,1073,1168,1262,1363,1456,1551,1646,1737,1828,1910,2020,2130,2230,2341,2450,2569,2751,2854,2937"
+=======
+ "startLines": "53",
+ "startColumns": "4",
+ "startOffsets": "5675",
+ "endColumns": "100",
+ "endOffsets": "5771"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-ko\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "207",
+ "endColumns": "96",
+ "endOffsets": "303"
+ },
+ "to": {
+ "startLines": "51",
+ "startColumns": "4",
+ "startOffsets": "5496",
+ "endColumns": "100",
+ "endOffsets": "5592"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-ko\\values-ko.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,202,296,397,479,577,683,763,839,930,1022,1117,1211,1312,1405,1500,1594,1685,1776,1855,1953,2047,2142,2242,2339,2439,2591,2685",
+ "endColumns": "96,93,100,81,97,105,79,75,90,91,94,93,100,92,94,93,90,90,78,97,93,94,99,96,99,151,93,77",
+ "endOffsets": "197,291,392,474,572,678,758,834,925,1017,1112,1206,1307,1400,1495,1589,1680,1771,1850,1948,2042,2137,2237,2334,2434,2586,2680,2758"
+>>>>>>> origin/feature/pushNotifications
},
"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,52",
"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",
+<<<<<<< HEAD
"startOffsets": "105,213,305,420,504,619,742,819,895,986,1078,1173,1267,1368,1461,1556,1651,1742,1833,1915,2025,2135,2235,2346,2455,2574,2756,6295",
"endColumns": "107,91,114,83,114,122,76,75,90,91,94,93,100,92,94,94,90,90,81,109,109,99,110,108,118,181,102,82",
"endOffsets": "208,300,415,499,614,737,814,890,981,1073,1168,1262,1363,1456,1551,1646,1737,1828,1910,2020,2130,2230,2341,2450,2569,2751,2854,6373"
@@ -531,15 +1100,78 @@
"startOffsets": "6378",
"endColumns": "100",
"endOffsets": "6474"
+=======
+ "startOffsets": "105,202,296,397,479,577,683,763,839,930,1022,1117,1211,1312,1405,1500,1594,1685,1776,1855,1953,2047,2142,2242,2339,2439,2591,5597",
+ "endColumns": "96,93,100,81,97,105,79,75,90,91,94,93,100,92,94,93,90,90,78,97,93,94,99,96,99,151,93,77",
+ "endOffsets": "197,291,392,474,572,678,758,834,925,1017,1112,1206,1307,1400,1495,1589,1680,1771,1850,1948,2042,2137,2237,2334,2434,2586,2680,5670"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-ko\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,347,518,632,732,906,1021,1154,1274,1478,1579,1746,1862,2039,2184,2269,2353",
+ "endColumns": "101,170,113,99,173,114,132,119,203,100,166,115,176,144,84,83,99",
+ "endOffsets": "346,517,631,731,905,1020,1153,1273,1477,1578,1745,1861,2038,2183,2268,2352,2452"
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2685,2791,2962,3080,3184,3358,3477,3614,3918,4122,4227,4394,4514,4691,4840,4929,5017",
+ "endColumns": "105,170,117,103,173,118,136,123,203,104,166,119,176,148,88,87,103",
+ "endOffsets": "2786,2957,3075,3179,3353,3472,3609,3733,4117,4222,4389,4509,4686,4835,4924,5012,5116"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-ko\\values-ko.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,141,234,337",
+ "endColumns": "85,92,102,92",
+ "endOffsets": "136,229,332,425"
+ },
+ "to": {
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "5121,5207,5300,5403",
+ "endColumns": "85,92,102,92",
+ "endOffsets": "5202,5295,5398,5491"
+>>>>>>> origin/feature/pushNotifications
}
}
]
},
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-v21_values-v21.arsc.flat",
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-v21\\values-v21.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-sq_values-sq.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-sq\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,350,555,690,795,1015,1147,1299,1440,1669,1775,1981,2117,2345,2555,2646,2739",
+ "endColumns": "104,204,134,104,219,131,151,140,228,105,205,135,227,209,90,92,106",
+ "endOffsets": "349,554,689,794,1014,1146,1298,1439,1668,1774,1980,2116,2344,2554,2645,2738,2845"
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2801,2910,3115,3254,3363,3583,3719,3875,4208,4437,4547,4753,4893,5121,5335,5430,5527",
+ "endColumns": "108,204,138,108,219,135,155,144,228,109,205,139,227,213,94,96,110",
+ "endOffsets": "2905,3110,3249,3358,3578,3714,3870,4015,4432,4542,4748,4888,5116,5330,5425,5522,5633"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-sq\\values-sq.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,13",
"startColumns": "4,4,4,4,4,4,4,4,4,4",
@@ -549,6 +1181,7 @@
"endOffsets": "154,218,285,349,465,591,717,845,1017,1355"
},
"to": {
+<<<<<<< HEAD
"startLines": "2,13,14,15,303,304,311,315,359,362",
"startColumns": "4,4,4,4,4,4,4,4,4,4",
"startOffsets": "55,1006,1070,1137,22423,22539,22996,23290,26246,26418",
@@ -578,9 +1211,21 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\47ce40ad459cbf22b0d81e337967e729\\media-1.0.0\\res\\values-v21\\values-v21.xml",
+=======
+ "startLines": "53",
+ "startColumns": "4",
+ "startOffsets": "6256",
+ "endColumns": "100",
+ "endOffsets": "6352"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-sq\\values-sq.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "2,5,8,11",
"startColumns": "4,4,4,4",
+<<<<<<< HEAD
"startOffsets": "55,223,386,554",
"endLines": "4,7,10,13",
"endColumns": "12,12,12,12",
@@ -638,16 +1283,55 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-af\\values.xml",
+=======
+ "startOffsets": "55,170,271,382",
+ "endColumns": "114,100,110,99",
+ "endOffsets": "165,266,377,477"
+ },
+ "to": {
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "5638,5753,5854,5965",
+ "endColumns": "114,100,110,99",
+ "endOffsets": "5748,5849,5960,6060"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-sq\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "207",
+ "endColumns": "105",
+ "endOffsets": "312"
+ },
+ "to": {
+ "startLines": "51",
+ "startColumns": "4",
+ "startOffsets": "6065",
+ "endColumns": "109",
+ "endOffsets": "6170"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-sq\\values.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "4",
"startColumns": "0",
"startOffsets": "247",
+<<<<<<< HEAD
"endColumns": "201",
"endOffsets": "448"
+=======
+ "endColumns": "187",
+ "endOffsets": "434"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "37",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "3929",
"endColumns": "201",
"endOffsets": "4126"
@@ -706,6 +1390,37 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-af\\values.xml",
+=======
+ "startOffsets": "4020",
+ "endColumns": "187",
+ "endOffsets": "4203"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-sq\\values-sq.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,219,319,431,517,623,746,828,907,998,1090,1185,1279,1381,1474,1569,1666,1757,1850,1930,2036,2140,2238,2344,2448,2550,2704,2801",
+ "endColumns": "113,99,111,85,105,122,81,78,90,91,94,93,101,92,94,96,90,92,79,105,103,97,105,103,101,153,96,80",
+ "endOffsets": "214,314,426,512,618,741,823,902,993,1085,1180,1274,1376,1469,1564,1661,1752,1845,1925,2031,2135,2233,2339,2443,2545,2699,2796,2877"
+ },
+ "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,52",
+ "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",
+ "startOffsets": "105,219,319,431,517,623,746,828,907,998,1090,1185,1279,1381,1474,1569,1666,1757,1850,1930,2036,2140,2238,2344,2448,2550,2704,6175",
+ "endColumns": "113,99,111,85,105,122,81,78,90,91,94,93,101,92,94,96,90,92,79,105,103,97,105,103,101,153,96,80",
+ "endOffsets": "214,314,426,512,618,741,823,902,993,1085,1180,1274,1376,1469,1564,1661,1752,1845,1925,2031,2135,2233,2339,2443,2545,2699,2796,6251"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-ja_values-ja.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-ja\\values-ja.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "4",
"startColumns": "0",
@@ -716,6 +1431,7 @@
"to": {
"startLines": "51",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "5881",
"endColumns": "105",
"endOffsets": "5982"
@@ -783,10 +1499,43 @@
"startOffsets": "55,165,272,392",
"endColumns": "109,106,119,106",
"endOffsets": "160,267,387,494"
+=======
+ "startOffsets": "5698",
+ "endColumns": "100",
+ "endOffsets": "5794"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-ja\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,347,513,631,735,924,1042,1173,1297,1488,1587,1751,1868,2047,2193,2279,2364",
+ "endColumns": "101,165,117,103,188,117,130,123,190,98,163,116,178,145,85,84,95",
+ "endOffsets": "346,512,630,734,923,1041,1172,1296,1487,1586,1750,1867,2046,2192,2278,2363,2459"
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2691,2797,2963,3085,3193,3382,3504,3639,3948,4139,4242,4406,4527,4706,4856,4946,5035",
+ "endColumns": "105,165,121,107,188,121,134,127,190,102,163,120,178,149,89,88,99",
+ "endOffsets": "2792,2958,3080,3188,3377,3499,3634,3762,4134,4237,4401,4522,4701,4851,4941,5030,5130"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-ja\\values-ja.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,148,243,344",
+ "endColumns": "92,94,100,93",
+ "endOffsets": "143,238,339,433"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "47,48,49,50",
"startColumns": "4,4,4,4",
+<<<<<<< HEAD
"startOffsets": "5544,5654,5761,5881",
"endColumns": "109,106,119,106",
"endOffsets": "5649,5756,5876,5983"
@@ -828,24 +1577,79 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-uk\\values.xml",
+=======
+ "startOffsets": "5135,5228,5323,5424",
+ "endColumns": "92,94,100,93",
+ "endOffsets": "5223,5318,5419,5513"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-ja\\values-ja.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,202,295,400,482,580,688,766,842,933,1025,1120,1214,1315,1408,1503,1597,1688,1779,1856,1958,2056,2151,2254,2350,2446,2594,2691",
+ "endColumns": "96,92,104,81,97,107,77,75,90,91,94,93,100,92,94,93,90,90,76,101,97,94,102,95,95,147,96,77",
+ "endOffsets": "197,290,395,477,575,683,761,837,928,1020,1115,1209,1310,1403,1498,1592,1683,1774,1851,1953,2051,2146,2249,2345,2441,2589,2686,2764"
+ },
+ "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,52",
+ "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",
+ "startOffsets": "105,202,295,400,482,580,688,766,842,933,1025,1120,1214,1315,1408,1503,1597,1688,1779,1856,1958,2056,2151,2254,2350,2446,2594,5620",
+ "endColumns": "96,92,104,81,97,107,77,75,90,91,94,93,100,92,94,93,90,90,76,101,97,94,102,95,95,147,96,77",
+ "endOffsets": "197,290,395,477,575,683,761,837,928,1020,1115,1209,1310,1403,1498,1592,1683,1774,1851,1953,2051,2146,2249,2345,2441,2589,2686,5693"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-ja\\values.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "4",
"startColumns": "0",
"startOffsets": "207",
+<<<<<<< HEAD
"endColumns": "98",
"endOffsets": "305"
+=======
+ "endColumns": "97",
+ "endOffsets": "304"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "51",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "5988",
"endColumns": "102",
"endOffsets": "6086"
+=======
+ "startOffsets": "5518",
+ "endColumns": "101",
+ "endOffsets": "5615"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-ja\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "247",
+ "endColumns": "180",
+ "endOffsets": "427"
+ },
+ "to": {
+ "startLines": "37",
+ "startColumns": "4",
+ "startOffsets": "3767",
+ "endColumns": "180",
+ "endOffsets": "3943"
+>>>>>>> origin/feature/pushNotifications
}
}
]
},
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-hdpi-v4_values-hdpi-v4.arsc.flat",
"map": [
{
@@ -872,10 +1676,23 @@
"startOffsets": "245,346,540,665,771,980,1107,1249,1377,1596,1702,1897,2027,2241,2412,2501,2592",
"endColumns": "100,193,124,105,208,126,141,127,218,105,194,129,213,170,88,90,112",
"endOffsets": "345,539,664,770,979,1106,1248,1376,1595,1701,1896,2026,2240,2411,2500,2591,2704"
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-fi_values-fi.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-fi\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,354,539,668,772,974,1098,1240,1372,1572,1676,1856,1980,2187,2352,2444,2540",
+ "endColumns": "108,184,128,103,201,123,141,131,199,103,179,123,206,164,91,95,107",
+ "endOffsets": "353,538,667,771,973,1097,1239,1371,1571,1675,1855,1979,2186,2351,2443,2539,2647"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+<<<<<<< HEAD
"startOffsets": "2827,2932,3126,3255,3365,3574,3705,3851,4182,4401,4511,4706,4840,5054,5229,5322,5417",
"endColumns": "104,193,128,109,208,130,145,131,218,109,194,133,213,174,92,94,116",
"endOffsets": "2927,3121,3250,3360,3569,3700,3846,3978,4396,4506,4701,4835,5049,5224,5317,5412,5529"
@@ -889,10 +1706,26 @@
"startOffsets": "55,155,255,362",
"endColumns": "99,99,106,97",
"endOffsets": "150,250,357,455"
+=======
+ "startOffsets": "2775,2888,3073,3206,3314,3516,3644,3790,4135,4335,4443,4623,4751,4958,5127,5223,5323",
+ "endColumns": "112,184,132,107,201,127,145,135,199,107,179,127,206,168,95,99,111",
+ "endOffsets": "2883,3068,3201,3309,3511,3639,3785,3921,4330,4438,4618,4746,4953,5122,5218,5318,5430"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-fi\\values-fi.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,158,259,368",
+ "endColumns": "102,100,108,97",
+ "endOffsets": "153,254,363,461"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "47,48,49,50",
"startColumns": "4,4,4,4",
+<<<<<<< HEAD
"startOffsets": "5534,5634,5734,5841",
"endColumns": "99,99,106,97",
"endOffsets": "5629,5729,5836,5934"
@@ -940,10 +1773,77 @@
"startOffsets": "247",
"endColumns": "198",
"endOffsets": "445"
+=======
+ "startOffsets": "5435,5538,5639,5748",
+ "endColumns": "102,100,108,97",
+ "endOffsets": "5533,5634,5743,5841"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-fi\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "247",
+ "endColumns": "208",
+ "endOffsets": "455"
},
"to": {
"startLines": "37",
"startColumns": "4",
+ "startOffsets": "3926",
+ "endColumns": "208",
+ "endOffsets": "4130"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-fi\\values-fi.xml",
+ "from": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "100",
+ "endOffsets": "151"
+ },
+ "to": {
+ "startLines": "53",
+ "startColumns": "4",
+ "startOffsets": "6029",
+ "endColumns": "100",
+ "endOffsets": "6125"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-fi\\values-fi.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,213,313,422,508,613,731,817,897,988,1080,1175,1269,1364,1457,1553,1652,1743,1837,1916,2023,2124,2221,2327,2427,2525,2675,2775",
+ "endColumns": "107,99,108,85,104,117,85,79,90,91,94,93,94,92,95,98,90,93,78,106,100,96,105,99,97,149,99,79",
+ "endOffsets": "208,308,417,503,608,726,812,892,983,1075,1170,1264,1359,1452,1548,1647,1738,1832,1911,2018,2119,2216,2322,2422,2520,2670,2770,2850"
+ },
+ "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,52",
+ "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",
+ "startOffsets": "105,213,313,422,508,613,731,817,897,988,1080,1175,1269,1364,1457,1553,1652,1743,1837,1916,2023,2124,2221,2327,2427,2525,2675,5949",
+ "endColumns": "107,99,108,85,104,117,85,79,90,91,94,93,94,92,95,98,90,93,78,106,100,96,105,99,97,149,99,79",
+ "endOffsets": "208,308,417,503,608,726,812,892,983,1075,1170,1264,1359,1452,1548,1647,1738,1832,1911,2018,2119,2216,2322,2422,2520,2670,2770,6024"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-fi\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "207",
+ "endColumns": "98",
+ "endOffsets": "305"
+>>>>>>> origin/feature/pushNotifications
+ },
+ "to": {
+ "startLines": "51",
+ "startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "3983",
"endColumns": "198",
"endOffsets": "4177"
@@ -964,11 +1864,17 @@
"startOffsets": "105,211,310,421,507,609,726,807,885,977,1070,1166,1268,1378,1472,1573,1667,1759,1852,1934,2045,2149,2248,2358,2460,2559,2725,6041",
"endColumns": "105,98,110,85,101,116,80,77,91,92,95,101,109,93,100,93,91,92,81,110,103,98,109,101,98,165,101,81",
"endOffsets": "206,305,416,502,604,721,802,880,972,1065,1161,1263,1373,1467,1568,1662,1754,1847,1929,2040,2144,2243,2353,2455,2554,2720,2822,6118"
+=======
+ "startOffsets": "5846",
+ "endColumns": "102",
+ "endOffsets": "5944"
+>>>>>>> origin/feature/pushNotifications
}
}
]
},
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-km_values-km.arsc.flat",
"map": [
{
@@ -979,10 +1885,40 @@
"startOffsets": "105,207,306,416,503,606,727,805,882,973,1065,1157,1251,1352,1445,1540,1634,1725,1816,1898,2002,2106,2206,2315,2424,2533,2695,2793",
"endColumns": "101,98,109,86,102,120,77,76,90,91,91,93,100,92,94,93,90,90,81,103,103,99,108,108,108,161,97,82",
"endOffsets": "202,301,411,498,601,722,800,877,968,1060,1152,1246,1347,1440,1535,1629,1720,1811,1893,1997,2101,2201,2310,2419,2528,2690,2788,2871"
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-am_values-am.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-am\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,345,516,636,736,922,1043,1177,1304,1491,1592,1768,1889,2083,2236,2322,2405",
+ "endColumns": "99,170,119,99,185,120,133,126,186,100,175,120,193,152,85,82,95",
+ "endOffsets": "344,515,635,735,921,1042,1176,1303,1490,1591,1767,1888,2082,2235,2321,2404,2500"
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2723,2827,2998,3122,3226,3412,3537,3675,3997,4184,4289,4465,4590,4784,4941,5031,5118",
+ "endColumns": "103,170,123,103,185,124,137,130,186,104,175,124,193,156,89,86,99",
+ "endOffsets": "2822,2993,3117,3221,3407,3532,3670,3801,4179,4284,4460,4585,4779,4936,5026,5113,5213"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-am\\values-am.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,203,301,407,493,596,713,791,868,959,1051,1143,1237,1338,1431,1526,1619,1710,1801,1880,1980,2080,2176,2278,2378,2477,2627,2723",
+ "endColumns": "97,97,105,85,102,116,77,76,90,91,91,93,100,92,94,92,90,90,78,99,99,95,101,99,98,149,95,78",
+ "endOffsets": "198,296,402,488,591,708,786,863,954,1046,1138,1232,1333,1426,1521,1614,1705,1796,1875,1975,2075,2171,2273,2373,2472,2622,2718,2797"
+>>>>>>> origin/feature/pushNotifications
},
"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,52",
"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",
+<<<<<<< HEAD
"startOffsets": "105,207,306,416,503,606,727,805,882,973,1065,1157,1251,1352,1445,1540,1634,1725,1816,1898,2002,2106,2206,2315,2424,2533,2695,6023",
"endColumns": "101,98,109,86,102,120,77,76,90,91,91,93,100,92,94,93,90,90,81,103,103,99,108,108,108,161,97,82",
"endOffsets": "202,301,411,498,601,722,800,877,968,1060,1152,1246,1347,1440,1535,1629,1720,1811,1893,1997,2101,2201,2310,2419,2528,2690,2788,6101"
@@ -990,6 +1926,32 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-km\\values.xml",
+=======
+ "startOffsets": "105,203,301,407,493,596,713,791,868,959,1051,1143,1237,1338,1431,1526,1619,1710,1801,1880,1980,2080,2176,2278,2378,2477,2627,5715",
+ "endColumns": "97,97,105,85,102,116,77,76,90,91,91,93,100,92,94,92,90,90,78,99,99,95,101,99,98,149,95,78",
+ "endOffsets": "198,296,402,488,591,708,786,863,954,1046,1138,1232,1333,1426,1521,1614,1705,1796,1875,1975,2075,2171,2273,2373,2472,2622,2718,5789"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-am\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "247",
+ "endColumns": "190",
+ "endOffsets": "437"
+ },
+ "to": {
+ "startLines": "37",
+ "startColumns": "4",
+ "startOffsets": "3806",
+ "endColumns": "190",
+ "endOffsets": "3992"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-am\\values-am.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "4",
"startColumns": "0",
@@ -998,6 +1960,7 @@
"endOffsets": "307"
},
"to": {
+<<<<<<< HEAD
"startLines": "51",
"startColumns": "4",
"startOffsets": "5918",
@@ -1071,11 +2034,53 @@
"startOffsets": "6106",
"endColumns": "100",
"endOffsets": "6202"
+=======
+ "startLines": "53",
+ "startColumns": "4",
+ "startOffsets": "5794",
+ "endColumns": "100",
+ "endOffsets": "5890"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-am\\values-am.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,151,246,352",
+ "endColumns": "95,94,105,95",
+ "endOffsets": "146,241,347,443"
+ },
+ "to": {
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "5218,5314,5409,5515",
+ "endColumns": "95,94,105,95",
+ "endOffsets": "5309,5404,5510,5606"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-am\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "207",
+ "endColumns": "99",
+ "endOffsets": "306"
+ },
+ "to": {
+ "startLines": "51",
+ "startColumns": "4",
+ "startOffsets": "5611",
+ "endColumns": "103",
+ "endOffsets": "5710"
+>>>>>>> origin/feature/pushNotifications
}
}
]
},
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-v25_values-v25.arsc.flat",
"map": [
{
@@ -1136,10 +2141,57 @@
"startOffsets": "207",
"endColumns": "99",
"endOffsets": "306"
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-is_values-is.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-is\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,349,535,658,765,965,1088,1223,1353,1566,1670,1858,1982,2183,2363,2453,2542",
+ "endColumns": "103,185,122,106,199,122,134,129,212,103,187,123,200,179,89,88,103",
+ "endOffsets": "348,534,657,764,964,1087,1222,1352,1565,1669,1857,1981,2182,2362,2452,2541,2645"
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2779,2887,3073,3200,3311,3511,3638,3777,4099,4312,4420,4608,4736,4937,5121,5215,5308",
+ "endColumns": "107,185,126,110,199,126,138,133,212,107,187,127,200,183,93,92,107",
+ "endOffsets": "2882,3068,3195,3306,3506,3633,3772,3906,4307,4415,4603,4731,4932,5116,5210,5303,5411"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-is\\values-is.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,159,260,366",
+ "endColumns": "103,100,105,99",
+ "endOffsets": "154,255,361,461"
+ },
+ "to": {
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "5416,5520,5621,5727",
+ "endColumns": "103,100,105,99",
+ "endOffsets": "5515,5616,5722,5822"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-is\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "247",
+ "endColumns": "187",
+ "endOffsets": "434"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "51",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "6163",
"endColumns": "103",
"endOffsets": "6262"
@@ -1220,6 +2272,14 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-mr\\values-mr.xml",
+=======
+ "startOffsets": "3911",
+ "endColumns": "187",
+ "endOffsets": "4094"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-is\\values-is.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -1230,6 +2290,64 @@
"to": {
"startLines": "53",
"startColumns": "4",
+ "startOffsets": "6014",
+ "endColumns": "100",
+ "endOffsets": "6110"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-is\\values-is.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,205,302,414,499,600,714,795,875,966,1058,1151,1245,1352,1445,1540,1635,1726,1820,1900,2010,2117,2214,2323,2423,2526,2681,2779",
+ "endColumns": "99,96,111,84,100,113,80,79,90,91,92,93,106,92,94,94,90,93,79,109,106,96,108,99,102,154,97,79",
+ "endOffsets": "200,297,409,494,595,709,790,870,961,1053,1146,1240,1347,1440,1535,1630,1721,1815,1895,2005,2112,2209,2318,2418,2521,2676,2774,2854"
+ },
+ "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,52",
+ "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",
+ "startOffsets": "105,205,302,414,499,600,714,795,875,966,1058,1151,1245,1352,1445,1540,1635,1726,1820,1900,2010,2117,2214,2323,2423,2526,2681,5934",
+ "endColumns": "99,96,111,84,100,113,80,79,90,91,92,93,106,92,94,94,90,93,79,109,106,96,108,99,102,154,97,79",
+ "endOffsets": "200,297,409,494,595,709,790,870,961,1053,1146,1240,1347,1440,1535,1630,1721,1815,1895,2005,2112,2209,2318,2418,2521,2676,2774,6009"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-is\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "207",
+ "endColumns": "102",
+ "endOffsets": "309"
+ },
+ "to": {
+ "startLines": "51",
+ "startColumns": "4",
+ "startOffsets": "5827",
+ "endColumns": "106",
+ "endOffsets": "5929"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-en-rIN_values-en-rIN.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-en-rIN\\values-en-rIN.xml",
+>>>>>>> origin/feature/pushNotifications
+ "from": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "100",
+ "endOffsets": "151"
+ },
+ "to": {
+ "startLines": "34",
+ "startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "6039",
"endColumns": "100",
"endOffsets": "6135"
@@ -1288,28 +2406,70 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-mr\\values.xml",
+=======
+ "startOffsets": "3246",
+ "endColumns": "100",
+ "endOffsets": "3342"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-en-rIN\\values-en-rIN.xml",
"from": {
- "startLines": "4",
- "startColumns": "0",
- "startOffsets": "247",
- "endColumns": "201",
- "endOffsets": "448"
+ "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",
+ "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",
+ "startOffsets": "105,209,309,417,501,601,716,794,870,961,1053,1148,1242,1343,1436,1531,1625,1716,1807,1888,1991,2094,2193,2298,2402,2506,2662,2762",
+ "endColumns": "103,99,107,83,99,114,77,75,90,91,94,93,100,92,94,93,90,90,80,102,102,98,104,103,103,155,99,81",
+ "endOffsets": "204,304,412,496,596,711,789,865,956,1048,1143,1237,1338,1431,1526,1620,1711,1802,1883,1986,2089,2188,2293,2397,2501,2657,2757,2839"
},
"to": {
- "startLines": "37",
- "startColumns": "4",
- "startOffsets": "3933",
- "endColumns": "201",
- "endOffsets": "4130"
+ "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,33",
+ "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",
+ "startOffsets": "105,209,309,417,501,601,716,794,870,961,1053,1148,1242,1343,1436,1531,1625,1716,1807,1888,1991,2094,2193,2298,2402,2506,2662,3164",
+ "endColumns": "103,99,107,83,99,114,77,75,90,91,94,93,100,92,94,93,90,90,80,102,102,98,104,103,103,155,99,81",
+ "endOffsets": "204,304,412,496,596,711,789,865,956,1048,1143,1237,1338,1431,1526,1620,1711,1802,1883,1986,2089,2188,2293,2397,2501,2657,2757,3241"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-en-rIN\\values-en-rIN.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,153,250,359",
+ "endColumns": "97,96,108,97",
+ "endOffsets": "148,245,354,452"
+ },
+ "to": {
+ "startLines": "29,30,31,32",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "2762,2860,2957,3066",
+ "endColumns": "97,96,108,97",
+ "endOffsets": "2855,2952,3061,3159"
}
}
]
},
{
- "outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-eu_values-eu.arsc.flat",
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-pl_values-pl.arsc.flat",
"map": [
{
- "source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-eu\\values-eu.xml",
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-pl\\values-pl.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,220,322,430,516,623,742,821,898,989,1081,1176,1270,1372,1465,1560,1655,1746,1837,1918,2027,2127,2226,2335,2447,2558,2721,2817",
+ "endColumns": "114,101,107,85,106,118,78,76,90,91,94,93,101,92,94,94,90,90,80,108,99,98,108,111,110,162,95,81",
+ "endOffsets": "215,317,425,511,618,737,816,893,984,1076,1171,1265,1367,1460,1555,1650,1741,1832,1913,2022,2122,2221,2330,2442,2553,2716,2812,2894"
+ },
+ "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,52",
+ "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",
+ "startOffsets": "105,220,322,430,516,623,742,821,898,989,1081,1176,1270,1372,1465,1560,1655,1746,1837,1918,2027,2127,2226,2335,2447,2558,2721,6078",
+ "endColumns": "114,101,107,85,106,118,78,76,90,91,94,93,101,92,94,94,90,90,80,108,99,98,108,111,110,162,95,81",
+ "endOffsets": "215,317,425,511,618,737,816,893,984,1076,1171,1265,1367,1460,1555,1650,1741,1832,1913,2022,2122,2221,2330,2442,2553,2716,2812,6155"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-pl\\values-pl.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -1318,6 +2478,79 @@
"endOffsets": "151"
},
"to": {
+ "startLines": "53",
+ "startColumns": "4",
+ "startOffsets": "6160",
+ "endColumns": "100",
+ "endOffsets": "6256"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-pl\\values-pl.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,155,254,369",
+ "endColumns": "99,98,114,102",
+ "endOffsets": "150,249,364,467"
+ },
+ "to": {
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "5558,5658,5757,5872",
+ "endColumns": "99,98,114,102",
+ "endOffsets": "5653,5752,5867,5970"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-pl\\values.xml",
+>>>>>>> origin/feature/pushNotifications
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "247",
+<<<<<<< HEAD
+ "endColumns": "201",
+ "endOffsets": "448"
+=======
+ "endColumns": "198",
+ "endOffsets": "445"
+>>>>>>> origin/feature/pushNotifications
+ },
+ "to": {
+ "startLines": "37",
+ "startColumns": "4",
+<<<<<<< HEAD
+ "startOffsets": "3933",
+ "endColumns": "201",
+ "endOffsets": "4130"
+=======
+ "startOffsets": "3965",
+ "endColumns": "198",
+ "endOffsets": "4159"
+>>>>>>> origin/feature/pushNotifications
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-eu_values-eu.arsc.flat",
+ "map": [
+ {
+<<<<<<< HEAD
+ "source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-eu\\values-eu.xml",
+=======
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-pl\\values.xml",
+>>>>>>> origin/feature/pushNotifications
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,347,547,667,775,985,1108,1245,1369,1599,1706,1912,2038,2256,2443,2538,2630",
+ "endColumns": "101,199,119,107,209,122,136,123,229,106,205,125,217,186,94,91,108",
+ "endOffsets": "346,546,666,774,984,1107,1244,1368,1598,1705,1911,2037,2255,2442,2537,2629,2738"
+ },
+ "to": {
+<<<<<<< HEAD
"startLines": "53",
"startColumns": "4",
"startOffsets": "6248",
@@ -1350,10 +2583,28 @@
"startOffsets": "247",
"endColumns": "200",
"endOffsets": "447"
+=======
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2817,2923,3123,3247,3359,3569,3696,3837,4164,4394,4505,4711,4841,5059,5250,5349,5445",
+ "endColumns": "105,199,123,111,209,126,140,127,229,110,205,129,217,190,98,95,112",
+ "endOffsets": "2918,3118,3242,3354,3564,3691,3832,3960,4389,4500,4706,4836,5054,5245,5344,5440,5553"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-pl\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "207",
+ "endColumns": "98",
+ "endOffsets": "305"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "37",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "4027",
"endColumns": "200",
"endOffsets": "4223"
@@ -1367,10 +2618,31 @@
"startOffsets": "207",
"endColumns": "106",
"endOffsets": "313"
+=======
+ "startOffsets": "5975",
+ "endColumns": "102",
+ "endOffsets": "6073"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-nb_values-nb.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-nb\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "247",
+ "endColumns": "188",
+ "endOffsets": "435"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
- "startLines": "51",
+ "startLines": "37",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "6055",
"endColumns": "110",
"endOffsets": "6161"
@@ -1384,10 +2656,26 @@
"startOffsets": "105,214,312,422,508,614,738,824,906,998,1091,1187,1281,1383,1477,1573,1670,1762,1855,1936,2045,2154,2253,2362,2469,2580,2751,2850",
"endColumns": "108,97,109,85,105,123,85,81,91,92,95,93,101,93,95,96,91,92,80,108,108,98,108,106,110,170,98,81",
"endOffsets": "209,307,417,503,609,733,819,901,993,1086,1182,1276,1378,1472,1568,1665,1757,1850,1931,2040,2149,2248,2357,2464,2575,2746,2845,2927"
+=======
+ "startOffsets": "3903",
+ "endColumns": "188",
+ "endOffsets": "4087"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-nb\\values-nb.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,208,303,417,503,603,716,793,869,960,1052,1146,1240,1341,1434,1529,1627,1718,1809,1886,1989,2087,2183,2287,2386,2487,2640,2737",
+ "endColumns": "102,94,113,85,99,112,76,75,90,91,93,93,100,92,94,97,90,90,76,102,97,95,103,98,100,152,96,78",
+ "endOffsets": "203,298,412,498,598,711,788,864,955,1047,1141,1235,1336,1429,1524,1622,1713,1804,1881,1984,2082,2178,2282,2381,2482,2635,2732,2811"
+>>>>>>> origin/feature/pushNotifications
},
"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,52",
"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",
+<<<<<<< HEAD
"startOffsets": "105,214,312,422,508,614,738,824,906,998,1091,1187,1281,1383,1477,1573,1670,1762,1855,1936,2045,2154,2253,2362,2469,2580,2751,6166",
"endColumns": "108,97,109,85,105,123,85,81,91,92,95,93,101,93,95,96,91,92,80,108,108,98,108,106,110,170,98,81",
"endOffsets": "209,307,417,503,609,733,819,901,993,1086,1182,1276,1378,1472,1568,1665,1757,1850,1931,2040,2149,2248,2357,2464,2575,2746,2845,6243"
@@ -1408,6 +2696,45 @@
"startOffsets": "2850,2956,3164,3292,3403,3609,3738,3891,4228,4471,4581,4779,4911,5138,5327,5423,5518",
"endColumns": "105,207,127,110,205,128,152,135,242,109,197,131,226,188,95,94,117",
"endOffsets": "2951,3159,3287,3398,3604,3733,3886,4022,4466,4576,4774,4906,5133,5322,5418,5513,5631"
+=======
+ "startOffsets": "105,208,303,417,503,603,716,793,869,960,1052,1146,1240,1341,1434,1529,1627,1718,1809,1886,1989,2087,2183,2287,2386,2487,2640,5964",
+ "endColumns": "102,94,113,85,99,112,76,75,90,91,93,93,100,92,94,97,90,90,76,102,97,95,103,98,100,152,96,78",
+ "endOffsets": "203,298,412,498,598,711,788,864,955,1047,1141,1235,1336,1429,1524,1622,1713,1804,1881,1984,2082,2178,2282,2381,2482,2635,2732,6038"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-nb\\values-nb.xml",
+ "from": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "100",
+ "endOffsets": "151"
+ },
+ "to": {
+ "startLines": "53",
+ "startColumns": "4",
+ "startOffsets": "6043",
+ "endColumns": "100",
+ "endOffsets": "6139"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-nb\\values-nb.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,165,266,378",
+ "endColumns": "109,100,111,95",
+ "endOffsets": "160,261,373,469"
+ },
+ "to": {
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "5439,5549,5650,5762",
+ "endColumns": "109,100,111,95",
+ "endOffsets": "5544,5645,5757,5853"
+>>>>>>> origin/feature/pushNotifications
}
}
]
@@ -1416,6 +2743,7 @@
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-port_values-port.arsc.flat",
"map": [
{
+<<<<<<< HEAD
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-port\\values-port.xml",
"from": {
"startLines": "2",
@@ -1432,16 +2760,25 @@
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-sk\\values.xml",
+=======
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-nb\\values.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "4",
"startColumns": "0",
"startOffsets": "207",
+<<<<<<< HEAD
"endColumns": "99",
"endOffsets": "306"
+=======
+ "endColumns": "101",
+ "endOffsets": "308"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "51",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "5999",
"endColumns": "103",
"endOffsets": "6098"
@@ -1455,17 +2792,63 @@
"startOffsets": "245,349,541,663,771,986,1112,1251,1378,1606,1715,1916,2044,2266,2456,2550,2643",
"endColumns": "103,191,121,107,214,125,138,126,227,108,200,127,221,189,93,92,111",
"endOffsets": "348,540,662,770,985,1111,1250,1377,1605,1714,1915,2043,2265,2455,2549,2642,2754"
+=======
+ "startOffsets": "5858",
+ "endColumns": "105",
+ "endOffsets": "5959"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-nb\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,348,539,663,770,985,1113,1259,1387,1600,1705,1897,2023,2224,2426,2519,2607",
+ "endColumns": "102,190,123,106,214,127,145,127,212,104,191,125,200,201,92,87,102",
+ "endOffsets": "347,538,662,769,984,1112,1258,1386,1599,1704,1896,2022,2223,2425,2518,2606,2709"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+<<<<<<< HEAD
"startOffsets": "2817,2925,3117,3243,3355,3570,3700,3843,4172,4400,4513,4714,4846,5068,5262,5360,5457",
"endColumns": "107,191,125,111,214,129,142,130,227,112,200,131,221,193,97,96,115",
"endOffsets": "2920,3112,3238,3350,3565,3695,3838,3969,4395,4508,4709,4841,5063,5257,5355,5452,5568"
+=======
+ "startOffsets": "2737,2844,3035,3163,3274,3489,3621,3771,4092,4305,4414,4606,4736,4937,5143,5240,5332",
+ "endColumns": "106,190,127,110,214,131,149,131,212,108,191,129,200,205,96,91,106",
+ "endOffsets": "2839,3030,3158,3269,3484,3616,3766,3898,4300,4409,4601,4731,4932,5138,5235,5327,5434"
}
- },
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-v25_values-v25.arsc.flat",
+ "map": [
{
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-v25\\values-v25.xml",
+ "from": {
+ "startLines": "2,3,4,6",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,126,209,308",
+ "endLines": "2,3,5,7",
+ "endColumns": "70,82,12,12",
+ "endOffsets": "121,204,303,414"
+>>>>>>> origin/feature/pushNotifications
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-uz_values-uz.arsc.flat",
+ "map": [
+ {
+<<<<<<< HEAD
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-sk\\values-sk.xml",
+=======
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-uz\\values-uz.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "2",
"startColumns": "4",
@@ -1476,6 +2859,7 @@
"to": {
"startLines": "53",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "6185",
"endColumns": "100",
"endOffsets": "6281"
@@ -1562,10 +2946,43 @@
"startOffsets": "105,208,307,415,505,610,727,810,893,984,1076,1171,1265,1366,1459,1554,1648,1739,1830,1911,2012,2120,2219,2326,2438,2542,2704,2801",
"endColumns": "102,98,107,89,104,116,82,82,90,91,94,93,100,92,94,93,90,90,80,100,107,98,106,111,103,161,96,81",
"endOffsets": "203,302,410,500,605,722,805,888,979,1071,1166,1260,1361,1454,1549,1643,1734,1825,1906,2007,2115,2214,2321,2433,2537,2699,2796,2878"
+=======
+ "startOffsets": "6137",
+ "endColumns": "100",
+ "endOffsets": "6233"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-uz\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "207",
+ "endColumns": "101",
+ "endOffsets": "308"
+ },
+ "to": {
+ "startLines": "51",
+ "startColumns": "4",
+ "startOffsets": "5948",
+ "endColumns": "105",
+ "endOffsets": "6049"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-uz\\values-uz.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,210,305,405,487,587,704,789,868,959,1051,1146,1240,1335,1428,1523,1618,1709,1801,1884,1994,2100,2200,2308,2414,2516,2677,2776",
+ "endColumns": "104,94,99,81,99,116,84,78,90,91,94,93,94,92,94,94,90,91,82,109,105,99,107,105,101,160,98,82",
+ "endOffsets": "205,300,400,482,582,699,784,863,954,1046,1141,1235,1330,1423,1518,1613,1704,1796,1879,1989,2095,2195,2303,2409,2511,2672,2771,2854"
+>>>>>>> origin/feature/pushNotifications
},
"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,52",
"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",
+<<<<<<< HEAD
"startOffsets": "105,208,307,415,505,610,727,810,893,984,1076,1171,1265,1366,1459,1554,1648,1739,1830,1911,2012,2120,2219,2326,2438,2542,2704,6093",
"endColumns": "102,98,107,89,104,116,82,82,90,91,94,93,100,92,94,93,90,90,80,100,107,98,106,111,103,161,96,81",
"endOffsets": "203,302,410,500,605,722,805,888,979,1071,1166,1260,1361,1454,1549,1643,1734,1825,1906,2007,2115,2214,2321,2433,2537,2699,2796,6170"
@@ -1596,10 +3013,26 @@
"startOffsets": "245,347,535,658,765,987,1110,1255,1394,1618,1722,1907,2032,2241,2426,2520,2621",
"endColumns": "101,187,122,106,221,122,144,138,223,103,184,124,208,184,93,100,120",
"endOffsets": "346,534,657,764,986,1109,1254,1393,1617,1721,1906,2031,2240,2425,2519,2620,2741"
+=======
+ "startOffsets": "105,210,305,405,487,587,704,789,868,959,1051,1146,1240,1335,1428,1523,1618,1709,1801,1884,1994,2100,2200,2308,2414,2516,2677,6054",
+ "endColumns": "104,94,99,81,99,116,84,78,90,91,94,93,94,92,94,94,90,91,82,109,105,99,107,105,101,160,98,82",
+ "endOffsets": "205,300,400,482,582,699,784,863,954,1046,1141,1235,1330,1423,1518,1613,1704,1796,1879,1989,2095,2195,2303,2409,2511,2672,2771,6132"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-uz\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,348,530,657,764,968,1099,1245,1376,1607,1713,1903,2033,2246,2434,2526,2613",
+ "endColumns": "102,181,126,106,203,130,145,130,230,105,189,129,212,187,91,86,104",
+ "endOffsets": "347,529,656,763,967,1098,1244,1375,1606,1712,1902,2032,2245,2433,2525,2612,2717"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+<<<<<<< HEAD
"startOffsets": "2801,2907,3095,3222,3333,3555,3682,3831,4179,4403,4511,4696,4825,5034,5223,5321,5426",
"endColumns": "105,187,126,110,221,126,148,142,223,107,184,128,208,188,97,104,124",
"endOffsets": "2902,3090,3217,3328,3550,3677,3826,3969,4398,4506,4691,4820,5029,5218,5316,5421,5546"
@@ -1624,24 +3057,62 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-sw\\values.xml",
+=======
+ "startOffsets": "2776,2883,3065,3196,3307,3511,3646,3796,4140,4371,4481,4671,4805,5018,5210,5306,5397",
+ "endColumns": "106,181,130,110,203,134,149,134,230,109,189,133,212,191,95,90,108",
+ "endOffsets": "2878,3060,3191,3302,3506,3641,3791,3926,4366,4476,4666,4800,5013,5205,5301,5392,5501"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-uz\\values-uz.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,173,282,392",
+ "endColumns": "117,108,109,104",
+ "endOffsets": "168,277,387,492"
+ },
+ "to": {
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "5506,5624,5733,5843",
+ "endColumns": "117,108,109,104",
+ "endOffsets": "5619,5728,5838,5943"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-uz\\values.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "4",
"startColumns": "0",
"startOffsets": "247",
+<<<<<<< HEAD
"endColumns": "204",
"endOffsets": "451"
+=======
+ "endColumns": "208",
+ "endOffsets": "455"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "37",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "3974",
"endColumns": "204",
"endOffsets": "4174"
+=======
+ "startOffsets": "3931",
+ "endColumns": "208",
+ "endOffsets": "4135"
+>>>>>>> origin/feature/pushNotifications
}
}
]
},
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-zh-rHK_values-zh-rHK.arsc.flat",
"map": [
{
@@ -1703,10 +3174,57 @@
"startOffsets": "55",
"endColumns": "100",
"endOffsets": "151"
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-kk_values-kk.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-kk\\values-kk.xml",
+ "from": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "100",
+ "endOffsets": "151"
},
"to": {
"startLines": "53",
"startColumns": "4",
+ "startOffsets": "6102",
+ "endColumns": "100",
+ "endOffsets": "6198"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-kk\\values-kk.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,155,259,367",
+ "endColumns": "99,103,107,103",
+ "endOffsets": "150,254,362,466"
+ },
+ "to": {
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "5502,5602,5706,5814",
+ "endColumns": "99,103,107,103",
+ "endOffsets": "5597,5701,5809,5913"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-kk\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "207",
+ "endColumns": "98",
+ "endOffsets": "305"
+>>>>>>> origin/feature/pushNotifications
+ },
+ "to": {
+ "startLines": "53",
+ "startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "5528",
"endColumns": "100",
"endOffsets": "5624"
@@ -1737,18 +3255,74 @@
"startOffsets": "105,200,293,393,475,572,680,757,833,925,1018,1109,1205,1301,1395,1491,1583,1675,1767,1844,1940,2035,2130,2227,2323,2421,2572,2666",
"endColumns": "94,92,99,81,96,107,76,75,91,92,90,95,95,93,95,91,91,91,76,95,94,94,96,95,97,150,93,77",
"endOffsets": "195,288,388,470,567,675,752,828,920,1013,1104,1200,1296,1390,1486,1578,1670,1762,1839,1935,2030,2125,2222,2318,2416,2567,2661,2739"
+=======
+ "startOffsets": "5918",
+ "endColumns": "102",
+ "endOffsets": "6016"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-kk\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "247",
+ "endColumns": "222",
+ "endOffsets": "469"
+ },
+ "to": {
+ "startLines": "37",
+ "startColumns": "4",
+ "startOffsets": "3940",
+ "endColumns": "222",
+ "endOffsets": "4158"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-kk\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,346,531,655,759,958,1082,1231,1365,1589,1693,1881,2008,2220,2403,2492,2577",
+ "endColumns": "100,184,123,103,198,123,148,133,223,103,187,126,211,182,88,84,102",
+ "endOffsets": "345,530,654,758,957,1081,1230,1364,1588,1692,1880,2007,2219,2402,2491,2576,2679"
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2796,2901,3086,3214,3322,3521,3649,3802,4163,4387,4495,4683,4814,5026,5213,5306,5395",
+ "endColumns": "104,184,127,107,198,127,152,137,223,107,187,130,211,186,92,88,106",
+ "endOffsets": "2896,3081,3209,3317,3516,3644,3797,3935,4382,4490,4678,4809,5021,5208,5301,5390,5497"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-kk\\values-kk.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,213,318,428,513,619,738,818,896,987,1079,1174,1268,1369,1462,1557,1654,1745,1836,1916,2021,2124,2222,2329,2435,2535,2701,2796",
+ "endColumns": "107,104,109,84,105,118,79,77,90,91,94,93,100,92,94,96,90,90,79,104,102,97,106,105,99,165,94,80",
+ "endOffsets": "208,313,423,508,614,733,813,891,982,1074,1169,1263,1364,1457,1552,1649,1740,1831,1911,2016,2119,2217,2324,2430,2530,2696,2791,2872"
+>>>>>>> origin/feature/pushNotifications
},
"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,52",
"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",
+<<<<<<< HEAD
"startOffsets": "105,200,293,393,475,572,680,757,833,925,1018,1109,1205,1301,1395,1491,1583,1675,1767,1844,1940,2035,2130,2227,2323,2421,2572,5450",
"endColumns": "94,92,99,81,96,107,76,75,91,92,90,95,95,93,95,91,91,91,76,95,94,94,96,95,97,150,93,77",
"endOffsets": "195,288,388,470,567,675,752,828,920,1013,1104,1200,1296,1390,1486,1578,1670,1762,1839,1935,2030,2125,2222,2318,2416,2567,2661,5523"
+=======
+ "startOffsets": "105,213,318,428,513,619,738,818,896,987,1079,1174,1268,1369,1462,1557,1654,1745,1836,1916,2021,2124,2222,2329,2435,2535,2701,6021",
+ "endColumns": "107,104,109,84,105,118,79,77,90,91,94,93,100,92,94,96,90,90,79,104,102,97,106,105,99,165,94,80",
+ "endOffsets": "208,313,423,508,614,733,813,891,982,1074,1169,1263,1364,1457,1552,1649,1740,1831,1911,2016,2119,2217,2324,2430,2530,2696,2791,6097"
+>>>>>>> origin/feature/pushNotifications
}
}
]
},
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-or_values-or.arsc.flat",
"map": [
{
@@ -1759,10 +3333,23 @@
"startOffsets": "245,354,547,678,793,1008,1142,1283,1418,1645,1756,1948,2080,2291,2475,2566,2664",
"endColumns": "108,192,130,114,214,133,140,134,226,110,191,131,210,183,90,97,111",
"endOffsets": "353,546,677,792,1007,1141,1282,1417,1644,1755,1947,2079,2290,2474,2565,2663,2775"
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-tl_values-tl.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-tl\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,350,558,694,801,1018,1152,1300,1438,1676,1781,1990,2126,2347,2552,2646,2738",
+ "endColumns": "104,207,135,106,216,133,147,137,237,104,208,135,220,204,93,91,105",
+ "endOffsets": "349,557,693,800,1017,1151,1299,1437,1675,1780,1989,2125,2346,2551,2645,2737,2843"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+<<<<<<< HEAD
"startOffsets": "2856,2969,3162,3297,3416,3631,3769,3914,4252,4479,4594,4786,4922,5133,5321,5416,5518",
"endColumns": "112,192,134,118,214,137,144,138,226,114,191,135,210,187,94,101,115",
"endOffsets": "2964,3157,3292,3411,3626,3764,3909,4048,4474,4589,4781,4917,5128,5316,5411,5513,5629"
@@ -1787,16 +3374,31 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-or\\values.xml",
+=======
+ "startOffsets": "2845,2954,3162,3302,3413,3630,3768,3920,4267,4505,4614,4823,4963,5184,5393,5491,5587",
+ "endColumns": "108,207,139,110,216,137,151,141,237,108,208,139,220,208,97,95,109",
+ "endOffsets": "2949,3157,3297,3408,3625,3763,3915,4057,4500,4609,4818,4958,5179,5388,5486,5582,5692"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-tl\\values.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "4",
"startColumns": "0",
"startOffsets": "247",
+<<<<<<< HEAD
"endColumns": "198",
"endOffsets": "445"
+=======
+ "endColumns": "204",
+ "endOffsets": "451"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "37",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "4053",
"endColumns": "198",
"endOffsets": "4247"
@@ -1821,6 +3423,32 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-or\\values-or.xml",
+=======
+ "startOffsets": "4062",
+ "endColumns": "204",
+ "endOffsets": "4262"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-tl\\values-tl.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,216,324,437,525,631,746,826,904,995,1087,1182,1276,1377,1470,1565,1659,1750,1841,1924,2033,2143,2244,2354,2472,2580,2743,2845",
+ "endColumns": "110,107,112,87,105,114,79,77,90,91,94,93,100,92,94,93,90,90,82,108,109,100,109,117,107,162,101,83",
+ "endOffsets": "211,319,432,520,626,741,821,899,990,1082,1177,1271,1372,1465,1560,1654,1745,1836,1919,2028,2138,2239,2349,2467,2575,2738,2840,2924"
+ },
+ "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,52",
+ "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",
+ "startOffsets": "105,216,324,437,525,631,746,826,904,995,1087,1182,1276,1377,1470,1565,1659,1750,1841,1924,2033,2143,2244,2354,2472,2580,2743,6225",
+ "endColumns": "110,107,112,87,105,114,79,77,90,91,94,93,100,92,94,93,90,90,82,108,109,100,109,117,107,162,101,83",
+ "endOffsets": "211,319,432,520,626,741,821,899,990,1082,1177,1271,1372,1465,1560,1654,1745,1836,1919,2028,2138,2239,2349,2467,2575,2738,2840,6304"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-tl\\values-tl.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "2",
"startColumns": "4",
@@ -1831,6 +3459,7 @@
"to": {
"startLines": "53",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "6266",
"endColumns": "100",
"endOffsets": "6362"
@@ -1838,16 +3467,48 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-or\\values.xml",
+=======
+ "startOffsets": "6309",
+ "endColumns": "100",
+ "endOffsets": "6405"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-tl\\values-tl.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,158,263,374",
+ "endColumns": "102,104,110,103",
+ "endOffsets": "153,258,369,473"
+ },
+ "to": {
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "5697,5800,5905,6016",
+ "endColumns": "102,104,110,103",
+ "endOffsets": "5795,5900,6011,6115"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-tl\\values.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "4",
"startColumns": "0",
"startOffsets": "207",
+<<<<<<< HEAD
"endColumns": "102",
"endOffsets": "309"
+=======
+ "endColumns": "100",
+ "endOffsets": "307"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "51",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "6070",
"endColumns": "106",
"endOffsets": "6172"
@@ -1900,10 +3561,31 @@
"startOffsets": "207",
"endColumns": "99",
"endOffsets": "306"
+=======
+ "startOffsets": "6120",
+ "endColumns": "104",
+ "endOffsets": "6220"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-ka_values-ka.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-ka\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "247",
+ "endColumns": "201",
+ "endOffsets": "448"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
- "startLines": "51",
+ "startLines": "37",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "5864",
"endColumns": "103",
"endOffsets": "5963"
@@ -1945,6 +3627,32 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-gu\\values-gu.xml",
+=======
+ "startOffsets": "3976",
+ "endColumns": "201",
+ "endOffsets": "4173"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-ka\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,348,529,655,763,976,1108,1256,1389,1621,1727,1913,2039,2259,2424,2516,2603",
+ "endColumns": "102,180,125,107,212,131,147,132,231,105,185,125,219,164,91,86,100",
+ "endOffsets": "347,528,654,762,975,1107,1255,1388,1620,1726,1912,2038,2258,2423,2515,2602,2703"
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2808,2915,3096,3226,3338,3551,3687,3839,4178,4410,4520,4706,4836,5056,5225,5321,5412",
+ "endColumns": "106,180,129,111,212,135,151,136,231,109,185,129,219,168,95,90,104",
+ "endOffsets": "2910,3091,3221,3333,3546,3682,3834,3971,4405,4515,4701,4831,5051,5220,5316,5407,5512"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-ka\\values-ka.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "2",
"startColumns": "4",
@@ -1955,6 +3663,7 @@
"to": {
"startLines": "53",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "6048",
"endColumns": "100",
"endOffsets": "6144"
@@ -2065,6 +3774,84 @@
"startOffsets": "5523,5628,5729,5843",
"endColumns": "104,100,113,101",
"endOffsets": "5623,5724,5838,5940"
+=======
+ "startOffsets": "6130",
+ "endColumns": "100",
+ "endOffsets": "6226"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-ka\\values-ka.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,161,264,374",
+ "endColumns": "105,102,109,103",
+ "endOffsets": "156,259,369,473"
+ },
+ "to": {
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "5517,5623,5726,5836",
+ "endColumns": "105,102,109,103",
+ "endOffsets": "5618,5721,5831,5935"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-ka\\values-ka.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,213,316,427,513,618,731,814,894,985,1077,1172,1266,1367,1460,1555,1650,1741,1832,1912,2025,2131,2229,2342,2447,2551,2709,2808",
+ "endColumns": "107,102,110,85,104,112,82,79,90,91,94,93,100,92,94,94,90,90,79,112,105,97,112,104,103,157,98,80",
+ "endOffsets": "208,311,422,508,613,726,809,889,980,1072,1167,1261,1362,1455,1550,1645,1736,1827,1907,2020,2126,2224,2337,2442,2546,2704,2803,2884"
+ },
+ "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,52",
+ "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",
+ "startOffsets": "105,213,316,427,513,618,731,814,894,985,1077,1172,1266,1367,1460,1555,1650,1741,1832,1912,2025,2131,2229,2342,2447,2551,2709,6049",
+ "endColumns": "107,102,110,85,104,112,82,79,90,91,94,93,100,92,94,94,90,90,79,112,105,97,112,104,103,157,98,80",
+ "endOffsets": "208,311,422,508,613,726,809,889,980,1072,1167,1261,1362,1455,1550,1645,1736,1827,1907,2020,2126,2224,2337,2442,2546,2704,2803,6125"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-ka\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "207",
+ "endColumns": "104",
+ "endOffsets": "311"
+ },
+ "to": {
+ "startLines": "51",
+ "startColumns": "4",
+ "startOffsets": "5940",
+ "endColumns": "108",
+ "endOffsets": "6044"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-fr-rCA_values-fr-rCA.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-fr-rCA\\values-fr-rCA.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,216,323,433,520,626,756,841,922,1013,1105,1203,1298,1399,1492,1585,1680,1771,1862,1947,2057,2168,2271,2382,2490,2597,2756,2855",
+ "endColumns": "110,106,109,86,105,129,84,80,90,91,97,94,100,92,92,94,90,90,84,109,110,102,110,107,106,158,98,85",
+ "endOffsets": "211,318,428,515,621,751,836,917,1008,1100,1198,1293,1394,1487,1580,1675,1766,1857,1942,2052,2163,2266,2377,2485,2592,2751,2850,2936"
+ },
+ "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,52",
+ "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",
+ "startOffsets": "105,216,323,433,520,626,756,841,922,1013,1105,1203,1298,1399,1492,1585,1680,1771,1862,1947,2057,2168,2271,2382,2490,2597,2756,6293",
+ "endColumns": "110,106,109,86,105,129,84,80,90,91,97,94,100,92,92,94,90,90,84,109,110,102,110,107,106,158,98,85",
+ "endOffsets": "211,318,428,515,621,751,836,917,1008,1100,1198,1293,1394,1487,1580,1675,1766,1857,1942,2052,2163,2266,2377,2485,2592,2751,2850,6374"
+>>>>>>> origin/feature/pushNotifications
}
}
]
@@ -2073,6 +3860,7 @@
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-pt-rPT_values-pt-rPT.arsc.flat",
"map": [
{
+<<<<<<< HEAD
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-pt-rPT\\values-pt-rPT.xml",
"from": {
"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",
@@ -2097,10 +3885,37 @@
"startOffsets": "55",
"endColumns": "100",
"endOffsets": "151"
+=======
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-fr-rCA\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "249,353,565,693,800,1030,1161,1308,1446,1700,1810,2026,2160,2379,2584,2683,2773",
+ "endColumns": "103,211,127,106,229,130,146,137,253,109,215,133,218,204,98,89,108",
+ "endOffsets": "352,564,692,799,1029,1160,1307,1445,1699,1809,2025,2159,2378,2583,2682,2772,2881"
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2855,2963,3175,3307,3418,3648,3783,3934,4296,4550,4664,4880,5018,5237,5446,5549,5643",
+ "endColumns": "107,211,131,110,229,134,150,141,253,113,215,137,218,208,102,93,112",
+ "endOffsets": "2958,3170,3302,3413,3643,3778,3929,4071,4545,4659,4875,5013,5232,5441,5544,5638,5751"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-fr-rCA\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "211",
+ "endColumns": "100",
+ "endOffsets": "311"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "53",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "6292",
"endColumns": "100",
"endOffsets": "6388"
@@ -2108,16 +3923,48 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-pt-rPT\\values.xml",
+=======
+ "startOffsets": "6188",
+ "endColumns": "104",
+ "endOffsets": "6288"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-fr-rCA\\values.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "4",
"startColumns": "0",
"startOffsets": "251",
+<<<<<<< HEAD
"endColumns": "203",
"endOffsets": "454"
+=======
+ "endColumns": "219",
+ "endOffsets": "470"
},
"to": {
"startLines": "37",
"startColumns": "4",
+ "startOffsets": "4076",
+ "endColumns": "219",
+ "endOffsets": "4291"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-fr-rCA\\values-fr-rCA.xml",
+ "from": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "100",
+ "endOffsets": "151"
+>>>>>>> origin/feature/pushNotifications
+ },
+ "to": {
+ "startLines": "37",
+ "startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "4037",
"endColumns": "203",
"endOffsets": "4236"
@@ -2165,13 +4012,90 @@
"startOffsets": "211",
"endColumns": "102",
"endOffsets": "313"
+=======
+ "startOffsets": "6379",
+ "endColumns": "100",
+ "endOffsets": "6475"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-fr-rCA\\values-fr-rCA.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,162,264,383",
+ "endColumns": "106,101,118,103",
+ "endOffsets": "157,259,378,482"
+ },
+ "to": {
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "5756,5863,5965,6084",
+ "endColumns": "106,101,118,103",
+ "endOffsets": "5858,5960,6079,6183"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-my_values-my.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-my\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "247",
+ "endColumns": "212",
+ "endOffsets": "459"
+ },
+ "to": {
+ "startLines": "37",
+ "startColumns": "4",
+ "startOffsets": "4058",
+ "endColumns": "212",
+ "endOffsets": "4266"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-my\\values-my.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,218,325,441,528,637,760,842,924,1015,1107,1202,1296,1397,1490,1585,1679,1770,1861,1945,2060,2169,2268,2394,2501,2609,2769,2872",
+ "endColumns": "112,106,115,86,108,122,81,81,90,91,94,93,100,92,94,93,90,90,83,114,108,98,125,106,107,159,102,84",
+ "endOffsets": "213,320,436,523,632,755,837,919,1010,1102,1197,1291,1392,1485,1580,1674,1765,1856,1940,2055,2164,2263,2389,2496,2604,2764,2867,2952"
+ },
+ "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,52",
+ "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",
+ "startOffsets": "105,218,325,441,528,637,760,842,924,1015,1107,1202,1296,1397,1490,1585,1679,1770,1861,1945,2060,2169,2268,2394,2501,2609,2769,6257",
+ "endColumns": "112,106,115,86,108,122,81,81,90,91,94,93,100,92,94,93,90,90,83,114,108,98,125,106,107,159,102,84",
+ "endOffsets": "213,320,436,523,632,755,837,919,1010,1102,1197,1291,1392,1485,1580,1674,1765,1856,1940,2055,2164,2263,2389,2496,2604,2764,2867,6337"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-my\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "207",
+ "endColumns": "101",
+ "endOffsets": "308"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "51",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "6100",
"endColumns": "106",
"endOffsets": "6202"
+=======
+ "startOffsets": "6151",
+ "endColumns": "105",
+ "endOffsets": "6252"
+>>>>>>> origin/feature/pushNotifications
}
}
]
@@ -2180,6 +4104,7 @@
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-kn_values-kn.arsc.flat",
"map": [
{
+<<<<<<< HEAD
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-kn\\values-kn.xml",
"from": {
"startLines": "2,3,4,5",
@@ -2187,10 +4112,20 @@
"startOffsets": "55,169,269,385",
"endColumns": "113,99,115,99",
"endOffsets": "164,264,380,480"
+=======
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-my\\values-my.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,164,270,385",
+ "endColumns": "108,105,114,105",
+ "endOffsets": "159,265,380,486"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "47,48,49,50",
"startColumns": "4,4,4,4",
+<<<<<<< HEAD
"startOffsets": "5579,5693,5793,5909",
"endColumns": "113,99,115,99",
"endOffsets": "5688,5788,5904,6004"
@@ -2215,6 +4150,32 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-kn\\values-kn.xml",
+=======
+ "startOffsets": "5715,5824,5930,6045",
+ "endColumns": "108,105,114,105",
+ "endOffsets": "5819,5925,6040,6146"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-my\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,350,546,678,787,993,1123,1272,1407,1642,1746,1947,2088,2305,2518,2614,2713",
+ "endColumns": "104,195,131,108,205,129,148,134,234,103,200,140,216,212,95,98,113",
+ "endOffsets": "349,545,677,786,992,1122,1271,1406,1641,1745,1946,2087,2304,2517,2613,2712,2826"
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2872,2981,3177,3313,3426,3632,3766,3919,4271,4506,4614,4815,4960,5177,5394,5494,5597",
+ "endColumns": "108,195,135,112,205,133,152,138,234,107,200,144,216,216,99,102,117",
+ "endOffsets": "2976,3172,3308,3421,3627,3761,3914,4053,4501,4609,4810,4955,5172,5389,5489,5592,5710"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-my\\values-my.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "2",
"startColumns": "4",
@@ -2225,6 +4186,7 @@
"to": {
"startLines": "53",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "6194",
"endColumns": "100",
"endOffsets": "6290"
@@ -2279,6 +4241,90 @@
"startOffsets": "2859,2972,3174,3309,3426,3628,3759,3897,4230,4439,4554,4745,4882,5086,5273,5372,5465",
"endColumns": "112,201,134,116,201,130,137,127,208,114,190,136,203,186,98,92,113",
"endOffsets": "2967,3169,3304,3421,3623,3754,3892,4020,4434,4549,4740,4877,5081,5268,5367,5460,5574"
+=======
+ "startOffsets": "6342",
+ "endColumns": "100",
+ "endOffsets": "6438"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values_values.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\8c1aed4303e761aac5e34d2036bbfc96\\coordinatorlayout-1.1.0\\res\\values\\values.xml",
+ "from": {
+ "startLines": "2,3,6,16",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,116,261,869",
+ "endLines": "2,5,15,104",
+ "endColumns": "60,12,24,24",
+ "endOffsets": "111,256,864,6075"
+ },
+ "to": {
+ "startLines": "24,4277,5515,5525",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "1278,288380,356276,356884",
+ "endLines": "24,4279,5524,5613",
+ "endColumns": "60,12,24,24",
+ "endOffsets": "1334,288520,356879,362090"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\adb371d4d53f86eab98a28717d70cc7e\\cardview-1.0.0\\res\\values\\values.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,35,36,37,38,45,47,50,7",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "55,107,168,230,292,2179,2238,2295,2349,2763,2827,2953,356",
+ "endLines": "2,3,4,5,6,35,36,37,44,46,49,52,34",
+ "endColumns": "51,60,61,61,63,58,56,53,12,12,12,12,24",
+ "endOffsets": "102,163,225,287,351,2233,2290,2344,2758,2822,2948,3076,2174"
+ },
+ "to": {
+ "startLines": "8,111,112,113,114,297,298,299,818,2624,2626,2629,5215",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "468,6767,6828,6890,6952,19423,19482,19539,59402,176750,176814,176940,340106",
+ "endLines": "8,111,112,113,114,297,298,299,824,2625,2628,2631,5242",
+ "endColumns": "51,60,61,61,63,58,56,53,12,12,12,12,24",
+ "endOffsets": "515,6823,6885,6947,7011,19477,19534,19588,59811,176809,176935,177063,341924"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e66da8b5301e9a6b4d099a6eed9ee5b8\\jetified-appcompat-resources-1.1.0\\res\\values\\values.xml",
+ "from": {
+ "startLines": "2,29,36,47,74",
+ "startColumns": "4,4,4,4,4",
+ "startOffsets": "55,1702,2087,2684,4317",
+ "endLines": "28,35,46,73,78",
+ "endColumns": "24,24,24,24,24",
+ "endOffsets": "1697,2082,2679,4312,4582"
+ },
+ "to": {
+ "startLines": "4407,4434,4441,6465,6492",
+ "startColumns": "4,4,4,4,4",
+ "startOffsets": "295958,297605,297990,406139,407772",
+ "endLines": "4433,4440,4451,6491,6496",
+ "endColumns": "24,24,24,24,24",
+ "endOffsets": "297600,297985,298582,407767,408037"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values\\values.xml",
+ "from": {
+ "startLines": "4,7",
+ "startColumns": "0,0",
+ "startOffsets": "238,401",
+ "endColumns": "63,166",
+ "endOffsets": "301,567"
+ },
+ "to": {
+ "startLines": "632,694",
+ "startColumns": "4,4",
+ "startOffsets": "40561,45486",
+ "endColumns": "67,166",
+ "endOffsets": "40624,45648"
+>>>>>>> origin/feature/pushNotifications
}
}
]
@@ -2287,6 +4333,7 @@
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-xlarge-v4_values-xlarge-v4.arsc.flat",
"map": [
{
+<<<<<<< HEAD
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-xlarge-v4\\values-xlarge-v4.xml",
"from": {
"startLines": "2,3,4,5,6,7",
@@ -2294,6 +4341,22 @@
"startOffsets": "55,126,197,267,337,405",
"endColumns": "70,70,69,69,67,67",
"endOffsets": "121,192,262,332,400,468"
+=======
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values\\values.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "55,113,179,242,304,375,447,515,582,661",
+ "endColumns": "57,65,62,61,70,71,67,66,78,68",
+ "endOffsets": "108,174,237,299,370,442,510,577,656,725"
+ },
+ "to": {
+ "startLines": "105,106,107,108,295,296,704,711,712,713",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "6403,6461,6527,6590,19280,19351,46779,47529,47596,47675",
+ "endColumns": "57,65,62,61,70,71,67,66,78,68",
+ "endOffsets": "6456,6522,6585,6647,19346,19418,46842,47591,47670,47739"
+>>>>>>> origin/feature/pushNotifications
}
}
]
@@ -2302,6 +4365,7 @@
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-b+sr+Latn_values-b+sr+Latn.arsc.flat",
"map": [
{
+<<<<<<< HEAD
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-b+sr+Latn\\values-b+sr+Latn.xml",
"from": {
"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",
@@ -2360,10 +4424,54 @@
"startOffsets": "55",
"endColumns": "100",
"endOffsets": "151"
+=======
+ "source": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\values\\strings.xml",
+ "from": {
+ "startLines": "2,5,4,3",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "57,244,178,112",
+ "endColumns": "53,69,64,64",
+ "endOffsets": "106,309,238,172"
},
"to": {
- "startLines": "53",
+ "startLines": "677,705,758,769",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "43622,46847,54974,56170",
+ "endColumns": "53,69,64,64",
+ "endOffsets": "43671,46912,55034,56230"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\47ce40ad459cbf22b0d81e337967e729\\media-1.0.0\\res\\values\\values.xml",
+ "from": {
+ "startLines": "2,5,6,7,8,10,11,12,13,14",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "55,288,341,394,447,560,626,748,809,875",
+ "endColumns": "88,52,52,52,52,65,121,60,65,66",
+ "endOffsets": "139,336,389,442,495,621,743,804,870,937"
+ },
+ "to": {
+ "startLines": "194,534,535,536,537,3074,3076,3077,3082,3084",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "12361,35140,35193,35246,35299,209048,209224,209346,209608,209803",
+ "endColumns": "88,52,52,52,52,65,121,60,65,66",
+ "endOffsets": "12445,35188,35241,35294,35347,209109,209341,209402,209669,209865"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\values\\ic_launcher_background.xml",
+ "from": {
+ "startLines": "2",
"startColumns": "4",
+ "startOffsets": "57",
+ "endColumns": "56",
+ "endOffsets": "109"
+>>>>>>> origin/feature/pushNotifications
+ },
+ "to": {
+ "startLines": "171",
+ "startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "6106",
"endColumns": "100",
"endOffsets": "6202"
@@ -2394,13 +4502,51 @@
"startOffsets": "214",
"endColumns": "99",
"endOffsets": "313"
+=======
+ "startOffsets": "10935",
+ "endColumns": "56",
+ "endOffsets": "10987"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\generated\\res\\google-services\\debug\\values\\values.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9",
+ "startColumns": "4,4,4,4,4,4,4,4",
+ "startOffsets": "55,199,315,397,501,610,730,835",
+ "endColumns": "143,115,81,103,108,119,104,81",
+ "endOffsets": "194,310,392,496,605,725,830,912"
},
"to": {
- "startLines": "51",
+ "startLines": "706,715,716,717,718,719,720,765",
+ "startColumns": "4,4,4,4,4,4,4,4",
+ "startOffsets": "46917,47826,47942,48024,48128,48237,48357,55885",
+ "endColumns": "143,115,81,103,108,119,104,81",
+ "endOffsets": "47056,47937,48019,48123,48232,48352,48457,55962"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "178",
+ "endColumns": "77",
+ "endOffsets": "255"
+>>>>>>> origin/feature/pushNotifications
+ },
+ "to": {
+ "startLines": "714",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "5916",
"endColumns": "103",
"endOffsets": "6015"
+=======
+ "startOffsets": "47744",
+ "endColumns": "81",
+ "endOffsets": "47821"
+>>>>>>> origin/feature/pushNotifications
}
}
]
@@ -2409,6 +4555,7 @@
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-ms_values-ms.arsc.flat",
"map": [
{
+<<<<<<< HEAD
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-ms\\values-ms.xml",
"from": {
"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",
@@ -2484,10 +4631,114 @@
"startOffsets": "247",
"endColumns": "204",
"endOffsets": "451"
+=======
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,33,46",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "215,301,377,463,549,625,702,778,951,1052,1233,1354,1457,1637,1756,1868,1967,2155,2256,2437,2558,2733,2877,2936,2994,3164,3475",
+ "endLines": "4,5,6,7,8,9,10,11,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,45,64",
+ "endColumns": "85,75,85,85,75,76,75,75,100,180,120,102,179,118,111,98,187,100,180,120,174,143,58,57,74,20,20",
+ "endOffsets": "300,376,462,548,624,701,777,853,1051,1232,1353,1456,1636,1755,1867,1966,2154,2255,2436,2557,2732,2876,2935,2993,3068,3474,3887"
},
"to": {
- "startLines": "37",
+ "startLines": "118,119,120,121,122,123,124,125,686,687,688,689,690,691,692,693,695,696,697,698,699,700,701,702,703,5876,6411",
+ "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": "7160,7250,7330,7420,7510,7590,7671,7751,44446,44551,44732,44857,44964,45144,45267,45383,45653,45841,45946,46127,46252,46427,46575,46638,46700,376771,403848",
+ "endLines": "118,119,120,121,122,123,124,125,686,687,688,689,690,691,692,693,695,696,697,698,699,700,701,702,703,5888,6429",
+ "endColumns": "89,79,89,89,79,80,79,79,104,180,124,106,179,122,115,102,187,104,180,124,174,147,62,61,78,20,20",
+ "endOffsets": "7245,7325,7415,7505,7585,7666,7746,7826,44546,44727,44852,44959,45139,45262,45378,45481,45836,45941,46122,46247,46422,46570,46633,46695,46774,377081,404260"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\node_modules\\@capacitor\\android\\capacitor\\build\\intermediates\\packaged_res\\debug\\values\\values.xml",
+ "from": {
+ "startLines": "2,3,4,6,7,8,9,20",
+ "startColumns": "4,4,4,4,4,4,4,4",
+ "startOffsets": "55,101,148,253,315,349,393,978",
+ "endLines": "2,3,4,6,7,8,9,22",
+ "endColumns": "45,46,50,61,33,43,78,22",
+ "endOffsets": "96,143,194,310,344,388,467,1088"
+ },
+ "to": {
+ "startLines": "115,116,117,680,757,764,766,7032",
+ "startColumns": "4,4,4,4,4,4,4,4",
+ "startOffsets": "7016,7062,7109,43957,54940,55841,55967,438080",
+ "endLines": "115,116,117,680,757,764,766,7034",
+ "endColumns": "45,46,50,61,33,43,78,22",
+ "endOffsets": "7057,7104,7155,44014,54969,55880,56041,438190"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\a444f209b7c59a0fec306c6e0a516b3f\\transition-1.2.0\\res\\values\\values.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "55,95,142,185,240,287,341,393,442,503",
+ "endColumns": "39,46,42,54,46,53,51,48,60,49",
+ "endOffsets": "90,137,180,235,282,336,388,437,498,548"
+ },
+ "to": {
+ "startLines": "586,587,595,598,599,617,618,619,620,621",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "38198,38238,38631,38770,38825,39709,39763,39815,39864,39925",
+ "endColumns": "39,46,42,54,46,53,51,48,60,49",
+ "endOffsets": "38233,38280,38669,38820,38867,39758,39810,39859,39920,39970"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\values\\styles.xml",
+ "from": {
+ "startLines": "4,11,18",
+ "startColumns": "4,4,4",
+ "startOffsets": "97,424,673",
+ "endLines": "9,15,20",
+ "endColumns": "12,12,12",
+ "endOffsets": "416,663,823"
+ },
+ "to": {
+ "startLines": "783,789,794",
+ "startColumns": "4,4,4",
+ "startOffsets": "57239,57558,57798",
+ "endLines": "788,793,796",
+ "endColumns": "12,12,12",
+ "endOffsets": "57553,57793,57946"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\8d8a8abf56b0acf243894e5c793a7480\\recyclerview-1.1.0\\res\\values\\values.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10",
+ "startColumns": "4,4,4,4,4,4,4,4,4",
+ "startOffsets": "55,111,170,218,274,349,425,497,563",
+ "endLines": "2,3,4,5,6,7,8,9,38",
+ "endColumns": "55,58,47,55,74,75,71,65,24",
+ "endOffsets": "106,165,213,269,344,420,492,558,2084"
+ },
+ "to": {
+ "startLines": "56,356,357,358,366,367,368,589,6300",
+ "startColumns": "4,4,4,4,4,4,4,4,4",
+ "startOffsets": "3190,23264,23323,23371,24038,24113,24189,38319,398046",
+ "endLines": "56,356,357,358,366,367,368,589,6328",
+ "endColumns": "55,58,47,55,74,75,71,65,24",
+ "endOffsets": "3241,23318,23366,23422,24108,24184,24256,38380,399567"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\305c2898fe2457e82c9da2257c2bc0a1\\jetified-viewpager2-1.0.0\\res\\values\\values.xml",
+ "from": {
+ "startLines": "2",
"startColumns": "4",
+ "startOffsets": "55",
+ "endLines": "4",
+ "endColumns": "24",
+ "endOffsets": "160"
+>>>>>>> origin/feature/pushNotifications
+ },
+ "to": {
+ "startLines": "7020",
+ "startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "4004",
"endColumns": "204",
"endOffsets": "4204"
@@ -2495,19 +4746,58 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-ms\\values-ms.xml",
+=======
+ "startOffsets": "437496",
+ "endLines": "7022",
+ "endColumns": "24",
+ "endOffsets": "437601"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values\\values.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
- "startLines": "2",
- "startColumns": "4",
- "startOffsets": "55",
- "endColumns": "100",
- "endOffsets": "151"
+ "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,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,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,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,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,218,219,223,227,231,236,242,249,253,257,262,266,270,274,278,282,286,292,296,302,306,312,316,321,325,328,332,338,342,348,352,358,361,365,369,373,377,381,382,383,384,387,390,393,396,400,401,402,403,404,407,409,411,413,418,419,423,429,433,434,436,447,448,452,458,462,463,464,468,495,499,500,504,532,703,729,901,927,958,966,972,986,1008,1013,1018,1028,1037,1046,1050,1057,1065,1072,1073,1082,1085,1088,1092,1096,1100,1103,1104,1109,1114,1124,1129,1136,1142,1143,1146,1150,1155,1157,1159,1162,1165,1167,1171,1174,1181,1184,1187,1191,1193,1197,1199,1201,1203,1207,1215,1223,1235,1241,1250,1253,1264,1267,1268,1273,1274,1279,1348,1418,1419,1429,1438,1439,1441,1445,1448,1451,1454,1457,1460,1463,1466,1470,1473,1476,1479,1483,1486,1490,1494,1495,1496,1497,1498,1499,1500,1501,1502,1503,1504,1505,1506,1507,1508,1509,1510,1511,1512,1513,1514,1516,1518,1519,1520,1521,1522,1523,1524,1525,1527,1528,1530,1531,1533,1535,1536,1538,1539,1540,1541,1542,1543,1545,1546,1547,1548,1549,1550,1552,1554,1556,1557,1558,1559,1560,1561,1562,1563,1564,1565,1566,1567,1568,1570,1571,1572,1573,1574,1575,1577,1581,1585,1586,1587,1588,1589,1590,1594,1595,1596,1597,1599,1601,1603,1605,1607,1608,1609,1610,1612,1614,1616,1617,1618,1619,1620,1621,1622,1623,1624,1625,1626,1627,1630,1631,1632,1633,1635,1637,1638,1640,1641,1643,1645,1647,1648,1649,1650,1651,1652,1653,1654,1655,1656,1657,1658,1660,1661,1662,1663,1665,1666,1667,1668,1669,1671,1673,1675,1677,1678,1679,1680,1681,1682,1683,1684,1685,1686,1687,1688,1689,1690,1691,1692,1775,1778,1781,1784,1798,1809,1819,1849,1876,1885,1960,2357,2362,2390,2408,2444,2450,2456,2479,2620,2640,2646,2650,2656,2693,2705,2771,2795,2864,2883,2909",
+ "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,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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": "105,160,205,254,295,350,409,471,552,613,688,764,841,919,1004,1086,1162,1238,1315,1393,1499,1605,1684,1764,1821,1879,1953,2028,2093,2159,2219,2280,2352,2425,2492,2560,2619,2678,2737,2796,2855,2909,2963,3016,3070,3124,3178,3232,3306,3385,3458,3532,3603,3675,3747,3820,3877,3935,4008,4082,4156,4231,4303,4376,4446,4517,4577,4638,4707,4776,4846,4920,4996,5060,5137,5213,5290,5355,5424,5501,5576,5645,5713,5790,5856,5917,6014,6079,6148,6247,6318,6377,6435,6492,6551,6615,6686,6758,6830,6902,6974,7041,7109,7177,7236,7299,7363,7453,7544,7604,7670,7737,7803,7873,7937,7990,8057,8118,8185,8298,8356,8419,8484,8549,8624,8697,8769,8818,8879,8940,9001,9063,9127,9191,9255,9320,9383,9443,9504,9570,9629,9689,9751,9822,9882,9950,10036,10123,10213,10300,10388,10470,10553,10643,10734,10786,10844,10889,10955,11019,11076,11133,11187,11244,11292,11341,11392,11426,11473,11522,11568,11600,11664,11726,11786,11843,11917,11987,12065,12119,12189,12274,12322,12368,12429,12492,12558,12622,12693,12756,12821,12885,12946,13007,13059,13132,13206,13275,13350,13424,13498,13639,13709,13762,13840,13930,14018,14114,14204,14786,14875,15122,15403,15655,15940,16333,16810,17032,17254,17530,17757,17987,18217,18447,18677,18904,19323,19549,19974,20204,20632,20851,21134,21342,21473,21700,22126,22351,22778,22999,23424,23544,23820,24121,24445,24736,25050,25187,25318,25423,25665,25832,26036,26244,26515,26627,26739,26844,26961,27175,27321,27461,27547,27895,27983,28229,28647,28896,28978,29076,29693,29793,30045,30469,30724,30818,30907,31144,33196,33438,33540,33793,35977,47101,48617,59840,61368,63125,63751,64171,65232,66497,66753,66989,67536,68030,68635,68833,69413,69977,70352,70470,71008,71165,71361,71634,71890,72060,72201,72265,72630,72997,73673,73937,74275,74628,74722,74908,75214,75476,75601,75728,75967,76178,76297,76490,76667,77122,77303,77425,77684,77797,77984,78086,78193,78322,78597,79105,79601,80478,80772,81342,81491,82223,82395,82479,82815,82907,83185,88594,94146,94208,94838,95452,95543,95656,95885,96045,96197,96368,96534,96703,96870,97033,97276,97446,97619,97790,98064,98263,98468,98798,98882,98978,99074,99172,99272,99374,99476,99578,99680,99782,99882,99978,100090,100219,100342,100473,100604,100702,100816,100910,101050,101184,101280,101392,101492,101608,101704,101816,101916,102056,102192,102356,102486,102644,102794,102935,103079,103214,103326,103476,103604,103732,103868,104000,104130,104260,104372,104512,104658,104802,104940,105006,105096,105172,105276,105366,105468,105576,105684,105784,105864,105956,106054,106164,106242,106348,106440,106544,106654,106776,106939,107096,107176,107276,107366,107476,107566,107807,107901,108007,108099,108199,108311,108425,108541,108657,108751,108865,108977,109079,109199,109321,109403,109507,109627,109753,109851,109945,110033,110145,110261,110383,110495,110670,110786,110872,110964,111076,111200,111267,111393,111461,111589,111733,111861,111930,112025,112140,112253,112352,112461,112572,112683,112784,112889,112989,113119,113210,113333,113427,113539,113625,113729,113825,113913,114031,114135,114239,114365,114453,114561,114661,114751,114861,114945,115047,115131,115185,115249,115355,115441,115551,115635,115755,120899,121017,121132,121264,121979,122671,123188,124787,126320,126708,131443,151705,151965,153475,154508,156521,156783,157139,157969,164751,165885,166179,166402,166729,168779,169427,173278,174480,178559,179774,181183",
+ "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,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,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,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,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,217,218,222,226,230,235,241,248,252,256,261,265,269,273,277,281,285,291,295,301,305,311,315,320,324,327,331,337,341,347,351,357,360,364,368,372,376,380,381,382,383,386,389,392,395,399,400,401,402,403,406,408,410,412,417,418,422,428,432,433,435,446,447,451,457,461,462,463,467,494,498,499,503,531,702,728,900,926,957,965,971,985,1007,1012,1017,1027,1036,1045,1049,1056,1064,1071,1072,1081,1084,1087,1091,1095,1099,1102,1103,1108,1113,1123,1128,1135,1141,1142,1145,1149,1154,1156,1158,1161,1164,1166,1170,1173,1180,1183,1186,1190,1192,1196,1198,1200,1202,1206,1214,1222,1234,1240,1249,1252,1263,1266,1267,1272,1273,1278,1347,1417,1418,1428,1437,1438,1440,1444,1447,1450,1453,1456,1459,1462,1465,1469,1472,1475,1478,1482,1485,1489,1493,1494,1495,1496,1497,1498,1499,1500,1501,1502,1503,1504,1505,1506,1507,1508,1509,1510,1511,1512,1513,1515,1517,1518,1519,1520,1521,1522,1523,1524,1526,1527,1529,1530,1532,1534,1535,1537,1538,1539,1540,1541,1542,1544,1545,1546,1547,1548,1549,1551,1553,1555,1556,1557,1558,1559,1560,1561,1562,1563,1564,1565,1566,1567,1569,1570,1571,1572,1573,1574,1576,1580,1584,1585,1586,1587,1588,1589,1593,1594,1595,1596,1598,1600,1602,1604,1606,1607,1608,1609,1611,1613,1615,1616,1617,1618,1619,1620,1621,1622,1623,1624,1625,1626,1629,1630,1631,1632,1634,1636,1637,1639,1640,1642,1644,1646,1647,1648,1649,1650,1651,1652,1653,1654,1655,1656,1657,1659,1660,1661,1662,1664,1665,1666,1667,1668,1670,1672,1674,1676,1677,1678,1679,1680,1681,1682,1683,1684,1685,1686,1687,1688,1689,1690,1691,1774,1777,1780,1783,1797,1808,1818,1848,1875,1884,1959,2356,2361,2389,2407,2443,2449,2455,2478,2619,2639,2645,2649,2655,2692,2704,2770,2794,2863,2882,2908,2917",
+ "endColumns": "54,44,48,40,54,58,61,80,60,74,75,76,77,84,81,75,75,76,77,105,105,78,79,56,57,73,74,64,65,59,60,71,72,66,67,58,58,58,58,58,53,53,52,53,53,53,53,73,78,72,73,70,71,71,72,56,57,72,73,73,74,71,72,69,70,59,60,68,68,69,73,75,63,76,75,76,64,68,76,74,68,67,76,65,60,96,64,68,98,70,58,57,56,58,63,70,71,71,71,71,66,67,67,58,62,63,89,90,59,65,66,65,69,63,52,66,60,66,112,57,62,64,64,74,72,71,48,60,60,60,61,63,63,63,64,62,59,60,65,58,59,61,70,59,67,85,86,89,86,87,81,82,89,90,51,57,44,65,63,56,56,53,56,47,48,50,33,46,48,45,31,63,61,59,56,73,69,77,53,69,84,47,45,60,62,65,63,70,62,64,63,60,60,51,72,73,68,74,73,73,140,69,52,77,89,87,95,89,12,88,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,136,130,104,12,12,12,12,12,111,111,104,116,12,12,12,12,12,87,12,12,12,81,12,12,99,12,12,12,93,88,12,12,12,101,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,117,12,12,12,12,12,12,12,63,12,12,12,12,12,12,93,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,83,12,91,12,12,12,61,12,12,90,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,83,95,95,97,99,101,101,101,101,101,99,95,111,128,122,130,130,97,113,93,12,12,95,111,99,115,95,111,99,12,135,12,129,12,12,140,12,134,111,149,127,127,12,131,129,129,111,139,12,12,12,65,89,75,103,89,101,107,107,99,79,91,97,12,77,105,91,103,109,12,12,12,79,99,89,109,89,12,93,105,91,12,12,12,12,12,93,113,111,12,12,12,81,103,119,125,97,93,87,111,115,121,111,12,115,85,91,12,12,66,12,67,12,12,12,68,94,114,112,98,108,110,110,100,104,99,12,90,122,93,12,85,103,95,87,12,12,12,12,87,107,99,89,109,83,101,83,53,63,105,85,109,83,119,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24",
+ "endOffsets": "155,200,249,290,345,404,466,547,608,683,759,836,914,999,1081,1157,1233,1310,1388,1494,1600,1679,1759,1816,1874,1948,2023,2088,2154,2214,2275,2347,2420,2487,2555,2614,2673,2732,2791,2850,2904,2958,3011,3065,3119,3173,3227,3301,3380,3453,3527,3598,3670,3742,3815,3872,3930,4003,4077,4151,4226,4298,4371,4441,4512,4572,4633,4702,4771,4841,4915,4991,5055,5132,5208,5285,5350,5419,5496,5571,5640,5708,5785,5851,5912,6009,6074,6143,6242,6313,6372,6430,6487,6546,6610,6681,6753,6825,6897,6969,7036,7104,7172,7231,7294,7358,7448,7539,7599,7665,7732,7798,7868,7932,7985,8052,8113,8180,8293,8351,8414,8479,8544,8619,8692,8764,8813,8874,8935,8996,9058,9122,9186,9250,9315,9378,9438,9499,9565,9624,9684,9746,9817,9877,9945,10031,10118,10208,10295,10383,10465,10548,10638,10729,10781,10839,10884,10950,11014,11071,11128,11182,11239,11287,11336,11387,11421,11468,11517,11563,11595,11659,11721,11781,11838,11912,11982,12060,12114,12184,12269,12317,12363,12424,12487,12553,12617,12688,12751,12816,12880,12941,13002,13054,13127,13201,13270,13345,13419,13493,13634,13704,13757,13835,13925,14013,14109,14199,14781,14870,15117,15398,15650,15935,16328,16805,17027,17249,17525,17752,17982,18212,18442,18672,18899,19318,19544,19969,20199,20627,20846,21129,21337,21468,21695,22121,22346,22773,22994,23419,23539,23815,24116,24440,24731,25045,25182,25313,25418,25660,25827,26031,26239,26510,26622,26734,26839,26956,27170,27316,27456,27542,27890,27978,28224,28642,28891,28973,29071,29688,29788,30040,30464,30719,30813,30902,31139,33191,33433,33535,33788,35972,47096,48612,59835,61363,63120,63746,64166,65227,66492,66748,66984,67531,68025,68630,68828,69408,69972,70347,70465,71003,71160,71356,71629,71885,72055,72196,72260,72625,72992,73668,73932,74270,74623,74717,74903,75209,75471,75596,75723,75962,76173,76292,76485,76662,77117,77298,77420,77679,77792,77979,78081,78188,78317,78592,79100,79596,80473,80767,81337,81486,82218,82390,82474,82810,82902,83180,88589,94141,94203,94833,95447,95538,95651,95880,96040,96192,96363,96529,96698,96865,97028,97271,97441,97614,97785,98059,98258,98463,98793,98877,98973,99069,99167,99267,99369,99471,99573,99675,99777,99877,99973,100085,100214,100337,100468,100599,100697,100811,100905,101045,101179,101275,101387,101487,101603,101699,101811,101911,102051,102187,102351,102481,102639,102789,102930,103074,103209,103321,103471,103599,103727,103863,103995,104125,104255,104367,104507,104653,104797,104935,105001,105091,105167,105271,105361,105463,105571,105679,105779,105859,105951,106049,106159,106237,106343,106435,106539,106649,106771,106934,107091,107171,107271,107361,107471,107561,107802,107896,108002,108094,108194,108306,108420,108536,108652,108746,108860,108972,109074,109194,109316,109398,109502,109622,109748,109846,109940,110028,110140,110256,110378,110490,110665,110781,110867,110959,111071,111195,111262,111388,111456,111584,111728,111856,111925,112020,112135,112248,112347,112456,112567,112678,112779,112884,112984,113114,113205,113328,113422,113534,113620,113724,113820,113908,114026,114130,114234,114360,114448,114556,114656,114746,114856,114940,115042,115126,115180,115244,115350,115436,115546,115630,115750,120894,121012,121127,121259,121974,122666,123183,124782,126315,126703,131438,151700,151960,153470,154503,156516,156778,157134,157964,164746,165880,166174,166397,166724,168774,169422,173273,174475,178554,179769,181178,181652"
},
"to": {
+<<<<<<< HEAD
"startLines": "53",
"startColumns": "4",
"startOffsets": "6257",
"endColumns": "100",
"endOffsets": "6353"
+=======
+ "startLines": "25,31,33,83,85,86,87,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,109,110,161,162,163,164,165,166,167,168,169,170,172,173,174,175,176,177,178,179,180,181,182,183,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,354,355,359,360,361,362,363,364,365,539,540,541,542,543,544,545,546,582,583,584,585,588,596,597,602,622,624,625,628,629,650,651,652,653,654,655,656,657,658,659,660,661,662,663,664,665,666,667,668,669,670,671,672,673,674,675,676,767,770,771,772,773,774,797,805,806,810,814,825,830,858,865,869,873,878,882,886,890,894,898,902,908,912,918,922,928,932,937,941,944,948,954,958,964,968,974,977,981,985,989,993,997,998,999,1000,1003,1006,1009,1012,1016,1017,1018,1019,1057,1060,1062,1064,1066,1071,1072,1076,1082,1086,1087,1089,1100,1101,1105,1111,1115,1170,1171,1175,1202,1206,1207,1211,1749,1920,1946,2118,2144,2175,2183,2189,2203,2225,2230,2235,2245,2254,2263,2267,2274,2282,2289,2290,2299,2302,2305,2309,2313,2317,2320,2321,2326,2331,2341,2346,2353,2359,2360,2363,2367,2372,2374,2376,2379,2382,2384,2388,2391,2398,2401,2404,2408,2410,2414,2416,2418,2420,2424,2432,2440,2452,2458,2467,2470,2481,2484,2485,2490,2491,2681,2750,2824,2825,2835,2844,2845,2847,2851,2854,2857,2860,2863,2866,2869,2872,2876,2879,2882,2885,2889,2892,2896,3013,3014,3015,3016,3017,3018,3019,3020,3021,3022,3023,3024,3025,3026,3027,3028,3029,3030,3031,3032,3033,3035,3037,3038,3039,3040,3041,3042,3043,3044,3046,3047,3049,3050,3052,3054,3055,3057,3058,3059,3060,3061,3062,3064,3065,3066,3067,3068,3196,3198,3200,3202,3203,3204,3205,3206,3207,3208,3209,3210,3211,3212,3213,3214,3216,3217,3218,3219,3220,3221,3223,3227,3350,3351,3352,3353,3354,3355,3359,3360,3361,3512,3514,3516,3518,3520,3522,3523,3524,3525,3527,3529,3531,3532,3533,3534,3535,3536,3537,3538,3539,3540,3541,3542,3545,3546,3547,3548,3550,3552,3553,3555,3556,3558,3560,3562,3563,3564,3565,3566,3567,3568,3569,3570,3571,3572,3573,3575,3576,3577,3578,3580,3581,3582,3583,3584,3586,3588,3590,3592,3593,3594,3595,3596,3597,3598,3599,3600,3601,3602,3603,3604,3605,3606,4280,4363,4366,4369,4372,4386,4397,4528,4558,4585,4594,4669,5210,5487,5614,5828,5864,5870,6052,6075,6216,6284,6290,6294,6336,6453,6497,6662,6906,6975,6994,7023",
+ "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,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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": "1339,1669,1767,4772,4872,4927,4986,5110,5191,5252,5327,5403,5480,5558,5643,5725,5801,5877,5954,6032,6138,6244,6323,6652,6709,10254,10328,10403,10468,10534,10594,10655,10727,10800,10867,10992,11051,11110,11169,11228,11287,11341,11395,11448,11502,11556,11610,12450,12524,12603,12676,12750,12821,12893,12965,13038,13095,13153,13226,13300,13374,13449,13521,13594,13664,13735,13795,13856,13925,13994,14064,14138,14214,14278,14355,14431,14508,14573,14642,14719,14794,14863,14931,15008,15074,15135,15232,15297,15366,15465,15536,15595,15653,15710,15769,15833,15904,15976,16048,16120,16192,16259,16327,16395,16454,16517,16581,16671,16762,16822,16888,16955,17021,17091,17155,17208,17275,17336,17403,17516,17574,17637,17702,17767,17842,17915,17987,18036,18097,18158,18219,18281,18345,18409,18473,18538,18601,18661,18722,18788,18847,18907,18969,19040,19100,23091,23177,23427,23517,23604,23692,23774,23857,23947,35417,35469,35527,35572,35638,35702,35759,35816,37993,38050,38098,38147,38285,38674,38721,38960,39975,40055,40119,40309,40369,41756,41830,41900,41978,42032,42102,42187,42235,42281,42342,42405,42471,42535,42606,42669,42734,42798,42859,42920,42972,43045,43119,43188,43263,43337,43411,43552,56046,56235,56313,56403,56491,56587,57951,58533,58622,58869,59150,59816,60101,61849,62326,62548,62770,63046,63273,63503,63733,63963,64193,64420,64839,65065,65490,65720,66148,66367,66650,66858,66989,67216,67642,67867,68294,68515,68940,69060,69336,69637,69961,70252,70566,70703,70834,70939,71181,71348,71552,71760,72031,72143,72255,72360,74417,74631,74777,74917,75003,75351,75439,75685,76103,76352,76434,76532,77149,77249,77501,77925,78180,82172,82261,82498,84550,84792,84894,85147,122380,133504,135020,146243,147771,149528,150154,150574,151635,152900,153156,153392,153939,154433,155038,155236,155816,156380,156755,156873,157411,157568,157764,158037,158293,158463,158604,158668,159033,159400,160076,160340,160678,161031,161125,161311,161617,161879,162004,162131,162370,162581,162700,162893,163070,163525,163706,163828,164087,164200,164387,164489,164596,164725,165000,165508,166004,166881,167175,167745,167894,168626,168798,168882,169218,169310,180603,186012,191908,191970,192600,193214,193305,193418,193647,193807,193959,194130,194296,194465,194632,194795,195038,195208,195381,195552,195826,196025,196230,203016,203100,203196,203292,203390,203490,203592,203694,203796,203898,204000,204100,204196,204308,204437,204560,204691,204822,204920,205034,205128,205268,205402,205498,205610,205710,205826,205922,206034,206134,206274,206410,206574,206704,206862,207012,207153,207297,207432,207544,207694,207822,207950,208086,208218,208348,208478,208590,216180,216326,216470,216608,216674,216764,216840,216944,217034,217136,217244,217352,217452,217532,217624,217722,217832,217910,218016,218108,218212,218322,218444,218607,227968,228048,228148,228238,228348,228438,228679,228773,228879,239458,239558,239670,239784,239900,240016,240110,240224,240336,240438,240558,240680,240762,240866,240986,241112,241210,241304,241392,241504,241620,241742,241854,242029,242145,242231,242323,242435,242559,242626,242752,242820,242948,243092,243220,243289,243384,243499,243612,243711,243820,243931,244042,244143,244248,244348,244478,244569,244692,244786,244898,244984,245088,245184,245272,245390,245494,245598,245724,245812,245920,246020,246110,246220,246304,246406,246490,246544,246608,246714,246800,246910,246994,288525,293669,293787,293902,294034,294749,295441,302970,304569,306102,306490,311225,339846,354766,362095,374140,376153,376415,385235,386065,392847,397202,397496,397719,399944,405491,408042,417235,430793,434872,436087,437606",
+ "endLines": "25,31,33,83,85,86,87,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,109,110,161,162,163,164,165,166,167,168,169,170,172,173,174,175,176,177,178,179,180,181,182,183,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,354,355,359,360,361,362,363,364,365,539,540,541,542,543,544,545,546,582,583,584,585,588,596,597,602,622,624,625,628,629,650,651,652,653,654,655,656,657,658,659,660,661,662,663,664,665,666,667,668,669,670,671,672,673,674,675,676,767,770,771,772,773,774,804,805,809,813,817,829,835,864,868,872,877,881,885,889,893,897,901,907,911,917,921,927,931,936,940,943,947,953,957,963,967,973,976,980,984,988,992,996,997,998,999,1002,1005,1008,1011,1015,1016,1017,1018,1019,1059,1061,1063,1065,1070,1071,1075,1081,1085,1086,1088,1099,1100,1104,1110,1114,1115,1170,1174,1201,1205,1206,1210,1238,1919,1945,2117,2143,2174,2182,2188,2202,2224,2229,2234,2244,2253,2262,2266,2273,2281,2288,2289,2298,2301,2304,2308,2312,2316,2319,2320,2325,2330,2340,2345,2352,2358,2359,2362,2366,2371,2373,2375,2378,2381,2383,2387,2390,2397,2400,2403,2407,2409,2413,2415,2417,2419,2423,2431,2439,2451,2457,2466,2469,2480,2483,2484,2489,2490,2495,2749,2819,2824,2834,2843,2844,2846,2850,2853,2856,2859,2862,2865,2868,2871,2875,2878,2881,2884,2888,2891,2895,2899,3013,3014,3015,3016,3017,3018,3019,3020,3021,3022,3023,3024,3025,3026,3027,3028,3029,3030,3031,3032,3034,3036,3037,3038,3039,3040,3041,3042,3043,3045,3046,3048,3049,3051,3053,3054,3056,3057,3058,3059,3060,3061,3063,3064,3065,3066,3067,3068,3197,3199,3201,3202,3203,3204,3205,3206,3207,3208,3209,3210,3211,3212,3213,3215,3216,3217,3218,3219,3220,3222,3226,3230,3350,3351,3352,3353,3354,3358,3359,3360,3361,3513,3515,3517,3519,3521,3522,3523,3524,3526,3528,3530,3531,3532,3533,3534,3535,3536,3537,3538,3539,3540,3541,3544,3545,3546,3547,3549,3551,3552,3554,3555,3557,3559,3561,3562,3563,3564,3565,3566,3567,3568,3569,3570,3571,3572,3574,3575,3576,3577,3579,3580,3581,3582,3583,3585,3587,3589,3591,3592,3593,3594,3595,3596,3597,3598,3599,3600,3601,3602,3603,3604,3605,3606,4362,4365,4368,4371,4385,4396,4406,4557,4584,4593,4668,5065,5214,5514,5631,5863,5869,5875,6074,6215,6235,6289,6293,6299,6372,6464,6562,6685,6974,6993,7019,7031",
+ "endColumns": "54,44,48,40,54,58,61,80,60,74,75,76,77,84,81,75,75,76,77,105,105,78,79,56,57,73,74,64,65,59,60,71,72,66,67,58,58,58,58,58,53,53,52,53,53,53,53,73,78,72,73,70,71,71,72,56,57,72,73,73,74,71,72,69,70,59,60,68,68,69,73,75,63,76,75,76,64,68,76,74,68,67,76,65,60,96,64,68,98,70,58,57,56,58,63,70,71,71,71,71,66,67,67,58,62,63,89,90,59,65,66,65,69,63,52,66,60,66,112,57,62,64,64,74,72,71,48,60,60,60,61,63,63,63,64,62,59,60,65,58,59,61,70,59,67,85,86,89,86,87,81,82,89,90,51,57,44,65,63,56,56,53,56,47,48,50,33,46,48,45,31,63,61,59,56,73,69,77,53,69,84,47,45,60,62,65,63,70,62,64,63,60,60,51,72,73,68,74,73,73,140,69,52,77,89,87,95,89,12,88,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,136,130,104,12,12,12,12,12,111,111,104,116,12,12,12,12,12,87,12,12,12,81,12,12,99,12,12,12,93,88,12,12,12,101,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,117,12,12,12,12,12,12,12,63,12,12,12,12,12,12,93,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,83,12,91,12,12,12,61,12,12,90,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,83,95,95,97,99,101,101,101,101,101,99,95,111,128,122,130,130,97,113,93,12,12,95,111,99,115,95,111,99,12,135,12,129,12,12,140,12,134,111,149,127,127,12,131,129,129,111,139,12,12,12,65,89,75,103,89,101,107,107,99,79,91,97,12,77,105,91,103,109,12,12,12,79,99,89,109,89,12,93,105,91,12,12,12,12,12,93,113,111,12,12,12,81,103,119,125,97,93,87,111,115,121,111,12,115,85,91,12,12,66,12,67,12,12,12,68,94,114,112,98,108,110,110,100,104,99,12,90,122,93,12,85,103,95,87,12,12,12,12,87,107,99,89,109,83,101,83,53,63,105,85,109,83,119,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24",
+ "endOffsets": "1389,1709,1811,4808,4922,4981,5043,5186,5247,5322,5398,5475,5553,5638,5720,5796,5872,5949,6027,6133,6239,6318,6398,6704,6762,10323,10398,10463,10529,10589,10650,10722,10795,10862,10930,11046,11105,11164,11223,11282,11336,11390,11443,11497,11551,11605,11659,12519,12598,12671,12745,12816,12888,12960,13033,13090,13148,13221,13295,13369,13444,13516,13589,13659,13730,13790,13851,13920,13989,14059,14133,14209,14273,14350,14426,14503,14568,14637,14714,14789,14858,14926,15003,15069,15130,15227,15292,15361,15460,15531,15590,15648,15705,15764,15828,15899,15971,16043,16115,16187,16254,16322,16390,16449,16512,16576,16666,16757,16817,16883,16950,17016,17086,17150,17203,17270,17331,17398,17511,17569,17632,17697,17762,17837,17910,17982,18031,18092,18153,18214,18276,18340,18404,18468,18533,18596,18656,18717,18783,18842,18902,18964,19035,19095,19163,23172,23259,23512,23599,23687,23769,23852,23942,24033,35464,35522,35567,35633,35697,35754,35811,35865,38045,38093,38142,38193,38314,38716,38765,39001,40002,40114,40176,40364,40421,41825,41895,41973,42027,42097,42182,42230,42276,42337,42400,42466,42530,42601,42664,42729,42793,42854,42915,42967,43040,43114,43183,43258,43332,43406,43547,43617,56094,56308,56398,56486,56582,56672,58528,58617,58864,59145,59397,60096,60489,62321,62543,62765,63041,63268,63498,63728,63958,64188,64415,64834,65060,65485,65715,66143,66362,66645,66853,66984,67211,67637,67862,68289,68510,68935,69055,69331,69632,69956,70247,70561,70698,70829,70934,71176,71343,71547,71755,72026,72138,72250,72355,72472,74626,74772,74912,74998,75346,75434,75680,76098,76347,76429,76527,77144,77244,77496,77920,78175,78269,82256,82493,84545,84787,84889,85142,87326,133499,135015,146238,147766,149523,150149,150569,151630,152895,153151,153387,153934,154428,155033,155231,155811,156375,156750,156868,157406,157563,157759,158032,158288,158458,158599,158663,159028,159395,160071,160335,160673,161026,161120,161306,161612,161874,161999,162126,162365,162576,162695,162888,163065,163520,163701,163823,164082,164195,164382,164484,164591,164720,164995,165503,165999,166876,167170,167740,167889,168621,168793,168877,169213,169305,169583,186007,191559,191965,192595,193209,193300,193413,193642,193802,193954,194125,194291,194460,194627,194790,195033,195203,195376,195547,195821,196020,196225,196555,203095,203191,203287,203385,203485,203587,203689,203791,203893,203995,204095,204191,204303,204432,204555,204686,204817,204915,205029,205123,205263,205397,205493,205605,205705,205821,205917,206029,206129,206269,206405,206569,206699,206857,207007,207148,207292,207427,207539,207689,207817,207945,208081,208213,208343,208473,208585,208725,216321,216465,216603,216669,216759,216835,216939,217029,217131,217239,217347,217447,217527,217619,217717,217827,217905,218011,218103,218207,218317,218439,218602,218759,228043,228143,228233,228343,228433,228674,228768,228874,228966,239553,239665,239779,239895,240011,240105,240219,240331,240433,240553,240675,240757,240861,240981,241107,241205,241299,241387,241499,241615,241737,241849,242024,242140,242226,242318,242430,242554,242621,242747,242815,242943,243087,243215,243284,243379,243494,243607,243706,243815,243926,244037,244138,244243,244343,244473,244564,244687,244781,244893,244979,245083,245179,245267,245385,245489,245593,245719,245807,245915,246015,246105,246215,246299,246401,246485,246539,246603,246709,246795,246905,246989,247109,293664,293782,293897,294029,294744,295436,295953,304564,306097,306485,311220,331482,340101,356271,363123,376148,376410,376766,386060,392842,393976,397491,397714,398041,401989,406134,411888,418432,434867,436082,437491,438075"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values\\values.xml",
+ "from": {
+ "startLines": "2,3,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,66,67,68,69,70,71,72,73,74,75,76,77,78,79,83,84,88,89,90,91,98,141,173,210",
+ "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",
+ "startOffsets": "55,124,319,389,457,529,599,660,734,807,868,929,991,1055,1117,1178,1246,1346,1406,1472,1545,1614,1671,1723,1785,1857,1933,1998,2057,2116,2176,2236,2296,2356,2416,2476,2536,2596,2656,2716,2775,2835,2895,2955,3015,3075,3135,3195,3255,3315,3375,3434,3494,3554,3613,3672,3731,3790,3849,3908,3943,3978,4033,4096,4151,4209,4266,4316,4377,4434,4468,4503,4538,4608,4679,4796,4997,5107,5308,5437,5509,5576,5874,8780,10845,12605",
+ "endLines": "2,3,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,66,67,68,69,70,71,72,73,74,75,76,77,78,82,83,87,88,89,90,97,140,172,209,216",
+ "endColumns": "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,56,49,60,56,33,34,34,69,70,116,12,109,12,128,71,66,24,24,24,24,24",
+ "endOffsets": "119,182,384,452,524,594,655,729,802,863,924,986,1050,1112,1173,1241,1341,1401,1467,1540,1609,1666,1718,1780,1852,1928,1993,2052,2111,2171,2231,2291,2351,2411,2471,2531,2591,2651,2711,2770,2830,2890,2950,3010,3070,3130,3190,3250,3310,3370,3429,3489,3549,3608,3667,3726,3785,3844,3903,3938,3973,4028,4091,4146,4204,4261,4311,4372,4429,4463,4498,4533,4603,4674,4791,4992,5102,5303,5432,5504,5571,5869,8775,10840,12600,12977"
+ },
+ "to": {
+ "startLines": "192,193,300,301,302,303,304,305,306,519,520,521,522,523,524,525,526,527,528,529,530,531,532,533,547,548,549,550,551,552,553,554,555,556,557,558,559,560,561,562,563,564,565,566,567,568,569,570,571,572,573,574,575,576,577,578,579,580,581,590,591,603,604,605,606,607,608,609,610,611,612,616,645,768,3069,3070,3075,3078,3083,3607,3608,5480,5704,5747,5784,5821",
+ "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",
+ "startOffsets": "12229,12298,19593,19663,19731,19803,19873,19934,20008,34162,34223,34284,34346,34410,34472,34533,34601,34701,34761,34827,34900,34969,35026,35078,35870,35942,36018,36083,36142,36201,36261,36321,36381,36441,36501,36561,36621,36681,36741,36801,36860,36920,36980,37040,37100,37160,37220,37280,37340,37400,37460,37519,37579,37639,37698,37757,37816,37875,37934,38385,38420,39006,39061,39124,39179,39237,39294,39344,39405,39462,39496,39674,41366,56099,208730,208847,209114,209407,209674,247114,247186,354468,366812,369718,372003,373763",
+ "endLines": "192,193,300,301,302,303,304,305,306,519,520,521,522,523,524,525,526,527,528,529,530,531,532,533,547,548,549,550,551,552,553,554,555,556,557,558,559,560,561,562,563,564,565,566,567,568,569,570,571,572,573,574,575,576,577,578,579,580,581,590,591,603,604,605,606,607,608,609,610,611,612,616,645,768,3069,3073,3075,3081,3083,3607,3608,5486,5746,5778,5820,5827",
+ "endColumns": "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,56,49,60,56,33,34,34,69,70,116,12,109,12,128,71,66,24,24,24,24,24",
+ "endOffsets": "12293,12356,19658,19726,19798,19868,19929,20003,20076,34218,34279,34341,34405,34467,34528,34596,34696,34756,34822,34895,34964,35021,35073,35135,35937,36013,36078,36137,36196,36256,36316,36376,36436,36496,36556,36616,36676,36736,36796,36855,36915,36975,37035,37095,37155,37215,37275,37335,37395,37455,37514,37574,37634,37693,37752,37811,37870,37929,37988,38415,38450,39056,39119,39174,39232,39289,39339,39400,39457,39491,39526,39704,41431,56165,208842,209043,209219,209603,209798,247181,247248,354761,369713,371778,373758,374135"
+>>>>>>> origin/feature/pushNotifications
}
}
]
@@ -2516,6 +4806,7 @@
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-bn_values-bn.arsc.flat",
"map": [
{
+<<<<<<< HEAD
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-bn\\values.xml",
"from": {
"startLines": "4",
@@ -2557,10 +4848,61 @@
"startOffsets": "105,213,319,425,514,619,740,823,906,997,1089,1183,1277,1378,1471,1566,1660,1751,1842,1927,2037,2141,2244,2352,2460,2565,2730,2835",
"endColumns": "107,105,105,88,104,120,82,82,90,91,93,93,100,92,94,93,90,90,84,109,103,102,107,107,104,164,104,85",
"endOffsets": "208,314,420,509,614,735,818,901,992,1084,1178,1272,1373,1466,1561,1655,1746,1837,1922,2032,2136,2239,2347,2455,2560,2725,2830,2916"
+=======
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\19593d9c2c700c52ad03572ebfd537d5\\material-1.1.0-rc02\\res\\values\\values.xml",
+ "from": {
+ "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,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,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,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,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,351,352,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384,385,386,387,388,389,390,391,392,393,394,395,396,397,398,399,400,401,402,403,407,411,418,425,433,443,452,461,470,471,472,477,478,482,483,489,493,494,495,496,506,507,508,512,513,519,523,524,525,526,527,593,641,699,747,812,860,908,966,1014,1018,1022,1034,1049,1061,1062,1109,1113,1114,1115,1118,1128,1161,1162,1163,1175,1179,1184,1189,1194,1197,1200,1203,1207,1211,1212,1213,1214,1215,1218,1221,1224,1227,1231,1232,1235,1238,1241,1244,1248,1251,1255,1258,1261,1264,1267,1271,1274,1277,1281,1284,1294,1302,1310,1313,1316,1319,1322,1325,1328,1331,1332,1335,1338,1339,1342,1346,1351,1352,1360,1368,1369,1377,1381,1389,1397,1405,1413,1421,1422,1430,1438,1439,1441,1446,1448,1453,1457,1461,1462,1467,1468,1469,1470,1471,1472,1473,1474,1475,1476,1477,1478,1479,1480,1481,1482,1483,1484,1485,1486,1487,1491,1492,1493,1499,1500,1504,1506,1507,1510,1515,1516,1517,1518,1519,1520,1524,1525,1526,1532,1533,1537,1539,1542,1546,1550,1554,1558,1559,1560,1561,1569,1577,1580,1585,1590,1595,1600,1604,1608,1617,1625,1626,1627,1628,1629,1637,1646,1651,1656,1657,1658,1659,1677,1681,1686,1689,1693,1696,1700,1704,1708,1716,1725,1738,1742,1757,1765,1768,1779,1784,1813,1817,1818,1825,1829,1830,1831,1834,1838,1842,1843,1847,1852,1864,1868,1869,1881,1891,1892,1902,1907,1929,1932,1938,1941,1950,1958,1962,1965,1968,1971,1975,1978,1993,1997,2000,2015,2018,2026,2031,2037,2043,2049,2079,2090,2107,2114,2117,2129,2138,2142,2147,2151,2155,2159,2163,2167,2170,2179,2184,2193,2197,2204,2213,2219,2223,2245,2246,2247,2248,2249,2258,2262,2274,2281,2282,2286,2290,2291,2295,2309,2315,2321,2327,2333,2338,2344,2350,2351,2360,2368,2369,2376,2401,2413,2452,2468,2496,2545,2596,2703,2726,2818,2833,2845,2851,2895,2899,2905,2910,2916,2923,2979,2987,2998,3010,3038,3047,3054,3060,3068,3073,3121,3124,3128,3166,3172,3189,3196,3204,3288,3492",
+ "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,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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,187,236,292,352,413,468,518,571,629,677,714,761,810,866,917,966,1020,1074,1123,1179,1226,1282,1342,1403,1456,1501,1554,1606,1664,1729,1777,1843,1901,1970,2028,2098,2172,2240,2307,2377,2443,2516,2576,2636,2696,2755,2812,2870,2928,2974,3034,3102,3171,3239,3292,3344,3390,3440,3487,3545,3603,3662,3722,3784,3846,3908,3970,4032,4094,4162,4223,4285,4347,4400,4454,4513,4575,4649,4720,4786,4860,4929,5000,5073,5144,5212,5285,5361,5431,5509,5577,5643,5704,5773,5837,5903,5971,6037,6100,6168,6239,6304,6377,6440,6521,6585,6651,6721,6791,6861,6931,6998,7063,7129,7182,7258,7324,7411,7487,7563,7610,7675,7725,7779,7858,7936,8009,8074,8137,8203,8274,8345,8407,8476,8542,8602,8669,8736,8792,8843,8896,8948,9002,9073,9136,9195,9257,9316,9389,9456,9516,9579,9654,9726,9822,9893,9949,10020,10077,10134,10200,10264,10335,10392,10445,10508,10560,10618,10685,10769,10854,10935,11003,11080,11153,11223,11295,11365,11438,11502,11572,11620,11689,11741,11799,11865,11932,11998,12079,12154,12210,12263,12324,12382,12432,12481,12530,12579,12641,12693,12738,12819,12873,12926,12980,13031,13080,13131,13192,13253,13315,13365,13406,13465,13524,13583,13644,13700,13756,13823,13884,13949,14004,14069,14138,14206,14284,14353,14413,14484,14558,14623,14695,14765,14832,14916,14985,15052,15122,15185,15252,15320,15403,15482,15572,15649,15717,15784,15862,15919,15976,16044,16110,16166,16226,16285,16339,16389,16439,16487,16549,16600,16673,16753,16833,16897,16960,17027,17098,17156,17217,17283,17342,17409,17469,17529,17592,17660,17721,17788,17866,17936,17985,18042,18111,18172,18260,18348,18436,18524,18580,18667,18754,18841,18928,18986,19042,19113,19178,19240,19315,19388,19457,19527,19596,19690,19759,19860,19911,19969,20039,20108,20178,20248,20318,20385,20460,20527,20586,20651,20707,20765,20827,20872,20915,20962,21007,21058,21106,21172,21234,21297,21369,21426,21489,21546,21606,21671,21738,21803,21860,21921,21979,22049,22106,22426,22576,22707,22805,22920,23007,23055,23134,23199,23288,23445,23602,23755,23909,24087,24269,24451,24633,24823,25013,25212,25385,25495,25680,25817,26037,26221,26381,26539,26723,26926,27097,27317,27539,27694,27901,28085,28188,28329,28494,28665,28865,29069,29271,29476,29677,29876,30080,30158,30459,30625,30780,30882,31159,31444,31834,32290,32799,33341,33806,34268,34739,34832,34939,35282,35389,35618,35739,36148,36380,36480,36585,36704,37238,37385,37504,37739,37872,38287,38525,38637,38758,38891,39038,43839,46880,51134,54189,58897,61901,64921,69091,72109,72361,72626,73686,74533,75352,75443,77574,77784,77893,78012,78196,78772,80753,80848,80879,81749,82035,82438,82840,83183,83395,83596,83809,84098,84383,84456,84543,84628,84727,84847,85008,85171,85332,85497,85550,85683,85803,85901,86014,86207,86333,86569,86711,86881,87037,87209,87500,87612,87741,87970,88188,89043,89630,90244,90412,90554,90715,90858,91026,91183,91378,91470,91643,91805,91900,92069,92312,92605,92719,93128,93542,93658,94076,94317,94747,95182,95592,96014,96424,96546,96955,97371,97493,97561,97905,97985,98341,98491,98635,98719,99096,99194,99302,99396,99526,99634,99756,99892,100000,100120,100254,100376,100504,100646,100772,100912,101038,101156,101288,101386,101496,101780,101892,102010,102474,102590,102877,103003,103099,103229,103618,103728,103852,103990,104100,104222,104518,104642,104772,105248,105376,105675,105813,105959,106121,106337,106493,106697,106765,106849,106953,107483,108082,108240,108459,108690,108913,109148,109370,109636,110228,110827,110941,111085,111197,111321,111892,112490,112985,113531,113676,113769,113861,115222,115610,115908,116097,116303,116496,116706,116923,117184,117616,118140,118784,118981,119929,120486,120609,121382,121603,123184,123419,123543,124051,124265,124368,124498,124673,124920,125111,125251,125445,125715,126416,126704,126834,127599,128244,128390,128951,129189,130612,130762,131179,131344,132030,132500,132696,132858,133013,133157,133391,133558,134332,134618,134778,135393,135552,135880,136107,136472,136843,137204,138984,139613,140658,141178,141330,142320,143057,143260,143506,143753,143995,144316,144621,144844,145016,145557,145826,146320,146581,147021,147766,148131,148436,150136,150242,150372,150510,150634,151270,151571,152326,152765,152889,153130,153318,153452,153643,154422,154691,154982,155261,155578,155800,156095,156378,156482,157129,157694,157814,158311,159935,160646,162694,163357,164824,167745,171053,176058,177196,182884,183592,184279,184663,186741,186972,187276,187496,187803,188233,190986,191461,191990,192485,193800,194291,194722,195095,195437,195645,198866,199003,199238,201092,201397,202318,202739,203055,207660,218947",
+ "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,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,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,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,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,350,351,352,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384,385,386,387,388,389,390,391,392,393,394,395,396,397,398,399,400,401,402,406,410,417,424,432,442,451,460,469,470,471,476,477,481,482,488,492,493,494,495,505,506,507,511,512,518,522,523,524,525,526,592,640,698,746,811,859,907,965,1013,1017,1021,1033,1048,1060,1061,1108,1112,1113,1114,1117,1127,1160,1161,1162,1174,1178,1183,1188,1193,1196,1199,1202,1206,1210,1211,1212,1213,1214,1217,1220,1223,1226,1230,1231,1234,1237,1240,1243,1247,1250,1254,1257,1260,1263,1266,1270,1273,1276,1280,1283,1293,1301,1309,1312,1315,1318,1321,1324,1327,1330,1331,1334,1337,1338,1341,1345,1350,1351,1359,1367,1368,1376,1380,1388,1396,1404,1412,1420,1421,1429,1437,1438,1440,1445,1447,1452,1456,1460,1461,1466,1467,1468,1469,1470,1471,1472,1473,1474,1475,1476,1477,1478,1479,1480,1481,1482,1483,1484,1485,1486,1490,1491,1492,1498,1499,1503,1505,1506,1509,1514,1515,1516,1517,1518,1519,1523,1524,1525,1531,1532,1536,1538,1541,1545,1549,1553,1557,1558,1559,1560,1568,1576,1579,1584,1589,1594,1599,1603,1607,1616,1624,1625,1626,1627,1628,1636,1645,1650,1655,1656,1657,1658,1676,1680,1685,1688,1692,1695,1699,1703,1707,1715,1724,1737,1741,1756,1764,1767,1778,1783,1812,1816,1817,1824,1828,1829,1830,1833,1837,1841,1842,1846,1851,1863,1867,1868,1880,1890,1891,1901,1906,1928,1931,1937,1940,1949,1957,1961,1964,1967,1970,1974,1977,1992,1996,1999,2014,2017,2025,2030,2036,2042,2048,2078,2089,2106,2113,2116,2128,2137,2141,2146,2150,2154,2158,2162,2166,2169,2178,2183,2192,2196,2203,2212,2218,2222,2244,2245,2246,2247,2248,2257,2261,2273,2280,2281,2285,2289,2290,2294,2308,2314,2320,2326,2332,2337,2343,2349,2350,2359,2367,2368,2375,2400,2412,2451,2467,2495,2544,2595,2702,2725,2817,2832,2844,2850,2894,2898,2904,2909,2915,2922,2978,2986,2997,3009,3037,3046,3053,3059,3067,3072,3120,3123,3127,3165,3171,3188,3195,3203,3287,3491,3507",
+ "endColumns": "36,48,55,59,60,54,49,52,57,47,36,46,48,55,50,48,53,53,48,55,46,55,59,60,52,44,52,51,57,64,47,65,57,68,57,69,73,67,66,69,65,72,59,59,59,58,56,57,57,45,59,67,68,67,52,51,45,49,46,57,57,58,59,61,61,61,61,61,61,67,60,61,61,52,53,58,61,73,70,65,73,68,70,72,70,67,72,75,69,77,67,65,60,68,63,65,67,65,62,67,70,64,72,62,80,63,65,69,69,69,69,66,64,65,52,75,65,86,75,75,46,64,49,53,78,77,72,64,62,65,70,70,61,68,65,59,66,66,55,50,52,51,53,70,62,58,61,58,72,66,59,62,74,71,95,70,55,70,56,56,65,63,70,56,52,62,51,57,66,83,84,80,67,76,72,69,71,69,72,63,69,47,68,51,57,65,66,65,80,74,55,52,60,57,49,48,48,48,61,51,44,80,53,52,53,50,48,50,60,60,61,49,40,58,58,58,60,55,55,66,60,64,54,64,68,67,77,68,59,70,73,64,71,69,66,83,68,66,69,62,66,67,82,78,89,76,67,66,77,56,56,67,65,55,59,58,53,49,49,47,61,50,72,79,79,63,62,66,70,57,60,65,58,66,59,59,62,67,60,66,77,69,48,56,68,60,87,87,87,87,55,86,86,86,86,57,55,70,64,61,74,72,68,69,68,93,68,100,50,57,69,68,69,69,69,66,74,66,58,64,55,57,61,44,42,46,44,50,47,65,61,62,71,56,62,56,59,64,66,64,56,60,57,69,56,12,149,130,97,114,86,47,78,64,88,156,156,152,153,177,181,181,181,189,189,198,172,109,184,136,219,183,159,157,183,202,170,219,221,154,206,183,102,140,164,170,199,203,201,204,200,198,203,77,300,165,154,101,10,10,10,10,10,10,10,10,10,92,106,10,106,10,120,10,10,99,104,118,10,146,118,10,132,10,10,111,120,132,146,10,10,10,10,10,10,10,10,10,10,10,10,10,10,90,10,10,108,118,10,10,10,94,30,10,10,10,10,10,10,10,10,10,10,72,86,84,98,10,10,10,10,10,52,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,91,10,10,94,10,10,10,113,10,10,115,10,10,10,10,10,10,10,121,10,10,121,10,10,10,10,10,10,83,10,97,107,93,129,107,121,135,107,119,133,121,127,141,125,139,125,117,131,97,109,10,111,117,10,115,10,10,95,10,10,109,123,137,109,121,10,123,129,10,127,10,10,10,10,10,10,10,67,83,103,10,10,10,10,10,10,10,10,10,10,10,113,143,111,123,10,10,10,10,144,92,91,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,123,10,10,102,129,10,10,10,139,10,10,10,10,129,10,10,145,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,105,129,137,123,10,10,10,10,123,10,10,133,10,10,10,10,10,10,10,10,10,103,10,10,119,10,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22",
+ "endOffsets": "182,231,287,347,408,463,513,566,624,672,709,756,805,861,912,961,1015,1069,1118,1174,1221,1277,1337,1398,1451,1496,1549,1601,1659,1724,1772,1838,1896,1965,2023,2093,2167,2235,2302,2372,2438,2511,2571,2631,2691,2750,2807,2865,2923,2969,3029,3097,3166,3234,3287,3339,3385,3435,3482,3540,3598,3657,3717,3779,3841,3903,3965,4027,4089,4157,4218,4280,4342,4395,4449,4508,4570,4644,4715,4781,4855,4924,4995,5068,5139,5207,5280,5356,5426,5504,5572,5638,5699,5768,5832,5898,5966,6032,6095,6163,6234,6299,6372,6435,6516,6580,6646,6716,6786,6856,6926,6993,7058,7124,7177,7253,7319,7406,7482,7558,7605,7670,7720,7774,7853,7931,8004,8069,8132,8198,8269,8340,8402,8471,8537,8597,8664,8731,8787,8838,8891,8943,8997,9068,9131,9190,9252,9311,9384,9451,9511,9574,9649,9721,9817,9888,9944,10015,10072,10129,10195,10259,10330,10387,10440,10503,10555,10613,10680,10764,10849,10930,10998,11075,11148,11218,11290,11360,11433,11497,11567,11615,11684,11736,11794,11860,11927,11993,12074,12149,12205,12258,12319,12377,12427,12476,12525,12574,12636,12688,12733,12814,12868,12921,12975,13026,13075,13126,13187,13248,13310,13360,13401,13460,13519,13578,13639,13695,13751,13818,13879,13944,13999,14064,14133,14201,14279,14348,14408,14479,14553,14618,14690,14760,14827,14911,14980,15047,15117,15180,15247,15315,15398,15477,15567,15644,15712,15779,15857,15914,15971,16039,16105,16161,16221,16280,16334,16384,16434,16482,16544,16595,16668,16748,16828,16892,16955,17022,17093,17151,17212,17278,17337,17404,17464,17524,17587,17655,17716,17783,17861,17931,17980,18037,18106,18167,18255,18343,18431,18519,18575,18662,18749,18836,18923,18981,19037,19108,19173,19235,19310,19383,19452,19522,19591,19685,19754,19855,19906,19964,20034,20103,20173,20243,20313,20380,20455,20522,20581,20646,20702,20760,20822,20867,20910,20957,21002,21053,21101,21167,21229,21292,21364,21421,21484,21541,21601,21666,21733,21798,21855,21916,21974,22044,22101,22421,22571,22702,22800,22915,23002,23050,23129,23194,23283,23440,23597,23750,23904,24082,24264,24446,24628,24818,25008,25207,25380,25490,25675,25812,26032,26216,26376,26534,26718,26921,27092,27312,27534,27689,27896,28080,28183,28324,28489,28660,28860,29064,29266,29471,29672,29871,30075,30153,30454,30620,30775,30877,31154,31439,31829,32285,32794,33336,33801,34263,34734,34827,34934,35277,35384,35613,35734,36143,36375,36475,36580,36699,37233,37380,37499,37734,37867,38282,38520,38632,38753,38886,39033,43834,46875,51129,54184,58892,61896,64916,69086,72104,72356,72621,73681,74528,75347,75438,77569,77779,77888,78007,78191,78767,80748,80843,80874,81744,82030,82433,82835,83178,83390,83591,83804,84093,84378,84451,84538,84623,84722,84842,85003,85166,85327,85492,85545,85678,85798,85896,86009,86202,86328,86564,86706,86876,87032,87204,87495,87607,87736,87965,88183,89038,89625,90239,90407,90549,90710,90853,91021,91178,91373,91465,91638,91800,91895,92064,92307,92600,92714,93123,93537,93653,94071,94312,94742,95177,95587,96009,96419,96541,96950,97366,97488,97556,97900,97980,98336,98486,98630,98714,99091,99189,99297,99391,99521,99629,99751,99887,99995,100115,100249,100371,100499,100641,100767,100907,101033,101151,101283,101381,101491,101775,101887,102005,102469,102585,102872,102998,103094,103224,103613,103723,103847,103985,104095,104217,104513,104637,104767,105243,105371,105670,105808,105954,106116,106332,106488,106692,106760,106844,106948,107478,108077,108235,108454,108685,108908,109143,109365,109631,110223,110822,110936,111080,111192,111316,111887,112485,112980,113526,113671,113764,113856,115217,115605,115903,116092,116298,116491,116701,116918,117179,117611,118135,118779,118976,119924,120481,120604,121377,121598,123179,123414,123538,124046,124260,124363,124493,124668,124915,125106,125246,125440,125710,126411,126699,126829,127594,128239,128385,128946,129184,130607,130757,131174,131339,132025,132495,132691,132853,133008,133152,133386,133553,134327,134613,134773,135388,135547,135875,136102,136467,136838,137199,138979,139608,140653,141173,141325,142315,143052,143255,143501,143748,143990,144311,144616,144839,145011,145552,145821,146315,146576,147016,147761,148126,148431,150131,150237,150367,150505,150629,151265,151566,152321,152760,152884,153125,153313,153447,153638,154417,154686,154977,155256,155573,155795,156090,156373,156477,157124,157689,157809,158306,159930,160641,162689,163352,164819,167740,171048,176053,177191,182879,183587,184274,184658,186736,186967,187271,187491,187798,188228,190981,191456,191985,192480,193795,194286,194717,195090,195432,195640,198861,198998,199233,201087,201392,202313,202734,203050,207655,218942,220011"
+ },
+ "to": {
+ "startLines": "2,3,4,5,6,7,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,26,27,28,29,30,32,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,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,84,88,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,184,185,186,187,188,189,190,191,293,294,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384,385,386,387,388,389,390,391,392,393,394,395,396,397,398,399,400,401,402,403,404,405,406,407,408,409,410,411,412,413,414,415,416,417,418,419,420,421,422,423,424,425,426,427,428,429,430,431,432,433,434,435,436,437,438,439,440,441,442,443,444,445,446,447,448,449,450,451,452,453,454,455,456,457,458,459,460,461,462,463,464,465,466,467,468,469,470,471,472,473,474,475,476,477,478,479,480,481,482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500,501,502,503,504,505,506,507,508,509,510,511,512,513,514,515,516,517,518,538,592,593,594,600,601,613,614,615,623,626,627,630,631,633,634,635,636,637,638,639,640,641,642,643,644,646,678,679,681,682,683,684,685,707,708,709,710,721,722,723,724,725,726,727,728,729,730,731,732,733,734,735,736,737,738,739,740,741,742,743,744,745,746,747,748,749,750,751,752,753,754,755,756,759,760,761,762,763,775,779,836,843,850,1020,1030,1039,1048,1116,1117,1118,1123,1124,1128,1129,1135,1139,1140,1141,1142,1152,1153,1154,1158,1159,1165,1169,1239,1240,1241,1242,1308,1356,1414,1462,1527,1575,1623,1681,1729,1733,1737,2496,2511,2523,2524,2571,2575,2576,2577,2580,2590,2623,2632,2633,2645,2649,2654,2659,2664,2667,2670,2673,2677,2820,2821,2822,2823,2900,2903,2906,2909,2912,2916,2917,2920,2923,2926,2929,2933,2936,2940,2943,2946,2949,2952,2956,2959,2962,2966,2969,2979,2987,2995,2998,3001,3004,3007,3010,3085,3088,3089,3092,3095,3096,3099,3103,3108,3109,3117,3125,3126,3134,3138,3146,3154,3162,3170,3178,3179,3187,3195,3231,3233,3238,3240,3245,3249,3253,3254,3259,3260,3261,3262,3263,3264,3265,3266,3267,3268,3269,3270,3271,3272,3273,3274,3275,3276,3277,3278,3279,3283,3284,3285,3291,3292,3296,3298,3299,3302,3307,3308,3309,3310,3311,3312,3316,3317,3318,3324,3325,3329,3331,3334,3338,3342,3346,3362,3363,3364,3365,3373,3381,3384,3389,3394,3399,3404,3408,3412,3421,3429,3430,3431,3432,3433,3441,3450,3455,3460,3461,3462,3463,3481,3485,3490,3493,3497,3500,3504,3508,3609,3617,3626,3639,3643,3658,3666,3669,3680,3685,3714,3718,3719,3726,3730,3731,3732,3735,3739,3743,3744,3748,3753,3765,3769,3770,3782,3792,3793,3803,3808,3830,3833,3839,3842,3851,3859,3863,3866,3869,3872,3876,3879,3894,3898,3901,3916,3919,3927,3932,3938,3944,3950,3980,3991,4008,4015,4018,4030,4039,4043,4048,4052,4056,4060,4064,4068,4071,4080,4085,4094,4098,4105,4114,4120,4124,4146,4147,4148,4149,4150,4159,4163,4175,4182,4183,4187,4191,4192,4196,4210,4216,4222,4228,4234,4239,4245,4251,4252,4261,4269,4270,4452,4477,4489,5066,5082,5110,5159,5243,5350,5373,5465,5632,5644,5650,5694,5698,5779,5889,5895,5902,5958,5966,5977,5989,6017,6026,6033,6039,6047,6236,6329,6332,6373,6430,6436,6563,6570,6578,6686,6890",
+ "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,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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,187,236,292,352,413,520,570,623,681,729,766,813,862,918,969,1018,1072,1126,1175,1231,1394,1450,1510,1571,1624,1714,1816,1868,1926,1991,2039,2105,2163,2232,2290,2360,2434,2502,2569,2639,2705,2778,2838,2898,2958,3017,3074,3132,3246,3292,3352,3420,3489,3557,3610,3662,3708,3758,3805,3863,3921,3980,4040,4102,4164,4226,4288,4350,4412,4480,4541,4603,4665,4718,4813,5048,7831,7905,7976,8042,8116,8185,8256,8329,8400,8468,8541,8617,8687,8765,8833,8899,8960,9029,9093,9159,9227,9293,9356,9424,9495,9560,9633,9696,9777,9841,9907,9977,10047,10117,10187,11664,11729,11795,11848,11924,11990,12077,12153,19168,19215,20081,20131,20185,20264,20342,20415,20480,20543,20609,20680,20751,20813,20882,20948,21008,21075,21142,21198,21249,21302,21354,21408,21479,21542,21601,21663,21722,21795,21862,21922,21985,22060,22132,22228,22299,22355,22426,22483,22540,22606,22670,22741,22798,22851,22914,22966,23024,24261,24345,24430,24511,24579,24656,24729,24799,24871,24941,25014,25078,25148,25196,25265,25317,25375,25441,25508,25574,25655,25730,25786,25839,25900,25958,26008,26057,26106,26155,26217,26269,26314,26395,26449,26502,26556,26607,26656,26707,26768,26829,26891,26941,26982,27041,27100,27159,27220,27276,27332,27399,27460,27525,27580,27645,27714,27782,27860,27929,27989,28060,28134,28199,28271,28341,28408,28492,28561,28628,28698,28761,28828,28896,28979,29058,29148,29225,29293,29360,29438,29495,29552,29620,29686,29742,29802,29861,29915,29965,30015,30063,30125,30176,30249,30329,30409,30473,30536,30603,30674,30732,30793,30859,30918,30985,31045,31105,31168,31236,31297,31364,31442,31512,31561,31618,31687,31748,31836,31924,32012,32100,32156,32243,32330,32417,32504,32562,32618,32689,32754,32816,32891,32964,33033,33103,33172,33266,33335,33436,33487,33545,33615,33684,33754,33824,33894,33961,34036,34103,35352,38455,38511,38569,38872,38917,39531,39578,39623,40007,40181,40247,40426,40489,40629,40686,40749,40806,40866,40931,40998,41063,41120,41181,41239,41309,41436,43676,43826,44019,44117,44232,44319,44367,47061,47126,47215,47372,48462,48615,48769,48947,49129,49311,49493,49683,49873,50072,50245,50355,50540,50677,50897,51081,51241,51399,51583,51786,51957,52177,52399,52554,52761,52945,53048,53189,53354,53525,53725,53929,54131,54336,54537,54736,55039,55117,55418,55584,55739,56677,56954,60494,60884,61340,72477,73019,73484,73946,78274,78367,78474,78817,78924,79153,79274,79683,79915,80015,80120,80239,80773,80920,81039,81274,81407,81822,82060,87331,87452,87585,87732,92533,95574,99828,102883,107591,110595,113615,117785,120803,121055,121320,169588,170435,171254,171345,173476,173686,173795,173914,174098,174674,176655,177068,177099,177969,178255,178658,179060,179403,179615,179816,180029,180318,191564,191637,191724,191809,196560,196680,196841,197004,197165,197330,197383,197516,197636,197734,197847,198040,198166,198402,198544,198714,198870,199042,199333,199445,199574,199803,200021,200876,201463,202077,202245,202387,202548,202691,202859,209870,210065,210157,210330,210492,210587,210756,210999,211292,211406,211815,212229,212345,212763,213004,213434,213869,214279,214701,215111,215233,215642,216058,218764,218832,219176,219256,219612,219762,219906,219990,220367,220465,220573,220667,220797,220905,221027,221163,221271,221391,221525,221647,221775,221917,222043,222183,222309,222427,222559,222657,222767,223051,223163,223281,223745,223861,224148,224274,224370,224500,224889,224999,225123,225261,225371,225493,225789,225913,226043,226519,226647,226946,227084,227230,227392,227608,227764,228971,229039,229123,229227,229757,230356,230514,230733,230964,231187,231422,231644,231910,232502,233101,233215,233359,233471,233595,234166,234764,235259,235805,235950,236043,236135,237496,237884,238182,238371,238577,238770,238980,239197,247253,247685,248209,248853,249050,249998,250555,250678,251451,251672,253253,253488,253612,254120,254334,254437,254567,254742,254989,255180,255320,255514,255784,256485,256773,256903,257668,258313,258459,259020,259258,260681,260831,261248,261413,262099,262569,262765,262927,263082,263226,263460,263627,264401,264687,264847,265462,265621,265949,266176,266541,266912,267273,269053,269682,270727,271247,271399,272389,273126,273329,273575,273822,274064,274385,274690,274913,275085,275626,275895,276389,276650,277090,277835,278200,278505,280205,280311,280441,280579,280703,281339,281640,282395,282834,282958,283199,283387,283521,283712,284491,284760,285051,285330,285647,285869,286164,286447,286551,287198,287763,287883,298587,300211,300922,331487,332150,333617,336538,341929,346934,348072,353760,363128,363815,364199,366277,366508,371783,377086,377393,377823,380576,381051,381580,382075,383390,383881,384312,384685,385027,393981,399572,399709,401994,404265,404570,411893,412314,412630,418437,429724",
+ "endLines": "2,3,4,5,6,7,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,26,27,28,29,30,32,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,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,84,88,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,184,185,186,187,188,189,190,191,293,294,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384,385,386,387,388,389,390,391,392,393,394,395,396,397,398,399,400,401,402,403,404,405,406,407,408,409,410,411,412,413,414,415,416,417,418,419,420,421,422,423,424,425,426,427,428,429,430,431,432,433,434,435,436,437,438,439,440,441,442,443,444,445,446,447,448,449,450,451,452,453,454,455,456,457,458,459,460,461,462,463,464,465,466,467,468,469,470,471,472,473,474,475,476,477,478,479,480,481,482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500,501,502,503,504,505,506,507,508,509,510,511,512,513,514,515,516,517,518,538,592,593,594,600,601,613,614,615,623,626,627,630,631,633,634,635,636,637,638,639,640,641,642,643,644,649,678,679,681,682,683,684,685,707,708,709,710,721,722,723,724,725,726,727,728,729,730,731,732,733,734,735,736,737,738,739,740,741,742,743,744,745,746,747,748,749,750,751,752,753,754,755,756,759,760,761,762,763,778,782,842,849,857,1029,1038,1047,1056,1116,1117,1122,1123,1127,1128,1134,1138,1139,1140,1141,1151,1152,1153,1157,1158,1164,1168,1169,1239,1240,1241,1307,1355,1413,1461,1526,1574,1622,1680,1728,1732,1736,1748,2510,2522,2523,2570,2574,2575,2576,2579,2589,2622,2623,2632,2644,2648,2653,2658,2663,2666,2669,2672,2676,2680,2820,2821,2822,2823,2902,2905,2908,2911,2915,2916,2919,2922,2925,2928,2932,2935,2939,2942,2945,2948,2951,2955,2958,2961,2965,2968,2978,2986,2994,2997,3000,3003,3006,3009,3012,3087,3088,3091,3094,3095,3098,3102,3107,3108,3116,3124,3125,3133,3137,3145,3153,3161,3169,3177,3178,3186,3194,3195,3232,3237,3239,3244,3248,3252,3253,3258,3259,3260,3261,3262,3263,3264,3265,3266,3267,3268,3269,3270,3271,3272,3273,3274,3275,3276,3277,3278,3282,3283,3284,3290,3291,3295,3297,3298,3301,3306,3307,3308,3309,3310,3311,3315,3316,3317,3323,3324,3328,3330,3333,3337,3341,3345,3349,3362,3363,3364,3372,3380,3383,3388,3393,3398,3403,3407,3411,3420,3428,3429,3430,3431,3432,3440,3449,3454,3459,3460,3461,3462,3480,3484,3489,3492,3496,3499,3503,3507,3511,3616,3625,3638,3642,3657,3665,3668,3679,3684,3713,3717,3718,3725,3729,3730,3731,3734,3738,3742,3743,3747,3752,3764,3768,3769,3781,3791,3792,3802,3807,3829,3832,3838,3841,3850,3858,3862,3865,3868,3871,3875,3878,3893,3897,3900,3915,3918,3926,3931,3937,3943,3949,3979,3990,4007,4014,4017,4029,4038,4042,4047,4051,4055,4059,4063,4067,4070,4079,4084,4093,4097,4104,4113,4119,4123,4145,4146,4147,4148,4149,4158,4162,4174,4181,4182,4186,4190,4191,4195,4209,4215,4221,4227,4233,4238,4244,4250,4251,4260,4268,4269,4276,4476,4488,4527,5081,5109,5158,5209,5349,5372,5464,5479,5643,5649,5693,5697,5703,5783,5894,5901,5957,5965,5976,5988,6016,6025,6032,6038,6046,6051,6283,6331,6335,6410,6435,6452,6569,6577,6661,6889,6905",
+ "endColumns": "36,48,55,59,60,54,49,52,57,47,36,46,48,55,50,48,53,53,48,55,46,55,59,60,52,44,52,51,57,64,47,65,57,68,57,69,73,67,66,69,65,72,59,59,59,58,56,57,57,45,59,67,68,67,52,51,45,49,46,57,57,58,59,61,61,61,61,61,61,67,60,61,61,52,53,58,61,73,70,65,73,68,70,72,70,67,72,75,69,77,67,65,60,68,63,65,67,65,62,67,70,64,72,62,80,63,65,69,69,69,69,66,64,65,52,75,65,86,75,75,46,64,49,53,78,77,72,64,62,65,70,70,61,68,65,59,66,66,55,50,52,51,53,70,62,58,61,58,72,66,59,62,74,71,95,70,55,70,56,56,65,63,70,56,52,62,51,57,66,83,84,80,67,76,72,69,71,69,72,63,69,47,68,51,57,65,66,65,80,74,55,52,60,57,49,48,48,48,61,51,44,80,53,52,53,50,48,50,60,60,61,49,40,58,58,58,60,55,55,66,60,64,54,64,68,67,77,68,59,70,73,64,71,69,66,83,68,66,69,62,66,67,82,78,89,76,67,66,77,56,56,67,65,55,59,58,53,49,49,47,61,50,72,79,79,63,62,66,70,57,60,65,58,66,59,59,62,67,60,66,77,69,48,56,68,60,87,87,87,87,55,86,86,86,86,57,55,70,64,61,74,72,68,69,68,93,68,100,50,57,69,68,69,69,69,66,74,66,58,64,55,57,61,44,42,46,44,50,47,65,61,62,71,56,62,56,59,64,66,64,56,60,57,69,56,12,149,130,97,114,86,47,78,64,88,156,156,152,153,177,181,181,181,189,189,198,172,109,184,136,219,183,159,157,183,202,170,219,221,154,206,183,102,140,164,170,199,203,201,204,200,198,203,77,300,165,154,101,10,10,10,10,10,10,10,10,10,92,106,10,106,10,120,10,10,99,104,118,10,146,118,10,132,10,10,111,120,132,146,10,10,10,10,10,10,10,10,10,10,10,10,10,10,90,10,10,108,118,10,10,10,94,30,10,10,10,10,10,10,10,10,10,10,72,86,84,98,10,10,10,10,10,52,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,91,10,10,94,10,10,10,113,10,10,115,10,10,10,10,10,10,10,121,10,10,121,10,10,10,10,10,10,83,10,97,107,93,129,107,121,135,107,119,133,121,127,141,125,139,125,117,131,97,109,10,111,117,10,115,10,10,95,10,10,109,123,137,109,121,10,123,129,10,127,10,10,10,10,10,10,10,67,83,103,10,10,10,10,10,10,10,10,10,10,10,113,143,111,123,10,10,10,10,144,92,91,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,123,10,10,102,129,10,10,10,139,10,10,10,10,129,10,10,145,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,105,129,137,123,10,10,10,10,123,10,10,133,10,10,10,10,10,10,10,10,10,103,10,10,119,10,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22",
+ "endOffsets": "182,231,287,347,408,463,565,618,676,724,761,808,857,913,964,1013,1067,1121,1170,1226,1273,1445,1505,1566,1619,1664,1762,1863,1921,1986,2034,2100,2158,2227,2285,2355,2429,2497,2564,2634,2700,2773,2833,2893,2953,3012,3069,3127,3185,3287,3347,3415,3484,3552,3605,3657,3703,3753,3800,3858,3916,3975,4035,4097,4159,4221,4283,4345,4407,4475,4536,4598,4660,4713,4767,4867,5105,7900,7971,8037,8111,8180,8251,8324,8395,8463,8536,8612,8682,8760,8828,8894,8955,9024,9088,9154,9222,9288,9351,9419,9490,9555,9628,9691,9772,9836,9902,9972,10042,10112,10182,10249,11724,11790,11843,11919,11985,12072,12148,12224,19210,19275,20126,20180,20259,20337,20410,20475,20538,20604,20675,20746,20808,20877,20943,21003,21070,21137,21193,21244,21297,21349,21403,21474,21537,21596,21658,21717,21790,21857,21917,21980,22055,22127,22223,22294,22350,22421,22478,22535,22601,22665,22736,22793,22846,22909,22961,23019,23086,24340,24425,24506,24574,24651,24724,24794,24866,24936,25009,25073,25143,25191,25260,25312,25370,25436,25503,25569,25650,25725,25781,25834,25895,25953,26003,26052,26101,26150,26212,26264,26309,26390,26444,26497,26551,26602,26651,26702,26763,26824,26886,26936,26977,27036,27095,27154,27215,27271,27327,27394,27455,27520,27575,27640,27709,27777,27855,27924,27984,28055,28129,28194,28266,28336,28403,28487,28556,28623,28693,28756,28823,28891,28974,29053,29143,29220,29288,29355,29433,29490,29547,29615,29681,29737,29797,29856,29910,29960,30010,30058,30120,30171,30244,30324,30404,30468,30531,30598,30669,30727,30788,30854,30913,30980,31040,31100,31163,31231,31292,31359,31437,31507,31556,31613,31682,31743,31831,31919,32007,32095,32151,32238,32325,32412,32499,32557,32613,32684,32749,32811,32886,32959,33028,33098,33167,33261,33330,33431,33482,33540,33610,33679,33749,33819,33889,33956,34031,34098,34157,35412,38506,38564,38626,38912,38955,39573,39618,39669,40050,40242,40304,40484,40556,40681,40744,40801,40861,40926,40993,41058,41115,41176,41234,41304,41361,41751,43821,43952,44112,44227,44314,44362,44441,47121,47210,47367,47524,48610,48764,48942,49124,49306,49488,49678,49868,50067,50240,50350,50535,50672,50892,51076,51236,51394,51578,51781,51952,52172,52394,52549,52756,52940,53043,53184,53349,53520,53720,53924,54126,54331,54532,54731,54935,55112,55413,55579,55734,55836,56949,57234,60879,61335,61844,73014,73479,73941,74412,78362,78469,78812,78919,79148,79269,79678,79910,80010,80115,80234,80768,80915,81034,81269,81402,81817,82055,82167,87447,87580,87727,92528,95569,99823,102878,107586,110590,113610,117780,120798,121050,121315,122375,170430,171249,171340,173471,173681,173790,173909,174093,174669,176650,176745,177094,177964,178250,178653,179055,179398,179610,179811,180024,180313,180598,191632,191719,191804,191903,196675,196836,196999,197160,197325,197378,197511,197631,197729,197842,198035,198161,198397,198539,198709,198865,199037,199328,199440,199569,199798,200016,200871,201458,202072,202240,202382,202543,202686,202854,203011,210060,210152,210325,210487,210582,210751,210994,211287,211401,211810,212224,212340,212758,212999,213429,213864,214274,214696,215106,215228,215637,216053,216175,218827,219171,219251,219607,219757,219901,219985,220362,220460,220568,220662,220792,220900,221022,221158,221266,221386,221520,221642,221770,221912,222038,222178,222304,222422,222554,222652,222762,223046,223158,223276,223740,223856,224143,224269,224365,224495,224884,224994,225118,225256,225366,225488,225784,225908,226038,226514,226642,226941,227079,227225,227387,227603,227759,227963,229034,229118,229222,229752,230351,230509,230728,230959,231182,231417,231639,231905,232497,233096,233210,233354,233466,233590,234161,234759,235254,235800,235945,236038,236130,237491,237879,238177,238366,238572,238765,238975,239192,239453,247680,248204,248848,249045,249993,250550,250673,251446,251667,253248,253483,253607,254115,254329,254432,254562,254737,254984,255175,255315,255509,255779,256480,256768,256898,257663,258308,258454,259015,259253,260676,260826,261243,261408,262094,262564,262760,262922,263077,263221,263455,263622,264396,264682,264842,265457,265616,265944,266171,266536,266907,267268,269048,269677,270722,271242,271394,272384,273121,273324,273570,273817,274059,274380,274685,274908,275080,275621,275890,276384,276645,277085,277830,278195,278500,280200,280306,280436,280574,280698,281334,281635,282390,282829,282953,283194,283382,283516,283707,284486,284755,285046,285325,285642,285864,286159,286442,286546,287193,287758,287878,288375,300206,300917,302965,332145,333612,336533,339841,346929,348067,353755,354463,363810,364194,366272,366503,366807,371998,377388,377818,380571,381046,381575,382070,383385,383876,384307,384680,385022,385230,397197,399704,399939,403843,404565,405486,412309,412625,417230,429719,430788"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-lt_values-lt.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-lt\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "207",
+ "endColumns": "101",
+ "endOffsets": "308"
+ },
+ "to": {
+ "startLines": "51",
+ "startColumns": "4",
+ "startOffsets": "6058",
+ "endColumns": "105",
+ "endOffsets": "6159"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-lt\\values-lt.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,221,325,438,525,627,749,832,913,1007,1102,1199,1295,1399,1495,1593,1689,1783,1877,1959,2068,2176,2276,2386,2491,2597,2773,2874",
+ "endColumns": "115,103,112,86,101,121,82,80,93,94,96,95,103,95,97,95,93,93,81,108,107,99,109,104,105,175,100,82",
+ "endOffsets": "216,320,433,520,622,744,827,908,1002,1097,1194,1290,1394,1490,1588,1684,1778,1872,1954,2063,2171,2271,2381,2486,2592,2768,2869,2952"
+>>>>>>> origin/feature/pushNotifications
},
"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,52",
"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",
+<<<<<<< HEAD
"startOffsets": "105,213,319,425,514,619,740,823,906,997,1089,1183,1277,1378,1471,1566,1660,1751,1842,1927,2037,2141,2244,2352,2460,2565,2730,6021",
"endColumns": "107,105,105,88,104,120,82,82,90,91,93,93,100,92,94,93,90,90,84,109,103,102,107,107,104,164,104,85",
"endOffsets": "208,314,420,509,614,735,818,901,992,1084,1178,1272,1373,1466,1561,1655,1746,1837,1922,2032,2136,2239,2347,2455,2560,2725,2830,6102"
@@ -2585,6 +4927,15 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-bn\\values.xml",
+=======
+ "startOffsets": "105,221,325,438,525,627,749,832,913,1007,1102,1199,1295,1399,1495,1593,1689,1783,1877,1959,2068,2176,2276,2386,2491,2597,2773,6164",
+ "endColumns": "115,103,112,86,101,121,82,80,93,94,96,95,103,95,97,95,93,93,81,108,107,99,109,104,105,175,100,82",
+ "endOffsets": "216,320,433,520,622,744,827,908,1002,1097,1194,1290,1394,1490,1588,1684,1778,1872,1954,2063,2171,2271,2381,2486,2592,2768,2869,6242"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-lt\\values-lt.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
"startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
@@ -2593,6 +4944,7 @@
"endOffsets": "351,542,668,777,973,1093,1231,1360,1564,1671,1858,1984,2177,2351,2437,2530,2645"
},
"to": {
+<<<<<<< HEAD
"startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
"startOffsets": "2835,2946,3137,3267,3380,3576,3700,3842,4186,4390,4501,4688,4818,5011,5189,5279,5376",
@@ -2630,10 +4982,28 @@
"startOffsets": "55,164,272,384",
"endColumns": "108,107,111,105",
"endOffsets": "159,267,379,485"
+=======
+ "startLines": "53",
+ "startColumns": "4",
+ "startOffsets": "6247",
+ "endColumns": "100",
+ "endOffsets": "6343"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-lt\\values-lt.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,160,265,379",
+ "endColumns": "104,104,113,104",
+ "endOffsets": "155,260,374,479"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "47,48,49,50",
"startColumns": "4,4,4,4",
+<<<<<<< HEAD
"startOffsets": "5556,5665,5773,5885",
"endColumns": "108,107,111,105",
"endOffsets": "5660,5768,5880,5986"
@@ -2658,6 +5028,103 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-be\\values-be.xml",
+=======
+ "startOffsets": "5629,5734,5839,5953",
+ "endColumns": "104,104,113,104",
+ "endOffsets": "5729,5834,5948,6053"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-lt\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "247",
+ "endColumns": "217",
+ "endOffsets": "464"
+ },
+ "to": {
+ "startLines": "37",
+ "startColumns": "4",
+ "startOffsets": "4038",
+ "endColumns": "217",
+ "endOffsets": "4251"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-lt\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,350,534,664,769,981,1109,1254,1385,1610,1717,1913,2045,2257,2433,2527,2619",
+ "endColumns": "104,183,129,104,211,127,144,130,224,106,195,131,211,175,93,91,114",
+ "endOffsets": "349,533,663,768,980,1108,1253,1384,1609,1716,1912,2044,2256,2432,2526,2618,2733"
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2874,2983,3167,3301,3410,3622,3754,3903,4256,4481,4592,4788,4924,5136,5316,5414,5510",
+ "endColumns": "108,183,133,108,211,131,148,134,224,110,195,135,211,179,97,95,118",
+ "endOffsets": "2978,3162,3296,3405,3617,3749,3898,4033,4476,4587,4783,4919,5131,5311,5409,5505,5624"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-xlarge-v4_values-xlarge-v4.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-xlarge-v4\\values-xlarge-v4.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7",
+ "startColumns": "4,4,4,4,4,4",
+ "startOffsets": "55,126,197,267,337,405",
+ "endColumns": "70,70,69,69,67,67",
+ "endOffsets": "121,192,262,332,400,468"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-pt-rPT_values-pt-rPT.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-pt-rPT\\values-pt-rPT.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,213,319,426,515,616,740,825,906,998,1091,1188,1282,1382,1476,1572,1667,1759,1851,1935,2042,2153,2255,2363,2471,2578,2749,2848",
+ "endColumns": "107,105,106,88,100,123,84,80,91,92,96,93,99,93,95,94,91,91,83,106,110,101,107,107,106,170,98,84",
+ "endOffsets": "208,314,421,510,611,735,820,901,993,1086,1183,1277,1377,1471,1567,1662,1754,1846,1930,2037,2148,2250,2358,2466,2573,2744,2843,2928"
+ },
+ "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,52",
+ "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",
+ "startOffsets": "105,213,319,426,515,616,740,825,906,998,1091,1188,1282,1382,1476,1572,1667,1759,1851,1935,2042,2153,2255,2363,2471,2578,2749,6207",
+ "endColumns": "107,105,106,88,100,123,84,80,91,92,96,93,99,93,95,94,91,91,83,106,110,101,107,107,106,170,98,84",
+ "endOffsets": "208,314,421,510,611,735,820,901,993,1086,1183,1277,1377,1471,1567,1662,1754,1846,1930,2037,2148,2250,2358,2466,2573,2744,2843,6287"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-pt-rPT\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "249,352,547,673,779,1006,1132,1280,1414,1661,1767,1968,2097,2315,2519,2613,2708",
+ "endColumns": "102,194,125,105,226,125,147,133,246,105,200,128,217,203,93,94,111",
+ "endOffsets": "351,546,672,778,1005,1131,1279,1413,1660,1766,1967,2096,2314,2518,2612,2707,2819"
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2848,2955,3150,3280,3390,3617,3747,3899,4241,4488,4598,4799,4932,5150,5358,5456,5555",
+ "endColumns": "106,194,129,109,226,129,151,137,246,109,200,132,217,207,97,98,115",
+ "endOffsets": "2950,3145,3275,3385,3612,3742,3894,4032,4483,4593,4794,4927,5145,5353,5451,5550,5666"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-pt-rPT\\values-pt-rPT.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "2",
"startColumns": "4",
@@ -2668,6 +5135,7 @@
"to": {
"startLines": "53",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "6177",
"endColumns": "100",
"endOffsets": "6273"
@@ -2681,10 +5149,43 @@
"startOffsets": "207",
"endColumns": "100",
"endOffsets": "307"
+=======
+ "startOffsets": "6292",
+ "endColumns": "100",
+ "endOffsets": "6388"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-pt-rPT\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "251",
+ "endColumns": "203",
+ "endOffsets": "454"
+ },
+ "to": {
+ "startLines": "37",
+ "startColumns": "4",
+ "startOffsets": "4037",
+ "endColumns": "203",
+ "endOffsets": "4236"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-pt-rPT\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "211",
+ "endColumns": "102",
+ "endOffsets": "313"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "51",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "5991",
"endColumns": "104",
"endOffsets": "6091"
@@ -2748,6 +5249,122 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-tr\\values-tr.xml",
+=======
+ "startOffsets": "6100",
+ "endColumns": "106",
+ "endOffsets": "6202"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-pt-rPT\\values-pt-rPT.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,171,270,382",
+ "endColumns": "115,98,111,101",
+ "endOffsets": "166,265,377,479"
+ },
+ "to": {
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "5671,5787,5886,5998",
+ "endColumns": "115,98,111,101",
+ "endOffsets": "5782,5881,5993,6095"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-sl_values-sl.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-sl\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "247",
+ "endColumns": "198",
+ "endOffsets": "445"
+ },
+ "to": {
+ "startLines": "37",
+ "startColumns": "4",
+ "startOffsets": "4011",
+ "endColumns": "198",
+ "endOffsets": "4205"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-sl\\values-sl.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,217,319,427,514,617,736,817,896,988,1081,1176,1270,1366,1460,1556,1656,1748,1840,1923,2031,2139,2239,2352,2460,2568,2751,2851",
+ "endColumns": "111,101,107,86,102,118,80,78,91,92,94,93,95,93,95,99,91,91,82,107,107,99,112,107,107,182,99,82",
+ "endOffsets": "212,314,422,509,612,731,812,891,983,1076,1171,1265,1361,1455,1551,1651,1743,1835,1918,2026,2134,2234,2347,2455,2563,2746,2846,2929"
+ },
+ "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,52",
+ "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",
+ "startOffsets": "105,217,319,427,514,617,736,817,896,988,1081,1176,1270,1366,1460,1556,1656,1748,1840,1923,2031,2139,2239,2352,2460,2568,2751,6091",
+ "endColumns": "111,101,107,86,102,118,80,78,91,92,94,93,95,93,95,99,91,91,82,107,107,99,112,107,107,182,99,82",
+ "endOffsets": "212,314,422,509,612,731,812,891,983,1076,1171,1265,1361,1455,1551,1651,1743,1835,1918,2026,2134,2234,2347,2455,2563,2746,2846,6169"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-sl\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,349,546,673,778,984,1112,1252,1381,1598,1703,1901,2029,2240,2418,2514,2602",
+ "endColumns": "103,196,126,104,205,127,139,128,216,104,197,127,210,177,95,87,108",
+ "endOffsets": "348,545,672,777,983,1111,1251,1380,1597,1702,1900,2028,2239,2417,2513,2601,2710"
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2851,2959,3156,3287,3396,3602,3734,3878,4210,4427,4536,4734,4866,5077,5259,5359,5451",
+ "endColumns": "107,196,130,108,205,131,143,132,216,108,197,131,210,181,99,91,112",
+ "endOffsets": "2954,3151,3282,3391,3597,3729,3873,4006,4422,4531,4729,4861,5072,5254,5354,5446,5559"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-sl\\values-sl.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,161,265,377",
+ "endColumns": "105,103,111,100",
+ "endOffsets": "156,260,372,473"
+ },
+ "to": {
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "5564,5670,5774,5886",
+ "endColumns": "105,103,111,100",
+ "endOffsets": "5665,5769,5881,5982"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-sl\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "207",
+ "endColumns": "99",
+ "endOffsets": "306"
+ },
+ "to": {
+ "startLines": "51",
+ "startColumns": "4",
+ "startOffsets": "5987",
+ "endColumns": "103",
+ "endOffsets": "6086"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-sl\\values-sl.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "2",
"startColumns": "4",
@@ -2758,12 +5375,24 @@
"to": {
"startLines": "53",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "6140",
"endColumns": "100",
"endOffsets": "6236"
+=======
+ "startOffsets": "6174",
+ "endColumns": "100",
+ "endOffsets": "6270"
+>>>>>>> origin/feature/pushNotifications
}
- },
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-en-rXC_values-en-rXC.arsc.flat",
+ "map": [
{
+<<<<<<< HEAD
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-tr\\values.xml",
"from": {
"startLines": "4",
@@ -2822,10 +5451,93 @@
"startOffsets": "207",
"endColumns": "101",
"endOffsets": "308"
+=======
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-en-rXC\\values-en-rXC.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,256,455,667",
+ "endColumns": "200,198,211,195",
+ "endOffsets": "251,450,662,858"
},
"to": {
- "startLines": "51",
+ "startLines": "29,30,31,32",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "5503,5704,5903,6115",
+ "endColumns": "200,198,211,195",
+ "endOffsets": "5699,5898,6110,6306"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-en-rXC\\values-en-rXC.xml",
+ "from": {
+ "startLines": "2",
"startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "203",
+ "endOffsets": "254"
+ },
+ "to": {
+ "startLines": "34",
+ "startColumns": "4",
+ "startOffsets": "6490",
+ "endColumns": "203",
+ "endOffsets": "6689"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-en-rXC\\values-en-rXC.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,310,510,719,904,1106,1321,1494,1671,1862,2055,2253,2449,2652,2847,3044,3239,3432,3623,3807,4011,4216,4417,4624,4826,5031,5303,5503",
+ "endColumns": "204,199,208,184,201,214,172,176,190,192,197,195,202,194,196,194,192,190,183,203,204,200,206,201,204,271,199,178",
+ "endOffsets": "305,505,714,899,1101,1316,1489,1666,1857,2050,2248,2444,2647,2842,3039,3234,3427,3618,3802,4006,4211,4412,4619,4821,5026,5298,5498,5677"
+ },
+ "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,33",
+ "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",
+ "startOffsets": "105,310,510,719,904,1106,1321,1494,1671,1862,2055,2253,2449,2652,2847,3044,3239,3432,3623,3807,4011,4216,4417,4624,4826,5031,5303,6311",
+ "endColumns": "204,199,208,184,201,214,172,176,190,192,197,195,202,194,196,194,192,190,183,203,204,200,206,201,204,271,199,178",
+ "endOffsets": "305,505,714,899,1101,1316,1489,1666,1857,2050,2248,2444,2647,2842,3039,3234,3427,3618,3802,4006,4211,4412,4619,4821,5026,5298,5498,6485"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-en-rGB_values-en-rGB.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-en-rGB\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "249,352,536,659,764,974,1095,1237,1365,1583,1686,1869,1992,2197,2371,2460,2548",
+ "endColumns": "102,183,122,104,209,120,141,127,217,102,182,122,204,173,88,87,103",
+ "endOffsets": "351,535,658,763,973,1094,1236,1364,1582,1685,1868,1991,2196,2370,2459,2547,2651"
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2762,2869,3053,3180,3289,3499,3624,3770,4099,4317,4424,4607,4734,4939,5117,5210,5302",
+ "endColumns": "106,183,126,108,209,124,145,131,217,106,182,126,204,177,92,91,107",
+ "endOffsets": "2864,3048,3175,3284,3494,3619,3765,3897,4312,4419,4602,4729,4934,5112,5205,5297,5405"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-en-rGB\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "251",
+ "endColumns": "196",
+ "endOffsets": "447"
+>>>>>>> origin/feature/pushNotifications
+ },
+ "to": {
+ "startLines": "37",
+ "startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "5955",
"endColumns": "105",
"endOffsets": "6056"
@@ -2872,6 +5584,14 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-da\\values-da.xml",
+=======
+ "startOffsets": "3902",
+ "endColumns": "196",
+ "endOffsets": "4094"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-en-rGB\\values-en-rGB.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -2882,6 +5602,92 @@
"to": {
"startLines": "53",
"startColumns": "4",
+ "startOffsets": "6006",
+ "endColumns": "100",
+ "endOffsets": "6102"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-en-rGB\\values-en-rGB.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,209,309,417,501,601,716,794,870,961,1053,1148,1242,1343,1436,1531,1625,1716,1807,1888,1991,2094,2193,2298,2402,2506,2662,2762",
+ "endColumns": "103,99,107,83,99,114,77,75,90,91,94,93,100,92,94,93,90,90,80,102,102,98,104,103,103,155,99,81",
+ "endOffsets": "204,304,412,496,596,711,789,865,956,1048,1143,1237,1338,1431,1526,1620,1711,1802,1883,1986,2089,2188,2293,2397,2501,2657,2757,2839"
+ },
+ "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,52",
+ "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",
+ "startOffsets": "105,209,309,417,501,601,716,794,870,961,1053,1148,1242,1343,1436,1531,1625,1716,1807,1888,1991,2094,2193,2298,2402,2506,2662,5924",
+ "endColumns": "103,99,107,83,99,114,77,75,90,91,94,93,100,92,94,93,90,90,80,102,102,98,104,103,103,155,99,81",
+ "endOffsets": "204,304,412,496,596,711,789,865,956,1048,1143,1237,1338,1431,1526,1620,1711,1802,1883,1986,2089,2188,2293,2397,2501,2657,2757,6001"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-en-rGB\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "211",
+ "endColumns": "107",
+ "endOffsets": "318"
+ },
+ "to": {
+ "startLines": "51",
+ "startColumns": "4",
+ "startOffsets": "5812",
+ "endColumns": "111",
+ "endOffsets": "5919"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-en-rGB\\values-en-rGB.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,153,250,359",
+ "endColumns": "97,96,108,97",
+ "endOffsets": "148,245,354,452"
+ },
+ "to": {
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "5410,5508,5605,5714",
+ "endColumns": "97,96,108,97",
+ "endOffsets": "5503,5600,5709,5807"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-v16_values-v16.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-v16\\values-v16.xml",
+ "from": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "65",
+ "endOffsets": "116"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-v16\\values-v16.xml",
+>>>>>>> origin/feature/pushNotifications
+ "from": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endLines": "5",
+ "endColumns": "12",
+ "endOffsets": "223"
+ },
+ "to": {
+ "startLines": "3",
+ "startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "6047",
"endColumns": "100",
"endOffsets": "6143"
@@ -2951,6 +5757,85 @@
"startOffsets": "55",
"endColumns": "112",
"endOffsets": "163"
+=======
+ "startOffsets": "121",
+ "endLines": "6",
+ "endColumns": "12",
+ "endOffsets": "289"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-es-rUS_values-es-rUS.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-es-rUS\\values-es-rUS.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,164,266,381",
+ "endColumns": "108,101,114,104",
+ "endOffsets": "159,261,376,481"
+ },
+ "to": {
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "5639,5748,5850,5965",
+ "endColumns": "108,101,114,104",
+ "endOffsets": "5743,5845,5960,6065"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-es-rUS\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "251",
+ "endColumns": "204",
+ "endOffsets": "455"
+ },
+ "to": {
+ "startLines": "37",
+ "startColumns": "4",
+ "startOffsets": "4014",
+ "endColumns": "204",
+ "endOffsets": "4214"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-es-rUS\\values-es-rUS.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,225,334,442,527,629,745,830,911,1002,1094,1189,1283,1383,1476,1575,1671,1762,1853,1934,2041,2140,2239,2347,2455,2562,2721,2821",
+ "endColumns": "119,108,107,84,101,115,84,80,90,91,94,93,99,92,98,95,90,90,80,106,98,98,107,107,106,158,99,81",
+ "endOffsets": "220,329,437,522,624,740,825,906,997,1089,1184,1278,1378,1471,1570,1666,1757,1848,1929,2036,2135,2234,2342,2450,2557,2716,2816,2898"
+ },
+ "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,52",
+ "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",
+ "startOffsets": "105,225,334,442,527,629,745,830,911,1002,1094,1189,1283,1383,1476,1575,1671,1762,1853,1934,2041,2140,2239,2347,2455,2562,2721,6175",
+ "endColumns": "119,108,107,84,101,115,84,80,90,91,94,93,99,92,98,95,90,90,80,106,98,98,107,107,106,158,99,81",
+ "endOffsets": "220,329,437,522,624,740,825,906,997,1089,1184,1278,1378,1471,1570,1666,1757,1848,1929,2036,2135,2234,2342,2450,2557,2716,2816,6252"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-es-rUS\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "249,355,553,683,789,1009,1138,1287,1418,1648,1755,1956,2087,2323,2527,2623,2711",
+ "endColumns": "105,197,129,105,219,128,148,130,229,106,200,130,235,203,95,87,102",
+ "endOffsets": "354,552,682,788,1008,1137,1286,1417,1647,1754,1955,2086,2322,2526,2622,2710,2813"
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2821,2931,3129,3263,3373,3593,3726,3879,4219,4449,4560,4761,4896,5132,5340,5440,5532",
+ "endColumns": "109,197,133,109,219,132,152,134,229,110,200,134,235,207,99,91,106",
+ "endOffsets": "2926,3124,3258,3368,3588,3721,3874,4009,4444,4555,4756,4891,5127,5335,5435,5527,5634"
+>>>>>>> origin/feature/pushNotifications
}
}
]
@@ -2959,6 +5844,7 @@
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-tl_values-tl.arsc.flat",
"map": [
{
+<<<<<<< HEAD
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-tl\\values.xml",
"from": {
"startLines": "4",
@@ -2966,10 +5852,20 @@
"startOffsets": "207",
"endColumns": "100",
"endOffsets": "307"
+=======
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-es-rUS\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "211",
+ "endColumns": "100",
+ "endOffsets": "311"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "51",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "6120",
"endColumns": "104",
"endOffsets": "6220"
@@ -2977,6 +5873,15 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-tl\\values-tl.xml",
+=======
+ "startOffsets": "6070",
+ "endColumns": "104",
+ "endOffsets": "6170"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-es-rUS\\values-es-rUS.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "2",
"startColumns": "4",
@@ -2987,12 +5892,24 @@
"to": {
"startLines": "53",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "6309",
"endColumns": "100",
"endOffsets": "6405"
+=======
+ "startOffsets": "6257",
+ "endColumns": "100",
+ "endOffsets": "6353"
+>>>>>>> origin/feature/pushNotifications
}
- },
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-w480dp-port-v13_values-w480dp-port-v13.arsc.flat",
+ "map": [
{
+<<<<<<< HEAD
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-tl\\values-tl.xml",
"from": {
"startLines": "2,3,4,5",
@@ -3034,10 +5951,69 @@
"startOffsets": "105,216,324,437,525,631,746,826,904,995,1087,1182,1276,1377,1470,1565,1659,1750,1841,1924,2033,2143,2244,2354,2472,2580,2743,2845",
"endColumns": "110,107,112,87,105,114,79,77,90,91,94,93,100,92,94,93,90,90,82,108,109,100,109,117,107,162,101,83",
"endOffsets": "211,319,432,520,626,741,821,899,990,1082,1177,1271,1372,1465,1560,1654,1745,1836,1919,2028,2138,2239,2349,2467,2575,2738,2840,2924"
+=======
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\19593d9c2c700c52ad03572ebfd537d5\\material-1.1.0-rc02\\res\\values-w480dp-port-v13\\values-w480dp-port-v13.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9",
+ "startColumns": "4,4,4,4,4,4,4,4",
+ "startOffsets": "55,114,170,226,293,358,413,478",
+ "endColumns": "58,55,55,66,64,54,64,68",
+ "endOffsets": "109,165,221,288,353,408,473,542"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-es_values-es.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-es\\values-es.xml",
+ "from": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "100",
+ "endOffsets": "151"
+ },
+ "to": {
+ "startLines": "53",
+ "startColumns": "4",
+ "startOffsets": "6276",
+ "endColumns": "100",
+ "endOffsets": "6372"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-es\\values-es.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,162,263,378",
+ "endColumns": "106,100,114,103",
+ "endOffsets": "157,258,373,477"
+ },
+ "to": {
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "5662,5769,5870,5985",
+ "endColumns": "106,100,114,103",
+ "endOffsets": "5764,5865,5980,6084"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-es\\values-es.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,207,320,428,513,614,742,828,910,1002,1095,1192,1286,1387,1481,1577,1673,1765,1857,1938,2045,2156,2255,2363,2471,2578,2737,2836",
+ "endColumns": "101,112,107,84,100,127,85,81,91,92,96,93,100,93,95,95,91,91,80,106,110,98,107,107,106,158,98,81",
+ "endOffsets": "202,315,423,508,609,737,823,905,997,1090,1187,1281,1382,1476,1572,1668,1760,1852,1933,2040,2151,2250,2358,2466,2573,2732,2831,2913"
+>>>>>>> origin/feature/pushNotifications
},
"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,52",
"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",
+<<<<<<< HEAD
"startOffsets": "105,216,324,437,525,631,746,826,904,995,1087,1182,1276,1377,1470,1565,1659,1750,1841,1924,2033,2143,2244,2354,2472,2580,2743,6225",
"endColumns": "110,107,112,87,105,114,79,77,90,91,94,93,100,92,94,93,90,90,82,108,109,100,109,117,107,162,101,83",
"endOffsets": "211,319,432,520,626,741,821,899,990,1082,1177,1271,1372,1465,1560,1654,1745,1836,1919,2028,2138,2239,2349,2467,2575,2738,2840,6304"
@@ -3045,19 +6021,39 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-tl\\values.xml",
+=======
+ "startOffsets": "105,207,320,428,513,614,742,828,910,1002,1095,1192,1286,1387,1481,1577,1673,1765,1857,1938,2045,2156,2255,2363,2471,2578,2737,6194",
+ "endColumns": "101,112,107,84,100,127,85,81,91,92,96,93,100,93,95,95,91,91,80,106,110,98,107,107,106,158,98,81",
+ "endOffsets": "202,315,423,508,609,737,823,905,997,1090,1187,1281,1382,1476,1572,1668,1760,1852,1933,2040,2151,2250,2358,2466,2573,2732,2831,6271"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-es\\values.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "4",
"startColumns": "0",
"startOffsets": "247",
+<<<<<<< HEAD
"endColumns": "204",
"endOffsets": "451"
+=======
+ "endColumns": "218",
+ "endOffsets": "465"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "37",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "4062",
"endColumns": "204",
"endOffsets": "4262"
+=======
+ "startOffsets": "4030",
+ "endColumns": "218",
+ "endOffsets": "4244"
+>>>>>>> origin/feature/pushNotifications
}
}
]
@@ -3066,6 +6062,7 @@
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-el_values-el.arsc.flat",
"map": [
{
+<<<<<<< HEAD
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-el\\values.xml",
"from": {
"startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
@@ -3084,6 +6081,48 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-el\\values-el.xml",
+=======
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-es\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "207",
+ "endColumns": "100",
+ "endOffsets": "307"
+ },
+ "to": {
+ "startLines": "51",
+ "startColumns": "4",
+ "startOffsets": "6089",
+ "endColumns": "104",
+ "endOffsets": "6189"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-es\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,351,546,675,781,1001,1132,1280,1415,1666,1773,1969,2099,2323,2506,2599,2694",
+ "endColumns": "105,194,128,105,219,130,147,134,250,106,195,129,223,182,92,94,109",
+ "endOffsets": "350,545,674,780,1000,1131,1279,1414,1665,1772,1968,2098,2322,2505,2598,2693,2803"
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2836,2946,3141,3274,3384,3604,3739,3891,4249,4500,4611,4807,4941,5165,5352,5449,5548",
+ "endColumns": "109,194,132,109,219,134,151,138,250,110,195,133,223,186,96,98,113",
+ "endOffsets": "2941,3136,3269,3379,3599,3734,3886,4025,4495,4606,4802,4936,5160,5347,5444,5543,5657"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-si_values-si.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-si\\values-si.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"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",
"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",
@@ -3111,6 +6150,7 @@
"to": {
"startLines": "51",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "6192",
"endColumns": "105",
"endOffsets": "6293"
@@ -3141,10 +6181,43 @@
"startOffsets": "55,165,272,397",
"endColumns": "109,106,124,108",
"endOffsets": "160,267,392,501"
+=======
+ "startOffsets": "6120",
+ "endColumns": "100",
+ "endOffsets": "6216"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-si\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,351,537,659,770,971,1093,1235,1358,1568,1681,1868,1997,2200,2387,2486,2573",
+ "endColumns": "105,185,121,110,200,121,141,122,209,112,186,128,202,186,98,86,104",
+ "endOffsets": "350,536,658,769,970,1092,1234,1357,1567,1680,1867,1996,2199,2386,2485,2572,2677"
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2821,2931,3117,3243,3358,3559,3685,3831,4156,4366,4483,4670,4803,5006,5197,5300,5391",
+ "endColumns": "109,185,125,114,200,125,145,126,209,116,186,132,202,190,102,90,108",
+ "endOffsets": "2926,3112,3238,3353,3554,3680,3826,3953,4361,4478,4665,4798,5001,5192,5295,5386,5495"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-si\\values-si.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,163,270,386",
+ "endColumns": "107,106,115,103",
+ "endOffsets": "158,265,381,485"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "47,48,49,50",
"startColumns": "4,4,4,4",
+<<<<<<< HEAD
"startOffsets": "5741,5851,5958,6083",
"endColumns": "109,106,124,108",
"endOffsets": "5846,5953,6078,6187"
@@ -3242,6 +6315,88 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-hy\\values-hy.xml",
+=======
+ "startOffsets": "5500,5608,5715,5831",
+ "endColumns": "107,106,115,103",
+ "endOffsets": "5603,5710,5826,5930"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-si\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "207",
+ "endColumns": "99",
+ "endOffsets": "306"
+ },
+ "to": {
+ "startLines": "51",
+ "startColumns": "4",
+ "startOffsets": "5935",
+ "endColumns": "103",
+ "endOffsets": "6034"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-si\\values-si.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,221,328,435,518,623,739,829,916,1007,1099,1193,1287,1388,1481,1576,1670,1761,1852,1935,2044,2148,2246,2356,2456,2563,2722,2821",
+ "endColumns": "115,106,106,82,104,115,89,86,90,91,93,93,100,92,94,93,90,90,82,108,103,97,109,99,106,158,98,80",
+ "endOffsets": "216,323,430,513,618,734,824,911,1002,1094,1188,1282,1383,1476,1571,1665,1756,1847,1930,2039,2143,2241,2351,2451,2558,2717,2816,2897"
+ },
+ "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,52",
+ "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",
+ "startOffsets": "105,221,328,435,518,623,739,829,916,1007,1099,1193,1287,1388,1481,1576,1670,1761,1852,1935,2044,2148,2246,2356,2456,2563,2722,6039",
+ "endColumns": "115,106,106,82,104,115,89,86,90,91,93,93,100,92,94,93,90,90,82,108,103,97,109,99,106,158,98,80",
+ "endOffsets": "216,323,430,513,618,734,824,911,1002,1094,1188,1282,1383,1476,1571,1665,1756,1847,1930,2039,2143,2241,2351,2451,2558,2717,2816,6115"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-si\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "247",
+ "endColumns": "197",
+ "endOffsets": "444"
+ },
+ "to": {
+ "startLines": "37",
+ "startColumns": "4",
+ "startOffsets": "3958",
+ "endColumns": "197",
+ "endOffsets": "4151"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-sr_values-sr.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-sr\\values-sr.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,212,313,419,505,609,731,815,897,988,1080,1175,1269,1370,1463,1558,1663,1754,1845,1930,2035,2141,2244,2350,2459,2566,2736,2833",
+ "endColumns": "106,100,105,85,103,121,83,81,90,91,94,93,100,92,94,104,90,90,84,104,105,102,105,108,106,169,96,85",
+ "endOffsets": "207,308,414,500,604,726,810,892,983,1075,1170,1264,1365,1458,1553,1658,1749,1840,1925,2030,2136,2239,2345,2454,2561,2731,2828,2914"
+ },
+ "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,52",
+ "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",
+ "startOffsets": "105,212,313,419,505,609,731,815,897,988,1080,1175,1269,1370,1463,1558,1663,1754,1845,1930,2035,2141,2244,2350,2459,2566,2736,6017",
+ "endColumns": "106,100,105,85,103,121,83,81,90,91,94,93,100,92,94,104,90,90,84,104,105,102,105,108,106,169,96,85",
+ "endOffsets": "207,308,414,500,604,726,810,892,983,1075,1170,1264,1365,1458,1553,1658,1749,1840,1925,2030,2136,2239,2345,2454,2561,2731,2828,6098"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-sr\\values-sr.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "2",
"startColumns": "4",
@@ -3252,6 +6407,7 @@
"to": {
"startLines": "53",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "6226",
"endColumns": "100",
"endOffsets": "6322"
@@ -3287,10 +6443,26 @@
"startOffsets": "247",
"endColumns": "213",
"endOffsets": "460"
+=======
+ "startOffsets": "6103",
+ "endColumns": "100",
+ "endOffsets": "6199"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-sr\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "207",
+ "endColumns": "99",
+ "endOffsets": "306"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
- "startLines": "37",
+ "startLines": "51",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "3939",
"endColumns": "213",
"endOffsets": "4148"
@@ -3321,10 +6493,26 @@
"startOffsets": "207",
"endColumns": "104",
"endOffsets": "311"
+=======
+ "startOffsets": "5913",
+ "endColumns": "103",
+ "endOffsets": "6012"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-sr\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "247",
+ "endColumns": "188",
+ "endOffsets": "435"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
- "startLines": "51",
+ "startLines": "37",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "5934",
"endColumns": "108",
"endOffsets": "6038"
@@ -3394,10 +6582,82 @@
"startOffsets": "55,160,264,369",
"endColumns": "104,103,104,106",
"endOffsets": "155,259,364,471"
+=======
+ "startOffsets": "3984",
+ "endColumns": "188",
+ "endOffsets": "4168"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-sr\\values-sr.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,166,266,379",
+ "endColumns": "110,99,112,96",
+ "endOffsets": "161,261,374,471"
},
"to": {
"startLines": "47,48,49,50",
"startColumns": "4,4,4,4",
+ "startOffsets": "5492,5603,5703,5816",
+ "endColumns": "110,99,112,96",
+ "endOffsets": "5598,5698,5811,5908"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-sr\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,349,537,661,769,982,1107,1245,1372,1580,1685,1876,2001,2209,2377,2471,2562",
+ "endColumns": "103,187,123,107,212,124,137,126,207,104,190,124,207,167,93,90,104",
+ "endOffsets": "348,536,660,768,981,1106,1244,1371,1579,1684,1875,2000,2208,2376,2470,2561,2666"
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2833,2941,3129,3257,3369,3582,3711,3853,4173,4381,4490,4681,4810,5018,5190,5288,5383",
+ "endColumns": "107,187,127,111,212,128,141,130,207,108,190,128,207,171,97,94,108",
+ "endOffsets": "2936,3124,3252,3364,3577,3706,3848,3979,4376,4485,4676,4805,5013,5185,5283,5378,5487"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-ky_values-ky.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-ky\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "247",
+ "endColumns": "220",
+ "endOffsets": "467"
+ },
+ "to": {
+ "startLines": "37",
+ "startColumns": "4",
+ "startOffsets": "3965",
+ "endColumns": "220",
+ "endOffsets": "4181"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-ky\\values-ky.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,154,259,368",
+ "endColumns": "98,104,108,104",
+ "endOffsets": "149,254,363,468"
+>>>>>>> origin/feature/pushNotifications
+ },
+ "to": {
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+<<<<<<< HEAD
"startOffsets": "5501,5606,5710,5815",
"endColumns": "104,103,104,106",
"endOffsets": "5601,5705,5810,5917"
@@ -3422,6 +6682,31 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-mn\\values-mn.xml",
+=======
+ "startOffsets": "5520,5619,5724,5833",
+ "endColumns": "98,104,108,104",
+ "endOffsets": "5614,5719,5828,5933"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-ky\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,349,530,657,762,966,1091,1232,1366,1594,1699,1880,2008,2204,2397,2487,2573",
+ "endColumns": "103,180,126,104,203,124,140,133,227,104,180,127,195,192,89,85,102",
+ "endOffsets": "348,529,656,761,965,1090,1231,1365,1593,1698,1879,2007,2203,2396,2486,2572,2675"
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2820,2928,3109,3240,3349,3553,3682,3827,4186,4414,4523,4704,4836,5032,5229,5323,5413",
+ "endColumns": "107,180,130,108,203,128,144,137,227,108,180,131,195,196,93,89,106",
+ "endOffsets": "2923,3104,3235,3344,3548,3677,3822,3960,4409,4518,4699,4831,5027,5224,5318,5408,5515"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-ky\\values-ky.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -3432,6 +6717,81 @@
"to": {
"startLines": "53",
"startColumns": "4",
+ "startOffsets": "6124",
+ "endColumns": "100",
+ "endOffsets": "6220"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-ky\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "207",
+ "endColumns": "100",
+ "endOffsets": "307"
+ },
+ "to": {
+ "startLines": "51",
+ "startColumns": "4",
+ "startOffsets": "5938",
+ "endColumns": "104",
+ "endOffsets": "6038"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-ky\\values-ky.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,216,325,437,522,627,744,823,902,993,1085,1180,1274,1375,1468,1563,1658,1749,1840,1920,2026,2131,2229,2336,2442,2557,2718,2820",
+ "endColumns": "110,108,111,84,104,116,78,78,90,91,94,93,100,92,94,94,90,90,79,105,104,97,106,105,114,160,101,80",
+ "endOffsets": "211,320,432,517,622,739,818,897,988,1080,1175,1269,1370,1463,1558,1653,1744,1835,1915,2021,2126,2224,2331,2437,2552,2713,2815,2896"
+ },
+ "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,52",
+ "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",
+ "startOffsets": "105,216,325,437,522,627,744,823,902,993,1085,1180,1274,1375,1468,1563,1658,1749,1840,1920,2026,2131,2229,2336,2442,2557,2718,6043",
+ "endColumns": "110,108,111,84,104,116,78,78,90,91,94,93,100,92,94,94,90,90,79,105,104,97,106,105,114,160,101,80",
+ "endOffsets": "211,320,432,517,622,739,818,897,988,1080,1175,1269,1370,1463,1558,1653,1744,1835,1915,2021,2126,2224,2331,2437,2552,2713,2815,6119"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-ca_values-ca.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-ca\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "207",
+ "endColumns": "100",
+ "endOffsets": "307"
+ },
+ "to": {
+ "startLines": "51",
+ "startColumns": "4",
+ "startOffsets": "5997",
+ "endColumns": "104",
+ "endOffsets": "6097"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-ca\\values-ca.xml",
+>>>>>>> origin/feature/pushNotifications
+ "from": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "100",
+ "endOffsets": "151"
+ },
+ "to": {
+ "startLines": "53",
+ "startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "6106",
"endColumns": "100",
"endOffsets": "6202"
@@ -3473,24 +6833,96 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-mn\\values.xml",
+=======
+ "startOffsets": "6183",
+ "endColumns": "100",
+ "endOffsets": "6279"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-ca\\values-ca.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,168,271,382",
+ "endColumns": "112,102,110,107",
+ "endOffsets": "163,266,377,485"
+ },
+ "to": {
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "5562,5675,5778,5889",
+ "endColumns": "112,102,110,107",
+ "endOffsets": "5670,5773,5884,5992"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-ca\\values.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "4",
"startColumns": "0",
"startOffsets": "247",
+<<<<<<< HEAD
"endColumns": "208",
"endOffsets": "455"
+=======
+ "endColumns": "193",
+ "endOffsets": "440"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "37",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "3963",
"endColumns": "208",
"endOffsets": "4167"
+=======
+ "startOffsets": "3984",
+ "endColumns": "193",
+ "endOffsets": "4173"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-ca\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,348,532,657,764,973,1098,1247,1380,1610,1717,1907,2036,2259,2443,2534,2628",
+ "endColumns": "102,183,124,106,208,124,148,132,229,106,189,128,222,183,90,93,111",
+ "endOffsets": "347,531,656,763,972,1097,1246,1379,1609,1716,1906,2035,2258,2442,2533,2627,2739"
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2825,2932,3116,3245,3356,3565,3694,3847,4178,4408,4519,4709,4842,5065,5253,5348,5446",
+ "endColumns": "106,183,128,110,208,128,152,136,229,110,189,132,222,187,94,97,115",
+ "endOffsets": "2927,3111,3240,3351,3560,3689,3842,3979,4403,4514,4704,4837,5060,5248,5343,5441,5557"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-ca\\values-ca.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,223,328,435,518,624,750,834,914,1005,1097,1190,1285,1384,1477,1570,1664,1755,1846,1926,2037,2145,2243,2353,2458,2566,2726,2825",
+ "endColumns": "117,104,106,82,105,125,83,79,90,91,92,94,98,92,92,93,90,90,79,110,107,97,109,104,107,159,98,80",
+ "endOffsets": "218,323,430,513,619,745,829,909,1000,1092,1185,1280,1379,1472,1565,1659,1750,1841,1921,2032,2140,2238,2348,2453,2561,2721,2820,2901"
+ },
+ "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,52",
+ "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",
+ "startOffsets": "105,223,328,435,518,624,750,834,914,1005,1097,1190,1285,1384,1477,1570,1664,1755,1846,1926,2037,2145,2243,2353,2458,2566,2726,6102",
+ "endColumns": "117,104,106,82,105,125,83,79,90,91,92,94,98,92,92,93,90,90,79,110,107,97,109,104,107,159,98,80",
+ "endOffsets": "218,323,430,513,619,745,829,909,1000,1092,1185,1280,1379,1472,1565,1659,1750,1841,1921,2032,2140,2238,2348,2453,2561,2721,2820,6178"
+>>>>>>> origin/feature/pushNotifications
}
}
]
},
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-nl_values-nl.arsc.flat",
"map": [
{
@@ -3529,16 +6961,181 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-nl\\values.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-zh-rHK_values-zh-rHK.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-zh-rHK\\values.xml",
"from": {
"startLines": "4",
"startColumns": "0",
- "startOffsets": "207",
- "endColumns": "101",
- "endOffsets": "308"
+ "startOffsets": "211",
+ "endColumns": "96",
+ "endOffsets": "307"
},
"to": {
"startLines": "51",
"startColumns": "4",
+ "startOffsets": "5349",
+ "endColumns": "100",
+ "endOffsets": "5445"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-zh-rHK\\values-zh-rHK.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,138,230,331",
+ "endColumns": "82,91,100,91",
+ "endOffsets": "133,225,326,418"
+ },
+ "to": {
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "4981,5064,5156,5257",
+ "endColumns": "82,91,100,91",
+ "endOffsets": "5059,5151,5252,5344"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-zh-rHK\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "251",
+ "endColumns": "166",
+ "endOffsets": "417"
+ },
+ "to": {
+ "startLines": "37",
+ "startColumns": "4",
+ "startOffsets": "3688",
+ "endColumns": "166",
+ "endOffsets": "3850"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-zh-rHK\\values.xml",
+>>>>>>> origin/feature/pushNotifications
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "249,348,508,621,721,887,1001,1129,1247,1416,1515,1675,1788,1954,2088,2169,2252",
+ "endColumns": "98,159,112,99,165,113,127,117,168,98,159,112,165,133,80,82,96",
+ "endOffsets": "347,507,620,720,886,1000,1128,1246,1415,1514,1674,1787,1953,2087,2168,2251,2348"
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2666,2769,2929,3046,3150,3316,3434,3566,3855,4024,4127,4287,4404,4570,4708,4793,4880",
+ "endColumns": "102,159,116,103,165,117,131,121,168,102,159,116,165,137,84,86,100",
+ "endOffsets": "2764,2924,3041,3145,3311,3429,3561,3683,4019,4122,4282,4399,4565,4703,4788,4875,4976"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-zh-rHK\\values-zh-rHK.xml",
+ "from": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "100",
+ "endOffsets": "151"
+ },
+ "to": {
+ "startLines": "53",
+ "startColumns": "4",
+ "startOffsets": "5528",
+ "endColumns": "100",
+ "endOffsets": "5624"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-zh-rHK\\values-zh-rHK.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,200,293,393,475,572,680,757,833,925,1018,1109,1205,1301,1395,1491,1583,1675,1767,1844,1940,2035,2130,2227,2323,2421,2572,2666",
+ "endColumns": "94,92,99,81,96,107,76,75,91,92,90,95,95,93,95,91,91,91,76,95,94,94,96,95,97,150,93,77",
+ "endOffsets": "195,288,388,470,567,675,752,828,920,1013,1104,1200,1296,1390,1486,1578,1670,1762,1839,1935,2030,2125,2222,2318,2416,2567,2661,2739"
+ },
+ "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,52",
+ "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",
+ "startOffsets": "105,200,293,393,475,572,680,757,833,925,1018,1109,1205,1301,1395,1491,1583,1675,1767,1844,1940,2035,2130,2227,2323,2421,2572,5450",
+ "endColumns": "94,92,99,81,96,107,76,75,91,92,90,95,95,93,95,91,91,91,76,95,94,94,96,95,97,150,93,77",
+ "endOffsets": "195,288,388,470,567,675,752,828,920,1013,1104,1200,1296,1390,1486,1578,1670,1762,1839,1935,2030,2125,2222,2318,2416,2567,2661,5523"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-it_values-it.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-it\\values-it.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,155,253,363",
+ "endColumns": "99,97,109,101",
+ "endOffsets": "150,248,358,460"
+ },
+ "to": {
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "5510,5610,5708,5818",
+ "endColumns": "99,97,109,101",
+ "endOffsets": "5605,5703,5813,5915"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-it\\values-it.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,210,313,422,506,611,730,808,884,976,1069,1162,1256,1358,1452,1549,1644,1736,1828,1908,2014,2121,2219,2323,2429,2536,2699,2799",
+ "endColumns": "104,102,108,83,104,118,77,75,91,92,92,93,101,93,96,94,91,91,79,105,106,97,103,105,106,162,99,80",
+ "endOffsets": "205,308,417,501,606,725,803,879,971,1064,1157,1251,1353,1447,1544,1639,1731,1823,1903,2009,2116,2214,2318,2424,2531,2694,2794,2875"
+ },
+ "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,52",
+ "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",
+ "startOffsets": "105,210,313,422,506,611,730,808,884,976,1069,1162,1256,1358,1452,1549,1644,1736,1828,1908,2014,2121,2219,2323,2429,2536,2699,6024",
+ "endColumns": "104,102,108,83,104,118,77,75,91,92,92,93,101,93,96,94,91,91,79,105,106,97,103,105,106,162,99,80",
+ "endOffsets": "205,308,417,501,606,725,803,879,971,1064,1157,1251,1353,1447,1544,1639,1731,1823,1903,2009,2116,2214,2318,2424,2531,2694,2794,6100"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-it\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,348,531,654,760,977,1103,1249,1378,1594,1699,1884,2009,2224,2431,2524,2611",
+ "endColumns": "102,182,122,105,216,125,145,128,215,104,184,124,214,206,92,86,101",
+ "endOffsets": "347,530,653,759,976,1102,1248,1377,1593,1698,1883,2008,2223,2430,2523,2610,2712"
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2799,2906,3089,3216,3326,3543,3673,3823,4151,4367,4476,4661,4790,5005,5216,5313,5404",
+ "endColumns": "106,182,126,109,216,129,149,132,215,108,184,128,214,210,96,90,105",
+ "endOffsets": "2901,3084,3211,3321,3538,3668,3818,3951,4362,4471,4656,4785,5000,5211,5308,5399,5505"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-it\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "207",
+ "endColumns": "99",
+ "endOffsets": "306"
+ },
+ "to": {
+ "startLines": "51",
+ "startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "6040",
"endColumns": "105",
"endOffsets": "6141"
@@ -3586,19 +7183,168 @@
"startOffsets": "245,353,540,668,777,1003,1128,1277,1408,1645,1749,1949,2073,2295,2503,2597,2686",
"endColumns": "107,186,127,108,225,124,148,130,236,103,199,123,221,207,93,88,103",
"endOffsets": "352,539,667,776,1002,1127,1276,1407,1644,1748,1948,2072,2294,2502,2596,2685,2789"
+=======
+ "startOffsets": "5920",
+ "endColumns": "103",
+ "endOffsets": "6019"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-it\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "247",
+ "endColumns": "194",
+ "endOffsets": "441"
},
"to": {
- "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "2832,2944,3131,3263,3376,3602,3731,3884,4221,4458,4566,4766,4894,5116,5328,5426,5519",
- "endColumns": "111,186,131,112,225,128,152,134,236,107,199,127,221,211,97,92,107",
- "endOffsets": "2939,3126,3258,3371,3597,3726,3879,4014,4453,4561,4761,4889,5111,5323,5421,5514,5622"
+ "startLines": "37",
+ "startColumns": "4",
+ "startOffsets": "3956",
+ "endColumns": "194",
+ "endOffsets": "4146"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-it\\values-it.xml",
+ "from": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "100",
+ "endOffsets": "151"
+ },
+ "to": {
+ "startLines": "53",
+ "startColumns": "4",
+ "startOffsets": "6105",
+ "endColumns": "100",
+ "endOffsets": "6201"
}
}
]
},
{
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-eu_values-eu.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-eu\\values-eu.xml",
+ "from": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "100",
+ "endOffsets": "151"
+ },
+ "to": {
+ "startLines": "53",
+ "startColumns": "4",
+ "startOffsets": "6248",
+ "endColumns": "100",
+ "endOffsets": "6344"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-eu\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,347,555,679,786,992,1117,1266,1398,1641,1747,1945,2073,2300,2485,2577,2668",
+ "endColumns": "101,207,123,106,205,124,148,131,242,105,197,127,226,184,91,90,113",
+ "endOffsets": "346,554,678,785,991,1116,1265,1397,1640,1746,1944,2072,2299,2484,2576,2667,2781"
+>>>>>>> origin/feature/pushNotifications
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+<<<<<<< HEAD
+ "startOffsets": "2832,2944,3131,3263,3376,3602,3731,3884,4221,4458,4566,4766,4894,5116,5328,5426,5519",
+ "endColumns": "111,186,131,112,225,128,152,134,236,107,199,127,221,211,97,92,107",
+ "endOffsets": "2939,3126,3258,3371,3597,3726,3879,4014,4453,4561,4761,4889,5111,5323,5421,5514,5622"
+=======
+ "startOffsets": "2850,2956,3164,3292,3403,3609,3738,3891,4228,4471,4581,4779,4911,5138,5327,5423,5518",
+ "endColumns": "105,207,127,110,205,128,152,135,242,109,197,131,226,188,95,94,117",
+ "endOffsets": "2951,3159,3287,3398,3604,3733,3886,4022,4466,4576,4774,4906,5133,5322,5418,5513,5631"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-eu\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "207",
+ "endColumns": "106",
+ "endOffsets": "313"
+ },
+ "to": {
+ "startLines": "51",
+ "startColumns": "4",
+ "startOffsets": "6055",
+ "endColumns": "110",
+ "endOffsets": "6161"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-eu\\values-eu.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,214,312,422,508,614,738,824,906,998,1091,1187,1281,1383,1477,1573,1670,1762,1855,1936,2045,2154,2253,2362,2469,2580,2751,2850",
+ "endColumns": "108,97,109,85,105,123,85,81,91,92,95,93,101,93,95,96,91,92,80,108,108,98,108,106,110,170,98,81",
+ "endOffsets": "209,307,417,503,609,733,819,901,993,1086,1182,1276,1378,1472,1568,1665,1757,1850,1931,2040,2149,2248,2357,2464,2575,2746,2845,2927"
+ },
+ "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,52",
+ "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",
+ "startOffsets": "105,214,312,422,508,614,738,824,906,998,1091,1187,1281,1383,1477,1573,1670,1762,1855,1936,2045,2154,2253,2362,2469,2580,2751,6166",
+ "endColumns": "108,97,109,85,105,123,85,81,91,92,95,93,101,93,95,96,91,92,80,108,108,98,108,106,110,170,98,81",
+ "endOffsets": "209,307,417,503,609,733,819,901,993,1086,1182,1276,1378,1472,1568,1665,1757,1850,1931,2040,2149,2248,2357,2464,2575,2746,2845,6243"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-eu\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "247",
+ "endColumns": "200",
+ "endOffsets": "447"
+ },
+ "to": {
+ "startLines": "37",
+ "startColumns": "4",
+ "startOffsets": "4027",
+ "endColumns": "200",
+ "endOffsets": "4223"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-eu\\values-eu.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,155,257,370",
+ "endColumns": "99,101,112,103",
+ "endOffsets": "150,252,365,469"
+ },
+ "to": {
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "5636,5736,5838,5951",
+ "endColumns": "99,101,112,103",
+ "endOffsets": "5731,5833,5946,6050"
+>>>>>>> origin/feature/pushNotifications
+ }
+ }
+ ]
+ },
+ {
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-ja_values-ja.arsc.flat",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-bg_values-bg.arsc.flat",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-ja\\values-ja.xml",
@@ -3812,6 +7558,7 @@
]
},
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-th_values-th.arsc.flat",
"map": [
{
@@ -3833,6 +7580,46 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-th\\values-th.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-en-rAU_values-en-rAU.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-en-rAU\\values-en-rAU.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,209,309,417,501,601,716,794,870,961,1053,1148,1242,1343,1436,1531,1625,1716,1807,1888,1991,2094,2193,2298,2402,2506,2662,2762",
+ "endColumns": "103,99,107,83,99,114,77,75,90,91,94,93,100,92,94,93,90,90,80,102,102,98,104,103,103,155,99,81",
+ "endOffsets": "204,304,412,496,596,711,789,865,956,1048,1143,1237,1338,1431,1526,1620,1711,1802,1883,1986,2089,2188,2293,2397,2501,2657,2757,2839"
+ },
+ "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,33",
+ "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",
+ "startOffsets": "105,209,309,417,501,601,716,794,870,961,1053,1148,1242,1343,1436,1531,1625,1716,1807,1888,1991,2094,2193,2298,2402,2506,2662,3164",
+ "endColumns": "103,99,107,83,99,114,77,75,90,91,94,93,100,92,94,93,90,90,80,102,102,98,104,103,103,155,99,81",
+ "endOffsets": "204,304,412,496,596,711,789,865,956,1048,1143,1237,1338,1431,1526,1620,1711,1802,1883,1986,2089,2188,2293,2397,2501,2657,2757,3241"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-en-rAU\\values-en-rAU.xml",
+ "from": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "100",
+ "endOffsets": "151"
+ },
+ "to": {
+ "startLines": "34",
+ "startColumns": "4",
+ "startOffsets": "3246",
+ "endColumns": "100",
+ "endOffsets": "3342"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-en-rAU\\values-en-rAU.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "2,3,4,5",
"startColumns": "4,4,4,4",
@@ -3847,9 +7634,20 @@
"endColumns": "102,98,110,96",
"endOffsets": "5445,5544,5655,5752"
}
+<<<<<<< HEAD
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-th\\values.xml",
+=======
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-sv_values-sv.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-sv\\values-sv.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "4",
"startColumns": "0",
@@ -3860,6 +7658,7 @@
"to": {
"startLines": "51",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "5757",
"endColumns": "107",
"endOffsets": "5860"
@@ -3873,10 +7672,43 @@
"startOffsets": "105,210,303,411,496,598,708,786,864,955,1047,1138,1232,1333,1426,1521,1615,1706,1797,1877,1980,2078,2176,2279,2385,2486,2639,2734",
"endColumns": "104,92,107,84,101,109,77,77,90,91,90,93,100,92,94,93,90,90,79,102,97,97,102,105,100,152,94,80",
"endOffsets": "205,298,406,491,593,703,781,859,950,1042,1133,1227,1328,1421,1516,1610,1701,1792,1872,1975,2073,2171,2274,2380,2481,2634,2729,2810"
+=======
+ "startOffsets": "6068",
+ "endColumns": "100",
+ "endOffsets": "6164"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-sv\\values-sv.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,155,255,368",
+ "endColumns": "99,99,112,96",
+ "endOffsets": "150,250,363,460"
+ },
+ "to": {
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "5473,5573,5673,5786",
+ "endColumns": "99,99,112,96",
+ "endOffsets": "5568,5668,5781,5878"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-sv\\values-sv.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,208,311,422,506,608,721,798,874,967,1061,1156,1250,1353,1448,1545,1643,1739,1832,1911,2017,2116,2212,2317,2420,2522,2676,2778",
+ "endColumns": "102,102,110,83,101,112,76,75,92,93,94,93,102,94,96,97,95,92,78,105,98,95,104,102,101,153,101,78",
+ "endOffsets": "203,306,417,501,603,716,793,869,962,1056,1151,1245,1348,1443,1540,1638,1734,1827,1906,2012,2111,2207,2312,2415,2517,2671,2773,2852"
+>>>>>>> origin/feature/pushNotifications
},
"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,52",
"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",
+<<<<<<< HEAD
"startOffsets": "105,210,303,411,496,598,708,786,864,955,1047,1138,1232,1333,1426,1521,1615,1706,1797,1877,1980,2078,2176,2279,2385,2486,2639,5865",
"endColumns": "104,92,107,84,101,109,77,77,90,91,90,93,100,92,94,93,90,90,79,102,97,97,102,105,100,152,94,80",
"endOffsets": "205,298,406,491,593,703,781,859,950,1042,1133,1227,1328,1421,1516,1610,1701,1792,1872,1975,2073,2171,2274,2380,2481,2634,2729,5941"
@@ -3901,24 +7733,79 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-th\\values.xml",
+=======
+ "startOffsets": "105,208,311,422,506,608,721,798,874,967,1061,1156,1250,1353,1448,1545,1643,1739,1832,1911,2017,2116,2212,2317,2420,2522,2676,5989",
+ "endColumns": "102,102,110,83,101,112,76,75,92,93,94,93,102,94,96,97,95,92,78,105,98,95,104,102,101,153,101,78",
+ "endOffsets": "203,306,417,501,603,716,793,869,962,1056,1151,1245,1348,1443,1540,1638,1734,1827,1906,2012,2111,2207,2312,2415,2517,2671,2773,6063"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-sv\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "207",
+ "endColumns": "101",
+ "endOffsets": "308"
+ },
+ "to": {
+ "startLines": "51",
+ "startColumns": "4",
+ "startOffsets": "5883",
+ "endColumns": "105",
+ "endOffsets": "5984"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-sv\\values.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "4",
"startColumns": "0",
"startOffsets": "247",
+<<<<<<< HEAD
"endColumns": "187",
"endOffsets": "434"
+=======
+ "endColumns": "206",
+ "endOffsets": "453"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "37",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "3862",
"endColumns": "187",
"endOffsets": "4045"
+=======
+ "startOffsets": "3930",
+ "endColumns": "206",
+ "endOffsets": "4132"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-sv\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,350,539,664,772,972,1095,1244,1373,1580,1686,1879,2005,2218,2400,2492,2581",
+ "endColumns": "104,188,124,107,199,122,148,128,206,105,192,125,212,181,91,88,103",
+ "endOffsets": "349,538,663,771,971,1094,1243,1372,1579,1685,1878,2004,2217,2399,2491,2580,2684"
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2778,2887,3076,3205,3317,3517,3644,3797,4137,4344,4454,4647,4777,4990,5176,5272,5365",
+ "endColumns": "108,188,128,111,199,126,152,132,206,109,192,129,212,185,95,92,107",
+ "endOffsets": "2882,3071,3200,3312,3512,3639,3792,3925,4339,4449,4642,4772,4985,5171,5267,5360,5468"
+>>>>>>> origin/feature/pushNotifications
}
}
]
},
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-az_values-az.arsc.flat",
"map": [
{
@@ -3980,10 +7867,74 @@
"startOffsets": "105,215,316,426,514,621,735,817,896,987,1079,1173,1272,1373,1466,1561,1655,1746,1838,1922,2027,2133,2233,2342,2447,2549,2707,2813",
"endColumns": "109,100,109,87,106,113,81,78,90,91,93,98,100,92,94,93,90,91,83,104,105,99,108,104,101,157,105,82",
"endOffsets": "210,311,421,509,616,730,812,891,982,1074,1168,1267,1368,1461,1556,1650,1741,1833,1917,2022,2128,2228,2337,2442,2544,2702,2808,2891"
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-ne_values-ne.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-ne\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "207",
+ "endColumns": "99",
+ "endOffsets": "306"
+ },
+ "to": {
+ "startLines": "51",
+ "startColumns": "4",
+ "startOffsets": "6163",
+ "endColumns": "103",
+ "endOffsets": "6262"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-ne\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,358,548,680,795,1025,1159,1295,1425,1664,1780,1975,2110,2317,2495,2587,2685",
+ "endColumns": "112,189,131,114,229,133,135,129,238,115,194,134,206,177,91,97,116",
+ "endOffsets": "357,547,679,794,1024,1158,1294,1424,1663,1779,1974,2109,2316,2494,2586,2684,2801"
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2888,3005,3195,3331,3450,3680,3818,3958,4315,4554,4674,4869,5008,5215,5397,5493,5595",
+ "endColumns": "116,189,135,118,229,137,139,133,238,119,194,138,206,181,95,101,120",
+ "endOffsets": "3000,3190,3326,3445,3675,3813,3953,4087,4549,4669,4864,5003,5210,5392,5488,5590,5711"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-ne\\values-ne.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,162,274,388",
+ "endColumns": "106,111,113,113",
+ "endOffsets": "157,269,383,497"
+ },
+ "to": {
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "5716,5823,5935,6049",
+ "endColumns": "106,111,113,113",
+ "endOffsets": "5818,5930,6044,6158"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-ne\\values-ne.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,216,327,435,526,633,760,844,924,1015,1107,1202,1296,1397,1490,1585,1679,1770,1861,1946,2059,2160,2256,2369,2479,2603,2777,2888",
+ "endColumns": "110,110,107,90,106,126,83,79,90,91,94,93,100,92,94,93,90,90,84,112,100,95,112,109,123,173,110,78",
+ "endOffsets": "211,322,430,521,628,755,839,919,1010,1102,1197,1291,1392,1485,1580,1674,1765,1856,1941,2054,2155,2251,2364,2474,2598,2772,2883,2962"
+>>>>>>> origin/feature/pushNotifications
},
"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,52",
"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",
+<<<<<<< HEAD
"startOffsets": "105,215,316,426,514,621,735,817,896,987,1079,1173,1272,1373,1466,1561,1655,1746,1838,1922,2027,2133,2233,2342,2447,2549,2707,6065",
"endColumns": "109,100,109,87,106,113,81,78,90,91,93,98,100,92,94,93,90,91,83,104,105,99,108,104,101,157,105,82",
"endOffsets": "210,311,421,509,616,730,812,891,982,1074,1168,1267,1368,1461,1556,1650,1741,1833,1917,2022,2128,2228,2337,2442,2544,2702,2808,6143"
@@ -3991,6 +7942,15 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-az\\values.xml",
+=======
+ "startOffsets": "105,216,327,435,526,633,760,844,924,1015,1107,1202,1296,1397,1490,1585,1679,1770,1861,1946,2059,2160,2256,2369,2479,2603,2777,6267",
+ "endColumns": "110,110,107,90,106,126,83,79,90,91,94,93,100,92,94,93,90,90,84,112,100,95,112,109,123,173,110,78",
+ "endOffsets": "211,322,430,521,628,755,839,919,1010,1102,1197,1291,1392,1485,1580,1674,1765,1856,1941,2054,2155,2251,2364,2474,2598,2772,2883,6341"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-ne\\values-ne.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "4",
"startColumns": "0",
@@ -4001,6 +7961,7 @@
"to": {
"startLines": "37",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "3983",
"endColumns": "220",
"endOffsets": "4199"
@@ -4014,22 +7975,50 @@
"startOffsets": "207",
"endColumns": "102",
"endOffsets": "309"
+=======
+ "startOffsets": "6346",
+ "endColumns": "100",
+ "endOffsets": "6442"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-ne\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "247",
+ "endColumns": "222",
+ "endOffsets": "469"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "51",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "5958",
"endColumns": "106",
"endOffsets": "6060"
+=======
+ "startOffsets": "4092",
+ "endColumns": "222",
+ "endOffsets": "4310"
+>>>>>>> origin/feature/pushNotifications
}
}
]
},
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-bs_values-bs.arsc.flat",
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-bs\\values-bs.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-pa_values-pa.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-pa\\values-pa.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "2",
"startColumns": "4",
@@ -4040,6 +8029,7 @@
"to": {
"startLines": "53",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "6122",
"endColumns": "100",
"endOffsets": "6218"
@@ -4053,10 +8043,26 @@
"startOffsets": "245,349,541,665,773,982,1106,1244,1371,1584,1689,1881,2006,2215,2387,2481,2572",
"endColumns": "103,191,123,107,208,123,137,126,212,104,191,124,208,171,93,90,109",
"endOffsets": "348,540,664,772,981,1105,1243,1370,1583,1688,1880,2005,2214,2386,2480,2571,2681"
+=======
+ "startOffsets": "6128",
+ "endColumns": "100",
+ "endOffsets": "6224"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-pa\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,350,555,683,790,996,1123,1262,1391,1612,1719,1923,2053,2265,2452,2544,2636",
+ "endColumns": "104,204,127,106,205,126,138,128,220,106,203,129,211,186,91,91,106",
+ "endOffsets": "349,554,682,789,995,1122,1261,1390,1611,1718,1922,2052,2264,2451,2543,2635,2742"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+<<<<<<< HEAD
"startOffsets": "2830,2938,3130,3258,3370,3579,3707,3849,4180,4393,4502,4694,4823,5032,5208,5306,5401",
"endColumns": "107,191,127,111,208,127,141,130,212,108,191,128,208,175,97,94,113",
"endOffsets": "2933,3125,3253,3365,3574,3702,3844,3975,4388,4497,4689,4818,5027,5203,5301,5396,5510"
@@ -4116,6 +8122,67 @@
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-bs\\values.xml",
"from": {
+=======
+ "startOffsets": "2767,2876,3081,3213,3324,3530,3661,3804,4147,4368,4479,4683,4817,5029,5220,5316,5412",
+ "endColumns": "108,204,131,110,205,130,142,132,220,110,203,133,211,190,95,95,110",
+ "endOffsets": "2871,3076,3208,3319,3525,3656,3799,3932,4363,4474,4678,4812,5024,5215,5311,5407,5518"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-pa\\values-pa.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,208,305,410,496,596,709,787,865,956,1048,1142,1236,1337,1430,1525,1619,1710,1801,1879,1989,2092,2188,2299,2401,2511,2670,2767",
+ "endColumns": "102,96,104,85,99,112,77,77,90,91,93,93,100,92,94,93,90,90,77,109,102,95,110,101,109,158,96,78",
+ "endOffsets": "203,300,405,491,591,704,782,860,951,1043,1137,1231,1332,1425,1520,1614,1705,1796,1874,1984,2087,2183,2294,2396,2506,2665,2762,2841"
+ },
+ "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,52",
+ "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",
+ "startOffsets": "105,208,305,410,496,596,709,787,865,956,1048,1142,1236,1337,1430,1525,1619,1710,1801,1879,1989,2092,2188,2299,2401,2511,2670,6049",
+ "endColumns": "102,96,104,85,99,112,77,77,90,91,93,93,100,92,94,93,90,90,77,109,102,95,110,101,109,158,96,78",
+ "endOffsets": "203,300,405,491,591,704,782,860,951,1043,1137,1231,1332,1425,1520,1614,1705,1796,1874,1984,2087,2183,2294,2396,2506,2665,2762,6123"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-pa\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "247",
+ "endColumns": "209",
+ "endOffsets": "456"
+ },
+ "to": {
+ "startLines": "37",
+ "startColumns": "4",
+ "startOffsets": "3937",
+ "endColumns": "209",
+ "endOffsets": "4142"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-pa\\values-pa.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,160,261,375",
+ "endColumns": "104,100,113,101",
+ "endOffsets": "155,256,370,472"
+ },
+ "to": {
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "5523,5628,5729,5843",
+ "endColumns": "104,100,113,101",
+ "endOffsets": "5623,5724,5838,5940"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-pa\\values.xml",
+ "from": {
+>>>>>>> origin/feature/pushNotifications
"startLines": "4",
"startColumns": "0",
"startOffsets": "207",
@@ -4125,14 +8192,21 @@
"to": {
"startLines": "51",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "5932",
"endColumns": "103",
"endOffsets": "6031"
+=======
+ "startOffsets": "5945",
+ "endColumns": "103",
+ "endOffsets": "6044"
+>>>>>>> origin/feature/pushNotifications
}
}
]
},
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-pl_values-pl.arsc.flat",
"map": [
{
@@ -4143,10 +8217,70 @@
"startOffsets": "245,347,547,667,775,985,1108,1245,1369,1599,1706,1912,2038,2256,2443,2538,2630",
"endColumns": "101,199,119,107,209,122,136,123,229,106,205,125,217,186,94,91,108",
"endOffsets": "346,546,666,774,984,1107,1244,1368,1598,1705,1911,2037,2255,2442,2537,2629,2738"
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-h480dp-land-v13_values-h480dp-land-v13.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\19593d9c2c700c52ad03572ebfd537d5\\material-1.1.0-rc02\\res\\values-h480dp-land-v13\\values-h480dp-land-v13.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10",
+ "startColumns": "4,4,4,4,4,4,4,4,4",
+ "startOffsets": "55,114,170,226,293,358,413,478,547",
+ "endColumns": "58,55,55,66,64,54,64,68,68",
+ "endOffsets": "109,165,221,288,353,408,473,542,611"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-h720dp-v13_values-h720dp-v13.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-h720dp-v13\\values-h720dp-v13.xml",
+ "from": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "66",
+ "endOffsets": "117"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-ro_values-ro.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-ro\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "207",
+ "endColumns": "101",
+ "endOffsets": "308"
+ },
+ "to": {
+ "startLines": "51",
+ "startColumns": "4",
+ "startOffsets": "6028",
+ "endColumns": "105",
+ "endOffsets": "6129"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-ro\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,350,542,669,776,986,1116,1265,1399,1620,1728,1918,2048,2253,2445,2542,2635",
+ "endColumns": "104,191,126,106,209,129,148,133,220,107,189,129,204,191,96,92,106",
+ "endOffsets": "349,541,668,775,985,1115,1264,1398,1619,1727,1917,2047,2252,2444,2541,2634,2741"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+<<<<<<< HEAD
"startOffsets": "2817,2923,3123,3247,3359,3569,3696,3837,4164,4394,4505,4711,4841,5059,5250,5349,5445",
"endColumns": "105,199,123,111,209,126,140,127,229,110,205,129,217,190,98,95,112",
"endOffsets": "2918,3118,3242,3354,3564,3691,3832,3960,4389,4500,4706,4836,5054,5245,5344,5440,5553"
@@ -4171,16 +8305,48 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-pl\\values.xml",
+=======
+ "startOffsets": "2851,2960,3152,3283,3394,3604,3738,3891,4233,4454,4566,4756,4890,5095,5291,5392,5489",
+ "endColumns": "108,191,130,110,209,133,152,137,220,111,189,133,204,195,100,96,110",
+ "endOffsets": "2955,3147,3278,3389,3599,3733,3886,4024,4449,4561,4751,4885,5090,5286,5387,5484,5595"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-ro\\values-ro.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,226,330,443,527,631,752,837,918,1009,1101,1196,1290,1391,1484,1579,1673,1764,1856,1938,2050,2158,2258,2372,2478,2584,2748,2851",
+ "endColumns": "120,103,112,83,103,120,84,80,90,91,94,93,100,92,94,93,90,91,81,111,107,99,113,105,105,163,102,82",
+ "endOffsets": "221,325,438,522,626,747,832,913,1004,1096,1191,1285,1386,1479,1574,1668,1759,1851,1933,2045,2153,2253,2367,2473,2579,2743,2846,2929"
+ },
+ "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,52",
+ "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",
+ "startOffsets": "105,226,330,443,527,631,752,837,918,1009,1101,1196,1290,1391,1484,1579,1673,1764,1856,1938,2050,2158,2258,2372,2478,2584,2748,6134",
+ "endColumns": "120,103,112,83,103,120,84,80,90,91,94,93,100,92,94,93,90,91,81,111,107,99,113,105,105,163,102,82",
+ "endOffsets": "221,325,438,522,626,747,832,913,1004,1096,1191,1285,1386,1479,1574,1668,1759,1851,1933,2045,2153,2253,2367,2473,2579,2743,2846,6212"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-ro\\values.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "4",
"startColumns": "0",
"startOffsets": "247",
+<<<<<<< HEAD
"endColumns": "198",
"endOffsets": "445"
+=======
+ "endColumns": "203",
+ "endOffsets": "450"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "37",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "3965",
"endColumns": "198",
"endOffsets": "4159"
@@ -4188,16 +8354,70 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-pl\\values.xml",
+=======
+ "startOffsets": "4029",
+ "endColumns": "203",
+ "endOffsets": "4228"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-ro\\values-ro.xml",
+ "from": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "100",
+ "endOffsets": "151"
+ },
+ "to": {
+ "startLines": "53",
+ "startColumns": "4",
+ "startOffsets": "6217",
+ "endColumns": "100",
+ "endOffsets": "6313"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-ro\\values-ro.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,162,264,379",
+ "endColumns": "106,101,114,103",
+ "endOffsets": "157,259,374,478"
+ },
+ "to": {
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "5600,5707,5809,5924",
+ "endColumns": "106,101,114,103",
+ "endOffsets": "5702,5804,5919,6023"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-ta_values-ta.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-ta\\values.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "4",
"startColumns": "0",
"startOffsets": "207",
+<<<<<<< HEAD
"endColumns": "98",
"endOffsets": "305"
+=======
+ "endColumns": "100",
+ "endOffsets": "307"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "51",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "5975",
"endColumns": "102",
"endOffsets": "6073"
@@ -4250,10 +8470,26 @@
"startOffsets": "245,352,548,674,784,1021,1150,1297,1441,1680,1790,1990,2119,2340,2542,2639,2728",
"endColumns": "106,195,125,109,236,128,146,143,238,109,199,128,220,201,96,88,104",
"endOffsets": "351,547,673,783,1020,1149,1296,1440,1679,1789,1989,2118,2339,2541,2638,2727,2832"
+=======
+ "startOffsets": "6033",
+ "endColumns": "104",
+ "endOffsets": "6133"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-ta\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,348,532,657,761,972,1098,1237,1363,1605,1710,1894,2027,2240,2422,2510,2599",
+ "endColumns": "102,183,124,103,210,125,138,125,241,104,183,132,212,181,87,88,105",
+ "endOffsets": "347,531,656,760,971,1097,1236,1362,1604,1709,1893,2026,2239,2421,2509,2598,2704"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+<<<<<<< HEAD
"startOffsets": "2832,2943,3139,3269,3383,3620,3753,3904,4256,4495,4609,4809,4942,5163,5369,5470,5563",
"endColumns": "110,195,129,113,236,132,150,147,238,113,199,132,220,205,100,92,108",
"endOffsets": "2938,3134,3264,3378,3615,3748,3899,4047,4490,4604,4804,4937,5158,5364,5465,5558,5667"
@@ -4261,16 +8497,26 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-de\\values-de.xml",
+=======
+ "startOffsets": "2871,2978,3162,3291,3399,3610,3740,3883,4238,4480,4589,4773,4910,5123,5309,5401,5494",
+ "endColumns": "106,183,128,107,210,129,142,129,241,108,183,136,212,185,91,92,109",
+ "endOffsets": "2973,3157,3286,3394,3605,3735,3878,4008,4475,4584,4768,4905,5118,5304,5396,5489,5599"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-ta\\values.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
- "startLines": "2",
- "startColumns": "4",
- "startOffsets": "55",
- "endColumns": "100",
- "endOffsets": "151"
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "247",
+ "endColumns": "224",
+ "endOffsets": "471"
},
"to": {
- "startLines": "53",
+ "startLines": "37",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "6276",
"endColumns": "100",
"endOffsets": "6372"
@@ -4318,10 +8564,43 @@
"startOffsets": "105,210,308,420,506,612,727,805,881,973,1066,1162,1263,1371,1471,1575,1673,1771,1868,1949,2060,2162,2260,2367,2470,2574,2730,2832",
"endColumns": "104,97,111,85,105,114,77,75,91,92,95,100,107,99,103,97,97,96,80,110,101,97,106,102,103,155,101,80",
"endOffsets": "205,303,415,501,607,722,800,876,968,1061,1157,1258,1366,1466,1570,1668,1766,1863,1944,2055,2157,2255,2362,2465,2569,2725,2827,2908"
+=======
+ "startOffsets": "4013",
+ "endColumns": "224",
+ "endOffsets": "4233"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-ta\\values-ta.xml",
+ "from": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "100",
+ "endOffsets": "151"
+ },
+ "to": {
+ "startLines": "53",
+ "startColumns": "4",
+ "startOffsets": "6219",
+ "endColumns": "100",
+ "endOffsets": "6315"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-ta\\values-ta.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,218,320,435,524,635,756,835,912,1010,1109,1204,1298,1406,1506,1608,1702,1800,1898,1978,2086,2189,2288,2404,2507,2612,2769,2871",
+ "endColumns": "112,101,114,88,110,120,78,76,97,98,94,93,107,99,101,93,97,97,79,107,102,98,115,102,104,156,101,80",
+ "endOffsets": "213,315,430,519,630,751,830,907,1005,1104,1199,1293,1401,1501,1603,1697,1795,1893,1973,2081,2184,2283,2399,2502,2607,2764,2866,2947"
+>>>>>>> origin/feature/pushNotifications
},
"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,52",
"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",
+<<<<<<< HEAD
"startOffsets": "105,210,308,420,506,612,727,805,881,973,1066,1162,1263,1371,1471,1575,1673,1771,1868,1949,2060,2162,2260,2367,2470,2574,2730,6195",
"endColumns": "104,97,111,85,105,114,77,75,91,92,95,100,107,99,103,97,97,96,80,110,101,97,106,102,103,155,101,80",
"endOffsets": "205,303,415,501,607,722,800,876,968,1061,1157,1258,1366,1466,1570,1668,1766,1863,1944,2055,2157,2255,2362,2465,2569,2725,2827,6271"
@@ -4342,11 +8621,34 @@
"startOffsets": "6087",
"endColumns": "107",
"endOffsets": "6190"
+=======
+ "startOffsets": "105,218,320,435,524,635,756,835,912,1010,1109,1204,1298,1406,1506,1608,1702,1800,1898,1978,2086,2189,2288,2404,2507,2612,2769,6138",
+ "endColumns": "112,101,114,88,110,120,78,76,97,98,94,93,107,99,101,93,97,97,79,107,102,98,115,102,104,156,101,80",
+ "endOffsets": "213,315,430,519,630,751,830,907,1005,1104,1199,1293,1401,1501,1603,1697,1795,1893,1973,2081,2184,2283,2399,2502,2607,2764,2866,6214"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-ta\\values-ta.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,172,274,381",
+ "endColumns": "116,101,106,102",
+ "endOffsets": "167,269,376,479"
+ },
+ "to": {
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "5604,5721,5823,5930",
+ "endColumns": "116,101,106,102",
+ "endOffsets": "5716,5818,5925,6028"
+>>>>>>> origin/feature/pushNotifications
}
}
]
},
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-v17_values-v17.arsc.flat",
"map": [
{
@@ -4390,10 +8692,23 @@
"startOffsets": "105,208,303,417,503,603,716,793,869,960,1052,1146,1240,1341,1434,1529,1627,1718,1809,1886,1989,2087,2183,2287,2386,2487,2640,2737",
"endColumns": "102,94,113,85,99,112,76,75,90,91,93,93,100,92,94,97,90,90,76,102,97,95,103,98,100,152,96,78",
"endOffsets": "203,298,412,498,598,711,788,864,955,1047,1141,1235,1336,1429,1524,1622,1713,1804,1881,1984,2082,2178,2282,2381,2482,2635,2732,2811"
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-sw_values-sw.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-sw\\values-sw.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,208,307,415,505,610,727,810,893,984,1076,1171,1265,1366,1459,1554,1648,1739,1830,1911,2012,2120,2219,2326,2438,2542,2704,2801",
+ "endColumns": "102,98,107,89,104,116,82,82,90,91,94,93,100,92,94,93,90,90,80,100,107,98,106,111,103,161,96,81",
+ "endOffsets": "203,302,410,500,605,722,805,888,979,1071,1166,1260,1361,1454,1549,1643,1734,1825,1906,2007,2115,2214,2321,2433,2537,2699,2796,2878"
+>>>>>>> origin/feature/pushNotifications
},
"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,52",
"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",
+<<<<<<< HEAD
"startOffsets": "105,208,303,417,503,603,716,793,869,960,1052,1146,1240,1341,1434,1529,1627,1718,1809,1886,1989,2087,2183,2287,2386,2487,2640,5964",
"endColumns": "102,94,113,85,99,112,76,75,90,91,93,93,100,92,94,97,90,90,76,102,97,95,103,98,100,152,96,78",
"endOffsets": "203,298,412,498,598,711,788,864,955,1047,1141,1235,1336,1429,1524,1622,1713,1804,1881,1984,2082,2178,2282,2381,2482,2635,2732,6038"
@@ -4424,10 +8739,26 @@
"startOffsets": "207",
"endColumns": "101",
"endOffsets": "308"
+=======
+ "startOffsets": "105,208,307,415,505,610,727,810,893,984,1076,1171,1265,1366,1459,1554,1648,1739,1830,1911,2012,2120,2219,2326,2438,2542,2704,6093",
+ "endColumns": "102,98,107,89,104,116,82,82,90,91,94,93,100,92,94,93,90,90,80,100,107,98,106,111,103,161,96,81",
+ "endOffsets": "203,302,410,500,605,722,805,888,979,1071,1166,1260,1361,1454,1549,1643,1734,1825,1906,2007,2115,2214,2321,2433,2537,2699,2796,6170"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-sw\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "247",
+ "endColumns": "204",
+ "endOffsets": "451"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
- "startLines": "51",
+ "startLines": "37",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "5858",
"endColumns": "105",
"endOffsets": "5959"
@@ -4458,10 +8789,26 @@
"startOffsets": "55,165,266,378",
"endColumns": "109,100,111,95",
"endOffsets": "160,261,373,469"
+=======
+ "startOffsets": "3974",
+ "endColumns": "204",
+ "endOffsets": "4174"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-sw\\values-sw.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,169,270,387",
+ "endColumns": "113,100,116,101",
+ "endOffsets": "164,265,382,484"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "47,48,49,50",
"startColumns": "4,4,4,4",
+<<<<<<< HEAD
"startOffsets": "5439,5549,5650,5762",
"endColumns": "109,100,111,95",
"endOffsets": "5544,5645,5757,5853"
@@ -4562,6 +8909,32 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-is\\values-is.xml",
+=======
+ "startOffsets": "5551,5665,5766,5883",
+ "endColumns": "113,100,116,101",
+ "endOffsets": "5660,5761,5878,5980"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-sw\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,347,535,658,765,987,1110,1255,1394,1618,1722,1907,2032,2241,2426,2520,2621",
+ "endColumns": "101,187,122,106,221,122,144,138,223,103,184,124,208,184,93,100,120",
+ "endOffsets": "346,534,657,764,986,1109,1254,1393,1617,1721,1906,2031,2240,2425,2519,2620,2741"
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2801,2907,3095,3222,3333,3555,3682,3831,4179,4403,4511,4696,4825,5034,5223,5321,5426",
+ "endColumns": "105,187,126,110,221,126,148,142,223,107,184,128,208,188,97,104,124",
+ "endOffsets": "2902,3090,3217,3328,3550,3677,3826,3969,4398,4506,4691,4820,5029,5218,5316,5421,5546"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-sw\\values-sw.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "2",
"startColumns": "4",
@@ -4572,6 +8945,7 @@
"to": {
"startLines": "53",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "6014",
"endColumns": "100",
"endOffsets": "6110"
@@ -4619,18 +8993,40 @@
"startOffsets": "247",
"endColumns": "187",
"endOffsets": "434"
+=======
+ "startOffsets": "6175",
+ "endColumns": "100",
+ "endOffsets": "6271"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-sw\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "207",
+ "endColumns": "103",
+ "endOffsets": "310"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "37",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "3911",
"endColumns": "187",
"endOffsets": "4094"
+=======
+ "startOffsets": "5985",
+ "endColumns": "107",
+ "endOffsets": "6088"
+>>>>>>> origin/feature/pushNotifications
}
}
]
},
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-mk_values-mk.arsc.flat",
"map": [
{
@@ -4682,10 +9078,97 @@
"startOffsets": "5552,5665,5770,5885",
"endColumns": "112,104,114,99",
"endOffsets": "5660,5765,5880,5980"
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-v21_values-v21.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-v21\\values-v21.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,13",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "55,159,223,290,354,470,596,722,850,1022",
+ "endLines": "2,3,4,5,6,7,8,9,12,17",
+ "endColumns": "103,63,66,63,115,125,125,127,12,12",
+ "endOffsets": "154,218,285,349,465,591,717,845,1017,1355"
+ },
+ "to": {
+ "startLines": "2,13,14,15,303,304,311,315,359,362",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "55,1006,1070,1137,22423,22539,22996,23290,26246,26418",
+ "endLines": "2,13,14,15,303,304,311,315,361,366",
+ "endColumns": "103,63,66,63,115,125,125,127,12,12",
+ "endOffsets": "154,1065,1132,1196,22534,22660,23117,23413,26413,26751"
}
},
{
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\47ce40ad459cbf22b0d81e337967e729\\media-1.0.0\\res\\values-v21\\values-v21.xml",
+ "from": {
+ "startLines": "2,5,8,11",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,223,386,554",
+ "endLines": "4,7,10,13",
+ "endColumns": "12,12,12,12",
+ "endOffsets": "218,381,549,716"
+ },
+ "to": {
+ "startLines": "305,308,312,316",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "22665,22833,23122,23418",
+ "endLines": "307,310,314,318",
+ "endColumns": "12,12,12,12",
+ "endOffsets": "22828,22991,23285,23580"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-v21\\values-v21.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,17,19,20,21,22,24,26,27,28,29,30,32,34,36,38,40,42,43,48,50,52,53,54,56,58,59,60,61,62,63,106,109,152,155,158,160,162,164,167,171,174,175,176,179,180,181,182,183,184,187,188,190,192,194,196,200,202,203,204,205,207,211,213,215,216,217,218,219,220,222,223,224,234,235,236,248",
+ "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",
+ "startOffsets": "55,146,249,352,457,564,673,782,891,1000,1109,1216,1319,1438,1593,1748,1853,1974,2075,2222,2363,2466,2585,2692,2795,2950,3121,3270,3435,3592,3743,3862,4213,4362,4511,4623,4770,4923,5070,5145,5234,5321,5422,5525,8499,8684,11670,11867,12066,12189,12312,12425,12608,12863,13064,13153,13264,13497,13598,13693,13816,13945,14062,14239,14338,14473,14616,14751,14870,15071,15190,15283,15394,15450,15557,15752,15863,15996,16091,16182,16273,16366,16483,16622,16693,16776,17456,17513,17571,18265",
+ "endLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,16,18,19,20,21,23,25,26,27,28,29,31,33,35,37,39,41,42,47,49,51,52,53,55,57,58,59,60,61,62,105,108,151,154,157,159,161,163,166,170,173,174,175,178,179,180,181,182,183,186,187,189,191,193,195,199,201,202,203,204,206,210,212,214,215,216,217,218,219,221,222,223,233,234,235,247,259",
+ "endColumns": "90,102,102,104,106,108,108,108,108,108,106,102,118,12,12,104,120,100,12,12,102,118,106,102,12,12,12,12,12,12,118,12,12,12,111,146,12,12,74,88,86,100,102,12,12,12,12,12,12,12,12,12,12,12,88,110,12,100,94,122,128,116,12,98,12,12,12,12,12,12,92,110,55,12,12,12,12,94,90,90,92,116,12,70,82,12,56,57,12,12",
+ "endOffsets": "141,244,347,452,559,668,777,886,995,1104,1211,1314,1433,1588,1743,1848,1969,2070,2217,2358,2461,2580,2687,2790,2945,3116,3265,3430,3587,3738,3857,4208,4357,4506,4618,4765,4918,5065,5140,5229,5316,5417,5520,8494,8679,11665,11862,12061,12184,12307,12420,12603,12858,13059,13148,13259,13492,13593,13688,13811,13940,14057,14234,14333,14468,14611,14746,14865,15066,15185,15278,15389,15445,15552,15747,15858,15991,16086,16177,16268,16361,16478,16617,16688,16771,17451,17508,17566,18260,18966"
+ },
+ "to": {
+ "startLines": "16,17,18,19,20,21,22,23,24,25,26,27,28,29,31,33,34,35,36,38,40,41,42,43,44,46,48,50,52,54,56,57,62,64,66,67,68,70,72,73,74,75,76,80,123,126,169,172,175,177,179,181,184,188,191,192,193,196,197,198,199,200,201,204,205,207,209,211,213,217,219,220,221,222,224,228,230,232,233,234,235,236,237,265,266,267,277,278,279,291",
+ "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",
+ "startOffsets": "1201,1292,1395,1498,1603,1710,1819,1928,2037,2146,2255,2362,2465,2584,2739,2894,2999,3120,3221,3368,3509,3612,3731,3838,3941,4096,4267,4416,4581,4738,4889,5008,5359,5508,5657,5769,5916,6069,6216,6291,6380,6467,6568,6884,9858,10043,13029,13226,13425,13548,13671,13784,13967,14222,14423,14512,14623,14856,14957,15052,15175,15304,15421,15598,15697,15832,15975,16110,16229,16430,16549,16642,16753,16809,16916,17111,17222,17355,17450,17541,17632,17725,17842,20074,20145,20228,20908,20965,21023,21717",
+ "endLines": "16,17,18,19,20,21,22,23,24,25,26,27,28,30,32,33,34,35,37,39,40,41,42,43,45,47,49,51,53,55,56,61,63,65,66,67,69,71,72,73,74,75,76,122,125,168,171,174,176,178,180,183,187,190,191,192,195,196,197,198,199,200,203,204,206,208,210,212,216,218,219,220,221,223,227,229,231,232,233,234,235,236,238,265,266,276,277,278,290,302",
+ "endColumns": "90,102,102,104,106,108,108,108,108,108,106,102,118,12,12,104,120,100,12,12,102,118,106,102,12,12,12,12,12,12,118,12,12,12,111,146,12,12,74,88,86,100,102,12,12,12,12,12,12,12,12,12,12,12,88,110,12,100,94,122,128,116,12,98,12,12,12,12,12,12,92,110,55,12,12,12,12,94,90,90,92,116,12,70,82,12,56,57,12,12",
+ "endOffsets": "1287,1390,1493,1598,1705,1814,1923,2032,2141,2250,2357,2460,2579,2734,2889,2994,3115,3216,3363,3504,3607,3726,3833,3936,4091,4262,4411,4576,4733,4884,5003,5354,5503,5652,5764,5911,6064,6211,6286,6375,6462,6563,6666,9853,10038,13024,13221,13420,13543,13666,13779,13962,14217,14418,14507,14618,14851,14952,15047,15170,15299,15416,15593,15692,15827,15970,16105,16224,16425,16544,16637,16748,16804,16911,17106,17217,17350,17445,17536,17627,17720,17837,17976,20140,20223,20903,20960,21018,21712,22418"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\19593d9c2c700c52ad03572ebfd537d5\\material-1.1.0-rc02\\res\\values-v21\\values-v21.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,15,16,19,24,35,41,47,53,59,65,69,72,75,78,81,85",
+ "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": "55,123,202,290,378,466,554,641,728,815,902,1115,1231,1401,1722,2751,3208,3550,3894,4244,4594,4987,5205,5427,5653,5869,6110",
+ "endLines": "2,3,4,5,6,7,8,9,10,11,14,15,18,23,34,40,46,52,58,64,68,71,74,77,80,84,88",
+ "endColumns": "67,78,87,87,87,87,86,86,86,86,10,115,10,12,10,10,10,10,10,10,10,10,10,10,10,10,10",
+ "endOffsets": "118,197,285,373,461,549,636,723,810,897,1110,1226,1396,1717,2746,3203,3545,3889,4239,4589,4982,5200,5422,5648,5864,6105,6364"
+ },
+ "to": {
+ "startLines": "3,4,5,6,7,8,9,10,11,12,77,239,240,243,248,259,319,325,331,337,343,347,350,353,356,367,371",
+ "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": "159,227,306,394,482,570,658,745,832,919,6671,17981,18097,18267,18588,19617,23585,23927,24271,24621,24971,25364,25582,25804,26030,26756,26997",
+ "endLines": "3,4,5,6,7,8,9,10,11,12,79,239,242,247,258,264,324,330,336,342,346,349,352,355,358,370,374",
+ "endColumns": "67,78,87,87,87,87,86,86,86,86,10,115,10,12,10,10,10,10,10,10,10,10,10,10,10,10,10",
+ "endOffsets": "222,301,389,477,565,653,740,827,914,1001,6879,18092,18262,18583,19612,20069,23922,24266,24616,24966,25359,25577,25799,26025,26241,26992,27251"
+>>>>>>> origin/feature/pushNotifications
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-hr_values-hr.arsc.flat",
+ "map": [
+ {
+<<<<<<< HEAD
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-mk\\values.xml",
+=======
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-hr\\values.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "4",
"startColumns": "0",
@@ -4696,6 +9179,7 @@
"to": {
"startLines": "51",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "5985",
"endColumns": "103",
"endOffsets": "6084"
@@ -4703,45 +9187,31 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-mk\\values.xml",
+=======
+ "startOffsets": "5912",
+ "endColumns": "103",
+ "endOffsets": "6011"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-hr\\values.xml",
"from": {
"startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
"startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
- "startOffsets": "245,350,543,674,782,986,1117,1263,1398,1614,1719,1916,2047,2259,2444,2539,2629",
- "endColumns": "104,192,130,107,203,130,145,134,215,104,196,130,211,184,94,89,103",
- "endOffsets": "349,542,673,781,985,1116,1262,1397,1613,1718,1915,2046,2258,2443,2538,2628,2732"
+ "startOffsets": "245,349,538,666,774,990,1118,1259,1391,1600,1705,1893,2019,2225,2394,2488,2576",
+ "endColumns": "103,188,127,107,215,127,140,131,208,104,187,125,205,168,93,87,105",
+ "endOffsets": "348,537,665,773,989,1117,1258,1390,1599,1704,1892,2018,2224,2393,2487,2575,2681"
},
"to": {
"startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "2820,2929,3122,3257,3369,3573,3708,3858,4193,4409,4518,4715,4850,5062,5251,5350,5444",
- "endColumns": "108,192,134,111,203,134,149,138,215,108,196,134,211,188,98,93,107",
- "endOffsets": "2924,3117,3252,3364,3568,3703,3853,3992,4404,4513,4710,4845,5057,5246,5345,5439,5547"
+ "startOffsets": "2816,2924,3113,3245,3357,3573,3705,3850,4177,4386,4495,4683,4813,5019,5192,5290,5382",
+ "endColumns": "107,188,131,111,215,131,144,135,208,108,187,129,205,172,97,91,109",
+ "endOffsets": "2919,3108,3240,3352,3568,3700,3845,3981,4381,4490,4678,4808,5014,5187,5285,5377,5487"
}
},
{
- "source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-mk\\values.xml",
- "from": {
- "startLines": "4",
- "startColumns": "0",
- "startOffsets": "247",
- "endColumns": "195",
- "endOffsets": "442"
- },
- "to": {
- "startLines": "37",
- "startColumns": "4",
- "startOffsets": "3997",
- "endColumns": "195",
- "endOffsets": "4188"
- }
- }
- ]
- },
- {
- "outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-sq_values-sq.arsc.flat",
- "map": [
- {
- "source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-sq\\values-sq.xml",
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-hr\\values-hr.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -4752,6 +9222,111 @@
"to": {
"startLines": "53",
"startColumns": "4",
+ "startOffsets": "6100",
+ "endColumns": "100",
+ "endOffsets": "6196"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-hr\\values-hr.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,210,305,412,498,602,721,806,889,980,1072,1167,1261,1362,1455,1550,1645,1736,1827,1912,2016,2128,2229,2334,2448,2550,2719,2816",
+ "endColumns": "104,94,106,85,103,118,84,82,90,91,94,93,100,92,94,94,90,90,84,103,111,100,104,113,101,168,96,83",
+ "endOffsets": "205,300,407,493,597,716,801,884,975,1067,1162,1256,1357,1450,1545,1640,1731,1822,1907,2011,2123,2224,2329,2443,2545,2714,2811,2895"
+ },
+ "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,52",
+ "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",
+ "startOffsets": "105,210,305,412,498,602,721,806,889,980,1072,1167,1261,1362,1455,1550,1645,1736,1827,1912,2016,2128,2229,2334,2448,2550,2719,6016",
+ "endColumns": "104,94,106,85,103,118,84,82,90,91,94,93,100,92,94,94,90,90,84,103,111,100,104,113,101,168,96,83",
+ "endOffsets": "205,300,407,493,597,716,801,884,975,1067,1162,1256,1357,1450,1545,1640,1731,1822,1907,2011,2123,2224,2329,2443,2545,2714,2811,6095"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-hr\\values-hr.xml",
+>>>>>>> origin/feature/pushNotifications
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,160,260,374",
+ "endColumns": "104,99,113,100",
+ "endOffsets": "155,255,369,470"
+ },
+ "to": {
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "5492,5597,5697,5811",
+ "endColumns": "104,99,113,100",
+ "endOffsets": "5592,5692,5806,5907"
+ }
+ },
+ {
+<<<<<<< HEAD
+ "source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-mk\\values.xml",
+=======
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-hr\\values.xml",
+>>>>>>> origin/feature/pushNotifications
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "247",
+ "endColumns": "190",
+ "endOffsets": "437"
+ },
+ "to": {
+ "startLines": "37",
+ "startColumns": "4",
+ "startOffsets": "3986",
+ "endColumns": "190",
+ "endOffsets": "4172"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-pt_values-pt.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-pt\\values-pt.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,225,331,438,527,628,747,832,913,1004,1096,1191,1285,1386,1479,1574,1669,1760,1851,1935,2042,2153,2255,2363,2471,2581,2743,2843",
+ "endColumns": "119,105,106,88,100,118,84,80,90,91,94,93,100,92,94,94,90,90,83,106,110,101,107,107,109,161,99,84",
+ "endOffsets": "220,326,433,522,623,742,827,908,999,1091,1186,1280,1381,1474,1569,1664,1755,1846,1930,2037,2148,2250,2358,2466,2576,2738,2838,2923"
+ },
+ "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,33",
+ "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",
+ "startOffsets": "105,225,331,438,527,628,747,832,913,1004,1096,1191,1285,1386,1479,1574,1669,1760,1851,1935,2042,2153,2255,2363,2471,2581,2743,3274",
+ "endColumns": "119,105,106,88,100,118,84,80,90,91,94,93,100,92,94,94,90,90,83,106,110,101,107,107,109,161,99,84",
+ "endOffsets": "220,326,433,522,623,742,827,908,999,1091,1186,1280,1381,1474,1569,1664,1755,1846,1930,2037,2148,2250,2358,2466,2576,2738,2838,3354"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-sq_values-sq.arsc.flat",
+ "map": [
+ {
+<<<<<<< HEAD
+ "source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-sq\\values-sq.xml",
+=======
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-pt\\values-pt.xml",
+>>>>>>> origin/feature/pushNotifications
+ "from": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "100",
+ "endOffsets": "151"
+ },
+ "to": {
+ "startLines": "34",
+ "startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "6256",
"endColumns": "100",
"endOffsets": "6352"
@@ -4810,16 +9385,53 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-sq\\values.xml",
+=======
+ "startOffsets": "3359",
+ "endColumns": "100",
+ "endOffsets": "3455"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-pt\\values-pt.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,170,269,381",
+ "endColumns": "114,98,111,104",
+ "endOffsets": "165,264,376,481"
+ },
+ "to": {
+ "startLines": "29,30,31,32",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "2843,2958,3057,3169",
+ "endColumns": "114,98,111,104",
+ "endOffsets": "2953,3052,3164,3269"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-hi_values-hi.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-hi\\values.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "4",
"startColumns": "0",
"startOffsets": "207",
+<<<<<<< HEAD
"endColumns": "105",
"endOffsets": "312"
+=======
+ "endColumns": "98",
+ "endOffsets": "305"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "51",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "6065",
"endColumns": "109",
"endOffsets": "6170"
@@ -4833,13 +9445,68 @@
"startOffsets": "55,170,271,382",
"endColumns": "114,100,110,99",
"endOffsets": "165,266,377,477"
+=======
+ "startOffsets": "5929",
+ "endColumns": "102",
+ "endOffsets": "6027"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-hi\\values-hi.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,161,263,375",
+ "endColumns": "105,101,111,101",
+ "endOffsets": "156,258,370,472"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "47,48,49,50",
"startColumns": "4,4,4,4",
+<<<<<<< HEAD
"startOffsets": "5638,5753,5854,5965",
"endColumns": "114,100,110,99",
"endOffsets": "5748,5849,5960,6060"
+=======
+ "startOffsets": "5507,5613,5715,5827",
+ "endColumns": "105,101,111,101",
+ "endOffsets": "5608,5710,5822,5924"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-hi\\values-hi.xml",
+ "from": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "100",
+ "endOffsets": "151"
+ },
+ "to": {
+ "startLines": "53",
+ "startColumns": "4",
+ "startOffsets": "6113",
+ "endColumns": "100",
+ "endOffsets": "6209"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-hi\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "247",
+ "endColumns": "204",
+ "endOffsets": "451"
+ },
+ "to": {
+ "startLines": "37",
+ "startColumns": "4",
+ "startOffsets": "3956",
+ "endColumns": "204",
+ "endOffsets": "4156"
+>>>>>>> origin/feature/pushNotifications
}
}
]
@@ -4848,6 +9515,7 @@
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-ko_values-ko.arsc.flat",
"map": [
{
+<<<<<<< HEAD
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-ko\\values.xml",
"from": {
"startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
@@ -4855,10 +9523,20 @@
"startOffsets": "245,347,518,632,732,906,1021,1154,1274,1478,1579,1746,1862,2039,2184,2269,2353",
"endColumns": "101,170,113,99,173,114,132,119,203,100,166,115,176,144,84,83,99",
"endOffsets": "346,517,631,731,905,1020,1153,1273,1477,1578,1745,1861,2038,2183,2268,2352,2452"
+=======
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-hi\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,351,543,667,777,987,1115,1253,1390,1606,1713,1910,2038,2238,2417,2506,2599",
+ "endColumns": "105,191,123,109,209,127,137,136,215,106,196,127,199,178,88,92,112",
+ "endOffsets": "350,542,666,776,986,1114,1252,1389,1605,1712,1909,2037,2237,2416,2505,2598,2711"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+<<<<<<< HEAD
"startOffsets": "2685,2791,2962,3080,3184,3358,3477,3614,3918,4122,4227,4394,4514,4691,4840,4929,5017",
"endColumns": "105,170,117,103,173,118,136,123,203,104,166,119,176,148,88,87,103",
"endOffsets": "2786,2957,3075,3179,3353,3472,3609,3733,4117,4222,4389,4509,4686,4835,4924,5012,5116"
@@ -4996,10 +9674,82 @@
"startOffsets": "245,350,548,672,780,981,1108,1249,1378,1618,1723,1917,2041,2267,2451,2546,2632",
"endColumns": "104,197,123,107,200,126,140,128,239,104,193,123,225,183,94,85,110",
"endOffsets": "349,547,671,779,980,1107,1248,1377,1617,1722,1916,2040,2266,2450,2545,2631,2742"
+=======
+ "startOffsets": "2787,2897,3089,3217,3331,3541,3673,3815,4161,4377,4488,4685,4817,5017,5200,5293,5390",
+ "endColumns": "109,191,127,113,209,131,141,140,215,110,196,131,199,182,92,96,116",
+ "endOffsets": "2892,3084,3212,3326,3536,3668,3810,3951,4372,4483,4680,4812,5012,5195,5288,5385,5502"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-hi\\values-hi.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,211,309,419,505,607,728,806,884,975,1067,1162,1256,1357,1450,1545,1639,1730,1821,1901,2006,2108,2206,2316,2419,2528,2686,2787",
+ "endColumns": "105,97,109,85,101,120,77,77,90,91,94,93,100,92,94,93,90,90,79,104,101,97,109,102,108,157,100,80",
+ "endOffsets": "206,304,414,500,602,723,801,879,970,1062,1157,1251,1352,1445,1540,1634,1725,1816,1896,2001,2103,2201,2311,2414,2523,2681,2782,2863"
+ },
+ "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,52",
+ "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",
+ "startOffsets": "105,211,309,419,505,607,728,806,884,975,1067,1162,1256,1357,1450,1545,1639,1730,1821,1901,2006,2108,2206,2316,2419,2528,2686,6032",
+ "endColumns": "105,97,109,85,101,120,77,77,90,91,94,93,100,92,94,93,90,90,79,104,101,97,109,102,108,157,100,80",
+ "endOffsets": "206,304,414,500,602,723,801,879,970,1062,1157,1251,1352,1445,1540,1634,1725,1816,1896,2001,2103,2201,2311,2414,2523,2681,2782,6108"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-ur_values-ur.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-ur\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "207",
+ "endColumns": "101",
+ "endOffsets": "308"
+ },
+ "to": {
+ "startLines": "51",
+ "startColumns": "4",
+ "startOffsets": "5979",
+ "endColumns": "105",
+ "endOffsets": "6080"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-ur\\values-ur.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,219,325,434,520,624,744,821,897,989,1082,1177,1271,1373,1467,1563,1657,1749,1841,1925,2033,2139,2241,2352,2453,2569,2734,2832",
+ "endColumns": "113,105,108,85,103,119,76,75,91,92,94,93,101,93,95,93,91,91,83,107,105,101,110,100,115,164,97,84",
+ "endOffsets": "214,320,429,515,619,739,816,892,984,1077,1172,1266,1368,1462,1558,1652,1744,1836,1920,2028,2134,2236,2347,2448,2564,2729,2827,2912"
+ },
+ "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,52",
+ "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",
+ "startOffsets": "105,219,325,434,520,624,744,821,897,989,1082,1177,1271,1373,1467,1563,1657,1749,1841,1925,2033,2139,2241,2352,2453,2569,2734,6085",
+ "endColumns": "113,105,108,85,103,119,76,75,91,92,94,93,101,93,95,93,91,91,83,107,105,101,110,100,115,164,97,84",
+ "endOffsets": "214,320,429,515,619,739,816,892,984,1077,1172,1266,1368,1462,1558,1652,1744,1836,1920,2028,2134,2236,2347,2448,2564,2729,2827,6165"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-ur\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,351,547,671,780,979,1104,1242,1371,1582,1690,1893,2019,2224,2419,2508,2601",
+ "endColumns": "105,195,123,108,198,124,137,128,210,107,202,125,204,194,88,92,112",
+ "endOffsets": "350,546,670,779,978,1103,1241,1370,1581,1689,1892,2018,2223,2418,2507,2600,2713"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+<<<<<<< HEAD
"startOffsets": "2822,2931,3129,3257,3369,3570,3701,3846,4195,4435,4544,4738,4866,5092,5280,5379,5469",
"endColumns": "108,197,127,111,200,130,144,132,239,108,193,127,225,187,98,89,114",
"endOffsets": "2926,3124,3252,3364,3565,3696,3841,3974,4430,4539,4733,4861,5087,5275,5374,5464,5579"
@@ -5007,16 +9757,31 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-ru\\values.xml",
+=======
+ "startOffsets": "2832,2942,3138,3266,3379,3578,3707,3849,4193,4404,4516,4719,4849,5054,5253,5346,5443",
+ "endColumns": "109,195,127,112,198,128,141,132,210,111,202,129,204,198,92,96,116",
+ "endOffsets": "2937,3133,3261,3374,3573,3702,3844,3977,4399,4511,4714,4844,5049,5248,5341,5438,5555"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-ur\\values.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "4",
"startColumns": "0",
"startOffsets": "247",
+<<<<<<< HEAD
"endColumns": "215",
"endOffsets": "462"
+=======
+ "endColumns": "210",
+ "endOffsets": "457"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "37",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "3979",
"endColumns": "215",
"endOffsets": "4190"
@@ -5069,10 +9834,26 @@
"startOffsets": "55,166,271,385",
"endColumns": "110,104,113,103",
"endOffsets": "161,266,380,484"
+=======
+ "startOffsets": "3982",
+ "endColumns": "210",
+ "endOffsets": "4188"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-ur\\values-ur.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,156,257,368",
+ "endColumns": "100,100,110,105",
+ "endOffsets": "151,252,363,469"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "47,48,49,50",
"startColumns": "4,4,4,4",
+<<<<<<< HEAD
"startOffsets": "5545,5656,5761,5875",
"endColumns": "110,104,113,103",
"endOffsets": "5651,5756,5870,5974"
@@ -5080,6 +9861,15 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-vi\\values-vi.xml",
+=======
+ "startOffsets": "5560,5661,5762,5873",
+ "endColumns": "100,100,110,105",
+ "endOffsets": "5656,5757,5868,5974"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-ur\\values-ur.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "2",
"startColumns": "4",
@@ -5090,12 +9880,24 @@
"to": {
"startLines": "53",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "6166",
"endColumns": "100",
"endOffsets": "6262"
+=======
+ "startOffsets": "6170",
+ "endColumns": "100",
+ "endOffsets": "6266"
+>>>>>>> origin/feature/pushNotifications
}
- },
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-h360dp-land-v13_values-h360dp-land-v13.arsc.flat",
+ "map": [
{
+<<<<<<< HEAD
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-vi\\values.xml",
"from": {
"startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
@@ -5110,20 +9912,39 @@
"startOffsets": "2798,2902,3096,3223,3332,3556,3688,3845,4173,4413,4522,4714,4846,5064,5243,5341,5435",
"endColumns": "103,193,126,108,223,131,156,132,239,108,191,131,217,178,97,93,109",
"endOffsets": "2897,3091,3218,3327,3551,3683,3840,3973,4408,4517,4709,4841,5059,5238,5336,5430,5540"
+=======
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\19593d9c2c700c52ad03572ebfd537d5\\material-1.1.0-rc02\\res\\values-h360dp-land-v13\\values-h360dp-land-v13.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10",
+ "startColumns": "4,4,4,4,4,4,4,4,4",
+ "startOffsets": "55,114,170,226,293,358,413,478,547",
+ "endColumns": "58,55,55,66,64,54,64,68,68",
+ "endOffsets": "109,165,221,288,353,408,473,542,611"
+>>>>>>> origin/feature/pushNotifications
}
- },
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-et_values-et.arsc.flat",
+ "map": [
{
+<<<<<<< HEAD
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-vi\\values.xml",
+=======
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-et\\values.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "4",
"startColumns": "0",
- "startOffsets": "207",
- "endColumns": "98",
- "endOffsets": "305"
+ "startOffsets": "247",
+ "endColumns": "198",
+ "endOffsets": "445"
},
"to": {
- "startLines": "51",
+ "startLines": "37",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "5979",
"endColumns": "102",
"endOffsets": "6077"
@@ -5176,16 +9997,111 @@
"startOffsets": "251",
"endColumns": "157",
"endOffsets": "408"
+=======
+ "startOffsets": "3983",
+ "endColumns": "198",
+ "endOffsets": "4177"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-et\\values-et.xml",
+ "from": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "100",
+ "endOffsets": "151"
+ },
+ "to": {
+ "startLines": "53",
+ "startColumns": "4",
+ "startOffsets": "6123",
+ "endColumns": "100",
+ "endOffsets": "6219"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-et\\values-et.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,155,255,362",
+ "endColumns": "99,99,106,97",
+ "endOffsets": "150,250,357,455"
+ },
+ "to": {
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "5534,5634,5734,5841",
+ "endColumns": "99,99,106,97",
+ "endOffsets": "5629,5729,5836,5934"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-et\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,346,540,665,771,980,1107,1249,1377,1596,1702,1897,2027,2241,2412,2501,2592",
+ "endColumns": "100,193,124,105,208,126,141,127,218,105,194,129,213,170,88,90,112",
+ "endOffsets": "345,539,664,770,979,1106,1248,1376,1595,1701,1896,2026,2240,2411,2500,2591,2704"
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2827,2932,3126,3255,3365,3574,3705,3851,4182,4401,4511,4706,4840,5054,5229,5322,5417",
+ "endColumns": "104,193,128,109,208,130,145,131,218,109,194,133,213,174,92,94,116",
+ "endOffsets": "2927,3121,3250,3360,3569,3700,3846,3978,4396,4506,4701,4835,5049,5224,5317,5412,5529"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-et\\values-et.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,211,310,421,507,609,726,807,885,977,1070,1166,1268,1378,1472,1573,1667,1759,1852,1934,2045,2149,2248,2358,2460,2559,2725,2827",
+ "endColumns": "105,98,110,85,101,116,80,77,91,92,95,101,109,93,100,93,91,92,81,110,103,98,109,101,98,165,101,81",
+ "endOffsets": "206,305,416,502,604,721,802,880,972,1065,1161,1263,1373,1467,1568,1662,1754,1847,1929,2040,2144,2243,2353,2455,2554,2720,2822,2904"
+ },
+ "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,52",
+ "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",
+ "startOffsets": "105,211,310,421,507,609,726,807,885,977,1070,1166,1268,1378,1472,1573,1667,1759,1852,1934,2045,2149,2248,2358,2460,2559,2725,6041",
+ "endColumns": "105,98,110,85,101,116,80,77,91,92,95,101,109,93,100,93,91,92,81,110,103,98,109,101,98,165,101,81",
+ "endOffsets": "206,305,416,502,604,721,802,880,972,1065,1161,1263,1373,1467,1568,1662,1754,1847,1929,2040,2144,2243,2353,2455,2554,2720,2822,6118"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-et\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "207",
+ "endColumns": "97",
+ "endOffsets": "304"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "37",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "3682",
"endColumns": "157",
"endOffsets": "3835"
+=======
+ "startOffsets": "5939",
+ "endColumns": "101",
+ "endOffsets": "6036"
+>>>>>>> origin/feature/pushNotifications
}
- },
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-hdpi-v4_values-hdpi-v4.arsc.flat",
+ "map": [
{
+<<<<<<< HEAD
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-zh-rCN\\values-zh-rCN.xml",
"from": {
"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",
@@ -5244,10 +10160,87 @@
"startOffsets": "55,138,230,331",
"endColumns": "82,91,100,91",
"endOffsets": "133,225,326,418"
+=======
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-hdpi-v4\\values-hdpi-v4.xml",
+ "from": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endLines": "6",
+ "endColumns": "13",
+ "endOffsets": "327"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-fr_values-fr.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-fr\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,349,561,689,796,1026,1157,1304,1442,1679,1789,2005,2139,2358,2563,2662,2755",
+ "endColumns": "103,211,127,106,229,130,146,137,236,109,215,133,218,204,98,92,108",
+ "endOffsets": "348,560,688,795,1025,1156,1303,1441,1678,1788,2004,2138,2357,2562,2661,2754,2863"
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2847,2955,3167,3299,3410,3640,3775,3926,4292,4529,4643,4859,4997,5216,5425,5528,5625",
+ "endColumns": "107,211,131,110,229,134,150,141,236,113,215,137,218,208,102,96,112",
+ "endOffsets": "2950,3162,3294,3405,3635,3770,3921,4063,4524,4638,4854,4992,5211,5420,5523,5620,5733"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-fr\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "207",
+ "endColumns": "100",
+ "endOffsets": "307"
+ },
+ "to": {
+ "startLines": "51",
+ "startColumns": "4",
+ "startOffsets": "6170",
+ "endColumns": "104",
+ "endOffsets": "6270"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-fr\\values-fr.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,216,331,441,523,629,759,837,914,1005,1097,1195,1290,1391,1484,1577,1672,1763,1854,1939,2049,2160,2263,2374,2482,2589,2748,2847",
+ "endColumns": "110,114,109,81,105,129,77,76,90,91,97,94,100,92,92,94,90,90,84,109,110,102,110,107,106,158,98,85",
+ "endOffsets": "211,326,436,518,624,754,832,909,1000,1092,1190,1285,1386,1479,1572,1667,1758,1849,1934,2044,2155,2258,2369,2477,2584,2743,2842,2928"
+ },
+ "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,52",
+ "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",
+ "startOffsets": "105,216,331,441,523,629,759,837,914,1005,1097,1195,1290,1391,1484,1577,1672,1763,1854,1939,2049,2160,2263,2374,2482,2589,2748,6275",
+ "endColumns": "110,114,109,81,105,129,77,76,90,91,97,94,100,92,92,94,90,90,84,109,110,102,110,107,106,158,98,85",
+ "endOffsets": "211,326,436,518,624,754,832,909,1000,1092,1190,1285,1386,1479,1572,1667,1758,1849,1934,2044,2155,2258,2369,2477,2584,2743,2842,6356"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-fr\\values-fr.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,162,264,383",
+ "endColumns": "106,101,118,103",
+ "endOffsets": "157,259,378,482"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "47,48,49,50",
"startColumns": "4,4,4,4",
+<<<<<<< HEAD
"startOffsets": "4965,5048,5140,5241",
"endColumns": "82,91,100,91",
"endOffsets": "5043,5135,5236,5328"
@@ -5261,18 +10254,57 @@
"startOffsets": "55",
"endColumns": "100",
"endOffsets": "151"
+=======
+ "startOffsets": "5738,5845,5947,6066",
+ "endColumns": "106,101,118,103",
+ "endOffsets": "5840,5942,6061,6165"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-fr\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "247",
+ "endColumns": "223",
+ "endOffsets": "470"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "53",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "5512",
"endColumns": "100",
"endOffsets": "5608"
+=======
+ "startOffsets": "4068",
+ "endColumns": "223",
+ "endOffsets": "4287"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-fr\\values-fr.xml",
+ "from": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "100",
+ "endOffsets": "151"
+ },
+ "to": {
+ "startLines": "53",
+ "startColumns": "4",
+ "startOffsets": "6361",
+ "endColumns": "100",
+ "endOffsets": "6457"
+>>>>>>> origin/feature/pushNotifications
}
}
]
},
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-watch-v20_values-watch-v20.arsc.flat",
"map": [
{
@@ -5284,6 +10316,25 @@
"endLines": "4,7,10",
"endColumns": "12,12,12",
"endOffsets": "209,380,553"
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-ml_values-ml.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-ml\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "207",
+ "endColumns": "98",
+ "endOffsets": "305"
+ },
+ "to": {
+ "startLines": "51",
+ "startColumns": "4",
+ "startOffsets": "6130",
+ "endColumns": "102",
+ "endOffsets": "6228"
+>>>>>>> origin/feature/pushNotifications
}
}
]
@@ -5292,6 +10343,7 @@
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-lt_values-lt.arsc.flat",
"map": [
{
+<<<<<<< HEAD
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-lt\\values.xml",
"from": {
"startLines": "4",
@@ -5316,10 +10368,54 @@
"startOffsets": "105,221,325,438,525,627,749,832,913,1007,1102,1199,1295,1399,1495,1593,1689,1783,1877,1959,2068,2176,2276,2386,2491,2597,2773,2874",
"endColumns": "115,103,112,86,101,121,82,80,93,94,96,95,103,95,97,95,93,93,81,108,107,99,109,104,105,175,100,82",
"endOffsets": "216,320,433,520,622,744,827,908,1002,1097,1194,1290,1394,1490,1588,1684,1778,1872,1954,2063,2171,2271,2381,2486,2592,2768,2869,2952"
+=======
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-ml\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,362,573,710,829,1052,1175,1306,1437,1678,1792,1997,2131,2339,2526,2616,2711",
+ "endColumns": "116,210,136,118,222,122,130,130,240,113,204,133,207,186,89,94,116",
+ "endOffsets": "361,572,709,828,1051,1174,1305,1436,1677,1791,1996,2130,2338,2525,2615,2710,2827"
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2854,2975,3186,3327,3450,3673,3800,3935,4289,4530,4648,4853,4991,5199,5390,5484,5583",
+ "endColumns": "120,210,140,122,222,126,134,134,240,117,204,137,207,190,93,98,120",
+ "endOffsets": "2970,3181,3322,3445,3668,3795,3930,4065,4525,4643,4848,4986,5194,5385,5479,5578,5699"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-ml\\values-ml.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,164,267,378",
+ "endColumns": "108,102,110,102",
+ "endOffsets": "159,262,373,476"
+ },
+ "to": {
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "5704,5813,5916,6027",
+ "endColumns": "108,102,110,102",
+ "endOffsets": "5808,5911,6022,6125"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-ml\\values-ml.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,212,318,429,520,625,747,825,901,992,1084,1185,1279,1380,1474,1569,1668,1759,1850,1931,2040,2144,2243,2355,2467,2588,2753,2854",
+ "endColumns": "106,105,110,90,104,121,77,75,90,91,100,93,100,93,94,98,90,90,80,108,103,98,111,111,120,164,100,81",
+ "endOffsets": "207,313,424,515,620,742,820,896,987,1079,1180,1274,1375,1469,1564,1663,1754,1845,1926,2035,2139,2238,2350,2462,2583,2748,2849,2931"
+>>>>>>> origin/feature/pushNotifications
},
"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,52",
"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",
+<<<<<<< HEAD
"startOffsets": "105,221,325,438,525,627,749,832,913,1007,1102,1199,1295,1399,1495,1593,1689,1783,1877,1959,2068,2176,2276,2386,2491,2597,2773,6164",
"endColumns": "115,103,112,86,101,121,82,80,93,94,96,95,103,95,97,95,93,93,81,108,107,99,109,104,105,175,100,82",
"endOffsets": "216,320,433,520,622,744,827,908,1002,1097,1194,1290,1394,1490,1588,1684,1778,1872,1954,2063,2171,2271,2381,2486,2592,2768,2869,6242"
@@ -5344,6 +10440,15 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-lt\\values-lt.xml",
+=======
+ "startOffsets": "105,212,318,429,520,625,747,825,901,992,1084,1185,1279,1380,1474,1569,1668,1759,1850,1931,2040,2144,2243,2355,2467,2588,2753,6233",
+ "endColumns": "106,105,110,90,104,121,77,75,90,91,100,93,100,93,94,98,90,90,80,108,103,98,111,111,120,164,100,81",
+ "endOffsets": "207,313,424,515,620,742,820,896,987,1079,1180,1274,1375,1469,1564,1663,1754,1845,1926,2035,2139,2238,2350,2462,2583,2748,2849,6310"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-ml\\values-ml.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "2",
"startColumns": "4",
@@ -5354,6 +10459,7 @@
"to": {
"startLines": "53",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "6247",
"endColumns": "100",
"endOffsets": "6343"
@@ -5367,10 +10473,26 @@
"startOffsets": "207",
"endColumns": "101",
"endOffsets": "308"
+=======
+ "startOffsets": "6315",
+ "endColumns": "100",
+ "endOffsets": "6411"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-ml\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "247",
+ "endColumns": "218",
+ "endOffsets": "465"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
- "startLines": "51",
+ "startLines": "37",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "6058",
"endColumns": "105",
"endOffsets": "6159"
@@ -5391,23 +10513,36 @@
"startOffsets": "5629,5734,5839,5953",
"endColumns": "104,104,113,104",
"endOffsets": "5729,5834,5948,6053"
+=======
+ "startOffsets": "4070",
+ "endColumns": "218",
+ "endOffsets": "4284"
+>>>>>>> origin/feature/pushNotifications
}
}
]
},
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-en-rAU_values-en-rAU.arsc.flat",
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-en-rAU\\values-en-rAU.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-or_values-or.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-or\\values.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
- "startLines": "2",
- "startColumns": "4",
- "startOffsets": "55",
- "endColumns": "100",
- "endOffsets": "151"
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "247",
+ "endColumns": "198",
+ "endOffsets": "445"
},
"to": {
+<<<<<<< HEAD
"startLines": "34",
"startColumns": "4",
"startOffsets": "3246",
@@ -5447,11 +10582,104 @@
"startOffsets": "2762,2860,2957,3066",
"endColumns": "97,96,108,97",
"endOffsets": "2855,2952,3061,3159"
+=======
+ "startLines": "37",
+ "startColumns": "4",
+ "startOffsets": "4053",
+ "endColumns": "198",
+ "endOffsets": "4247"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-or\\values-or.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,165,270,383",
+ "endColumns": "109,104,112,107",
+ "endOffsets": "160,265,378,486"
+ },
+ "to": {
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "5634,5744,5849,5962",
+ "endColumns": "109,104,112,107",
+ "endOffsets": "5739,5844,5957,6065"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-or\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "207",
+ "endColumns": "102",
+ "endOffsets": "309"
+ },
+ "to": {
+ "startLines": "51",
+ "startColumns": "4",
+ "startOffsets": "6070",
+ "endColumns": "106",
+ "endOffsets": "6172"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-or\\values-or.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,224,334,441,527,631,751,829,906,997,1089,1185,1280,1381,1474,1569,1665,1756,1846,1934,2044,2148,2254,2365,2469,2587,2750,2856",
+ "endColumns": "118,109,106,85,103,119,77,76,90,91,95,94,100,92,94,95,90,89,87,109,103,105,110,103,117,162,105,88",
+ "endOffsets": "219,329,436,522,626,746,824,901,992,1084,1180,1275,1376,1469,1564,1660,1751,1841,1929,2039,2143,2249,2360,2464,2582,2745,2851,2940"
+ },
+ "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,52",
+ "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",
+ "startOffsets": "105,224,334,441,527,631,751,829,906,997,1089,1185,1280,1381,1474,1569,1665,1756,1846,1934,2044,2148,2254,2365,2469,2587,2750,6177",
+ "endColumns": "118,109,106,85,103,119,77,76,90,91,95,94,100,92,94,95,90,89,87,109,103,105,110,103,117,162,105,88",
+ "endOffsets": "219,329,436,522,626,746,824,901,992,1084,1180,1275,1376,1469,1564,1660,1751,1841,1929,2039,2143,2249,2360,2464,2582,2745,2851,6261"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-or\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,354,547,678,793,1008,1142,1283,1418,1645,1756,1948,2080,2291,2475,2566,2664",
+ "endColumns": "108,192,130,114,214,133,140,134,226,110,191,131,210,183,90,97,111",
+ "endOffsets": "353,546,677,792,1007,1141,1282,1417,1644,1755,1947,2079,2290,2474,2565,2663,2775"
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2856,2969,3162,3297,3416,3631,3769,3914,4252,4479,4594,4786,4922,5133,5321,5416,5518",
+ "endColumns": "112,192,134,118,214,137,144,138,226,114,191,135,210,187,94,101,115",
+ "endOffsets": "2964,3157,3292,3411,3626,3764,3909,4048,4474,4589,4781,4917,5128,5316,5411,5513,5629"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-or\\values-or.xml",
+ "from": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "100",
+ "endOffsets": "151"
+ },
+ "to": {
+ "startLines": "53",
+ "startColumns": "4",
+ "startOffsets": "6266",
+ "endColumns": "100",
+ "endOffsets": "6362"
+>>>>>>> origin/feature/pushNotifications
}
}
]
},
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-zh-rTW_values-zh-rTW.arsc.flat",
"map": [
{
@@ -5496,10 +10724,57 @@
"startOffsets": "105,200,293,393,475,572,680,757,833,925,1018,1115,1211,1307,1401,1497,1589,1681,1773,1850,1946,2041,2136,2233,2329,2427,2577,2671",
"endColumns": "94,92,99,81,96,107,76,75,91,92,96,95,95,93,95,91,91,91,76,95,94,94,96,95,97,149,93,77",
"endOffsets": "195,288,388,470,567,675,752,828,920,1013,1110,1206,1302,1396,1492,1584,1676,1768,1845,1941,2036,2131,2228,2324,2422,2572,2666,2744"
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-hu_values-hu.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-hu\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "247",
+ "endColumns": "235",
+ "endOffsets": "482"
+ },
+ "to": {
+ "startLines": "37",
+ "startColumns": "4",
+ "startOffsets": "4097",
+ "endColumns": "235",
+ "endOffsets": "4328"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-hu\\values-hu.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,151,252,367",
+ "endColumns": "95,100,114,102",
+ "endOffsets": "146,247,362,465"
+ },
+ "to": {
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "5776,5872,5973,6088",
+ "endColumns": "95,100,114,102",
+ "endOffsets": "5867,5968,6083,6186"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-hu\\values-hu.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,213,305,420,504,619,742,819,895,986,1078,1173,1267,1368,1461,1556,1651,1742,1833,1915,2025,2135,2235,2346,2455,2574,2756,2859",
+ "endColumns": "107,91,114,83,114,122,76,75,90,91,94,93,100,92,94,94,90,90,81,109,109,99,110,108,118,181,102,82",
+ "endOffsets": "208,300,415,499,614,737,814,890,981,1073,1168,1262,1363,1456,1551,1646,1737,1828,1910,2020,2130,2230,2341,2450,2569,2751,2854,2937"
+>>>>>>> origin/feature/pushNotifications
},
"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,52",
"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",
+<<<<<<< HEAD
"startOffsets": "105,200,293,393,475,572,680,757,833,925,1018,1115,1211,1307,1401,1497,1589,1681,1773,1850,1946,2041,2136,2233,2329,2427,2577,5449",
"endColumns": "94,92,99,81,96,107,76,75,91,92,96,95,95,93,95,91,91,91,76,95,94,94,96,95,97,149,93,77",
"endOffsets": "195,288,388,470,567,675,752,828,920,1013,1110,1206,1302,1396,1492,1584,1676,1768,1845,1941,2036,2131,2228,2324,2422,2572,2666,5522"
@@ -5530,10 +10805,26 @@
"startOffsets": "251",
"endColumns": "161",
"endOffsets": "412"
+=======
+ "startOffsets": "105,213,305,420,504,619,742,819,895,986,1078,1173,1267,1368,1461,1556,1651,1742,1833,1915,2025,2135,2235,2346,2455,2574,2756,6295",
+ "endColumns": "107,91,114,83,114,122,76,75,90,91,94,93,100,92,94,94,90,90,81,109,109,99,110,108,118,181,102,82",
+ "endOffsets": "208,300,415,499,614,737,814,890,981,1073,1168,1262,1363,1456,1551,1646,1737,1828,1910,2020,2130,2230,2341,2450,2569,2751,2854,6373"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-hu\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "207",
+ "endColumns": "99",
+ "endOffsets": "306"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
- "startLines": "37",
+ "startLines": "51",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "3693",
"endColumns": "161",
"endOffsets": "3850"
@@ -5541,6 +10832,32 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-zh-rTW\\values-zh-rTW.xml",
+=======
+ "startOffsets": "6191",
+ "endColumns": "103",
+ "endOffsets": "6290"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-hu\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,354,570,706,813,1040,1176,1324,1459,1688,1794,2010,2145,2376,2574,2671,2765",
+ "endColumns": "108,215,135,106,226,135,147,134,228,105,215,134,230,197,96,93,112",
+ "endOffsets": "353,569,705,812,1039,1175,1323,1458,1687,1793,2009,2144,2375,2573,2670,2764,2877"
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2859,2972,3188,3328,3439,3666,3806,3958,4333,4562,4672,4888,5027,5258,5460,5561,5659",
+ "endColumns": "112,215,139,110,226,139,151,138,228,109,215,138,230,201,100,97,116",
+ "endOffsets": "2967,3183,3323,3434,3661,3801,3953,4092,4557,4667,4883,5022,5253,5455,5556,5654,5771"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-hu\\values-hu.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "2",
"startColumns": "4",
@@ -5551,14 +10868,21 @@
"to": {
"startLines": "53",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "5527",
"endColumns": "100",
"endOffsets": "5623"
+=======
+ "startOffsets": "6378",
+ "endColumns": "100",
+ "endOffsets": "6474"
+>>>>>>> origin/feature/pushNotifications
}
}
]
},
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-h480dp-land-v13_values-h480dp-land-v13.arsc.flat",
"map": [
{
@@ -5569,6 +10893,25 @@
"startOffsets": "55,114,170,226,293,358,413,478,547",
"endColumns": "58,55,55,66,64,54,64,68,68",
"endOffsets": "109,165,221,288,353,408,473,542,611"
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-af_values-af.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-af\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "207",
+ "endColumns": "101",
+ "endOffsets": "308"
+ },
+ "to": {
+ "startLines": "51",
+ "startColumns": "4",
+ "startOffsets": "5881",
+ "endColumns": "105",
+ "endOffsets": "5982"
+>>>>>>> origin/feature/pushNotifications
}
}
]
@@ -5577,6 +10920,7 @@
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-fr_values-fr.arsc.flat",
"map": [
{
+<<<<<<< HEAD
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-fr\\values-fr.xml",
"from": {
"startLines": "2",
@@ -5612,16 +10956,42 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-fr\\values.xml",
+=======
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-af\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,350,538,662,770,979,1099,1246,1373,1598,1704,1892,2017,2215,2395,2487,2576",
+ "endColumns": "104,187,123,107,208,119,146,126,224,105,187,124,197,179,91,88,103",
+ "endOffsets": "349,537,661,769,978,1098,1245,1372,1597,1703,1891,2016,2214,2394,2486,2575,2679"
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2777,2886,3074,3202,3314,3523,3647,3798,4131,4356,4466,4654,4783,4981,5165,5261,5354",
+ "endColumns": "108,187,127,111,208,123,150,130,224,109,187,128,197,183,95,92,107",
+ "endOffsets": "2881,3069,3197,3309,3518,3642,3793,3924,4351,4461,4649,4778,4976,5160,5256,5349,5457"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-af\\values.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "4",
"startColumns": "0",
"startOffsets": "247",
+<<<<<<< HEAD
"endColumns": "223",
"endOffsets": "470"
+=======
+ "endColumns": "201",
+ "endOffsets": "448"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "37",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "4068",
"endColumns": "223",
"endOffsets": "4287"
@@ -5629,16 +10999,60 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-fr\\values-fr.xml",
+=======
+ "startOffsets": "3929",
+ "endColumns": "201",
+ "endOffsets": "4126"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-af\\values-af.xml",
+ "from": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "100",
+ "endOffsets": "151"
+ },
+ "to": {
+ "startLines": "53",
+ "startColumns": "4",
+ "startOffsets": "6067",
+ "endColumns": "100",
+ "endOffsets": "6163"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-af\\values-af.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,213,309,415,500,603,721,798,875,966,1058,1153,1247,1347,1440,1535,1634,1729,1823,1903,2010,2115,2212,2320,2423,2525,2679,2777",
+ "endColumns": "107,95,105,84,102,117,76,76,90,91,94,93,99,92,94,98,94,93,79,106,104,96,107,102,101,153,97,79",
+ "endOffsets": "208,304,410,495,598,716,793,870,961,1053,1148,1242,1342,1435,1530,1629,1724,1818,1898,2005,2110,2207,2315,2418,2520,2674,2772,2852"
+ },
+ "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,52",
+ "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",
+ "startOffsets": "105,213,309,415,500,603,721,798,875,966,1058,1153,1247,1347,1440,1535,1634,1729,1823,1903,2010,2115,2212,2320,2423,2525,2679,5987",
+ "endColumns": "107,95,105,84,102,117,76,76,90,91,94,93,99,92,94,98,94,93,79,106,104,96,107,102,101,153,97,79",
+ "endOffsets": "208,304,410,495,598,716,793,870,961,1053,1148,1242,1342,1435,1530,1629,1724,1818,1898,2005,2110,2207,2315,2418,2520,2674,2772,6062"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-af\\values-af.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "2,3,4,5",
"startColumns": "4,4,4,4",
- "startOffsets": "55,162,264,383",
- "endColumns": "106,101,118,103",
- "endOffsets": "157,259,378,482"
+ "startOffsets": "55,160,262,375",
+ "endColumns": "104,101,112,98",
+ "endOffsets": "155,257,370,469"
},
"to": {
"startLines": "47,48,49,50",
"startColumns": "4,4,4,4",
+<<<<<<< HEAD
"startOffsets": "5738,5845,5947,6066",
"endColumns": "106,101,118,103",
"endOffsets": "5840,5942,6061,6165"
@@ -5702,6 +11116,54 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-my\\values-my.xml",
+=======
+ "startOffsets": "5462,5567,5669,5782",
+ "endColumns": "104,101,112,98",
+ "endOffsets": "5562,5664,5777,5876"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-as_values-as.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-as\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "247",
+ "endColumns": "184",
+ "endOffsets": "431"
+ },
+ "to": {
+ "startLines": "37",
+ "startColumns": "4",
+ "startOffsets": "3971",
+ "endColumns": "184",
+ "endOffsets": "4151"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-as\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "207",
+ "endColumns": "99",
+ "endOffsets": "306"
+ },
+ "to": {
+ "startLines": "51",
+ "startColumns": "4",
+ "startOffsets": "5877",
+ "endColumns": "103",
+ "endOffsets": "5976"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-as\\values-as.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "2",
"startColumns": "4",
@@ -5712,6 +11174,7 @@
"to": {
"startLines": "53",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "6342",
"endColumns": "100",
"endOffsets": "6438"
@@ -5759,10 +11222,82 @@
"startOffsets": "247",
"endColumns": "212",
"endOffsets": "459"
+=======
+ "startOffsets": "6063",
+ "endColumns": "100",
+ "endOffsets": "6159"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-as\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,351,536,657,765,954,1074,1213,1351,1553,1659,1839,1961,2152,2331,2417,2509",
+ "endColumns": "105,184,120,107,188,119,138,137,201,105,179,121,190,178,85,91,111",
+ "endOffsets": "350,535,656,764,953,1073,1212,1350,1552,1658,1838,1960,2151,2330,2416,2508,2620"
},
"to": {
- "startLines": "37",
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2841,2951,3136,3261,3373,3562,3686,3829,4156,4358,4468,4648,4774,4965,5148,5238,5334",
+ "endColumns": "109,184,124,111,188,123,142,141,201,109,179,125,190,182,89,95,115",
+ "endOffsets": "2946,3131,3256,3368,3557,3681,3824,3966,4353,4463,4643,4769,4960,5143,5233,5329,5445"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-as\\values-as.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,163,269,377",
+ "endColumns": "107,105,107,104",
+ "endOffsets": "158,264,372,477"
+ },
+ "to": {
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "5450,5558,5664,5772",
+ "endColumns": "107,105,107,104",
+ "endOffsets": "5553,5659,5767,5872"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-as\\values-as.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,213,312,419,510,612,732,809,885,976,1068,1163,1257,1358,1451,1546,1640,1731,1822,1907,2020,2128,2227,2336,2452,2572,2739,2841",
+ "endColumns": "107,98,106,90,101,119,76,75,90,91,94,93,100,92,94,93,90,90,84,112,107,98,108,115,119,166,101,81",
+ "endOffsets": "208,307,414,505,607,727,804,880,971,1063,1158,1252,1353,1446,1541,1635,1726,1817,1902,2015,2123,2222,2331,2447,2567,2734,2836,2918"
+ },
+ "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,52",
+ "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",
+ "startOffsets": "105,213,312,419,510,612,732,809,885,976,1068,1163,1257,1358,1451,1546,1640,1731,1822,1907,2020,2128,2227,2336,2452,2572,2739,5981",
+ "endColumns": "107,98,106,90,101,119,76,75,90,91,94,93,100,92,94,93,90,90,84,112,107,98,108,115,119,166,101,81",
+ "endOffsets": "208,307,414,505,607,727,804,880,971,1063,1158,1252,1353,1446,1541,1635,1726,1817,1902,2015,2123,2222,2331,2447,2567,2734,2836,6058"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-hy_values-hy.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-hy\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "207",
+ "endColumns": "101",
+ "endOffsets": "308"
+>>>>>>> origin/feature/pushNotifications
+ },
+ "to": {
+ "startLines": "51",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "4058",
"endColumns": "212",
"endOffsets": "4266"
@@ -5783,6 +11318,11 @@
"startOffsets": "6151",
"endColumns": "105",
"endOffsets": "6252"
+=======
+ "startOffsets": "6038",
+ "endColumns": "105",
+ "endOffsets": "6139"
+>>>>>>> origin/feature/pushNotifications
}
}
]
@@ -5791,7 +11331,11 @@
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-pt_values-pt.arsc.flat",
"map": [
{
+<<<<<<< HEAD
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-pt\\values-pt.xml",
+=======
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-hy\\values-hy.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "2",
"startColumns": "4",
@@ -5802,6 +11346,7 @@
"to": {
"startLines": "34",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "3359",
"endColumns": "100",
"endOffsets": "3455"
@@ -5815,10 +11360,43 @@
"startOffsets": "55,170,269,381",
"endColumns": "114,98,111,104",
"endOffsets": "165,264,376,481"
+=======
+ "startOffsets": "6226",
+ "endColumns": "100",
+ "endOffsets": "6322"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-hy\\values-hy.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,213,313,423,512,618,735,817,898,989,1081,1176,1270,1371,1464,1559,1653,1744,1835,1917,2023,2129,2228,2338,2446,2547,2717,2814",
+ "endColumns": "107,99,109,88,105,116,81,80,90,91,94,93,100,92,94,93,90,90,81,105,105,98,109,107,100,169,96,81",
+ "endOffsets": "208,308,418,507,613,730,812,893,984,1076,1171,1265,1366,1459,1554,1648,1739,1830,1912,2018,2124,2223,2333,2441,2542,2712,2809,2891"
+ },
+ "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,52",
+ "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",
+ "startOffsets": "105,213,313,423,512,618,735,817,898,989,1081,1176,1270,1371,1464,1559,1653,1744,1835,1917,2023,2129,2228,2338,2446,2547,2717,6144",
+ "endColumns": "107,99,109,88,105,116,81,80,90,91,94,93,100,92,94,93,90,90,81,105,105,98,109,107,100,169,96,81",
+ "endOffsets": "208,308,418,507,613,730,812,893,984,1076,1171,1265,1366,1459,1554,1648,1739,1830,1912,2018,2124,2223,2333,2441,2542,2712,2809,6221"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-hy\\values-hy.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,159,262,373",
+ "endColumns": "103,102,110,101",
+ "endOffsets": "154,257,368,470"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "29,30,31,32",
"startColumns": "4,4,4,4",
+<<<<<<< HEAD
"startOffsets": "2843,2958,3057,3169",
"endColumns": "114,98,111,104",
"endOffsets": "2953,3052,3164,3269"
@@ -5839,11 +11417,51 @@
"startOffsets": "105,225,331,438,527,628,747,832,913,1004,1096,1191,1285,1386,1479,1574,1669,1760,1851,1935,2042,2153,2255,2363,2471,2581,2743,3274",
"endColumns": "119,105,106,88,100,118,84,80,90,91,94,93,100,92,94,94,90,90,83,106,110,101,107,107,109,161,99,84",
"endOffsets": "220,326,433,522,623,742,827,908,999,1091,1186,1280,1381,1474,1569,1664,1755,1846,1930,2037,2148,2250,2358,2466,2576,2738,2838,3354"
+=======
+ "startOffsets": "5618,5722,5825,5936",
+ "endColumns": "103,102,110,101",
+ "endOffsets": "5717,5820,5931,6033"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-hy\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "247",
+ "endColumns": "209",
+ "endOffsets": "456"
+ },
+ "to": {
+ "startLines": "37",
+ "startColumns": "4",
+ "startOffsets": "4015",
+ "endColumns": "209",
+ "endOffsets": "4220"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-hy\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,349,546,678,784,997,1131,1284,1422,1648,1754,1953,2087,2308,2500,2591,2684",
+ "endColumns": "103,196,131,105,212,133,152,137,225,105,198,133,220,191,90,92,106",
+ "endOffsets": "348,545,677,783,996,1130,1283,1421,1647,1753,1952,2086,2307,2499,2590,2683,2790"
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2814,2922,3119,3255,3365,3578,3716,3873,4225,4451,4561,4760,4898,5119,5315,5410,5507",
+ "endColumns": "107,196,135,109,212,137,156,141,225,109,198,137,220,195,94,96,110",
+ "endOffsets": "2917,3114,3250,3360,3573,3711,3868,4010,4446,4556,4755,4893,5114,5310,5405,5502,5613"
+>>>>>>> origin/feature/pushNotifications
}
}
]
},
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-night-v8_values-night-v8.arsc.flat",
"map": [
{
@@ -5878,11 +11496,63 @@
"startOffsets": "55,125,209,293,389,491,593,2549",
"endColumns": "69,83,83,95,101,101,93,88",
"endOffsets": "120,204,288,384,486,588,682,2633"
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-v23_values-v23.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\19593d9c2c700c52ad03572ebfd537d5\\material-1.1.0-rc02\\res\\values-v23\\values-v23.xml",
+ "from": {
+ "startLines": "2,6",
+ "startColumns": "4,4",
+ "startOffsets": "55,320",
+ "endLines": "5,9",
+ "endColumns": "10,10",
+ "endOffsets": "315,588"
+ },
+ "to": {
+ "startLines": "51,55",
+ "startColumns": "4,4",
+ "startOffsets": "3557,3822",
+ "endLines": "54,58",
+ "endColumns": "10,10",
+ "endOffsets": "3817,4090"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-v23\\values-v23.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,20,34,35,36,37,41,42,43,44",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "55,190,325,400,487,1371,2267,2386,2513,2618,2842,2957,3064,3177",
+ "endLines": "2,3,4,5,19,33,34,35,36,40,41,42,43,47",
+ "endColumns": "134,134,74,86,12,12,118,126,104,12,114,106,112,12",
+ "endOffsets": "185,320,395,482,1366,2262,2381,2508,2613,2837,2952,3059,3172,3402"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\adb371d4d53f86eab98a28717d70cc7e\\cardview-1.0.0\\res\\values-v23\\values-v23.xml",
+ "from": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endLines": "4",
+ "endColumns": "12",
+ "endOffsets": "200"
+ },
+ "to": {
+ "startLines": "48",
+ "startColumns": "4",
+ "startOffsets": "3407",
+ "endLines": "50",
+ "endColumns": "12",
+ "endOffsets": "3552"
+>>>>>>> origin/feature/pushNotifications
}
}
]
},
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-in_values-in.arsc.flat",
"map": [
{
@@ -5910,10 +11580,33 @@
"startOffsets": "207",
"endColumns": "103",
"endOffsets": "310"
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-zu_values-zu.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-zu\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,354,562,695,797,1024,1151,1301,1436,1655,1763,1959,2088,2305,2488,2575,2670",
+ "endColumns": "108,207,132,101,226,126,149,134,218,107,195,128,216,182,86,94,109",
+ "endOffsets": "353,561,694,796,1023,1150,1300,1435,1654,1762,1958,2087,2304,2487,2574,2669,2779"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
- "startLines": "51",
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2791,2904,3112,3249,3355,3582,3713,3867,4197,4416,4528,4724,4857,5074,5261,5352,5451",
+ "endColumns": "112,207,136,105,226,130,153,138,218,111,195,132,216,186,90,98,113",
+ "endOffsets": "2899,3107,3244,3350,3577,3708,3862,4001,4411,4523,4719,4852,5069,5256,5347,5446,5560"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-zu\\values-zu.xml",
+ "from": {
+ "startLines": "2",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "5906",
"endColumns": "107",
"endOffsets": "6009"
@@ -5985,11 +11678,92 @@
"startOffsets": "6098",
"endColumns": "100",
"endOffsets": "6194"
+=======
+ "startOffsets": "55",
+ "endColumns": "100",
+ "endOffsets": "151"
+ },
+ "to": {
+ "startLines": "53",
+ "startColumns": "4",
+ "startOffsets": "6204",
+ "endColumns": "100",
+ "endOffsets": "6300"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-zu\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "247",
+ "endColumns": "190",
+ "endOffsets": "437"
+ },
+ "to": {
+ "startLines": "37",
+ "startColumns": "4",
+ "startOffsets": "4006",
+ "endColumns": "190",
+ "endOffsets": "4192"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-zu\\values-zu.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,167,275,387",
+ "endColumns": "111,107,111,110",
+ "endOffsets": "162,270,382,493"
+ },
+ "to": {
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "5565,5677,5785,5897",
+ "endColumns": "111,107,111,110",
+ "endOffsets": "5672,5780,5892,6003"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-zu\\values-zu.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,213,320,432,520,623,738,817,895,986,1078,1173,1267,1368,1461,1556,1650,1741,1834,1914,2018,2121,2219,2326,2433,2538,2695,2791",
+ "endColumns": "107,106,111,87,102,114,78,77,90,91,94,93,100,92,94,93,90,92,79,103,102,97,106,106,104,156,95,80",
+ "endOffsets": "208,315,427,515,618,733,812,890,981,1073,1168,1262,1363,1456,1551,1645,1736,1829,1909,2013,2116,2214,2321,2428,2533,2690,2786,2867"
+ },
+ "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,52",
+ "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",
+ "startOffsets": "105,213,320,432,520,623,738,817,895,986,1078,1173,1267,1368,1461,1556,1650,1741,1834,1914,2018,2121,2219,2326,2433,2538,2695,6123",
+ "endColumns": "107,106,111,87,102,114,78,77,90,91,94,93,100,92,94,93,90,92,79,103,102,97,106,106,104,156,95,80",
+ "endOffsets": "208,315,427,515,618,733,812,890,981,1073,1168,1262,1363,1456,1551,1645,1736,1829,1909,2013,2116,2214,2321,2428,2533,2690,2786,6199"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-zu\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "207",
+ "endColumns": "110",
+ "endOffsets": "317"
+ },
+ "to": {
+ "startLines": "51",
+ "startColumns": "4",
+ "startOffsets": "6008",
+ "endColumns": "114",
+ "endOffsets": "6118"
+>>>>>>> origin/feature/pushNotifications
}
}
]
},
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-ar_values-ar.arsc.flat",
"map": [
{
@@ -6045,6 +11819,80 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-ar\\values-ar.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-b+sr+Latn_values-b+sr+Latn.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-b+sr+Latn\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "214",
+ "endColumns": "99",
+ "endOffsets": "313"
+ },
+ "to": {
+ "startLines": "51",
+ "startColumns": "4",
+ "startOffsets": "5916",
+ "endColumns": "103",
+ "endOffsets": "6015"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-b+sr+Latn\\values-b+sr+Latn.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,166,266,379",
+ "endColumns": "110,99,112,96",
+ "endOffsets": "161,261,374,471"
+ },
+ "to": {
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "5495,5606,5706,5819",
+ "endColumns": "110,99,112,96",
+ "endOffsets": "5601,5701,5814,5911"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-b+sr+Latn\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "252,356,544,668,776,989,1114,1252,1379,1587,1692,1883,2008,2216,2384,2478,2569",
+ "endColumns": "103,187,123,107,212,124,137,126,207,104,190,124,207,167,93,90,104",
+ "endOffsets": "355,543,667,775,988,1113,1251,1378,1586,1691,1882,2007,2215,2383,2477,2568,2673"
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2836,2944,3132,3260,3372,3585,3714,3856,4176,4384,4493,4684,4813,5021,5193,5291,5386",
+ "endColumns": "107,187,127,111,212,128,141,130,207,108,190,128,207,171,97,94,108",
+ "endOffsets": "2939,3127,3255,3367,3580,3709,3851,3982,4379,4488,4679,4808,5016,5188,5286,5381,5490"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-b+sr+Latn\\values-b+sr+Latn.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,212,313,419,505,609,731,816,899,990,1082,1177,1271,1372,1465,1560,1665,1756,1847,1932,2037,2143,2246,2353,2462,2569,2739,2836",
+ "endColumns": "106,100,105,85,103,121,84,82,90,91,94,93,100,92,94,104,90,90,84,104,105,102,106,108,106,169,96,85",
+ "endOffsets": "207,308,414,500,604,726,811,894,985,1077,1172,1266,1367,1460,1555,1660,1751,1842,1927,2032,2138,2241,2348,2457,2564,2734,2831,2917"
+ },
+ "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,52",
+ "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",
+ "startOffsets": "105,212,313,419,505,609,731,816,899,990,1082,1177,1271,1372,1465,1560,1665,1756,1847,1932,2037,2143,2246,2353,2462,2569,2739,6020",
+ "endColumns": "106,100,105,85,103,121,84,82,90,91,94,93,100,92,94,104,90,90,84,104,105,102,106,108,106,169,96,85",
+ "endOffsets": "207,308,414,500,604,726,811,894,985,1077,1172,1266,1367,1460,1555,1660,1751,1842,1927,2032,2138,2241,2348,2457,2564,2734,2831,6101"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-b+sr+Latn\\values-b+sr+Latn.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "2",
"startColumns": "4",
@@ -6055,6 +11903,7 @@
"to": {
"startLines": "53",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "5936",
"endColumns": "100",
"endOffsets": "6032"
@@ -6092,11 +11941,34 @@
"startOffsets": "5343,5443,5541,5649",
"endColumns": "99,97,107,100",
"endOffsets": "5438,5536,5644,5745"
+=======
+ "startOffsets": "6106",
+ "endColumns": "100",
+ "endOffsets": "6202"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-b+sr+Latn\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "254",
+ "endColumns": "188",
+ "endOffsets": "442"
+ },
+ "to": {
+ "startLines": "37",
+ "startColumns": "4",
+ "startOffsets": "3987",
+ "endColumns": "188",
+ "endOffsets": "4171"
+>>>>>>> origin/feature/pushNotifications
}
}
]
},
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-am_values-am.arsc.flat",
"map": [
{
@@ -6124,10 +11996,57 @@
"startOffsets": "55",
"endColumns": "100",
"endOffsets": "151"
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-gu_values-gu.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-gu\\values-gu.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,212,316,423,510,610,730,808,886,977,1069,1164,1258,1359,1452,1547,1641,1732,1823,1902,2008,2109,2206,2315,2415,2525,2685,2788",
+ "endColumns": "106,103,106,86,99,119,77,77,90,91,94,93,100,92,94,93,90,90,78,105,100,96,108,99,109,159,102,79",
+ "endOffsets": "207,311,418,505,605,725,803,881,972,1064,1159,1253,1354,1447,1542,1636,1727,1818,1897,2003,2104,2201,2310,2410,2520,2680,2783,2863"
+ },
+ "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,52",
+ "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",
+ "startOffsets": "105,212,316,423,510,610,730,808,886,977,1069,1164,1258,1359,1452,1547,1641,1732,1823,1902,2008,2109,2206,2315,2415,2525,2685,5968",
+ "endColumns": "106,103,106,86,99,119,77,77,90,91,94,93,100,92,94,93,90,90,78,105,100,96,108,99,109,159,102,79",
+ "endOffsets": "207,311,418,505,605,725,803,881,972,1064,1159,1253,1354,1447,1542,1636,1727,1818,1897,2003,2104,2201,2310,2410,2520,2680,2783,6043"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-gu\\values-gu.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,156,257,366",
+ "endColumns": "100,100,108,99",
+ "endOffsets": "151,252,361,461"
+ },
+ "to": {
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "5453,5554,5655,5764",
+ "endColumns": "100,100,108,99",
+ "endOffsets": "5549,5650,5759,5859"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-gu\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "247",
+ "endColumns": "205",
+ "endOffsets": "452"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "53",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "5794",
"endColumns": "100",
"endOffsets": "5890"
@@ -6152,6 +12071,15 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-am\\values.xml",
+=======
+ "startOffsets": "3928",
+ "endColumns": "205",
+ "endOffsets": "4129"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-gu\\values.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "4",
"startColumns": "0",
@@ -6162,6 +12090,7 @@
"to": {
"startLines": "51",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "5611",
"endColumns": "103",
"endOffsets": "5710"
@@ -6175,10 +12104,26 @@
"startOffsets": "245,345,516,636,736,922,1043,1177,1304,1491,1592,1768,1889,2083,2236,2322,2405",
"endColumns": "99,170,119,99,185,120,133,126,186,100,175,120,193,152,85,82,95",
"endOffsets": "344,515,635,735,921,1042,1176,1303,1490,1591,1767,1888,2082,2235,2321,2404,2500"
+=======
+ "startOffsets": "5864",
+ "endColumns": "103",
+ "endOffsets": "5963"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-gu\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,351,549,672,782,979,1099,1236,1361,1568,1674,1869,1992,2194,2370,2457,2549",
+ "endColumns": "105,197,122,109,196,119,136,124,206,105,194,122,201,175,86,91,106",
+ "endOffsets": "350,548,671,781,978,1098,1235,1360,1567,1673,1868,1991,2193,2369,2456,2548,2655"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+<<<<<<< HEAD
"startOffsets": "2723,2827,2998,3122,3226,3412,3537,3675,3997,4184,4289,4465,4590,4784,4941,5031,5118",
"endColumns": "103,170,123,103,185,124,137,130,186,104,175,124,193,156,89,86,99",
"endOffsets": "2822,2993,3117,3221,3407,3532,3670,3801,4179,4284,4460,4585,4779,4936,5026,5113,5213"
@@ -6338,6 +12283,15 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-lo\\values.xml",
+=======
+ "startOffsets": "2788,2898,3096,3223,3337,3534,3658,3799,4134,4341,4451,4646,4773,4975,5155,5246,5342",
+ "endColumns": "109,197,126,113,196,123,140,128,206,109,194,126,201,179,90,95,110",
+ "endOffsets": "2893,3091,3218,3332,3529,3653,3794,3923,4336,4446,4641,4768,4970,5150,5241,5337,5448"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-gu\\values-gu.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "4",
"startColumns": "0",
@@ -6348,12 +12302,24 @@
"to": {
"startLines": "37",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "3946",
"endColumns": "190",
"endOffsets": "4132"
+=======
+ "startOffsets": "6048",
+ "endColumns": "100",
+ "endOffsets": "6144"
+>>>>>>> origin/feature/pushNotifications
}
- },
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-ldltr-v21_values-ldltr-v21.arsc.flat",
+ "map": [
{
+<<<<<<< HEAD
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-lo\\values-lo.xml",
"from": {
"startLines": "2,3,4,5",
@@ -6372,6 +12338,24 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-lo\\values-lo.xml",
+=======
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-ldltr-v21\\values-ldltr-v21.xml",
+ "from": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "112",
+ "endOffsets": "163"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-zh-rCN_values-zh-rCN.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-zh-rCN\\values-zh-rCN.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "2",
"startColumns": "4",
@@ -6382,6 +12366,7 @@
"to": {
"startLines": "53",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "6110",
"endColumns": "100",
"endOffsets": "6206"
@@ -6445,16 +12430,77 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-si\\values.xml",
+=======
+ "startOffsets": "5512",
+ "endColumns": "100",
+ "endOffsets": "5608"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-zh-rCN\\values-zh-rCN.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,200,295,395,477,574,680,757,833,924,1016,1113,1209,1304,1397,1492,1584,1675,1766,1843,1939,2034,2129,2226,2322,2420,2568,2662",
+ "endColumns": "94,94,99,81,96,105,76,75,90,91,96,95,94,92,94,91,90,90,76,95,94,94,96,95,97,147,93,77",
+ "endOffsets": "195,290,390,472,569,675,752,828,919,1011,1108,1204,1299,1392,1487,1579,1670,1761,1838,1934,2029,2124,2221,2317,2415,2563,2657,2735"
+ },
+ "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,52",
+ "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",
+ "startOffsets": "105,200,295,395,477,574,680,757,833,924,1016,1113,1209,1304,1397,1492,1584,1675,1766,1843,1939,2034,2129,2226,2322,2420,2568,5434",
+ "endColumns": "94,94,99,81,96,105,76,75,90,91,96,95,94,92,94,91,90,90,76,95,94,94,96,95,97,147,93,77",
+ "endOffsets": "195,290,390,472,569,675,752,828,919,1011,1108,1204,1299,1392,1487,1579,1670,1761,1838,1934,2029,2124,2221,2317,2415,2563,2657,5507"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-zh-rCN\\values.xml",
"from": {
"startLines": "4",
"startColumns": "0",
- "startOffsets": "247",
- "endColumns": "197",
- "endOffsets": "444"
+ "startOffsets": "251",
+ "endColumns": "157",
+ "endOffsets": "408"
},
"to": {
"startLines": "37",
"startColumns": "4",
+ "startOffsets": "3682",
+ "endColumns": "157",
+ "endOffsets": "3835"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-zh-rCN\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "249,348,509,622,722,886,1000,1128,1245,1412,1511,1672,1785,1948,2082,2164,2247",
+ "endColumns": "98,160,112,99,163,113,127,116,166,98,160,112,162,133,81,82,98",
+ "endOffsets": "347,508,621,721,885,999,1127,1244,1411,1510,1671,1784,1947,2081,2163,2246,2345"
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2662,2765,2926,3043,3147,3311,3429,3561,3840,4007,4110,4271,4388,4551,4689,4775,4862",
+ "endColumns": "102,160,116,103,163,117,131,120,166,102,160,116,162,137,85,86,102",
+ "endOffsets": "2760,2921,3038,3142,3306,3424,3556,3677,4002,4105,4266,4383,4546,4684,4770,4857,4960"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-zh-rCN\\values.xml",
+>>>>>>> origin/feature/pushNotifications
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "211",
+ "endColumns": "96",
+ "endOffsets": "307"
+ },
+ "to": {
+ "startLines": "51",
+ "startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "3958",
"endColumns": "197",
"endOffsets": "4151"
@@ -6509,11 +12555,34 @@
"startOffsets": "5935",
"endColumns": "103",
"endOffsets": "6034"
+=======
+ "startOffsets": "5333",
+ "endColumns": "100",
+ "endOffsets": "5429"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-zh-rCN\\values-zh-rCN.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,138,230,331",
+ "endColumns": "82,91,100,91",
+ "endOffsets": "133,225,326,418"
+ },
+ "to": {
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "4965,5048,5140,5241",
+ "endColumns": "82,91,100,91",
+ "endOffsets": "5043,5135,5236,5328"
+>>>>>>> origin/feature/pushNotifications
}
}
]
},
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-es-rUS_values-es-rUS.arsc.flat",
"map": [
{
@@ -6592,17 +12661,62 @@
"startOffsets": "251",
"endColumns": "204",
"endOffsets": "455"
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-bs_values-bs.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-bs\\values-bs.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,226,323,430,516,620,742,827,910,1001,1093,1188,1282,1383,1476,1571,1666,1757,1848,1935,2038,2142,2243,2348,2462,2565,2734,2830",
+ "endColumns": "120,96,106,85,103,121,84,82,90,91,94,93,100,92,94,94,90,90,86,102,103,100,104,113,102,168,95,85",
+ "endOffsets": "221,318,425,511,615,737,822,905,996,1088,1183,1277,1378,1471,1566,1661,1752,1843,1930,2033,2137,2238,2343,2457,2560,2729,2825,2911"
},
"to": {
- "startLines": "37",
- "startColumns": "4",
- "startOffsets": "4014",
- "endColumns": "204",
- "endOffsets": "4214"
+ "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,52",
+ "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",
+ "startOffsets": "105,226,323,430,516,620,742,827,910,1001,1093,1188,1282,1383,1476,1571,1666,1757,1848,1935,2038,2142,2243,2348,2462,2565,2734,6036",
+ "endColumns": "120,96,106,85,103,121,84,82,90,91,94,93,100,92,94,94,90,90,86,102,103,100,104,113,102,168,95,85",
+ "endOffsets": "221,318,425,511,615,737,822,905,996,1088,1183,1277,1378,1471,1566,1661,1752,1843,1930,2033,2137,2238,2343,2457,2560,2729,2825,6117"
}
},
{
- "source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-es-rUS\\values-es-rUS.xml",
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-bs\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,349,541,665,773,982,1106,1244,1371,1584,1689,1881,2006,2215,2387,2481,2572",
+ "endColumns": "103,191,123,107,208,123,137,126,212,104,191,124,208,171,93,90,109",
+ "endOffsets": "348,540,664,772,981,1105,1243,1370,1583,1688,1880,2005,2214,2386,2480,2571,2681"
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2830,2938,3130,3258,3370,3579,3707,3849,4180,4393,4502,4694,4823,5032,5208,5306,5401",
+ "endColumns": "107,191,127,111,208,127,141,130,212,108,191,128,208,175,97,94,113",
+ "endOffsets": "2933,3125,3253,3365,3574,3702,3844,3975,4388,4497,4689,4818,5027,5203,5301,5396,5510"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-bs\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "207",
+ "endColumns": "99",
+ "endOffsets": "306"
+ },
+ "to": {
+ "startLines": "51",
+ "startColumns": "4",
+ "startOffsets": "5932",
+ "endColumns": "103",
+ "endOffsets": "6031"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-bs\\values-bs.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -6611,16 +12725,70 @@
"endOffsets": "151"
},
"to": {
+ "startLines": "53",
+ "startColumns": "4",
+ "startOffsets": "6122",
+ "endColumns": "100",
+ "endOffsets": "6218"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-bs\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "247",
+ "endColumns": "199",
+ "endOffsets": "446"
+>>>>>>> origin/feature/pushNotifications
+ },
+ "to": {
+ "startLines": "37",
+ "startColumns": "4",
+<<<<<<< HEAD
+ "startOffsets": "4014",
+ "endColumns": "204",
+ "endOffsets": "4214"
+ }
+ },
+ {
+ "source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-es-rUS\\values-es-rUS.xml",
+=======
+ "startOffsets": "3980",
+ "endColumns": "199",
+ "endOffsets": "4175"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-bs\\values-bs.xml",
+>>>>>>> origin/feature/pushNotifications
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,159,259,373",
+ "endColumns": "103,99,113,98",
+ "endOffsets": "154,254,368,467"
+ },
+ "to": {
+<<<<<<< HEAD
"startLines": "53",
"startColumns": "4",
"startOffsets": "6257",
"endColumns": "100",
"endOffsets": "6353"
+=======
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "5515,5619,5719,5833",
+ "endColumns": "103,99,113,98",
+ "endOffsets": "5614,5714,5828,5927"
+>>>>>>> origin/feature/pushNotifications
}
}
]
},
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-fi_values-fi.arsc.flat",
"map": [
{
@@ -6642,14 +12810,38 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-fi\\values-fi.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-lv_values-lv.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-lv\\values-lv.xml",
"from": {
- "startLines": "2",
- "startColumns": "4",
- "startOffsets": "55",
- "endColumns": "100",
- "endOffsets": "151"
+ "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",
+ "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",
+ "startOffsets": "105,225,335,444,530,634,756,838,919,1029,1136,1242,1351,1463,1566,1678,1785,1890,1990,2074,2183,2294,2393,2504,2611,2716,2890,2989",
+ "endColumns": "119,109,108,85,103,121,81,80,109,106,105,108,111,102,111,106,104,99,83,108,110,98,110,106,104,173,98,81",
+ "endOffsets": "220,330,439,525,629,751,833,914,1024,1131,1237,1346,1458,1561,1673,1780,1885,1985,2069,2178,2289,2388,2499,2606,2711,2885,2984,3066"
},
"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,52",
+ "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",
+ "startOffsets": "105,225,335,444,530,634,756,838,919,1029,1136,1242,1351,1463,1566,1678,1785,1890,1990,2074,2183,2294,2393,2504,2611,2716,2890,6306",
+ "endColumns": "119,109,108,85,103,121,81,80,109,106,105,108,111,102,111,106,104,99,83,108,110,98,110,106,104,173,98,81",
+ "endOffsets": "220,330,439,525,629,751,833,914,1024,1131,1237,1346,1458,1561,1673,1780,1885,1985,2069,2178,2289,2388,2499,2606,2711,2885,2984,6383"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-lv\\values.xml",
+>>>>>>> origin/feature/pushNotifications
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,350,543,674,780,981,1110,1253,1384,1618,1725,1925,2058,2286,2467,2557,2651",
+ "endColumns": "104,192,130,105,200,128,142,130,233,106,199,132,227,180,89,93,113",
+ "endOffsets": "349,542,673,779,980,1109,1252,1383,1617,1724,1924,2057,2285,2466,2556,2650,2764"
+ },
+ "to": {
+<<<<<<< HEAD
"startLines": "53",
"startColumns": "4",
"startOffsets": "6029",
@@ -6659,16 +12851,28 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-fi\\values.xml",
+=======
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2989,3098,3291,3426,3536,3737,3870,4017,4377,4611,4722,4922,5059,5287,5472,5566,5664",
+ "endColumns": "108,192,134,109,200,132,146,134,233,110,199,136,227,184,93,97,117",
+ "endOffsets": "3093,3286,3421,3531,3732,3865,4012,4147,4606,4717,4917,5054,5282,5467,5561,5659,5777"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-lv\\values.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "4",
"startColumns": "0",
- "startOffsets": "207",
- "endColumns": "98",
- "endOffsets": "305"
+ "startOffsets": "247",
+ "endColumns": "224",
+ "endOffsets": "471"
},
"to": {
- "startLines": "51",
+ "startLines": "37",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "5846",
"endColumns": "102",
"endOffsets": "5944"
@@ -6786,6 +12990,52 @@
"from": {
"startLines": "2",
"startColumns": "4",
+=======
+ "startOffsets": "4152",
+ "endColumns": "224",
+ "endOffsets": "4372"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-lv\\values-lv.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,158,257,373",
+ "endColumns": "102,98,115,100",
+ "endOffsets": "153,252,368,469"
+ },
+ "to": {
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "5782,5885,5984,6100",
+ "endColumns": "102,98,115,100",
+ "endOffsets": "5880,5979,6095,6196"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-lv\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "207",
+ "endColumns": "100",
+ "endOffsets": "307"
+ },
+ "to": {
+ "startLines": "51",
+ "startColumns": "4",
+ "startOffsets": "6201",
+ "endColumns": "104",
+ "endOffsets": "6301"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-lv\\values-lv.xml",
+ "from": {
+ "startLines": "2",
+ "startColumns": "4",
+>>>>>>> origin/feature/pushNotifications
"startOffsets": "55",
"endColumns": "100",
"endOffsets": "151"
@@ -6793,11 +13043,24 @@
"to": {
"startLines": "53",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "6137",
"endColumns": "100",
"endOffsets": "6233"
}
},
+=======
+ "startOffsets": "6388",
+ "endColumns": "100",
+ "endOffsets": "6484"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-night-v8_values-night-v8.arsc.flat",
+ "map": [
+>>>>>>> origin/feature/pushNotifications
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-uz\\values.xml",
"from": {
@@ -6835,7 +13098,11 @@
]
},
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-land_values-land.arsc.flat",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-large-v4_values-large-v4.arsc.flat",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-land\\values-land.xml",
@@ -6869,6 +13136,7 @@
]
},
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-en-rXC_values-en-rXC.arsc.flat",
"map": [
{
@@ -6920,6 +13188,59 @@
"startOffsets": "105,310,510,719,904,1106,1321,1494,1671,1862,2055,2253,2449,2652,2847,3044,3239,3432,3623,3807,4011,4216,4417,4624,4826,5031,5303,6311",
"endColumns": "204,199,208,184,201,214,172,176,190,192,197,195,202,194,196,194,192,190,183,203,204,200,206,201,204,271,199,178",
"endOffsets": "305,505,714,899,1101,1316,1489,1666,1857,2050,2248,2444,2647,2842,3039,3234,3427,3618,3802,4006,4211,4412,4619,4821,5026,5298,5498,6485"
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-cs_values-cs.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-cs\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "247",
+ "endColumns": "201",
+ "endOffsets": "448"
+ },
+ "to": {
+ "startLines": "37",
+ "startColumns": "4",
+ "startOffsets": "3950",
+ "endColumns": "201",
+ "endOffsets": "4147"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-cs\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,349,541,664,772,984,1109,1247,1373,1607,1716,1911,2037,2257,2438,2532,2625",
+ "endColumns": "103,191,122,107,211,124,137,125,233,108,194,125,219,180,93,92,110",
+ "endOffsets": "348,540,663,771,983,1108,1246,1372,1606,1715,1910,2036,2256,2437,2531,2624,2735"
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2798,2906,3098,3225,3337,3549,3678,3820,4152,4386,4499,4694,4824,5044,5229,5327,5424",
+ "endColumns": "107,191,126,111,211,128,141,129,233,112,194,129,219,184,97,96,114",
+ "endOffsets": "2901,3093,3220,3332,3544,3673,3815,3945,4381,4494,4689,4819,5039,5224,5322,5419,5534"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-cs\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "207",
+ "endColumns": "99",
+ "endOffsets": "306"
+ },
+ "to": {
+ "startLines": "51",
+ "startColumns": "4",
+ "startOffsets": "5958",
+ "endColumns": "103",
+ "endOffsets": "6057"
+>>>>>>> origin/feature/pushNotifications
}
}
]
@@ -6928,6 +13249,7 @@
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-v22_values-v22.arsc.flat",
"map": [
{
+<<<<<<< HEAD
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-v22\\values-v22.xml",
"from": {
"startLines": "2,3,4,9",
@@ -6968,10 +13290,54 @@
"startOffsets": "55,153,250,359",
"endColumns": "97,96,108,97",
"endOffsets": "148,245,354,452"
+=======
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-cs\\values-cs.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,212,314,423,509,614,731,809,886,977,1069,1164,1258,1353,1446,1541,1638,1729,1820,1903,2007,2119,2218,2324,2435,2537,2700,2798",
+ "endColumns": "106,101,108,85,104,116,77,76,90,91,94,93,94,92,94,96,90,90,82,103,111,98,105,110,101,162,97,81",
+ "endOffsets": "207,309,418,504,609,726,804,881,972,1064,1159,1253,1348,1441,1536,1633,1724,1815,1898,2002,2114,2213,2319,2430,2532,2695,2793,2875"
+ },
+ "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,52",
+ "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",
+ "startOffsets": "105,212,314,423,509,614,731,809,886,977,1069,1164,1258,1353,1446,1541,1638,1729,1820,1903,2007,2119,2218,2324,2435,2537,2700,6062",
+ "endColumns": "106,101,108,85,104,116,77,76,90,91,94,93,94,92,94,96,90,90,82,103,111,98,105,110,101,162,97,81",
+ "endOffsets": "207,309,418,504,609,726,804,881,972,1064,1159,1253,1348,1441,1536,1633,1724,1815,1898,2002,2114,2213,2319,2430,2532,2695,2793,6139"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-cs\\values-cs.xml",
+ "from": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "100",
+ "endOffsets": "151"
+ },
+ "to": {
+ "startLines": "53",
+ "startColumns": "4",
+ "startOffsets": "6144",
+ "endColumns": "100",
+ "endOffsets": "6240"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-cs\\values-cs.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,157,260,374",
+ "endColumns": "101,102,113,99",
+ "endOffsets": "152,255,369,469"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "29,30,31,32",
"startColumns": "4,4,4,4",
+<<<<<<< HEAD
"startOffsets": "2762,2860,2957,3066",
"endColumns": "97,96,108,97",
"endOffsets": "2855,2952,3061,3159"
@@ -7039,10 +13405,65 @@
"startOffsets": "105,212,313,419,505,609,731,815,897,988,1080,1175,1269,1370,1463,1558,1663,1754,1845,1930,2035,2141,2244,2350,2459,2566,2736,2833",
"endColumns": "106,100,105,85,103,121,83,81,90,91,94,93,100,92,94,104,90,90,84,104,105,102,105,108,106,169,96,85",
"endOffsets": "207,308,414,500,604,726,810,892,983,1075,1170,1264,1365,1458,1553,1658,1749,1840,1925,2030,2136,2239,2345,2454,2561,2731,2828,2914"
+=======
+ "startOffsets": "5539,5641,5744,5858",
+ "endColumns": "101,102,113,99",
+ "endOffsets": "5636,5739,5853,5953"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-el_values-el.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-el\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "247",
+ "endColumns": "222",
+ "endOffsets": "469"
+ },
+ "to": {
+ "startLines": "37",
+ "startColumns": "4",
+ "startOffsets": "4113",
+ "endColumns": "222",
+ "endOffsets": "4331"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-el\\values-el.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,165,272,397",
+ "endColumns": "109,106,124,108",
+ "endOffsets": "160,267,392,501"
+ },
+ "to": {
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "5741,5851,5958,6083",
+ "endColumns": "109,106,124,108",
+ "endOffsets": "5846,5953,6078,6187"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-el\\values-el.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,223,334,451,536,642,765,854,940,1031,1123,1218,1312,1413,1506,1601,1698,1789,1880,1964,2075,2184,2286,2397,2507,2615,2786,2886",
+ "endColumns": "117,110,116,84,105,122,88,85,90,91,94,93,100,92,94,96,90,90,83,110,108,101,110,109,107,170,99,84",
+ "endOffsets": "218,329,446,531,637,760,849,935,1026,1118,1213,1307,1408,1501,1596,1693,1784,1875,1959,2070,2179,2281,2392,2502,2610,2781,2881,2966"
+>>>>>>> origin/feature/pushNotifications
},
"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,52",
"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",
+<<<<<<< HEAD
"startOffsets": "105,212,313,419,505,609,731,815,897,988,1080,1175,1269,1370,1463,1558,1663,1754,1845,1930,2035,2141,2244,2350,2459,2566,2736,6017",
"endColumns": "106,100,105,85,103,121,83,81,90,91,94,93,100,92,94,104,90,90,84,104,105,102,105,108,106,169,96,85",
"endOffsets": "207,308,414,500,604,726,810,892,983,1075,1170,1264,1365,1458,1553,1658,1749,1840,1925,2030,2136,2239,2345,2454,2561,2731,2828,6098"
@@ -7097,9 +13518,71 @@
"startOffsets": "5492,5603,5703,5816",
"endColumns": "110,99,112,96",
"endOffsets": "5598,5698,5811,5908"
+=======
+ "startOffsets": "105,223,334,451,536,642,765,854,940,1031,1123,1218,1312,1413,1506,1601,1698,1789,1880,1964,2075,2184,2286,2397,2507,2615,2786,6298",
+ "endColumns": "117,110,116,84,105,122,88,85,90,91,94,93,100,92,94,96,90,90,83,110,108,101,110,109,107,170,99,84",
+ "endOffsets": "218,329,446,531,637,760,849,935,1026,1118,1213,1307,1408,1501,1596,1693,1784,1875,1959,2070,2179,2281,2392,2502,2610,2781,2881,6378"
}
},
{
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-el\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,354,572,702,811,1051,1174,1318,1448,1696,1802,2003,2130,2367,2538,2633,2721",
+ "endColumns": "108,217,129,108,239,122,143,129,247,105,200,126,236,170,94,87,107",
+ "endOffsets": "353,571,701,810,1050,1173,1317,1447,1695,1801,2002,2129,2366,2537,2632,2720,2828"
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2886,2999,3217,3351,3464,3704,3831,3979,4336,4584,4694,4895,5026,5263,5438,5537,5629",
+ "endColumns": "112,217,133,112,239,126,147,133,247,109,200,130,236,174,98,91,111",
+ "endOffsets": "2994,3212,3346,3459,3699,3826,3974,4108,4579,4689,4890,5021,5258,5433,5532,5624,5736"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-el\\values-el.xml",
+ "from": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "100",
+ "endOffsets": "151"
+ },
+ "to": {
+ "startLines": "53",
+ "startColumns": "4",
+ "startOffsets": "6383",
+ "endColumns": "100",
+ "endOffsets": "6479"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-el\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "207",
+ "endColumns": "101",
+ "endOffsets": "308"
+ },
+ "to": {
+ "startLines": "51",
+ "startColumns": "4",
+ "startOffsets": "6192",
+ "endColumns": "105",
+ "endOffsets": "6293"
+>>>>>>> origin/feature/pushNotifications
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-te_values-te.arsc.flat",
+ "map": [
+ {
+<<<<<<< HEAD
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-sr\\values.xml",
"from": {
"startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
@@ -7163,10 +13646,54 @@
"startOffsets": "245,349,530,657,762,966,1091,1232,1366,1594,1699,1880,2008,2204,2397,2487,2573",
"endColumns": "103,180,126,104,203,124,140,133,227,104,180,127,195,192,89,85,102",
"endOffsets": "348,529,656,761,965,1090,1231,1365,1593,1698,1879,2007,2203,2396,2486,2572,2675"
+=======
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-te\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "247",
+ "endColumns": "198",
+ "endOffsets": "445"
+ },
+ "to": {
+ "startLines": "37",
+ "startColumns": "4",
+ "startOffsets": "3979",
+ "endColumns": "198",
+ "endOffsets": "4173"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-te\\values-te.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,222,334,445,535,640,759,837,914,1005,1097,1192,1286,1387,1480,1575,1670,1761,1852,1934,2048,2150,2247,2362,2465,2580,2742,2845",
+ "endColumns": "116,111,110,89,104,118,77,76,90,91,94,93,100,92,94,94,90,90,81,113,101,96,114,102,114,161,102,79",
+ "endOffsets": "217,329,440,530,635,754,832,909,1000,1092,1187,1281,1382,1475,1570,1665,1756,1847,1929,2043,2145,2242,2357,2460,2575,2737,2840,2920"
+ },
+ "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,52",
+ "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",
+ "startOffsets": "105,222,334,445,535,640,759,837,914,1005,1097,1192,1286,1387,1480,1575,1670,1761,1852,1934,2048,2150,2247,2362,2465,2580,2742,6061",
+ "endColumns": "116,111,110,89,104,118,77,76,90,91,94,93,100,92,94,94,90,90,81,113,101,96,114,102,114,161,102,79",
+ "endOffsets": "217,329,440,530,635,754,832,909,1000,1092,1187,1281,1382,1475,1570,1665,1756,1847,1929,2043,2145,2242,2357,2460,2575,2737,2840,6136"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-te\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,353,539,667,780,976,1099,1230,1355,1563,1673,1857,1983,2193,2382,2472,2568",
+ "endColumns": "107,185,127,112,195,122,130,124,207,109,183,125,209,188,89,95,106",
+ "endOffsets": "352,538,666,779,975,1098,1229,1354,1562,1672,1856,1982,2192,2381,2471,2567,2674"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+<<<<<<< HEAD
"startOffsets": "2820,2928,3109,3240,3349,3553,3682,3827,4186,4414,4523,4704,4836,5032,5229,5323,5413",
"endColumns": "107,180,130,108,203,128,144,137,227,108,180,131,195,196,93,89,106",
"endOffsets": "2923,3104,3235,3344,3548,3677,3822,3960,4409,4518,4699,4831,5027,5224,5318,5408,5515"
@@ -7174,6 +13701,15 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-ky\\values.xml",
+=======
+ "startOffsets": "2845,2957,3143,3275,3392,3588,3715,3850,4178,4386,4500,4684,4814,5024,5217,5311,5411",
+ "endColumns": "111,185,131,116,195,126,134,128,207,113,183,129,209,192,93,99,110",
+ "endOffsets": "2952,3138,3270,3387,3583,3710,3845,3974,4381,4495,4679,4809,5019,5212,5306,5406,5517"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-te\\values.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "4",
"startColumns": "0",
@@ -7184,6 +13720,7 @@
"to": {
"startLines": "51",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "5938",
"endColumns": "104",
"endOffsets": "6038"
@@ -7255,11 +13792,29 @@
"endOffsets": "161,267,378,484"
},
"to": {
+=======
+ "startOffsets": "5956",
+ "endColumns": "104",
+ "endOffsets": "6056"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-te\\values-te.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,166,272,383",
+ "endColumns": "110,105,110,105",
+ "endOffsets": "161,267,378,484"
+ },
+ "to": {
+>>>>>>> origin/feature/pushNotifications
"startLines": "47,48,49,50",
"startColumns": "4,4,4,4",
"startOffsets": "5522,5633,5739,5850",
"endColumns": "110,105,110,105",
"endOffsets": "5628,5734,5845,5951"
+<<<<<<< HEAD
}
},
{
@@ -7323,14 +13878,34 @@
"endOffsets": "151"
},
"to": {
+=======
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-te\\values-te.xml",
+ "from": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "100",
+ "endOffsets": "151"
+ },
+ "to": {
+>>>>>>> origin/feature/pushNotifications
"startLines": "53",
"startColumns": "4",
"startOffsets": "6141",
"endColumns": "100",
"endOffsets": "6237"
}
- },
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-km_values-km.arsc.flat",
+ "map": [
{
+<<<<<<< HEAD
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-te\\values.xml",
"from": {
"startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
@@ -7338,13 +13913,28 @@
"startOffsets": "245,353,539,667,780,976,1099,1230,1355,1563,1673,1857,1983,2193,2382,2472,2568",
"endColumns": "107,185,127,112,195,122,130,124,207,109,183,125,209,188,89,95,106",
"endOffsets": "352,538,666,779,975,1098,1229,1354,1562,1672,1856,1982,2192,2381,2471,2567,2674"
+=======
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-km\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,345,532,651,754,975,1097,1244,1378,1595,1699,1901,2024,2228,2412,2502,2586",
+ "endColumns": "99,186,118,102,220,121,146,133,216,103,201,122,203,183,89,83,101",
+ "endOffsets": "344,531,650,753,974,1096,1243,1377,1594,1698,1900,2023,2227,2411,2501,2585,2687"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+<<<<<<< HEAD
"startOffsets": "2845,2957,3143,3275,3392,3588,3715,3850,4178,4386,4500,4684,4814,5024,5217,5311,5411",
"endColumns": "111,185,131,116,195,126,134,128,207,113,183,129,209,192,93,99,110",
"endOffsets": "2952,3138,3270,3387,3583,3710,3845,3974,4381,4495,4679,4809,5019,5212,5306,5406,5517"
+=======
+ "startOffsets": "2793,2897,3084,3207,3314,3535,3661,3812,4158,4375,4483,4685,4812,5016,5204,5298,5386",
+ "endColumns": "103,186,122,106,220,125,150,137,216,107,201,126,203,187,93,87,105",
+ "endOffsets": "2892,3079,3202,3309,3530,3656,3807,3945,4370,4478,4680,4807,5011,5199,5293,5381,5487"
+>>>>>>> origin/feature/pushNotifications
}
}
]
@@ -7353,6 +13943,7 @@
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-cs_values-cs.arsc.flat",
"map": [
{
+<<<<<<< HEAD
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-cs\\values.xml",
"from": {
"startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
@@ -7371,6 +13962,26 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-cs\\values-cs.xml",
+=======
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-km\\values-km.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,152,249,382",
+ "endColumns": "96,96,132,98",
+ "endOffsets": "147,244,377,476"
+ },
+ "to": {
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "5492,5589,5686,5819",
+ "endColumns": "96,96,132,98",
+ "endOffsets": "5584,5681,5814,5913"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-km\\values-km.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "2",
"startColumns": "4",
@@ -7381,6 +13992,7 @@
"to": {
"startLines": "53",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "6144",
"endColumns": "100",
"endOffsets": "6240"
@@ -7452,12 +14064,72 @@
"startOffsets": "105,212,314,423,509,614,731,809,886,977,1069,1164,1258,1353,1446,1541,1638,1729,1820,1903,2007,2119,2218,2324,2435,2537,2700,6062",
"endColumns": "106,101,108,85,104,116,77,76,90,91,94,93,94,92,94,96,90,90,82,103,111,98,105,110,101,162,97,81",
"endOffsets": "207,309,418,504,609,726,804,881,972,1064,1159,1253,1348,1441,1536,1633,1724,1815,1898,2002,2114,2213,2319,2430,2532,2695,2793,6139"
+=======
+ "startOffsets": "6106",
+ "endColumns": "100",
+ "endOffsets": "6202"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-km\\values-km.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,207,306,416,503,606,727,805,882,973,1065,1157,1251,1352,1445,1540,1634,1725,1816,1898,2002,2106,2206,2315,2424,2533,2695,2793",
+ "endColumns": "101,98,109,86,102,120,77,76,90,91,91,93,100,92,94,93,90,90,81,103,103,99,108,108,108,161,97,82",
+ "endOffsets": "202,301,411,498,601,722,800,877,968,1060,1152,1246,1347,1440,1535,1629,1720,1811,1893,1997,2101,2201,2310,2419,2528,2690,2788,2871"
+ },
+ "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,52",
+ "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",
+ "startOffsets": "105,207,306,416,503,606,727,805,882,973,1065,1157,1251,1352,1445,1540,1634,1725,1816,1898,2002,2106,2206,2315,2424,2533,2695,6023",
+ "endColumns": "101,98,109,86,102,120,77,76,90,91,91,93,100,92,94,93,90,90,81,103,103,99,108,108,108,161,97,82",
+ "endOffsets": "202,301,411,498,601,722,800,877,968,1060,1152,1246,1347,1440,1535,1629,1720,1811,1893,1997,2101,2201,2310,2419,2528,2690,2788,6101"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-km\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "247",
+ "endColumns": "207",
+ "endOffsets": "454"
+ },
+ "to": {
+ "startLines": "37",
+ "startColumns": "4",
+ "startOffsets": "3950",
+ "endColumns": "207",
+ "endOffsets": "4153"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-km\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "207",
+ "endColumns": "100",
+ "endOffsets": "307"
+ },
+ "to": {
+ "startLines": "51",
+ "startColumns": "4",
+ "startOffsets": "5918",
+ "endColumns": "104",
+ "endOffsets": "6018"
+>>>>>>> origin/feature/pushNotifications
}
}
]
},
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-hi_values-hi.arsc.flat",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-gl_values-gl.arsc.flat",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-hi\\values.xml",
@@ -7599,6 +14271,7 @@
"endColumns": "100",
"endOffsets": "6279"
}
+<<<<<<< HEAD
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-ca\\values-ca.xml",
@@ -7642,10 +14315,216 @@
"startOffsets": "247",
"endColumns": "193",
"endOffsets": "440"
+=======
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-v18_values-v18.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-v18\\values-v18.xml",
+ "from": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "48",
+ "endOffsets": "99"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-sw600dp-v13_values-sw600dp-v13.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\19593d9c2c700c52ad03572ebfd537d5\\material-1.1.0-rc02\\res\\values-sw600dp-v13\\values-sw600dp-v13.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,10,11,12,13,14",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "55,115,185,256,328,386,444,553,617,673,732,795",
+ "endLines": "2,3,4,5,6,7,9,10,11,12,13,17",
+ "endColumns": "59,69,70,71,57,57,10,63,55,58,62,10",
+ "endOffsets": "110,180,251,323,381,439,548,612,668,727,790,962"
+ },
+ "to": {
+ "startLines": "10,11,12,13,14,15,16,18,19,20,21,22",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "611,671,741,812,884,942,1000,1109,1173,1229,1288,1351",
+ "endLines": "10,11,12,13,14,15,17,18,19,20,21,25",
+ "endColumns": "59,69,70,71,57,57,10,63,55,58,62,10",
+ "endOffsets": "666,736,807,879,937,995,1104,1168,1224,1283,1346,1518"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-sw600dp-v13\\values-sw600dp-v13.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9",
+ "startColumns": "4,4,4,4,4,4,4,4",
+ "startOffsets": "55,124,193,263,337,413,472,543",
+ "endColumns": "68,68,69,73,75,58,70,67",
+ "endOffsets": "119,188,258,332,408,467,538,606"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-v17_values-v17.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-v17\\values-v17.xml",
+ "from": {
+ "startLines": "2,5,9,12,15,18,22,25,29,33,37,40,43,46,50,53,57",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "55,228,456,614,764,936,1161,1331,1559,1783,2025,2196,2370,2539,2812,3012,3216",
+ "endLines": "4,8,11,14,17,21,24,28,32,36,39,42,45,49,52,56,60",
+ "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12",
+ "endOffsets": "223,451,609,759,931,1156,1326,1554,1778,2020,2191,2365,2534,2807,3007,3211,3540"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-mr_values-mr.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-mr\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "247",
+ "endColumns": "201",
+ "endOffsets": "448"
},
"to": {
"startLines": "37",
"startColumns": "4",
+ "startOffsets": "3933",
+ "endColumns": "201",
+ "endOffsets": "4130"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-mr\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,350,549,670,780,984,1103,1237,1359,1568,1674,1859,1981,2179,2358,2444,2536",
+ "endColumns": "104,198,120,109,203,118,133,121,208,105,184,121,197,178,85,91,105",
+ "endOffsets": "349,548,669,779,983,1102,1236,1358,1567,1673,1858,1980,2178,2357,2443,2535,2641"
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2795,2904,3103,3228,3342,3546,3669,3807,4135,4344,4454,4639,4765,4963,5146,5236,5332",
+ "endColumns": "108,198,124,113,203,122,137,125,208,109,184,125,197,182,89,95,109",
+ "endOffsets": "2899,3098,3223,3337,3541,3664,3802,3928,4339,4449,4634,4760,4958,5141,5231,5327,5437"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-mr\\values-mr.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,156,257,368",
+ "endColumns": "100,100,110,100",
+ "endOffsets": "151,252,363,464"
+ },
+ "to": {
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "5442,5543,5644,5755",
+ "endColumns": "100,100,110,100",
+ "endOffsets": "5538,5639,5750,5851"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-mr\\values-mr.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,216,322,429,519,621,733,811,889,980,1072,1165,1262,1363,1456,1551,1645,1736,1827,1906,2013,2114,2210,2319,2421,2535,2692,2795",
+ "endColumns": "110,105,106,89,101,111,77,77,90,91,92,96,100,92,94,93,90,90,78,106,100,95,108,101,113,156,102,78",
+ "endOffsets": "211,317,424,514,616,728,806,884,975,1067,1160,1257,1358,1451,1546,1640,1731,1822,1901,2008,2109,2205,2314,2416,2530,2687,2790,2869"
+ },
+ "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,52",
+ "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",
+ "startOffsets": "105,216,322,429,519,621,733,811,889,980,1072,1165,1262,1363,1456,1551,1645,1736,1827,1906,2013,2114,2210,2319,2421,2535,2692,5960",
+ "endColumns": "110,105,106,89,101,111,77,77,90,91,92,96,100,92,94,93,90,90,78,106,100,95,108,101,113,156,102,78",
+ "endOffsets": "211,317,424,514,616,728,806,884,975,1067,1160,1257,1358,1451,1546,1640,1731,1822,1901,2008,2109,2205,2314,2416,2530,2687,2790,6034"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-mr\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "207",
+ "endColumns": "99",
+ "endOffsets": "306"
+ },
+ "to": {
+ "startLines": "51",
+ "startColumns": "4",
+ "startOffsets": "5856",
+ "endColumns": "103",
+ "endOffsets": "5955"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-mr\\values-mr.xml",
+ "from": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "100",
+ "endOffsets": "151"
+ },
+ "to": {
+ "startLines": "53",
+ "startColumns": "4",
+ "startOffsets": "6039",
+ "endColumns": "100",
+ "endOffsets": "6135"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-be_values-be.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-be\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "207",
+ "endColumns": "100",
+ "endOffsets": "307"
+ },
+ "to": {
+ "startLines": "51",
+ "startColumns": "4",
+ "startOffsets": "5991",
+ "endColumns": "104",
+ "endOffsets": "6091"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-be\\values-be.xml",
+ "from": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "100",
+ "endOffsets": "151"
+>>>>>>> origin/feature/pushNotifications
+ },
+ "to": {
+ "startLines": "53",
+ "startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "3984",
"endColumns": "193",
"endOffsets": "4173"
@@ -7675,16 +14554,26 @@
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-it\\values.xml",
+=======
+ "startOffsets": "6177",
+ "endColumns": "100",
+ "endOffsets": "6273"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-be\\values.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "4",
"startColumns": "0",
- "startOffsets": "207",
- "endColumns": "99",
- "endOffsets": "306"
+ "startOffsets": "247",
+ "endColumns": "204",
+ "endOffsets": "451"
},
"to": {
- "startLines": "51",
+ "startLines": "37",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "5920",
"endColumns": "103",
"endOffsets": "6019"
@@ -7715,10 +14604,60 @@
"startOffsets": "105,210,313,422,506,611,730,808,884,976,1069,1162,1256,1358,1452,1549,1644,1736,1828,1908,2014,2121,2219,2323,2429,2536,2699,2799",
"endColumns": "104,102,108,83,104,118,77,75,91,92,92,93,101,93,96,94,91,91,79,105,106,97,103,105,106,162,99,80",
"endOffsets": "205,308,417,501,606,725,803,879,971,1064,1157,1251,1353,1447,1544,1639,1731,1823,1903,2009,2116,2214,2318,2424,2531,2694,2794,2875"
+=======
+ "startOffsets": "3997",
+ "endColumns": "204",
+ "endOffsets": "4197"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-be\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,350,544,667,775,989,1113,1254,1383,1604,1709,1903,2029,2241,2426,2521,2609",
+ "endColumns": "104,193,122,107,213,123,140,128,220,104,193,125,211,184,94,87,103",
+ "endOffsets": "349,543,666,774,988,1112,1253,1382,1603,1708,1902,2028,2240,2425,2520,2608,2712"
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2835,2944,3138,3265,3377,3591,3719,3864,4202,4423,4532,4726,4856,5068,5257,5356,5448",
+ "endColumns": "108,193,126,111,213,127,144,132,220,108,193,129,211,188,98,91,107",
+ "endOffsets": "2939,3133,3260,3372,3586,3714,3859,3992,4418,4527,4721,4851,5063,5252,5351,5443,5551"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-be\\values-be.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,164,272,384",
+ "endColumns": "108,107,111,105",
+ "endOffsets": "159,267,379,485"
+ },
+ "to": {
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "5556,5665,5773,5885",
+ "endColumns": "108,107,111,105",
+ "endOffsets": "5660,5768,5880,5986"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-be\\values-be.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,225,328,444,530,635,754,834,912,1004,1097,1192,1286,1382,1476,1572,1667,1759,1851,1931,2037,2142,2240,2348,2454,2562,2735,2835",
+ "endColumns": "119,102,115,85,104,118,79,77,91,92,94,93,95,93,95,94,91,91,79,105,104,97,107,105,107,172,99,80",
+ "endOffsets": "220,323,439,525,630,749,829,907,999,1092,1187,1281,1377,1471,1567,1662,1754,1846,1926,2032,2137,2235,2343,2449,2557,2730,2830,2911"
+>>>>>>> origin/feature/pushNotifications
},
"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,52",
"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",
+<<<<<<< HEAD
"startOffsets": "105,210,313,422,506,611,730,808,884,976,1069,1162,1256,1358,1452,1549,1644,1736,1828,1908,2014,2121,2219,2323,2429,2536,2699,6024",
"endColumns": "104,102,108,83,104,118,77,75,91,92,92,93,101,93,96,94,91,91,79,105,106,97,103,105,106,162,99,80",
"endOffsets": "205,308,417,501,606,725,803,879,971,1064,1157,1251,1353,1447,1544,1639,1731,1823,1903,2009,2116,2214,2318,2424,2531,2694,2794,6100"
@@ -7743,6 +14682,71 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-it\\values-it.xml",
+=======
+ "startOffsets": "105,225,328,444,530,635,754,834,912,1004,1097,1192,1286,1382,1476,1572,1667,1759,1851,1931,2037,2142,2240,2348,2454,2562,2735,6096",
+ "endColumns": "119,102,115,85,104,118,79,77,91,92,94,93,95,93,95,94,91,91,79,105,104,97,107,105,107,172,99,80",
+ "endOffsets": "220,323,439,525,630,749,829,907,999,1092,1187,1281,1377,1471,1567,1662,1754,1846,1926,2032,2137,2235,2343,2449,2557,2730,2830,6172"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-da_values-da.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-da\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,349,541,666,773,975,1098,1244,1374,1589,1693,1886,2011,2215,2419,2511,2599",
+ "endColumns": "103,191,124,106,201,122,145,129,214,103,192,124,203,203,91,87,102",
+ "endOffsets": "348,540,665,772,974,1097,1243,1373,1588,1692,1885,2010,2214,2418,2510,2598,2701"
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2757,2865,3057,3186,3297,3499,3626,3776,4096,4311,4419,4612,4741,4945,5153,5249,5341",
+ "endColumns": "107,191,128,110,201,126,149,133,214,107,192,128,203,207,95,91,106",
+ "endOffsets": "2860,3052,3181,3292,3494,3621,3771,3905,4306,4414,4607,4736,4940,5148,5244,5336,5443"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-da\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "207",
+ "endColumns": "101",
+ "endOffsets": "308"
+ },
+ "to": {
+ "startLines": "51",
+ "startColumns": "4",
+ "startOffsets": "5862",
+ "endColumns": "105",
+ "endOffsets": "5963"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-da\\values-da.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,205,299,415,500,600,713,791,868,959,1051,1144,1238,1333,1426,1521,1619,1710,1801,1879,1987,2094,2190,2303,2406,2507,2660,2757",
+ "endColumns": "99,93,115,84,99,112,77,76,90,91,92,93,94,92,94,97,90,90,77,107,106,95,112,102,100,152,96,78",
+ "endOffsets": "200,294,410,495,595,708,786,863,954,1046,1139,1233,1328,1421,1516,1614,1705,1796,1874,1982,2089,2185,2298,2401,2502,2655,2752,2831"
+ },
+ "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,52",
+ "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",
+ "startOffsets": "105,205,299,415,500,600,713,791,868,959,1051,1144,1238,1333,1426,1521,1619,1710,1801,1879,1987,2094,2190,2303,2406,2507,2660,5968",
+ "endColumns": "99,93,115,84,99,112,77,76,90,91,92,93,94,92,94,97,90,90,77,107,106,95,112,102,100,152,96,78",
+ "endOffsets": "200,294,410,495,595,708,786,863,954,1046,1139,1233,1328,1421,1516,1614,1705,1796,1874,1982,2089,2185,2298,2401,2502,2655,2752,6042"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-da\\values-da.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "2",
"startColumns": "4",
@@ -7753,6 +14757,7 @@
"to": {
"startLines": "53",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "6105",
"endColumns": "100",
"endOffsets": "6201"
@@ -7807,11 +14812,51 @@
"endLines": "10,11,15,19",
"endColumns": "74,86,12,12",
"endOffsets": "825,912,1142,1384"
+=======
+ "startOffsets": "6047",
+ "endColumns": "100",
+ "endOffsets": "6143"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-da\\values-da.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,167,266,373",
+ "endColumns": "111,98,106,95",
+ "endOffsets": "162,261,368,464"
+ },
+ "to": {
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "5448,5560,5659,5766",
+ "endColumns": "111,98,106,95",
+ "endOffsets": "5555,5654,5761,5857"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-da\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "247",
+ "endColumns": "185",
+ "endOffsets": "432"
+ },
+ "to": {
+ "startLines": "37",
+ "startColumns": "4",
+ "startOffsets": "3910",
+ "endColumns": "185",
+ "endOffsets": "4091"
+>>>>>>> origin/feature/pushNotifications
}
}
]
},
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values_values.arsc.flat",
"map": [
{
@@ -7833,6 +14878,29 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\src\\main\\res\\values\\ic_launcher_background.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-zh-rTW_values-zh-rTW.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-zh-rTW\\values-zh-rTW.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,200,293,393,475,572,680,757,833,925,1018,1115,1211,1307,1401,1497,1589,1681,1773,1850,1946,2041,2136,2233,2329,2427,2577,2671",
+ "endColumns": "94,92,99,81,96,107,76,75,91,92,96,95,95,93,95,91,91,91,76,95,94,94,96,95,97,149,93,77",
+ "endOffsets": "195,288,388,470,567,675,752,828,920,1013,1110,1206,1302,1396,1492,1584,1676,1768,1845,1941,2036,2131,2228,2324,2422,2572,2666,2744"
+ },
+ "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,52",
+ "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",
+ "startOffsets": "105,200,293,393,475,572,680,757,833,925,1018,1115,1211,1307,1401,1497,1589,1681,1773,1850,1946,2041,2136,2233,2329,2427,2577,5449",
+ "endColumns": "94,92,99,81,96,107,76,75,91,92,96,95,95,93,95,91,91,91,76,95,94,94,96,95,97,149,93,77",
+ "endOffsets": "195,288,388,470,567,675,752,828,920,1013,1110,1206,1302,1396,1492,1584,1676,1768,1845,1941,2036,2131,2228,2324,2422,2572,2666,5522"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-zh-rTW\\values-zh-rTW.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "2",
"startColumns": "4",
@@ -7843,6 +14911,7 @@
"to": {
"startLines": "171",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "10935",
"endColumns": "56",
"endOffsets": "10987"
@@ -7939,6 +15008,154 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\305c2898fe2457e82c9da2257c2bc0a1\\jetified-viewpager2-1.0.0\\res\\values\\values.xml",
+=======
+ "startOffsets": "5527",
+ "endColumns": "100",
+ "endOffsets": "5623"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-zh-rTW\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "251",
+ "endColumns": "161",
+ "endOffsets": "412"
+ },
+ "to": {
+ "startLines": "37",
+ "startColumns": "4",
+ "startOffsets": "3693",
+ "endColumns": "161",
+ "endOffsets": "3850"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-zh-rTW\\values-zh-rTW.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,139,231,332",
+ "endColumns": "83,91,100,91",
+ "endOffsets": "134,226,327,419"
+ },
+ "to": {
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "4979,5063,5155,5256",
+ "endColumns": "83,91,100,91",
+ "endOffsets": "5058,5150,5251,5343"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-zh-rTW\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "249,348,508,621,721,887,1001,1127,1247,1416,1515,1675,1788,1949,2083,2165,2248",
+ "endColumns": "98,159,112,99,165,113,125,119,168,98,159,112,160,133,81,82,98",
+ "endOffsets": "347,507,620,720,886,1000,1126,1246,1415,1514,1674,1787,1948,2082,2164,2247,2346"
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2671,2774,2934,3051,3155,3321,3439,3569,3855,4024,4127,4287,4404,4565,4703,4789,4876",
+ "endColumns": "102,159,116,103,165,117,129,123,168,102,159,116,160,137,85,86,102",
+ "endOffsets": "2769,2929,3046,3150,3316,3434,3564,3688,4019,4122,4282,4399,4560,4698,4784,4871,4974"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-zh-rTW\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "211",
+ "endColumns": "96",
+ "endOffsets": "307"
+ },
+ "to": {
+ "startLines": "51",
+ "startColumns": "4",
+ "startOffsets": "5348",
+ "endColumns": "100",
+ "endOffsets": "5444"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-small-v4_values-small-v4.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\19593d9c2c700c52ad03572ebfd537d5\\material-1.1.0-rc02\\res\\values-small-v4\\values-small-v4.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,128,198,270",
+ "endColumns": "72,69,71,69",
+ "endOffsets": "123,193,265,335"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-v28_values-v28.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-v28\\values-v28.xml",
+ "from": {
+ "startLines": "2,3,4,8",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,130,217,447",
+ "endLines": "2,3,7,11",
+ "endColumns": "74,86,12,12",
+ "endOffsets": "125,212,442,684"
+ },
+ "to": {
+ "startLines": "10,11,12,16",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "755,830,917,1147",
+ "endLines": "10,11,15,19",
+ "endColumns": "74,86,12,12",
+ "endOffsets": "825,912,1142,1384"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\19593d9c2c700c52ad03572ebfd537d5\\material-1.1.0-rc02\\res\\values-v28\\values-v28.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9",
+ "startColumns": "4,4,4,4,4,4,4,4",
+ "startOffsets": "55,143,231,319,407,494,581,668",
+ "endColumns": "87,87,87,87,86,86,86,86",
+ "endOffsets": "138,226,314,402,489,576,663,750"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-ar_values-ar.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-ar\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "247",
+ "endColumns": "188",
+ "endOffsets": "435"
+ },
+ "to": {
+ "startLines": "37",
+ "startColumns": "4",
+ "startOffsets": "3870",
+ "endColumns": "188",
+ "endOffsets": "4054"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-ar\\values-ar.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "2",
"startColumns": "4",
@@ -7950,6 +15167,7 @@
"to": {
"startLines": "7020",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "437496",
"endLines": "7022",
"endColumns": "24",
@@ -8157,11 +15375,192 @@
"startOffsets": "40561,45486",
"endColumns": "67,166",
"endOffsets": "40624,45648"
+=======
+ "startOffsets": "5936",
+ "endColumns": "100",
+ "endOffsets": "6032"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-ar\\values-ar.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,213,317,424,506,607,721,801,880,971,1063,1155,1249,1350,1443,1538,1631,1722,1816,1894,1999,2097,2195,2303,2403,2506,2661,2758",
+ "endColumns": "107,103,106,81,100,113,79,78,90,91,91,93,100,92,94,92,90,93,77,104,97,97,107,99,102,154,96,80",
+ "endOffsets": "208,312,419,501,602,716,796,875,966,1058,1150,1244,1345,1438,1533,1626,1717,1811,1889,1994,2092,2190,2298,2398,2501,2656,2753,2834"
+ },
+ "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,52",
+ "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",
+ "startOffsets": "105,213,317,424,506,607,721,801,880,971,1063,1155,1249,1350,1443,1538,1631,1722,1816,1894,1999,2097,2195,2303,2403,2506,2661,5855",
+ "endColumns": "107,103,106,81,100,113,79,78,90,91,91,93,100,92,94,92,90,93,77,104,97,97,107,99,102,154,96,80",
+ "endOffsets": "208,312,419,501,602,716,796,875,966,1058,1150,1244,1345,1438,1533,1626,1717,1811,1889,1994,2092,2190,2298,2398,2501,2656,2753,5931"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-ar\\values-ar.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,155,253,361",
+ "endColumns": "99,97,107,100",
+ "endOffsets": "150,248,356,457"
+ },
+ "to": {
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "5343,5443,5541,5649",
+ "endColumns": "99,97,107,100",
+ "endOffsets": "5438,5536,5644,5745"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-ar\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,347,523,643,746,943,1069,1206,1333,1529,1631,1812,1932,2130,2302,2392,2484",
+ "endColumns": "101,175,119,102,196,125,136,126,195,101,180,119,197,171,89,91,108",
+ "endOffsets": "346,522,642,745,942,1068,1205,1332,1528,1630,1811,1931,2129,2301,2391,2483,2592"
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2758,2864,3040,3164,3271,3468,3598,3739,4059,4255,4361,4542,4666,4864,5040,5134,5230",
+ "endColumns": "105,175,123,106,196,129,140,130,195,105,180,123,197,175,93,95,112",
+ "endOffsets": "2859,3035,3159,3266,3463,3593,3734,3865,4250,4356,4537,4661,4859,5035,5129,5225,5338"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-ar\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "207",
+ "endColumns": "100",
+ "endOffsets": "307"
+ },
+ "to": {
+ "startLines": "51",
+ "startColumns": "4",
+ "startOffsets": "5750",
+ "endColumns": "104",
+ "endOffsets": "5850"
}
}
]
},
{
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-sk_values-sk.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-sk\\values-sk.xml",
+ "from": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "100",
+ "endOffsets": "151"
+ },
+ "to": {
+ "startLines": "53",
+ "startColumns": "4",
+ "startOffsets": "6185",
+ "endColumns": "100",
+ "endOffsets": "6281"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-sk\\values-sk.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,162,265,380",
+ "endColumns": "106,102,114,100",
+ "endOffsets": "157,260,375,476"
+ },
+ "to": {
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "5573,5680,5783,5898",
+ "endColumns": "106,102,114,100",
+ "endOffsets": "5675,5778,5893,5994"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-sk\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,349,541,663,771,986,1112,1251,1378,1606,1715,1916,2044,2266,2456,2550,2643",
+ "endColumns": "103,191,121,107,214,125,138,126,227,108,200,127,221,189,93,92,111",
+ "endOffsets": "348,540,662,770,985,1111,1250,1377,1605,1714,1915,2043,2265,2455,2549,2642,2754"
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2817,2925,3117,3243,3355,3570,3700,3843,4172,4400,4513,4714,4846,5068,5262,5360,5457",
+ "endColumns": "107,191,125,111,214,129,142,130,227,112,200,131,221,193,97,96,115",
+ "endOffsets": "2920,3112,3238,3350,3565,3695,3838,3969,4395,4508,4709,4841,5063,5257,5355,5452,5568"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-sk\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "247",
+ "endColumns": "197",
+ "endOffsets": "444"
+ },
+ "to": {
+ "startLines": "37",
+ "startColumns": "4",
+ "startOffsets": "3974",
+ "endColumns": "197",
+ "endOffsets": "4167"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-sk\\values-sk.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,212,313,424,510,618,736,815,893,984,1076,1174,1268,1369,1462,1557,1655,1746,1837,1920,2025,2133,2232,2338,2450,2553,2719,2817",
+ "endColumns": "106,100,110,85,107,117,78,77,90,91,97,93,100,92,94,97,90,90,82,104,107,98,105,111,102,165,97,81",
+ "endOffsets": "207,308,419,505,613,731,810,888,979,1071,1169,1263,1364,1457,1552,1650,1741,1832,1915,2020,2128,2227,2333,2445,2548,2714,2812,2894"
+ },
+ "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,52",
+ "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",
+ "startOffsets": "105,212,313,424,510,618,736,815,893,984,1076,1174,1268,1369,1462,1557,1655,1746,1837,1920,2025,2133,2232,2338,2450,2553,2719,6103",
+ "endColumns": "106,100,110,85,107,117,78,77,90,91,97,93,100,92,94,97,90,90,82,104,107,98,105,111,102,165,97,81",
+ "endOffsets": "207,308,419,505,613,731,810,888,979,1071,1169,1263,1364,1457,1552,1650,1741,1832,1915,2020,2128,2227,2333,2445,2548,2714,2812,6180"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-sk\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "207",
+ "endColumns": "99",
+ "endOffsets": "306"
+ },
+ "to": {
+ "startLines": "51",
+ "startColumns": "4",
+ "startOffsets": "5999",
+ "endColumns": "103",
+ "endOffsets": "6098"
+>>>>>>> origin/feature/pushNotifications
+ }
+ }
+ ]
+ },
+ {
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-ka_values-ka.arsc.flat",
"map": [
{
@@ -8200,6 +15599,63 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-ka\\values-ka.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-bn_values-bn.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-bn\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "207",
+ "endColumns": "99",
+ "endOffsets": "306"
+ },
+ "to": {
+ "startLines": "51",
+ "startColumns": "4",
+ "startOffsets": "5917",
+ "endColumns": "103",
+ "endOffsets": "6016"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-bn\\values-bn.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,213,319,425,514,619,740,823,906,997,1089,1183,1277,1378,1471,1566,1660,1751,1842,1927,2037,2141,2244,2352,2460,2565,2730,2835",
+ "endColumns": "107,105,105,88,104,120,82,82,90,91,93,93,100,92,94,93,90,90,84,109,103,102,107,107,104,164,104,85",
+ "endOffsets": "208,314,420,509,614,735,818,901,992,1084,1178,1272,1373,1466,1561,1655,1746,1837,1922,2032,2136,2239,2347,2455,2560,2725,2830,2916"
+ },
+ "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,52",
+ "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",
+ "startOffsets": "105,213,319,425,514,619,740,823,906,997,1089,1183,1277,1378,1471,1566,1660,1751,1842,1927,2037,2141,2244,2352,2460,2565,2730,6021",
+ "endColumns": "107,105,105,88,104,120,82,82,90,91,93,93,100,92,94,93,90,90,84,109,103,102,107,107,104,164,104,85",
+ "endOffsets": "208,314,420,509,614,735,818,901,992,1084,1178,1272,1373,1466,1561,1655,1746,1837,1922,2032,2136,2239,2347,2455,2560,2725,2830,6102"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-bn\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,352,543,669,778,974,1094,1232,1361,1565,1672,1859,1985,2178,2352,2438,2531",
+ "endColumns": "106,190,125,108,195,119,137,128,203,106,186,125,192,173,85,92,114",
+ "endOffsets": "351,542,668,777,973,1093,1231,1360,1564,1671,1858,1984,2177,2351,2437,2530,2645"
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2835,2946,3137,3267,3380,3576,3700,3842,4186,4390,4501,4688,4818,5011,5189,5279,5376",
+ "endColumns": "110,190,129,112,195,123,141,132,203,110,186,129,192,177,89,96,118",
+ "endOffsets": "2941,3132,3262,3375,3571,3695,3837,3970,4385,4496,4683,4813,5006,5184,5274,5371,5490"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-bn\\values-bn.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "2",
"startColumns": "4",
@@ -8210,6 +15666,7 @@
"to": {
"startLines": "53",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "6130",
"endColumns": "100",
"endOffsets": "6226"
@@ -8234,16 +15691,48 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-ka\\values.xml",
+=======
+ "startOffsets": "6107",
+ "endColumns": "100",
+ "endOffsets": "6203"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-bn\\values-bn.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,161,263,372",
+ "endColumns": "105,101,108,104",
+ "endOffsets": "156,258,367,472"
+ },
+ "to": {
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "5495,5601,5703,5812",
+ "endColumns": "105,101,108,104",
+ "endOffsets": "5596,5698,5807,5912"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-bn\\values.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "4",
"startColumns": "0",
"startOffsets": "247",
+<<<<<<< HEAD
"endColumns": "201",
"endOffsets": "448"
+=======
+ "endColumns": "210",
+ "endOffsets": "457"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "37",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "3976",
"endColumns": "201",
"endOffsets": "4173"
@@ -8264,11 +15753,49 @@
"startOffsets": "105,213,316,427,513,618,731,814,894,985,1077,1172,1266,1367,1460,1555,1650,1741,1832,1912,2025,2131,2229,2342,2447,2551,2709,6049",
"endColumns": "107,102,110,85,104,112,82,79,90,91,94,93,100,92,94,94,90,90,79,112,105,97,112,104,103,157,98,80",
"endOffsets": "208,311,422,508,613,726,809,889,980,1072,1167,1261,1362,1455,1550,1645,1736,1827,1907,2020,2126,2224,2337,2442,2546,2704,2803,6125"
+=======
+ "startOffsets": "3975",
+ "endColumns": "210",
+ "endOffsets": "4181"
}
}
]
},
{
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-v24_values-v24.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-v24\\values-v24.xml",
+ "from": {
+ "startLines": "2,3",
+ "startColumns": "4,4",
+ "startOffsets": "55,212",
+ "endColumns": "156,134",
+ "endOffsets": "207,342"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\47ce40ad459cbf22b0d81e337967e729\\media-1.0.0\\res\\values-v24\\values-v24.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,121,182,248",
+ "endColumns": "65,60,65,66",
+ "endOffsets": "116,177,243,310"
+ },
+ "to": {
+ "startLines": "4,5,6,7",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "347,413,474,540",
+ "endColumns": "65,60,65,66",
+ "endOffsets": "408,469,535,602"
+>>>>>>> origin/feature/pushNotifications
+ }
+ }
+ ]
+ },
+ {
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-en-rCA_values-en-rCA.arsc.flat",
"map": [
{
@@ -8290,14 +15817,38 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-en-rCA\\values-en-rCA.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-mn_values-mn.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-mn\\values.xml",
"from": {
- "startLines": "2",
- "startColumns": "4",
- "startOffsets": "55",
- "endColumns": "100",
- "endOffsets": "151"
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,353,542,672,777,973,1097,1252,1387,1590,1695,1894,2021,2221,2415,2502,2590",
+ "endColumns": "107,188,129,104,195,123,154,134,202,104,198,126,199,193,86,87,101",
+ "endOffsets": "352,541,671,776,972,1096,1251,1386,1589,1694,1893,2020,2220,2414,2501,2589,2691"
},
"to": {
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2797,2909,3098,3232,3341,3537,3665,3824,4172,4375,4484,4683,4814,5014,5212,5303,5395",
+ "endColumns": "111,188,133,108,195,127,158,138,202,108,198,130,199,197,90,91,105",
+ "endOffsets": "2904,3093,3227,3336,3532,3660,3819,3958,4370,4479,4678,4809,5009,5207,5298,5390,5496"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-mn\\values.xml",
+>>>>>>> origin/feature/pushNotifications
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "247",
+ "endColumns": "208",
+ "endOffsets": "455"
+ },
+ "to": {
+<<<<<<< HEAD
"startLines": "34",
"startColumns": "4",
"startOffsets": "3248",
@@ -8320,6 +15871,47 @@
"startOffsets": "2764,2862,2959,3068",
"endColumns": "97,96,108,97",
"endOffsets": "2857,2954,3063,3161"
+=======
+ "startLines": "37",
+ "startColumns": "4",
+ "startOffsets": "3963",
+ "endColumns": "208",
+ "endOffsets": "4167"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-mn\\values-mn.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,219,319,428,514,620,734,817,899,990,1082,1177,1273,1371,1464,1558,1650,1741,1831,1910,2017,2120,2217,2324,2426,2539,2698,2797",
+ "endColumns": "113,99,108,85,105,113,82,81,90,91,94,95,97,92,93,91,90,89,78,106,102,96,106,101,112,158,98,79",
+ "endOffsets": "214,314,423,509,615,729,812,894,985,1077,1172,1268,1366,1459,1553,1645,1736,1826,1905,2012,2115,2212,2319,2421,2534,2693,2792,2872"
+ },
+ "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,52",
+ "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",
+ "startOffsets": "105,219,319,428,514,620,734,817,899,990,1082,1177,1273,1371,1464,1558,1650,1741,1831,1910,2017,2120,2217,2324,2426,2539,2698,6026",
+ "endColumns": "113,99,108,85,105,113,82,81,90,91,94,95,97,92,93,91,90,89,78,106,102,96,106,101,112,158,98,79",
+ "endOffsets": "214,314,423,509,615,729,812,894,985,1077,1172,1268,1366,1459,1553,1645,1736,1826,1905,2012,2115,2212,2319,2421,2534,2693,2792,6101"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-mn\\values-mn.xml",
+ "from": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "100",
+ "endOffsets": "151"
+ },
+ "to": {
+ "startLines": "53",
+ "startColumns": "4",
+ "startOffsets": "6106",
+ "endColumns": "100",
+ "endOffsets": "6202"
+>>>>>>> origin/feature/pushNotifications
}
}
]
@@ -8328,6 +15920,7 @@
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-v26_values-v26.arsc.flat",
"map": [
{
+<<<<<<< HEAD
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-v26\\values-v26.xml",
"from": {
"startLines": "2,3,4,8,12,16",
@@ -8336,6 +15929,22 @@
"endLines": "2,3,7,11,15,16",
"endColumns": "74,86,12,12,12,92",
"endOffsets": "125,212,426,652,891,984"
+=======
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-mn\\values-mn.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,160,264,369",
+ "endColumns": "104,103,104,106",
+ "endOffsets": "155,259,364,471"
+ },
+ "to": {
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "5501,5606,5710,5815",
+ "endColumns": "104,103,104,106",
+ "endOffsets": "5601,5705,5810,5917"
+>>>>>>> origin/feature/pushNotifications
}
}
]
@@ -8344,6 +15953,7 @@
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-h720dp-v13_values-h720dp-v13.arsc.flat",
"map": [
{
+<<<<<<< HEAD
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-h720dp-v13\\values-h720dp-v13.xml",
"from": {
"startLines": "2",
@@ -8351,11 +15961,28 @@
"startOffsets": "55",
"endColumns": "66",
"endOffsets": "117"
+=======
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-mn\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "207",
+ "endColumns": "99",
+ "endOffsets": "306"
+ },
+ "to": {
+ "startLines": "51",
+ "startColumns": "4",
+ "startOffsets": "5922",
+ "endColumns": "103",
+ "endOffsets": "6021"
+>>>>>>> origin/feature/pushNotifications
}
}
]
},
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-ml_values-ml.arsc.flat",
"map": [
{
@@ -8373,9 +16000,28 @@
"startOffsets": "4070",
"endColumns": "218",
"endOffsets": "4284"
- }
- },
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-v22_values-v22.arsc.flat",
+ "map": [
{
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-v22\\values-v22.xml",
+ "from": {
+ "startLines": "2,3,4,9",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,130,217,553",
+ "endLines": "2,3,8,13",
+ "endColumns": "74,86,12,12",
+ "endOffsets": "125,212,548,896"
+>>>>>>> origin/feature/pushNotifications
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-v26_values-v26.arsc.flat",
+ "map": [
+ {
+<<<<<<< HEAD
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-ml\\values-ml.xml",
"from": {
"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",
@@ -8390,10 +16036,29 @@
"startOffsets": "105,212,318,429,520,625,747,825,901,992,1084,1185,1279,1380,1474,1569,1668,1759,1850,1931,2040,2144,2243,2355,2467,2588,2753,6233",
"endColumns": "106,105,110,90,104,121,77,75,90,91,100,93,100,93,94,98,90,90,80,108,103,98,111,111,120,164,100,81",
"endOffsets": "207,313,424,515,620,742,820,896,987,1079,1180,1274,1375,1469,1564,1663,1754,1845,1926,2035,2139,2238,2350,2462,2583,2748,2849,6310"
+=======
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-v26\\values-v26.xml",
+ "from": {
+ "startLines": "2,3,4,8,12,16",
+ "startColumns": "4,4,4,4,4,4",
+ "startOffsets": "55,130,217,431,657,896",
+ "endLines": "2,3,7,11,15,16",
+ "endColumns": "74,86,12,12,12,92",
+ "endOffsets": "125,212,426,652,891,984"
+>>>>>>> origin/feature/pushNotifications
}
- },
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-en-rCA_values-en-rCA.arsc.flat",
+ "map": [
{
+<<<<<<< HEAD
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-ml\\values.xml",
+=======
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-en-rCA\\values-en-rCA.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "4",
"startColumns": "0",
@@ -8402,6 +16067,7 @@
"endOffsets": "305"
},
"to": {
+<<<<<<< HEAD
"startLines": "51",
"startColumns": "4",
"startOffsets": "6130",
@@ -8434,16 +16100,62 @@
"startOffsets": "55,164,267,378",
"endColumns": "108,102,110,102",
"endOffsets": "159,262,373,476"
- },
- "to": {
- "startLines": "47,48,49,50",
- "startColumns": "4,4,4,4",
- "startOffsets": "5704,5813,5916,6027",
- "endColumns": "108,102,110,102",
- "endOffsets": "5808,5911,6022,6125"
+=======
+ "startLines": "34",
+ "startColumns": "4",
+ "startOffsets": "3248",
+ "endColumns": "100",
+ "endOffsets": "3344"
}
},
{
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-en-rCA\\values-en-rCA.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,209,309,417,501,601,716,793,869,960,1053,1149,1243,1344,1437,1532,1626,1717,1808,1890,1993,2097,2196,2301,2404,2508,2664,2764",
+ "endColumns": "103,99,107,83,99,114,76,75,90,92,95,93,100,92,94,93,90,90,81,102,103,98,104,102,103,155,99,81",
+ "endOffsets": "204,304,412,496,596,711,788,864,955,1048,1144,1238,1339,1432,1527,1621,1712,1803,1885,1988,2092,2191,2296,2399,2503,2659,2759,2841"
+ },
+ "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,33",
+ "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",
+ "startOffsets": "105,209,309,417,501,601,716,793,869,960,1053,1149,1243,1344,1437,1532,1626,1717,1808,1890,1993,2097,2196,2301,2404,2508,2664,3166",
+ "endColumns": "103,99,107,83,99,114,76,75,90,92,95,93,100,92,94,93,90,90,81,102,103,98,104,102,103,155,99,81",
+ "endOffsets": "204,304,412,496,596,711,788,864,955,1048,1144,1238,1339,1432,1527,1621,1712,1803,1885,1988,2092,2191,2296,2399,2503,2659,2759,3243"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-en-rCA\\values-en-rCA.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,153,250,359",
+ "endColumns": "97,96,108,97",
+ "endOffsets": "148,245,354,452"
+>>>>>>> origin/feature/pushNotifications
+ },
+ "to": {
+ "startLines": "29,30,31,32",
+ "startColumns": "4,4,4,4",
+<<<<<<< HEAD
+ "startOffsets": "5704,5813,5916,6027",
+ "endColumns": "108,102,110,102",
+ "endOffsets": "5808,5911,6022,6125"
+=======
+ "startOffsets": "2764,2862,2959,3068",
+ "endColumns": "97,96,108,97",
+ "endOffsets": "2857,2954,3063,3161"
+>>>>>>> origin/feature/pushNotifications
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-watch-v20_values-watch-v20.arsc.flat",
+ "map": [
+ {
+<<<<<<< HEAD
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-ml\\values-ml.xml",
"from": {
"startLines": "2",
@@ -8458,25 +16170,48 @@
"startOffsets": "6315",
"endColumns": "100",
"endOffsets": "6411"
+=======
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-watch-v20\\values-watch-v20.xml",
+ "from": {
+ "startLines": "2,5,8",
+ "startColumns": "4,4,4",
+ "startOffsets": "55,214,385",
+ "endLines": "4,7,10",
+ "endColumns": "12,12,12",
+ "endOffsets": "209,380,553"
+>>>>>>> origin/feature/pushNotifications
}
}
]
},
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-es_values-es.arsc.flat",
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-es\\values.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-de_values-de.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-de\\values.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "4",
"startColumns": "0",
"startOffsets": "207",
+<<<<<<< HEAD
"endColumns": "100",
"endOffsets": "307"
+=======
+ "endColumns": "103",
+ "endOffsets": "310"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "51",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "6089",
"endColumns": "104",
"endOffsets": "6189"
@@ -8574,6 +16309,14 @@
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-ta\\values-ta.xml",
+=======
+ "startOffsets": "6087",
+ "endColumns": "107",
+ "endOffsets": "6190"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-de\\values-de.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -8581,6 +16324,83 @@
"endColumns": "100",
"endOffsets": "151"
},
+ "to": {
+ "startLines": "53",
+ "startColumns": "4",
+ "startOffsets": "6276",
+ "endColumns": "100",
+ "endOffsets": "6372"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-de\\values-de.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,159,260,371",
+ "endColumns": "103,100,110,98",
+ "endOffsets": "154,255,366,465"
+ },
+ "to": {
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "5672,5776,5877,5988",
+ "endColumns": "103,100,110,98",
+ "endOffsets": "5771,5872,5983,6082"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-de\\values-de.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,210,308,420,506,612,727,805,881,973,1066,1162,1263,1371,1471,1575,1673,1771,1868,1949,2060,2162,2260,2367,2470,2574,2730,2832",
+ "endColumns": "104,97,111,85,105,114,77,75,91,92,95,100,107,99,103,97,97,96,80,110,101,97,106,102,103,155,101,80",
+ "endOffsets": "205,303,415,501,607,722,800,876,968,1061,1157,1258,1366,1466,1570,1668,1766,1863,1944,2055,2157,2255,2362,2465,2569,2725,2827,2908"
+ },
+ "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,52",
+ "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",
+ "startOffsets": "105,210,308,420,506,612,727,805,881,973,1066,1162,1263,1371,1471,1575,1673,1771,1868,1949,2060,2162,2260,2367,2470,2574,2730,6195",
+ "endColumns": "104,97,111,85,105,114,77,75,91,92,95,100,107,99,103,97,97,96,80,110,101,97,106,102,103,155,101,80",
+ "endOffsets": "205,303,415,501,607,722,800,876,968,1061,1157,1258,1366,1466,1570,1668,1766,1863,1944,2055,2157,2255,2362,2465,2569,2725,2827,6271"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-de\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,352,548,674,784,1021,1150,1297,1441,1680,1790,1990,2119,2340,2542,2639,2728",
+ "endColumns": "106,195,125,109,236,128,146,143,238,109,199,128,220,201,96,88,104",
+ "endOffsets": "351,547,673,783,1020,1149,1296,1440,1679,1789,1989,2118,2339,2541,2638,2727,2832"
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2832,2943,3139,3269,3383,3620,3753,3904,4256,4495,4609,4809,4942,5163,5369,5470,5563",
+ "endColumns": "110,195,129,113,236,132,150,147,238,113,199,132,220,205,100,92,108",
+ "endOffsets": "2938,3134,3264,3378,3615,3748,3899,4047,4490,4604,4804,4937,5158,5364,5465,5558,5667"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-de\\values.xml",
+>>>>>>> origin/feature/pushNotifications
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "247",
+ "endColumns": "203",
+ "endOffsets": "450"
+ },
+ "to": {
+ "startLines": "37",
+ "startColumns": "4",
+<<<<<<< HEAD
+ "startOffsets": "55",
+ "endColumns": "100",
+ "endOffsets": "151"
+ },
"to": {
"startLines": "53",
"startColumns": "4",
@@ -8631,10 +16451,65 @@
"startOffsets": "105,218,320,435,524,635,756,835,912,1010,1109,1204,1298,1406,1506,1608,1702,1800,1898,1978,2086,2189,2288,2404,2507,2612,2769,2871",
"endColumns": "112,101,114,88,110,120,78,76,97,98,94,93,107,99,101,93,97,97,79,107,102,98,115,102,104,156,101,80",
"endOffsets": "213,315,430,519,630,751,830,907,1005,1104,1199,1293,1401,1501,1603,1697,1795,1893,1973,2081,2184,2283,2399,2502,2607,2764,2866,2947"
+=======
+ "startOffsets": "4052",
+ "endColumns": "203",
+ "endOffsets": "4251"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-fa_values-fa.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-fa\\values-fa.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,154,251,362",
+ "endColumns": "98,96,110,101",
+ "endOffsets": "149,246,357,459"
+ },
+ "to": {
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "5525,5624,5721,5832",
+ "endColumns": "98,96,110,101",
+ "endOffsets": "5619,5716,5827,5929"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-fa\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,351,542,671,772,971,1097,1238,1365,1577,1685,1888,2019,2233,2417,2509,2603",
+ "endColumns": "105,190,128,100,198,125,140,126,211,107,202,130,213,183,91,93,109",
+ "endOffsets": "350,541,670,771,970,1096,1237,1364,1576,1684,1887,2018,2232,2416,2508,2602,2712"
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2795,2905,3096,3229,3334,3533,3663,3808,4153,4365,4477,4680,4815,5029,5217,5313,5411",
+ "endColumns": "109,190,132,104,198,129,144,130,211,111,202,134,213,187,95,97,113",
+ "endOffsets": "2900,3091,3224,3329,3528,3658,3803,3934,4360,4472,4675,4810,5024,5212,5308,5406,5520"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-fa\\values-fa.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,215,316,427,511,612,727,807,885,978,1072,1164,1258,1361,1456,1553,1647,1740,1830,1911,2019,2123,2221,2327,2432,2537,2694,2795",
+ "endColumns": "109,100,110,83,100,114,79,77,92,93,91,93,102,94,96,93,92,89,80,107,103,97,105,104,104,156,100,80",
+ "endOffsets": "210,311,422,506,607,722,802,880,973,1067,1159,1253,1356,1451,1548,1642,1735,1825,1906,2014,2118,2216,2322,2427,2532,2689,2790,2871"
+>>>>>>> origin/feature/pushNotifications
},
"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,52",
"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",
+<<<<<<< HEAD
"startOffsets": "105,218,320,435,524,635,756,835,912,1010,1109,1204,1298,1406,1506,1608,1702,1800,1898,1978,2086,2189,2288,2404,2507,2612,2769,6138",
"endColumns": "112,101,114,88,110,120,78,76,97,98,94,93,107,99,101,93,97,97,79,107,102,98,115,102,104,156,101,80",
"endOffsets": "213,315,430,519,630,751,830,907,1005,1104,1199,1293,1401,1501,1603,1697,1795,1893,1973,2081,2184,2283,2399,2502,2607,2764,2866,6214"
@@ -8648,10 +16523,26 @@
"startOffsets": "207",
"endColumns": "100",
"endOffsets": "307"
+=======
+ "startOffsets": "105,215,316,427,511,612,727,807,885,978,1072,1164,1258,1361,1456,1553,1647,1740,1830,1911,2019,2123,2221,2327,2432,2537,2694,6043",
+ "endColumns": "109,100,110,83,100,114,79,77,92,93,91,93,102,94,96,93,92,89,80,107,103,97,105,104,104,156,100,80",
+ "endOffsets": "210,311,422,506,607,722,802,880,973,1067,1159,1253,1356,1451,1548,1642,1735,1825,1906,2014,2118,2216,2322,2427,2532,2689,2790,6119"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-fa\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "247",
+ "endColumns": "213",
+ "endOffsets": "460"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "51",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "6033",
"endColumns": "104",
"endOffsets": "6133"
@@ -8732,6 +16623,88 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-sv\\values.xml",
+=======
+ "startOffsets": "3939",
+ "endColumns": "213",
+ "endOffsets": "4148"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-fa\\values-fa.xml",
+ "from": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "100",
+ "endOffsets": "151"
+ },
+ "to": {
+ "startLines": "53",
+ "startColumns": "4",
+ "startOffsets": "6124",
+ "endColumns": "100",
+ "endOffsets": "6220"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-fa\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "207",
+ "endColumns": "104",
+ "endOffsets": "311"
+ },
+ "to": {
+ "startLines": "51",
+ "startColumns": "4",
+ "startOffsets": "5934",
+ "endColumns": "108",
+ "endOffsets": "6038"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-pt-rBR_values-pt-rBR.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-pt-rBR\\values-pt-rBR.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,170,269,381",
+ "endColumns": "114,98,111,104",
+ "endOffsets": "165,264,376,481"
+ },
+ "to": {
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "5594,5709,5808,5920",
+ "endColumns": "114,98,111,104",
+ "endOffsets": "5704,5803,5915,6020"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-pt-rBR\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "251",
+ "endColumns": "203",
+ "endOffsets": "454"
+ },
+ "to": {
+ "startLines": "37",
+ "startColumns": "4",
+ "startOffsets": "4013",
+ "endColumns": "203",
+ "endOffsets": "4212"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-pt-rBR\\values-pt-rBR.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "4",
"startColumns": "0",
@@ -8742,6 +16715,7 @@
"to": {
"startLines": "51",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "5883",
"endColumns": "105",
"endOffsets": "5984"
@@ -8755,10 +16729,43 @@
"startOffsets": "55",
"endColumns": "100",
"endOffsets": "151"
+=======
+ "startOffsets": "6217",
+ "endColumns": "100",
+ "endOffsets": "6313"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-pt-rBR\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "249,352,532,657,763,989,1117,1265,1395,1624,1730,1925,2053,2269,2452,2547,2639",
+ "endColumns": "102,179,124,105,225,127,147,129,228,105,194,127,215,182,94,91,108",
+ "endOffsets": "351,531,656,762,988,1116,1264,1394,1623,1729,1924,2052,2268,2451,2546,2638,2747"
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2843,2950,3130,3259,3369,3595,3727,3879,4217,4446,4556,4751,4883,5099,5286,5385,5481",
+ "endColumns": "106,179,128,109,225,131,151,133,228,109,194,131,215,186,98,95,112",
+ "endOffsets": "2945,3125,3254,3364,3590,3722,3874,4008,4441,4551,4746,4878,5094,5281,5380,5476,5589"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-pt-rBR\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "211",
+ "endColumns": "102",
+ "endOffsets": "313"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "53",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "6068",
"endColumns": "100",
"endOffsets": "6164"
@@ -8779,11 +16786,34 @@
"startOffsets": "3930",
"endColumns": "206",
"endOffsets": "4132"
+=======
+ "startOffsets": "6025",
+ "endColumns": "106",
+ "endOffsets": "6127"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-pt-rBR\\values-pt-rBR.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,225,331,438,527,628,747,832,913,1004,1096,1191,1285,1386,1479,1574,1669,1760,1851,1935,2042,2153,2255,2363,2471,2581,2743,2843",
+ "endColumns": "119,105,106,88,100,118,84,80,90,91,94,93,100,92,94,94,90,90,83,106,110,101,107,107,109,161,99,84",
+ "endOffsets": "220,326,433,522,623,742,827,908,999,1091,1186,1280,1381,1474,1569,1664,1755,1846,1930,2037,2148,2250,2358,2466,2576,2738,2838,2923"
+ },
+ "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,52",
+ "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",
+ "startOffsets": "105,225,331,438,527,628,747,832,913,1004,1096,1191,1285,1386,1479,1574,1669,1760,1851,1935,2042,2153,2255,2363,2471,2581,2743,6132",
+ "endColumns": "119,105,106,88,100,118,84,80,90,91,94,93,100,92,94,94,90,90,83,106,110,101,107,107,109,161,99,84",
+ "endOffsets": "220,326,433,522,623,742,827,908,999,1091,1186,1280,1381,1474,1569,1664,1755,1846,1930,2037,2148,2250,2358,2466,2576,2738,2838,6212"
+>>>>>>> origin/feature/pushNotifications
}
}
]
},
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-ur_values-ur.arsc.flat",
"map": [
{
@@ -8805,16 +16835,45 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-ur\\values.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-vi_values-vi.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-vi\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "207",
+ "endColumns": "98",
+ "endOffsets": "305"
+ },
+ "to": {
+ "startLines": "51",
+ "startColumns": "4",
+ "startOffsets": "5979",
+ "endColumns": "102",
+ "endOffsets": "6077"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-vi\\values.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "4",
"startColumns": "0",
"startOffsets": "247",
+<<<<<<< HEAD
"endColumns": "210",
"endOffsets": "457"
+=======
+ "endColumns": "194",
+ "endOffsets": "441"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "37",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "3982",
"endColumns": "210",
"endOffsets": "4188"
@@ -8822,6 +16881,15 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-ur\\values-ur.xml",
+=======
+ "startOffsets": "3978",
+ "endColumns": "194",
+ "endOffsets": "4168"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-vi\\values-vi.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "2",
"startColumns": "4",
@@ -8832,6 +16900,7 @@
"to": {
"startLines": "53",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "6170",
"endColumns": "100",
"endOffsets": "6266"
@@ -8886,11 +16955,68 @@
"startOffsets": "5979",
"endColumns": "105",
"endOffsets": "6080"
+=======
+ "startOffsets": "6166",
+ "endColumns": "100",
+ "endOffsets": "6262"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-vi\\values-vi.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,166,271,385",
+ "endColumns": "110,104,113,103",
+ "endOffsets": "161,266,380,484"
+ },
+ "to": {
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "5545,5656,5761,5875",
+ "endColumns": "110,104,113,103",
+ "endOffsets": "5651,5756,5870,5974"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-vi\\values-vi.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,212,314,423,507,610,729,807,884,975,1067,1162,1256,1357,1450,1545,1639,1730,1821,1904,2008,2116,2217,2322,2437,2542,2699,2798",
+ "endColumns": "106,101,108,83,102,118,77,76,90,91,94,93,100,92,94,93,90,90,82,103,107,100,104,114,104,156,98,83",
+ "endOffsets": "207,309,418,502,605,724,802,879,970,1062,1157,1251,1352,1445,1540,1634,1725,1816,1899,2003,2111,2212,2317,2432,2537,2694,2793,2877"
+ },
+ "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,52",
+ "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",
+ "startOffsets": "105,212,314,423,507,610,729,807,884,975,1067,1162,1256,1357,1450,1545,1639,1730,1821,1904,2008,2116,2217,2322,2437,2542,2699,6082",
+ "endColumns": "106,101,108,83,102,118,77,76,90,91,94,93,100,92,94,93,90,90,82,103,107,100,104,114,104,156,98,83",
+ "endOffsets": "207,309,418,502,605,724,802,879,970,1062,1157,1251,1352,1445,1540,1634,1725,1816,1899,2003,2111,2212,2317,2432,2537,2694,2793,6161"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-vi\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,345,539,662,767,991,1119,1272,1401,1641,1746,1938,2066,2284,2459,2553,2643",
+ "endColumns": "99,193,122,104,223,127,152,128,239,104,191,127,217,174,93,89,105",
+ "endOffsets": "344,538,661,766,990,1118,1271,1400,1640,1745,1937,2065,2283,2458,2552,2642,2748"
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2798,2902,3096,3223,3332,3556,3688,3845,4173,4413,4522,4714,4846,5064,5243,5341,5435",
+ "endColumns": "103,193,126,108,223,131,156,132,239,108,191,131,217,178,97,93,109",
+ "endOffsets": "2897,3091,3218,3327,3551,3683,3840,3973,4408,4517,4709,4841,5059,5238,5336,5430,5540"
+>>>>>>> origin/feature/pushNotifications
}
}
]
},
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-sl_values-sl.arsc.flat",
"map": [
{
@@ -8918,10 +17044,40 @@
"startOffsets": "207",
"endColumns": "99",
"endOffsets": "306"
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-in_values-in.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-in\\values-in.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,220,324,429,516,620,736,819,898,989,1081,1176,1270,1371,1464,1559,1653,1744,1835,1920,2023,2128,2229,2333,2442,2550,2710,2809",
+ "endColumns": "114,103,104,86,103,115,82,78,90,91,94,93,100,92,94,93,90,90,84,102,104,100,103,108,107,159,98,83",
+ "endOffsets": "215,319,424,511,615,731,814,893,984,1076,1171,1265,1366,1459,1554,1648,1739,1830,1915,2018,2123,2224,2328,2437,2545,2705,2804,2888"
+ },
+ "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,52",
+ "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",
+ "startOffsets": "105,220,324,429,516,620,736,819,898,989,1081,1176,1270,1371,1464,1559,1653,1744,1835,1920,2023,2128,2229,2333,2442,2550,2710,6014",
+ "endColumns": "114,103,104,86,103,115,82,78,90,91,94,93,100,92,94,93,90,90,84,102,104,100,103,108,107,159,98,83",
+ "endOffsets": "215,319,424,511,615,731,814,893,984,1076,1171,1265,1366,1459,1554,1648,1739,1830,1915,2018,2123,2224,2328,2437,2545,2705,2804,6093"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-in\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "247",
+ "endColumns": "190",
+ "endOffsets": "437"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "51",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "5987",
"endColumns": "103",
"endOffsets": "6086"
@@ -8929,6 +17085,15 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-sl\\values-sl.xml",
+=======
+ "startOffsets": "3973",
+ "endColumns": "190",
+ "endOffsets": "4159"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-in\\values-in.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "2",
"startColumns": "4",
@@ -8939,6 +17104,7 @@
"to": {
"startLines": "53",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "6174",
"endColumns": "100",
"endOffsets": "6270"
@@ -8969,10 +17135,43 @@
"startOffsets": "247",
"endColumns": "198",
"endOffsets": "445"
+=======
+ "startOffsets": "6098",
+ "endColumns": "100",
+ "endOffsets": "6194"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-in\\values-in.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,155,253,362",
+ "endColumns": "99,97,108,99",
+ "endOffsets": "150,248,357,457"
+ },
+ "to": {
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "5499,5599,5697,5806",
+ "endColumns": "99,97,108,99",
+ "endOffsets": "5594,5692,5801,5901"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-in\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "207",
+ "endColumns": "103",
+ "endOffsets": "310"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "37",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "4011",
"endColumns": "198",
"endOffsets": "4205"
@@ -8986,32 +17185,66 @@
"startOffsets": "245,349,546,673,778,984,1112,1252,1381,1598,1703,1901,2029,2240,2418,2514,2602",
"endColumns": "103,196,126,104,205,127,139,128,216,104,197,127,210,177,95,87,108",
"endOffsets": "348,545,672,777,983,1111,1251,1380,1597,1702,1900,2028,2239,2417,2513,2601,2710"
+=======
+ "startOffsets": "5906",
+ "endColumns": "107",
+ "endOffsets": "6009"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-in\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,350,546,670,774,988,1113,1254,1385,1610,1713,1908,2032,2246,2416,2506,2592",
+ "endColumns": "104,195,123,103,213,124,140,130,224,102,194,123,213,169,89,85,103",
+ "endOffsets": "349,545,669,773,987,1112,1253,1384,1609,1712,1907,2031,2245,2415,2505,2591,2695"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+<<<<<<< HEAD
"startOffsets": "2851,2959,3156,3287,3396,3602,3734,3878,4210,4427,4536,4734,4866,5077,5259,5359,5451",
"endColumns": "107,196,130,108,205,131,143,132,216,108,197,131,210,181,99,91,112",
"endOffsets": "2954,3151,3282,3391,3597,3729,3873,4006,4422,4531,4729,4861,5072,5254,5354,5446,5559"
+=======
+ "startOffsets": "2809,2918,3114,3242,3350,3564,3693,3838,4164,4389,4496,4691,4819,5033,5207,5301,5391",
+ "endColumns": "108,195,127,107,213,128,144,134,224,106,194,127,213,173,93,89,107",
+ "endOffsets": "2913,3109,3237,3345,3559,3688,3833,3968,4384,4491,4686,4814,5028,5202,5296,5386,5494"
+>>>>>>> origin/feature/pushNotifications
}
}
]
},
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-ro_values-ro.arsc.flat",
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-ro\\values.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-iw_values-iw.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-iw\\values.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "4",
"startColumns": "0",
"startOffsets": "247",
+<<<<<<< HEAD
"endColumns": "203",
"endOffsets": "450"
+=======
+ "endColumns": "176",
+ "endOffsets": "423"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "37",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "4029",
"endColumns": "203",
"endOffsets": "4228"
@@ -9036,6 +17269,49 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-ro\\values-ro.xml",
+=======
+ "startOffsets": "3884",
+ "endColumns": "176",
+ "endOffsets": "4056"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-iw\\values-iw.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,210,310,418,502,604,720,799,878,969,1062,1156,1250,1351,1444,1539,1632,1723,1815,1895,2000,2103,2201,2306,2408,2510,2664,2761",
+ "endColumns": "104,99,107,83,101,115,78,78,90,92,93,93,100,92,94,92,90,91,79,104,102,97,104,101,101,153,96,80",
+ "endOffsets": "205,305,413,497,599,715,794,873,964,1057,1151,1245,1346,1439,1534,1627,1718,1810,1890,1995,2098,2196,2301,2403,2505,2659,2756,2837"
+ },
+ "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,52",
+ "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",
+ "startOffsets": "105,210,310,418,502,604,720,799,878,969,1062,1156,1250,1351,1444,1539,1632,1723,1815,1895,2000,2103,2201,2306,2408,2510,2664,5823",
+ "endColumns": "104,99,107,83,101,115,78,78,90,92,93,93,100,92,94,92,90,91,79,104,102,97,104,101,101,153,96,80",
+ "endOffsets": "205,305,413,497,599,715,794,873,964,1057,1151,1245,1346,1439,1534,1627,1718,1810,1890,1995,2098,2196,2301,2403,2505,2659,2756,5899"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-iw\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,346,532,655,757,955,1078,1216,1344,1539,1640,1816,1937,2130,2301,2387,2473",
+ "endColumns": "100,185,122,101,197,122,137,127,194,100,175,120,192,170,85,85,105",
+ "endOffsets": "345,531,654,756,954,1077,1215,1343,1538,1639,1815,1936,2129,2300,2386,2472,2578"
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2761,2866,3052,3179,3285,3483,3610,3752,4061,4256,4361,4537,4662,4855,5030,5120,5210",
+ "endColumns": "104,185,126,105,197,126,141,131,194,104,175,124,192,174,89,89,109",
+ "endOffsets": "2861,3047,3174,3280,3478,3605,3747,3879,4251,4356,4532,4657,4850,5025,5115,5205,5315"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-iw\\values-iw.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "2",
"startColumns": "4",
@@ -9046,6 +17322,7 @@
"to": {
"startLines": "53",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "6217",
"endColumns": "100",
"endOffsets": "6313"
@@ -9070,22 +17347,60 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-ro\\values.xml",
+=======
+ "startOffsets": "5904",
+ "endColumns": "100",
+ "endOffsets": "6000"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-iw\\values-iw.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,146,247,353",
+ "endColumns": "90,100,105,100",
+ "endOffsets": "141,242,348,449"
+ },
+ "to": {
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "5320,5411,5512,5618",
+ "endColumns": "90,100,105,100",
+ "endOffsets": "5406,5507,5613,5714"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-iw\\values.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "4",
"startColumns": "0",
"startOffsets": "207",
- "endColumns": "101",
- "endOffsets": "308"
+ "endColumns": "99",
+ "endOffsets": "306"
},
"to": {
"startLines": "51",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "6028",
"endColumns": "105",
"endOffsets": "6129"
+=======
+ "startOffsets": "5719",
+ "endColumns": "103",
+ "endOffsets": "5818"
+>>>>>>> origin/feature/pushNotifications
}
- },
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-port_values-port.arsc.flat",
+ "map": [
{
+<<<<<<< HEAD
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-ro\\values.xml",
"from": {
"startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
@@ -9116,11 +17431,21 @@
"endLines": "5,9,13",
"endColumns": "12,12,12",
"endOffsets": "266,494,724"
+=======
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-port\\values-port.xml",
+ "from": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "55",
+ "endOffsets": "106"
+>>>>>>> origin/feature/pushNotifications
}
}
]
},
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-hr_values-hr.arsc.flat",
"map": [
{
@@ -9142,6 +17467,29 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-hr\\values-hr.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-ms_values-ms.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-ms\\values-ms.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,160,260,379",
+ "endColumns": "104,99,118,100",
+ "endOffsets": "155,255,374,475"
+ },
+ "to": {
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "5645,5750,5850,5969",
+ "endColumns": "104,99,118,100",
+ "endOffsets": "5745,5845,5964,6065"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-ms\\values-ms.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"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",
"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",
@@ -9150,6 +17498,7 @@
"endOffsets": "205,300,407,493,597,716,801,884,975,1067,1162,1256,1357,1450,1545,1640,1731,1822,1907,2011,2123,2224,2329,2443,2545,2714,2811,2895"
},
"to": {
+<<<<<<< HEAD
"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,52",
"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",
"startOffsets": "105,210,305,412,498,602,721,806,889,980,1072,1167,1261,1362,1455,1550,1645,1736,1827,1912,2016,2128,2229,2334,2448,2550,2719,6016",
@@ -9216,10 +17565,62 @@
"startOffsets": "55",
"endColumns": "100",
"endOffsets": "151"
+=======
+ "startLines": "53",
+ "startColumns": "4",
+ "startOffsets": "6257",
+ "endColumns": "100",
+ "endOffsets": "6353"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-ms\\values-ms.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,216,321,429,516,620,731,810,889,980,1072,1167,1261,1360,1453,1548,1642,1733,1824,1903,2015,2123,2220,2329,2433,2540,2699,2800",
+ "endColumns": "110,104,107,86,103,110,78,78,90,91,94,93,98,92,94,93,90,90,78,111,107,96,108,103,106,158,100,79",
+ "endOffsets": "211,316,424,511,615,726,805,884,975,1067,1162,1256,1355,1448,1543,1637,1728,1819,1898,2010,2118,2215,2324,2428,2535,2694,2795,2875"
+ },
+ "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,52",
+ "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",
+ "startOffsets": "105,216,321,429,516,620,731,810,889,980,1072,1167,1261,1360,1453,1548,1642,1733,1824,1903,2015,2123,2220,2329,2433,2540,2699,6177",
+ "endColumns": "110,104,107,86,103,110,78,78,90,91,94,93,98,92,94,93,90,90,78,111,107,96,108,103,106,158,100,79",
+ "endOffsets": "211,316,424,511,615,726,805,884,975,1067,1162,1256,1355,1448,1543,1637,1728,1819,1898,2010,2118,2215,2324,2428,2535,2694,2795,6252"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-ms\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,349,554,682,786,1017,1147,1293,1425,1669,1776,1982,2115,2345,2546,2639,2729",
+ "endColumns": "103,204,127,103,230,129,145,131,243,106,205,132,229,200,92,89,107",
+ "endOffsets": "348,553,681,785,1016,1146,1292,1424,1668,1775,1981,2114,2344,2545,2638,2728,2836"
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2800,2908,3113,3245,3353,3584,3718,3868,4209,4453,4564,4770,4907,5137,5342,5439,5533",
+ "endColumns": "107,204,131,107,230,133,149,135,243,110,205,136,229,204,96,93,111",
+ "endOffsets": "2903,3108,3240,3348,3579,3713,3863,3999,4448,4559,4765,4902,5132,5337,5434,5528,5640"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-ms\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "247",
+ "endColumns": "204",
+ "endOffsets": "451"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "53",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "6100",
"endColumns": "100",
"endOffsets": "6196"
@@ -9262,9 +17663,37 @@
"startOffsets": "2843,2950,3130,3259,3369,3595,3727,3879,4217,4446,4556,4751,4883,5099,5286,5385,5481",
"endColumns": "106,179,128,109,225,131,151,133,228,109,194,131,215,186,98,95,112",
"endOffsets": "2945,3125,3254,3364,3590,3722,3874,4008,4441,4551,4746,4878,5094,5281,5380,5476,5589"
+=======
+ "startOffsets": "4004",
+ "endColumns": "204",
+ "endOffsets": "4204"
}
},
{
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-ms\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "207",
+ "endColumns": "102",
+ "endOffsets": "309"
+ },
+ "to": {
+ "startLines": "51",
+ "startColumns": "4",
+ "startOffsets": "6070",
+ "endColumns": "106",
+ "endOffsets": "6172"
+>>>>>>> origin/feature/pushNotifications
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-nl_values-nl.arsc.flat",
+ "map": [
+ {
+<<<<<<< HEAD
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-pt-rBR\\values-pt-rBR.xml",
"from": {
"startLines": "2,3,4,5",
@@ -9283,6 +17712,26 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-pt-rBR\\values.xml",
+=======
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-nl\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "207",
+ "endColumns": "101",
+ "endOffsets": "308"
+ },
+ "to": {
+ "startLines": "51",
+ "startColumns": "4",
+ "startOffsets": "6040",
+ "endColumns": "105",
+ "endOffsets": "6141"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-nl\\values-nl.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "4",
"startColumns": "0",
@@ -9293,6 +17742,7 @@
"to": {
"startLines": "51",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "6025",
"endColumns": "106",
"endOffsets": "6127"
@@ -9362,10 +17812,60 @@
"startOffsets": "55,167,275,387",
"endColumns": "111,107,111,110",
"endOffsets": "162,270,382,493"
+=======
+ "startOffsets": "6228",
+ "endColumns": "100",
+ "endOffsets": "6324"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-nl\\values-nl.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,223,328,435,521,629,749,827,904,996,1089,1184,1278,1379,1473,1569,1664,1756,1848,1929,2040,2143,2242,2357,2471,2574,2729,2832",
+ "endColumns": "117,104,106,85,107,119,77,76,91,92,94,93,100,93,95,94,91,91,80,110,102,98,114,113,102,154,102,81",
+ "endOffsets": "218,323,430,516,624,744,822,899,991,1084,1179,1273,1374,1468,1564,1659,1751,1843,1924,2035,2138,2237,2352,2466,2569,2724,2827,2909"
+ },
+ "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,52",
+ "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",
+ "startOffsets": "105,223,328,435,521,629,749,827,904,996,1089,1184,1278,1379,1473,1569,1664,1756,1848,1929,2040,2143,2242,2357,2471,2574,2729,6146",
+ "endColumns": "117,104,106,85,107,119,77,76,91,92,94,93,100,93,95,94,91,91,80,110,102,98,114,113,102,154,102,81",
+ "endOffsets": "218,323,430,516,624,744,822,899,991,1084,1179,1273,1374,1468,1564,1659,1751,1843,1924,2035,2138,2237,2352,2466,2569,2724,2827,6223"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-nl\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,353,540,668,777,1003,1128,1277,1408,1645,1749,1949,2073,2295,2503,2597,2686",
+ "endColumns": "107,186,127,108,225,124,148,130,236,103,199,123,221,207,93,88,103",
+ "endOffsets": "352,539,667,776,1002,1127,1276,1407,1644,1748,1948,2072,2294,2502,2596,2685,2789"
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2832,2944,3131,3263,3376,3602,3731,3884,4221,4458,4566,4766,4894,5116,5328,5426,5519",
+ "endColumns": "111,186,131,112,225,128,152,134,236,107,199,127,221,211,97,92,107",
+ "endOffsets": "2939,3126,3258,3371,3597,3726,3879,4014,4453,4561,4761,4889,5111,5323,5421,5514,5622"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-nl\\values-nl.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,158,259,370",
+ "endColumns": "102,100,110,97",
+ "endOffsets": "153,254,365,463"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "47,48,49,50",
"startColumns": "4,4,4,4",
+<<<<<<< HEAD
"startOffsets": "5565,5677,5785,5897",
"endColumns": "111,107,111,110",
"endOffsets": "5672,5780,5892,6003"
@@ -9437,11 +17937,34 @@
"startOffsets": "105,213,320,432,520,623,738,817,895,986,1078,1173,1267,1368,1461,1556,1650,1741,1834,1914,2018,2121,2219,2326,2433,2538,2695,6123",
"endColumns": "107,106,111,87,102,114,78,77,90,91,94,93,100,92,94,93,90,92,79,103,102,97,106,106,104,156,95,80",
"endOffsets": "208,315,427,515,618,733,812,890,981,1073,1168,1262,1363,1456,1551,1645,1736,1829,1909,2013,2116,2214,2321,2428,2533,2690,2786,6199"
+=======
+ "startOffsets": "5627,5730,5831,5942",
+ "endColumns": "102,100,110,97",
+ "endOffsets": "5725,5826,5937,6035"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-nl\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "247",
+ "endColumns": "201",
+ "endOffsets": "448"
+ },
+ "to": {
+ "startLines": "37",
+ "startColumns": "4",
+ "startOffsets": "4019",
+ "endColumns": "201",
+ "endOffsets": "4216"
+>>>>>>> origin/feature/pushNotifications
}
}
]
},
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-w360dp-port-v13_values-w360dp-port-v13.arsc.flat",
"map": [
{
@@ -9512,14 +18035,55 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-as\\values-as.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-land_values-land.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-land\\values-land.xml",
"from": {
- "startLines": "2",
- "startColumns": "4",
- "startOffsets": "55",
- "endColumns": "100",
- "endOffsets": "151"
+ "startLines": "2,3,4",
+ "startColumns": "4,4,4",
+ "startOffsets": "55,125,196",
+ "endColumns": "69,70,67",
+ "endOffsets": "120,191,259"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\19593d9c2c700c52ad03572ebfd537d5\\material-1.1.0-rc02\\res\\values-land\\values-land.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,24,30",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "55,128,198,270,340,405,472,542,614,683,752,834,924,1000,1068,1135,1213,1278,1345,1517,1912",
+ "endLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,23,29,34",
+ "endColumns": "72,69,71,69,64,66,69,71,68,68,81,89,75,67,66,77,64,66,10,10,10",
+ "endOffsets": "123,193,265,335,400,467,537,609,678,747,829,919,995,1063,1130,1208,1273,1340,1512,1907,2176"
},
"to": {
+ "startLines": "5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,27,33",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "264,337,407,479,549,614,681,751,823,892,961,1043,1133,1209,1277,1344,1422,1487,1554,1726,2121",
+ "endLines": "5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,26,32,37",
+ "endColumns": "72,69,71,69,64,66,69,71,68,68,81,89,75,67,66,77,64,66,10,10,10",
+ "endOffsets": "332,402,474,544,609,676,746,818,887,956,1038,1128,1204,1272,1339,1417,1482,1549,1721,2116,2385"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-tr_values-tr.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-tr\\values-tr.xml",
+>>>>>>> origin/feature/pushNotifications
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,219,318,430,515,621,741,821,897,988,1080,1172,1266,1367,1460,1562,1657,1748,1839,1917,2024,2128,2224,2331,2434,2543,2699,2797",
+ "endColumns": "113,98,111,84,105,119,79,75,90,91,91,93,100,92,101,94,90,90,77,106,103,95,106,102,108,155,97,78",
+ "endOffsets": "214,313,425,510,616,736,816,892,983,1075,1167,1261,1362,1455,1557,1652,1743,1834,1912,2019,2123,2219,2326,2429,2538,2694,2792,2871"
+ },
+ "to": {
+<<<<<<< HEAD
"startLines": "53",
"startColumns": "4",
"startOffsets": "6063",
@@ -9529,16 +18093,50 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-as\\values.xml",
+=======
+ "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,52",
+ "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",
+ "startOffsets": "105,219,318,430,515,621,741,821,897,988,1080,1172,1266,1367,1460,1562,1657,1748,1839,1917,2024,2128,2224,2331,2434,2543,2699,6061",
+ "endColumns": "113,98,111,84,105,119,79,75,90,91,91,93,100,92,101,94,90,90,77,106,103,95,106,102,108,155,97,78",
+ "endOffsets": "214,313,425,510,616,736,816,892,983,1075,1167,1261,1362,1455,1557,1652,1743,1834,1912,2019,2123,2219,2326,2429,2538,2694,2792,6135"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-tr\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,353,540,674,777,983,1111,1264,1395,1626,1731,1919,2051,2255,2448,2536,2626",
+ "endColumns": "107,186,133,102,205,127,152,130,230,104,187,131,203,192,87,89,104",
+ "endOffsets": "352,539,673,776,982,1110,1263,1394,1625,1730,1918,2050,2254,2447,2535,2625,2730"
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2797,2909,3096,3234,3341,3547,3679,3836,4177,4408,4517,4705,4841,5045,5242,5334,5428",
+ "endColumns": "111,186,137,106,205,131,156,134,230,108,187,135,203,196,91,93,108",
+ "endOffsets": "2904,3091,3229,3336,3542,3674,3831,3966,4403,4512,4700,4836,5040,5237,5329,5423,5532"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-tr\\values.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "4",
"startColumns": "0",
"startOffsets": "207",
+<<<<<<< HEAD
"endColumns": "99",
"endOffsets": "306"
+=======
+ "endColumns": "101",
+ "endOffsets": "308"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "51",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "5877",
"endColumns": "103",
"endOffsets": "5976"
@@ -9559,6 +18157,28 @@
"startOffsets": "105,213,312,419,510,612,732,809,885,976,1068,1163,1257,1358,1451,1546,1640,1731,1822,1907,2020,2128,2227,2336,2452,2572,2739,5981",
"endColumns": "107,98,106,90,101,119,76,75,90,91,94,93,100,92,94,93,90,90,84,112,107,98,108,115,119,166,101,81",
"endOffsets": "208,307,414,505,607,727,804,880,971,1063,1158,1252,1353,1446,1541,1635,1726,1817,1902,2015,2123,2222,2331,2447,2567,2734,2836,6058"
+=======
+ "startOffsets": "5955",
+ "endColumns": "105",
+ "endOffsets": "6056"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-tr\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "247",
+ "endColumns": "205",
+ "endOffsets": "452"
+ },
+ "to": {
+ "startLines": "37",
+ "startColumns": "4",
+ "startOffsets": "3971",
+ "endColumns": "205",
+ "endOffsets": "4172"
+>>>>>>> origin/feature/pushNotifications
}
}
]
@@ -9567,6 +18187,7 @@
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-kk_values-kk.arsc.flat",
"map": [
{
+<<<<<<< HEAD
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-kk\\values.xml",
"from": {
"startLines": "4",
@@ -9581,9 +18202,48 @@
"startOffsets": "3940",
"endColumns": "222",
"endOffsets": "4158"
+=======
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-tr\\values-tr.xml",
+ "from": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "100",
+ "endOffsets": "151"
+ },
+ "to": {
+ "startLines": "53",
+ "startColumns": "4",
+ "startOffsets": "6140",
+ "endColumns": "100",
+ "endOffsets": "6236"
}
},
{
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-tr\\values-tr.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,155,261,368",
+ "endColumns": "99,105,106,104",
+ "endOffsets": "150,256,363,468"
+ },
+ "to": {
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "5537,5637,5743,5850",
+ "endColumns": "99,105,106,104",
+ "endOffsets": "5632,5738,5845,5950"
+>>>>>>> origin/feature/pushNotifications
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-watch-v21_values-watch-v21.arsc.flat",
+ "map": [
+ {
+<<<<<<< HEAD
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-kk\\values-kk.xml",
"from": {
"startLines": "2",
@@ -9608,10 +18268,36 @@
"startOffsets": "245,346,531,655,759,958,1082,1231,1365,1589,1693,1881,2008,2220,2403,2492,2577",
"endColumns": "100,184,123,103,198,123,148,133,223,103,187,126,211,182,88,84,102",
"endOffsets": "345,530,654,758,957,1081,1230,1364,1588,1692,1880,2007,2219,2402,2491,2576,2679"
+=======
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-watch-v21\\values-watch-v21.xml",
+ "from": {
+ "startLines": "2,6,10",
+ "startColumns": "4,4,4",
+ "startOffsets": "55,271,499",
+ "endLines": "5,9,13",
+ "endColumns": "12,12,12",
+ "endOffsets": "266,494,724"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-kn_values-kn.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-kn\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,354,556,687,800,1002,1129,1263,1387,1596,1707,1898,2031,2235,2418,2513,2602",
+ "endColumns": "108,201,130,112,201,126,133,123,208,110,190,132,203,182,94,88,109",
+ "endOffsets": "353,555,686,799,1001,1128,1262,1386,1595,1706,1897,2030,2234,2417,2512,2601,2711"
+>>>>>>> origin/feature/pushNotifications
},
"to": {
"startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+<<<<<<< HEAD
"startOffsets": "2796,2901,3086,3214,3322,3521,3649,3802,4163,4387,4495,4683,4814,5026,5213,5306,5395",
"endColumns": "104,184,127,107,198,127,152,137,223,107,187,130,211,186,92,88,106",
"endOffsets": "2896,3081,3209,3317,3516,3644,3797,3935,4382,4490,4678,4809,5021,5208,5301,5390,5497"
@@ -9659,18 +18345,108 @@
"startOffsets": "207",
"endColumns": "98",
"endOffsets": "305"
+=======
+ "startOffsets": "2859,2972,3174,3309,3426,3628,3759,3897,4230,4439,4554,4745,4882,5086,5273,5372,5465",
+ "endColumns": "112,201,134,116,201,130,137,127,208,114,190,136,203,186,98,92,113",
+ "endOffsets": "2967,3169,3304,3421,3623,3754,3892,4020,4434,4549,4740,4877,5081,5268,5367,5460,5574"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-kn\\values-kn.xml",
+ "from": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "100",
+ "endOffsets": "151"
+ },
+ "to": {
+ "startLines": "53",
+ "startColumns": "4",
+ "startOffsets": "6194",
+ "endColumns": "100",
+ "endOffsets": "6290"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-kn\\values-kn.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,169,269,385",
+ "endColumns": "113,99,115,99",
+ "endOffsets": "164,264,380,480"
+ },
+ "to": {
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "5579,5693,5793,5909",
+ "endColumns": "113,99,115,99",
+ "endOffsets": "5688,5788,5904,6004"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-kn\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "207",
+ "endColumns": "98",
+ "endOffsets": "305"
},
"to": {
"startLines": "51",
"startColumns": "4",
+ "startOffsets": "6009",
+ "endColumns": "102",
+ "endOffsets": "6107"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-kn\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "247",
+ "endColumns": "204",
+ "endOffsets": "451"
+>>>>>>> origin/feature/pushNotifications
+ },
+ "to": {
+ "startLines": "37",
+ "startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "5918",
"endColumns": "102",
"endOffsets": "6016"
+=======
+ "startOffsets": "4025",
+ "endColumns": "204",
+ "endOffsets": "4225"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-kn\\values-kn.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,219,331,444,532,639,765,843,920,1011,1103,1198,1292,1393,1486,1581,1675,1766,1857,1938,2054,2164,2263,2376,2481,2595,2759,2859",
+ "endColumns": "113,111,112,87,106,125,77,76,90,91,94,93,100,92,94,93,90,90,80,115,109,98,112,104,113,163,99,81",
+ "endOffsets": "214,326,439,527,634,760,838,915,1006,1098,1193,1287,1388,1481,1576,1670,1761,1852,1933,2049,2159,2258,2371,2476,2590,2754,2854,2936"
+ },
+ "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,52",
+ "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",
+ "startOffsets": "105,219,331,444,532,639,765,843,920,1011,1103,1198,1292,1393,1486,1581,1675,1766,1857,1938,2054,2164,2263,2376,2481,2595,2759,6112",
+ "endColumns": "113,111,112,87,106,125,77,76,90,91,94,93,100,92,94,93,90,90,80,115,109,98,112,104,113,163,99,81",
+ "endOffsets": "214,326,439,527,634,760,838,915,1006,1098,1193,1287,1388,1481,1576,1670,1761,1852,1933,2049,2159,2258,2371,2476,2590,2754,2854,6189"
+>>>>>>> origin/feature/pushNotifications
}
}
]
},
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-bg_values-bg.arsc.flat",
"map": [
{
@@ -9760,6 +18536,80 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-bg\\values-bg.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-uk_values-uk.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-uk\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "245,351,546,671,779,992,1119,1260,1390,1617,1721,1914,2037,2243,2411,2507,2594",
+ "endColumns": "105,194,124,107,212,126,140,129,226,103,192,122,205,167,95,86,112",
+ "endOffsets": "350,545,670,778,991,1118,1259,1389,1616,1720,1913,2036,2242,2410,2506,2593,2706"
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2829,2939,3134,3263,3375,3588,3719,3864,4203,4430,4538,4731,4858,5064,5236,5336,5427",
+ "endColumns": "109,194,128,111,212,130,144,133,226,107,192,126,205,171,99,90,116",
+ "endOffsets": "2934,3129,3258,3370,3583,3714,3859,3993,4425,4533,4726,4853,5059,5231,5331,5422,5539"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-uk\\values-uk.xml",
+ "from": {
+ "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",
+ "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",
+ "startOffsets": "105,214,316,424,510,615,733,814,894,985,1077,1172,1266,1367,1460,1555,1650,1741,1832,1930,2036,2142,2240,2347,2454,2559,2729,2829",
+ "endColumns": "108,101,107,85,104,117,80,79,90,91,94,93,100,92,94,94,90,90,97,105,105,97,106,106,104,169,99,80",
+ "endOffsets": "209,311,419,505,610,728,809,889,980,1072,1167,1261,1362,1455,1550,1645,1736,1827,1925,2031,2137,2235,2342,2449,2554,2724,2824,2905"
+ },
+ "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,52",
+ "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",
+ "startOffsets": "105,214,316,424,510,615,733,814,894,985,1077,1172,1266,1367,1460,1555,1650,1741,1832,1930,2036,2142,2240,2347,2454,2559,2729,6091",
+ "endColumns": "108,101,107,85,104,117,80,79,90,91,94,93,100,92,94,94,90,90,97,105,105,97,106,106,104,169,99,80",
+ "endOffsets": "209,311,419,505,610,728,809,889,980,1072,1167,1261,1362,1455,1550,1645,1736,1827,1925,2031,2137,2235,2342,2449,2554,2724,2824,6167"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-uk\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "207",
+ "endColumns": "98",
+ "endOffsets": "305"
+ },
+ "to": {
+ "startLines": "51",
+ "startColumns": "4",
+ "startOffsets": "5988",
+ "endColumns": "102",
+ "endOffsets": "6086"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-uk\\values.xml",
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "247",
+ "endColumns": "204",
+ "endOffsets": "451"
+ },
+ "to": {
+ "startLines": "37",
+ "startColumns": "4",
+ "startOffsets": "3998",
+ "endColumns": "204",
+ "endOffsets": "4198"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-uk\\values-uk.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "2",
"startColumns": "4",
@@ -9770,9 +18620,15 @@
"to": {
"startLines": "53",
"startColumns": "4",
+<<<<<<< HEAD
"startOffsets": "6277",
"endColumns": "100",
"endOffsets": "6373"
+=======
+ "startOffsets": "6172",
+ "endColumns": "100",
+ "endOffsets": "6268"
+>>>>>>> origin/feature/pushNotifications
}
}
]
@@ -9781,6 +18637,7 @@
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\values-v16_values-v16.arsc.flat",
"map": [
{
+<<<<<<< HEAD
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-v16\\values-v16.xml",
"from": {
"startLines": "2",
@@ -9822,6 +18679,22 @@
"startOffsets": "55",
"endColumns": "48",
"endOffsets": "99"
+=======
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-uk\\values-uk.xml",
+ "from": {
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,165,272,392",
+ "endColumns": "109,106,119,106",
+ "endOffsets": "160,267,387,494"
+ },
+ "to": {
+ "startLines": "47,48,49,50",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "5544,5654,5761,5881",
+ "endColumns": "109,106,119,106",
+ "endOffsets": "5649,5756,5876,5983"
+>>>>>>> origin/feature/pushNotifications
}
}
]
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-af.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-af.json
index 63dd8090d..852cf837c 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-af.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-af.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-af\\values-af.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-af\\values-af.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-af\\values-af.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-am.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-am.json
index 30834ac98..5d46a08d2 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-am.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-am.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-am\\values-am.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-am\\values-am.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-am\\values.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-ar.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-ar.json
index f6af7d4dd..6e8a76549 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-ar.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-ar.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ar\\values-ar.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ar\\values-ar.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-ar\\values.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-as.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-as.json
index 6c758ac62..f66e06567 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-as.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-as.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-as\\values-as.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-as\\values-as.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-as\\values.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-az.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-az.json
index aad5d8cda..7fe358b0a 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-az.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-az.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-az\\values-az.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-az\\values-az.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-az\\values.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-b+sr+Latn.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-b+sr+Latn.json
index b5b3c2b05..5540ad09f 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-b+sr+Latn.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-b+sr+Latn.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-b+sr+Latn\\values-b+sr+Latn.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-b+sr+Latn\\values-b+sr+Latn.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-b+sr+Latn\\values-b+sr+Latn.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-be.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-be.json
index e30efd0cb..c6f3c0972 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-be.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-be.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-be\\values-be.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-be\\values-be.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-be\\values-be.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-bg.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-bg.json
index afa8b9caa..7259a1851 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-bg.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-bg.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-bg\\values-bg.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-bg\\values-bg.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-bg\\values-bg.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-bn.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-bn.json
index 50c8e961a..3788cc40a 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-bn.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-bn.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-bn\\values-bn.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-bn\\values-bn.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-bn\\values.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-bs.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-bs.json
index a6595859c..0bd67340d 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-bs.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-bs.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-bs\\values-bs.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-bs\\values-bs.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-bs\\values-bs.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-ca.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-ca.json
index b97bb879c..7e79c4837 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-ca.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-ca.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ca\\values-ca.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ca\\values-ca.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-ca\\values.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-cs.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-cs.json
index 05a0a5001..8b5201da2 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-cs.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-cs.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-cs\\values-cs.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-cs\\values-cs.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-cs\\values.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-da.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-da.json
index 4af092bac..27a0bcdfe 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-da.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-da.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-da\\values-da.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-da\\values-da.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-da\\values-da.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-de.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-de.json
index 51fa4da6c..01b888b5b 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-de.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-de.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-de\\values-de.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-de\\values-de.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-de\\values.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-el.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-el.json
index b3bdb809c..030a7eba3 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-el.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-el.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-el\\values-el.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-el\\values-el.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-el\\values.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-en-rAU.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-en-rAU.json
index 6174c4bd7..996f9aced 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-en-rAU.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-en-rAU.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rAU\\values-en-rAU.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rAU\\values-en-rAU.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-en-rAU\\values-en-rAU.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-en-rCA.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-en-rCA.json
index 1a7ceb2e6..7514bb758 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-en-rCA.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-en-rCA.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rCA\\values-en-rCA.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rCA\\values-en-rCA.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-en-rCA\\values-en-rCA.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-en-rGB.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-en-rGB.json
index da5e74518..e959d75e1 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-en-rGB.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-en-rGB.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rGB\\values-en-rGB.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rGB\\values-en-rGB.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-en-rGB\\values.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-en-rIN.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-en-rIN.json
index 5b8a3a86b..3b56c592d 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-en-rIN.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-en-rIN.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rIN\\values-en-rIN.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rIN\\values-en-rIN.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-en-rIN\\values-en-rIN.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-en-rXC.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-en-rXC.json
index a4ca457b3..19597ef24 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-en-rXC.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-en-rXC.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rXC\\values-en-rXC.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rXC\\values-en-rXC.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-en-rXC\\values-en-rXC.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-es-rUS.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-es-rUS.json
index e51367e89..6e9697797 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-es-rUS.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-es-rUS.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-es-rUS\\values-es-rUS.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-es-rUS\\values-es-rUS.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-es-rUS\\values-es-rUS.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-es.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-es.json
index 5da2651a4..42b7cc92f 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-es.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-es.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-es\\values-es.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-es\\values-es.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-es\\values.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-et.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-et.json
index 383868d19..4bbc94b07 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-et.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-et.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-et\\values-et.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-et\\values-et.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-et\\values.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-eu.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-eu.json
index 9b46aa1cd..387b85416 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-eu.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-eu.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-eu\\values-eu.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-eu\\values-eu.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-eu\\values-eu.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-fa.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-fa.json
index 4334fed21..d7448c691 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-fa.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-fa.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-fa\\values-fa.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-fa\\values-fa.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-fa\\values.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-fi.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-fi.json
index df18d883c..1e934bc18 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-fi.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-fi.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-fi\\values-fi.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-fi\\values-fi.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-fi\\values.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-fr-rCA.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-fr-rCA.json
index ca2bca514..73e3ee914 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-fr-rCA.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-fr-rCA.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-fr-rCA\\values-fr-rCA.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-fr-rCA\\values-fr-rCA.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-fr-rCA\\values.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-fr.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-fr.json
index 4682f2205..58a00c4c7 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-fr.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-fr.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-fr\\values-fr.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-fr\\values-fr.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-fr\\values-fr.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-gl.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-gl.json
index d73966ae4..c11c21658 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-gl.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-gl.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-gl\\values-gl.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-gl\\values-gl.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-gl\\values.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-gu.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-gu.json
index 6beaff2a3..088f2c3c2 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-gu.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-gu.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-gu\\values-gu.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-gu\\values-gu.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-gu\\values-gu.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-h360dp-land-v13.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-h360dp-land-v13.json
index 22797c833..24dcd74c5 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-h360dp-land-v13.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-h360dp-land-v13.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-h360dp-land-v13\\values-h360dp-land-v13.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-h360dp-land-v13\\values-h360dp-land-v13.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\19593d9c2c700c52ad03572ebfd537d5\\material-1.1.0-rc02\\res\\values-h360dp-land-v13\\values-h360dp-land-v13.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-h480dp-land-v13.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-h480dp-land-v13.json
index 0646a6efa..201a8c20d 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-h480dp-land-v13.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-h480dp-land-v13.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-h480dp-land-v13\\values-h480dp-land-v13.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-h480dp-land-v13\\values-h480dp-land-v13.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\19593d9c2c700c52ad03572ebfd537d5\\material-1.1.0-rc02\\res\\values-h480dp-land-v13\\values-h480dp-land-v13.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-h720dp-v13.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-h720dp-v13.json
index ef4297a91..4f40a54d5 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-h720dp-v13.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-h720dp-v13.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-h720dp-v13\\values-h720dp-v13.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-h720dp-v13\\values-h720dp-v13.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-h720dp-v13\\values-h720dp-v13.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-hdpi-v4.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-hdpi-v4.json
index f77819e75..2d7d1e202 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-hdpi-v4.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-hdpi-v4.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hdpi-v4\\values-hdpi-v4.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hdpi-v4\\values-hdpi-v4.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-hdpi-v4\\values-hdpi-v4.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-hi.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-hi.json
index d97e190c0..8a7125c62 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-hi.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-hi.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hi\\values-hi.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hi\\values-hi.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-hi\\values.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-hr.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-hr.json
index e6be0e1fc..eda781608 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-hr.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-hr.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hr\\values-hr.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hr\\values-hr.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-hr\\values.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-hu.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-hu.json
index 18c7adf0f..5364e818e 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-hu.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-hu.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hu\\values-hu.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hu\\values-hu.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-hu\\values.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-hy.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-hy.json
index fe9dd6b42..b0b63b385 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-hy.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-hy.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hy\\values-hy.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hy\\values-hy.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-hy\\values-hy.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-in.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-in.json
index ce88773f8..4623db651 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-in.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-in.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-in\\values-in.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-in\\values-in.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-in\\values-in.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-is.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-is.json
index 177c37926..bcd95118a 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-is.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-is.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-is\\values-is.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-is\\values-is.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-is\\values-is.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-it.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-it.json
index 04bec0da8..2571872c4 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-it.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-it.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-it\\values-it.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-it\\values-it.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-it\\values.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-iw.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-iw.json
index 332602284..060a24ffa 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-iw.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-iw.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-iw\\values-iw.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-iw\\values-iw.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-iw\\values-iw.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-ja.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-ja.json
index 696c69cd6..d16b611ec 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-ja.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-ja.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ja\\values-ja.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ja\\values-ja.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-ja\\values-ja.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-ka.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-ka.json
index afa4efffa..e3bc77913 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-ka.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-ka.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ka\\values-ka.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ka\\values-ka.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-ka\\values.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-kk.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-kk.json
index 6054e025b..c0f9ee32c 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-kk.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-kk.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-kk\\values-kk.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-kk\\values-kk.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-kk\\values.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-km.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-km.json
index c8d237e4d..3dcc99808 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-km.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-km.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-km\\values-km.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-km\\values-km.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-km\\values-km.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-kn.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-kn.json
index 79f3b8316..7c073e363 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-kn.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-kn.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-kn\\values-kn.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-kn\\values-kn.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-kn\\values-kn.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-ko.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-ko.json
index 56729d929..26490eff3 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-ko.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-ko.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ko\\values-ko.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ko\\values-ko.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-ko\\values.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-ky.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-ky.json
index 118bd8136..849b0d40f 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-ky.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-ky.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ky\\values-ky.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ky\\values-ky.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-ky\\values-ky.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-land.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-land.json
index 0c4a5d25a..5f18c45b5 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-land.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-land.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-land\\values-land.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-land\\values-land.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-land\\values-land.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-large-v4.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-large-v4.json
index e123c08dc..4a0fbe842 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-large-v4.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-large-v4.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-large-v4\\values-large-v4.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-large-v4\\values-large-v4.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-large-v4\\values-large-v4.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-ldltr-v21.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-ldltr-v21.json
index 2a61a53e3..7d284916d 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-ldltr-v21.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-ldltr-v21.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ldltr-v21\\values-ldltr-v21.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ldltr-v21\\values-ldltr-v21.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-ldltr-v21\\values-ldltr-v21.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-lo.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-lo.json
index c00ab68d4..78baafdfa 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-lo.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-lo.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-lo\\values-lo.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-lo\\values-lo.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-lo\\values.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-lt.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-lt.json
index 20f06c220..0a12567e6 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-lt.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-lt.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-lt\\values-lt.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-lt\\values-lt.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-lt\\values.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-lv.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-lv.json
index 9db90822b..6d8ca90fa 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-lv.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-lv.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-lv\\values-lv.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-lv\\values-lv.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-lv\\values-lv.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-mk.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-mk.json
index 112144bcf..25cb62df9 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-mk.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-mk.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-mk\\values-mk.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-mk\\values-mk.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-mk\\values-mk.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-ml.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-ml.json
index 2591122e0..73d4b9d69 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-ml.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-ml.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ml\\values-ml.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ml\\values-ml.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-ml\\values.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-mn.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-mn.json
index 9b89e4027..fdfe6e9ef 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-mn.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-mn.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-mn\\values-mn.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-mn\\values-mn.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-mn\\values-mn.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-mr.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-mr.json
index 9933e00db..48b8d4ca7 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-mr.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-mr.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-mr\\values-mr.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-mr\\values-mr.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-mr\\values.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-ms.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-ms.json
index e7b220ca4..c772bffc9 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-ms.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-ms.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ms\\values-ms.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ms\\values-ms.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-ms\\values-ms.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-my.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-my.json
index b8d7180f8..c3676b6f5 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-my.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-my.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-my\\values-my.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-my\\values-my.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-my\\values.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-nb.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-nb.json
index b82e87c36..9725ce71a 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-nb.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-nb.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-nb\\values-nb.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-nb\\values-nb.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-nb\\values.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-ne.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-ne.json
index 7e34ea4a6..5e0e312b6 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-ne.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-ne.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ne\\values-ne.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ne\\values-ne.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-ne\\values.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-night-v8.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-night-v8.json
index 8963b3754..c109a3078 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-night-v8.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-night-v8.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-night-v8\\values-night-v8.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-night-v8\\values-night-v8.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\19593d9c2c700c52ad03572ebfd537d5\\material-1.1.0-rc02\\res\\values-night-v8\\values-night-v8.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-nl.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-nl.json
index 3e4f623cb..7e72626f6 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-nl.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-nl.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-nl\\values-nl.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-nl\\values-nl.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-nl\\values.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-or.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-or.json
index 932519c16..898c5d60f 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-or.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-or.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-or\\values-or.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-or\\values-or.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-or\\values.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-pa.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-pa.json
index 03aba1306..27f40ca7b 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-pa.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-pa.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-pa\\values-pa.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-pa\\values-pa.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-pa\\values-pa.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-pl.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-pl.json
index 5637465e8..16fa1d9dc 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-pl.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-pl.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-pl\\values-pl.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-pl\\values-pl.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-pl\\values.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-port.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-port.json
index ac6fabd92..bd64d2cc1 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-port.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-port.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-port\\values-port.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-port\\values-port.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-port\\values-port.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-pt-rBR.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-pt-rBR.json
index 66d0227e2..3d0a778a6 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-pt-rBR.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-pt-rBR.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-pt-rBR\\values-pt-rBR.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-pt-rBR\\values-pt-rBR.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-pt-rBR\\values-pt-rBR.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-pt-rPT.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-pt-rPT.json
index f03ebf665..64439fbcd 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-pt-rPT.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-pt-rPT.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-pt-rPT\\values-pt-rPT.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-pt-rPT\\values-pt-rPT.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-pt-rPT\\values-pt-rPT.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-pt.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-pt.json
index 9315c1988..906c06027 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-pt.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-pt.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-pt\\values-pt.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-pt\\values-pt.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-pt\\values-pt.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-ro.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-ro.json
index a4307fef9..78cf939b3 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-ro.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-ro.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ro\\values-ro.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ro\\values-ro.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-ro\\values.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-ru.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-ru.json
index 98193b54e..bf04dd35f 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-ru.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-ru.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ru\\values-ru.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ru\\values-ru.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-ru\\values-ru.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-si.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-si.json
index 1bcee1953..b9fe03fa0 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-si.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-si.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-si\\values-si.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-si\\values-si.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-si\\values-si.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-sk.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-sk.json
index a6a4dabf3..b1a2fc749 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-sk.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-sk.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sk\\values-sk.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sk\\values-sk.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-sk\\values.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-sl.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-sl.json
index 03e19f8f8..900936876 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-sl.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-sl.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sl\\values-sl.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sl\\values-sl.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-sl\\values-sl.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-small-v4.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-small-v4.json
index 23a32b0e0..19eb27fec 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-small-v4.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-small-v4.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-small-v4\\values-small-v4.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-small-v4\\values-small-v4.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\19593d9c2c700c52ad03572ebfd537d5\\material-1.1.0-rc02\\res\\values-small-v4\\values-small-v4.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-sq.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-sq.json
index 59880eecf..9a38bb6c3 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-sq.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-sq.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sq\\values-sq.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sq\\values-sq.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-sq\\values-sq.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-sr.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-sr.json
index 5f77c14fc..75c8d590b 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-sr.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-sr.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sr\\values-sr.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sr\\values-sr.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-sr\\values-sr.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-sv.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-sv.json
index 2911fa74a..405f580cd 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-sv.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-sv.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sv\\values-sv.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sv\\values-sv.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-sv\\values-sv.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-sw.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-sw.json
index 360ab3b09..67137d2b1 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-sw.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-sw.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sw\\values-sw.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sw\\values-sw.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-sw\\values-sw.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-sw600dp-v13.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-sw600dp-v13.json
index f13f60e95..81eb129ee 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-sw600dp-v13.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-sw600dp-v13.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sw600dp-v13\\values-sw600dp-v13.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sw600dp-v13\\values-sw600dp-v13.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\19593d9c2c700c52ad03572ebfd537d5\\material-1.1.0-rc02\\res\\values-sw600dp-v13\\values-sw600dp-v13.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-ta.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-ta.json
index fca519ee2..b7de06fe4 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-ta.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-ta.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ta\\values-ta.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ta\\values-ta.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-ta\\values-ta.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-te.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-te.json
index ea9a9324e..765dcb766 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-te.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-te.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-te\\values-te.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-te\\values-te.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-te\\values-te.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-th.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-th.json
index 3924f52fe..907c981f4 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-th.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-th.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-th\\values-th.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-th\\values-th.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-th\\values-th.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-tl.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-tl.json
index ae59ad834..09544093e 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-tl.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-tl.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-tl\\values-tl.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-tl\\values-tl.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-tl\\values.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-tr.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-tr.json
index 0ab28d1a1..b47f61eb1 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-tr.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-tr.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-tr\\values-tr.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-tr\\values-tr.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-tr\\values-tr.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-uk.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-uk.json
index 8dfa32fdd..f575f3149 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-uk.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-uk.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-uk\\values-uk.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-uk\\values-uk.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-uk\\values-uk.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-ur.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-ur.json
index cc45a790c..164195497 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-ur.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-ur.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ur\\values-ur.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ur\\values-ur.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-ur\\values-ur.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-uz.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-uz.json
index 615cb2139..20ac89f05 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-uz.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-uz.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-uz\\values-uz.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-uz\\values-uz.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-uz\\values.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-v16.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-v16.json
index 06cf149f6..4c86a19c5 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-v16.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-v16.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v16\\values-v16.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v16\\values-v16.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-v16\\values-v16.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-v17.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-v17.json
index 13e285f92..82d44c8f2 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-v17.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-v17.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v17\\values-v17.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v17\\values-v17.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-v17\\values-v17.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-v18.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-v18.json
index b6ec82d6e..b3dc3efa6 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-v18.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-v18.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v18\\values-v18.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v18\\values-v18.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-v18\\values-v18.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-v21.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-v21.json
index 0ab61ce34..37f98eecf 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-v21.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-v21.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v21\\values-v21.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v21\\values-v21.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-v21\\values-v21.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-v22.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-v22.json
index 2ba76b8e4..85a216e70 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-v22.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-v22.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v22\\values-v22.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v22\\values-v22.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-v22\\values-v22.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-v23.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-v23.json
index 07b468ffd..3bfb01fb4 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-v23.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-v23.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v23\\values-v23.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v23\\values-v23.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\19593d9c2c700c52ad03572ebfd537d5\\material-1.1.0-rc02\\res\\values-v23\\values-v23.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-v24.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-v24.json
index d50b76a98..d25523e27 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-v24.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-v24.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v24\\values-v24.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v24\\values-v24.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\47ce40ad459cbf22b0d81e337967e729\\media-1.0.0\\res\\values-v24\\values-v24.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-v25.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-v25.json
index 8c5e74d08..b917a4329 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-v25.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-v25.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v25\\values-v25.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v25\\values-v25.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-v25\\values-v25.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-v26.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-v26.json
index cd7a33771..60fa230ed 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-v26.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-v26.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v26\\values-v26.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v26\\values-v26.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-v26\\values-v26.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-v28.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-v28.json
index 5971dc2f3..5728c65d2 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-v28.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-v28.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v28\\values-v28.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v28\\values-v28.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\19593d9c2c700c52ad03572ebfd537d5\\material-1.1.0-rc02\\res\\values-v28\\values-v28.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-vi.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-vi.json
index 804036ed0..5229e67c4 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-vi.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-vi.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-vi\\values-vi.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-vi\\values-vi.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-vi\\values-vi.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-w360dp-port-v13.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-w360dp-port-v13.json
index 40c15e0cd..ebdee6139 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-w360dp-port-v13.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-w360dp-port-v13.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-w360dp-port-v13\\values-w360dp-port-v13.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-w360dp-port-v13\\values-w360dp-port-v13.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\19593d9c2c700c52ad03572ebfd537d5\\material-1.1.0-rc02\\res\\values-w360dp-port-v13\\values-w360dp-port-v13.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-w480dp-port-v13.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-w480dp-port-v13.json
index b5eb3085e..e0b7e5e35 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-w480dp-port-v13.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-w480dp-port-v13.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-w480dp-port-v13\\values-w480dp-port-v13.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-w480dp-port-v13\\values-w480dp-port-v13.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\19593d9c2c700c52ad03572ebfd537d5\\material-1.1.0-rc02\\res\\values-w480dp-port-v13\\values-w480dp-port-v13.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-watch-v20.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-watch-v20.json
index 7fcb8801c..2366ba55d 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-watch-v20.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-watch-v20.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-watch-v20\\values-watch-v20.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-watch-v20\\values-watch-v20.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-watch-v20\\values-watch-v20.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-watch-v21.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-watch-v21.json
index a7815dd80..83635d7c4 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-watch-v21.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-watch-v21.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-watch-v21\\values-watch-v21.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-watch-v21\\values-watch-v21.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-watch-v21\\values-watch-v21.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-xlarge-v4.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-xlarge-v4.json
index 330971a88..2c73bcf4c 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-xlarge-v4.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-xlarge-v4.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-xlarge-v4\\values-xlarge-v4.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-xlarge-v4\\values-xlarge-v4.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-xlarge-v4\\values-xlarge-v4.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rCN.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rCN.json
index ab2a32839..22a045a9a 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rCN.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rCN.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rCN\\values-zh-rCN.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rCN\\values-zh-rCN.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-zh-rCN\\values.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rHK.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rHK.json
index 8cbdd1d89..8dd717139 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rHK.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rHK.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rHK\\values-zh-rHK.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rHK\\values-zh-rHK.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-zh-rHK\\values.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rTW.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rTW.json
index 8e723b06a..aa368381a 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rTW.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rTW.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rTW\\values-zh-rTW.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rTW\\values-zh-rTW.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-zh-rTW\\values.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values-zu.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values-zu.json
index 6762e23c4..577261bc8 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values-zu.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values-zu.json
@@ -1,7 +1,11 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zu\\values-zu.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zu\\values-zu.xml",
+>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-zu\\values.xml",
diff --git a/android/app/build/intermediates/blame/res/debug/multi-v2/values.json b/android/app/build/intermediates/blame/res/debug/multi-v2/values.json
index 2638de50d..c0ab9a769 100644
--- a/android/app/build/intermediates/blame/res/debug/multi-v2/values.json
+++ b/android/app/build/intermediates/blame/res/debug/multi-v2/values.json
@@ -1,10 +1,125 @@
{
"logs": [
{
+<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values\\values.xml",
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\47ce40ad459cbf22b0d81e337967e729\\media-1.0.0\\res\\values\\values.xml",
+=======
+ "outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values\\values.xml",
+ "map": [
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\8c1aed4303e761aac5e34d2036bbfc96\\coordinatorlayout-1.1.0\\res\\values\\values.xml",
+ "from": {
+ "startLines": "2,3,6,16",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,116,261,869",
+ "endLines": "2,5,15,104",
+ "endColumns": "60,12,24,24",
+ "endOffsets": "111,256,864,6075"
+ },
+ "to": {
+ "startLines": "24,4277,5515,5525",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "1278,288380,356276,356884",
+ "endLines": "24,4279,5524,5613",
+ "endColumns": "60,12,24,24",
+ "endOffsets": "1334,288520,356879,362090"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\adb371d4d53f86eab98a28717d70cc7e\\cardview-1.0.0\\res\\values\\values.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,35,36,37,38,45,47,50,7",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "55,107,168,230,292,2179,2238,2295,2349,2763,2827,2953,356",
+ "endLines": "2,3,4,5,6,35,36,37,44,46,49,52,34",
+ "endColumns": "51,60,61,61,63,58,56,53,12,12,12,12,24",
+ "endOffsets": "102,163,225,287,351,2233,2290,2344,2758,2822,2948,3076,2174"
+ },
+ "to": {
+ "startLines": "8,111,112,113,114,297,298,299,818,2624,2626,2629,5215",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "468,6767,6828,6890,6952,19423,19482,19539,59402,176750,176814,176940,340106",
+ "endLines": "8,111,112,113,114,297,298,299,824,2625,2628,2631,5242",
+ "endColumns": "51,60,61,61,63,58,56,53,12,12,12,12,24",
+ "endOffsets": "515,6823,6885,6947,7011,19477,19534,19588,59811,176809,176935,177063,341924"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\e66da8b5301e9a6b4d099a6eed9ee5b8\\jetified-appcompat-resources-1.1.0\\res\\values\\values.xml",
+ "from": {
+ "startLines": "2,29,36,47,74",
+ "startColumns": "4,4,4,4,4",
+ "startOffsets": "55,1702,2087,2684,4317",
+ "endLines": "28,35,46,73,78",
+ "endColumns": "24,24,24,24,24",
+ "endOffsets": "1697,2082,2679,4312,4582"
+ },
+ "to": {
+ "startLines": "4407,4434,4441,6465,6492",
+ "startColumns": "4,4,4,4,4",
+ "startOffsets": "295958,297605,297990,406139,407772",
+ "endLines": "4433,4440,4451,6491,6496",
+ "endColumns": "24,24,24,24,24",
+ "endOffsets": "297600,297985,298582,407767,408037"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values\\values.xml",
+ "from": {
+ "startLines": "4,7",
+ "startColumns": "0,0",
+ "startOffsets": "238,401",
+ "endColumns": "63,166",
+ "endOffsets": "301,567"
+ },
+ "to": {
+ "startLines": "632,694",
+ "startColumns": "4,4",
+ "startOffsets": "40561,45486",
+ "endColumns": "67,166",
+ "endOffsets": "40624,45648"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values\\values.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "55,113,179,242,304,375,447,515,582,661",
+ "endColumns": "57,65,62,61,70,71,67,66,78,68",
+ "endOffsets": "108,174,237,299,370,442,510,577,656,725"
+ },
+ "to": {
+ "startLines": "105,106,107,108,295,296,704,711,712,713",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "6403,6461,6527,6590,19280,19351,46779,47529,47596,47675",
+ "endColumns": "57,65,62,61,70,71,67,66,78,68",
+ "endOffsets": "6456,6522,6585,6647,19346,19418,46842,47591,47670,47739"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\values\\strings.xml",
+ "from": {
+ "startLines": "2,5,4,3",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "57,244,178,112",
+ "endColumns": "53,69,64,64",
+ "endOffsets": "106,309,238,172"
+ },
+ "to": {
+ "startLines": "677,705,758,769",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "43622,46847,54974,56170",
+ "endColumns": "53,69,64,64",
+ "endOffsets": "43671,46912,55034,56230"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\47ce40ad459cbf22b0d81e337967e729\\media-1.0.0\\res\\values\\values.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "2,5,6,7,8,10,11,12,13,14",
"startColumns": "4,4,4,4,4,4,4,4,4,4",
@@ -21,6 +136,7 @@
}
},
{
+<<<<<<< HEAD
"source": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\src\\main\\res\\values\\ic_launcher_background.xml",
"from": {
"startLines": "2",
@@ -28,6 +144,14 @@
"startOffsets": "55",
"endColumns": "56",
"endOffsets": "107"
+=======
+ "source": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\values\\ic_launcher_background.xml",
+ "from": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "57",
+ "endColumns": "56",
+ "endOffsets": "109"
},
"to": {
"startLines": "171",
@@ -38,7 +162,24 @@
}
},
{
- "source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values\\values.xml",
+ "source": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\generated\\res\\google-services\\debug\\values\\values.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9",
+ "startColumns": "4,4,4,4,4,4,4,4",
+ "startOffsets": "55,199,315,397,501,610,730,835",
+ "endColumns": "143,115,81,103,108,119,104,81",
+ "endOffsets": "194,310,392,496,605,725,830,912"
+ },
+ "to": {
+ "startLines": "706,715,716,717,718,719,720,765",
+ "startColumns": "4,4,4,4,4,4,4,4",
+ "startOffsets": "46917,47826,47942,48024,48128,48237,48357,55885",
+ "endColumns": "143,115,81,103,108,119,104,81",
+ "endOffsets": "47056,47937,48019,48123,48232,48352,48457,55962"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values\\values.xml",
"from": {
"startLines": "4",
"startColumns": "0",
@@ -55,6 +196,103 @@
}
},
{
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values\\values.xml",
+ "from": {
+ "startLines": "4,5,6,7,8,9,10,11,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,33,46",
+ "startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+ "startOffsets": "215,301,377,463,549,625,702,778,951,1052,1233,1354,1457,1637,1756,1868,1967,2155,2256,2437,2558,2733,2877,2936,2994,3164,3475",
+ "endLines": "4,5,6,7,8,9,10,11,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,45,64",
+ "endColumns": "85,75,85,85,75,76,75,75,100,180,120,102,179,118,111,98,187,100,180,120,174,143,58,57,74,20,20",
+ "endOffsets": "300,376,462,548,624,701,777,853,1051,1232,1353,1456,1636,1755,1867,1966,2154,2255,2436,2557,2732,2876,2935,2993,3068,3474,3887"
+ },
+ "to": {
+ "startLines": "118,119,120,121,122,123,124,125,686,687,688,689,690,691,692,693,695,696,697,698,699,700,701,702,703,5876,6411",
+ "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": "7160,7250,7330,7420,7510,7590,7671,7751,44446,44551,44732,44857,44964,45144,45267,45383,45653,45841,45946,46127,46252,46427,46575,46638,46700,376771,403848",
+ "endLines": "118,119,120,121,122,123,124,125,686,687,688,689,690,691,692,693,695,696,697,698,699,700,701,702,703,5888,6429",
+ "endColumns": "89,79,89,89,79,80,79,79,104,180,124,106,179,122,115,102,187,104,180,124,174,147,62,61,78,20,20",
+ "endOffsets": "7245,7325,7415,7505,7585,7666,7746,7826,44546,44727,44852,44959,45139,45262,45378,45481,45836,45941,46122,46247,46422,46570,46633,46695,46774,377081,404260"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\node_modules\\@capacitor\\android\\capacitor\\build\\intermediates\\packaged_res\\debug\\values\\values.xml",
+ "from": {
+ "startLines": "2,3,4,6,7,8,9,20",
+ "startColumns": "4,4,4,4,4,4,4,4",
+ "startOffsets": "55,101,148,253,315,349,393,978",
+ "endLines": "2,3,4,6,7,8,9,22",
+ "endColumns": "45,46,50,61,33,43,78,22",
+ "endOffsets": "96,143,194,310,344,388,467,1088"
+>>>>>>> origin/feature/pushNotifications
+ },
+ "to": {
+ "startLines": "115,116,117,680,757,764,766,7032",
+ "startColumns": "4,4,4,4,4,4,4,4",
+ "startOffsets": "7016,7062,7109,43957,54940,55841,55967,438080",
+ "endLines": "115,116,117,680,757,764,766,7034",
+ "endColumns": "45,46,50,61,33,43,78,22",
+ "endOffsets": "7057,7104,7155,44014,54969,55880,56041,438190"
+ }
+ },
+ {
+<<<<<<< HEAD
+ "source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values\\values.xml",
+=======
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\a444f209b7c59a0fec306c6e0a516b3f\\transition-1.2.0\\res\\values\\values.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "55,95,142,185,240,287,341,393,442,503",
+ "endColumns": "39,46,42,54,46,53,51,48,60,49",
+ "endOffsets": "90,137,180,235,282,336,388,437,498,548"
+ },
+ "to": {
+ "startLines": "586,587,595,598,599,617,618,619,620,621",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "38198,38238,38631,38770,38825,39709,39763,39815,39864,39925",
+ "endColumns": "39,46,42,54,46,53,51,48,60,49",
+ "endOffsets": "38233,38280,38669,38820,38867,39758,39810,39859,39920,39970"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\values\\styles.xml",
+ "from": {
+ "startLines": "4,11,18",
+ "startColumns": "4,4,4",
+ "startOffsets": "97,424,673",
+ "endLines": "9,15,20",
+ "endColumns": "12,12,12",
+ "endOffsets": "416,663,823"
+ },
+ "to": {
+ "startLines": "783,789,794",
+ "startColumns": "4,4,4",
+ "startOffsets": "57239,57558,57798",
+ "endLines": "788,793,796",
+ "endColumns": "12,12,12",
+ "endOffsets": "57553,57793,57946"
+ }
+ },
+ {
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\8d8a8abf56b0acf243894e5c793a7480\\recyclerview-1.1.0\\res\\values\\values.xml",
+>>>>>>> origin/feature/pushNotifications
+ "from": {
+ "startLines": "4",
+ "startColumns": "0",
+ "startOffsets": "178",
+ "endColumns": "77",
+ "endOffsets": "255"
+ },
+ "to": {
+ "startLines": "714",
+ "startColumns": "4",
+ "startOffsets": "47744",
+ "endColumns": "81",
+ "endOffsets": "47821"
+ }
+ },
+ {
+<<<<<<< HEAD
"source": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\generated\\res\\google-services\\debug\\values\\values.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9",
@@ -128,6 +366,9 @@
},
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\305c2898fe2457e82c9da2257c2bc0a1\\jetified-viewpager2-1.0.0\\res\\values\\values.xml",
+=======
+ "source": "C:\\Users\\eudes.inacio\\.gradle\\caches\\transforms-2\\files-2.1\\305c2898fe2457e82c9da2257c2bc0a1\\jetified-viewpager2-1.0.0\\res\\values\\values.xml",
+>>>>>>> origin/feature/pushNotifications
"from": {
"startLines": "2",
"startColumns": "4",
diff --git a/android/app/build/intermediates/blame/res/debug/single/debug.json b/android/app/build/intermediates/blame/res/debug/single/debug.json
index 6cab39b74..811fd5e26 100644
--- a/android/app/build/intermediates/blame/res/debug/single/debug.json
+++ b/android/app/build/intermediates/blame/res/debug/single/debug.json
@@ -1,5 +1,6 @@
[
{
+<<<<<<< HEAD
"merged": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-port-xhdpi_splash.png.flat",
"source": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\src\\main\\res\\drawable-port-xhdpi\\splash.png"
},
@@ -130,5 +131,137 @@
{
"merged": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-port-hdpi_splash.png.flat",
"source": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\src\\main\\res\\drawable-port-hdpi\\splash.png"
+=======
+ "merged": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xhdpi_ic_launcher.png.flat",
+ "source": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-xhdpi\\ic_launcher.png"
+ },
+ {
+ "merged": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-port-hdpi_splash.png.flat",
+ "source": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\drawable-port-hdpi\\splash.png"
+ },
+ {
+ "merged": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xxxhdpi_ic_launcher.png.flat",
+ "source": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-xxxhdpi\\ic_launcher.png"
+ },
+ {
+ "merged": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xhdpi_ic_launcher_foreground.png.flat",
+ "source": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-xhdpi\\ic_launcher_foreground.png"
+ },
+ {
+ "merged": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-hdpi_ic_launcher_round.png.flat",
+ "source": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-hdpi\\ic_launcher_round.png"
+ },
+ {
+ "merged": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable_splash.png.flat",
+ "source": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\drawable\\splash.png"
+ },
+ {
+ "merged": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-land-xxhdpi_splash.png.flat",
+ "source": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\drawable-land-xxhdpi\\splash.png"
+ },
+ {
+ "merged": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-v24_ic_launcher_foreground.xml.flat",
+ "source": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\drawable-v24\\ic_launcher_foreground.xml"
+ },
+ {
+ "merged": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xxhdpi_ic_launcher.png.flat",
+ "source": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-xxhdpi\\ic_launcher.png"
+ },
+ {
+ "merged": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-land-xhdpi_splash.png.flat",
+ "source": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\drawable-land-xhdpi\\splash.png"
+ },
+ {
+ "merged": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-mdpi_ic_launcher_foreground.png.flat",
+ "source": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-mdpi\\ic_launcher_foreground.png"
+ },
+ {
+ "merged": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-hdpi_ic_launcher_foreground.png.flat",
+ "source": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-hdpi\\ic_launcher_foreground.png"
+ },
+ {
+ "merged": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xxhdpi_ic_launcher_round.png.flat",
+ "source": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-xxhdpi\\ic_launcher_round.png"
+ },
+ {
+ "merged": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable_ic_launcher_background.xml.flat",
+ "source": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\drawable\\ic_launcher_background.xml"
+ },
+ {
+ "merged": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-land-xxxhdpi_splash.png.flat",
+ "source": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\drawable-land-xxxhdpi\\splash.png"
+ },
+ {
+ "merged": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\xml_file_paths.xml.flat",
+ "source": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\xml\\file_paths.xml"
+ },
+ {
+ "merged": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xhdpi_ic_launcher_round.png.flat",
+ "source": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-xhdpi\\ic_launcher_round.png"
+ },
+ {
+ "merged": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-hdpi_ic_launcher.png.flat",
+ "source": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-hdpi\\ic_launcher.png"
+ },
+ {
+ "merged": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xxxhdpi_ic_launcher_foreground.png.flat",
+ "source": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-xxxhdpi\\ic_launcher_foreground.png"
+ },
+ {
+ "merged": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-anydpi-v26_ic_launcher_round.xml.flat",
+ "source": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-anydpi-v26\\ic_launcher_round.xml"
+ },
+ {
+ "merged": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\layout_activity_main.xml.flat",
+ "source": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\layout\\activity_main.xml"
+ },
+ {
+ "merged": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xxhdpi_ic_launcher_foreground.png.flat",
+ "source": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-xxhdpi\\ic_launcher_foreground.png"
+ },
+ {
+ "merged": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-port-xhdpi_splash.png.flat",
+ "source": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\drawable-port-xhdpi\\splash.png"
+ },
+ {
+ "merged": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-port-xxxhdpi_splash.png.flat",
+ "source": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\drawable-port-xxxhdpi\\splash.png"
+ },
+ {
+ "merged": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-land-hdpi_splash.png.flat",
+ "source": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\drawable-land-hdpi\\splash.png"
+ },
+ {
+ "merged": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\xml_config.xml.flat",
+ "source": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\xml\\config.xml"
+ },
+ {
+ "merged": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-port-xxhdpi_splash.png.flat",
+ "source": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\drawable-port-xxhdpi\\splash.png"
+ },
+ {
+ "merged": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-mdpi_ic_launcher.png.flat",
+ "source": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-mdpi\\ic_launcher.png"
+ },
+ {
+ "merged": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-mdpi_ic_launcher_round.png.flat",
+ "source": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-mdpi\\ic_launcher_round.png"
+ },
+ {
+ "merged": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xxxhdpi_ic_launcher_round.png.flat",
+ "source": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-xxxhdpi\\ic_launcher_round.png"
+ },
+ {
+ "merged": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-port-mdpi_splash.png.flat",
+ "source": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\drawable-port-mdpi\\splash.png"
+ },
+ {
+ "merged": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-anydpi-v26_ic_launcher.xml.flat",
+ "source": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-anydpi-v26\\ic_launcher.xml"
+ },
+ {
+ "merged": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-land-mdpi_splash.png.flat",
+ "source": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\drawable-land-mdpi\\splash.png"
+>>>>>>> origin/feature/pushNotifications
}
]
\ No newline at end of file
diff --git a/android/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/android/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
index f4845a502..7aba53307 100644
--- a/android/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
+++ b/android/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
@@ -1,2 +1,6 @@
-
\ No newline at end of file
+<<<<<<< HEAD
+
+=======
+
+>>>>>>> origin/feature/pushNotifications
diff --git a/android/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/android/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
index f729e9793..b4494727a 100644
--- a/android/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
+++ b/android/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
@@ -1,2 +1,6 @@
-
\ No newline at end of file
+<<<<<<< HEAD
+
+=======
+
+>>>>>>> origin/feature/pushNotifications
diff --git a/android/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties b/android/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
index 2cb7c0d2e..430f1f070 100644
--- a/android/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
+++ b/android/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
#Mon Feb 08 11:56:18 WAT 2021
C\:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\src\\main\\res\\drawable-port-xhdpi\\splash.png=C\:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-port-xhdpi_splash.png.flat
C\:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-mdpi\\ic_launcher_foreground.png=C\:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-mdpi_ic_launcher_foreground.png.flat
@@ -32,3 +33,39 @@ C\:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\src\\main
C\:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\src\\main\\res\\layout\\activity_main.xml=C\:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\layout_activity_main.xml.flat
C\:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-hdpi\\ic_launcher_foreground.png=C\:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-hdpi_ic_launcher_foreground.png.flat
C\:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\src\\main\\res\\drawable\\ic_launcher_background.xml=C\:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable_ic_launcher_background.xml.flat
+=======
+#Mon Feb 08 14:33:30 WAT 2021
+C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-xhdpi\\ic_launcher.png=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xhdpi_ic_launcher.png.flat
+C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-mdpi\\ic_launcher_foreground.png=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-mdpi_ic_launcher_foreground.png.flat
+C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\drawable-port-xhdpi\\splash.png=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-port-xhdpi_splash.png.flat
+C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-hdpi\\ic_launcher_round.png=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-hdpi_ic_launcher_round.png.flat
+C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-xxhdpi\\ic_launcher_foreground.png=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xxhdpi_ic_launcher_foreground.png.flat
+C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\drawable-land-mdpi\\splash.png=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-land-mdpi_splash.png.flat
+C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\xml\\config.xml=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\xml_config.xml.flat
+C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\drawable\\ic_launcher_background.xml=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable_ic_launcher_background.xml.flat
+C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\layout\\activity_main.xml=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\layout_activity_main.xml.flat
+C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\drawable-v24\\ic_launcher_foreground.xml=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-v24_ic_launcher_foreground.xml.flat
+C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-xxxhdpi\\ic_launcher_round.png=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xxxhdpi_ic_launcher_round.png.flat
+C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\drawable-land-xhdpi\\splash.png=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-land-xhdpi_splash.png.flat
+C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\drawable\\splash.png=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable_splash.png.flat
+C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\drawable-land-xxxhdpi\\splash.png=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-land-xxxhdpi_splash.png.flat
+C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-hdpi\\ic_launcher.png=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-hdpi_ic_launcher.png.flat
+C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\drawable-port-xxhdpi\\splash.png=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-port-xxhdpi_splash.png.flat
+C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-anydpi-v26\\ic_launcher_round.xml=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-anydpi-v26_ic_launcher_round.xml.flat
+C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-xhdpi\\ic_launcher_foreground.png=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xhdpi_ic_launcher_foreground.png.flat
+C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\drawable-port-hdpi\\splash.png=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-port-hdpi_splash.png.flat
+C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-xxhdpi\\ic_launcher.png=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xxhdpi_ic_launcher.png.flat
+C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-xxhdpi\\ic_launcher_round.png=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xxhdpi_ic_launcher_round.png.flat
+C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\drawable-land-xxhdpi\\splash.png=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-land-xxhdpi_splash.png.flat
+C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\drawable-port-xxxhdpi\\splash.png=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-port-xxxhdpi_splash.png.flat
+C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-mdpi\\ic_launcher_round.png=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-mdpi_ic_launcher_round.png.flat
+C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-xxxhdpi\\ic_launcher_foreground.png=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xxxhdpi_ic_launcher_foreground.png.flat
+C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-anydpi-v26\\ic_launcher.xml=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-anydpi-v26_ic_launcher.xml.flat
+C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-mdpi\\ic_launcher.png=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-mdpi_ic_launcher.png.flat
+C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-xhdpi\\ic_launcher_round.png=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xhdpi_ic_launcher_round.png.flat
+C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-hdpi\\ic_launcher_foreground.png=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-hdpi_ic_launcher_foreground.png.flat
+C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\xml\\file_paths.xml=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\xml_file_paths.xml.flat
+C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-xxxhdpi\\ic_launcher.png=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xxxhdpi_ic_launcher.png.flat
+C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\drawable-port-mdpi\\splash.png=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-port-mdpi_splash.png.flat
+C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\src\\main\\res\\drawable-land-hdpi\\splash.png=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-land-hdpi_splash.png.flat
+>>>>>>> origin/feature/pushNotifications
diff --git a/android/app/build/intermediates/incremental/mergeDebugResources/merger.xml b/android/app/build/intermediates/incremental/mergeDebugResources/merger.xml
index 0b36d30aa..671865618 100644
--- a/android/app/build/intermediates/incremental/mergeDebugResources/merger.xml
+++ b/android/app/build/intermediates/incremental/mergeDebugResources/merger.xml
@@ -326,7 +326,11 @@
"Aktiveer""%1$s sal nie werk nie tensy jy Google Play-dienste aktiveer.""Aktiveer Google Play-dienste""Installeer""%1$s sal nie sonder Google Play Dienste werk nie, wat nie op jou toestel is nie.""Kry Google Play-dienste""Beskikbaarheid van Google Play-dienste""Google Play Services-fout""%1$s sal nie werk sonder Google Play Dienste nie, wat nie deur jou toestel gesteun word nie.""Dateer op""%1$s sal nie werk nie tensy jy Google Play Dienste opdateer.""Dateer Google Play-dienste op""%1$s sal nie sonder Google Play-dienste werk nie, wat tans opdateer.""Nuwe weergawe van Google Play-dienste is nodig. Dit sal binnekort self opdateer.""Maak oop op foon""Meld aan""Meld aan met Google""አንቃ""Google Play አገልግሎቶችን ካላነቁ በስተቀር %1$s አይሰራም።""Google Play አገልግሎቶችን ያንቁ""ጫን""%1$s ያለ Google Play አገልግሎቶች አይሰራም፣ እነሱ ደግሞ በመሣሪያዎ ላይ የሉም።""Google Play አገልግሎቶችን ያግኙ""Google Play አገልግሎቶች ተገኝነት""የGoogle Play አገልግሎቶች ስህተት""%1$s ያለGoogle Play አገልግሎቶች አይሄድም፣ እነዚህም በመሣሪያዎ አይደገፉም።""ያዘምኑ""Google Play አገልግሎቶችን ካላዘመኑ በስተቀር ድረስ %1$s አይሰራም።""Google Play አገልግሎቶችን ያዘምኑ""%1$s ያለ Google Play አገልግሎቶች አይሰራም፣ እነሱ ደግሞ በአሁኑ ጊዜ በመዘመን ላይ ናቸው።""አዲስ የGoogle Play አገልግሎቶች ስሪት ያስፈልጋል። በቅርቡ እራሱን ያዘምናል።""ስልክ ላይ ክፈት""ግባ""በGoogle ይግቡ""تفعيل""لن يعمل %1$s ما لم يتم تفعيل خدمات Google Play.""تفعيل خدمات Google Play""تثبيت""لن يتم تشغيل %1$s بدون خدمات Google Play، والتي لا تتوفر على جهازك.""الحصول على خدمات Google Play""مدى توفّر خدمات Google Play""خطأ في خدمات Google Play""لن يتم تشغيل %1$s بدون خدمات Google Play التي لا يوفرها جهازك.""تحديث""لن يتم تشغيل %1$s ما لم يتم تحديث خدمات Google Play.""تحديث خدمات Google Play""لن يتم تشغيل %1$s بدون خدمات Google Play، والتي يتم تحديثها حاليًا.""يجب توفر إصدار جديد من خدمات Google Play. سيتم تحديثها تلقائيًا قريبًا.""فتح على الهاتف""تسجل الدخول""تسجيل الدخول عبر Google""সক্ষম কৰক""আপুনি Google Play সেৱাবোৰ সক্ষম নকৰালৈকে %1$sএ কাম নকৰিব।""Google প্লে সেৱাসক্ষম কৰক""ইনষ্টল কৰক""%1$s Google প্লে সেৱাৰ অবিহনে নচলে, যিটো আপোনাৰ ডিভাইচত নাই।""Google প্লে সেৱালাভ কৰক""Google প্লে সেৱাসমূহৰ উপলব্ধতা""Google Playৰ সেৱা সম্পৰ্কীয় আসোঁৱাহ""%1$s Google প্লে সেৱাৰ অবিহনে নচলে, যিবোৰ আপোনাৰ ডিভাইচত চলিব নোৱাৰে।""আপডেট কৰক""আপুনি Google Play সেৱাবোৰ আপডেট নকৰালৈকে %1$s নচলিব।""Google Play সেৱা আপডেট কৰক""বৰ্তমান আপডেট হৈ থকা Google Play সেৱাসমূহৰ অবিহনে %1$s নচলিব৷""Google Play সেৱাসমূহৰ নতুন সংস্কৰণৰ প্ৰয়োজন৷ এইটো শীঘ্ৰেই নিজে-নিজে আপডেট হ’ব৷""ফ\'নত খোলক""ছাইন ইন কৰক""Googleৰ জৰিয়তে ছাইন ইন কৰক""Aktiv edin""%1$s Google Play xidmətlərini aktiv edənə kimi işləməyəcək.""Google Play xidmətlərini aktiv edin""Quraşdırın""%1$s cihazınızda mövcud olmayan Google Play xidmətləri olmadan çalışmayacaq.""Google Play xidmətlərini əldə edin""Google Play xidmətlərinin əlçatanlığı""Google Play xidmətləri xətası""Cihazınız tərəfindən dəstəklənməyən Google Play xidmətləri olmadan %1$s tətbiqi işləməyəcək.""Güncəlləyin""%1$s Google Play xidmətləri yeniləmə halda çalışmaz.""Google Play xidmətlərini güncəlləşdirin""%1$s hal-hazırda güncəllənən Google Play xidmətləri olmadan çalışmayacaq.""Google Play xidmətlərinin yeni versiyası lazımdır. Qısa müddətə özünü yeniləyəcək.""Telefonda açın""Daxil olun""Google ilə daxil olun""Omogući""%1$s neće funkcionisati ako ne omogućite Google Play usluge.""Omogućite Google Play usluge""Instaliraj""%1$s ne može da se pokrene bez Google Play usluga, koje nisu instalirane na uređaju.""Preuzmite Google Play usluge""Dostupnost Google Play usluga""Greška Google Play usluga""%1$s ne može da se pokrene bez Google Play usluga, koje uređaj ne podržava.""Ažuriraj""%1$s ne može da se pokrene ako ne ažurirate Google Play usluge.""Ažurirajte Google Play usluge""%1$s ne može da se pokrene bez Google Play usluga, koje se trenutno ažuriraju.""Potrebna je nova verzija Google Play usluga. Uskoro će se ažurirati.""Otvori na telefonu""Prijavi me""Prijavi me na Google""Уключыць""%1$s не будзе працаваць, пакуль вы не ўключыце службы Google Play.""Уключыць службы Google Play""Усталяваць""%1$s не будзе працаваць без службаў Google Play, якія адсутнічаюць на вашай прыладзе.""Атрымаць службы Google Play""Даступнасць сэрвісаў Google Play""Памылка службаў Google Play""%1$s не будзе працаваць без службаў Google Play, якія не падтрымліваюцца вашай прыладай.""Абнавіць""%1$s не будзе працаваць, пакуль вы не абновіце службы Google Play.""Абнаўленне службаў Google Play""%1$s не будзе працаваць без службаў Google Play, якія ў цяперашні час абнаўляюцца.""Патрабуецца новая версія служб Google Play. Яна абновіцца аўтаматычна ў бліжэйшы час.""Адкрыць на тэлефоне""Увайсцi""Увайсці праз Google""Активиране""%1$s няма да работи, освен ако не активирате услугите за Google Play.""Активиране на услугите за Google Play""Инсталиране""%1$s няма да се изпълнява, тъй като услугите за Google Play не са инсталирани на устройството ви.""Изтегляне на услугите за Google Play""Наличност на услугите за Google Play""Грешка в услугите за Google Play""%1$s няма да се изпълнява, тъй като услугите за Google Play не се поддържат от устройството ви.""Актуализиране""%1$s няма да се изпълнява, освен ако не актуализирате услугите за Google Play.""Актуализиране на услугите за Google Play""%1$s няма да се изпълнява без услугите за Google Play. Понастоящем те се актуализират.""Необходима е нова версия на услугите за Google Play. Скоро тя ще се актуализира автоматично.""Отваряне на телефона""Вход""Вход с Google""সক্ষম করুন""আপনি Google Play পরিষেবা সক্ষম না করা পর্যন্ত %1$s কাজ করবে না।""Google Play পরিষেবা সক্ষম করুন""ইনস্টল করুন""Google Play পরিষেবা ছাড়া %1$s চলবে না, যা আপনার ডিভাইসে অনুপস্থিত।""Google Play পরিষেবা পান""Google Play পরিষেবার উপলভ্যতা""Google Play পরিষেবার ত্রুটি""Google Play পরিষেবা ছাড়া %1$s চলবে না, যেটি আপনার ডিভাইসে সমর্থিত নয়৷""আপডেট করুন""আপনি Google Play পরিষেবা আপডেট না করা পর্যন্ত %1$s চলবে না।""Google Play পরিষেবা আপডেট করুন""Google Play পরিষেবা ছাড়া %1$s চলবে না যা বর্তমানে আপডেট হচ্ছে।""Google Play পরিষেবার নতুন ভার্সন প্রয়োজন৷ খুব শীঘ্রই এটা নিজেই আপডেট হবে৷""ফোনে খুলুন""সাইন-ইন করুন""Google এর মাধ্যমে সাইন-ইন করুন""Omogući""Aplikacija %1$s neće raditi ako ne omogućite Google Play usluge.""Omogućite Google Play usluge""Instaliraj""Aplikacija %1$s neće raditi bez Google Play usluga, kojih na vašem uređaju nema.""Nabavite Google Play usluge""Dostupnost Google Play usluga""Greška Google Play usluge""Aplikacija %1$s neće raditi bez Google Play usluga, koje vaš uređaj ne podržava.""Ažuriraj""Aplikacija %1$s neće raditi ako ne ažurirate Google Play usluge.""Ažuriranje Google Play usluga""Aplikacija %1$s neće raditi bez Google Play usluga, koje se trenutno ažuriraju.""Potrebna je nova verzija Google Play usluga. Ubrzo će se samo ažurirati.""Otvori na telefonu""Prijavi se""Prijavi se pomoću Googlea""Activa""%1$s no funcionarà si no actives Serveis de Google Play.""Activa Serveis de Google Play""Instal·la""%1$s no s\'executarà si Serveis de Google Play no està instal·lat al dispositiu.""Obtén Serveis de Google Play""Disponibilitat de serveis de Google Play""Error de Serveis de Google Play""%1$s no es pot executar sense Serveis de Google Play, que no és compatible amb el teu dispositiu.""Actualitza""%1$s no s\'executarà si no actualitzes Serveis de Google Play.""Actualitza Serveis de Google Play""%1$s no s\'executarà sense Serveis de Google Play, que s\'està actualitzant en aquest moment.""Cal una nova versió de Serveis de Google Play. S\'actualitzarà automàticament aviat.""Obre al telèfon""Inicia sessió""Inicia la sessió amb Google""Povolit""Ke spuštění aplikace %1$s je třeba aktivovat služby Google Play.""Aktivace služeb Google Play""Instalovat""Ke spuštění aplikace %1$s jsou potřeba služby Google Play, které v zařízení nemáte.""Instalace služeb Google Play""Dostupnost služeb Google Play""Chyba služeb Google Play""Ke spuštění aplikace %1$s jsou potřeba služby Google Play, které v tomto zařízení nejsou podporovány.""Aktualizovat""Ke spuštění aplikace %1$s je třeba aktualizovat služby Google Play.""Aktualizace služeb Google Play""Ke spuštění aplikace %1$s jsou potřeba služby Google Play, které jsou právě aktualizovány.""Je vyžadována nová verze služeb Google Play. Nová verze se brzy sama nainstaluje.""Otevřít v telefonu""Přihlásit se""Přihlásit se k účtu Google""Aktivér""Du skal aktivere Google Play-tjenester, for at %1$s kan fungere.""Aktivér Google Play-tjenester""Installer""Du skal installere Google Play-tjenester, før %1$s kan køre på din enhed.""Hent Google Play-tjenester""Google Play-tjenesters tilgængelighed""Fejl i Google Play-tjenester""%1$s fungerer ikke uden Google Play-tjenester, som ikke understøttes på din enhed.""Opdater""%1$s kan ikke køre, medmindre du opdaterer Google Play-tjenester.""Opdater Google Play-tjenester""%1$s kan ikke køre uden Google Play-tjenester, som i øjeblikket opdateres.""Du skal bruge en ny version af Google Play-tjenester. Opdateringen gennemføres automatisk om et øjeblik.""Åbn på telefonen""Log ind""Log ind med Google""Aktivieren""%1$s funktioniert erst nach der Aktivierung der Google Play-Dienste.""Google Play-Dienste aktivieren""Installieren""Zur Nutzung von %1$s sind die Google Play-Dienste erforderlich, die auf deinem Gerät nicht installiert sind.""Google Play-Dienste installieren""Verfügbarkeit von Google Play-Diensten""Fehler bei Zugriff auf Google Play-Dienste""Zur Nutzung von %1$s sind Google Play-Dienste erforderlich, die auf deinem Gerät nicht unterstützt werden.""Aktualisieren""%1$s wird nur ausgeführt, wenn du die Google Play-Dienste aktualisierst.""Google Play-Dienste aktualisieren""Zur Nutzung von %1$s sind Google Play-Dienste erforderlich, die gerade aktualisiert werden.""Eine neue Version der Google Play-Dienste wird benötigt. Diese wird in Kürze automatisch aktualisiert.""Auf Smartphone öffnen""Anmelden""Über Google anmelden""Ενεργοποίηση""Η εφαρμογή %1$s δεν θα λειτουργήσει εάν δεν έχετε ενεργοποιήσει τις υπηρεσίες Google Play.""Ενεργοποίηση υπηρεσιών Google Play""Εγκατάσταση""Η εφαρμογή %1$s δεν μπορεί να εκτελεστεί χωρίς τις υπηρεσίες Google Play, οι οποίες λείπουν από τη συσκευή σας.""Λήψη υπηρεσιών Google Play""Διαθεσιμότητα υπηρεσιών Google Play""Σφάλμα Υπηρεσιών Google Play""Η εφαρμογή %1$s δεν θα εκτελεστεί χωρίς τις υπηρεσίες Google Play, οι οποίες δεν υποστηρίζονται από τη συσκευή σας.""Ενημέρωση""Η εφαρμογή %1$s θα εκτελεστεί αφού ενημερώσετε τις Υπηρεσίες Google Play.""Ενημέρωση υπηρεσιών Google Play""Η εφαρμογή %1$s δεν θα εκτελεστεί χωρίς τις υπηρεσίες Google Play, οι οποίες ενημερώνονται αυτήν τη στιγμή.""Απαιτείται νέα έκδοση των υπηρεσιών Google Play. Θα ενημερωθεί σύντομα.""Άνοιγμα σε τηλέφωνο""Σύνδεση""Συνδεθείτε με το Google""Enable""%1$s won\'t work unless you enable Google Play services.""Enable Google Play services""Install""%1$s won\'t run without Google Play services, which are missing from your device.""Get Google Play services""Google Play services availability""Google Play services error""%1$s won\'t run without Google Play services, which are not supported by your device.""Update""%1$s won\'t run unless you update Google Play services.""Update Google Play services""%1$s won\'t run without Google Play services, which are currently updating.""New version of Google Play services needed. It will update itself shortly.""Open on phone""Sign In""Sign in with Google""Habilitar""%1$s no funcionará hasta que no habilites Servicios de Google Play.""Habilita Servicios de Google Play""Instalar""%1$s no se ejecutará si los Servicios de Google Play no están instalados en tu dispositivo.""Descargar Servicios de Google Play""Disponibilidad Servicios de Google Play""Error de Servicios de Google Play""No es posible ejecutar la aplicación %1$s sin los Servicios de Google Play, que no son compatibles con tu dispositivo.""Actualizar""%1$s no funcionará hasta que no actualices Servicios de Google Play.""Actualiza Servicios de Google Play""%1$s no se ejecutará hasta que finalice la actualización en curso de Servicios de Google Play.""Se necesita una nueva versión de Servicios de Google Play. Se actualizará en breve.""Abrir en teléfono""Iniciar sesión""Iniciar sesión con Google""Habilitar""%1$s no funcionará a menos que habilites los servicios de Google Play.""Habilitar servicios de Google Play""Instalar""%1$s no se ejecutará si los Servicios de Google Play no están instalados en tu dispositivo.""Obtener servicios de Google Play""Disp. de los Servicios de Google Play""Error de Google Play Services""%1$s no se ejecutará sin los servicios de Google Play, que no son compatibles con tu dispositivo.""Actualizar""%1$s no se ejecutará a menos que actualices los servicios de Google Play.""Actualizar servicios de Google Play""%1$s no se ejecutará sin los servicios de Google Play. La plataforma se está actualizando en este momento.""Se necesita una nueva versión de los servicios de Google Play. Se actualizarán automáticamente en breve.""Abrir en el teléfono""Acceder""Acceder con Google""Luba""Rakendus %1$s töötab ainult siis, kui lubate Google Play teenused.""Google Play teenuste lubamine""Installi""Rakendus %1$s töötab ainult koos Google Play teenustega, mida teie seadmes pole.""Google Play teenuste hankimine""Google Play teenuste saadavalolek""Viga Google Play teenustes""Rakendus %1$s töötab ainult koos Google Play teenustega, mida teie seadmes ei toetata.""Värskenda""Rakenduse %1$s töötamiseks peate värskendama Google Play teenuseid.""Google Play teenuste värskendamine""Rakendus %1$s töötab ainult koos Google Play teenustega, mida praegu värskendatakse.""Vajalik on Google Play teenuste uus versioon. See värskendab end peagi.""Ava telefonis""Logi sisse""Logi sisse Google\'i kontoga""Gaitu""%1$s aplikazioak ez du funtzionatuko Google Play zerbitzuak gaitzen ez badituzu.""Gaitu Google Play zerbitzuak""Instalatu""%1$s ez da exekutatuko Google Play zerbitzurik gabe, baina ez dituzu gailuan.""Lortu Google Play zerbitzuak""Google Play zerbitzuen erabilgarritasuna""Google Play zerbitzuen errorea""%1$s aplikazioa ezin da erabili Google Play zerbitzurik gabe, eta zure gailua ez da zerbitzuokin bateragarria.""Eguneratu""%1$s ez da exekutatuko Google Play zerbitzuak eguneratzen ez badituzu.""Eguneratu Google Play zerbitzuak""%1$s ez da exekutatuko Google Play zerbitzurik gabe; une honetan eguneratzen ari dira zerbitzuok.""Google Play zerbitzuen bertsio berria behar da. Berehala eguneratuko da automatikoki.""Ireki telefonoan""Hasi saioa""Hasi saioa Google kontuarekin""فعال کردن""تا وقتی سرویسهای Google Play را فعال نکنید، %1$s کار نمیکند.""فعال کردن سرویسهای Google Play""نصب""%1$s بدون خدمات Google Play که در دستگاه شما وجود ندارد اجرا نمیشود.""دریافت سرویسهای Google Play""قابلیت دسترسی خدمات Google Play""خطا در خدمات Google Play""%1$s بدون خدمات Google Play که در دستگاه شما پشتیبانی نمیشود، اجرا نخواهد شد.""بهروزرسانی""تاز مانی که سرویسهای Google Play را بهروزرسانی نکنید، %1$s اجرا نمیشود.""بهروزرسانی سرویسهای Google Play""%1$s بدون سرویسهای Google Play که درحال حاضر درحال بهروزرسانی هستند، کار نمیکند.""نسخه جدید سرویسهای Google Play نیاز است. بهزودی بهطور خودکار بهروزرسانی میشود.""باز کردن در تلفن""ورود به سیستم""ورود به سیستم با Google""Ota käyttöön""%1$s ei toimi, ellet ota Google Play Palveluita käyttöön.""Ota Google Play Palvelut käyttöön""Asenna""%1$s ei toimi ilman Google Play Palveluita, jotka puuttuvat laitteeltasi.""Asenna Google Play Palvelut""Google Play Palveluiden saatavuus""Virhe Google Play -palveluissa""%1$s ei toimi ilman Google Play Palveluita, joita laitteesi ei tue.""Päivitä""%1$s ei toimi, ellet päivitä Google Play Palveluita.""Päivitä Google Play Palvelut""%1$s ei toimi ilman Google Play Palveluita, joita päivitetään tällä hetkellä.""Uusi Google Play Palveluiden versio tarvitaan. Se päivittyy pian.""Avaa puhelimessa""Kirjaudu sisään""Kirjaudu Google-tilille""Activer""%1$s ne fonctionnera pas tant que vous n\'aurez pas activé les services Google Play.""Activer les services Google Play""Installer""%1$s ne fonctionnera pas sans les services Google Play, qui ne sont pas installés sur votre appareil.""Installer les services Google Play""Disponibilité des services Google Play""Erreur liée aux services Google Play""%1$s ne fonctionnera pas sans les services Google Play, qui ne sont pas compatibles avec votre appareil.""Mettre à jour""%1$s ne fonctionnera pas tant que vous n\'aurez pas mis à jour les services Google Play.""Mettre à jour les services Google Play""%1$s ne fonctionnera pas sans les services Google Play, qui sont en cours de mise à jour.""La nouvelle version des services Google Play est nécessaire. Elle sera bientôt installée automatiquement.""Ouvrir sur le téléphone""Se connecter""Se connecter avec Google""Activer""%1$s ne fonctionnera pas tant que vous n\'aurez pas activé les services Google Play.""Activer les services Google Play""Installer""%1$s ne fonctionnera pas sans les services Google Play, qui ne sont pas installés sur votre appareil.""Installer les services Google Play""Disponibilité des services Google Play""Erreur liée aux services Google Play""L\'application %1$s ne fonctionnera pas sans les services Google Play, qui ne sont pas pris en charge par votre appareil.""Mettre à jour""%1$s ne fonctionnera pas tant que vous n\'aurez pas mis à jour les services Google Play.""Mettre à jour les services Google Play""%1$s ne fonctionnera pas sans les services Google Play, qui sont actuellement mis à jour.""La nouvelle version des services Google Play est nécessaire. Elle sera bientôt installée automatiquement.""Ouvrir sur le téléphone""Connexion""Se connecter avec Google""Activar""%1$s non funcionará a menos que actives os servizos de Google Play.""Activar servizos de Google Play""Instalar""%1$s non se executará se o teu dispositivo non ten instalados os servizos de Google Play.""Descargar servizos de Google Play""Dispoñibilidade dos servizos de Play""Erro nos servizos de Google Play""%1$s non se executará sen os servizos de Google Play, que non son compatibles co teu dispositivo.""Actualizar""%1$s non se executará a menos que actualices os servizos de Google Play.""Actualizar os servizos de Google Play""%1$s non se executará sen os servizos de Google Play, que se están actualizando neste momento.""Necesítase a nova versión dos servizos de Google Play. Actualizarase en breve.""Abrir no teléfono""Iniciar sesión""Iniciar sesión con Google""સક્ષમ કરો""તમે Google Play સેવાઓ સક્ષમ કરશો નહીં ત્યાં સુધી %1$s કાર્ય કરશે નહીં.""Google Play સેવાઓ સક્ષમ કરો""ઇન્સ્ટૉલ કરો""%1$s, Google Play સેવાઓ વગર ચાલશે નહીં, જે તમારા ઉપકરણમાંથી ખૂટે છે.""Google Play સેવાઓ મેળવો""Google Play સેવાઓની ઉપલબ્ધતા""Google Play સેવાઓની ભૂલ""%1$s, Google Play સેવાઓ વગર ચાલશે નહીં, જે તમારા ઉપકરણ દ્વારા સમર્થિત નથી.""અપડેટ કરો""તમે Google Play સેવાઓ અપડેટ કરશો નહીં ત્યાં સુધી %1$s શરૂ થશે નહીં.""Google Play સેવાઓ અપડેટ કરો""%1$s, Google Play સેવાઓ વગર શરૂ થશે નહીં, જે વર્તમાનમાં અપડેટ થઈ રહી છે.""Google Play સેવાઓના નવા સંસ્કરણની જરૂર છે. તે ટૂંક સમયમાં પોતાને અપડેટ કરશે.""ફોનમાં ખોલો""સાઇન ઇન કરો""Google માં સાઇન ઇન કરો""चालू करें""जब तक आप Google Play सेवाएं चालू नहीं करते, %1$s काम नहीं करेगा.""Google Play सेवाएं चालू करें""इंस्टॉल करें""%1$s उन Google Play सेवाओं के बिना नहीं चलेगा जो आपके डिवाइस में उपलब्ध नहीं हैं.""Google Play सेवाएं इंस्टॉल करें""Google Play सेवाएं उपलब्ध हैं""Google Play सेवाओं से जुड़ी गड़बड़ी""%1$s उन Google Play सेवाओं के बिना नहीं चलेगा, जो आपके डिवाइस पर काम नहीं करती हैं.""अपडेट करें""%1$s तब तक नहीं चलेगा जब तक आप Google Play सेवाओं को अपडेट नहीं करते.""Google Play सेवाओं को अपडेट करें""%1$s उन Google Play सेवाओं के बिना नहीं चलेगा जो अभी अपडेट हो रही हैं.""Google Play सेवाओं के नए वर्शन की ज़रूरत है. यह जल्द ही अपने आप अपडेट हो जाएगा.""फ़ोन पर खोलें""साइन इन करें""Google के ज़रिए साइन इन करें""Omogući""%1$s neće funkcionirati ako ne omogućite usluge Google Playa.""Omogućivanje usluga Google Playa""Instaliraj""%1$s neće funkcionirati bez usluga Google Playa koje nisu instalirane na vašem uređaju.""Preuzimanje usluga Google Playa""Dostupnost usluga za Google Play""Pogreška Usluga za Google Play""%1$s neće funkcionirati bez usluga Google Playa koje vaš uređaj ne podržava.""Ažuriraj""%1$s neće funkcionirati ako ne ažurirate Google Play usluge.""Ažuriranje usluga Google Playa""%1$s neće se pokrenuti bez usluga Google Playa koje se trenutačno ažuriraju.""Potrebna je nova verzija usluga Google Playa. Uskoro će se ažurirati.""Otvori na telefonu""Prijava""Prijava putem Googlea""Engedélyezés""A(z) %1$s alkalmazás csak akkor működik, ha engedélyezi a Google Play-szolgáltatásokat.""Google Play-szolgáltatások engedélyezése""Telepítés""A(z) %1$s alkalmazás nem fut a Google Play-szolgáltatások nélkül, amelyek hiányoznak az eszközről.""A Google Play-szolgáltatások beszerzése""Google Play-szolgáltatások elérhetősége""Google Play-szolgáltatások – hiba""A(z) %1$s alkalmazás nem fut a Google Play-szolgáltatások nélkül, amelyeket eszköze nem támogat.""Frissítés""A(z) %1$s alkalmazás csak akkor fog működni, ha frissíti a Google Play-szolgáltatásokat.""A Google Play-szolgáltatások frissítése""A(z) %1$s alkalmazás nem fut a Google Play-szolgáltatások nélkül, amelyek frissítése folyamatban van.""A Google Play-szolgáltatások új verziójára van szükség. A szolgáltatás hamarosan frissíti önmagát.""Megnyitás a telefonon""Bejelentkezés""Bejelentkezés Google-fiókkal""Միացնել""%1$s հավելվածը չի աշխատի մինչև չմիացնեք Google Play ծառայությունները:""Միացնել Google Play ծառայությունները""Տեղադրել""%1$s հավելվածը չի աշխատի առանց Google Play ծառայությունների, որոնք չկան ձեր սարքում:""Տեղադրել Google Play ծառայությունները""Google Play ծառայությունների հասանելիություն""Google Play ծառայությունների սխալ կա""%1$s հավելվածը չի աշխատի առանց Google Play ծառայությունների, որոնք ձեր սարքում չեն աջակցվում:""Թարմացնել""%1$s հավելվածը չի աշխատի մինչև չթարմացնեք Google Play ծառայությունները:""Թարմացնել Google Play ծառայությունները""%1$s հավելվածը չի աշխատի առանց Google Play ծառայությունների, որոնք այս պահին թարմացվում են:""Անհրաժեշտ է Google Play ծառայությունների նոր տարբերակը: Այն շուտով կթարմացվի ավտոմատ կերպով:""Բացել հեռախոսով""Մուտք գործել""Մուտք գործել Google-ով""Aktifkan""%1$s tidak akan berfungsi jika layanan Google Play tidak diaktifkan.""Aktifkan layanan Google Play""Instal""%1$s tidak akan berjalan tanpa layanan Google Play, yang tidak ada di perangkat Anda.""Dapatkan layanan Google Play""Ketersediaan layanan Google Play""Kesalahan layanan Google Play""%1$s tidak akan berjalan tanpa layanan Google Play, yang tidak didukung oleh perangkat Anda.""Update""%1$s tidak akan berjalan jika layanan Google Play tidak diperbarui.""Perbarui layanan Google Play""%1$s tidak akan berjalan tanpa layanan Google Play, yang saat ini sedang diperbarui.""Perlu versi baru layanan Google Play. Akan segera memperbarui sendiri.""Buka di ponsel""Login""Login dengan Google""Kveikja""%1$s virkar ekki nema þú gerir þjónustu Google Play virka.""Virkja þjónustu Google Play""Setja upp""%1$s getur ekki keyrt án þjónustu Google Play, sem vantar í tækið þitt.""Sækja þjónustu Google Play""Staða þjónustu Google Play""Villa í þjónustu Google Play""%1$s getur ekki keyrt án þjónustu Google Play, sem er ekki studd af tækinu þínu.""Uppfæra""%1$s getur ekki keyrt nema þú uppfærir þjónustu Google Play.""Uppfæra þjónustu Google Play""%1$s getur ekki keyrt án þjónustu Google Play, sem verið er að uppfæra.""Nýja útgáfu af þjónustu Google Play vantar. Hún uppfærir sig sjálf innan skamms.""Opna í símanum""Skrá inn""Skrá inn með Google""Attiva""%1$s non funzionerà se non attivi Google Play Services.""Attiva Google Play Services""Installa""L\'app %1$s non funzionerà senza Google Play Services, non presente sul tuo dispositivo.""Installa Google Play Services""Disponibilità di Google Play Services""Errore Google Play Services""%1$s non funzionerà senza Google Play Services, non supportati dal tuo dispositivo.""Aggiorna""%1$s non funzionerà se non aggiorni Google Play Services.""Aggiorna Google Play Services""%1$s non funzionerà senza Google Play Services, attualmente in fase di aggiornamento.""È richiesta una nuova versione di Google Play Services. L\'aggiornamento automatico verrà eseguito a breve.""Apri sul telefono""Accedi""Accedi con Google""הפעל""האפליקציה %1$s לא תפעל אם לא תפעיל את שירותי Google Play.""הפעל את שירותי Google Play""התקן""האפליקציה %1$s לא תפעל ללא שירותי Google Play, שאינם מותקנים במכשיר.""קבל את שירותי Google Play""זמינות של שירותי Google Play""שגיאה בשירותי Google Play""%1$s לא תפעל ללא שירותי Google Play, שאינם נתמכים במכשיר שלך.""עדכן""%1$s לא יפעל אם לא תעדכן את שירותי Google Play.""עדכון שירותי Google Play""האפליקציה %1$s לא תפעל ללא שירותי Google Play, שמתעדכנים כרגע.""דרושה גרסה חדשה של שירותי Google Play. הגרסה תתעדכן בעצמה תוך זמן קצר.""פתח בטלפון""כניסה""היכנס באמצעות Google""有効にする""%1$sの実行には、Google Play開発者サービスの有効化が必要です。""Google Play開発者サービスの有効化""インストール""「%1$s」の実行には Google Play 開発者サービスが必要ですが、お使いの端末にはインストールされていません。""Google Play開発者サービスの入手""Google Play 開発者サービスの利用""Google Play開発者サービスのエラー""「%1$s」の実行には Google Play 開発者サービスが必要ですが、お使いの端末ではサポートされていません。""更新""%1$sの実行にはGoogle Play開発者サービスの更新が必要です。""Google Play開発者サービスの更新""%1$sの実行にはGoogle Play開発者サービスが必要ですが、このサービスは現在更新中です。""Google Play開発者サービスの新しいバージョンが必要です。まもなく自動更新されます。""スマートフォンで開く""ログイン""Googleにログイン""ჩართვა""%1$s ვერ იმუშავებს Google Play Services-ის ჩართვამდე.""Google Play Services-ის ჩართვა""ინსტალაცია""%1$s ვერ გაეშვება Google Play Services-ის გარეშე, რომელიც აკლია თქვენს მოწყობილობას.""Google Play Services-ის ჩამოტვირთვა""Google Play services-ის ხელმისაწვდომობა""Google Play Services-ის შეცდომა""%1$s ვერ გაეშვება Google Play Services-ის გარეშე, რომლებიც მხარდაუჭერელია თქვენი მოწყობილობის მიერ.""განახლება""%1$s ვერ გაეშვება, თუ Google Play სერვისებს არ განაახლებთ.""განაახლეთ Google Play Services""%1$s ვერ გაეშვება Google Play Services-ის გარეშე, რომელთა განახლებაც ამჟამად მიმდინარეობს.""საჭიროა Google Play Services-ის ახალი ვერსია. ის მალე განახლდება.""ტელეფონში გახსნა""შესვლა""Google-ით შესვლა""Қосу""Google Play қызметтерін қоспасаңыз, %1$s жұмыс істемейді.""Google Play қызметтерін қосу""Орнату""Google Play қызметтері құрылғыда болмағандықтан, %1$s іске қосылмайды.""Google Play қызметтерін алу""Google Play қызметтерінің қолжетімділігі""Google Play қызметтерінің қатесі""%1$s қолданбасы құрылғыңызда қолдау көрсетілмейтін Google Play қызметінсіз жұмыс істемейді.""Жаңарту""Google Play қызметтерін жаңартпасаңыз, %1$s іске қосылмайды.""Google Play қызметтерін жаңарту""Қазіргі уақытта жаңартылып жатқан Google Play қызметтерінсіз %1$s іске қосылмайды.""Google Play қызметтерінің жаңа нұсқасы қажет. Ол қысқа уақыттан кейін өзі жаңарады.""Телефонда ашу""Кіру""Google арқылы кіру""បើក""%1$s នឹងមិនដំណើរការទេ លុះត្រាតែអ្នកបើកសេវាកម្ម Google Play។""បើកសេវាកម្ម Google Play""ដំឡើង""%1$s នឹងមិនដំណើរការទេ ប្រសិនបើមិនមានសេវាកម្មនានារបស់ Google Play ដែលបានបាត់ពីឧបករណ៍របស់អ្នក។""ទាញយកសេវាកម្ម Google Play""លទ្ធភាពប្រើប្រាស់សេវាកម្ម Google Play""កំហុសសេវាកម្ម Google កម្សាន្ត""%1$s នឹងមិនដំណើរការដោយគ្មានសេវាកម្មរបស់ Google Play ដែលឧបករណ៍របស់អ្នកមិនគាំទ្រនោះទេ។""អាប់ដេត""%1$s នឹងមិនដំណើរការទេ លុះត្រាតែអ្នកធ្វើបច្ចុប្បន្នភាពសេវាកម្ម Google Play។""អាប់ដេតសេវាកម្ម Google Play""%1$s នឹងមិនដំណើរការទេ បើមិនមានសេវាកម្ម Google Play ដោយសារតែវាកំពុងអាប់ដេត។""តម្រូវឲ្យមានកំណែថ្មីនៃសេវាកម្ម Google Play។ វានឹងអាប់ដេតដោយខ្លួនវានៅពេលបន្តិចទៀតនេះ។""បើកតាមទូរស័ព្ទ""ចូល""ចូលដោយប្រើ Google""ಸಕ್ರಿಯಗೊಳಿಸು""Google Play ಸೇವೆಗಳನ್ನು ನೀವು ಸಕ್ರಿಯಗೊಳಿಸದ ಹೊರತು %1$s ಕಾರ್ಯನಿರ್ವಹಿಸುವುದಿಲ್ಲ.""Google Play ಸೇವೆಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ""ಇನ್ಸ್ಟಾಲ್ ಮಾಡಿ""ನಿಮ್ಮ ಸಾಧನದಿಂದ ಕಾಣೆಯಾಗಿರುವ %1$s, Google Play ಸೇವೆಗಳಿಲ್ಲದೆ ರನ್ ಆಗುವುದಿಲ್ಲ.""Google Play ಸೇವೆಗಳನ್ನು ಪಡೆಯಿರಿ""Google Play ಸೇವೆಗಳ ಲಭ್ಯತೆ""Google Play ಸೇವೆಗಳ ದೋಷ""ನಿಮ್ಮ ಸಾಧನದ ಮೂಲಕ ಬೆಂಬಲಿಸದಿರುವ Google Play ಸೇವೆಗಳಿಲ್ಲದೆ %1$s ರನ್ ಆಗುವುದಿಲ್ಲ.""ಅಪ್ಡೇಟ್ ಮಾಡು""ನೀವು Google Play ಸೇವೆಗಳನ್ನು ನವೀಕರಿಸದ ಹೊರತು %1$s ರನ್ ಆಗುವುದಿಲ್ಲ.""Google ಪ್ಲೇ ಸೇವೆಗಳನ್ನು ಅಪ್ಡೇಟ್ ಮಾಡಿ""Google Play ಸೇವೆಗಳಿಲ್ಲದೆ ಪ್ರಸ್ತುತ ಅಪ್ಡೇಟ್ ಆಗುತ್ತಿರುವ %1$s ರನ್ ಆಗುವುದಿಲ್ಲ.""Google Play ಸೇವೆಗಳ ಹೊಸ ಆವೃತ್ತಿ ಅಗತ್ಯವಿದೆ. ಸದ್ಯದಲ್ಲೇ ಅದು ತಾನಾಗಿಯೇ ಅಪ್ಡೇಟ್ ಆಗುತ್ತದೆ.""ಫೋನ್ನಲ್ಲಿ ತೆರೆಯಿರಿ""ಸೈನ್ ಇನ್""Google ಮೂಲಕ ಸೈನ್ ಇನ್ ಮಾಡಿ""사용 설정""Google Play 서비스를 사용하도록 설정해야 %1$s이(가) 작동합니다.""Google Play 서비스 사용""설치""기기에 Google Play 서비스가 설치되어 있어야 %1$s이(가) 실행됩니다.""Google Play 서비스 설치""Google Play 서비스 사용 가능 여부""Google Play 서비스 오류""%1$s은(는) Google Play 서비스 없이는 실행되지 않으나, 기기에서 Google Play 서비스를 지원하지 않습니다.""업데이트""Google Play 서비스를 업데이트해야 %1$s이(가) 실행됩니다.""Google Play 서비스 업데이트""현재 업데이트 중인 Google Play 서비스가 있어야 %1$s이(가) 실행됩니다.""새 버전의 Google Play 서비스가 필요합니다. 곧 자동으로 업데이트됩니다.""스마트폰에서 열기""로그인""Google 계정으로 로그인""Иштетүү""Google Play кызматтарын иштетмейиңизче %1$s иштебейт.""Google Play кызматтарын иштетүү""Орнотуу""Google Play кызматтарысыз %1$s иштебейт. Алар түзмөгүңүздө жок болуп жатат.""Google Play кызматтарын алуу""Google Play кызматтарынын иштеши""Google Play кызматтарынын катасы""%1$s колдонмосу сиздин түзмөгүңүздө колдоого алынбаган Google Play кызматтары болбосо иштебейт.""Жаңыртуу""Google Play кызматтары жаңыртылмайынча %1$s иштебейт.""Google Play кызматтарын жаңыртуу""Google Play кызматтарысыз %1$s иштебейт, алар учурда жаңыртылууда.""Google Play кызматтарынын жаңы версиясы талап кылынат. Бир аздан кийин ал өзү эле жаңыртылат.""Телефондо ачык""Кирүү""Google менен кирүү""ເປີດນຳໃຊ້""%1$s ຈະບໍ່ສາມາດໃຊ້ງານໄດ້ຈົນກວ່າທ່ານຈະເປີດໃຊ້ງານການບໍລິການ Google Play.""ເປີດໃຊ້ການບໍລິການ Google Play""ຕິດຕັ້ງ""%1$s ຈະບໍ່ສາມາດເປີດໃຊ້ໄດ້ຫາກບໍ່ມີການບໍລິການ Google Play ເຊິ່ງແທັບເລັດຂອງທ່ານບໍ່ມີ.""ຕິດຕັ້ງບໍລິການ Google Play""ສະຖານະບໍລິການ Google Play""Google Play Services ເກີດຄວາມຜິດພາດ""%1$s ຈະບໍ່ສາມາດໃຊ້ໄດ້ຫາກບໍ່ມີບໍລິການ Google Play ເຊິ່ງອຸປະກອນຂອງທ່ານບໍ່ຮອງຮັບ.""ອັບເດດ""%1$s ຈະບໍ່ສາມາດເຮັດວຽກໄດ້ຈົນກວ່າທ່ານຈະອັບເດດການບໍລິການ Google Play""ອັບເດດການບໍລິການ Google Play""%1$s ຈະບໍ່ສາມາດໃຊ້ງານໄດ້ໂດຍທີ່ບໍ່ມີການບໍລິການ Google Play, ເຊິ່ງກຳລັງອັບເດດຢູ່ໃນປະຈຸບັນ.""ຈຳເປັນຕ້ອງມີການບໍລິການ Google Play ເວີຊັນໃໝ່. ມັນຈະອັບເດດຕົວເອງໄວໆນີ້.""ເປີດໃນໂທລະສັບ""ລົງຊື່ເຂົ້າໃຊ້""ລົງຊື່ເຂົ້າໃຊ້ດ້ວຍ Google""Įgalinti""„%1$s“ neveiks, jei neįgalinsite „Google Play“ paslaugų.""Įgalinkite „Google Play“ paslaugas""Įdiegti""Programa „%1$s“ nebus paleidžiama be „Google Play“ paslaugų, kurių nėra įrenginyje.""Gaukite „Google Play“ paslaugas""„Google Play“ paslaugų pasiekiamumas""„Google Play“ paslaugų klaida""Programa „%1$s“ nebus paleidžiama be „Google Play“ paslaugų, kurių jūsų įrenginys nepalaiko.""Atnaujinti""„%1$s“ nebus paleidžiama, jei neatnaujinsite „Google Play“ paslaugų.""Atnaujinkite „Google Play“ paslaugas""„%1$s“ nebus paleidžiama be „Google Play“ paslaugų, kurios šiuo metu atnaujinamos.""Reikia naujos versijos „Google Play“ paslaugų. Jos netrukus bus atnaujintos.""Atidaryti telefone""Prisijungti""Prisijungti naudojant „Google“""Iespējot""Lai lietotne %1$s darbotos, ir jāiespējo Google Play pakalpojumi.""Google Play pakalpojumu iespējošana""Instalēt""Lai lietotne %1$s darbotos, ierīcē ir jāinstalē Google Play pakalpojumi.""Google Play pakalpojumu iegūšana""Google Play pakalpojumu pieejamība""Google Play pakalpojumu kļūda""Lai lietotne %1$s darbotos, ir nepieciešami Google Play pakalpojumi, taču jūsu ierīce tos neatbalsta.""Atjaunināt""Lai lietotne %1$s darbotos, jums ir jāatjaunina Google Play pakalpojumi.""Google Play pakalpojumu atjaunināšana""Lai lietotne %1$s darbotos, ir jāinstalē Google Play pakalpojumi. Pašlaik notiek to atjaunināšana.""Ir nepieciešama jauna Google Play pakalpojumu versija. Drīzumā tā tiks instalēta.""Atvērt tālrunī""Pierakstīties""Pierakstīties ar Google kontu""Овозможи""%1$s нема да се извршува ако не овозможите услуги на Google Play.""Овозможи ги услугите на Google Play""Инсталирај""%1$s нема да се извршува без услугите на Google Play што ги нема на уредот.""Преземи ги услугите на Google Play""Достапност на услугите на Google Play""Грешка на услугите на Google Play""%1$s нема да се извршува без услугите на Google Play, што не се подржани од уредов.""Ажурирај""%1$s нема да се извршува ако не ги ажурирате услугите на Google Play.""Ажурирај ги услугите на Google Play""%1$s нема да се извршува без услугите на Google Play што се ажурираат во моментов.""Потребна е нова верзија на услугите на Google Play. Таа наскоро самата ќе се ажурира.""Отвори на телефонот""Најави се""Најави се со Google""പ്രവർത്തനക്ഷമമാക്കുക""നിങ്ങൾ Google Play സേവനങ്ങൾ പ്രവർത്തനക്ഷമമാക്കുന്നില്ലെങ്കിൽ %1$s പ്രവർത്തിക്കില്ല.""Google Play സേവനങ്ങൾ പ്രവർത്തനക്ഷമമാക്കുക""ഇന്സ്റ്റാള് ചെയ്യുക""Google Play സേവനങ്ങളില്ലാതെ %1$s പ്രവർത്തിക്കില്ല, ഈ സേവനങ്ങളാകട്ടെ നിങ്ങളുടെ ഉപകരണത്തിൽ ഇല്ല.""Google Play സേവനങ്ങൾ നേടുക""Google Play സേവന ലഭ്യത""Google Play സേവനങ്ങളിലെ പിശക്""Google Play സേവനങ്ങളില്ലാതെ %1$s പ്രവർത്തിക്കില്ല, സേവനങ്ങളെയാകട്ടെ നിങ്ങളുടെ ഉപകരണം പിന്തുണയ്ക്കുന്നുമില്ല.""അപ്ഡേറ്റുചെയ്യുക""നിങ്ങൾ Google Play സേവനങ്ങൾ അപ്ഡേറ്റുചെയ്തില്ലെങ്കിൽ %1$s പ്രവർത്തിക്കില്ല.""Google Play സേവനങ്ങൾ അപ്ഡേറ്റുചെയ്യുക""നിലവിൽ അപ്ഡേറ്റുചെയ്യുന്ന Google Play സേവനങ്ങൾ ഇല്ലാതെ %1$s പ്രവർത്തിക്കില്ല.""Google Play സേവനങ്ങളുടെ പുതിയ പതിപ്പ് ആവശ്യമാണ്. താമസിയാതെ ഇത് സ്വയം അപ്ഡേറ്റുചെയ്യും.""ഫോണിൽ തുറക്കുക""സൈൻ ഇൻ ചെയ്യുക""Google ഉപയോഗിച്ച് സൈൻ ഇൻ ചെയ്യുക""Идэвхжүүлэх""%1$s нь Google Play үйлчилгээг идэвхжүүлэх хүртэл ажиллахгүй.""Google Play үйлчилгээг идэвхжүүлэх""Суулгах""Таны төхөөрөмжид Google Play үйлчилгээ байхгүй тул %1$s ажиллахгүй.""Google Play үйлчилгээг авах""Google Play-н үйлчилгээнүүдийн боломжит байдал""Google Наадаан үйлчилгээний алдаа""Таны төхөөрөмж Google Play үйлчилгээг дэмждэггүй учир %1$s ажиллахгүй.""Шинэчлэх""%1$s нь таныг Google Play үйлчилгээнүүдийг шинэчлэхээс нааш ажиллахгүй.""Google Play үйлчилгээг шинэчлэх""%1$s нь одоогоор шинэчилж буй Google Play үйлчилгээгүйгээр ажиллахгүй.""Google Play үйлчилгээний шинэ хувилбар хэрэгтэй. Энэ нь удахгүй өөрөө өөрийгөө шинэчлэх болно.""Утсаар нээх""Нэвтрэх""Google-р нэвтрэх:""सुरू करा""तुम्ही Google Play सेवा सक्षम केल्याशिवाय %1$s हा अॅप कार्य करणार नाही.""Google Play सेवा सुरू करा""स्थापित करा""Google Play सेवा आपल्या डिव्हाइसवर उपलब्ध नाही, त्याशिवाय %1$s चालणार नाही.""Google Play सेवा मिळवा""Google Play सेवा उपलब्धता""Google Play सेवा एरर""तुमचे डिव्हाइस सपोर्ट करत नसलेल्या, Google Play सेवांशिवाय %1$s चालणार नाही.""अपडेट करा""तुम्ही Google Play सेवा अपडेट करेपर्यंत %1$s चालणार नाही.""Google Play सेवा अपडेट करा""सध्या अपडेट होत असलेल्या, Google Play सेवांशिवाय %1$s चालणार नाही.""Google Play सेवांच्या नवीन आवृत्तीची आवश्यकता आहे. हे स्वत:ला लवकरच अपडेट करेल.""फोनवर उघडा""साइन इन करा""Google सह साइन इन करा""Dayakan""%1$s tidak akan berfungsi melainkan anda mendayakan perkhidmatan Google Play.""Dayakan perkhidmatan Google Play""Pasang""%1$s tidak akan berfungsi tanpa perkhidmatan Google Play dan perkhidmatan ini tiada pada peranti anda.""Dapatkan perkhidmatan Google Play""Ketersediaan perkhidmatan Google Play""Ralat perkhidmatan Google Play""%1$s tidak akan berfungsi tanpa perkhidmatan Google Play dan perkhidmatan ini tidak disokong oleh peranti anda.""Kemas kini""%1$s tidak akan berfungsi kecuali anda mengemas kini perkhidmatan Google Play.""Kemaskinikan perkhidmatan Google Play""%1$s tidak akan berfungsi tanpa perkhidmatan Google Play dan perkhidmatan ini sedang dikemaskinikan.""Versi baharu perkhidmatan Google Play diperlukan. Kemas kini automatik akan dijalankan sebentar lagi.""Buka pada telefon""Log masuk""Log masuk dengan Google""ဖွင့်ရန်""Google Play ဝန်ဆောင်မှုများကို မဖွင့်သ၍ %1$s သည်အလုပ်လုပ်မည်မဟုတ်ပါ။""Google Play ဝန်ဆောင်မှုများ ဖွင့်ရန်""ထည့်သွင်းပါ""သင့်တက်ဘလက်တွင် Google Play ဝန်ဆောင်မှုများမရှိသောကြောင့် %1$s ကိုဖွင့်၍မရပါ။""Google Play ဝန်ဆောင်မှုများရယူရန်""Google Play ဝန်ဆောင်မှုများ ရရှိနိုင်သည်""Google Play ဝန်ဆောင်မှုများ အမှား""Google Play ဝန်ဆောင်မှုများကို သင့်စက်ပစ္စည်းတွင် ပံ့ပိုးမထားသည့်အတွက် ၎င်းမရှိဘဲ %1$s ကို ဖွင့်၍မရပါ။""အပ်ဒိတ်""Google Play ဝန်ဆောင်မှုများအား အပ်ဒိတ်မလုပ်ပါက %1$s အလုပ်လုပ်မည် မဟုတ်ပါ။""Google Play ဝန်ဆောင်မှုများကို အပ်ဒိတ်လုပ်ရန်""Google Play ဝန်ဆောင်မှုများကို လက်ရှိအပ်ဒိတ်လုပ်နေသောကြောင့် %1$s ကိုဖွင့်၍ရမည်မဟုတ်ပါ။""Google Play ဝန်ဆောင်မှုဗားရှင်းအသစ်များ လိုအပ်နေသည်။ အချိန်အနည်းငယ်အကြာတွင် ၎င်းကိုယ်တိုင်အပ်ဒိတ်လုပ်ပါ လိမ့်မည်။""ဖုန်းပေါ်မှာ ဖွင့်ပါ""လက်မှတ်ထိုး ဝင်ရန်""Google ဖြင့် လက်မှတ်ထိုးဝင်ရေ""Slå på""%1$s fungerer ikke med mindre du slår på Google Play-tjenester.""Slå på Google Play-tjenester""Installer""%1$s kan ikke kjøre uten Google Play-tjenester, som ikke er installert på enheten din.""Installer Google Play-tjenester""Google Play Tjenester-tilgjengelighet""Google Play Tjenester-feil""%1$s kan ikke kjøre uten Google Play-tjenester, som ikke støttes av enheten din.""Oppdater""%1$s kjører ikke med mindre du oppdaterer Google Play Tjenester.""Oppdater Google Play-tjenester""%1$s kjører ikke uten Google Play-tjenester, som oppdateres akkurat nå.""Du må installere en ny versjon av Google Play-tjenester. Appen oppdateres automatisk om en kort stund.""Åpne på telefonen""Logg på""Logg på med Google""सक्रिय गर्नुहोस्""%1$s ले तपाईँले Google Play सेवाहरू सक्षम नगरेसम्म काम गर्दैन।""Google Play सेवाहरू सक्षम पार्नुहोस्""स्थापना गर्नुहोस्""%1$s Google Play services बिना सञ्चालन हुने छैन र तपाईँको यन्त्रमा Google Play services उपलब्ध छैनन्।""Google Play सेवाहरू प्राप्त गर्नुहोस्""Google Play सेवाको उपलब्धता""Google Play सेवाहरूका त्रुटि""%1$s Google Play services बिना सञ्चालन हुने छैन र तपाईँको यन्त्रले Google Play services लाई समर्थन गर्दैन।""अद्यावधिक गर्नुहोस्""%1$s तपाईंले Google प्ले सेवाहरू अद्यावधिक नगरेसम्म सञ्चालन हुँदैन।""Google Play सेवाहरू अद्यावधिक गर्नुहोस्""Google Play सेवाहरू %1$s बिना सञ्चालन हुँदैन, जुन हाल अद्यावधिक भइरहेका छन्।""Google Play सेवाहरूको नयाँ संस्करण आवश्यक छ। यो आफै छिट्टै नै अद्यावधिक हुनेछ।""फोनमा खोल्नुहोस्""साइन इन गर्नुहोस्""Google मार्फत साइन इन गर्नुहोस्""Inschakelen""%1$s werkt niet, tenzij je Google Play-services inschakelt.""Google Play-services inschakelen""Installeren""%1$s kan niet worden uitgevoerd zonder Google Play-services, die je nog niet op je apparaat hebt.""Google Play-services ophalen""Beschikbaarheid van Google Play-services""Fout met Google Play-services""%1$s kan niet worden uitgevoerd zonder Google Play-services, die niet worden ondersteund op je apparaat.""Updaten""%1$s kan niet worden uitgevoerd, tenzij je Google Play-services updatet.""Google Play-services updaten""%1$s kan niet worden uitgevoerd zonder Google Play-services, die momenteel worden geüpdatet.""Er is een nieuwe versie van Google Play-services vereist. De update wordt binnenkort automatisch uitgevoerd.""Openen op telefoon""Inloggen""Inloggen met Google""ସକ୍ଷମ କରନ୍ତୁ""ଆପଣ Google Play ସେବା ସକ୍ଷମ ନ କରିବା ପର୍ଯ୍ୟନ୍ତ %1$s କାମ କରିବ ନାହିଁ।""Google Play ସେବାଗୁଡ଼ିକ ସକ୍ଷମ କରନ୍ତୁ""ଇନ୍ଷ୍ଟଲ୍ କରନ୍ତୁ""%1$s ଏହି Google Play ସେବାଗୁଡ଼ିକ ବିନା ଚାଲେ ନାହିଁ, ଏବଂ ସେଗୁଡ଼ିକ ଆପଣଙ୍କ ଡିଭାଇସ୍ରେ ନାହିଁ।""Google Play ସେବାଗୁଡ଼ିକ ପ୍ରାପ୍ତ କରନ୍ତୁ""Google Play ସେବାଗୁଡ଼ିକର ଉପଲବ୍ଧତା""Google Play ସେବା ସମ୍ପର୍କିତ ସମସ୍ୟା""%1$s ଏହି Google Play ସେବାଗୁଡ଼ିକ ବିନା ଚାଲେ ନାହିଁ, ଏବଂ ସେଗୁଡ଼ିକ ଆପଣଙ୍କ ଡିଭାଇସ୍ରେ କାମ କରେ ନାହିଁ।""ଅପଡେଟ୍ କରନ୍ତୁ""ଆପଣ Google Play ସେବା ଅପଡେଟ୍ ନ କରିବା ପର୍ଯ୍ୟନ୍ତ %1$s ଚାଲିବ ନାହିଁ।""Google Play ସେବାଗୁଡ଼ିକ ଅପଡେଟ୍ କରନ୍ତୁ""Google Play ସେବାଗୁଡ଼ିକ ବିନା %1$s ଚାଲିବ ନାହିଁ, ଯେଉଁଗୁଡ଼ିକ ବର୍ତ୍ତମାନ ଅପଡେଟ୍ ହେଉଛି।""Google Play ସେବାଗୁଡ଼ିକର ନୂତନ ଭର୍ସନ୍ ଆବଶ୍ୟକ। ଏହା ନିଜକୁ କିଛି ସମୟ ମଧ୍ୟରେ ଅପଡେଟ୍ କରିବ।""ଫୋନ୍ରେ ଖୋଲନ୍ତୁ""ସାଇନ୍-ଇନ୍ କରନ୍ତୁ""Google ସହ ସାଇନ୍-ଇନ୍ କରନ୍ତୁ""ਚਾਲੂ ਕਰੋ""%1$s ਕੰਮ ਨਹੀਂ ਕਰੇਗਾ ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ Google Play ਸੇਵਾਵਾਂ ਨੂੰ ਚਾਲੂ ਨਹੀਂ ਕਰਦੇ ਹੋ।""Google Play ਸੇਵਾਵਾਂ ਨੂੰ ਚਾਲੂ ਕਰੋ""ਸਥਾਪਤ ਕਰੋ""%1$s Google Play ਸੇਵਾਵਾਂ ਤੋਂ ਬਿਨਾਂ ਨਹੀਂ ਚੱਲੇਗੀ, ਜੋ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਤੋਂ ਗੁੰਮ ਹਨ।""Google Play ਸੇਵਾਵਾਂ ਪ੍ਰਾਪਤ ਕਰੋ""Google Play ਸੇਵਾਵਾਂ ਦੀ ਉਪਲਬਧਤਾ""Google Play ਸੇਵਾਵਾਂ ਅਸ਼ੁੱਧੀ""%1$s Google Play ਸੇਵਾਵਾਂ ਤੋਂ ਬਿਨਾਂ ਨਹੀਂ ਚੱਲ ਸਕੇਗੀ, ਜੋ ਤੁਹਾਡੇ ਡੀਵਾਈਸ \'ਤੇ ਸਮਰਥਿਤ ਨਹੀਂ ਹਨ।""ਅੱਪਡੇਟ ਕਰੋ""%1$s ਨਹੀਂ ਚੱਲੇਗਾ ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ Google Play ਸੇਵਾਵਾਂ ਨੂੰ ਅੱਪਡੇਟ ਨਹੀਂ ਕਰਦੇ ਹੋ।""Google Play ਸੇਵਾਵਾਂ ਨੂੰ ਅੱਪਡੇਟ ਕਰੋ""%1$s Google Play ਸੇਵਾਵਾਂ ਤੋਂ ਬਿਨਾਂ ਨਹੀਂ ਚੱਲੇਗਾ, ਜੋ ਵਰਤਮਾਨ ਵਿੱਚ ਅੱਪਡੇਟ ਹੋ ਰਹੀਆਂ ਹਨ।""Google Play ਸੇਵਾਵਾਂ ਦੇ ਨਵਾਂ ਸੰਸਕਰਨ ਦੀ ਲੋੜ ਹੈ। ਇਹ ਛੇਤੀ ਹੀ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਅੱਪਡੇਟ ਕਰੇਗਾ।""ਫ਼ੋਨ \'ਤੇ ਖੋਲ੍ਹੋ""ਸਾਈਨ-ਇਨ ਕਰੋ""Google ਨਾਲ ਸਾਈਨ-ਇਨ ਕਰੋ""Włącz""Aplikacja %1$s nie będzie działać, jeśli nie włączysz Usług Google Play.""Włącz Usługi Google Play""Zainstaluj""%1$s nie będzie działać, jeśli nie zainstalujesz na urządzeniu Usług Google Play.""Pobierz Usługi Google Play""Dostępność Usług Google Play""Błąd Usług Google Play""%1$s nie będzie działać bez Usług Google Play, które nie są obecnie obsługiwane przez urządzenie.""Aktualizuj""Aplikacja %1$s nie będzie działać, jeśli nie zaktualizujesz Usług Google Play.""Zaktualizuj Usługi Google Play""Aplikacja %1$s nie będzie działać bez Usług Google Play, które są obecnie aktualizowane.""Wymagana jest nowa wersja Usług Google Play. Wkrótce nastąpi automatyczna aktualizacja.""Otwórz na telefonie""Zaloguj się""Zaloguj się przez Google""Ativar""%1$s só funciona com o Google Play Services ativado.""Ativar o Google Play Services""Instalar""O app %1$s não funciona sem o Google Play Services, o qual não está instalado no seu dispositivo.""Instalar o Google Play Services""Disponibilidade do Google Play Services""Erro do Google Play Services""O app %1$s não funciona sem o Google Play Services, o qual não é compatível com seu dispositivo.""Atualizar""%1$s só funciona com uma versão atualizada do Google Play Services.""Atualizar o Google Play Services""%1$s não funciona sem o Google Play Services, o qual está sendo atualizado no momento.""É necessária uma nova versão do Google Play Services. Ele será atualizado em breve.""Abrir no smartphone""Fazer login""Fazer login com o Google""Ativar""O %1$s não funciona enquanto não ativar os serviços do Google Play.""Ativar serviços do Google Play""Instalar""O %1$s não é executado sem os Serviços do Google Play, os quais estão em falta no seu dispositivo.""Obter serviços do Google Play""Disponibilidade Serviços do Google Play""Erro dos Serviços do Google Play""Não é possível executar o %1$s sem os Serviços do Google Play, os quais não são compatíveis com o seu dispositivo.""Atualizar""O %1$s não é executado enquanto não atualizar os serviços do Google Play.""Atualizar serviços do Google Play""O %1$s não é executado sem os serviços do Google Play, os quais estão a ser atualizados.""É necessária uma nova versão dos serviços do Google Play. Esta será atualizada automaticamente em breve.""Abrir no telemóvel""Iniciar sessão""Iniciar sessão com o Google""Activați""%1$s nu va funcționa decât dacă activați serviciile Google Play.""Activați serviciile Google Play""Instalați""%1$s nu va rula fără serviciile Google Play, care lipsesc de pe dispozitivul dvs.""Descărcați serviciile Google Play""Disponibilitatea serviciilor Google Play""Eroare a serviciilor Google Play""%1$s nu va rula fără serviciile Google Play, care nu sunt acceptate de dispozitivul dvs.""Actualizați""%1$s nu va rula decât dacă actualizați serviciile Google Play.""Actualizați serviciile Google Play""%1$s nu va rula fără serviciile Google Play, care momentan se actualizează.""Este necesară o nouă versiune a serviciilor Google Play. Se vor actualiza automat în curând.""Deschideți pe telefon""Conectați-vă""Conectați-vă cu Google""Включить""Для работы приложения \"%1$s\" требуется включить сервисы Google Play.""Включите сервисы Google Play""Установить""Для работы приложения \"%1$s\" требуется установить сервисы Google Play.""Установите сервисы Google Play""Доступность сервисов Google Play""Ошибка сервисов Google Play""Для работы с приложением \"%1$s\" требуются сервисы Google Play. Они не поддерживаются на вашем устройстве.""Обновить""Чтобы запустить приложение \"%1$s\", обновите сервисы Google Play.""Обновите сервисы Google Play""Сервисы Google Play, необходимые для работы приложения \"%1$s\", в настоящий момент обновляются.""Версия сервисов Google Play устарела. Они автоматически обновятся в ближайшее время.""Открыть на телефоне""Войти""Войти через аккаунт Google""සබල කරන්න""ඔබ Google Play සේවා සබල කරන්නේ නම් මිස %1$s වැඩ නොකරනු ඇත.""Google Play සේවා සබල කරන්න""ස්ථාපනය කරන්න""ඔබගේ ටැබ්ලට් පරිගණකයේ නැති Google Play සේවා නොමැතිව %1$s ධාවනය නොවනු ඇත.""Google Play සේවා ලබා ගන්න""Google Play සේවාවල ලබා ගත හැකි බව""Google Play සේවා දෝෂය""ඔබගේ උපාංගය මගින් සහාය නොදක්වන, Google Play සේවා නොමැතිව %1$s ධාවනය නොවනු ඇත.""යාවත්කාලීන කරන්න""Google Play සේවා යාවත්කාලීන කරන්නේ නොමැතිව %1$s ධාවනය නොවේ.""Google Play සේවා යාවත්කාලීන කරන්න""දැනට යාවත්කාලීන කරමින් ඇති, Google Play සේවා නොමැතිව %1$s ධාවනය නොවනු ඇත.""Google Play සේවාවල නව අනුවාදයක් අවශ්යයි. එය මද වේලාවකින් එය විසින්ම යාවත්කාලීන වනු ඇත.""දුරකථනය තුළ විවෘත කරන්න""පුරන්න""Google සමගින් පුරන්න""Povoliť""Aplikácia %1$s bude fungovať až po povolení služieb Google Play.""Povoliť služby Google Play""Inštalovať""Na spustenie aplikácie %1$s sa vyžadujú služby Google Play, ktoré na zariadení nemáte.""Inštalovať služby Google Play""Dostupnosť služieb Google Play""Chyba služieb Google Play""Aplikáciu %1$s nebude možné spustiť bez služieb Google Play, ktoré vaše zariadenie nepodporuje.""Aktualizovať""Aplikáciu %1$s bude možné spustiť až po aktualizácii služieb Google Play.""Aktualizácia služieb Google Play""Na spustenie aplikácie %1$s sa vyžadujú služby Google Play, ktoré sa momentálne aktualizujú.""Vyžaduje sa nová verzia služieb Google Play. Aktualizujú sa automaticky v najbližšom čase.""Otvoriť v telefóne""Prihlásiť sa""Prihlásiť sa do účtu Google""Omogoči""Aplikacija %1$s ne bo delovala, če ne omogočite storitev Google Play.""Omogočanje storitev Google Play""Namesti""Aplikacija %1$s ne deluje brez storitev Google Play, vendar teh ni v napravi.""Namestitev storitev Google Play""Dostopnost storitev Google Play""Napaka storitev Google Play""Aplikacija %1$s ne deluje brez storitev Google Play, ki jih vaša naprava ne podpira.""Posodobi""Aplikacija %1$s ne bo delovala, če ne posodobite storitev Google Play.""Posodobitev storitev Google Play""Aplikacija %1$s ne deluje brez storitev Google Play, ki se trenutno posodabljajo.""Potrebujete novo različico storitev Google Play. V kratkem se bodo posodobile.""Odpiranje v telefonu""Prijava""Prijava z Google Računom""Aktivizo""%1$s nuk do të funksionojë nëse nuk aktivizon shërbimet e \"Luaj me Google\".""Aktivizo shërbimet e \"Luaj me Google\"""Instalo""%1$s nuk do të funksionojë pa shërbimet e Google Play, të cilat mungojnë në pajisjen tënde.""Merr shërbimet e \"Luaj me Google\"""Disponueshmëria e shërbimeve të Google Play""Gabim në shërbimet e \"Luaj me Google\"""%1$s nuk do të funksionojë pa shërbimet e Google Play, të cilat nuk mbështeten nga pajisja jote.""Përditëso""%1$s nuk do të funksionojë nëse nuk përditëson shërbimet e \"Luaj me Google\".""Përditëso shërbimet e \"Luaj me Google\"""%1$s nuk do të funksionojë pa shërbimet e \"Luaj me Google\", të cilat po përditësohen aktualisht.""Nevojitet një version i ri i shërbimeve të \"Luaj me Google\". Ai do të përditësohet automatikisht së shpejti.""Hape në telefon""Identifikohu""Identifikohu me Google""Омогући""%1$s неће функционисати ако не омогућите Google Play услуге.""Омогућите Google Play услуге""Инсталирај""%1$s не може да се покрене без Google Play услуга, које нису инсталиране на уређају.""Преузмите Google Play услуге""Доступност Google Play услуга""Грешка Google Play услуга""%1$s не може да се покрене без Google Play услуга, које уређај не подржава.""Ажурирај""%1$s не може да се покрене ако не ажурирате Google Play услуге.""Ажурирајте Google Play услуге""%1$s не може да се покрене без Google Play услуга, које се тренутно ажурирају.""Потребна је нова верзија Google Play услуга. Ускоро ће се ажурирати.""Отвори на телефону""Пријави ме""Пријави ме на Google""Aktivera""%1$s fungerar inte om du inte aktiverar Google Play-tjänster.""Aktivera Google Play-tjänster""Installera""%1$s kan inte köras utan Google Play-tjänsterna, som saknas på enheten.""Hämta Google Play-tjänster""Tillgänglighet för Google Plays tjänster""Fel på Google Play-tjänster""%1$s fungerar inte utan Google Play-tjänsterna, som inte stöds på enheten.""Uppdatera""%1$s kan inte köras om du inte uppdaterar Google Play-tjänsterna.""Uppdatera Google Play-tjänster""%1$s kan inte köras utan Google Play-tjänster, och dessa uppdateras för närvarande.""En ny version av Google Play-tjänster krävs. Den uppdateras automatiskt inom kort.""Öppna på mobilen""Logga in""Logga in med Google""Washa""%1$s haitafanya kazi isipokuwa uwashe huduma za Google Play.""Washa huduma za Google Play""Sakinisha""%1$s haitafanya kazi bila huduma za Google Play. Huduma hizi hazipatikani kwenye kifaa chako.""Pata huduma za Google Play""Upatikanaji wa huduma za Google Play""Hitilafu kwenye huduma za Google Play""%1$s haitafanya kazi bila huduma za Google Play. Huduma hizi hazitumiki kwenye kifaa chako.""Sasisha""%1$s haitafanya kazi hadi usasishe huduma za Google Play.""Sasisha huduma za Google Play""%1$s haitafanya kazi bila huduma za Google Play. Huduma hizi zinasasishwa sasa.""Toleo jipya la huduma za Google Play linahitajika. Litajisasisha baada ya muda mfupi.""Fungua kwenye simu""Ingia katika akaunti""Ingia katika akaunti ukitumia Google""இயக்கு""Google Play சேவைகளை இயக்கினால் மட்டுமே, %1$s செயல்படும்.""Google Play சேவைகளை இயக்கவும்""நிறுவு""Google Play சேவைகள் இருந்தால் மட்டுமே, %1$s இயங்கும். அவை உங்கள் சாதனத்தில் இல்லை.""Google Play சேவைகளைப் பெறவும்""கிடைக்கும் Google Play சேவைகள்""Google Play சேவைகள் பிழை""Google Play சேவைகள் இருந்தால் மட்டுமே %1$s பயன்பாடு இயங்கும். ஆனால், உங்கள் சாதனத்தில் அவை ஆதரிக்கப்படவில்லை.""புதுப்பி""Google Play சேவைகளை இயக்கினால் மட்டுமே, %1$s செயல்படும்.""Google Play சேவைகளைப் புதுப்பிக்கவும்""தற்போது புதுப்பிக்கப்படும், Google Play சேவைகள் இருந்தால் மட்டுமே, %1$s செயல்படும்.""Google Play சேவைகளின் புதிய பதிப்பு தேவை. அது விரைவில் தானாகவே புதுப்பிக்கப்படும்.""மொபைலில் திற""உள்நுழைக""Google மூலம் உள்நுழைக""ప్రారంభించు""మీరు Google Play సేవలను ప్రారంభిస్తే మినహా %1$s పని చేయదు.""Google Play సేవలను ప్రారంభించండి""ఇన్స్టాల్ చేయి""%1$s Google Play సేవలు లేకుండా అమలు కాదు, ఆ సేవలు మీ పరికరంలో లేవు.""Google Play సేవలను పొందండి""Google Play సేవల లభ్యత""Google Play సేవల ఎర్రర్""%1$s Google Play సేవలు లేకుండా అమలు కాదు, ఈ సేవలకు మీ పరికరంలో మద్దతు లేదు.""అప్డేట్ చేయి""మీరు Google Play సేవలను నవీకరిస్తే మినహా %1$s అమలు కాదు.""Google Play సేవలను నవీకరించండి""%1$s Google Play సేవలు లేకుండా అమలు కాదు, ఆ సేవలు ప్రస్తుతం నవీకరించబడుతున్నాయి.""కొత్త Google Play సేవల వెర్షన్ అవసరం. అది కొద్ది సేపట్లో దానంతట అదే అప్డేట్ చేయబడుతుంది.""ఫోన్లో తెరువు""సైన్ ఇన్ చేయండి""Googleతో సైన్ ఇన్ చేయి""เปิดใช้""%1$s จะไม่ทำงานจนกว่าคุณจะเปิดใช้บริการ Google Play""เปิดใช้บริการ Google Play""ติดตั้ง""%1$s จะไม่ทำงานหากไม่มีบริการ Google Play ซี่งไม่มีในอุปกรณ์ของคุณ""ติดตั้งบริการ Google Play""ความพร้อมใช้งานของบริการ Google Play""ข้อผิดพลาดของบริการ Google Play""%1$s จะไม่ทำงานหากไม่มีบริการ Google Play ซึ่งอุปกรณ์ของคุณไม่สนับสนุน""อัปเดต""%1$s จะไม่ทำงานจนกว่าคุณจะอัปเดตบริการ Google Play""อัปเดตบริการ Google Play""%1$s จะไม่ทำงานหากไม่มีบริการ Google Play ซึ่งกำลังอัปเดตอยู่ในขณะนี้""จำเป็นต้องใช้บริการ Google Play เวอร์ชันใหม่ ซึ่งจะอัปเดตอัตโนมัติในอีกไม่ช้า""เปิดบนโทรศัพท์""ลงชื่อเข้าใช้""ลงชื่อเข้าใช้ด้วย Google""I-enable""Hindi gagana ang %1$s maliban kung ie-enable mo ang mga serbisyo ng Google Play.""I-enable ang mga serbisyo ng Google Play""I-install""Hindi gagana ang %1$s nang wala ang mga serbisyo ng Google Play na wala sa iyong device.""Kunin ang mga serbisyo ng Google Play""Availability ng serbisyo ng Google Play""Error sa Mga Serbisyo ng Google Play""Hindi gagana ang %1$s nang wala ang mga serbisyo ng Google Play, na hindi nasusuportahan ng iyong device.""I-update""Hindi gagana ang %1$s maliban kung i-a-update mo ang mga serbisyo ng Google Play.""I-update ang mga serbisyo ng Google Play""Hindi gagana ang %1$s nang wala ang mga serbisyo ng Google Play na kasalukuyang ina-update.""Kailangan ang bagong bersyon ng mga serbisyo ng Google Play. Mag-a-update itong mag-isa sa ilang sandali.""Buksan sa telepono""Mag-sign in""Mag-sign in sa Google""Etkinleştir""Google Play hizmetlerini etkinleştirmezseniz %1$s çalışmaz.""Google Play hizmetlerini etkinleştirin""Yükle""%1$s, şu anda cihazınızda bulunmayan Google Play hizmetleri olmadan çalışmaz.""Google Play hizmetlerini edinin""Google Play hizmetlerinin kullanılabilirliği""Google Play Hizmetleri hatası""%1$s, Google Play hizmetleri olmadan çalışmaz ve bu hizmetler cihazınız tarafından desteklenmiyor.""Güncelle""Google Play hizmetlerini güncellemezseniz %1$s çalışmayacak.""Google Play hizmetlerini güncelleyin""%1$s, şu anda güncellenmekte olan Google Play hizmetleri olmadan çalışmaz.""Google Play hizmetlerinin yeni sürümü gerekiyor. Kendisini kısa süre içinde güncelleyecektir.""Telefonda aç""Oturum aç""Google\'da oturum aç""Увімкнути""Додаток %1$s не працюватиме, якщо не ввімкнути сервіси Google Play.""Увімкнути сервіси Google Play""Установити""Додаток %1$s не працюватиме без сервісів Google Play, яких немає на вашому пристрої.""Установити сервіси Google Play""Доступність сервісів Google Play""Помилка сервісів Google Play""Додаток %1$s не працюватиме без сервісів Google Play, які не підтримуються на вашому пристрої.""Оновити""Додаток %1$s не працюватиме, якщо не оновити сервіси Google Play.""Оновіть сервіси Google Play""Додаток %1$s не працюватиме без сервісів Google Play, які зараз оновлюються.""Потрібна нова версія сервісів Google Play. Вони невдовзі оновляться.""Відкрити на телефоні""Увійти""Увійти в облік. запис Google""فعال کریں""جب تک آپ Google Play سروسز فعال نہیں کر لیتے، %1$s کام نہیں کرے گی۔""Google Play سروسز فعال کریں""انسٹال کریں""%1$s Google Play سروسز کے بغیر نہیں چلے گی، جو آپ کے آلہ سے غائب ہیں۔""Google Play سروسز حاصل کریں""Google Play سروسز کی دستیابی""Google Play سروسز کی خرابی""%1$s Google Play سروسز کے بغیر نہیں چلے گی، جن کی آپ کا آلہ معاونت نہیں کرتا۔""اپ ڈیٹ کریں""جب تک آپ Google Play سروسز اپ ڈیٹ نہیں کر لیتے ہیں %1$s تب تک نہیں چلے گی۔""Google Play سروسز اپ ڈیٹ کریں""%1$s Google Play سروسز کے بغیر نہیں چلے گی، جو فی الحال اپ ڈیٹ ہو رہی ہیں۔""Google Play سروسز کے نئے ورژن کی ضرورت ہے۔ یہ تھوڑی دیر میں خود ہی اپنے آپ کو اپ ڈیٹ کر لے گا۔""فون پر کھولیں""سائن ان کریں""Google کے ساتھ سائن ان کریں""Yoqish""Google Play xizmatlari yoqilmaguncha, %1$s ishlamaydi.""Google Play xizmatlarini yoqish""O‘rnatish""%1$s ishlashi uchun qurilmangizda Google Play xizmatlarini o‘rnatish lozim.""Google Play xizmatlarini o‘rnatish""Google Play xizmatlarining mavjudligi""Google Play xizmatlari xatosi""%1$s ilovasi Google Play xizmatlarisiz ishlamaydi, biroq qurilmangiz ularni qo‘llab-quvvatlamaydi.""Yangilash""Google Play xizmatlari yangilanmaguncha, %1$s ishga tushmaydi.""Google Play xizmatlarini yangilash""%1$s ilovasining ishlashi uchun zarur Google Play xizmatlari hozirda yangilanmoqda.""Google Play xizmatlarining yangi versiyasi zarur. U o‘zini qisqa vaqt ichida yangilaydi.""Telefonda ochish""Kirish""Google orqali kirish""Bật""%1$s sẽ không hoạt động nếu bạn không bật dịch vụ của Google Play.""Bật dịch vụ của Google Play""Cài đặt""%1$s sẽ không chạy nếu không có dịch vụ của Google Play. Thiết bị của bạn bị thiếu dịch vụ này.""Cài đặt dịch vụ của Google Play""Phạm vi cung cấp các dịch vụ của Google Play""Lỗi dịch vụ của Google Play""%1$s sẽ không chạy nếu không có các dịch vụ của Google Play. Thiết bị của bạn không hỗ trợ các dịch vụ này.""Cập nhật""%1$s sẽ không chạy trừ khi bạn cập nhật Dịch vụ của Google Play.""Cập nhật dịch vụ của Google Play""%1$s sẽ không chạy nếu không có dịch vụ của Google Play. Dịch vụ này hiện đang cập nhật.""Cần phiên bản mới của dịch vụ Google Play. Dịch vụ sẽ sớm tự động cập nhật.""Mở trên điện thoại""Đăng nhập""Đăng nhập bằng Google""启用""您必须先启用 Google Play 服务，然后才能运行%1$s。""启用 Google Play 服务""安装""您的设备没有安装 Google Play 服务，因此无法运行%1$s。""获取 Google Play 服务""Google Play 服务的适用范围""Google Play服务出错""您的设备不支持 Google Play 服务，因此无法运行%1$s。""更新""您必须先更新 Google Play 服务，然后才能运行%1$s。""更新 Google Play 服务""Google Play 服务当前正在更新，因此您无法运行%1$s。""必须使用新版 Google Play 服务。该服务很快就会自行更新。""在手机上打开""登录""使用 Google 帐号登录""啟用""您必須啟用 Google Play 服務，方可執行「%1$s」。""啟用 Google Play 服務""安裝""您的裝置尚未安裝 Google Play 服務，因此無法執行「%1$s」。""安裝 Google Play 服務""Google Play 服務的適用範圍""Google Play 服務錯誤""您的裝置不支援 Google Play 服務，因此無法執行「%1$s」。""更新""您必須更新「Google Play 服務」，才能執行 %1$s。""更新 Google Play 服務""正在更新 Google Play 服務，更新完成後方可執行「%1$s」。""需要使用新版本的 Google Play 服務。更新會即將自動開始。""在手機開啟""登入""透過 Google 登入""啟用""您必須啟用 Google Play 服務，才能執行「%1$s」。""啟用 Google Play 服務""安裝""您的裝置並未安裝 Google Play 服務，因此無法執行「%1$s」。""取得 Google Play 服務""Google Play 服務可用性""Google Play 服務發生錯誤""您的裝置不支援 Google Play 服務，因此無法執行「%1$s」。""更新""您必須更新 Google Play 服務，才能執行「%1$s」。""更新 Google Play 服務""執行「%1$s」所需的 Google Play 服務正在更新。""必須使用新版 Google Play 服務。該服務稍後就會自動更新。""在手機上開啟""登入""使用 Google 帳戶登入""Nika amandla""I-%1$s ngeke isebenze ngaphandle kokuthi unike amandla amasevisi we-Google Play.""Nika amandla amasevisi we-Google Play""Faka""I-%1$s ngeke ize iqalise ngaphandle kwamasevisi we-Google Play, angekho kusukela kudivayisi yakho.""Thola amasevisi we-Google Play""Ukungatholakali kwamasevisi e-Google Play""Iphutha lamasevisi we-Google Play""%1$s ngeke isebenze ngaphandle kwamasevisi e-Google Play, angasekelwa idivayisi yakho.""Isibuyekezo""I-%1$s ngeke ize iqalise ngaphandle kokuthi ubuyekeze i-Google Play.""Buyekeza amasevisi we-Google Play""I-%1$s ngeke ize iqalise ngaphandle kwamasevisi we-Google Play, okwamanje abuyekezwayo.""Kudingeka inguqulo entsha yamasevisi we-Google Play. Izozibuyekeza ngokwayo maduze.""Vula kufoni""Ngena ngemvume""Ngena ngemvume nge-Google"Miscellaneous"Diverse""የተለያዩ""متنوعة""বিবিধ""Müxtəlif""Razno""Рознае""Разни""বিবিধ""Razno""Altres""Různé""Diverse""Sonstiges""Διάφορα""Miscellaneous""Varias""Varios""Muu""Askotarikoak""موارد دیگر""Muut""Divers""Divers""Varios""વિવિધ""अन्य""Razno""Egyéb""Զանազան""Lain-Lain""Ýmislegt""Varie""שונות""その他""სხვადასხვა""Өзге""ផ្សេងៗ""ಇತರೆ""기타""Аралаш""ອື່ນໆ""Įvairūs""Dažādi""Разно""പലവക""Бусад""मिश्र""Pelbagai""အထွေထွေ""Diverse""विविध""Overige""ଅନ୍ୟାନ୍ୟ""ਫੁਟਕਲ""Inne""Diversos""Diversas""Diverse""Другое""විවිධ""Rôzne""Razno""Të ndryshme""Разно""Diverse""Zinginezo""மற்றவை""ఇతరాలు""เบ็ดเตล็ด""Iba Pa""Çeşitli""Інше""متفرقات""Har xil""Khác""其他""其他""其他""Okwahlukahlukene"
+<<<<<<< HEAD
truefalsetrue@android:color/black#7fa87f@android:color/black@android:color/black@color/material_deep_teal_200@color/material_deep_teal_500@color/material_grey_800@android:color/white@color/material_grey_850@color/material_grey_50#80ffffff#80000000@color/bright_foreground_material_light@color/bright_foreground_material_dark@android:color/white@android:color/black#ff5a595b#ffd6d7d7#80bebebe#80323232#ffbebebe#ff323232#ff7043#ff5722@android:color/white@android:color/black#6680cbc4#66009688#ff37474f#ff263238#ff21272b#ff80cbc4#ff008577#fff5f5f5#ffe0e0e0#fffafafa#ff757575#ff424242#ff303030#ff212121@android:color/black@color/material_grey_600@color/material_grey_900@color/material_grey_100#ffffffff#de000000#4Dffffff#39000000#33ffffff#1f000000#b3ffffff#8a000000#36ffffff#24000000#ff616161#ffbdbdbd#ffbdbdbd#fff1f1f1#e6616161#e6FFFFFF16dp72dp56dp0dp0dp4dp16dp10dp6dp48dp180dp5dp-3dp48dp48dp36dp48dp48dp@dimen/abc_control_inset_material6dp8dp@dimen/abc_control_padding_material720dp320dp2dp4dp4dp2dp- 80%
- 100%
- 320dp
- 320dp
8dp8dp- 65%
- 95%
24dp18dp8dp- 0.30
- 0.26
32dip8dip8dip7dp4dp10dp16dp80dp64dp48dp@dimen/abc_action_bar_content_inset_material296dp4dp48dip320dip2dp2dp20dp3dp14sp14sp14sp12sp34sp45sp56sp112sp24sp22sp18sp14sp16sp14sp16sp16dp20sp20dp- 0.30
- 0.26
- 0.26
- 0.20
- 0.12
- 0.50
- 0.38
- 0.70
- 0.54
2dp16dp8dp8dp96dp6.5dp0dp16dp- 0.24
- 0.40
- 0.40
- 0.24
- 0.12
- 0.20
- 0.20
- 0.12
4dp18dp40dp2dp2dp40dp40dp4dp0dp22dp48dp2dp2dp48dp48dp0dp#FF4081#3F51B5#303F9FCapacitorAndroidUnable to use cameraOKPictureAllow this app to take pictures- 0.24
- 0.40
- 0.40
- 0.24
- 0.12
- 0.20
- 0.20
- 0.12
4dp18dp40dp2dp2dp40dp40dp4dp0dp22dp48dp2dp2dp48dp48dp0dp#FF4081#3F51B5#303F9FCapacitorAndroidUnable to use cameraOKPictureAllow this app to take pictures
+<<<<<<< HEAD
#FFFFFFgabinete-digitalgabinete-digitalcom.gpr.gabinetedigitalcom.gpr.gabinetedigital800733765231-92oa7ib62ob0pkouphb5i5sp01vkalid.apps.googleusercontent.comhttps://gabinete-digital-2020.firebaseio.com800733765231AIzaSyD0pfW45DLoW6mqvZRklJdbfSTskW22Fok1:800733765231:android:e7ffc0b310037d9f13779aAIzaSyD0pfW45DLoW6mqvZRklJdbfSTskW22Fokgabinete-digital-2020.appspot.comgabinete-digital-2020
+=======
+ 800733765231-92oa7ib62ob0pkouphb5i5sp01vkalid.apps.googleusercontent.comhttps://gabinete-digital-2020.firebaseio.com800733765231AIzaSyD0pfW45DLoW6mqvZRklJdbfSTskW22Fok1:800733765231:android:e7ffc0b310037d9f13779aAIzaSyD0pfW45DLoW6mqvZRklJdbfSTskW22Fokgabinete-digital-2020.appspot.comgabinete-digital-2020
+>>>>>>> origin/feature/pushNotifications
diff --git a/android/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/android/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
index 607cd3ef7..d374388c6 100644
--- a/android/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
+++ b/android/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
@@ -1,2 +1,6 @@
-
\ No newline at end of file
+<<<<<<< HEAD
+
+=======
+
+>>>>>>> origin/feature/pushNotifications
diff --git a/android/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/android/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
index e8fed5972..e5c5d2730 100644
--- a/android/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
+++ b/android/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
#Mon Feb 08 12:02:03 WAT 2021
+=======
+#Mon Feb 08 14:34:56 WAT 2021
+>>>>>>> origin/feature/pushNotifications
path.3=classes_1.dex
path.2=classes_0.dex
path.1=classes.dex
@@ -7,7 +11,14 @@ renamed.3=classes4.dex
renamed.2=classes3.dex
renamed.1=classes2.dex
renamed.0=classes.dex
+<<<<<<< HEAD
base.3=C\:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\dex\\debug\\mergeLibDexDebug\\classes_1.dex
base.2=C\:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\dex\\debug\\mergeLibDexDebug\\classes_0.dex
base.1=C\:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\classes.dex
base.0=C\:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\dex\\debug\\mergeExtDexDebug\\classes.dex
+=======
+base.3=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\dex\\debug\\mergeLibDexDebug\\classes_1.dex
+base.2=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\dex\\debug\\mergeLibDexDebug\\classes_0.dex
+base.1=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\classes.dex
+base.0=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\dex\\debug\\mergeExtDexDebug\\classes.dex
+>>>>>>> origin/feature/pushNotifications
diff --git a/android/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/android/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
index ad25bc722..457aed0b1 100644
--- a/android/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
+++ b/android/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
@@ -6,13 +6,20 @@
6
7 C:\Users\tiago.kayaya\development\gabinete-digital\android\app\src\main\AndroidManifest.xml
9 android:targetSdkVersion="29" />
9-->C:\Users\tiago.kayaya\development\gabinete-digital\android\app\src\main\AndroidManifest.xml
+=======
+8-->C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml
+9 android:targetSdkVersion="29" />
+9-->C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml
+>>>>>>> origin/feature/pushNotifications
10
11
12
13
+<<<<<<< HEAD
13-->C:\Users\tiago.kayaya\development\gabinete-digital\android\app\src\main\AndroidManifest.xml:48:5-67
13-->C:\Users\tiago.kayaya\development\gabinete-digital\android\app\src\main\AndroidManifest.xml:48:22-64
14
@@ -63,18 +70,77 @@
36
36-->[:capacitor-android] C:\Users\tiago.kayaya\development\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:16:5-68
36-->[:capacitor-android] C:\Users\tiago.kayaya\development\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:16:22-65
+=======
+13-->C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:48:5-67
+13-->C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:48:22-64
+14
+15
+15-->C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:50:5-79
+15-->C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:50:22-77
+16
+16-->C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:51:5-81
+16-->C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:51:22-78
+17
+18
+18-->C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:53:5-81
+18-->C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:53:22-78
+19
+19-->C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:54:5-79
+19-->C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:54:22-76
+20
+21
+21-->C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:55:5-66
+21-->C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:55:19-63
+22
+23
+23-->C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:57:5-79
+23-->C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:57:22-76
+24
+25
+26
+26-->C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:60:5-65
+26-->C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:60:22-62
+27
+28
+28-->C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:62:5-71
+28-->C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:62:22-68
+29
+29-->C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:63:5-79
+29-->C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:63:22-77
+30
+31 [:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:11:5-13:36
+32 android:name="android.hardware.camera"
+32-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:12:9-47
+33 android:required="false" />
+33-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:13:9-33
+34
+35
+35-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:15:5-81
+35-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:15:22-78
+36
+36-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:16:5-68
+36-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:16:22-65
+>>>>>>> origin/feature/pushNotifications
37
37-->[com.google.firebase:firebase-iid:20.1.1] C:\Users\tiago.kayaya\.gradle\caches\transforms-2\files-2.1\2af03360c2f1d9c4749c1d75a7057ee7\jetified-firebase-iid-20.1.1\AndroidManifest.xml:26:5-82
37-->[com.google.firebase:firebase-iid:20.1.1] C:\Users\tiago.kayaya\.gradle\caches\transforms-2\files-2.1\2af03360c2f1d9c4749c1d75a7057ee7\jetified-firebase-iid-20.1.1\AndroidManifest.xml:26:22-79
38
39 C:\Users\tiago.kayaya\development\gabinete-digital\android\app\src\main\AndroidManifest.xml:5:5-44:19
40 android:allowBackup="true"
40-->C:\Users\tiago.kayaya\development\gabinete-digital\android\app\src\main\AndroidManifest.xml:6:9-35
+=======
+39-->C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:5:5-44:19
+40 android:allowBackup="true"
+40-->C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:6:9-35
+>>>>>>> origin/feature/pushNotifications
41 android:appComponentFactory="androidx.core.app.CoreComponentFactory"
41-->[androidx.core:core:1.2.0] C:\Users\tiago.kayaya\.gradle\caches\transforms-2\files-2.1\e5357b0b880d2be0ed83398576c19d42\core-1.2.0\AndroidManifest.xml:24:18-86
42 android:debuggable="true"
43 android:icon="@mipmap/ic_launcher"
+<<<<<<< HEAD
43-->C:\Users\tiago.kayaya\development\gabinete-digital\android\app\src\main\AndroidManifest.xml:7:9-43
44 android:label="@string/app_name"
44-->C:\Users\tiago.kayaya\development\gabinete-digital\android\app\src\main\AndroidManifest.xml:8:9-41
@@ -123,11 +189,62 @@
66
66-->C:\Users\tiago.kayaya\development\gabinete-digital\android\app\src\main\AndroidManifest.xml:29:17-68
66-->C:\Users\tiago.kayaya\development\gabinete-digital\android\app\src\main\AndroidManifest.xml:29:23-65
+=======
+43-->C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:7:9-43
+44 android:label="@string/app_name"
+44-->C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:8:9-41
+45 android:roundIcon="@mipmap/ic_launcher_round"
+45-->C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:9:9-54
+46 android:supportsRtl="true"
+46-->C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:10:9-35
+47 android:testOnly="true"
+48 android:theme="@style/AppTheme" >
+48-->C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:11:9-40
+49 C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:13:9-32:20
+50 android:name="com.gpr.gabinetedigital.MainActivity"
+50-->C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:15:13-64
+51 android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode"
+51-->C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:14:13-129
+52 android:label="@string/title_activity_main"
+52-->C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:16:13-56
+53 android:launchMode="singleTask"
+53-->C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:18:13-44
+54 android:theme="@style/AppTheme.NoActionBarLaunch" >
+54-->C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:17:13-62
+55
+55-->C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:20:13-23:29
+56
+56-->C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:21:17-69
+56-->C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:21:25-66
+57
+58
+58-->C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:22:17-77
+58-->C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:22:27-74
+59
+60
+60-->C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:25:13-30:29
+61
+61-->C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:26:17-69
+61-->C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:26:25-66
+62
+63
+63-->C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:27:17-76
+63-->C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:27:27-73
+64
+64-->C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:28:17-78
+64-->C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:28:27-75
+65
+66
+66-->C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:29:17-68
+66-->C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:29:23-65
+>>>>>>> origin/feature/pushNotifications
67
68
69
70 C:\Users\tiago.kayaya\development\gabinete-digital\android\app\src\main\AndroidManifest.xml:35:13-62
72 android:authorities="com.gpr.gabinetedigital.fileprovider"
72-->C:\Users\tiago.kayaya\development\gabinete-digital\android\app\src\main\AndroidManifest.xml:36:13-64
@@ -181,10 +298,66 @@
98
98-->[:capacitor-android] C:\Users\tiago.kayaya\development\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:34:17-78
98-->[:capacitor-android] C:\Users\tiago.kayaya\development\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:34:25-75
+=======
+71-->C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:35:13-62
+72 android:authorities="com.gpr.gabinetedigital.fileprovider"
+72-->C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:36:13-64
+73 android:exported="false"
+73-->C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:37:13-37
+74 android:grantUriPermissions="true" >
+74-->C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:38:13-47
+75 C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:39:13-41:64
+76 android:name="android.support.FILE_PROVIDER_PATHS"
+76-->C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:40:17-67
+77 android:resource="@xml/file_paths" />
+77-->C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:41:17-51
+78 C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:42:13-136
+79 android:name="com.google.firebase.messaging.default_notification_icon"
+79-->C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:42:24-94
+80 android:resource="@mipmap/ic_launcher" />
+80-->C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:42:95-133
+81
+82
+83 [:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:19:9-21:40
+84 android:name="com.getcapacitor.plugin.background.BackgroundTaskService"
+84-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:20:13-84
+85 android:exported="false" />
+85-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:21:13-37
+86
+87
+87-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:23:9-100
+87-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:23:19-97
+88
+88-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:24:9-101
+88-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:24:19-98
+89
+90 [:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:26:9-28:37
+91 android:name="firebase_messaging_auto_init_enabled"
+91-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:27:13-64
+92 android:value="false" />
+92-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:28:13-34
+93
+94 [:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:30:9-36:19
+95 android:name="com.getcapacitor.CapacitorFirebaseMessagingService"
+95-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:31:13-78
+96 android:stopWithTask="false" >
+96-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:32:13-41
+97
+97-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:33:13-35:29
+98
+98-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:34:17-78
+98-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:34:25-75
+>>>>>>> origin/feature/pushNotifications
99
100
101
102 [:capacitor-android] C:\Users\tiago.kayaya\development\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:38:9-47:20
103 android:name="com.getcapacitor.plugin.notification.LocalNotificationRestoreReceiver"
103-->[:capacitor-android] C:\Users\tiago.kayaya\development\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:39:13-97
@@ -203,6 +376,26 @@
109
109-->[:capacitor-android] C:\Users\tiago.kayaya\development\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:45:17-82
109-->[:capacitor-android] C:\Users\tiago.kayaya\development\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:45:25-79
+=======
+102-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:38:9-47:20
+103 android:name="com.getcapacitor.plugin.notification.LocalNotificationRestoreReceiver"
+103-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:39:13-97
+104 android:directBootAware="true"
+104-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:40:13-43
+105 android:exported="false" >
+105-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:41:13-37
+106
+106-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:42:13-46:29
+107
+107-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:43:17-86
+107-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:43:25-83
+108
+108-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:44:17-79
+108-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:44:25-76
+109
+109-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:45:17-82
+109-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:45:25-79
+>>>>>>> origin/feature/pushNotifications
110
111
112 [com.google.firebase:firebase-messaging:20.1.2] C:\Users\tiago.kayaya\.gradle\caches\transforms-2\files-2.1\ec0d34db7bfab328a67bc775742a1d9e\jetified-firebase-messaging-20.1.2\AndroidManifest.xml:30:13-37
119
+<<<<<<< HEAD
119-->[:capacitor-android] C:\Users\tiago.kayaya\development\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:33:13-35:29
120
120-->[:capacitor-android] C:\Users\tiago.kayaya\development\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:34:17-78
120-->[:capacitor-android] C:\Users\tiago.kayaya\development\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:34:25-75
+=======
+119-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:33:13-35:29
+120
+120-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:34:17-78
+120-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:34:25-75
+>>>>>>> origin/feature/pushNotifications
121
122
123 {
+ if (res) {
+ console.log(res);
+ //this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
+ }
+ });
+ });
+ }
viewExpedientDetail(serialNumber) {
return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, function* () {
console.log(this.profile);
@@ -494,7 +517,7 @@ let HomePage = class HomePage {
HomePage.ctorParameters = () => [
{ type: _services_events_service__WEBPACK_IMPORTED_MODULE_2__["EventsService"] },
{ type: _services_processes_service__WEBPACK_IMPORTED_MODULE_4__["ProcessesService"] },
- { type: _angular_router__WEBPACK_IMPORTED_MODULE_10__["Router"] },
+ { type: _angular_router__WEBPACK_IMPORTED_MODULE_11__["Router"] },
{ type: _ionic_angular__WEBPACK_IMPORTED_MODULE_5__["ModalController"] }
];
HomePage = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__decorate"])([
diff --git a/android/app/build/intermediates/merged_assets/debug/out/public/home-home-module-es2015.js.map b/android/app/build/intermediates/merged_assets/debug/out/public/home-home-module-es2015.js.map
index 9657b8b9a..251a0e8d6 100644
--- a/android/app/build/intermediates/merged_assets/debug/out/public/home-home-module-es2015.js.map
+++ b/android/app/build/intermediates/merged_assets/debug/out/public/home-home-module-es2015.js.map
@@ -1 +1,5 @@
-{"version":3,"sources":["./src/app/home/home.page.html","./src/app/home/home-routing.module.ts","./src/app/home/home.module.ts","./src/app/home/home.page.scss","./src/app/home/home.page.ts","./src/app/resolvers/userData.resolver.ts"],"names":[],"mappings":"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","file":"home-home-module-es2015.js","sourcesContent":["export default \"\\r\\n\\r\\n\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n {{totalEvent}}\\r\\n Início\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n Agenda\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n {{totalExpediente}}\\r\\n Gabinete\\r\\n \\r\\n \\r\\n \\r\\n Acções\\r\\n \\r\\n \\r\\n \\r\\n Chat\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n\";","import { NgModule } from '@angular/core';\r\nimport { Routes, RouterModule } from '@angular/router';\r\nimport { HomeGuard } from '../guards/home.guard';\r\nimport { UserDataResolver } from '../resolvers/userData.resolver';\r\n\r\nimport { HomePage } from './home.page';\r\n\r\nconst routes: Routes = [\r\n {\r\n path: 'home',\r\n component: HomePage,\r\n /* canActivate: [HomeGuard], */\r\n resolve: {\r\n userData: UserDataResolver\r\n },\r\n children: [\r\n {\r\n path: 'events',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/events/events.module').then(m => m.EventsPageModule)\r\n },\r\n {\r\n path:':eventId/:caller',\r\n loadChildren: ()=> import('../pages/events/event-detail/event-detail.module').then(m => m.EventDetailPageModule),\r\n },\r\n ]\r\n },\r\n {\r\n path: 'attachments',\r\n children: [\r\n {\r\n path:':eventId',\r\n loadChildren: ()=> import('../pages/events/attachments/attachments.module').then(m => m.AttachmentsPageModule)\r\n },\r\n\r\n ]\r\n },\r\n {\r\n path: 'attendees',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/events/attendees/attendees.module').then(m => m.AttendeesPageModule)\r\n },\r\n ]\r\n },\r\n {\r\n path: 'login',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/login/login.module').then(m => m.LoginPageModule)\r\n },\r\n ]\r\n },\r\n {\r\n path: 'agenda',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/agenda/agenda.module').then(m => m.AgendaPageModule)\r\n },\r\n {\r\n path:':eventId/:caller',\r\n loadChildren: ()=> import('../pages/events/event-detail/event-detail.module').then(m => m.EventDetailPageModule),\r\n }\r\n ]\r\n },\r\n {\r\n path: 'gabinete-digital',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/gabinete-digital/gabinete-digital.module').then(m => m.GabineteDigitalPageModule)\r\n },\r\n {\r\n path:'expediente',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/gabinete-digital/expediente/expediente.module').then(m => m.ExpedientePageModule)\r\n },\r\n {\r\n path:':SerialNumber',\r\n loadChildren: ()=> import('../pages/gabinete-digital/expediente/expediente-detail/expediente-detail.module').then(m => m.ExpedienteDetailPageModule)\r\n },\r\n {\r\n path:'events/:eventId/:caller',\r\n loadChildren: ()=> import('../pages/events/event-detail/event-detail.module').then(m => m.EventDetailPageModule),\r\n }\r\n ]\r\n },\r\n {\r\n path:'event-list',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/gabinete-digital/event-list/event-list.module').then(m => m.EventListPageModule)\r\n },\r\n ] \r\n },\r\n ]\r\n },\r\n {\r\n path: 'search',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/search/search.module').then(m => m.SearchPageModule)\r\n }\r\n ]\r\n },\r\n {\r\n path: 'publications',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/publications/publications.module').then(m => m.PublicationsPageModule)\r\n },\r\n {\r\n path:'view-publications',\r\n children: [\r\n {\r\n path:':folderId',\r\n loadChildren: ()=> import('../pages/publications/view-publications/view-publications.module').then(m => m.ViewPublicationsPageModule)\r\n },\r\n {\r\n path:'publication-detail',\r\n children: [\r\n {\r\n path: ':id',\r\n loadChildren: ()=> import('../pages/publications/view-publications/publication-detail/publication-detail.module').then(m => m.PublicationDetailPageModule)\r\n },\r\n ]\r\n \r\n },\r\n ] \r\n },\r\n ]\r\n },\r\n {\r\n path: 'chat',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/chat/chat.module').then(m => m.ChatPageModule)\r\n }\r\n ]\r\n },\r\n ]\r\n },\r\n {\r\n path: '',\r\n redirectTo: '/home/events',\r\n pathMatch: 'full'\r\n }\r\n];\r\n\r\n@NgModule({\r\n imports: [RouterModule.forChild(routes)],\r\n exports: [RouterModule],\r\n})\r\nexport class HomePageRoutingModule {}\r\n","import { NgModule } from '@angular/core';\r\nimport { CommonModule } from '@angular/common';\r\nimport { FormsModule } from '@angular/forms';\r\n\r\nimport { IonicModule } from '@ionic/angular';\r\n\r\nimport { HomePageRoutingModule } from './home-routing.module';\r\n\r\nimport { HomePage } from './home.page';\r\n/* import { IonicSelectableModule } from 'ionic-selectable'; */\r\nimport { SharedModule } from 'src/app/shared/shared.module';\r\n\r\n@NgModule({\r\n imports: [\r\n CommonModule,\r\n FormsModule,\r\n IonicModule,\r\n HomePageRoutingModule,\r\n SharedModule\r\n ],\r\n declarations: [HomePage]\r\n})\r\nexport class HomePageModule {}\r\n","export default \"ion-tab-bar {\\n --background: #f9f9f9;\\n --color: #061b52;\\n}\\n\\nion-badge {\\n /* */\\n /* display: inline-block;*/\\n min-width: 18px;\\n font-size: 15px;\\n /* font-weight: $badge-font-weight;\\n line-height: 1;\\n\\n white-space: nowrap;\\n vertical-align: baseline; */\\n}\\n\\n.tab .bottoms {\\n display: flex;\\n justify-content: space-around;\\n}\\n/*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNyYy9hcHAvaG9tZS9DOlxcVXNlcnNcXHRpYWdvLmtheWF5YVxcZGV2ZWxvcG1lbnRcXGdhYmluZXRlLWRpZ2l0YWwvc3JjXFxhcHBcXGhvbWVcXGhvbWUucGFnZS5zY3NzIiwic3JjL2FwcC9ob21lL2hvbWUucGFnZS5zY3NzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBO0VBQ0kscUJBQUE7RUFDQSxnQkFBQTtBQ0FKOztBRGFBO0VBQVcsS0FBQTtFQUVULDBCQUFBO0VBRUEsZUFBQTtFQUNBLGVBWGU7RUFZZjs7Ozs2QkFBQTtBQ1BGOztBRGdCRTtFQUNFLGFBQUE7RUFDQSw2QkFBQTtBQ2JKIiwiZmlsZSI6InNyYy9hcHAvaG9tZS9ob21lLnBhZ2Uuc2NzcyIsInNvdXJjZXNDb250ZW50IjpbIlxyXG5pb24tdGFiLWJhcntcclxuICAgIC0tYmFja2dyb3VuZDogI2Y5ZjlmOTtcclxuICAgIC0tY29sb3I6ICMwNjFiNTI7XHJcbn1cclxuXHJcbi8vIEJhZGdlXHJcbi8vIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tXHJcblxyXG4vLy8gQHByb3AgLSBGb250IHNpemUgb2YgdGhlIGJhZGdlXHJcbiRiYWRnZS1mb250LXNpemU6MTVweCAhZGVmYXVsdDtcclxuXHJcbi8vLyBAcHJvcCAtIEZvbnQgd2VpZ2h0IG9mIHRoZSBiYWRnZVxyXG4kYmFkZ2UtZm9udC13ZWlnaHQ6Ym9sZCAhZGVmYXVsdDtcclxuXHJcblxyXG5pb24tYmFkZ2Ugey8qICAqL1xyXG5cclxuICAvKiBkaXNwbGF5OiBpbmxpbmUtYmxvY2s7Ki9cclxuXHJcbiAgbWluLXdpZHRoOiAxOHB4OyBcclxuICBmb250LXNpemU6ICRiYWRnZS1mb250LXNpemU7XHJcbiAgLyogZm9udC13ZWlnaHQ6ICRiYWRnZS1mb250LXdlaWdodDtcclxuICBsaW5lLWhlaWdodDogMTtcclxuXHJcbiAgd2hpdGUtc3BhY2U6IG5vd3JhcDtcclxuICB2ZXJ0aWNhbC1hbGlnbjogYmFzZWxpbmU7ICovXHJcbn1cclxuXHJcblxyXG4udGFie1xyXG4gIC5ib3R0b21ze1xyXG4gICAgZGlzcGxheTogZmxleDtcclxuICAgIGp1c3RpZnktY29udGVudDogc3BhY2UtYXJvdW5kO1xyXG4gIH1cclxufSIsImlvbi10YWItYmFyIHtcbiAgLS1iYWNrZ3JvdW5kOiAjZjlmOWY5O1xuICAtLWNvbG9yOiAjMDYxYjUyO1xufVxuXG5pb24tYmFkZ2Uge1xuICAvKiAgKi9cbiAgLyogZGlzcGxheTogaW5saW5lLWJsb2NrOyovXG4gIG1pbi13aWR0aDogMThweDtcbiAgZm9udC1zaXplOiAxNXB4O1xuICAvKiBmb250LXdlaWdodDogJGJhZGdlLWZvbnQtd2VpZ2h0O1xuICBsaW5lLWhlaWdodDogMTtcblxuICB3aGl0ZS1zcGFjZTogbm93cmFwO1xuICB2ZXJ0aWNhbC1hbGlnbjogYmFzZWxpbmU7ICovXG59XG5cbi50YWIgLmJvdHRvbXMge1xuICBkaXNwbGF5OiBmbGV4O1xuICBqdXN0aWZ5LWNvbnRlbnQ6IHNwYWNlLWFyb3VuZDtcbn0iXX0= */\";","import { Component, OnInit } from '@angular/core';\r\nimport { EventsService } from '../services/events.service';\r\nimport { formatDate } from '@angular/common';\r\nimport { Event } from '../models/event.model';\r\nimport { ProcessesService } from '../services/processes.service';\r\nimport { StorageService } from 'src/app/services/storage.service';\r\nimport { ModalController } from '@ionic/angular';\r\nimport { PublicationDetailPage } from '../../app/pages/publications/view-publications/publication-detail/publication-detail.page';\r\nimport { ViewPublicationsPage } from '../../app/pages/publications/view-publications/view-publications.page';\r\nimport { ExpedienteDetailPage } from '../../app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page'\r\n\r\nimport { Plugins, PushNotification, PushNotificationToken, PushNotificationActionPerformed, Modals } from '@capacitor/core';\r\nimport { Router } from '@angular/router';\r\nimport { MethodCall } from '@angular/compiler';\r\n\r\nconst { PushNotifications, LocalNotifications, LocalNotificationAction } = Plugins;\r\n\r\n@Component({\r\n selector: 'app-home',\r\n templateUrl: './home.page.html',\r\n styleUrls: ['./home.page.scss'],\r\n})\r\nexport class HomePage implements OnInit {\r\n eventsList: Event[];\r\n prEventList: Event[];\r\n mdEventList: Event[];\r\n\r\n totalEvent = 0;\r\n totalExpediente = 0;\r\n profile: string;\r\n\r\n constructor(private eventService: EventsService, private processesbackend: ProcessesService, private router: Router, private modalController: ModalController,) { }\r\n\r\n ngOnInit() {\r\n //Initialize profile as mdgpr\r\n this.profile = \"mdgpr\";\r\n if (this.profile == \"mdgpr\") {\r\n this.eventService.getAllMdEvents(formatDate(new Date(), 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => {\r\n this.eventsList = res;\r\n this.totalEvent = this.eventsList.length;\r\n });\r\n }\r\n else {\r\n this.eventService.getAllPrEvents(formatDate(new Date(), 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => {\r\n this.eventsList = res;\r\n this.totalEvent = this.eventsList.length;\r\n });\r\n\r\n }\r\n this.processesbackend.GetTasksList(\"Expediente\", true).subscribe(result => {\r\n this.totalExpediente = result;\r\n });\r\n /*\r\n (PushNotifications as any).requestPermission().then(result => {\r\n PushNotifications.register();\r\n });\r\n \r\n PushNotifications.addListener(\r\n 'registration',\r\n (token: PushNotificationToken) => {\r\n alert('Push registration success, token: ' + token.value);\r\n console.log('FIREBASE: ', token.value)\r\n this.storageService.store(this.username,token.value);\r\n },\r\n );\r\n \r\n console.log(this.storageService.get(this.username)) */\r\n\r\n PushNotifications.addListener('registrationError', (error: any) => {\r\n alert('Error on registration: ' + JSON.stringify(error));\r\n });\r\n\r\n PushNotifications.addListener('pushNotificationReceived', notification => { \r\n\r\n //const isPushNotification = !!notification.title || !!notification.body;\r\n \r\n // if this is a push notification received when the app is in the foreground on Android\r\n //if (isAndroid && isPushNotification) {\r\n \r\n // We schedule a LocalNotification 1 second later since Capacitor for Android doesn't show anything in this case\r\n LocalNotifications.schedule({\r\n notifications: [{\r\n title: notification.title,\r\n body: notification.body,\r\n id: new Date().getUTCMilliseconds(),\r\n schedule: {\r\n at: new Date(Date.now() + 1000)\r\n },\r\n extra: notification.data,\r\n channelId: 'pop-notifications'\r\n }]\r\n });\r\n //}\r\n });\r\n \r\n\r\n PushNotifications.addListener(\r\n 'pushNotificationActionPerformed',\r\n (notification: PushNotificationActionPerformed) => {\r\n let service = notification.notification.data.service;\r\n let object = notification.notification.data.object;\r\n let idObject = notification.notification.data.idObject;\r\n\r\n console.log('Service: ', service);\r\n console.log('Object: ', object);\r\n console.log('idObject: ', idObject);\r\n\r\n /* if (service === \"events\") {\r\n this.router.navigate(['/home/', service, idObject, 'home']);\r\n } else if (service === \"agenda\") {\r\n this.router.navigate(['/home/', service, idObject, 'home']);\r\n } else if (service === \"gabinete-digital\" && object != \"expediente\") {*/\r\n // this.router.navigate(['/home/', service]);\r\n // }\r\n\r\n //if (service != null) {\r\n\r\n /*const routeValue = {\r\n \"agenda\": this.router.navigate(['/home/', service, idObject, 'home']),\r\n \"gabinete-digital\": this.router.navigate(['/home/', service]),\r\n \"accoes\": this.viewExpedientDetail(idObject),\r\n\r\n }\r\n\r\n const route = routeValue[service] && object ;\r\n\r\n service = \"agenda\" ? this.router.navigate(['/home/', service, idObject, 'home']) : */\r\n\r\n if (service === \"agenda\") {\r\n this.router.navigate(['/home/', service, idObject, 'home']);\r\n } else if (service === \"gabinete-digital\" && object != \"expediente\") {\r\n this.router.navigate(['/home/', service]);\r\n } else if (service === \"gabinete-digital\" && object === \"expediente\") {\r\n this.viewExpedientDetail(idObject)\r\n } else if (service === \"accoes\" && object === \"accao\") {\r\n this.viewPublications(idObject)\r\n } else if (service === \"accoes\" && object === \"publicacao\") {\r\n this.viewPublicationDetail(idObject)\r\n }\r\n \r\n\r\n\r\n\r\n /*switch (service) {\r\n case \"events\":\r\n this.router.navigate(['/home/', service, idObject, 'home']);\r\n break;\r\n case \"agenda\":\r\n this.router.navigate(['/home/', service, idObject, 'home']);\r\n break;\r\n case \"gabinete-digital\":\r\n this.router.navigate(['/home/', service]);\r\n break;\r\n case \"gabinete-digital-expediente\":\r\n this.router.navigate(['/home/gabinete-digital/', object, idObject, 'home']);\r\n break;\r\n case \"\": {\r\n\r\n if(publicationId && processId != null) {\r\n this.viewPublicationDetail(publicationId,processId)\r\n }\r\n if (folder.ProcessId != null) {\r\n this.viewPublications(folder)\r\n }\r\n }\r\n\r\n default:\r\n this.router.navigate(['/home/']);\r\n }*/\r\n\r\n\r\n\r\n },\r\n );\r\n }\r\n\r\n async localNotificationPresent(notification) {\r\n\r\n LocalNotificationAction.\r\n\r\n LocalNotifications.schedule({\r\n notifications: [\r\n {\r\n title: notification.title,\r\n body: notification.body,\r\n id: 1,\r\n schedule: { at: new Date(Date.now() + 1000) },\r\n sound: null,\r\n attachments: null,\r\n actionTypeId: \"\",\r\n extra: null,\r\n foreground: true,\r\n }\r\n ]\r\n });\r\n }\r\n\r\n async viewExpedientDetail(serialNumber:any) {\r\n console.log(this.profile);\r\n \r\n const modal = await this.modalController.create({\r\n component: ExpedienteDetailPage,\r\n componentProps:{\r\n serialNumber: serialNumber,\r\n profile: this.profile,\r\n },\r\n cssClass: 'modal',\r\n backdropDismiss: false\r\n });\r\n await modal.present();\r\n modal.onDidDismiss().then((res)=>{\r\n if(res){\r\n console.log(res);\r\n }\r\n });\r\n }\r\n\r\n\r\n\r\n async viewPublicationDetail(folderId) {\r\n const modal = await this.modalController.create({\r\n component: PublicationDetailPage,\r\n componentProps: {\r\n folderId: folderId,\r\n },\r\n cssClass: 'publication-detail',\r\n backdropDismiss: false\r\n });\r\n await modal.present();\r\n modal.onDidDismiss();\r\n }\r\n\r\n async viewPublications(folderId) {\r\n\r\n\r\n const modal = await this.modalController.create({\r\n component: ViewPublicationsPage,\r\n /* enterAnimation,\r\n leaveAnimation, */\r\n componentProps: {\r\n item: folderId,\r\n },\r\n cssClass: 'new-action',\r\n backdropDismiss: false\r\n });\r\n await modal.present();\r\n modal.onDidDismiss();\r\n }\r\n\r\n}\r\n","import { Injectable } from '@angular/core';\r\nimport { AuthService } from '../services/auth.service';\r\n\r\n@Injectable({\r\n providedIn: 'root'\r\n})\r\nexport class UserDataResolver{ \r\n constructor(private authService: AuthService){}\r\n\r\n resolve(){\r\n return this.authService.getUserData();\r\n }\r\n}"],"sourceRoot":"webpack:///"}
\ No newline at end of file
+<<<<<<< HEAD
+{"version":3,"sources":["./src/app/home/home.page.html","./src/app/home/home-routing.module.ts","./src/app/home/home.module.ts","./src/app/home/home.page.scss","./src/app/home/home.page.ts","./src/app/resolvers/userData.resolver.ts"],"names":[],"mappings":";;;;;;;;;;AAAA;AAAe,+XAAgU,YAAY,mnBAAmnB,iBAAiB,2jBAA2jB,E;;;;;;;;;;;;;;;;;;;;ACAj/C;AACc;AAEW;AAE3B;AAEvC,MAAM,MAAM,GAAW;IACrB;QACE,IAAI,EAAE,MAAM;QACZ,SAAS,EAAE,mDAAQ;QACnB,+BAA+B;QAC/B,OAAO,EAAE;YACP,QAAQ,EAAE,6EAAgB;SAC3B;QACD,QAAQ,EAAE;YACR;gBACE,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE;oBACR;wBACE,IAAI,EAAC,EAAE;wBACP,YAAY,EAAE,GAAE,EAAE,CAAC,ozBAAuC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,gBAAgB,CAAC;qBACzF;oBACD;wBACE,IAAI,EAAC,kBAAkB;wBACvB,YAAY,EAAE,GAAE,EAAE,CAAC,mXAA0D,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,qBAAqB,CAAC;qBACjH;iBACF;aACF;YACD;gBACE,IAAI,EAAE,aAAa;gBACnB,QAAQ,EAAE;oBACR;wBACE,IAAI,EAAC,UAAU;wBACjB,YAAY,EAAE,GAAE,EAAE,CAAC,wUAAwD,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,qBAAqB,CAAC;qBAC7G;iBAEF;aACF;YACD;gBACE,IAAI,EAAE,WAAW;gBACjB,QAAQ,EAAE;oBACR;wBACE,IAAI,EAAC,EAAE;wBACP,YAAY,EAAE,GAAE,EAAE,CAAC,4PAAoD,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,mBAAmB,CAAC;qBACzG;iBACF;aACF;YACD;gBACE,IAAI,EAAE,OAAO;gBACb,QAAQ,EAAE;oBACR;wBACE,IAAI,EAAC,EAAE;wBACP,YAAY,EAAE,GAAE,EAAE,CAAC,mWAAqC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,eAAe,CAAC;qBACtF;iBACF;aACF;YACD;gBACE,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE;oBACR;wBACE,IAAI,EAAC,EAAE;wBACT,YAAY,EAAE,GAAE,EAAE,CAAC,mfAAuC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,gBAAgB,CAAC;qBACvF;oBACD;wBACE,IAAI,EAAC,kBAAkB;wBACvB,YAAY,EAAE,GAAE,EAAE,CAAC,mXAA0D,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,qBAAqB,CAAC;qBACjH;iBACF;aACF;YACD;gBACE,IAAI,EAAE,kBAAkB;gBACxB,QAAQ,EAAE;oBACR;wBACE,IAAI,EAAC,EAAE;wBACP,YAAY,EAAE,GAAE,EAAE,CAAC,wsBAA2D,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,yBAAyB,CAAC;qBACtH;oBACD;wBACE,IAAI,EAAC,YAAY;wBACjB,QAAQ,EAAE;4BACR;gCACE,IAAI,EAAC,EAAE;gCACP,YAAY,EAAE,GAAE,EAAE,CAAC,uiBAAgE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,oBAAoB,CAAC;6BACtH;4BACD;gCACE,IAAI,EAAC,eAAe;gCACpB,YAAY,EAAE,GAAE,EAAE,CAAC,2XAAyF,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,0BAA0B,CAAC;6BACrJ;4BACD;gCACE,IAAI,EAAC,yBAAyB;gCAC9B,YAAY,EAAE,GAAE,EAAE,CAAC,mXAA0D,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,qBAAqB,CAAC;6BACjH;yBACF;qBACF;oBACD;wBACE,IAAI,EAAC,YAAY;wBACjB,QAAQ,EAAE;4BACR;gCACE,IAAI,EAAC,EAAE;gCACP,YAAY,EAAE,GAAE,EAAE,CAAC,kaAAgE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,mBAAmB,CAAC;6BACrH;yBACF;qBACF;iBACF;aACF;YACD;gBACE,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE;oBACR;wBACE,IAAI,EAAC,EAAE;wBACP,YAAY,EAAE,GAAE,EAAE,CAAC,qNAAuC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,gBAAgB,CAAC;qBACzF;iBACF;aACF;YACD;gBACE,IAAI,EAAE,cAAc;gBACpB,QAAQ,EAAE;oBACR;wBACE,IAAI,EAAC,EAAE;wBACP,YAAY,EAAE,GAAE,EAAE,CAAC,qwBAAmD,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,sBAAsB,CAAC;qBAC3G;oBACD;wBACE,IAAI,EAAC,mBAAmB;wBACxB,QAAQ,EAAE;4BACR;gCACE,IAAI,EAAC,WAAW;gCAChB,YAAY,EAAE,GAAE,EAAE,CAAC,8UAA0E,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,0BAA0B,CAAC;6BACtI;4BACD;gCACE,IAAI,EAAC,oBAAoB;gCACzB,QAAQ,EAAE;oCACR;wCACE,IAAI,EAAE,KAAK;wCACb,YAAY,EAAE,GAAE,EAAE,CAAC,4YAA8F,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,2BAA2B,CAAC;qCACzJ;iCACF;6BAEF;yBACF;qBACF;iBACF;aACF;YACD;gBACE,IAAI,EAAE,MAAM;gBACZ,QAAQ,EAAE;oBACR;wBACE,IAAI,EAAC,EAAE;wBACP,YAAY,EAAE,GAAE,EAAE,CAAC,qvBAAmC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC;qBACnF;iBACF;aACF;SACF;KACF;IACD;QACE,IAAI,EAAE,EAAE;QACR,UAAU,EAAE,cAAc;QAC1B,SAAS,EAAE,MAAM;KAClB;CACF,CAAC;AAMF,IAAa,qBAAqB,GAAlC,MAAa,qBAAqB;CAAG;AAAxB,qBAAqB;IAJjC,8DAAQ,CAAC;QACR,OAAO,EAAE,CAAC,4DAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QACxC,OAAO,EAAE,CAAC,4DAAY,CAAC;KACxB,CAAC;GACW,qBAAqB,CAAG;AAAH;;;;;;;;;;;;;;;;;;;;;;;;ACpKO;AACM;AACF;AAEA;AAEiB;AAEvB;AACvC,+DAA+D;AACH;AAY5D,IAAa,cAAc,GAA3B,MAAa,cAAc;CAAG;AAAjB,cAAc;IAV1B,8DAAQ,CAAC;QACR,OAAO,EAAE;YACP,4DAAY;YACZ,0DAAW;YACX,0DAAW;YACX,0EAAqB;YACrB,yEAAY;SACb;QACD,YAAY,EAAE,CAAC,mDAAQ,CAAC;KACzB,CAAC;GACW,cAAc,CAAG;AAAH;;;;;;;;;;;;;ACtB3B;AAAe,6EAAc,0BAA0B,qBAAqB,GAAG,eAAe,uCAAuC,sBAAsB,oBAAoB,uCAAuC,mBAAmB,0BAA0B,6BAA6B,MAAM,mBAAmB,kBAAkB,kCAAkC,GAAG,6CAA6C,+0DAA+0D,E;;;;;;;;;;;;;;;;;;;;;;;;;;ACA1rE;AACS;AACd;AAEoB;AAEhB;AACiF;AACrB;AACc;AAEC;AACnF;AAGzC,MAAM,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,GAAG,uDAAO,CAAC;AAOnF,IAAa,QAAQ,GAArB,MAAa,QAAQ;IASnB,YAAoB,YAA2B,EAAU,gBAAkC,EAAU,MAAc,EAAU,eAAgC;QAAzI,iBAAY,GAAZ,YAAY,CAAe;QAAU,qBAAgB,GAAhB,gBAAgB,CAAkB;QAAU,WAAM,GAAN,MAAM,CAAQ;QAAU,oBAAe,GAAf,eAAe,CAAiB;QAJ7J,eAAU,GAAG,CAAC,CAAC;QACf,oBAAe,GAAG,CAAC,CAAC;IAG8I,CAAC;IAEnK,QAAQ;QACN,6BAA6B;QAC7B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,IAAI,CAAC,OAAO,IAAI,OAAO,EAAE;YAC3B,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,kEAAU,CAAC,IAAI,IAAI,EAAE,EAAE,qBAAqB,EAAE,IAAI,CAAC,EAAE,kEAAU,CAAC,IAAI,IAAI,EAAE,EAAE,YAAY,EAAE,IAAI,CAAC,GAAG,WAAW,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE;gBAC9J,IAAI,CAAC,UAAU,GAAG,GAAG,CAAC;gBACtB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;YAC3C,CAAC,CAAC,CAAC;SACJ;aACI;YACH,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,kEAAU,CAAC,IAAI,IAAI,EAAE,EAAE,qBAAqB,EAAE,IAAI,CAAC,EAAE,kEAAU,CAAC,IAAI,IAAI,EAAE,EAAE,YAAY,EAAE,IAAI,CAAC,GAAG,WAAW,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE;gBAC9J,IAAI,CAAC,UAAU,GAAG,GAAG,CAAC;gBACtB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;YAC3C,CAAC,CAAC,CAAC;SAEJ;QACD,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE;YACxE,IAAI,CAAC,eAAe,GAAG,MAAM,CAAC;QAChC,CAAC,CAAC,CAAC;QACH;;;;;;;;;;;;;;kEAc0D;QAE1D,iBAAiB,CAAC,WAAW,CAAC,mBAAmB,EAAE,CAAC,KAAU,EAAE,EAAE;YAChE,KAAK,CAAC,yBAAyB,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;QAC3D,CAAC,CAAC,CAAC;QAEH,iBAAiB,CAAC,WAAW,CAAC,0BAA0B,EAAE,YAAY,CAAC,EAAE;YAEvE,yEAAyE;YAEzE,uFAAuF;YACvF,wCAAwC;YAEpC,gHAAgH;YAChH,kBAAkB,CAAC,QAAQ,CAAC;gBACxB,aAAa,EAAE,CAAC;wBACZ,KAAK,EAAE,YAAY,CAAC,KAAK;wBACzB,IAAI,EAAE,YAAY,CAAC,IAAI;wBACvB,EAAE,EAAE,IAAI,IAAI,EAAE,CAAC,kBAAkB,EAAE;wBACnC,QAAQ,EAAE;4BACN,EAAE,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;yBAClC;wBACD,KAAK,EAAE,YAAY,CAAC,IAAI;wBACxB,SAAS,EAAE,mBAAmB;qBACjC,CAAC;aACL,CAAC,CAAC;YACP,GAAG;QACP,CAAC,CAAC,CAAC;QAGD,iBAAiB,CAAC,WAAW,CAC3B,iCAAiC,EACjC,CAAC,YAA6C,EAAE,EAAE;YAChD,IAAI,OAAO,GAAG,YAAY,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC;YACrD,IAAI,MAAM,GAAG,YAAY,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC;YACnD,IAAI,QAAQ,GAAG,YAAY,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC;YAEvD,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;YAClC,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;YAChC,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;YAEpC;;;;qFAIyE;YACxE,6CAA6C;YAC/C,IAAI;YAEH,wBAAwB;YAExB;;;;;;;;;iGASqF;YAEnF,IAAI,OAAO,KAAK,QAAQ,EAAE;gBACxB,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;aAC7D;iBAAO,IAAI,OAAO,KAAK,kBAAkB,IAAI,MAAM,IAAI,YAAY,EAAE;gBACpE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC;aAC3C;iBAAM,IAAI,OAAO,KAAK,kBAAkB,IAAI,MAAM,KAAK,YAAY,EAAE;gBACpE,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC;aACnC;iBAAM,IAAI,OAAO,KAAK,QAAQ,IAAI,MAAM,KAAK,OAAO,EAAE;gBACrD,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC;aAChC;iBAAM,IAAI,OAAO,KAAK,QAAQ,IAAI,MAAM,KAAK,YAAY,EAAE;gBAC1D,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC;aACrC;YAKH;;;;;;;;;;;;;;;;;;;;;;;;;eAyBG;QAIL,CAAC,CACF,CAAC;IACJ,CAAC;IAEK,wBAAwB,CAAC,YAAY;;YAEzC,uBAAuB;gBAEvB,kBAAkB,CAAC,QAAQ,CAAC;gBAC1B,aAAa,EAAE;oBACb;wBACE,KAAK,EAAE,YAAY,CAAC,KAAK;wBACzB,IAAI,EAAE,YAAY,CAAC,IAAI;wBACvB,EAAE,EAAE,CAAC;wBACL,QAAQ,EAAE,EAAE,EAAE,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,EAAE;wBAC7C,KAAK,EAAE,IAAI;wBACX,WAAW,EAAE,IAAI;wBACjB,YAAY,EAAE,EAAE;wBAChB,KAAK,EAAE,IAAI;wBACX,UAAU,EAAE,IAAI;qBACjB;iBACF;aACF,CAAC,CAAC;QACL,CAAC;KAAA;IAEK,mBAAmB,CAAC,YAAgB;;YACxC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAE1B,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC;gBAC9C,SAAS,EAAE,oIAAoB;gBAC/B,cAAc,EAAC;oBACb,YAAY,EAAE,YAAY;oBAC1B,OAAO,EAAE,IAAI,CAAC,OAAO;iBACtB;gBACD,QAAQ,EAAE,OAAO;gBACjB,eAAe,EAAE,KAAK;aACvB,CAAC,CAAC;YACH,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC;YACtB,KAAK,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC,CAAC,GAAG,EAAC,EAAE;gBAC/B,IAAG,GAAG,EAAC;oBACL,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;iBAClB;YACH,CAAC,CAAC,CAAC;QACL,CAAC;KAAA;IAIK,qBAAqB,CAAC,QAAQ;;YAClC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC;gBAC9C,SAAS,EAAE,0IAAqB;gBAChC,cAAc,EAAE;oBACd,QAAQ,EAAE,QAAQ;iBACnB;gBACD,QAAQ,EAAE,oBAAoB;gBAC9B,eAAe,EAAE,KAAK;aACvB,CAAC,CAAC;YACH,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC;YACtB,KAAK,CAAC,YAAY,EAAE,CAAC;QACvB,CAAC;KAAA;IAEK,gBAAgB,CAAC,QAAQ;;YAG7B,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC;gBAC9C,SAAS,EAAE,qHAAoB;gBAC/B;kCACkB;gBAClB,cAAc,EAAE;oBACd,IAAI,EAAE,QAAQ;iBACf;gBACD,QAAQ,EAAE,YAAY;gBACtB,eAAe,EAAE,KAAK;aACvB,CAAC,CAAC;YACH,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC;YACtB,KAAK,CAAC,YAAY,EAAE,CAAC;QACvB,CAAC;KAAA;CAEF;;YA1NmC,sEAAa;YAA4B,4EAAgB;YAAkB,uDAAM;YAA2B,8DAAe;;AATlJ,QAAQ;IALpB,+DAAS,CAAC;QACT,QAAQ,EAAE,UAAU;QACpB,8MAA+B;;KAEhC,CAAC;GACW,QAAQ,CAmOpB;AAnOoB;;;;;;;;;;;;;;;;;;;ACtBsB;AACY;AAKvD,IAAa,gBAAgB,GAA7B,MAAa,gBAAgB;IACzB,YAAoB,WAAwB;QAAxB,gBAAW,GAAX,WAAW,CAAa;IAAE,CAAC;IAE/C,OAAO;QACH,OAAO,IAAI,CAAC,WAAW,CAAC,WAAW,EAAE,CAAC;IAC1C,CAAC;CACJ;;YALoC,kEAAW;;AADnC,gBAAgB;IAH5B,gEAAU,CAAC;QACV,UAAU,EAAE,MAAM;KACnB,CAAC;GACW,gBAAgB,CAM5B;AAN4B","file":"home-home-module-es2015.js","sourcesContent":["export default \"\\r\\n\\r\\n\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n {{totalEvent}}\\r\\n Início\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n Agenda\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n {{totalExpediente}}\\r\\n Gabinete\\r\\n \\r\\n \\r\\n \\r\\n Acções\\r\\n \\r\\n \\r\\n \\r\\n Chat\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n\";","import { NgModule } from '@angular/core';\r\nimport { Routes, RouterModule } from '@angular/router';\r\nimport { HomeGuard } from '../guards/home.guard';\r\nimport { UserDataResolver } from '../resolvers/userData.resolver';\r\n\r\nimport { HomePage } from './home.page';\r\n\r\nconst routes: Routes = [\r\n {\r\n path: 'home',\r\n component: HomePage,\r\n /* canActivate: [HomeGuard], */\r\n resolve: {\r\n userData: UserDataResolver\r\n },\r\n children: [\r\n {\r\n path: 'events',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/events/events.module').then(m => m.EventsPageModule)\r\n },\r\n {\r\n path:':eventId/:caller',\r\n loadChildren: ()=> import('../pages/events/event-detail/event-detail.module').then(m => m.EventDetailPageModule),\r\n },\r\n ]\r\n },\r\n {\r\n path: 'attachments',\r\n children: [\r\n {\r\n path:':eventId',\r\n loadChildren: ()=> import('../pages/events/attachments/attachments.module').then(m => m.AttachmentsPageModule)\r\n },\r\n\r\n ]\r\n },\r\n {\r\n path: 'attendees',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/events/attendees/attendees.module').then(m => m.AttendeesPageModule)\r\n },\r\n ]\r\n },\r\n {\r\n path: 'login',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/login/login.module').then(m => m.LoginPageModule)\r\n },\r\n ]\r\n },\r\n {\r\n path: 'agenda',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/agenda/agenda.module').then(m => m.AgendaPageModule)\r\n },\r\n {\r\n path:':eventId/:caller',\r\n loadChildren: ()=> import('../pages/events/event-detail/event-detail.module').then(m => m.EventDetailPageModule),\r\n }\r\n ]\r\n },\r\n {\r\n path: 'gabinete-digital',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/gabinete-digital/gabinete-digital.module').then(m => m.GabineteDigitalPageModule)\r\n },\r\n {\r\n path:'expediente',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/gabinete-digital/expediente/expediente.module').then(m => m.ExpedientePageModule)\r\n },\r\n {\r\n path:':SerialNumber',\r\n loadChildren: ()=> import('../pages/gabinete-digital/expediente/expediente-detail/expediente-detail.module').then(m => m.ExpedienteDetailPageModule)\r\n },\r\n {\r\n path:'events/:eventId/:caller',\r\n loadChildren: ()=> import('../pages/events/event-detail/event-detail.module').then(m => m.EventDetailPageModule),\r\n }\r\n ]\r\n },\r\n {\r\n path:'event-list',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/gabinete-digital/event-list/event-list.module').then(m => m.EventListPageModule)\r\n },\r\n ] \r\n },\r\n ]\r\n },\r\n {\r\n path: 'search',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/search/search.module').then(m => m.SearchPageModule)\r\n }\r\n ]\r\n },\r\n {\r\n path: 'publications',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/publications/publications.module').then(m => m.PublicationsPageModule)\r\n },\r\n {\r\n path:'view-publications',\r\n children: [\r\n {\r\n path:':folderId',\r\n loadChildren: ()=> import('../pages/publications/view-publications/view-publications.module').then(m => m.ViewPublicationsPageModule)\r\n },\r\n {\r\n path:'publication-detail',\r\n children: [\r\n {\r\n path: ':id',\r\n loadChildren: ()=> import('../pages/publications/view-publications/publication-detail/publication-detail.module').then(m => m.PublicationDetailPageModule)\r\n },\r\n ]\r\n \r\n },\r\n ] \r\n },\r\n ]\r\n },\r\n {\r\n path: 'chat',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/chat/chat.module').then(m => m.ChatPageModule)\r\n }\r\n ]\r\n },\r\n ]\r\n },\r\n {\r\n path: '',\r\n redirectTo: '/home/events',\r\n pathMatch: 'full'\r\n }\r\n];\r\n\r\n@NgModule({\r\n imports: [RouterModule.forChild(routes)],\r\n exports: [RouterModule],\r\n})\r\nexport class HomePageRoutingModule {}\r\n","import { NgModule } from '@angular/core';\r\nimport { CommonModule } from '@angular/common';\r\nimport { FormsModule } from '@angular/forms';\r\n\r\nimport { IonicModule } from '@ionic/angular';\r\n\r\nimport { HomePageRoutingModule } from './home-routing.module';\r\n\r\nimport { HomePage } from './home.page';\r\n/* import { IonicSelectableModule } from 'ionic-selectable'; */\r\nimport { SharedModule } from 'src/app/shared/shared.module';\r\n\r\n@NgModule({\r\n imports: [\r\n CommonModule,\r\n FormsModule,\r\n IonicModule,\r\n HomePageRoutingModule,\r\n SharedModule\r\n ],\r\n declarations: [HomePage]\r\n})\r\nexport class HomePageModule {}\r\n","export default \"ion-tab-bar {\\n --background: #f9f9f9;\\n --color: #061b52;\\n}\\n\\nion-badge {\\n /* */\\n /* display: inline-block;*/\\n min-width: 18px;\\n font-size: 15px;\\n /* font-weight: $badge-font-weight;\\n line-height: 1;\\n\\n white-space: nowrap;\\n vertical-align: baseline; */\\n}\\n\\n.tab .bottoms {\\n display: flex;\\n justify-content: space-around;\\n}\\n/*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNyYy9hcHAvaG9tZS9DOlxcVXNlcnNcXHRpYWdvLmtheWF5YVxcZGV2ZWxvcG1lbnRcXGdhYmluZXRlLWRpZ2l0YWwvc3JjXFxhcHBcXGhvbWVcXGhvbWUucGFnZS5zY3NzIiwic3JjL2FwcC9ob21lL2hvbWUucGFnZS5zY3NzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBO0VBQ0kscUJBQUE7RUFDQSxnQkFBQTtBQ0FKOztBRGFBO0VBQVcsS0FBQTtFQUVULDBCQUFBO0VBRUEsZUFBQTtFQUNBLGVBWGU7RUFZZjs7Ozs2QkFBQTtBQ1BGOztBRGdCRTtFQUNFLGFBQUE7RUFDQSw2QkFBQTtBQ2JKIiwiZmlsZSI6InNyYy9hcHAvaG9tZS9ob21lLnBhZ2Uuc2NzcyIsInNvdXJjZXNDb250ZW50IjpbIlxyXG5pb24tdGFiLWJhcntcclxuICAgIC0tYmFja2dyb3VuZDogI2Y5ZjlmOTtcclxuICAgIC0tY29sb3I6ICMwNjFiNTI7XHJcbn1cclxuXHJcbi8vIEJhZGdlXHJcbi8vIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tXHJcblxyXG4vLy8gQHByb3AgLSBGb250IHNpemUgb2YgdGhlIGJhZGdlXHJcbiRiYWRnZS1mb250LXNpemU6MTVweCAhZGVmYXVsdDtcclxuXHJcbi8vLyBAcHJvcCAtIEZvbnQgd2VpZ2h0IG9mIHRoZSBiYWRnZVxyXG4kYmFkZ2UtZm9udC13ZWlnaHQ6Ym9sZCAhZGVmYXVsdDtcclxuXHJcblxyXG5pb24tYmFkZ2Ugey8qICAqL1xyXG5cclxuICAvKiBkaXNwbGF5OiBpbmxpbmUtYmxvY2s7Ki9cclxuXHJcbiAgbWluLXdpZHRoOiAxOHB4OyBcclxuICBmb250LXNpemU6ICRiYWRnZS1mb250LXNpemU7XHJcbiAgLyogZm9udC13ZWlnaHQ6ICRiYWRnZS1mb250LXdlaWdodDtcclxuICBsaW5lLWhlaWdodDogMTtcclxuXHJcbiAgd2hpdGUtc3BhY2U6IG5vd3JhcDtcclxuICB2ZXJ0aWNhbC1hbGlnbjogYmFzZWxpbmU7ICovXHJcbn1cclxuXHJcblxyXG4udGFie1xyXG4gIC5ib3R0b21ze1xyXG4gICAgZGlzcGxheTogZmxleDtcclxuICAgIGp1c3RpZnktY29udGVudDogc3BhY2UtYXJvdW5kO1xyXG4gIH1cclxufSIsImlvbi10YWItYmFyIHtcbiAgLS1iYWNrZ3JvdW5kOiAjZjlmOWY5O1xuICAtLWNvbG9yOiAjMDYxYjUyO1xufVxuXG5pb24tYmFkZ2Uge1xuICAvKiAgKi9cbiAgLyogZGlzcGxheTogaW5saW5lLWJsb2NrOyovXG4gIG1pbi13aWR0aDogMThweDtcbiAgZm9udC1zaXplOiAxNXB4O1xuICAvKiBmb250LXdlaWdodDogJGJhZGdlLWZvbnQtd2VpZ2h0O1xuICBsaW5lLWhlaWdodDogMTtcblxuICB3aGl0ZS1zcGFjZTogbm93cmFwO1xuICB2ZXJ0aWNhbC1hbGlnbjogYmFzZWxpbmU7ICovXG59XG5cbi50YWIgLmJvdHRvbXMge1xuICBkaXNwbGF5OiBmbGV4O1xuICBqdXN0aWZ5LWNvbnRlbnQ6IHNwYWNlLWFyb3VuZDtcbn0iXX0= */\";","import { Component, OnInit } from '@angular/core';\r\nimport { EventsService } from '../services/events.service';\r\nimport { formatDate } from '@angular/common';\r\nimport { Event } from '../models/event.model';\r\nimport { ProcessesService } from '../services/processes.service';\r\nimport { StorageService } from 'src/app/services/storage.service';\r\nimport { ModalController } from '@ionic/angular';\r\nimport { PublicationDetailPage } from '../../app/pages/publications/view-publications/publication-detail/publication-detail.page';\r\nimport { ViewPublicationsPage } from '../../app/pages/publications/view-publications/view-publications.page';\r\nimport { ExpedienteDetailPage } from '../../app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page'\r\n\r\nimport { Plugins, PushNotification, PushNotificationToken, PushNotificationActionPerformed, Modals } from '@capacitor/core';\r\nimport { Router } from '@angular/router';\r\nimport { MethodCall } from '@angular/compiler';\r\n\r\nconst { PushNotifications, LocalNotifications, LocalNotificationAction } = Plugins;\r\n\r\n@Component({\r\n selector: 'app-home',\r\n templateUrl: './home.page.html',\r\n styleUrls: ['./home.page.scss'],\r\n})\r\nexport class HomePage implements OnInit {\r\n eventsList: Event[];\r\n prEventList: Event[];\r\n mdEventList: Event[];\r\n\r\n totalEvent = 0;\r\n totalExpediente = 0;\r\n profile: string;\r\n\r\n constructor(private eventService: EventsService, private processesbackend: ProcessesService, private router: Router, private modalController: ModalController,) { }\r\n\r\n ngOnInit() {\r\n //Initialize profile as mdgpr\r\n this.profile = \"mdgpr\";\r\n if (this.profile == \"mdgpr\") {\r\n this.eventService.getAllMdEvents(formatDate(new Date(), 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => {\r\n this.eventsList = res;\r\n this.totalEvent = this.eventsList.length;\r\n });\r\n }\r\n else {\r\n this.eventService.getAllPrEvents(formatDate(new Date(), 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => {\r\n this.eventsList = res;\r\n this.totalEvent = this.eventsList.length;\r\n });\r\n\r\n }\r\n this.processesbackend.GetTasksList(\"Expediente\", true).subscribe(result => {\r\n this.totalExpediente = result;\r\n });\r\n /*\r\n (PushNotifications as any).requestPermission().then(result => {\r\n PushNotifications.register();\r\n });\r\n \r\n PushNotifications.addListener(\r\n 'registration',\r\n (token: PushNotificationToken) => {\r\n alert('Push registration success, token: ' + token.value);\r\n console.log('FIREBASE: ', token.value)\r\n this.storageService.store(this.username,token.value);\r\n },\r\n );\r\n \r\n console.log(this.storageService.get(this.username)) */\r\n\r\n PushNotifications.addListener('registrationError', (error: any) => {\r\n alert('Error on registration: ' + JSON.stringify(error));\r\n });\r\n\r\n PushNotifications.addListener('pushNotificationReceived', notification => { \r\n\r\n //const isPushNotification = !!notification.title || !!notification.body;\r\n \r\n // if this is a push notification received when the app is in the foreground on Android\r\n //if (isAndroid && isPushNotification) {\r\n \r\n // We schedule a LocalNotification 1 second later since Capacitor for Android doesn't show anything in this case\r\n LocalNotifications.schedule({\r\n notifications: [{\r\n title: notification.title,\r\n body: notification.body,\r\n id: new Date().getUTCMilliseconds(),\r\n schedule: {\r\n at: new Date(Date.now() + 1000)\r\n },\r\n extra: notification.data,\r\n channelId: 'pop-notifications'\r\n }]\r\n });\r\n //}\r\n });\r\n \r\n\r\n PushNotifications.addListener(\r\n 'pushNotificationActionPerformed',\r\n (notification: PushNotificationActionPerformed) => {\r\n let service = notification.notification.data.service;\r\n let object = notification.notification.data.object;\r\n let idObject = notification.notification.data.idObject;\r\n\r\n console.log('Service: ', service);\r\n console.log('Object: ', object);\r\n console.log('idObject: ', idObject);\r\n\r\n /* if (service === \"events\") {\r\n this.router.navigate(['/home/', service, idObject, 'home']);\r\n } else if (service === \"agenda\") {\r\n this.router.navigate(['/home/', service, idObject, 'home']);\r\n } else if (service === \"gabinete-digital\" && object != \"expediente\") {*/\r\n // this.router.navigate(['/home/', service]);\r\n // }\r\n\r\n //if (service != null) {\r\n\r\n /*const routeValue = {\r\n \"agenda\": this.router.navigate(['/home/', service, idObject, 'home']),\r\n \"gabinete-digital\": this.router.navigate(['/home/', service]),\r\n \"accoes\": this.viewExpedientDetail(idObject),\r\n\r\n }\r\n\r\n const route = routeValue[service] && object ;\r\n\r\n service = \"agenda\" ? this.router.navigate(['/home/', service, idObject, 'home']) : */\r\n\r\n if (service === \"agenda\") {\r\n this.router.navigate(['/home/', service, idObject, 'home']);\r\n } else if (service === \"gabinete-digital\" && object != \"expediente\") {\r\n this.router.navigate(['/home/', service]);\r\n } else if (service === \"gabinete-digital\" && object === \"expediente\") {\r\n this.viewExpedientDetail(idObject)\r\n } else if (service === \"accoes\" && object === \"accao\") {\r\n this.viewPublications(idObject)\r\n } else if (service === \"accoes\" && object === \"publicacao\") {\r\n this.viewPublicationDetail(idObject)\r\n }\r\n \r\n\r\n\r\n\r\n /*switch (service) {\r\n case \"events\":\r\n this.router.navigate(['/home/', service, idObject, 'home']);\r\n break;\r\n case \"agenda\":\r\n this.router.navigate(['/home/', service, idObject, 'home']);\r\n break;\r\n case \"gabinete-digital\":\r\n this.router.navigate(['/home/', service]);\r\n break;\r\n case \"gabinete-digital-expediente\":\r\n this.router.navigate(['/home/gabinete-digital/', object, idObject, 'home']);\r\n break;\r\n case \"\": {\r\n\r\n if(publicationId && processId != null) {\r\n this.viewPublicationDetail(publicationId,processId)\r\n }\r\n if (folder.ProcessId != null) {\r\n this.viewPublications(folder)\r\n }\r\n }\r\n\r\n default:\r\n this.router.navigate(['/home/']);\r\n }*/\r\n\r\n\r\n\r\n },\r\n );\r\n }\r\n\r\n async localNotificationPresent(notification) {\r\n\r\n LocalNotificationAction.\r\n\r\n LocalNotifications.schedule({\r\n notifications: [\r\n {\r\n title: notification.title,\r\n body: notification.body,\r\n id: 1,\r\n schedule: { at: new Date(Date.now() + 1000) },\r\n sound: null,\r\n attachments: null,\r\n actionTypeId: \"\",\r\n extra: null,\r\n foreground: true,\r\n }\r\n ]\r\n });\r\n }\r\n\r\n async viewExpedientDetail(serialNumber:any) {\r\n console.log(this.profile);\r\n \r\n const modal = await this.modalController.create({\r\n component: ExpedienteDetailPage,\r\n componentProps:{\r\n serialNumber: serialNumber,\r\n profile: this.profile,\r\n },\r\n cssClass: 'modal',\r\n backdropDismiss: false\r\n });\r\n await modal.present();\r\n modal.onDidDismiss().then((res)=>{\r\n if(res){\r\n console.log(res);\r\n }\r\n });\r\n }\r\n\r\n\r\n\r\n async viewPublicationDetail(folderId) {\r\n const modal = await this.modalController.create({\r\n component: PublicationDetailPage,\r\n componentProps: {\r\n folderId: folderId,\r\n },\r\n cssClass: 'publication-detail',\r\n backdropDismiss: false\r\n });\r\n await modal.present();\r\n modal.onDidDismiss();\r\n }\r\n\r\n async viewPublications(folderId) {\r\n\r\n\r\n const modal = await this.modalController.create({\r\n component: ViewPublicationsPage,\r\n /* enterAnimation,\r\n leaveAnimation, */\r\n componentProps: {\r\n item: folderId,\r\n },\r\n cssClass: 'new-action',\r\n backdropDismiss: false\r\n });\r\n await modal.present();\r\n modal.onDidDismiss();\r\n }\r\n\r\n}\r\n","import { Injectable } from '@angular/core';\r\nimport { AuthService } from '../services/auth.service';\r\n\r\n@Injectable({\r\n providedIn: 'root'\r\n})\r\nexport class UserDataResolver{ \r\n constructor(private authService: AuthService){}\r\n\r\n resolve(){\r\n return this.authService.getUserData();\r\n }\r\n}"],"sourceRoot":"webpack:///"}
+=======
+{"version":3,"sources":["./src/app/home/home.page.html","./src/app/home/home-routing.module.ts","./src/app/home/home.module.ts","./src/app/home/home.page.scss","./src/app/home/home.page.ts","./src/app/resolvers/userData.resolver.ts"],"names":[],"mappings":"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","file":"home-home-module-es2015.js","sourcesContent":["export default \"\\r\\n\\r\\n\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n {{totalEvent}}\\r\\n Início\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n Agenda\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n {{totalExpediente}}\\r\\n Gabinete\\r\\n \\r\\n \\r\\n \\r\\n Acções\\r\\n \\r\\n \\r\\n \\r\\n Chat\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n\";","import { NgModule } from '@angular/core';\r\nimport { Routes, RouterModule } from '@angular/router';\r\nimport { HomeGuard } from '../guards/home.guard';\r\nimport { UserDataResolver } from '../resolvers/userData.resolver';\r\n\r\nimport { HomePage } from './home.page';\r\n\r\nconst routes: Routes = [\r\n {\r\n path: 'home',\r\n component: HomePage,\r\n /* canActivate: [HomeGuard], */\r\n resolve: {\r\n userData: UserDataResolver\r\n },\r\n children: [\r\n {\r\n path: 'events',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/events/events.module').then(m => m.EventsPageModule)\r\n },\r\n {\r\n path:':eventId/:caller',\r\n loadChildren: ()=> import('../pages/events/event-detail/event-detail.module').then(m => m.EventDetailPageModule),\r\n },\r\n ]\r\n },\r\n {\r\n path: 'attachments',\r\n children: [\r\n {\r\n path:':eventId',\r\n loadChildren: ()=> import('../pages/events/attachments/attachments.module').then(m => m.AttachmentsPageModule)\r\n },\r\n\r\n ]\r\n },\r\n {\r\n path: 'attendees',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/events/attendees/attendees.module').then(m => m.AttendeesPageModule)\r\n },\r\n ]\r\n },\r\n {\r\n path: 'login',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/login/login.module').then(m => m.LoginPageModule)\r\n },\r\n ]\r\n },\r\n {\r\n path: 'agenda',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/agenda/agenda.module').then(m => m.AgendaPageModule)\r\n },\r\n {\r\n path:':eventId/:caller',\r\n loadChildren: ()=> import('../pages/events/event-detail/event-detail.module').then(m => m.EventDetailPageModule),\r\n }\r\n ]\r\n },\r\n {\r\n path: 'gabinete-digital',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/gabinete-digital/gabinete-digital.module').then(m => m.GabineteDigitalPageModule)\r\n },\r\n {\r\n path:'expediente',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/gabinete-digital/expediente/expediente.module').then(m => m.ExpedientePageModule)\r\n },\r\n {\r\n path:':SerialNumber',\r\n loadChildren: ()=> import('../pages/gabinete-digital/expediente/expediente-detail/expediente-detail.module').then(m => m.ExpedienteDetailPageModule)\r\n },\r\n {\r\n path:'events/:eventId/:caller',\r\n loadChildren: ()=> import('../pages/events/event-detail/event-detail.module').then(m => m.EventDetailPageModule),\r\n }\r\n ]\r\n },\r\n {\r\n path:'event-list',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/gabinete-digital/event-list/event-list.module').then(m => m.EventListPageModule)\r\n },\r\n ] \r\n },\r\n ]\r\n },\r\n {\r\n path: 'search',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/search/search.module').then(m => m.SearchPageModule)\r\n }\r\n ]\r\n },\r\n {\r\n path: 'publications',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/publications/publications.module').then(m => m.PublicationsPageModule)\r\n },\r\n {\r\n path:'view-publications',\r\n children: [\r\n {\r\n path:':folderId',\r\n loadChildren: ()=> import('../pages/publications/view-publications/view-publications.module').then(m => m.ViewPublicationsPageModule)\r\n },\r\n {\r\n path:'publication-detail',\r\n children: [\r\n {\r\n path: ':id',\r\n loadChildren: ()=> import('../pages/publications/view-publications/publication-detail/publication-detail.module').then(m => m.PublicationDetailPageModule)\r\n },\r\n ]\r\n \r\n },\r\n ] \r\n },\r\n ]\r\n },\r\n {\r\n path: 'chat',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/chat/chat.module').then(m => m.ChatPageModule)\r\n }\r\n ]\r\n },\r\n ]\r\n },\r\n {\r\n path: '',\r\n redirectTo: '/home/events',\r\n pathMatch: 'full'\r\n }\r\n];\r\n\r\n@NgModule({\r\n imports: [RouterModule.forChild(routes)],\r\n exports: [RouterModule],\r\n})\r\nexport class HomePageRoutingModule {}\r\n","import { NgModule } from '@angular/core';\r\nimport { CommonModule } from '@angular/common';\r\nimport { FormsModule } from '@angular/forms';\r\n\r\nimport { IonicModule } from '@ionic/angular';\r\n\r\nimport { HomePageRoutingModule } from './home-routing.module';\r\n\r\nimport { HomePage } from './home.page';\r\n/* import { IonicSelectableModule } from 'ionic-selectable'; */\r\nimport { SharedModule } from 'src/app/shared/shared.module';\r\n\r\n@NgModule({\r\n imports: [\r\n CommonModule,\r\n FormsModule,\r\n IonicModule,\r\n HomePageRoutingModule,\r\n SharedModule\r\n ],\r\n declarations: [HomePage]\r\n})\r\nexport class HomePageModule {}\r\n","export default \"ion-tab-bar {\\n --background: #f9f9f9;\\n --color: #061b52;\\n}\\n\\nion-badge {\\n /* */\\n /* display: inline-block;*/\\n min-width: 18px;\\n font-size: 15px;\\n /* font-weight: $badge-font-weight;\\n line-height: 1;\\n\\n white-space: nowrap;\\n vertical-align: baseline; */\\n}\\n\\n.tab .bottoms {\\n display: flex;\\n justify-content: space-around;\\n}\\n/*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNyYy9hcHAvaG9tZS9DOlxcVXNlcnNcXGV1ZGVzLmluYWNpb1xcR2FiaW5ldC1EaWdpdGFsUHJvamVjdFxcTmV3IGZvbGRlclxcZ2FiaW5ldGUtZGlnaXRhbC9zcmNcXGFwcFxcaG9tZVxcaG9tZS5wYWdlLnNjc3MiLCJzcmMvYXBwL2hvbWUvaG9tZS5wYWdlLnNjc3MiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0E7RUFDSSxxQkFBQTtFQUNBLGdCQUFBO0FDQUo7O0FEYUE7RUFBVyxLQUFBO0VBRVQsMEJBQUE7RUFFQSxlQUFBO0VBQ0EsZUFYZTtFQVlmOzs7OzZCQUFBO0FDUEY7O0FEZ0JFO0VBQ0UsYUFBQTtFQUNBLDZCQUFBO0FDYkoiLCJmaWxlIjoic3JjL2FwcC9ob21lL2hvbWUucGFnZS5zY3NzIiwic291cmNlc0NvbnRlbnQiOlsiXHJcbmlvbi10YWItYmFye1xyXG4gICAgLS1iYWNrZ3JvdW5kOiAjZjlmOWY5O1xyXG4gICAgLS1jb2xvcjogIzA2MWI1MjtcclxufVxyXG5cclxuLy8gQmFkZ2VcclxuLy8gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS1cclxuXHJcbi8vLyBAcHJvcCAtIEZvbnQgc2l6ZSBvZiB0aGUgYmFkZ2VcclxuJGJhZGdlLWZvbnQtc2l6ZToxNXB4ICFkZWZhdWx0O1xyXG5cclxuLy8vIEBwcm9wIC0gRm9udCB3ZWlnaHQgb2YgdGhlIGJhZGdlXHJcbiRiYWRnZS1mb250LXdlaWdodDpib2xkICFkZWZhdWx0O1xyXG5cclxuXHJcbmlvbi1iYWRnZSB7LyogICovXHJcblxyXG4gIC8qIGRpc3BsYXk6IGlubGluZS1ibG9jazsqL1xyXG5cclxuICBtaW4td2lkdGg6IDE4cHg7IFxyXG4gIGZvbnQtc2l6ZTogJGJhZGdlLWZvbnQtc2l6ZTtcclxuICAvKiBmb250LXdlaWdodDogJGJhZGdlLWZvbnQtd2VpZ2h0O1xyXG4gIGxpbmUtaGVpZ2h0OiAxO1xyXG5cclxuICB3aGl0ZS1zcGFjZTogbm93cmFwO1xyXG4gIHZlcnRpY2FsLWFsaWduOiBiYXNlbGluZTsgKi9cclxufVxyXG5cclxuXHJcbi50YWJ7XHJcbiAgLmJvdHRvbXN7XHJcbiAgICBkaXNwbGF5OiBmbGV4O1xyXG4gICAganVzdGlmeS1jb250ZW50OiBzcGFjZS1hcm91bmQ7XHJcbiAgfVxyXG59IiwiaW9uLXRhYi1iYXIge1xuICAtLWJhY2tncm91bmQ6ICNmOWY5Zjk7XG4gIC0tY29sb3I6ICMwNjFiNTI7XG59XG5cbmlvbi1iYWRnZSB7XG4gIC8qICAqL1xuICAvKiBkaXNwbGF5OiBpbmxpbmUtYmxvY2s7Ki9cbiAgbWluLXdpZHRoOiAxOHB4O1xuICBmb250LXNpemU6IDE1cHg7XG4gIC8qIGZvbnQtd2VpZ2h0OiAkYmFkZ2UtZm9udC13ZWlnaHQ7XG4gIGxpbmUtaGVpZ2h0OiAxO1xuXG4gIHdoaXRlLXNwYWNlOiBub3dyYXA7XG4gIHZlcnRpY2FsLWFsaWduOiBiYXNlbGluZTsgKi9cbn1cblxuLnRhYiAuYm90dG9tcyB7XG4gIGRpc3BsYXk6IGZsZXg7XG4gIGp1c3RpZnktY29udGVudDogc3BhY2UtYXJvdW5kO1xufSJdfQ== */\";","import { Component, OnInit } from '@angular/core';\r\nimport { EventsService } from '../services/events.service';\r\nimport { formatDate } from '@angular/common';\r\nimport { Event } from '../models/event.model';\r\nimport { ProcessesService } from '../services/processes.service';\r\nimport { StorageService } from 'src/app/services/storage.service';\r\nimport { ModalController } from '@ionic/angular';\r\nimport { PublicationDetailPage } from '../../app/pages/publications/view-publications/publication-detail/publication-detail.page';\r\nimport { ViewPublicationsPage } from '../../app/pages/publications/view-publications/view-publications.page';\r\nimport { ExpedienteDetailPage } from '../../app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page'\r\nimport { ViewEventPage } from '../../app/pages/agenda/view-event/view-event.page'\r\n\r\nimport { Plugins, PushNotification, PushNotificationToken, PushNotificationActionPerformed, Modals } from '@capacitor/core';\r\nimport { Router } from '@angular/router';\r\nimport { MethodCall } from '@angular/compiler';\r\n\r\nconst { PushNotifications, LocalNotifications, LocalNotificationAction } = Plugins;\r\n\r\n@Component({\r\n selector: 'app-home',\r\n templateUrl: './home.page.html',\r\n styleUrls: ['./home.page.scss'],\r\n})\r\nexport class HomePage implements OnInit {\r\n eventsList: Event[];\r\n prEventList: Event[];\r\n mdEventList: Event[];\r\n\r\n totalEvent = 0;\r\n totalExpediente = 0;\r\n profile: string;\r\n\r\n constructor(private eventService: EventsService, private processesbackend: ProcessesService, private router: Router, private modalController: ModalController,) { }\r\n\r\n ngOnInit() {\r\n //Initialize profile as mdgpr\r\n this.profile = \"mdgpr\";\r\n if (this.profile == \"mdgpr\") {\r\n this.eventService.getAllMdEvents(formatDate(new Date(), 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => {\r\n this.eventsList = res;\r\n this.totalEvent = this.eventsList.length;\r\n });\r\n }\r\n else {\r\n this.eventService.getAllPrEvents(formatDate(new Date(), 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => {\r\n this.eventsList = res;\r\n this.totalEvent = this.eventsList.length;\r\n });\r\n\r\n }\r\n this.processesbackend.GetTasksList(\"Expediente\", true).subscribe(result => {\r\n this.totalExpediente = result;\r\n });\r\n /*\r\n (PushNotifications as any).requestPermission().then(result => {\r\n PushNotifications.register();\r\n });\r\n \r\n PushNotifications.addListener(\r\n 'registration',\r\n (token: PushNotificationToken) => {\r\n alert('Push registration success, token: ' + token.value);\r\n console.log('FIREBASE: ', token.value)\r\n this.storageService.store(this.username,token.value);\r\n },\r\n );\r\n \r\n console.log(this.storageService.get(this.username)) */\r\n\r\n PushNotifications.addListener('registrationError', (error: any) => {\r\n alert('Error on registration: ' + JSON.stringify(error));\r\n });\r\n\r\n PushNotifications.addListener('pushNotificationReceived', notification => { \r\n\r\n //const isPushNotification = !!notification.title || !!notification.body;\r\n \r\n // if this is a push notification received when the app is in the foreground on Android\r\n //if (isAndroid && isPushNotification) {\r\n \r\n // We schedule a LocalNotification 1 second later since Capacitor for Android doesn't show anything in this case\r\n LocalNotifications.schedule({\r\n notifications: [{\r\n title: notification.title,\r\n body: notification.body,\r\n id: new Date().getUTCMilliseconds(),\r\n schedule: {\r\n at: new Date(Date.now() + 1000)\r\n },\r\n extra: notification.data,\r\n channelId: 'pop-notifications'\r\n }]\r\n });\r\n //}\r\n });\r\n \r\n\r\n PushNotifications.addListener(\r\n 'pushNotificationActionPerformed',\r\n (notification: PushNotificationActionPerformed) => {\r\n let service = notification.notification.data.service;\r\n let object = notification.notification.data.object;\r\n let idObject = notification.notification.data.idObject;\r\n\r\n console.log('Service: ', service);\r\n console.log('Object: ', object);\r\n console.log('idObject: ', idObject);\r\n\r\n /* if (service === \"events\") {\r\n this.router.navigate(['/home/', service, idObject, 'home']);\r\n } else if (service === \"agenda\") {\r\n this.router.navigate(['/home/', service, idObject, 'home']);\r\n } else if (service === \"gabinete-digital\" && object != \"expediente\") {*/\r\n // this.router.navigate(['/home/', service]);\r\n // }\r\n\r\n //if (service != null) {\r\n\r\n /*const routeValue = {\r\n \"agenda\": this.router.navigate(['/home/', service, idObject, 'home']),\r\n \"gabinete-digital\": this.router.navigate(['/home/', service]),\r\n \"accoes\": this.viewExpedientDetail(idObject),\r\n\r\n }\r\n\r\n const route = routeValue[service] && object ;\r\n\r\n service = \"agenda\" ? this.router.navigate(['/home/', service, idObject, 'home']) : */\r\n\r\n if (service === \"agenda\") {\r\n //this.router.navigate(['/home/', service, idObject, 'home']);\r\n this.viewEventDetail(idObject)\r\n } else if (service === \"gabinete-digital\" && object != \"expediente\") {\r\n this.router.navigate(['/home/', service]);\r\n } else if (service === \"gabinete-digital\" && object === \"expediente\") {\r\n this.viewExpedientDetail(idObject)\r\n } else if (service === \"accoes\" && object === \"accao\") {\r\n this.viewPublications(idObject)\r\n } else if (service === \"accoes\" && object === \"publicacao\") {\r\n this.viewPublicationDetail(idObject)\r\n }\r\n \r\n\r\n\r\n\r\n /*switch (service) {\r\n case \"events\":\r\n this.router.navigate(['/home/', service, idObject, 'home']);\r\n break;\r\n case \"agenda\":\r\n this.router.navigate(['/home/', service, idObject, 'home']);\r\n break;\r\n case \"gabinete-digital\":\r\n this.router.navigate(['/home/', service]);\r\n break;\r\n case \"gabinete-digital-expediente\":\r\n this.router.navigate(['/home/gabinete-digital/', object, idObject, 'home']);\r\n break;\r\n case \"\": {\r\n\r\n if(publicationId && processId != null) {\r\n this.viewPublicationDetail(publicationId,processId)\r\n }\r\n if (folder.ProcessId != null) {\r\n this.viewPublications(folder)\r\n }\r\n }\r\n\r\n default:\r\n this.router.navigate(['/home/']);\r\n }*/\r\n\r\n\r\n\r\n },\r\n );\r\n }\r\n\r\n async localNotificationPresent(notification) {\r\n\r\n LocalNotificationAction.\r\n\r\n LocalNotifications.schedule({\r\n notifications: [\r\n {\r\n title: notification.title,\r\n body: notification.body,\r\n id: 1,\r\n schedule: { at: new Date(Date.now() + 1000) },\r\n sound: null,\r\n attachments: null,\r\n actionTypeId: \"\",\r\n extra: null,\r\n foreground: true,\r\n }\r\n ]\r\n });\r\n }\r\n\r\n async viewEventDetail(eventId:any) {\r\n console.log(this.profile);\r\n \r\n const modal = await this.modalController.create({\r\n component: ViewEventPage,\r\n componentProps:{\r\n eventId: eventId,\r\n },\r\n cssClass: 'modal',\r\n backdropDismiss: false\r\n });\r\n await modal.present();\r\n modal.onDidDismiss().then((res)=>{\r\n if(res){\r\n console.log(res);\r\n //this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);\r\n }\r\n });\r\n }\r\n\r\n async viewExpedientDetail(serialNumber:any) {\r\n console.log(this.profile);\r\n \r\n const modal = await this.modalController.create({\r\n component: ExpedienteDetailPage,\r\n componentProps:{\r\n serialNumber: serialNumber,\r\n profile: this.profile,\r\n },\r\n cssClass: 'modal',\r\n backdropDismiss: false\r\n });\r\n await modal.present();\r\n modal.onDidDismiss().then((res)=>{\r\n if(res){\r\n console.log(res);\r\n }\r\n });\r\n }\r\n\r\n\r\n\r\n async viewPublicationDetail(folderId) {\r\n const modal = await this.modalController.create({\r\n component: PublicationDetailPage,\r\n componentProps: {\r\n folderId: folderId,\r\n },\r\n cssClass: 'publication-detail',\r\n backdropDismiss: false\r\n });\r\n await modal.present();\r\n modal.onDidDismiss();\r\n }\r\n\r\n async viewPublications(folderId) {\r\n\r\n\r\n const modal = await this.modalController.create({\r\n component: ViewPublicationsPage,\r\n /* enterAnimation,\r\n leaveAnimation, */\r\n componentProps: {\r\n item: folderId,\r\n },\r\n cssClass: 'new-action',\r\n backdropDismiss: false\r\n });\r\n await modal.present();\r\n modal.onDidDismiss();\r\n }\r\n\r\n}\r\n","import { Injectable } from '@angular/core';\r\nimport { AuthService } from '../services/auth.service';\r\n\r\n@Injectable({\r\n providedIn: 'root'\r\n})\r\nexport class UserDataResolver{ \r\n constructor(private authService: AuthService){}\r\n\r\n resolve(){\r\n return this.authService.getUserData();\r\n }\r\n}"],"sourceRoot":"webpack:///"}
+>>>>>>> origin/feature/pushNotifications
diff --git a/android/app/build/intermediates/merged_assets/debug/out/public/home-home-module-es5.js b/android/app/build/intermediates/merged_assets/debug/out/public/home-home-module-es5.js
index 3fbda80dd..d15097da5 100644
--- a/android/app/build/intermediates/merged_assets/debug/out/public/home-home-module-es5.js
+++ b/android/app/build/intermediates/merged_assets/debug/out/public/home-home-module-es5.js
@@ -504,17 +504,23 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
/* harmony import */
- var _capacitor_core__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(
+ var _app_pages_agenda_view_event_view_event_page__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(
+ /*! ../../app/pages/agenda/view-event/view-event.page */
+ "./src/app/pages/agenda/view-event/view-event.page.ts");
+ /* harmony import */
+
+
+ var _capacitor_core__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(
/*! @capacitor/core */
"./node_modules/@capacitor/core/dist/esm/index.js");
/* harmony import */
- var _angular_router__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(
+ var _angular_router__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(
/*! @angular/router */
"./node_modules/@angular/router/__ivy_ngcc__/fesm2015/router.js");
- var _capacitor_core__WEBP = _capacitor_core__WEBPACK_IMPORTED_MODULE_9__["Plugins"],
+ var _capacitor_core__WEBP = _capacitor_core__WEBPACK_IMPORTED_MODULE_10__["Plugins"],
PushNotifications = _capacitor_core__WEBP.PushNotifications,
LocalNotifications = _capacitor_core__WEBP.LocalNotifications,
LocalNotificationAction = _capacitor_core__WEBP.LocalNotificationAction;
@@ -616,7 +622,8 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
service = "agenda" ? this.router.navigate(['/home/', service, idObject, 'home']) : */
if (service === "agenda") {
- _this.router.navigate(['/home/', service, idObject, 'home']);
+ //this.router.navigate(['/home/', service, idObject, 'home']);
+ _this.viewEventDetail(idObject);
} else if (service === "gabinete-digital" && object != "expediente") {
_this.router.navigate(['/home/', service]);
} else if (service === "gabinete-digital" && object === "expediente") {
@@ -686,8 +693,8 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
}));
}
}, {
- key: "viewExpedientDetail",
- value: function viewExpedientDetail(serialNumber) {
+ key: "viewEventDetail",
+ value: function viewEventDetail(eventId) {
return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
var modal;
return regeneratorRuntime.wrap(function _callee2$(_context2) {
@@ -697,10 +704,9 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
console.log(this.profile);
_context2.next = 3;
return this.modalController.create({
- component: _app_pages_gabinete_digital_expediente_expediente_detail_expediente_detail_page__WEBPACK_IMPORTED_MODULE_8__["ExpedienteDetailPage"],
+ component: _app_pages_agenda_view_event_view_event_page__WEBPACK_IMPORTED_MODULE_9__["ViewEventPage"],
componentProps: {
- serialNumber: serialNumber,
- profile: this.profile
+ eventId: eventId
},
cssClass: 'modal',
backdropDismiss: false
@@ -714,7 +720,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
case 6:
modal.onDidDismiss().then(function (res) {
if (res) {
- console.log(res);
+ console.log(res); //this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
}
});
@@ -727,33 +733,39 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
}));
}
}, {
- key: "viewPublicationDetail",
- value: function viewPublicationDetail(folderId) {
+ key: "viewExpedientDetail",
+ value: function viewExpedientDetail(serialNumber) {
return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee3() {
var modal;
return regeneratorRuntime.wrap(function _callee3$(_context3) {
while (1) {
switch (_context3.prev = _context3.next) {
case 0:
- _context3.next = 2;
+ console.log(this.profile);
+ _context3.next = 3;
return this.modalController.create({
- component: _app_pages_publications_view_publications_publication_detail_publication_detail_page__WEBPACK_IMPORTED_MODULE_6__["PublicationDetailPage"],
+ component: _app_pages_gabinete_digital_expediente_expediente_detail_expediente_detail_page__WEBPACK_IMPORTED_MODULE_8__["ExpedienteDetailPage"],
componentProps: {
- folderId: folderId
+ serialNumber: serialNumber,
+ profile: this.profile
},
- cssClass: 'publication-detail',
+ cssClass: 'modal',
backdropDismiss: false
});
- case 2:
+ case 3:
modal = _context3.sent;
- _context3.next = 5;
+ _context3.next = 6;
return modal.present();
- case 5:
- modal.onDidDismiss();
-
case 6:
+ modal.onDidDismiss().then(function (res) {
+ if (res) {
+ console.log(res);
+ }
+ });
+
+ case 7:
case "end":
return _context3.stop();
}
@@ -762,8 +774,8 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
}));
}
}, {
- key: "viewPublications",
- value: function viewPublications(folderId) {
+ key: "viewPublicationDetail",
+ value: function viewPublicationDetail(folderId) {
return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee4() {
var modal;
return regeneratorRuntime.wrap(function _callee4$(_context4) {
@@ -772,14 +784,11 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
case 0:
_context4.next = 2;
return this.modalController.create({
- component: _app_pages_publications_view_publications_view_publications_page__WEBPACK_IMPORTED_MODULE_7__["ViewPublicationsPage"],
-
- /* enterAnimation,
- leaveAnimation, */
+ component: _app_pages_publications_view_publications_publication_detail_publication_detail_page__WEBPACK_IMPORTED_MODULE_6__["PublicationDetailPage"],
componentProps: {
- item: folderId
+ folderId: folderId
},
- cssClass: 'new-action',
+ cssClass: 'publication-detail',
backdropDismiss: false
});
@@ -799,6 +808,44 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
}, _callee4, this);
}));
}
+ }, {
+ key: "viewPublications",
+ value: function viewPublications(folderId) {
+ return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee5() {
+ var modal;
+ return regeneratorRuntime.wrap(function _callee5$(_context5) {
+ while (1) {
+ switch (_context5.prev = _context5.next) {
+ case 0:
+ _context5.next = 2;
+ return this.modalController.create({
+ component: _app_pages_publications_view_publications_view_publications_page__WEBPACK_IMPORTED_MODULE_7__["ViewPublicationsPage"],
+
+ /* enterAnimation,
+ leaveAnimation, */
+ componentProps: {
+ item: folderId
+ },
+ cssClass: 'new-action',
+ backdropDismiss: false
+ });
+
+ case 2:
+ modal = _context5.sent;
+ _context5.next = 5;
+ return modal.present();
+
+ case 5:
+ modal.onDidDismiss();
+
+ case 6:
+ case "end":
+ return _context5.stop();
+ }
+ }
+ }, _callee5, this);
+ }));
+ }
}]);
return HomePage;
@@ -810,7 +857,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
}, {
type: _services_processes_service__WEBPACK_IMPORTED_MODULE_4__["ProcessesService"]
}, {
- type: _angular_router__WEBPACK_IMPORTED_MODULE_10__["Router"]
+ type: _angular_router__WEBPACK_IMPORTED_MODULE_11__["Router"]
}, {
type: _ionic_angular__WEBPACK_IMPORTED_MODULE_5__["ModalController"]
}];
diff --git a/android/app/build/intermediates/merged_assets/debug/out/public/home-home-module-es5.js.map b/android/app/build/intermediates/merged_assets/debug/out/public/home-home-module-es5.js.map
index 7e6cff07a..90819878e 100644
--- a/android/app/build/intermediates/merged_assets/debug/out/public/home-home-module-es5.js.map
+++ b/android/app/build/intermediates/merged_assets/debug/out/public/home-home-module-es5.js.map
@@ -1 +1,5 @@
-{"version":3,"sources":["webpack:///src/app/home/home.page.html","webpack:///src/app/home/home-routing.module.ts","webpack:///src/app/home/home.module.ts","webpack:///src/app/home/home.page.scss","webpack:///src/app/home/home.page.ts","webpack:///src/app/resolvers/userData.resolver.ts"],"names":["routes","path","component","resolve","userData","children","loadChildren","then","m","EventsPageModule","EventDetailPageModule","AttachmentsPageModule","AttendeesPageModule","LoginPageModule","AgendaPageModule","GabineteDigitalPageModule","ExpedientePageModule","ExpedienteDetailPageModule","EventListPageModule","SearchPageModule","PublicationsPageModule","ViewPublicationsPageModule","PublicationDetailPageModule","ChatPageModule","redirectTo","pathMatch","HomePageRoutingModule","imports","forChild","exports","HomePageModule","declarations","PushNotifications","LocalNotifications","LocalNotificationAction","HomePage","eventService","processesbackend","router","modalController","totalEvent","totalExpediente","profile","getAllMdEvents","Date","subscribe","res","eventsList","length","getAllPrEvents","GetTasksList","result","addListener","error","alert","JSON","stringify","notification","schedule","notifications","title","body","id","getUTCMilliseconds","at","now","extra","data","channelId","service","object","idObject","console","log","navigate","viewExpedientDetail","viewPublications","viewPublicationDetail","sound","attachments","actionTypeId","foreground","serialNumber","create","componentProps","cssClass","backdropDismiss","modal","present","onDidDismiss","folderId","item","selector","template","UserDataResolver","authService","getUserData","providedIn"],"mappings":"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","file":"home-home-module-es5.js","sourcesContent":["export default \"\\r\\n\\r\\n\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n {{totalEvent}}\\r\\n Início\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n Agenda\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n {{totalExpediente}}\\r\\n Gabinete\\r\\n \\r\\n \\r\\n \\r\\n Acções\\r\\n \\r\\n \\r\\n \\r\\n Chat\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n\";","import { NgModule } from '@angular/core';\r\nimport { Routes, RouterModule } from '@angular/router';\r\nimport { HomeGuard } from '../guards/home.guard';\r\nimport { UserDataResolver } from '../resolvers/userData.resolver';\r\n\r\nimport { HomePage } from './home.page';\r\n\r\nconst routes: Routes = [\r\n {\r\n path: 'home',\r\n component: HomePage,\r\n /* canActivate: [HomeGuard], */\r\n resolve: {\r\n userData: UserDataResolver\r\n },\r\n children: [\r\n {\r\n path: 'events',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/events/events.module').then(m => m.EventsPageModule)\r\n },\r\n {\r\n path:':eventId/:caller',\r\n loadChildren: ()=> import('../pages/events/event-detail/event-detail.module').then(m => m.EventDetailPageModule),\r\n },\r\n ]\r\n },\r\n {\r\n path: 'attachments',\r\n children: [\r\n {\r\n path:':eventId',\r\n loadChildren: ()=> import('../pages/events/attachments/attachments.module').then(m => m.AttachmentsPageModule)\r\n },\r\n\r\n ]\r\n },\r\n {\r\n path: 'attendees',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/events/attendees/attendees.module').then(m => m.AttendeesPageModule)\r\n },\r\n ]\r\n },\r\n {\r\n path: 'login',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/login/login.module').then(m => m.LoginPageModule)\r\n },\r\n ]\r\n },\r\n {\r\n path: 'agenda',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/agenda/agenda.module').then(m => m.AgendaPageModule)\r\n },\r\n {\r\n path:':eventId/:caller',\r\n loadChildren: ()=> import('../pages/events/event-detail/event-detail.module').then(m => m.EventDetailPageModule),\r\n }\r\n ]\r\n },\r\n {\r\n path: 'gabinete-digital',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/gabinete-digital/gabinete-digital.module').then(m => m.GabineteDigitalPageModule)\r\n },\r\n {\r\n path:'expediente',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/gabinete-digital/expediente/expediente.module').then(m => m.ExpedientePageModule)\r\n },\r\n {\r\n path:':SerialNumber',\r\n loadChildren: ()=> import('../pages/gabinete-digital/expediente/expediente-detail/expediente-detail.module').then(m => m.ExpedienteDetailPageModule)\r\n },\r\n {\r\n path:'events/:eventId/:caller',\r\n loadChildren: ()=> import('../pages/events/event-detail/event-detail.module').then(m => m.EventDetailPageModule),\r\n }\r\n ]\r\n },\r\n {\r\n path:'event-list',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/gabinete-digital/event-list/event-list.module').then(m => m.EventListPageModule)\r\n },\r\n ] \r\n },\r\n ]\r\n },\r\n {\r\n path: 'search',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/search/search.module').then(m => m.SearchPageModule)\r\n }\r\n ]\r\n },\r\n {\r\n path: 'publications',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/publications/publications.module').then(m => m.PublicationsPageModule)\r\n },\r\n {\r\n path:'view-publications',\r\n children: [\r\n {\r\n path:':folderId',\r\n loadChildren: ()=> import('../pages/publications/view-publications/view-publications.module').then(m => m.ViewPublicationsPageModule)\r\n },\r\n {\r\n path:'publication-detail',\r\n children: [\r\n {\r\n path: ':id',\r\n loadChildren: ()=> import('../pages/publications/view-publications/publication-detail/publication-detail.module').then(m => m.PublicationDetailPageModule)\r\n },\r\n ]\r\n \r\n },\r\n ] \r\n },\r\n ]\r\n },\r\n {\r\n path: 'chat',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/chat/chat.module').then(m => m.ChatPageModule)\r\n }\r\n ]\r\n },\r\n ]\r\n },\r\n {\r\n path: '',\r\n redirectTo: '/home/events',\r\n pathMatch: 'full'\r\n }\r\n];\r\n\r\n@NgModule({\r\n imports: [RouterModule.forChild(routes)],\r\n exports: [RouterModule],\r\n})\r\nexport class HomePageRoutingModule {}\r\n","import { NgModule } from '@angular/core';\r\nimport { CommonModule } from '@angular/common';\r\nimport { FormsModule } from '@angular/forms';\r\n\r\nimport { IonicModule } from '@ionic/angular';\r\n\r\nimport { HomePageRoutingModule } from './home-routing.module';\r\n\r\nimport { HomePage } from './home.page';\r\n/* import { IonicSelectableModule } from 'ionic-selectable'; */\r\nimport { SharedModule } from 'src/app/shared/shared.module';\r\n\r\n@NgModule({\r\n imports: [\r\n CommonModule,\r\n FormsModule,\r\n IonicModule,\r\n HomePageRoutingModule,\r\n SharedModule\r\n ],\r\n declarations: [HomePage]\r\n})\r\nexport class HomePageModule {}\r\n","export default \"ion-tab-bar {\\n --background: #f9f9f9;\\n --color: #061b52;\\n}\\n\\nion-badge {\\n /* */\\n /* display: inline-block;*/\\n min-width: 18px;\\n font-size: 15px;\\n /* font-weight: $badge-font-weight;\\n line-height: 1;\\n\\n white-space: nowrap;\\n vertical-align: baseline; */\\n}\\n\\n.tab .bottoms {\\n display: flex;\\n justify-content: space-around;\\n}\\n/*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNyYy9hcHAvaG9tZS9DOlxcVXNlcnNcXHRpYWdvLmtheWF5YVxcZGV2ZWxvcG1lbnRcXGdhYmluZXRlLWRpZ2l0YWwvc3JjXFxhcHBcXGhvbWVcXGhvbWUucGFnZS5zY3NzIiwic3JjL2FwcC9ob21lL2hvbWUucGFnZS5zY3NzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBO0VBQ0kscUJBQUE7RUFDQSxnQkFBQTtBQ0FKOztBRGFBO0VBQVcsS0FBQTtFQUVULDBCQUFBO0VBRUEsZUFBQTtFQUNBLGVBWGU7RUFZZjs7Ozs2QkFBQTtBQ1BGOztBRGdCRTtFQUNFLGFBQUE7RUFDQSw2QkFBQTtBQ2JKIiwiZmlsZSI6InNyYy9hcHAvaG9tZS9ob21lLnBhZ2Uuc2NzcyIsInNvdXJjZXNDb250ZW50IjpbIlxyXG5pb24tdGFiLWJhcntcclxuICAgIC0tYmFja2dyb3VuZDogI2Y5ZjlmOTtcclxuICAgIC0tY29sb3I6ICMwNjFiNTI7XHJcbn1cclxuXHJcbi8vIEJhZGdlXHJcbi8vIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tXHJcblxyXG4vLy8gQHByb3AgLSBGb250IHNpemUgb2YgdGhlIGJhZGdlXHJcbiRiYWRnZS1mb250LXNpemU6MTVweCAhZGVmYXVsdDtcclxuXHJcbi8vLyBAcHJvcCAtIEZvbnQgd2VpZ2h0IG9mIHRoZSBiYWRnZVxyXG4kYmFkZ2UtZm9udC13ZWlnaHQ6Ym9sZCAhZGVmYXVsdDtcclxuXHJcblxyXG5pb24tYmFkZ2Ugey8qICAqL1xyXG5cclxuICAvKiBkaXNwbGF5OiBpbmxpbmUtYmxvY2s7Ki9cclxuXHJcbiAgbWluLXdpZHRoOiAxOHB4OyBcclxuICBmb250LXNpemU6ICRiYWRnZS1mb250LXNpemU7XHJcbiAgLyogZm9udC13ZWlnaHQ6ICRiYWRnZS1mb250LXdlaWdodDtcclxuICBsaW5lLWhlaWdodDogMTtcclxuXHJcbiAgd2hpdGUtc3BhY2U6IG5vd3JhcDtcclxuICB2ZXJ0aWNhbC1hbGlnbjogYmFzZWxpbmU7ICovXHJcbn1cclxuXHJcblxyXG4udGFie1xyXG4gIC5ib3R0b21ze1xyXG4gICAgZGlzcGxheTogZmxleDtcclxuICAgIGp1c3RpZnktY29udGVudDogc3BhY2UtYXJvdW5kO1xyXG4gIH1cclxufSIsImlvbi10YWItYmFyIHtcbiAgLS1iYWNrZ3JvdW5kOiAjZjlmOWY5O1xuICAtLWNvbG9yOiAjMDYxYjUyO1xufVxuXG5pb24tYmFkZ2Uge1xuICAvKiAgKi9cbiAgLyogZGlzcGxheTogaW5saW5lLWJsb2NrOyovXG4gIG1pbi13aWR0aDogMThweDtcbiAgZm9udC1zaXplOiAxNXB4O1xuICAvKiBmb250LXdlaWdodDogJGJhZGdlLWZvbnQtd2VpZ2h0O1xuICBsaW5lLWhlaWdodDogMTtcblxuICB3aGl0ZS1zcGFjZTogbm93cmFwO1xuICB2ZXJ0aWNhbC1hbGlnbjogYmFzZWxpbmU7ICovXG59XG5cbi50YWIgLmJvdHRvbXMge1xuICBkaXNwbGF5OiBmbGV4O1xuICBqdXN0aWZ5LWNvbnRlbnQ6IHNwYWNlLWFyb3VuZDtcbn0iXX0= */\";","import { Component, OnInit } from '@angular/core';\r\nimport { EventsService } from '../services/events.service';\r\nimport { formatDate } from '@angular/common';\r\nimport { Event } from '../models/event.model';\r\nimport { ProcessesService } from '../services/processes.service';\r\nimport { StorageService } from 'src/app/services/storage.service';\r\nimport { ModalController } from '@ionic/angular';\r\nimport { PublicationDetailPage } from '../../app/pages/publications/view-publications/publication-detail/publication-detail.page';\r\nimport { ViewPublicationsPage } from '../../app/pages/publications/view-publications/view-publications.page';\r\nimport { ExpedienteDetailPage } from '../../app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page'\r\n\r\nimport { Plugins, PushNotification, PushNotificationToken, PushNotificationActionPerformed, Modals } from '@capacitor/core';\r\nimport { Router } from '@angular/router';\r\nimport { MethodCall } from '@angular/compiler';\r\n\r\nconst { PushNotifications, LocalNotifications, LocalNotificationAction } = Plugins;\r\n\r\n@Component({\r\n selector: 'app-home',\r\n templateUrl: './home.page.html',\r\n styleUrls: ['./home.page.scss'],\r\n})\r\nexport class HomePage implements OnInit {\r\n eventsList: Event[];\r\n prEventList: Event[];\r\n mdEventList: Event[];\r\n\r\n totalEvent = 0;\r\n totalExpediente = 0;\r\n profile: string;\r\n\r\n constructor(private eventService: EventsService, private processesbackend: ProcessesService, private router: Router, private modalController: ModalController,) { }\r\n\r\n ngOnInit() {\r\n //Initialize profile as mdgpr\r\n this.profile = \"mdgpr\";\r\n if (this.profile == \"mdgpr\") {\r\n this.eventService.getAllMdEvents(formatDate(new Date(), 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => {\r\n this.eventsList = res;\r\n this.totalEvent = this.eventsList.length;\r\n });\r\n }\r\n else {\r\n this.eventService.getAllPrEvents(formatDate(new Date(), 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => {\r\n this.eventsList = res;\r\n this.totalEvent = this.eventsList.length;\r\n });\r\n\r\n }\r\n this.processesbackend.GetTasksList(\"Expediente\", true).subscribe(result => {\r\n this.totalExpediente = result;\r\n });\r\n /*\r\n (PushNotifications as any).requestPermission().then(result => {\r\n PushNotifications.register();\r\n });\r\n \r\n PushNotifications.addListener(\r\n 'registration',\r\n (token: PushNotificationToken) => {\r\n alert('Push registration success, token: ' + token.value);\r\n console.log('FIREBASE: ', token.value)\r\n this.storageService.store(this.username,token.value);\r\n },\r\n );\r\n \r\n console.log(this.storageService.get(this.username)) */\r\n\r\n PushNotifications.addListener('registrationError', (error: any) => {\r\n alert('Error on registration: ' + JSON.stringify(error));\r\n });\r\n\r\n PushNotifications.addListener('pushNotificationReceived', notification => { \r\n\r\n //const isPushNotification = !!notification.title || !!notification.body;\r\n \r\n // if this is a push notification received when the app is in the foreground on Android\r\n //if (isAndroid && isPushNotification) {\r\n \r\n // We schedule a LocalNotification 1 second later since Capacitor for Android doesn't show anything in this case\r\n LocalNotifications.schedule({\r\n notifications: [{\r\n title: notification.title,\r\n body: notification.body,\r\n id: new Date().getUTCMilliseconds(),\r\n schedule: {\r\n at: new Date(Date.now() + 1000)\r\n },\r\n extra: notification.data,\r\n channelId: 'pop-notifications'\r\n }]\r\n });\r\n //}\r\n });\r\n \r\n\r\n PushNotifications.addListener(\r\n 'pushNotificationActionPerformed',\r\n (notification: PushNotificationActionPerformed) => {\r\n let service = notification.notification.data.service;\r\n let object = notification.notification.data.object;\r\n let idObject = notification.notification.data.idObject;\r\n\r\n console.log('Service: ', service);\r\n console.log('Object: ', object);\r\n console.log('idObject: ', idObject);\r\n\r\n /* if (service === \"events\") {\r\n this.router.navigate(['/home/', service, idObject, 'home']);\r\n } else if (service === \"agenda\") {\r\n this.router.navigate(['/home/', service, idObject, 'home']);\r\n } else if (service === \"gabinete-digital\" && object != \"expediente\") {*/\r\n // this.router.navigate(['/home/', service]);\r\n // }\r\n\r\n //if (service != null) {\r\n\r\n /*const routeValue = {\r\n \"agenda\": this.router.navigate(['/home/', service, idObject, 'home']),\r\n \"gabinete-digital\": this.router.navigate(['/home/', service]),\r\n \"accoes\": this.viewExpedientDetail(idObject),\r\n\r\n }\r\n\r\n const route = routeValue[service] && object ;\r\n\r\n service = \"agenda\" ? this.router.navigate(['/home/', service, idObject, 'home']) : */\r\n\r\n if (service === \"agenda\") {\r\n this.router.navigate(['/home/', service, idObject, 'home']);\r\n } else if (service === \"gabinete-digital\" && object != \"expediente\") {\r\n this.router.navigate(['/home/', service]);\r\n } else if (service === \"gabinete-digital\" && object === \"expediente\") {\r\n this.viewExpedientDetail(idObject)\r\n } else if (service === \"accoes\" && object === \"accao\") {\r\n this.viewPublications(idObject)\r\n } else if (service === \"accoes\" && object === \"publicacao\") {\r\n this.viewPublicationDetail(idObject)\r\n }\r\n \r\n\r\n\r\n\r\n /*switch (service) {\r\n case \"events\":\r\n this.router.navigate(['/home/', service, idObject, 'home']);\r\n break;\r\n case \"agenda\":\r\n this.router.navigate(['/home/', service, idObject, 'home']);\r\n break;\r\n case \"gabinete-digital\":\r\n this.router.navigate(['/home/', service]);\r\n break;\r\n case \"gabinete-digital-expediente\":\r\n this.router.navigate(['/home/gabinete-digital/', object, idObject, 'home']);\r\n break;\r\n case \"\": {\r\n\r\n if(publicationId && processId != null) {\r\n this.viewPublicationDetail(publicationId,processId)\r\n }\r\n if (folder.ProcessId != null) {\r\n this.viewPublications(folder)\r\n }\r\n }\r\n\r\n default:\r\n this.router.navigate(['/home/']);\r\n }*/\r\n\r\n\r\n\r\n },\r\n );\r\n }\r\n\r\n async localNotificationPresent(notification) {\r\n\r\n LocalNotificationAction.\r\n\r\n LocalNotifications.schedule({\r\n notifications: [\r\n {\r\n title: notification.title,\r\n body: notification.body,\r\n id: 1,\r\n schedule: { at: new Date(Date.now() + 1000) },\r\n sound: null,\r\n attachments: null,\r\n actionTypeId: \"\",\r\n extra: null,\r\n foreground: true,\r\n }\r\n ]\r\n });\r\n }\r\n\r\n async viewExpedientDetail(serialNumber:any) {\r\n console.log(this.profile);\r\n \r\n const modal = await this.modalController.create({\r\n component: ExpedienteDetailPage,\r\n componentProps:{\r\n serialNumber: serialNumber,\r\n profile: this.profile,\r\n },\r\n cssClass: 'modal',\r\n backdropDismiss: false\r\n });\r\n await modal.present();\r\n modal.onDidDismiss().then((res)=>{\r\n if(res){\r\n console.log(res);\r\n }\r\n });\r\n }\r\n\r\n\r\n\r\n async viewPublicationDetail(folderId) {\r\n const modal = await this.modalController.create({\r\n component: PublicationDetailPage,\r\n componentProps: {\r\n folderId: folderId,\r\n },\r\n cssClass: 'publication-detail',\r\n backdropDismiss: false\r\n });\r\n await modal.present();\r\n modal.onDidDismiss();\r\n }\r\n\r\n async viewPublications(folderId) {\r\n\r\n\r\n const modal = await this.modalController.create({\r\n component: ViewPublicationsPage,\r\n /* enterAnimation,\r\n leaveAnimation, */\r\n componentProps: {\r\n item: folderId,\r\n },\r\n cssClass: 'new-action',\r\n backdropDismiss: false\r\n });\r\n await modal.present();\r\n modal.onDidDismiss();\r\n }\r\n\r\n}\r\n","import { Injectable } from '@angular/core';\r\nimport { AuthService } from '../services/auth.service';\r\n\r\n@Injectable({\r\n providedIn: 'root'\r\n})\r\nexport class UserDataResolver{ \r\n constructor(private authService: AuthService){}\r\n\r\n resolve(){\r\n return this.authService.getUserData();\r\n }\r\n}"]}
\ No newline at end of file
+<<<<<<< HEAD
+{"version":3,"sources":["webpack:///src/app/home/home.page.html","webpack:///src/app/home/home-routing.module.ts","webpack:///src/app/home/home.module.ts","webpack:///src/app/home/home.page.scss","webpack:///src/app/home/home.page.ts","webpack:///src/app/resolvers/userData.resolver.ts"],"names":["routes","path","component","resolve","userData","children","loadChildren","then","m","EventsPageModule","EventDetailPageModule","AttachmentsPageModule","AttendeesPageModule","LoginPageModule","AgendaPageModule","GabineteDigitalPageModule","ExpedientePageModule","ExpedienteDetailPageModule","EventListPageModule","SearchPageModule","PublicationsPageModule","ViewPublicationsPageModule","PublicationDetailPageModule","ChatPageModule","redirectTo","pathMatch","HomePageRoutingModule","imports","forChild","exports","HomePageModule","declarations","PushNotifications","LocalNotifications","LocalNotificationAction","HomePage","eventService","processesbackend","router","modalController","totalEvent","totalExpediente","profile","getAllMdEvents","Date","subscribe","res","eventsList","length","getAllPrEvents","GetTasksList","result","addListener","error","alert","JSON","stringify","notification","schedule","notifications","title","body","id","getUTCMilliseconds","at","now","extra","data","channelId","service","object","idObject","console","log","navigate","viewExpedientDetail","viewPublications","viewPublicationDetail","sound","attachments","actionTypeId","foreground","serialNumber","create","componentProps","cssClass","backdropDismiss","modal","present","onDidDismiss","folderId","item","selector","template","UserDataResolver","authService","getUserData","providedIn"],"mappings":"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","file":"home-home-module-es5.js","sourcesContent":["export default \"\\r\\n\\r\\n\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n {{totalEvent}}\\r\\n Início\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n Agenda\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n {{totalExpediente}}\\r\\n Gabinete\\r\\n \\r\\n \\r\\n \\r\\n Acções\\r\\n \\r\\n \\r\\n \\r\\n Chat\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n\";","import { NgModule } from '@angular/core';\r\nimport { Routes, RouterModule } from '@angular/router';\r\nimport { HomeGuard } from '../guards/home.guard';\r\nimport { UserDataResolver } from '../resolvers/userData.resolver';\r\n\r\nimport { HomePage } from './home.page';\r\n\r\nconst routes: Routes = [\r\n {\r\n path: 'home',\r\n component: HomePage,\r\n /* canActivate: [HomeGuard], */\r\n resolve: {\r\n userData: UserDataResolver\r\n },\r\n children: [\r\n {\r\n path: 'events',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/events/events.module').then(m => m.EventsPageModule)\r\n },\r\n {\r\n path:':eventId/:caller',\r\n loadChildren: ()=> import('../pages/events/event-detail/event-detail.module').then(m => m.EventDetailPageModule),\r\n },\r\n ]\r\n },\r\n {\r\n path: 'attachments',\r\n children: [\r\n {\r\n path:':eventId',\r\n loadChildren: ()=> import('../pages/events/attachments/attachments.module').then(m => m.AttachmentsPageModule)\r\n },\r\n\r\n ]\r\n },\r\n {\r\n path: 'attendees',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/events/attendees/attendees.module').then(m => m.AttendeesPageModule)\r\n },\r\n ]\r\n },\r\n {\r\n path: 'login',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/login/login.module').then(m => m.LoginPageModule)\r\n },\r\n ]\r\n },\r\n {\r\n path: 'agenda',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/agenda/agenda.module').then(m => m.AgendaPageModule)\r\n },\r\n {\r\n path:':eventId/:caller',\r\n loadChildren: ()=> import('../pages/events/event-detail/event-detail.module').then(m => m.EventDetailPageModule),\r\n }\r\n ]\r\n },\r\n {\r\n path: 'gabinete-digital',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/gabinete-digital/gabinete-digital.module').then(m => m.GabineteDigitalPageModule)\r\n },\r\n {\r\n path:'expediente',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/gabinete-digital/expediente/expediente.module').then(m => m.ExpedientePageModule)\r\n },\r\n {\r\n path:':SerialNumber',\r\n loadChildren: ()=> import('../pages/gabinete-digital/expediente/expediente-detail/expediente-detail.module').then(m => m.ExpedienteDetailPageModule)\r\n },\r\n {\r\n path:'events/:eventId/:caller',\r\n loadChildren: ()=> import('../pages/events/event-detail/event-detail.module').then(m => m.EventDetailPageModule),\r\n }\r\n ]\r\n },\r\n {\r\n path:'event-list',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/gabinete-digital/event-list/event-list.module').then(m => m.EventListPageModule)\r\n },\r\n ] \r\n },\r\n ]\r\n },\r\n {\r\n path: 'search',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/search/search.module').then(m => m.SearchPageModule)\r\n }\r\n ]\r\n },\r\n {\r\n path: 'publications',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/publications/publications.module').then(m => m.PublicationsPageModule)\r\n },\r\n {\r\n path:'view-publications',\r\n children: [\r\n {\r\n path:':folderId',\r\n loadChildren: ()=> import('../pages/publications/view-publications/view-publications.module').then(m => m.ViewPublicationsPageModule)\r\n },\r\n {\r\n path:'publication-detail',\r\n children: [\r\n {\r\n path: ':id',\r\n loadChildren: ()=> import('../pages/publications/view-publications/publication-detail/publication-detail.module').then(m => m.PublicationDetailPageModule)\r\n },\r\n ]\r\n \r\n },\r\n ] \r\n },\r\n ]\r\n },\r\n {\r\n path: 'chat',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/chat/chat.module').then(m => m.ChatPageModule)\r\n }\r\n ]\r\n },\r\n ]\r\n },\r\n {\r\n path: '',\r\n redirectTo: '/home/events',\r\n pathMatch: 'full'\r\n }\r\n];\r\n\r\n@NgModule({\r\n imports: [RouterModule.forChild(routes)],\r\n exports: [RouterModule],\r\n})\r\nexport class HomePageRoutingModule {}\r\n","import { NgModule } from '@angular/core';\r\nimport { CommonModule } from '@angular/common';\r\nimport { FormsModule } from '@angular/forms';\r\n\r\nimport { IonicModule } from '@ionic/angular';\r\n\r\nimport { HomePageRoutingModule } from './home-routing.module';\r\n\r\nimport { HomePage } from './home.page';\r\n/* import { IonicSelectableModule } from 'ionic-selectable'; */\r\nimport { SharedModule } from 'src/app/shared/shared.module';\r\n\r\n@NgModule({\r\n imports: [\r\n CommonModule,\r\n FormsModule,\r\n IonicModule,\r\n HomePageRoutingModule,\r\n SharedModule\r\n ],\r\n declarations: [HomePage]\r\n})\r\nexport class HomePageModule {}\r\n","export default \"ion-tab-bar {\\n --background: #f9f9f9;\\n --color: #061b52;\\n}\\n\\nion-badge {\\n /* */\\n /* display: inline-block;*/\\n min-width: 18px;\\n font-size: 15px;\\n /* font-weight: $badge-font-weight;\\n line-height: 1;\\n\\n white-space: nowrap;\\n vertical-align: baseline; */\\n}\\n\\n.tab .bottoms {\\n display: flex;\\n justify-content: space-around;\\n}\\n/*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNyYy9hcHAvaG9tZS9DOlxcVXNlcnNcXHRpYWdvLmtheWF5YVxcZGV2ZWxvcG1lbnRcXGdhYmluZXRlLWRpZ2l0YWwvc3JjXFxhcHBcXGhvbWVcXGhvbWUucGFnZS5zY3NzIiwic3JjL2FwcC9ob21lL2hvbWUucGFnZS5zY3NzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBO0VBQ0kscUJBQUE7RUFDQSxnQkFBQTtBQ0FKOztBRGFBO0VBQVcsS0FBQTtFQUVULDBCQUFBO0VBRUEsZUFBQTtFQUNBLGVBWGU7RUFZZjs7Ozs2QkFBQTtBQ1BGOztBRGdCRTtFQUNFLGFBQUE7RUFDQSw2QkFBQTtBQ2JKIiwiZmlsZSI6InNyYy9hcHAvaG9tZS9ob21lLnBhZ2Uuc2NzcyIsInNvdXJjZXNDb250ZW50IjpbIlxyXG5pb24tdGFiLWJhcntcclxuICAgIC0tYmFja2dyb3VuZDogI2Y5ZjlmOTtcclxuICAgIC0tY29sb3I6ICMwNjFiNTI7XHJcbn1cclxuXHJcbi8vIEJhZGdlXHJcbi8vIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tXHJcblxyXG4vLy8gQHByb3AgLSBGb250IHNpemUgb2YgdGhlIGJhZGdlXHJcbiRiYWRnZS1mb250LXNpemU6MTVweCAhZGVmYXVsdDtcclxuXHJcbi8vLyBAcHJvcCAtIEZvbnQgd2VpZ2h0IG9mIHRoZSBiYWRnZVxyXG4kYmFkZ2UtZm9udC13ZWlnaHQ6Ym9sZCAhZGVmYXVsdDtcclxuXHJcblxyXG5pb24tYmFkZ2Ugey8qICAqL1xyXG5cclxuICAvKiBkaXNwbGF5OiBpbmxpbmUtYmxvY2s7Ki9cclxuXHJcbiAgbWluLXdpZHRoOiAxOHB4OyBcclxuICBmb250LXNpemU6ICRiYWRnZS1mb250LXNpemU7XHJcbiAgLyogZm9udC13ZWlnaHQ6ICRiYWRnZS1mb250LXdlaWdodDtcclxuICBsaW5lLWhlaWdodDogMTtcclxuXHJcbiAgd2hpdGUtc3BhY2U6IG5vd3JhcDtcclxuICB2ZXJ0aWNhbC1hbGlnbjogYmFzZWxpbmU7ICovXHJcbn1cclxuXHJcblxyXG4udGFie1xyXG4gIC5ib3R0b21ze1xyXG4gICAgZGlzcGxheTogZmxleDtcclxuICAgIGp1c3RpZnktY29udGVudDogc3BhY2UtYXJvdW5kO1xyXG4gIH1cclxufSIsImlvbi10YWItYmFyIHtcbiAgLS1iYWNrZ3JvdW5kOiAjZjlmOWY5O1xuICAtLWNvbG9yOiAjMDYxYjUyO1xufVxuXG5pb24tYmFkZ2Uge1xuICAvKiAgKi9cbiAgLyogZGlzcGxheTogaW5saW5lLWJsb2NrOyovXG4gIG1pbi13aWR0aDogMThweDtcbiAgZm9udC1zaXplOiAxNXB4O1xuICAvKiBmb250LXdlaWdodDogJGJhZGdlLWZvbnQtd2VpZ2h0O1xuICBsaW5lLWhlaWdodDogMTtcblxuICB3aGl0ZS1zcGFjZTogbm93cmFwO1xuICB2ZXJ0aWNhbC1hbGlnbjogYmFzZWxpbmU7ICovXG59XG5cbi50YWIgLmJvdHRvbXMge1xuICBkaXNwbGF5OiBmbGV4O1xuICBqdXN0aWZ5LWNvbnRlbnQ6IHNwYWNlLWFyb3VuZDtcbn0iXX0= */\";","import { Component, OnInit } from '@angular/core';\r\nimport { EventsService } from '../services/events.service';\r\nimport { formatDate } from '@angular/common';\r\nimport { Event } from '../models/event.model';\r\nimport { ProcessesService } from '../services/processes.service';\r\nimport { StorageService } from 'src/app/services/storage.service';\r\nimport { ModalController } from '@ionic/angular';\r\nimport { PublicationDetailPage } from '../../app/pages/publications/view-publications/publication-detail/publication-detail.page';\r\nimport { ViewPublicationsPage } from '../../app/pages/publications/view-publications/view-publications.page';\r\nimport { ExpedienteDetailPage } from '../../app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page'\r\n\r\nimport { Plugins, PushNotification, PushNotificationToken, PushNotificationActionPerformed, Modals } from '@capacitor/core';\r\nimport { Router } from '@angular/router';\r\nimport { MethodCall } from '@angular/compiler';\r\n\r\nconst { PushNotifications, LocalNotifications, LocalNotificationAction } = Plugins;\r\n\r\n@Component({\r\n selector: 'app-home',\r\n templateUrl: './home.page.html',\r\n styleUrls: ['./home.page.scss'],\r\n})\r\nexport class HomePage implements OnInit {\r\n eventsList: Event[];\r\n prEventList: Event[];\r\n mdEventList: Event[];\r\n\r\n totalEvent = 0;\r\n totalExpediente = 0;\r\n profile: string;\r\n\r\n constructor(private eventService: EventsService, private processesbackend: ProcessesService, private router: Router, private modalController: ModalController,) { }\r\n\r\n ngOnInit() {\r\n //Initialize profile as mdgpr\r\n this.profile = \"mdgpr\";\r\n if (this.profile == \"mdgpr\") {\r\n this.eventService.getAllMdEvents(formatDate(new Date(), 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => {\r\n this.eventsList = res;\r\n this.totalEvent = this.eventsList.length;\r\n });\r\n }\r\n else {\r\n this.eventService.getAllPrEvents(formatDate(new Date(), 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => {\r\n this.eventsList = res;\r\n this.totalEvent = this.eventsList.length;\r\n });\r\n\r\n }\r\n this.processesbackend.GetTasksList(\"Expediente\", true).subscribe(result => {\r\n this.totalExpediente = result;\r\n });\r\n /*\r\n (PushNotifications as any).requestPermission().then(result => {\r\n PushNotifications.register();\r\n });\r\n \r\n PushNotifications.addListener(\r\n 'registration',\r\n (token: PushNotificationToken) => {\r\n alert('Push registration success, token: ' + token.value);\r\n console.log('FIREBASE: ', token.value)\r\n this.storageService.store(this.username,token.value);\r\n },\r\n );\r\n \r\n console.log(this.storageService.get(this.username)) */\r\n\r\n PushNotifications.addListener('registrationError', (error: any) => {\r\n alert('Error on registration: ' + JSON.stringify(error));\r\n });\r\n\r\n PushNotifications.addListener('pushNotificationReceived', notification => { \r\n\r\n //const isPushNotification = !!notification.title || !!notification.body;\r\n \r\n // if this is a push notification received when the app is in the foreground on Android\r\n //if (isAndroid && isPushNotification) {\r\n \r\n // We schedule a LocalNotification 1 second later since Capacitor for Android doesn't show anything in this case\r\n LocalNotifications.schedule({\r\n notifications: [{\r\n title: notification.title,\r\n body: notification.body,\r\n id: new Date().getUTCMilliseconds(),\r\n schedule: {\r\n at: new Date(Date.now() + 1000)\r\n },\r\n extra: notification.data,\r\n channelId: 'pop-notifications'\r\n }]\r\n });\r\n //}\r\n });\r\n \r\n\r\n PushNotifications.addListener(\r\n 'pushNotificationActionPerformed',\r\n (notification: PushNotificationActionPerformed) => {\r\n let service = notification.notification.data.service;\r\n let object = notification.notification.data.object;\r\n let idObject = notification.notification.data.idObject;\r\n\r\n console.log('Service: ', service);\r\n console.log('Object: ', object);\r\n console.log('idObject: ', idObject);\r\n\r\n /* if (service === \"events\") {\r\n this.router.navigate(['/home/', service, idObject, 'home']);\r\n } else if (service === \"agenda\") {\r\n this.router.navigate(['/home/', service, idObject, 'home']);\r\n } else if (service === \"gabinete-digital\" && object != \"expediente\") {*/\r\n // this.router.navigate(['/home/', service]);\r\n // }\r\n\r\n //if (service != null) {\r\n\r\n /*const routeValue = {\r\n \"agenda\": this.router.navigate(['/home/', service, idObject, 'home']),\r\n \"gabinete-digital\": this.router.navigate(['/home/', service]),\r\n \"accoes\": this.viewExpedientDetail(idObject),\r\n\r\n }\r\n\r\n const route = routeValue[service] && object ;\r\n\r\n service = \"agenda\" ? this.router.navigate(['/home/', service, idObject, 'home']) : */\r\n\r\n if (service === \"agenda\") {\r\n this.router.navigate(['/home/', service, idObject, 'home']);\r\n } else if (service === \"gabinete-digital\" && object != \"expediente\") {\r\n this.router.navigate(['/home/', service]);\r\n } else if (service === \"gabinete-digital\" && object === \"expediente\") {\r\n this.viewExpedientDetail(idObject)\r\n } else if (service === \"accoes\" && object === \"accao\") {\r\n this.viewPublications(idObject)\r\n } else if (service === \"accoes\" && object === \"publicacao\") {\r\n this.viewPublicationDetail(idObject)\r\n }\r\n \r\n\r\n\r\n\r\n /*switch (service) {\r\n case \"events\":\r\n this.router.navigate(['/home/', service, idObject, 'home']);\r\n break;\r\n case \"agenda\":\r\n this.router.navigate(['/home/', service, idObject, 'home']);\r\n break;\r\n case \"gabinete-digital\":\r\n this.router.navigate(['/home/', service]);\r\n break;\r\n case \"gabinete-digital-expediente\":\r\n this.router.navigate(['/home/gabinete-digital/', object, idObject, 'home']);\r\n break;\r\n case \"\": {\r\n\r\n if(publicationId && processId != null) {\r\n this.viewPublicationDetail(publicationId,processId)\r\n }\r\n if (folder.ProcessId != null) {\r\n this.viewPublications(folder)\r\n }\r\n }\r\n\r\n default:\r\n this.router.navigate(['/home/']);\r\n }*/\r\n\r\n\r\n\r\n },\r\n );\r\n }\r\n\r\n async localNotificationPresent(notification) {\r\n\r\n LocalNotificationAction.\r\n\r\n LocalNotifications.schedule({\r\n notifications: [\r\n {\r\n title: notification.title,\r\n body: notification.body,\r\n id: 1,\r\n schedule: { at: new Date(Date.now() + 1000) },\r\n sound: null,\r\n attachments: null,\r\n actionTypeId: \"\",\r\n extra: null,\r\n foreground: true,\r\n }\r\n ]\r\n });\r\n }\r\n\r\n async viewExpedientDetail(serialNumber:any) {\r\n console.log(this.profile);\r\n \r\n const modal = await this.modalController.create({\r\n component: ExpedienteDetailPage,\r\n componentProps:{\r\n serialNumber: serialNumber,\r\n profile: this.profile,\r\n },\r\n cssClass: 'modal',\r\n backdropDismiss: false\r\n });\r\n await modal.present();\r\n modal.onDidDismiss().then((res)=>{\r\n if(res){\r\n console.log(res);\r\n }\r\n });\r\n }\r\n\r\n\r\n\r\n async viewPublicationDetail(folderId) {\r\n const modal = await this.modalController.create({\r\n component: PublicationDetailPage,\r\n componentProps: {\r\n folderId: folderId,\r\n },\r\n cssClass: 'publication-detail',\r\n backdropDismiss: false\r\n });\r\n await modal.present();\r\n modal.onDidDismiss();\r\n }\r\n\r\n async viewPublications(folderId) {\r\n\r\n\r\n const modal = await this.modalController.create({\r\n component: ViewPublicationsPage,\r\n /* enterAnimation,\r\n leaveAnimation, */\r\n componentProps: {\r\n item: folderId,\r\n },\r\n cssClass: 'new-action',\r\n backdropDismiss: false\r\n });\r\n await modal.present();\r\n modal.onDidDismiss();\r\n }\r\n\r\n}\r\n","import { Injectable } from '@angular/core';\r\nimport { AuthService } from '../services/auth.service';\r\n\r\n@Injectable({\r\n providedIn: 'root'\r\n})\r\nexport class UserDataResolver{ \r\n constructor(private authService: AuthService){}\r\n\r\n resolve(){\r\n return this.authService.getUserData();\r\n }\r\n}"]}
+=======
+{"version":3,"sources":["webpack:///src/app/home/home.page.html","webpack:///src/app/home/home-routing.module.ts","webpack:///src/app/home/home.module.ts","webpack:///src/app/home/home.page.scss","webpack:///src/app/home/home.page.ts","webpack:///src/app/resolvers/userData.resolver.ts"],"names":["routes","path","component","resolve","userData","children","loadChildren","then","m","EventsPageModule","EventDetailPageModule","AttachmentsPageModule","AttendeesPageModule","LoginPageModule","AgendaPageModule","GabineteDigitalPageModule","ExpedientePageModule","ExpedienteDetailPageModule","EventListPageModule","SearchPageModule","PublicationsPageModule","ViewPublicationsPageModule","PublicationDetailPageModule","ChatPageModule","redirectTo","pathMatch","HomePageRoutingModule","imports","forChild","exports","HomePageModule","declarations","PushNotifications","LocalNotifications","LocalNotificationAction","HomePage","eventService","processesbackend","router","modalController","totalEvent","totalExpediente","profile","getAllMdEvents","Date","subscribe","res","eventsList","length","getAllPrEvents","GetTasksList","result","addListener","error","alert","JSON","stringify","notification","schedule","notifications","title","body","id","getUTCMilliseconds","at","now","extra","data","channelId","service","object","idObject","console","log","viewEventDetail","navigate","viewExpedientDetail","viewPublications","viewPublicationDetail","sound","attachments","actionTypeId","foreground","eventId","create","componentProps","cssClass","backdropDismiss","modal","present","onDidDismiss","serialNumber","folderId","item","selector","template","UserDataResolver","authService","getUserData","providedIn"],"mappings":"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","file":"home-home-module-es5.js","sourcesContent":["export default \"\\r\\n\\r\\n\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n {{totalEvent}}\\r\\n Início\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n Agenda\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n {{totalExpediente}}\\r\\n Gabinete\\r\\n \\r\\n \\r\\n \\r\\n Acções\\r\\n \\r\\n \\r\\n \\r\\n Chat\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n\";","import { NgModule } from '@angular/core';\r\nimport { Routes, RouterModule } from '@angular/router';\r\nimport { HomeGuard } from '../guards/home.guard';\r\nimport { UserDataResolver } from '../resolvers/userData.resolver';\r\n\r\nimport { HomePage } from './home.page';\r\n\r\nconst routes: Routes = [\r\n {\r\n path: 'home',\r\n component: HomePage,\r\n /* canActivate: [HomeGuard], */\r\n resolve: {\r\n userData: UserDataResolver\r\n },\r\n children: [\r\n {\r\n path: 'events',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/events/events.module').then(m => m.EventsPageModule)\r\n },\r\n {\r\n path:':eventId/:caller',\r\n loadChildren: ()=> import('../pages/events/event-detail/event-detail.module').then(m => m.EventDetailPageModule),\r\n },\r\n ]\r\n },\r\n {\r\n path: 'attachments',\r\n children: [\r\n {\r\n path:':eventId',\r\n loadChildren: ()=> import('../pages/events/attachments/attachments.module').then(m => m.AttachmentsPageModule)\r\n },\r\n\r\n ]\r\n },\r\n {\r\n path: 'attendees',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/events/attendees/attendees.module').then(m => m.AttendeesPageModule)\r\n },\r\n ]\r\n },\r\n {\r\n path: 'login',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/login/login.module').then(m => m.LoginPageModule)\r\n },\r\n ]\r\n },\r\n {\r\n path: 'agenda',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/agenda/agenda.module').then(m => m.AgendaPageModule)\r\n },\r\n {\r\n path:':eventId/:caller',\r\n loadChildren: ()=> import('../pages/events/event-detail/event-detail.module').then(m => m.EventDetailPageModule),\r\n }\r\n ]\r\n },\r\n {\r\n path: 'gabinete-digital',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/gabinete-digital/gabinete-digital.module').then(m => m.GabineteDigitalPageModule)\r\n },\r\n {\r\n path:'expediente',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/gabinete-digital/expediente/expediente.module').then(m => m.ExpedientePageModule)\r\n },\r\n {\r\n path:':SerialNumber',\r\n loadChildren: ()=> import('../pages/gabinete-digital/expediente/expediente-detail/expediente-detail.module').then(m => m.ExpedienteDetailPageModule)\r\n },\r\n {\r\n path:'events/:eventId/:caller',\r\n loadChildren: ()=> import('../pages/events/event-detail/event-detail.module').then(m => m.EventDetailPageModule),\r\n }\r\n ]\r\n },\r\n {\r\n path:'event-list',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/gabinete-digital/event-list/event-list.module').then(m => m.EventListPageModule)\r\n },\r\n ] \r\n },\r\n ]\r\n },\r\n {\r\n path: 'search',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/search/search.module').then(m => m.SearchPageModule)\r\n }\r\n ]\r\n },\r\n {\r\n path: 'publications',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/publications/publications.module').then(m => m.PublicationsPageModule)\r\n },\r\n {\r\n path:'view-publications',\r\n children: [\r\n {\r\n path:':folderId',\r\n loadChildren: ()=> import('../pages/publications/view-publications/view-publications.module').then(m => m.ViewPublicationsPageModule)\r\n },\r\n {\r\n path:'publication-detail',\r\n children: [\r\n {\r\n path: ':id',\r\n loadChildren: ()=> import('../pages/publications/view-publications/publication-detail/publication-detail.module').then(m => m.PublicationDetailPageModule)\r\n },\r\n ]\r\n \r\n },\r\n ] \r\n },\r\n ]\r\n },\r\n {\r\n path: 'chat',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/chat/chat.module').then(m => m.ChatPageModule)\r\n }\r\n ]\r\n },\r\n ]\r\n },\r\n {\r\n path: '',\r\n redirectTo: '/home/events',\r\n pathMatch: 'full'\r\n }\r\n];\r\n\r\n@NgModule({\r\n imports: [RouterModule.forChild(routes)],\r\n exports: [RouterModule],\r\n})\r\nexport class HomePageRoutingModule {}\r\n","import { NgModule } from '@angular/core';\r\nimport { CommonModule } from '@angular/common';\r\nimport { FormsModule } from '@angular/forms';\r\n\r\nimport { IonicModule } from '@ionic/angular';\r\n\r\nimport { HomePageRoutingModule } from './home-routing.module';\r\n\r\nimport { HomePage } from './home.page';\r\n/* import { IonicSelectableModule } from 'ionic-selectable'; */\r\nimport { SharedModule } from 'src/app/shared/shared.module';\r\n\r\n@NgModule({\r\n imports: [\r\n CommonModule,\r\n FormsModule,\r\n IonicModule,\r\n HomePageRoutingModule,\r\n SharedModule\r\n ],\r\n declarations: [HomePage]\r\n})\r\nexport class HomePageModule {}\r\n","export default \"ion-tab-bar {\\n --background: #f9f9f9;\\n --color: #061b52;\\n}\\n\\nion-badge {\\n /* */\\n /* display: inline-block;*/\\n min-width: 18px;\\n font-size: 15px;\\n /* font-weight: $badge-font-weight;\\n line-height: 1;\\n\\n white-space: nowrap;\\n vertical-align: baseline; */\\n}\\n\\n.tab .bottoms {\\n display: flex;\\n justify-content: space-around;\\n}\\n/*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNyYy9hcHAvaG9tZS9DOlxcVXNlcnNcXGV1ZGVzLmluYWNpb1xcR2FiaW5ldC1EaWdpdGFsUHJvamVjdFxcTmV3IGZvbGRlclxcZ2FiaW5ldGUtZGlnaXRhbC9zcmNcXGFwcFxcaG9tZVxcaG9tZS5wYWdlLnNjc3MiLCJzcmMvYXBwL2hvbWUvaG9tZS5wYWdlLnNjc3MiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0E7RUFDSSxxQkFBQTtFQUNBLGdCQUFBO0FDQUo7O0FEYUE7RUFBVyxLQUFBO0VBRVQsMEJBQUE7RUFFQSxlQUFBO0VBQ0EsZUFYZTtFQVlmOzs7OzZCQUFBO0FDUEY7O0FEZ0JFO0VBQ0UsYUFBQTtFQUNBLDZCQUFBO0FDYkoiLCJmaWxlIjoic3JjL2FwcC9ob21lL2hvbWUucGFnZS5zY3NzIiwic291cmNlc0NvbnRlbnQiOlsiXHJcbmlvbi10YWItYmFye1xyXG4gICAgLS1iYWNrZ3JvdW5kOiAjZjlmOWY5O1xyXG4gICAgLS1jb2xvcjogIzA2MWI1MjtcclxufVxyXG5cclxuLy8gQmFkZ2VcclxuLy8gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS1cclxuXHJcbi8vLyBAcHJvcCAtIEZvbnQgc2l6ZSBvZiB0aGUgYmFkZ2VcclxuJGJhZGdlLWZvbnQtc2l6ZToxNXB4ICFkZWZhdWx0O1xyXG5cclxuLy8vIEBwcm9wIC0gRm9udCB3ZWlnaHQgb2YgdGhlIGJhZGdlXHJcbiRiYWRnZS1mb250LXdlaWdodDpib2xkICFkZWZhdWx0O1xyXG5cclxuXHJcbmlvbi1iYWRnZSB7LyogICovXHJcblxyXG4gIC8qIGRpc3BsYXk6IGlubGluZS1ibG9jazsqL1xyXG5cclxuICBtaW4td2lkdGg6IDE4cHg7IFxyXG4gIGZvbnQtc2l6ZTogJGJhZGdlLWZvbnQtc2l6ZTtcclxuICAvKiBmb250LXdlaWdodDogJGJhZGdlLWZvbnQtd2VpZ2h0O1xyXG4gIGxpbmUtaGVpZ2h0OiAxO1xyXG5cclxuICB3aGl0ZS1zcGFjZTogbm93cmFwO1xyXG4gIHZlcnRpY2FsLWFsaWduOiBiYXNlbGluZTsgKi9cclxufVxyXG5cclxuXHJcbi50YWJ7XHJcbiAgLmJvdHRvbXN7XHJcbiAgICBkaXNwbGF5OiBmbGV4O1xyXG4gICAganVzdGlmeS1jb250ZW50OiBzcGFjZS1hcm91bmQ7XHJcbiAgfVxyXG59IiwiaW9uLXRhYi1iYXIge1xuICAtLWJhY2tncm91bmQ6ICNmOWY5Zjk7XG4gIC0tY29sb3I6ICMwNjFiNTI7XG59XG5cbmlvbi1iYWRnZSB7XG4gIC8qICAqL1xuICAvKiBkaXNwbGF5OiBpbmxpbmUtYmxvY2s7Ki9cbiAgbWluLXdpZHRoOiAxOHB4O1xuICBmb250LXNpemU6IDE1cHg7XG4gIC8qIGZvbnQtd2VpZ2h0OiAkYmFkZ2UtZm9udC13ZWlnaHQ7XG4gIGxpbmUtaGVpZ2h0OiAxO1xuXG4gIHdoaXRlLXNwYWNlOiBub3dyYXA7XG4gIHZlcnRpY2FsLWFsaWduOiBiYXNlbGluZTsgKi9cbn1cblxuLnRhYiAuYm90dG9tcyB7XG4gIGRpc3BsYXk6IGZsZXg7XG4gIGp1c3RpZnktY29udGVudDogc3BhY2UtYXJvdW5kO1xufSJdfQ== */\";","import { Component, OnInit } from '@angular/core';\r\nimport { EventsService } from '../services/events.service';\r\nimport { formatDate } from '@angular/common';\r\nimport { Event } from '../models/event.model';\r\nimport { ProcessesService } from '../services/processes.service';\r\nimport { StorageService } from 'src/app/services/storage.service';\r\nimport { ModalController } from '@ionic/angular';\r\nimport { PublicationDetailPage } from '../../app/pages/publications/view-publications/publication-detail/publication-detail.page';\r\nimport { ViewPublicationsPage } from '../../app/pages/publications/view-publications/view-publications.page';\r\nimport { ExpedienteDetailPage } from '../../app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page'\r\nimport { ViewEventPage } from '../../app/pages/agenda/view-event/view-event.page'\r\n\r\nimport { Plugins, PushNotification, PushNotificationToken, PushNotificationActionPerformed, Modals } from '@capacitor/core';\r\nimport { Router } from '@angular/router';\r\nimport { MethodCall } from '@angular/compiler';\r\n\r\nconst { PushNotifications, LocalNotifications, LocalNotificationAction } = Plugins;\r\n\r\n@Component({\r\n selector: 'app-home',\r\n templateUrl: './home.page.html',\r\n styleUrls: ['./home.page.scss'],\r\n})\r\nexport class HomePage implements OnInit {\r\n eventsList: Event[];\r\n prEventList: Event[];\r\n mdEventList: Event[];\r\n\r\n totalEvent = 0;\r\n totalExpediente = 0;\r\n profile: string;\r\n\r\n constructor(private eventService: EventsService, private processesbackend: ProcessesService, private router: Router, private modalController: ModalController,) { }\r\n\r\n ngOnInit() {\r\n //Initialize profile as mdgpr\r\n this.profile = \"mdgpr\";\r\n if (this.profile == \"mdgpr\") {\r\n this.eventService.getAllMdEvents(formatDate(new Date(), 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => {\r\n this.eventsList = res;\r\n this.totalEvent = this.eventsList.length;\r\n });\r\n }\r\n else {\r\n this.eventService.getAllPrEvents(formatDate(new Date(), 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => {\r\n this.eventsList = res;\r\n this.totalEvent = this.eventsList.length;\r\n });\r\n\r\n }\r\n this.processesbackend.GetTasksList(\"Expediente\", true).subscribe(result => {\r\n this.totalExpediente = result;\r\n });\r\n /*\r\n (PushNotifications as any).requestPermission().then(result => {\r\n PushNotifications.register();\r\n });\r\n \r\n PushNotifications.addListener(\r\n 'registration',\r\n (token: PushNotificationToken) => {\r\n alert('Push registration success, token: ' + token.value);\r\n console.log('FIREBASE: ', token.value)\r\n this.storageService.store(this.username,token.value);\r\n },\r\n );\r\n \r\n console.log(this.storageService.get(this.username)) */\r\n\r\n PushNotifications.addListener('registrationError', (error: any) => {\r\n alert('Error on registration: ' + JSON.stringify(error));\r\n });\r\n\r\n PushNotifications.addListener('pushNotificationReceived', notification => { \r\n\r\n //const isPushNotification = !!notification.title || !!notification.body;\r\n \r\n // if this is a push notification received when the app is in the foreground on Android\r\n //if (isAndroid && isPushNotification) {\r\n \r\n // We schedule a LocalNotification 1 second later since Capacitor for Android doesn't show anything in this case\r\n LocalNotifications.schedule({\r\n notifications: [{\r\n title: notification.title,\r\n body: notification.body,\r\n id: new Date().getUTCMilliseconds(),\r\n schedule: {\r\n at: new Date(Date.now() + 1000)\r\n },\r\n extra: notification.data,\r\n channelId: 'pop-notifications'\r\n }]\r\n });\r\n //}\r\n });\r\n \r\n\r\n PushNotifications.addListener(\r\n 'pushNotificationActionPerformed',\r\n (notification: PushNotificationActionPerformed) => {\r\n let service = notification.notification.data.service;\r\n let object = notification.notification.data.object;\r\n let idObject = notification.notification.data.idObject;\r\n\r\n console.log('Service: ', service);\r\n console.log('Object: ', object);\r\n console.log('idObject: ', idObject);\r\n\r\n /* if (service === \"events\") {\r\n this.router.navigate(['/home/', service, idObject, 'home']);\r\n } else if (service === \"agenda\") {\r\n this.router.navigate(['/home/', service, idObject, 'home']);\r\n } else if (service === \"gabinete-digital\" && object != \"expediente\") {*/\r\n // this.router.navigate(['/home/', service]);\r\n // }\r\n\r\n //if (service != null) {\r\n\r\n /*const routeValue = {\r\n \"agenda\": this.router.navigate(['/home/', service, idObject, 'home']),\r\n \"gabinete-digital\": this.router.navigate(['/home/', service]),\r\n \"accoes\": this.viewExpedientDetail(idObject),\r\n\r\n }\r\n\r\n const route = routeValue[service] && object ;\r\n\r\n service = \"agenda\" ? this.router.navigate(['/home/', service, idObject, 'home']) : */\r\n\r\n if (service === \"agenda\") {\r\n //this.router.navigate(['/home/', service, idObject, 'home']);\r\n this.viewEventDetail(idObject)\r\n } else if (service === \"gabinete-digital\" && object != \"expediente\") {\r\n this.router.navigate(['/home/', service]);\r\n } else if (service === \"gabinete-digital\" && object === \"expediente\") {\r\n this.viewExpedientDetail(idObject)\r\n } else if (service === \"accoes\" && object === \"accao\") {\r\n this.viewPublications(idObject)\r\n } else if (service === \"accoes\" && object === \"publicacao\") {\r\n this.viewPublicationDetail(idObject)\r\n }\r\n \r\n\r\n\r\n\r\n /*switch (service) {\r\n case \"events\":\r\n this.router.navigate(['/home/', service, idObject, 'home']);\r\n break;\r\n case \"agenda\":\r\n this.router.navigate(['/home/', service, idObject, 'home']);\r\n break;\r\n case \"gabinete-digital\":\r\n this.router.navigate(['/home/', service]);\r\n break;\r\n case \"gabinete-digital-expediente\":\r\n this.router.navigate(['/home/gabinete-digital/', object, idObject, 'home']);\r\n break;\r\n case \"\": {\r\n\r\n if(publicationId && processId != null) {\r\n this.viewPublicationDetail(publicationId,processId)\r\n }\r\n if (folder.ProcessId != null) {\r\n this.viewPublications(folder)\r\n }\r\n }\r\n\r\n default:\r\n this.router.navigate(['/home/']);\r\n }*/\r\n\r\n\r\n\r\n },\r\n );\r\n }\r\n\r\n async localNotificationPresent(notification) {\r\n\r\n LocalNotificationAction.\r\n\r\n LocalNotifications.schedule({\r\n notifications: [\r\n {\r\n title: notification.title,\r\n body: notification.body,\r\n id: 1,\r\n schedule: { at: new Date(Date.now() + 1000) },\r\n sound: null,\r\n attachments: null,\r\n actionTypeId: \"\",\r\n extra: null,\r\n foreground: true,\r\n }\r\n ]\r\n });\r\n }\r\n\r\n async viewEventDetail(eventId:any) {\r\n console.log(this.profile);\r\n \r\n const modal = await this.modalController.create({\r\n component: ViewEventPage,\r\n componentProps:{\r\n eventId: eventId,\r\n },\r\n cssClass: 'modal',\r\n backdropDismiss: false\r\n });\r\n await modal.present();\r\n modal.onDidDismiss().then((res)=>{\r\n if(res){\r\n console.log(res);\r\n //this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);\r\n }\r\n });\r\n }\r\n\r\n async viewExpedientDetail(serialNumber:any) {\r\n console.log(this.profile);\r\n \r\n const modal = await this.modalController.create({\r\n component: ExpedienteDetailPage,\r\n componentProps:{\r\n serialNumber: serialNumber,\r\n profile: this.profile,\r\n },\r\n cssClass: 'modal',\r\n backdropDismiss: false\r\n });\r\n await modal.present();\r\n modal.onDidDismiss().then((res)=>{\r\n if(res){\r\n console.log(res);\r\n }\r\n });\r\n }\r\n\r\n\r\n\r\n async viewPublicationDetail(folderId) {\r\n const modal = await this.modalController.create({\r\n component: PublicationDetailPage,\r\n componentProps: {\r\n folderId: folderId,\r\n },\r\n cssClass: 'publication-detail',\r\n backdropDismiss: false\r\n });\r\n await modal.present();\r\n modal.onDidDismiss();\r\n }\r\n\r\n async viewPublications(folderId) {\r\n\r\n\r\n const modal = await this.modalController.create({\r\n component: ViewPublicationsPage,\r\n /* enterAnimation,\r\n leaveAnimation, */\r\n componentProps: {\r\n item: folderId,\r\n },\r\n cssClass: 'new-action',\r\n backdropDismiss: false\r\n });\r\n await modal.present();\r\n modal.onDidDismiss();\r\n }\r\n\r\n}\r\n","import { Injectable } from '@angular/core';\r\nimport { AuthService } from '../services/auth.service';\r\n\r\n@Injectable({\r\n providedIn: 'root'\r\n})\r\nexport class UserDataResolver{ \r\n constructor(private authService: AuthService){}\r\n\r\n resolve(){\r\n return this.authService.getUserData();\r\n }\r\n}"]}
+>>>>>>> origin/feature/pushNotifications
diff --git a/android/app/build/outputs/logs/manifest-merger-debug-report.txt b/android/app/build/outputs/logs/manifest-merger-debug-report.txt
index 5860bad59..d0158e8c1 100644
--- a/android/app/build/outputs/logs/manifest-merger-debug-report.txt
+++ b/android/app/build/outputs/logs/manifest-merger-debug-report.txt
@@ -1,5 +1,6 @@
-- Merging decision tree log ---
provider#androidx.core.content.FileProvider
+<<<<<<< HEAD
INJECTED from C:\Users\tiago.kayaya\development\gabinete-digital\android\app\src\main\AndroidManifest.xml:34:9-43:20
android:grantUriPermissions
ADDED from C:\Users\tiago.kayaya\development\gabinete-digital\android\app\src\main\AndroidManifest.xml:38:13-47
@@ -134,9 +135,146 @@ MERGED from [com.google.android.datatransport:transport-backend-cct:2.2.0] C:\Us
MERGED from [com.google.android.datatransport:transport-backend-cct:2.2.0] C:\Users\tiago.kayaya\.gradle\caches\transforms-2\files-2.1\8e8493fc4060d1a9e60e0e8b89d28daa\jetified-transport-backend-cct-2.2.0\AndroidManifest.xml:28:5-36:19
MERGED from [com.google.android.datatransport:transport-runtime:2.2.0] C:\Users\tiago.kayaya\.gradle\caches\transforms-2\files-2.1\09a4bf673ec4891d08a21c203c688e10\jetified-transport-runtime-2.2.0\AndroidManifest.xml:25:5-39:19
MERGED from [com.google.android.datatransport:transport-runtime:2.2.0] C:\Users\tiago.kayaya\.gradle\caches\transforms-2\files-2.1\09a4bf673ec4891d08a21c203c688e10\jetified-transport-runtime-2.2.0\AndroidManifest.xml:25:5-39:19
+=======
+INJECTED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:34:9-43:20
+ android:grantUriPermissions
+ ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:38:13-47
+ android:authorities
+ INJECTED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml
+ ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:36:13-64
+ android:exported
+ ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:37:13-37
+ android:name
+ ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:35:13-62
+manifest
+ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:2:1-64:12
+INJECTED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:2:1-64:12
+INJECTED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:2:1-64:12
+INJECTED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:2:1-64:12
+MERGED from [:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:2:1-50:12
+MERGED from [com.google.android.material:material:1.1.0-rc02] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\19593d9c2c700c52ad03572ebfd537d5\material-1.1.0-rc02\AndroidManifest.xml:17:1-24:12
+MERGED from [androidx.appcompat:appcompat:1.1.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\396e7ddea1addefd32f4f3d87ec48909\appcompat-1.1.0\AndroidManifest.xml:17:1-24:12
+MERGED from [androidx.legacy:legacy-support-v4:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\aab5293454cabe85272e9de04d494d57\legacy-support-v4-1.0.0\AndroidManifest.xml:17:1-22:12
+MERGED from [:capacitor-cordova-android-plugins] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\capacitor-cordova-android-plugins\build\intermediates\library_manifest\debug\AndroidManifest.xml:2:1-18:12
+MERGED from [androidx.legacy:legacy-support-core-ui:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\226817fd352d0debd037c03d8ec9b5c1\legacy-support-core-ui-1.0.0\AndroidManifest.xml:17:1-22:12
+MERGED from [androidx.cursoradapter:cursoradapter:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\705071dba30571a9226503cb1f0dac80\cursoradapter-1.0.0\AndroidManifest.xml:17:1-22:12
+MERGED from [androidx.viewpager2:viewpager2:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\305c2898fe2457e82c9da2257c2bc0a1\jetified-viewpager2-1.0.0\AndroidManifest.xml:17:1-24:12
+MERGED from [com.google.firebase:firebase-messaging:20.1.2] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\ec0d34db7bfab328a67bc775742a1d9e\jetified-firebase-messaging-20.1.2\AndroidManifest.xml:17:1-44:12
+MERGED from [com.google.android.gms:play-services-location:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\bf701184cb284afcaa68a6fadbfff89e\jetified-play-services-location-17.0.0\AndroidManifest.xml:2:1-9:12
+MERGED from [com.google.firebase:firebase-datatransport:17.0.3] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\ec6ed60bc769c1397d2bb4044e417511\jetified-firebase-datatransport-17.0.3\AndroidManifest.xml:15:1-34:12
+MERGED from [com.google.firebase:firebase-iid:20.1.1] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\2af03360c2f1d9c4749c1d75a7057ee7\jetified-firebase-iid-20.1.1\AndroidManifest.xml:17:1-47:12
+MERGED from [com.google.firebase:firebase-installations:16.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\a9f39591fd7e3606aa03e1dd4d0c2ad4\jetified-firebase-installations-16.0.0\AndroidManifest.xml:2:1-23:12
+MERGED from [com.google.firebase:firebase-common:19.3.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\d5ae2f905dca277d72c2333071856016\jetified-firebase-common-19.3.0\AndroidManifest.xml:15:1-39:12
+MERGED from [com.google.firebase:firebase-iid-interop:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\33cfeb201180ccbffcbd0bf570ba86e2\jetified-firebase-iid-interop-17.0.0\AndroidManifest.xml:2:1-10:12
+MERGED from [com.google.android.gms:play-services-base:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\9d9f5eefb5bcc469207d44112eb03d4a\jetified-play-services-base-17.0.0\AndroidManifest.xml:17:1-29:12
+MERGED from [com.google.firebase:firebase-installations-interop:16.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\f83230e685678f09189e9abde1693e34\jetified-firebase-installations-interop-16.0.0\AndroidManifest.xml:15:1-23:12
+MERGED from [com.google.android.gms:play-services-tasks:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\61b6250f2312bb6eaf48524efa92324f\jetified-play-services-tasks-17.0.0\AndroidManifest.xml:2:1-9:12
+MERGED from [com.google.firebase:firebase-measurement-connector:18.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\eb1940bc3fb957fd232db9f27e4df6ed\jetified-firebase-measurement-connector-18.0.0\AndroidManifest.xml:17:1-25:12
+MERGED from [com.google.android.gms:play-services-places-placereport:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\4a929dd5da9b3523b8f1ddfe5205ecb7\jetified-play-services-places-placereport-17.0.0\AndroidManifest.xml:17:1-24:12
+MERGED from [com.google.android.gms:play-services-stats:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\b4cf759fbefe631836a911785c931842\jetified-play-services-stats-17.0.0\AndroidManifest.xml:2:1-9:12
+MERGED from [com.google.android.gms:play-services-basement:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\f258e3825c6af3b14c7ec1616fae4742\jetified-play-services-basement-17.0.0\AndroidManifest.xml:17:1-28:12
+MERGED from [androidx.fragment:fragment:1.1.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\e40e3efd5a968ec9847eae2ae9c7d8ac\fragment-1.1.0\AndroidManifest.xml:17:1-24:12
+MERGED from [androidx.appcompat:appcompat-resources:1.1.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\e66da8b5301e9a6b4d099a6eed9ee5b8\jetified-appcompat-resources-1.1.0\AndroidManifest.xml:17:1-24:12
+MERGED from [androidx.drawerlayout:drawerlayout:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\6984223d1aa8f315c8c42812a9db3a3b\drawerlayout-1.0.0\AndroidManifest.xml:17:1-22:12
+MERGED from [androidx.browser:browser:1.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\caa5198f0ae08d91561862daa07e196f\browser-1.2.0\AndroidManifest.xml:17:1-24:12
+MERGED from [androidx.media:media:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\47ce40ad459cbf22b0d81e337967e729\media-1.0.0\AndroidManifest.xml:17:1-22:12
+MERGED from [androidx.legacy:legacy-support-core-utils:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\92ce016465e3a6bb2a1c0eeefed0193e\legacy-support-core-utils-1.0.0\AndroidManifest.xml:17:1-22:12
+MERGED from [androidx.viewpager:viewpager:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\bd24342c93fd52cb5e9c9c7bb35f50f1\viewpager-1.0.0\AndroidManifest.xml:17:1-22:12
+MERGED from [androidx.loader:loader:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\148f2fd794536689e5a7e95e250ac390\loader-1.0.0\AndroidManifest.xml:17:1-22:12
+MERGED from [androidx.activity:activity:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\5d880c01bc106322c4b2a83be9757563\jetified-activity-1.0.0\AndroidManifest.xml:17:1-24:12
+MERGED from [androidx.vectordrawable:vectordrawable-animated:1.1.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\7369d370d1c3f03944cff7adb4eeb0ab\vectordrawable-animated-1.1.0\AndroidManifest.xml:17:1-24:12
+MERGED from [androidx.vectordrawable:vectordrawable:1.1.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\57d4ae6adbb5ccfa9dafa8ad36f43ff8\vectordrawable-1.1.0\AndroidManifest.xml:17:1-24:12
+MERGED from [androidx.coordinatorlayout:coordinatorlayout:1.1.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\8c1aed4303e761aac5e34d2036bbfc96\coordinatorlayout-1.1.0\AndroidManifest.xml:17:1-24:12
+MERGED from [androidx.slidingpanelayout:slidingpanelayout:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\4ee2c6fbb04620a960d68455ede34459\slidingpanelayout-1.0.0\AndroidManifest.xml:17:1-22:12
+MERGED from [androidx.recyclerview:recyclerview:1.1.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\8d8a8abf56b0acf243894e5c793a7480\recyclerview-1.1.0\AndroidManifest.xml:17:1-24:12
+MERGED from [androidx.customview:customview:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\2be247bf8cbe2dd724b705391ddac84d\customview-1.0.0\AndroidManifest.xml:17:1-22:12
+MERGED from [androidx.transition:transition:1.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\a444f209b7c59a0fec306c6e0a516b3f\transition-1.2.0\AndroidManifest.xml:17:1-24:12
+MERGED from [androidx.swiperefreshlayout:swiperefreshlayout:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\db6ea2a636bcb3ab9eb7b581c5db983e\swiperefreshlayout-1.0.0\AndroidManifest.xml:17:1-22:12
+MERGED from [androidx.asynclayoutinflater:asynclayoutinflater:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\ccd497c0d55509e00fa2c4ec5a0ae967\asynclayoutinflater-1.0.0\AndroidManifest.xml:17:1-22:12
+MERGED from [androidx.core:core:1.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\e5357b0b880d2be0ed83398576c19d42\core-1.2.0\AndroidManifest.xml:17:1-26:12
+MERGED from [androidx.localbroadcastmanager:localbroadcastmanager:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\bf3e5eb0de5dbaf7174c5a9a34f69c5a\localbroadcastmanager-1.0.0\AndroidManifest.xml:17:1-22:12
+MERGED from [androidx.exifinterface:exifinterface:1.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\a5f8c4bd9c5151a79f218b639b5c253f\exifinterface-1.2.0\AndroidManifest.xml:17:1-24:12
+MERGED from [androidx.versionedparcelable:versionedparcelable:1.1.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\324b5866ad2c13339651997b434b41f3\versionedparcelable-1.1.0\AndroidManifest.xml:17:1-27:12
+MERGED from [androidx.cardview:cardview:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\adb371d4d53f86eab98a28717d70cc7e\cardview-1.0.0\AndroidManifest.xml:17:1-22:12
+MERGED from [androidx.interpolator:interpolator:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\6435850e23f2d01013861f1c8dbdb3a0\interpolator-1.0.0\AndroidManifest.xml:17:1-22:12
+MERGED from [com.google.android.datatransport:transport-backend-cct:2.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\8e8493fc4060d1a9e60e0e8b89d28daa\jetified-transport-backend-cct-2.2.0\AndroidManifest.xml:15:1-38:12
+MERGED from [com.google.android.datatransport:transport-runtime:2.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\09a4bf673ec4891d08a21c203c688e10\jetified-transport-runtime-2.2.0\AndroidManifest.xml:15:1-41:12
+MERGED from [com.google.firebase:firebase-components:16.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\626cd0cdd86577b53b05b9ceb0f9a7ca\jetified-firebase-components-16.0.0\AndroidManifest.xml:15:1-23:12
+MERGED from [com.google.firebase:firebase-encoders-json:16.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\fe101a7202e82c550c20fc0bfa50e08f\jetified-firebase-encoders-json-16.0.0\AndroidManifest.xml:15:1-23:12
+MERGED from [androidx.documentfile:documentfile:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\6ca55331635d9ca1071738b385928a75\documentfile-1.0.0\AndroidManifest.xml:17:1-22:12
+MERGED from [androidx.print:print:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\d5fd7fbc692311a845217063332ce16c\print-1.0.0\AndroidManifest.xml:17:1-22:12
+MERGED from [androidx.lifecycle:lifecycle-runtime:2.1.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\6750b43e205c4f520c814d38be8b2dbe\lifecycle-runtime-2.1.0\AndroidManifest.xml:17:1-22:12
+MERGED from [androidx.lifecycle:lifecycle-viewmodel:2.1.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\4585a9ad75e82c7c92523d92d109b415\lifecycle-viewmodel-2.1.0\AndroidManifest.xml:17:1-22:12
+MERGED from [androidx.savedstate:savedstate:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\d831d74eee9f185c588b244b4025c98f\jetified-savedstate-1.0.0\AndroidManifest.xml:17:1-24:12
+MERGED from [androidx.lifecycle:lifecycle-livedata:2.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\f15487c13029c5c78640eedfe3e4179f\lifecycle-livedata-2.0.0\AndroidManifest.xml:17:1-22:12
+MERGED from [androidx.lifecycle:lifecycle-livedata-core:2.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\b77454809810e03ad1b0b8586694d509\lifecycle-livedata-core-2.0.0\AndroidManifest.xml:17:1-22:12
+MERGED from [androidx.arch.core:core-runtime:2.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\59b723f090061559cc5b6f12f2aff3bc\core-runtime-2.0.0\AndroidManifest.xml:17:1-22:12
+MERGED from [org.apache.cordova:framework:7.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\158881081e6477a246826c6bde171b96\jetified-framework-7.0.0\AndroidManifest.xml:20:1-27:12
+MERGED from [com.google.android.datatransport:transport-api:2.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\467b040972e5d42442f90b49207efc7f\jetified-transport-api-2.2.0\AndroidManifest.xml:15:1-22:12
+INJECTED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:2:1-64:12
+INJECTED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:2:1-64:12
+INJECTED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:2:1-64:12
+ package
+ ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:3:5-38
+ INJECTED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml
+ INJECTED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml
+ android:versionName
+ INJECTED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml
+ ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:2:1-64:12
+ INJECTED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml
+ android:versionCode
+ INJECTED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml
+ ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:2:1-64:12
+ INJECTED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml
+ xmlns:android
+ ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:2:11-69
+application
+ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:5:5-44:19
+MERGED from [:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:18:5-48:19
+MERGED from [:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:18:5-48:19
+MERGED from [com.google.android.material:material:1.1.0-rc02] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\19593d9c2c700c52ad03572ebfd537d5\material-1.1.0-rc02\AndroidManifest.xml:22:5-20
+MERGED from [com.google.android.material:material:1.1.0-rc02] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\19593d9c2c700c52ad03572ebfd537d5\material-1.1.0-rc02\AndroidManifest.xml:22:5-20
+MERGED from [:capacitor-cordova-android-plugins] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\capacitor-cordova-android-plugins\build\intermediates\library_manifest\debug\AndroidManifest.xml:15:5-16:19
+MERGED from [:capacitor-cordova-android-plugins] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\capacitor-cordova-android-plugins\build\intermediates\library_manifest\debug\AndroidManifest.xml:15:5-16:19
+MERGED from [com.google.firebase:firebase-messaging:20.1.2] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\ec0d34db7bfab328a67bc775742a1d9e\jetified-firebase-messaging-20.1.2\AndroidManifest.xml:22:5-42:19
+MERGED from [com.google.firebase:firebase-messaging:20.1.2] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\ec0d34db7bfab328a67bc775742a1d9e\jetified-firebase-messaging-20.1.2\AndroidManifest.xml:22:5-42:19
+MERGED from [com.google.android.gms:play-services-location:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\bf701184cb284afcaa68a6fadbfff89e\jetified-play-services-location-17.0.0\AndroidManifest.xml:7:5-20
+MERGED from [com.google.android.gms:play-services-location:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\bf701184cb284afcaa68a6fadbfff89e\jetified-play-services-location-17.0.0\AndroidManifest.xml:7:5-20
+MERGED from [com.google.firebase:firebase-datatransport:17.0.3] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\ec6ed60bc769c1397d2bb4044e417511\jetified-firebase-datatransport-17.0.3\AndroidManifest.xml:24:5-32:19
+MERGED from [com.google.firebase:firebase-datatransport:17.0.3] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\ec6ed60bc769c1397d2bb4044e417511\jetified-firebase-datatransport-17.0.3\AndroidManifest.xml:24:5-32:19
+MERGED from [com.google.firebase:firebase-iid:20.1.1] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\2af03360c2f1d9c4749c1d75a7057ee7\jetified-firebase-iid-20.1.1\AndroidManifest.xml:28:5-45:19
+MERGED from [com.google.firebase:firebase-iid:20.1.1] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\2af03360c2f1d9c4749c1d75a7057ee7\jetified-firebase-iid-20.1.1\AndroidManifest.xml:28:5-45:19
+MERGED from [com.google.firebase:firebase-installations:16.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\a9f39591fd7e3606aa03e1dd4d0c2ad4\jetified-firebase-installations-16.0.0\AndroidManifest.xml:13:5-21:19
+MERGED from [com.google.firebase:firebase-installations:16.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\a9f39591fd7e3606aa03e1dd4d0c2ad4\jetified-firebase-installations-16.0.0\AndroidManifest.xml:13:5-21:19
+MERGED from [com.google.firebase:firebase-common:19.3.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\d5ae2f905dca277d72c2333071856016\jetified-firebase-common-19.3.0\AndroidManifest.xml:25:5-37:19
+MERGED from [com.google.firebase:firebase-common:19.3.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\d5ae2f905dca277d72c2333071856016\jetified-firebase-common-19.3.0\AndroidManifest.xml:25:5-37:19
+MERGED from [com.google.firebase:firebase-iid-interop:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\33cfeb201180ccbffcbd0bf570ba86e2\jetified-firebase-iid-interop-17.0.0\AndroidManifest.xml:7:5-8:19
+MERGED from [com.google.firebase:firebase-iid-interop:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\33cfeb201180ccbffcbd0bf570ba86e2\jetified-firebase-iid-interop-17.0.0\AndroidManifest.xml:7:5-8:19
+MERGED from [com.google.android.gms:play-services-base:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\9d9f5eefb5bcc469207d44112eb03d4a\jetified-play-services-base-17.0.0\AndroidManifest.xml:22:5-27:19
+MERGED from [com.google.android.gms:play-services-base:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\9d9f5eefb5bcc469207d44112eb03d4a\jetified-play-services-base-17.0.0\AndroidManifest.xml:22:5-27:19
+MERGED from [com.google.android.gms:play-services-tasks:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\61b6250f2312bb6eaf48524efa92324f\jetified-play-services-tasks-17.0.0\AndroidManifest.xml:7:5-20
+MERGED from [com.google.android.gms:play-services-tasks:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\61b6250f2312bb6eaf48524efa92324f\jetified-play-services-tasks-17.0.0\AndroidManifest.xml:7:5-20
+MERGED from [com.google.firebase:firebase-measurement-connector:18.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\eb1940bc3fb957fd232db9f27e4df6ed\jetified-firebase-measurement-connector-18.0.0\AndroidManifest.xml:22:5-23:19
+MERGED from [com.google.firebase:firebase-measurement-connector:18.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\eb1940bc3fb957fd232db9f27e4df6ed\jetified-firebase-measurement-connector-18.0.0\AndroidManifest.xml:22:5-23:19
+MERGED from [com.google.android.gms:play-services-places-placereport:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\4a929dd5da9b3523b8f1ddfe5205ecb7\jetified-play-services-places-placereport-17.0.0\AndroidManifest.xml:22:5-20
+MERGED from [com.google.android.gms:play-services-places-placereport:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\4a929dd5da9b3523b8f1ddfe5205ecb7\jetified-play-services-places-placereport-17.0.0\AndroidManifest.xml:22:5-20
+MERGED from [com.google.android.gms:play-services-stats:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\b4cf759fbefe631836a911785c931842\jetified-play-services-stats-17.0.0\AndroidManifest.xml:7:5-20
+MERGED from [com.google.android.gms:play-services-stats:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\b4cf759fbefe631836a911785c931842\jetified-play-services-stats-17.0.0\AndroidManifest.xml:7:5-20
+MERGED from [com.google.android.gms:play-services-basement:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\f258e3825c6af3b14c7ec1616fae4742\jetified-play-services-basement-17.0.0\AndroidManifest.xml:22:5-26:19
+MERGED from [com.google.android.gms:play-services-basement:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\f258e3825c6af3b14c7ec1616fae4742\jetified-play-services-basement-17.0.0\AndroidManifest.xml:22:5-26:19
+MERGED from [androidx.core:core:1.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\e5357b0b880d2be0ed83398576c19d42\core-1.2.0\AndroidManifest.xml:24:5-89
+MERGED from [androidx.core:core:1.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\e5357b0b880d2be0ed83398576c19d42\core-1.2.0\AndroidManifest.xml:24:5-89
+MERGED from [androidx.versionedparcelable:versionedparcelable:1.1.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\324b5866ad2c13339651997b434b41f3\versionedparcelable-1.1.0\AndroidManifest.xml:24:5-25:19
+MERGED from [androidx.versionedparcelable:versionedparcelable:1.1.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\324b5866ad2c13339651997b434b41f3\versionedparcelable-1.1.0\AndroidManifest.xml:24:5-25:19
+MERGED from [com.google.android.datatransport:transport-backend-cct:2.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\8e8493fc4060d1a9e60e0e8b89d28daa\jetified-transport-backend-cct-2.2.0\AndroidManifest.xml:28:5-36:19
+MERGED from [com.google.android.datatransport:transport-backend-cct:2.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\8e8493fc4060d1a9e60e0e8b89d28daa\jetified-transport-backend-cct-2.2.0\AndroidManifest.xml:28:5-36:19
+MERGED from [com.google.android.datatransport:transport-runtime:2.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\09a4bf673ec4891d08a21c203c688e10\jetified-transport-runtime-2.2.0\AndroidManifest.xml:25:5-39:19
+MERGED from [com.google.android.datatransport:transport-runtime:2.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\09a4bf673ec4891d08a21c203c688e10\jetified-transport-runtime-2.2.0\AndroidManifest.xml:25:5-39:19
+>>>>>>> origin/feature/pushNotifications
android:appComponentFactory
ADDED from [androidx.core:core:1.2.0] C:\Users\tiago.kayaya\.gradle\caches\transforms-2\files-2.1\e5357b0b880d2be0ed83398576c19d42\core-1.2.0\AndroidManifest.xml:24:18-86
android:supportsRtl
+<<<<<<< HEAD
ADDED from C:\Users\tiago.kayaya\development\gabinete-digital\android\app\src\main\AndroidManifest.xml:10:9-35
android:label
ADDED from C:\Users\tiago.kayaya\development\gabinete-digital\android\app\src\main\AndroidManifest.xml:8:9-41
@@ -462,6 +600,333 @@ action#android.intent.action.QUICKBOOT_POWERON
ADDED from [:capacitor-android] C:\Users\tiago.kayaya\development\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:45:17-82
android:name
ADDED from [:capacitor-android] C:\Users\tiago.kayaya\development\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:45:25-79
+=======
+ ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:10:9-35
+ android:label
+ ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:8:9-41
+ android:roundIcon
+ ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:9:9-54
+ android:icon
+ ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:7:9-43
+ android:allowBackup
+ ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:6:9-35
+ android:theme
+ ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:11:9-40
+activity#com.gpr.gabinetedigital.MainActivity
+ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:13:9-32:20
+ android:label
+ ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:16:13-56
+ android:launchMode
+ ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:18:13-44
+ android:configChanges
+ ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:14:13-129
+ android:theme
+ ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:17:13-62
+ android:name
+ ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:15:13-64
+intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER
+ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:20:13-23:29
+action#android.intent.action.MAIN
+ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:21:17-69
+ android:name
+ ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:21:25-66
+category#android.intent.category.LAUNCHER
+ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:22:17-77
+ android:name
+ ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:22:27-74
+intent-filter#action:name:android.intent.action.VIEW+category:name:android.intent.category.BROWSABLE+category:name:android.intent.category.DEFAULT+data:scheme:@string/custom_url_scheme
+ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:25:13-30:29
+action#android.intent.action.VIEW
+ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:26:17-69
+ android:name
+ ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:26:25-66
+category#android.intent.category.DEFAULT
+ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:27:17-76
+ android:name
+ ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:27:27-73
+category#android.intent.category.BROWSABLE
+ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:28:17-78
+ android:name
+ ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:28:27-75
+data
+ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:29:17-68
+ android:scheme
+ ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:29:23-65
+uses-permission#android.permission.INTERNET
+ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:48:5-67
+MERGED from [com.google.firebase:firebase-iid:20.1.1] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\2af03360c2f1d9c4749c1d75a7057ee7\jetified-firebase-iid-20.1.1\AndroidManifest.xml:23:5-67
+MERGED from [com.google.firebase:firebase-iid:20.1.1] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\2af03360c2f1d9c4749c1d75a7057ee7\jetified-firebase-iid-20.1.1\AndroidManifest.xml:23:5-67
+MERGED from [com.google.firebase:firebase-installations:16.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\a9f39591fd7e3606aa03e1dd4d0c2ad4\jetified-firebase-installations-16.0.0\AndroidManifest.xml:11:5-67
+MERGED from [com.google.firebase:firebase-installations:16.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\a9f39591fd7e3606aa03e1dd4d0c2ad4\jetified-firebase-installations-16.0.0\AndroidManifest.xml:11:5-67
+MERGED from [com.google.android.datatransport:transport-backend-cct:2.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\8e8493fc4060d1a9e60e0e8b89d28daa\jetified-transport-backend-cct-2.2.0\AndroidManifest.xml:26:5-67
+MERGED from [com.google.android.datatransport:transport-backend-cct:2.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\8e8493fc4060d1a9e60e0e8b89d28daa\jetified-transport-backend-cct-2.2.0\AndroidManifest.xml:26:5-67
+ android:name
+ ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:48:22-64
+uses-permission#android.permission.READ_EXTERNAL_STORAGE
+ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:50:5-79
+MERGED from [:capacitor-cordova-android-plugins] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\capacitor-cordova-android-plugins\build\intermediates\library_manifest\debug\AndroidManifest.xml:13:5-80
+MERGED from [:capacitor-cordova-android-plugins] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\capacitor-cordova-android-plugins\build\intermediates\library_manifest\debug\AndroidManifest.xml:13:5-80
+ android:name
+ ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:50:22-77
+uses-permission#android.permission.WRITE_EXTERNAL_STORAGE
+ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:51:5-81
+MERGED from [:capacitor-cordova-android-plugins] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\capacitor-cordova-android-plugins\build\intermediates\library_manifest\debug\AndroidManifest.xml:12:5-81
+MERGED from [:capacitor-cordova-android-plugins] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\capacitor-cordova-android-plugins\build\intermediates\library_manifest\debug\AndroidManifest.xml:12:5-81
+ android:name
+ ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:51:22-78
+uses-permission#android.permission.ACCESS_COARSE_LOCATION
+ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:53:5-81
+ android:name
+ ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:53:22-78
+uses-permission#android.permission.ACCESS_FINE_LOCATION
+ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:54:5-79
+ android:name
+ ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:54:22-76
+uses-feature#android.hardware.location.gps
+ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:55:5-66
+ android:name
+ ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:55:19-63
+uses-permission#android.permission.ACCESS_NETWORK_STATE
+ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:57:5-79
+MERGED from [com.google.firebase:firebase-iid:20.1.1] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\2af03360c2f1d9c4749c1d75a7057ee7\jetified-firebase-iid-20.1.1\AndroidManifest.xml:22:5-79
+MERGED from [com.google.firebase:firebase-iid:20.1.1] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\2af03360c2f1d9c4749c1d75a7057ee7\jetified-firebase-iid-20.1.1\AndroidManifest.xml:22:5-79
+MERGED from [com.google.firebase:firebase-installations:16.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\a9f39591fd7e3606aa03e1dd4d0c2ad4\jetified-firebase-installations-16.0.0\AndroidManifest.xml:10:5-79
+MERGED from [com.google.firebase:firebase-installations:16.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\a9f39591fd7e3606aa03e1dd4d0c2ad4\jetified-firebase-installations-16.0.0\AndroidManifest.xml:10:5-79
+MERGED from [com.google.android.datatransport:transport-backend-cct:2.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\8e8493fc4060d1a9e60e0e8b89d28daa\jetified-transport-backend-cct-2.2.0\AndroidManifest.xml:25:5-79
+MERGED from [com.google.android.datatransport:transport-backend-cct:2.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\8e8493fc4060d1a9e60e0e8b89d28daa\jetified-transport-backend-cct-2.2.0\AndroidManifest.xml:25:5-79
+MERGED from [com.google.android.datatransport:transport-runtime:2.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\09a4bf673ec4891d08a21c203c688e10\jetified-transport-runtime-2.2.0\AndroidManifest.xml:22:5-79
+MERGED from [com.google.android.datatransport:transport-runtime:2.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\09a4bf673ec4891d08a21c203c688e10\jetified-transport-runtime-2.2.0\AndroidManifest.xml:22:5-79
+ android:name
+ ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:57:22-76
+uses-permission#android.permission.CAMERA
+ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:60:5-65
+ android:name
+ ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:60:22-62
+uses-permission#android.permission.RECORD_AUDIO
+ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:62:5-71
+ android:name
+ ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:62:22-68
+uses-permission#android.permission.MODIFY_AUDIO_SETTINGS
+ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:63:5-79
+ android:name
+ ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:63:22-77
+uses-sdk
+INJECTED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml reason: use-sdk injection requested
+INJECTED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml
+INJECTED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml
+MERGED from [:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:7:5-9:41
+MERGED from [:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:7:5-9:41
+MERGED from [com.google.android.material:material:1.1.0-rc02] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\19593d9c2c700c52ad03572ebfd537d5\material-1.1.0-rc02\AndroidManifest.xml:20:5-44
+MERGED from [com.google.android.material:material:1.1.0-rc02] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\19593d9c2c700c52ad03572ebfd537d5\material-1.1.0-rc02\AndroidManifest.xml:20:5-44
+MERGED from [androidx.appcompat:appcompat:1.1.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\396e7ddea1addefd32f4f3d87ec48909\appcompat-1.1.0\AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.appcompat:appcompat:1.1.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\396e7ddea1addefd32f4f3d87ec48909\appcompat-1.1.0\AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.legacy:legacy-support-v4:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\aab5293454cabe85272e9de04d494d57\legacy-support-v4-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.legacy:legacy-support-v4:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\aab5293454cabe85272e9de04d494d57\legacy-support-v4-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [:capacitor-cordova-android-plugins] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\capacitor-cordova-android-plugins\build\intermediates\library_manifest\debug\AndroidManifest.xml:8:5-10:41
+MERGED from [:capacitor-cordova-android-plugins] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\capacitor-cordova-android-plugins\build\intermediates\library_manifest\debug\AndroidManifest.xml:8:5-10:41
+MERGED from [androidx.legacy:legacy-support-core-ui:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\226817fd352d0debd037c03d8ec9b5c1\legacy-support-core-ui-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.legacy:legacy-support-core-ui:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\226817fd352d0debd037c03d8ec9b5c1\legacy-support-core-ui-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.cursoradapter:cursoradapter:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\705071dba30571a9226503cb1f0dac80\cursoradapter-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.cursoradapter:cursoradapter:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\705071dba30571a9226503cb1f0dac80\cursoradapter-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.viewpager2:viewpager2:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\305c2898fe2457e82c9da2257c2bc0a1\jetified-viewpager2-1.0.0\AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.viewpager2:viewpager2:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\305c2898fe2457e82c9da2257c2bc0a1\jetified-viewpager2-1.0.0\AndroidManifest.xml:20:5-22:41
+MERGED from [com.google.firebase:firebase-messaging:20.1.2] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\ec0d34db7bfab328a67bc775742a1d9e\jetified-firebase-messaging-20.1.2\AndroidManifest.xml:20:5-44
+MERGED from [com.google.firebase:firebase-messaging:20.1.2] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\ec0d34db7bfab328a67bc775742a1d9e\jetified-firebase-messaging-20.1.2\AndroidManifest.xml:20:5-44
+MERGED from [com.google.android.gms:play-services-location:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\bf701184cb284afcaa68a6fadbfff89e\jetified-play-services-location-17.0.0\AndroidManifest.xml:5:5-44
+MERGED from [com.google.android.gms:play-services-location:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\bf701184cb284afcaa68a6fadbfff89e\jetified-play-services-location-17.0.0\AndroidManifest.xml:5:5-44
+MERGED from [com.google.firebase:firebase-datatransport:17.0.3] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\ec6ed60bc769c1397d2bb4044e417511\jetified-firebase-datatransport-17.0.3\AndroidManifest.xml:19:5-21:41
+MERGED from [com.google.firebase:firebase-datatransport:17.0.3] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\ec6ed60bc769c1397d2bb4044e417511\jetified-firebase-datatransport-17.0.3\AndroidManifest.xml:19:5-21:41
+MERGED from [com.google.firebase:firebase-iid:20.1.1] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\2af03360c2f1d9c4749c1d75a7057ee7\jetified-firebase-iid-20.1.1\AndroidManifest.xml:20:5-44
+MERGED from [com.google.firebase:firebase-iid:20.1.1] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\2af03360c2f1d9c4749c1d75a7057ee7\jetified-firebase-iid-20.1.1\AndroidManifest.xml:20:5-44
+MERGED from [com.google.firebase:firebase-installations:16.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\a9f39591fd7e3606aa03e1dd4d0c2ad4\jetified-firebase-installations-16.0.0\AndroidManifest.xml:6:5-8:41
+MERGED from [com.google.firebase:firebase-installations:16.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\a9f39591fd7e3606aa03e1dd4d0c2ad4\jetified-firebase-installations-16.0.0\AndroidManifest.xml:6:5-8:41
+MERGED from [com.google.firebase:firebase-common:19.3.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\d5ae2f905dca277d72c2333071856016\jetified-firebase-common-19.3.0\AndroidManifest.xml:20:5-22:41
+MERGED from [com.google.firebase:firebase-common:19.3.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\d5ae2f905dca277d72c2333071856016\jetified-firebase-common-19.3.0\AndroidManifest.xml:20:5-22:41
+MERGED from [com.google.firebase:firebase-iid-interop:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\33cfeb201180ccbffcbd0bf570ba86e2\jetified-firebase-iid-interop-17.0.0\AndroidManifest.xml:5:5-44
+MERGED from [com.google.firebase:firebase-iid-interop:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\33cfeb201180ccbffcbd0bf570ba86e2\jetified-firebase-iid-interop-17.0.0\AndroidManifest.xml:5:5-44
+MERGED from [com.google.android.gms:play-services-base:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\9d9f5eefb5bcc469207d44112eb03d4a\jetified-play-services-base-17.0.0\AndroidManifest.xml:20:5-44
+MERGED from [com.google.android.gms:play-services-base:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\9d9f5eefb5bcc469207d44112eb03d4a\jetified-play-services-base-17.0.0\AndroidManifest.xml:20:5-44
+MERGED from [com.google.firebase:firebase-installations-interop:16.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\f83230e685678f09189e9abde1693e34\jetified-firebase-installations-interop-16.0.0\AndroidManifest.xml:19:5-21:41
+MERGED from [com.google.firebase:firebase-installations-interop:16.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\f83230e685678f09189e9abde1693e34\jetified-firebase-installations-interop-16.0.0\AndroidManifest.xml:19:5-21:41
+MERGED from [com.google.android.gms:play-services-tasks:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\61b6250f2312bb6eaf48524efa92324f\jetified-play-services-tasks-17.0.0\AndroidManifest.xml:5:5-44
+MERGED from [com.google.android.gms:play-services-tasks:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\61b6250f2312bb6eaf48524efa92324f\jetified-play-services-tasks-17.0.0\AndroidManifest.xml:5:5-44
+MERGED from [com.google.firebase:firebase-measurement-connector:18.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\eb1940bc3fb957fd232db9f27e4df6ed\jetified-firebase-measurement-connector-18.0.0\AndroidManifest.xml:20:5-44
+MERGED from [com.google.firebase:firebase-measurement-connector:18.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\eb1940bc3fb957fd232db9f27e4df6ed\jetified-firebase-measurement-connector-18.0.0\AndroidManifest.xml:20:5-44
+MERGED from [com.google.android.gms:play-services-places-placereport:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\4a929dd5da9b3523b8f1ddfe5205ecb7\jetified-play-services-places-placereport-17.0.0\AndroidManifest.xml:20:5-44
+MERGED from [com.google.android.gms:play-services-places-placereport:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\4a929dd5da9b3523b8f1ddfe5205ecb7\jetified-play-services-places-placereport-17.0.0\AndroidManifest.xml:20:5-44
+MERGED from [com.google.android.gms:play-services-stats:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\b4cf759fbefe631836a911785c931842\jetified-play-services-stats-17.0.0\AndroidManifest.xml:5:5-44
+MERGED from [com.google.android.gms:play-services-stats:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\b4cf759fbefe631836a911785c931842\jetified-play-services-stats-17.0.0\AndroidManifest.xml:5:5-44
+MERGED from [com.google.android.gms:play-services-basement:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\f258e3825c6af3b14c7ec1616fae4742\jetified-play-services-basement-17.0.0\AndroidManifest.xml:20:5-44
+MERGED from [com.google.android.gms:play-services-basement:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\f258e3825c6af3b14c7ec1616fae4742\jetified-play-services-basement-17.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.fragment:fragment:1.1.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\e40e3efd5a968ec9847eae2ae9c7d8ac\fragment-1.1.0\AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.fragment:fragment:1.1.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\e40e3efd5a968ec9847eae2ae9c7d8ac\fragment-1.1.0\AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.appcompat:appcompat-resources:1.1.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\e66da8b5301e9a6b4d099a6eed9ee5b8\jetified-appcompat-resources-1.1.0\AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.appcompat:appcompat-resources:1.1.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\e66da8b5301e9a6b4d099a6eed9ee5b8\jetified-appcompat-resources-1.1.0\AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.drawerlayout:drawerlayout:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\6984223d1aa8f315c8c42812a9db3a3b\drawerlayout-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.drawerlayout:drawerlayout:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\6984223d1aa8f315c8c42812a9db3a3b\drawerlayout-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.browser:browser:1.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\caa5198f0ae08d91561862daa07e196f\browser-1.2.0\AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.browser:browser:1.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\caa5198f0ae08d91561862daa07e196f\browser-1.2.0\AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.media:media:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\47ce40ad459cbf22b0d81e337967e729\media-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.media:media:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\47ce40ad459cbf22b0d81e337967e729\media-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.legacy:legacy-support-core-utils:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\92ce016465e3a6bb2a1c0eeefed0193e\legacy-support-core-utils-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.legacy:legacy-support-core-utils:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\92ce016465e3a6bb2a1c0eeefed0193e\legacy-support-core-utils-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.viewpager:viewpager:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\bd24342c93fd52cb5e9c9c7bb35f50f1\viewpager-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.viewpager:viewpager:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\bd24342c93fd52cb5e9c9c7bb35f50f1\viewpager-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.loader:loader:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\148f2fd794536689e5a7e95e250ac390\loader-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.loader:loader:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\148f2fd794536689e5a7e95e250ac390\loader-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.activity:activity:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\5d880c01bc106322c4b2a83be9757563\jetified-activity-1.0.0\AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.activity:activity:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\5d880c01bc106322c4b2a83be9757563\jetified-activity-1.0.0\AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.vectordrawable:vectordrawable-animated:1.1.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\7369d370d1c3f03944cff7adb4eeb0ab\vectordrawable-animated-1.1.0\AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.vectordrawable:vectordrawable-animated:1.1.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\7369d370d1c3f03944cff7adb4eeb0ab\vectordrawable-animated-1.1.0\AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.vectordrawable:vectordrawable:1.1.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\57d4ae6adbb5ccfa9dafa8ad36f43ff8\vectordrawable-1.1.0\AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.vectordrawable:vectordrawable:1.1.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\57d4ae6adbb5ccfa9dafa8ad36f43ff8\vectordrawable-1.1.0\AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.coordinatorlayout:coordinatorlayout:1.1.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\8c1aed4303e761aac5e34d2036bbfc96\coordinatorlayout-1.1.0\AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.coordinatorlayout:coordinatorlayout:1.1.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\8c1aed4303e761aac5e34d2036bbfc96\coordinatorlayout-1.1.0\AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.slidingpanelayout:slidingpanelayout:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\4ee2c6fbb04620a960d68455ede34459\slidingpanelayout-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.slidingpanelayout:slidingpanelayout:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\4ee2c6fbb04620a960d68455ede34459\slidingpanelayout-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.recyclerview:recyclerview:1.1.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\8d8a8abf56b0acf243894e5c793a7480\recyclerview-1.1.0\AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.recyclerview:recyclerview:1.1.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\8d8a8abf56b0acf243894e5c793a7480\recyclerview-1.1.0\AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.customview:customview:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\2be247bf8cbe2dd724b705391ddac84d\customview-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.customview:customview:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\2be247bf8cbe2dd724b705391ddac84d\customview-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.transition:transition:1.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\a444f209b7c59a0fec306c6e0a516b3f\transition-1.2.0\AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.transition:transition:1.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\a444f209b7c59a0fec306c6e0a516b3f\transition-1.2.0\AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.swiperefreshlayout:swiperefreshlayout:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\db6ea2a636bcb3ab9eb7b581c5db983e\swiperefreshlayout-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.swiperefreshlayout:swiperefreshlayout:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\db6ea2a636bcb3ab9eb7b581c5db983e\swiperefreshlayout-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.asynclayoutinflater:asynclayoutinflater:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\ccd497c0d55509e00fa2c4ec5a0ae967\asynclayoutinflater-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.asynclayoutinflater:asynclayoutinflater:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\ccd497c0d55509e00fa2c4ec5a0ae967\asynclayoutinflater-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.core:core:1.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\e5357b0b880d2be0ed83398576c19d42\core-1.2.0\AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.core:core:1.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\e5357b0b880d2be0ed83398576c19d42\core-1.2.0\AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.localbroadcastmanager:localbroadcastmanager:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\bf3e5eb0de5dbaf7174c5a9a34f69c5a\localbroadcastmanager-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.localbroadcastmanager:localbroadcastmanager:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\bf3e5eb0de5dbaf7174c5a9a34f69c5a\localbroadcastmanager-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.exifinterface:exifinterface:1.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\a5f8c4bd9c5151a79f218b639b5c253f\exifinterface-1.2.0\AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.exifinterface:exifinterface:1.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\a5f8c4bd9c5151a79f218b639b5c253f\exifinterface-1.2.0\AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.versionedparcelable:versionedparcelable:1.1.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\324b5866ad2c13339651997b434b41f3\versionedparcelable-1.1.0\AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.versionedparcelable:versionedparcelable:1.1.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\324b5866ad2c13339651997b434b41f3\versionedparcelable-1.1.0\AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.cardview:cardview:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\adb371d4d53f86eab98a28717d70cc7e\cardview-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.cardview:cardview:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\adb371d4d53f86eab98a28717d70cc7e\cardview-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.interpolator:interpolator:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\6435850e23f2d01013861f1c8dbdb3a0\interpolator-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.interpolator:interpolator:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\6435850e23f2d01013861f1c8dbdb3a0\interpolator-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [com.google.android.datatransport:transport-backend-cct:2.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\8e8493fc4060d1a9e60e0e8b89d28daa\jetified-transport-backend-cct-2.2.0\AndroidManifest.xml:19:5-21:41
+MERGED from [com.google.android.datatransport:transport-backend-cct:2.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\8e8493fc4060d1a9e60e0e8b89d28daa\jetified-transport-backend-cct-2.2.0\AndroidManifest.xml:19:5-21:41
+MERGED from [com.google.android.datatransport:transport-runtime:2.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\09a4bf673ec4891d08a21c203c688e10\jetified-transport-runtime-2.2.0\AndroidManifest.xml:18:5-20:41
+MERGED from [com.google.android.datatransport:transport-runtime:2.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\09a4bf673ec4891d08a21c203c688e10\jetified-transport-runtime-2.2.0\AndroidManifest.xml:18:5-20:41
+MERGED from [com.google.firebase:firebase-components:16.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\626cd0cdd86577b53b05b9ceb0f9a7ca\jetified-firebase-components-16.0.0\AndroidManifest.xml:19:5-21:41
+MERGED from [com.google.firebase:firebase-components:16.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\626cd0cdd86577b53b05b9ceb0f9a7ca\jetified-firebase-components-16.0.0\AndroidManifest.xml:19:5-21:41
+MERGED from [com.google.firebase:firebase-encoders-json:16.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\fe101a7202e82c550c20fc0bfa50e08f\jetified-firebase-encoders-json-16.0.0\AndroidManifest.xml:19:5-21:41
+MERGED from [com.google.firebase:firebase-encoders-json:16.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\fe101a7202e82c550c20fc0bfa50e08f\jetified-firebase-encoders-json-16.0.0\AndroidManifest.xml:19:5-21:41
+MERGED from [androidx.documentfile:documentfile:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\6ca55331635d9ca1071738b385928a75\documentfile-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.documentfile:documentfile:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\6ca55331635d9ca1071738b385928a75\documentfile-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.print:print:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\d5fd7fbc692311a845217063332ce16c\print-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.print:print:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\d5fd7fbc692311a845217063332ce16c\print-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.lifecycle:lifecycle-runtime:2.1.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\6750b43e205c4f520c814d38be8b2dbe\lifecycle-runtime-2.1.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.lifecycle:lifecycle-runtime:2.1.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\6750b43e205c4f520c814d38be8b2dbe\lifecycle-runtime-2.1.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.lifecycle:lifecycle-viewmodel:2.1.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\4585a9ad75e82c7c92523d92d109b415\lifecycle-viewmodel-2.1.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.lifecycle:lifecycle-viewmodel:2.1.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\4585a9ad75e82c7c92523d92d109b415\lifecycle-viewmodel-2.1.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.savedstate:savedstate:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\d831d74eee9f185c588b244b4025c98f\jetified-savedstate-1.0.0\AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.savedstate:savedstate:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\d831d74eee9f185c588b244b4025c98f\jetified-savedstate-1.0.0\AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.lifecycle:lifecycle-livedata:2.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\f15487c13029c5c78640eedfe3e4179f\lifecycle-livedata-2.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.lifecycle:lifecycle-livedata:2.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\f15487c13029c5c78640eedfe3e4179f\lifecycle-livedata-2.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.lifecycle:lifecycle-livedata-core:2.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\b77454809810e03ad1b0b8586694d509\lifecycle-livedata-core-2.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.lifecycle:lifecycle-livedata-core:2.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\b77454809810e03ad1b0b8586694d509\lifecycle-livedata-core-2.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.arch.core:core-runtime:2.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\59b723f090061559cc5b6f12f2aff3bc\core-runtime-2.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.arch.core:core-runtime:2.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\59b723f090061559cc5b6f12f2aff3bc\core-runtime-2.0.0\AndroidManifest.xml:20:5-44
+MERGED from [org.apache.cordova:framework:7.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\158881081e6477a246826c6bde171b96\jetified-framework-7.0.0\AndroidManifest.xml:25:5-44
+MERGED from [org.apache.cordova:framework:7.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\158881081e6477a246826c6bde171b96\jetified-framework-7.0.0\AndroidManifest.xml:25:5-44
+MERGED from [com.google.android.datatransport:transport-api:2.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\467b040972e5d42442f90b49207efc7f\jetified-transport-api-2.2.0\AndroidManifest.xml:18:5-20:41
+MERGED from [com.google.android.datatransport:transport-api:2.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\467b040972e5d42442f90b49207efc7f\jetified-transport-api-2.2.0\AndroidManifest.xml:18:5-20:41
+INJECTED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml
+INJECTED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml
+ android:targetSdkVersion
+ INJECTED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml
+ ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml
+ INJECTED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml
+ android:minSdkVersion
+ INJECTED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml
+ ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml
+ INJECTED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml
+meta-data#android.support.FILE_PROVIDER_PATHS
+ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:39:13-41:64
+ android:resource
+ ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:41:17-51
+ android:name
+ ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:40:17-67
+meta-data#com.google.firebase.messaging.default_notification_icon
+ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:42:13-136
+ android:resource
+ ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:42:95-133
+ android:name
+ ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\android\app\src\main\AndroidManifest.xml:42:24-94
+uses-feature#android.hardware.camera
+ADDED from [:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:11:5-13:36
+ android:required
+ ADDED from [:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:13:9-33
+ android:name
+ ADDED from [:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:12:9-47
+uses-permission#android.permission.RECEIVE_BOOT_COMPLETED
+ADDED from [:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:15:5-81
+ android:name
+ ADDED from [:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:15:22-78
+uses-permission#android.permission.WAKE_LOCK
+ADDED from [:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:16:5-68
+MERGED from [com.google.firebase:firebase-iid:20.1.1] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\2af03360c2f1d9c4749c1d75a7057ee7\jetified-firebase-iid-20.1.1\AndroidManifest.xml:24:5-68
+MERGED from [com.google.firebase:firebase-iid:20.1.1] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\2af03360c2f1d9c4749c1d75a7057ee7\jetified-firebase-iid-20.1.1\AndroidManifest.xml:24:5-68
+ android:name
+ ADDED from [:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:16:22-65
+service#com.getcapacitor.plugin.background.BackgroundTaskService
+ADDED from [:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:19:9-21:40
+ android:exported
+ ADDED from [:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:21:13-37
+ android:name
+ ADDED from [:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:20:13-84
+receiver#com.getcapacitor.plugin.notification.TimedNotificationPublisher
+ADDED from [:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:23:9-100
+ android:name
+ ADDED from [:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:23:19-97
+receiver#com.getcapacitor.plugin.notification.NotificationDismissReceiver
+ADDED from [:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:24:9-101
+ android:name
+ ADDED from [:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:24:19-98
+meta-data#firebase_messaging_auto_init_enabled
+ADDED from [:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:26:9-28:37
+ android:value
+ ADDED from [:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:28:13-34
+ android:name
+ ADDED from [:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:27:13-64
+service#com.getcapacitor.CapacitorFirebaseMessagingService
+ADDED from [:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:30:9-36:19
+ android:stopWithTask
+ ADDED from [:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:32:13-41
+ android:name
+ ADDED from [:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:31:13-78
+intent-filter#action:name:com.google.firebase.MESSAGING_EVENT
+ADDED from [:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:33:13-35:29
+action#com.google.firebase.MESSAGING_EVENT
+ADDED from [:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:34:17-78
+ android:name
+ ADDED from [:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:34:25-75
+receiver#com.getcapacitor.plugin.notification.LocalNotificationRestoreReceiver
+ADDED from [:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:38:9-47:20
+ android:exported
+ ADDED from [:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:41:13-37
+ android:directBootAware
+ ADDED from [:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:40:13-43
+ android:name
+ ADDED from [:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:39:13-97
+intent-filter#action:name:android.intent.action.BOOT_COMPLETED+action:name:android.intent.action.LOCKED_BOOT_COMPLETED+action:name:android.intent.action.QUICKBOOT_POWERON
+ADDED from [:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:42:13-46:29
+action#android.intent.action.LOCKED_BOOT_COMPLETED
+ADDED from [:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:43:17-86
+ android:name
+ ADDED from [:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:43:25-83
+action#android.intent.action.BOOT_COMPLETED
+ADDED from [:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:44:17-79
+ android:name
+ ADDED from [:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:44:25-76
+action#android.intent.action.QUICKBOOT_POWERON
+ADDED from [:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:45:17-82
+ android:name
+ ADDED from [:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\firebaseBug\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:45:25-79
+>>>>>>> origin/feature/pushNotifications
service#com.google.firebase.messaging.FirebaseMessagingService
ADDED from [com.google.firebase:firebase-messaging:20.1.2] C:\Users\tiago.kayaya\.gradle\caches\transforms-2\files-2.1\ec0d34db7bfab328a67bc775742a1d9e\jetified-firebase-messaging-20.1.2\AndroidManifest.xml:28:9-34:19
android:exported
diff --git a/android/app/src/main/assets/public/home-home-module-es2015.js b/android/app/src/main/assets/public/home-home-module-es2015.js
index 8fdcfaf0a..574c09d3f 100644
--- a/android/app/src/main/assets/public/home-home-module-es2015.js
+++ b/android/app/src/main/assets/public/home-home-module-es2015.js
@@ -274,8 +274,9 @@ __webpack_require__.r(__webpack_exports__);
/* harmony import */ var _app_pages_publications_view_publications_publication_detail_publication_detail_page__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../../app/pages/publications/view-publications/publication-detail/publication-detail.page */ "./src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts");
/* harmony import */ var _app_pages_publications_view_publications_view_publications_page__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../../app/pages/publications/view-publications/view-publications.page */ "./src/app/pages/publications/view-publications/view-publications.page.ts");
/* harmony import */ var _app_pages_gabinete_digital_expediente_expediente_detail_expediente_detail_page__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../../app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page */ "./src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts");
-/* harmony import */ var _capacitor_core__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! @capacitor/core */ "./node_modules/@capacitor/core/dist/esm/index.js");
-/* harmony import */ var _angular_router__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! @angular/router */ "./node_modules/@angular/router/__ivy_ngcc__/fesm2015/router.js");
+/* harmony import */ var _app_pages_agenda_view_event_view_event_page__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../../app/pages/agenda/view-event/view-event.page */ "./src/app/pages/agenda/view-event/view-event.page.ts");
+/* harmony import */ var _capacitor_core__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! @capacitor/core */ "./node_modules/@capacitor/core/dist/esm/index.js");
+/* harmony import */ var _angular_router__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! @angular/router */ "./node_modules/@angular/router/__ivy_ngcc__/fesm2015/router.js");
@@ -287,7 +288,8 @@ __webpack_require__.r(__webpack_exports__);
-const { PushNotifications, LocalNotifications, LocalNotificationAction } = _capacitor_core__WEBPACK_IMPORTED_MODULE_9__["Plugins"];
+
+const { PushNotifications, LocalNotifications, LocalNotificationAction } = _capacitor_core__WEBPACK_IMPORTED_MODULE_10__["Plugins"];
let HomePage = class HomePage {
constructor(eventService, processesbackend, router, modalController) {
this.eventService = eventService;
@@ -378,7 +380,8 @@ let HomePage = class HomePage {
service = "agenda" ? this.router.navigate(['/home/', service, idObject, 'home']) : */
if (service === "agenda") {
- this.router.navigate(['/home/', service, idObject, 'home']);
+ //this.router.navigate(['/home/', service, idObject, 'home']);
+ this.viewEventDetail(idObject);
}
else if (service === "gabinete-digital" && object != "expediente") {
this.router.navigate(['/home/', service]);
@@ -440,6 +443,26 @@ let HomePage = class HomePage {
});
});
}
+ viewEventDetail(eventId) {
+ return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, function* () {
+ console.log(this.profile);
+ const modal = yield this.modalController.create({
+ component: _app_pages_agenda_view_event_view_event_page__WEBPACK_IMPORTED_MODULE_9__["ViewEventPage"],
+ componentProps: {
+ eventId: eventId,
+ },
+ cssClass: 'modal',
+ backdropDismiss: false
+ });
+ yield modal.present();
+ modal.onDidDismiss().then((res) => {
+ if (res) {
+ console.log(res);
+ //this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
+ }
+ });
+ });
+ }
viewExpedientDetail(serialNumber) {
return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, function* () {
console.log(this.profile);
@@ -494,7 +517,7 @@ let HomePage = class HomePage {
HomePage.ctorParameters = () => [
{ type: _services_events_service__WEBPACK_IMPORTED_MODULE_2__["EventsService"] },
{ type: _services_processes_service__WEBPACK_IMPORTED_MODULE_4__["ProcessesService"] },
- { type: _angular_router__WEBPACK_IMPORTED_MODULE_10__["Router"] },
+ { type: _angular_router__WEBPACK_IMPORTED_MODULE_11__["Router"] },
{ type: _ionic_angular__WEBPACK_IMPORTED_MODULE_5__["ModalController"] }
];
HomePage = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__decorate"])([
diff --git a/android/app/src/main/assets/public/home-home-module-es2015.js.map b/android/app/src/main/assets/public/home-home-module-es2015.js.map
index 9657b8b9a..f1174fb09 100644
--- a/android/app/src/main/assets/public/home-home-module-es2015.js.map
+++ b/android/app/src/main/assets/public/home-home-module-es2015.js.map
@@ -1 +1 @@
-{"version":3,"sources":["./src/app/home/home.page.html","./src/app/home/home-routing.module.ts","./src/app/home/home.module.ts","./src/app/home/home.page.scss","./src/app/home/home.page.ts","./src/app/resolvers/userData.resolver.ts"],"names":[],"mappings":"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","file":"home-home-module-es2015.js","sourcesContent":["export default \"\\r\\n\\r\\n\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n {{totalEvent}}\\r\\n Início\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n Agenda\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n {{totalExpediente}}\\r\\n Gabinete\\r\\n \\r\\n \\r\\n \\r\\n Acções\\r\\n \\r\\n \\r\\n \\r\\n Chat\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n\";","import { NgModule } from '@angular/core';\r\nimport { Routes, RouterModule } from '@angular/router';\r\nimport { HomeGuard } from '../guards/home.guard';\r\nimport { UserDataResolver } from '../resolvers/userData.resolver';\r\n\r\nimport { HomePage } from './home.page';\r\n\r\nconst routes: Routes = [\r\n {\r\n path: 'home',\r\n component: HomePage,\r\n /* canActivate: [HomeGuard], */\r\n resolve: {\r\n userData: UserDataResolver\r\n },\r\n children: [\r\n {\r\n path: 'events',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/events/events.module').then(m => m.EventsPageModule)\r\n },\r\n {\r\n path:':eventId/:caller',\r\n loadChildren: ()=> import('../pages/events/event-detail/event-detail.module').then(m => m.EventDetailPageModule),\r\n },\r\n ]\r\n },\r\n {\r\n path: 'attachments',\r\n children: [\r\n {\r\n path:':eventId',\r\n loadChildren: ()=> import('../pages/events/attachments/attachments.module').then(m => m.AttachmentsPageModule)\r\n },\r\n\r\n ]\r\n },\r\n {\r\n path: 'attendees',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/events/attendees/attendees.module').then(m => m.AttendeesPageModule)\r\n },\r\n ]\r\n },\r\n {\r\n path: 'login',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/login/login.module').then(m => m.LoginPageModule)\r\n },\r\n ]\r\n },\r\n {\r\n path: 'agenda',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/agenda/agenda.module').then(m => m.AgendaPageModule)\r\n },\r\n {\r\n path:':eventId/:caller',\r\n loadChildren: ()=> import('../pages/events/event-detail/event-detail.module').then(m => m.EventDetailPageModule),\r\n }\r\n ]\r\n },\r\n {\r\n path: 'gabinete-digital',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/gabinete-digital/gabinete-digital.module').then(m => m.GabineteDigitalPageModule)\r\n },\r\n {\r\n path:'expediente',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/gabinete-digital/expediente/expediente.module').then(m => m.ExpedientePageModule)\r\n },\r\n {\r\n path:':SerialNumber',\r\n loadChildren: ()=> import('../pages/gabinete-digital/expediente/expediente-detail/expediente-detail.module').then(m => m.ExpedienteDetailPageModule)\r\n },\r\n {\r\n path:'events/:eventId/:caller',\r\n loadChildren: ()=> import('../pages/events/event-detail/event-detail.module').then(m => m.EventDetailPageModule),\r\n }\r\n ]\r\n },\r\n {\r\n path:'event-list',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/gabinete-digital/event-list/event-list.module').then(m => m.EventListPageModule)\r\n },\r\n ] \r\n },\r\n ]\r\n },\r\n {\r\n path: 'search',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/search/search.module').then(m => m.SearchPageModule)\r\n }\r\n ]\r\n },\r\n {\r\n path: 'publications',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/publications/publications.module').then(m => m.PublicationsPageModule)\r\n },\r\n {\r\n path:'view-publications',\r\n children: [\r\n {\r\n path:':folderId',\r\n loadChildren: ()=> import('../pages/publications/view-publications/view-publications.module').then(m => m.ViewPublicationsPageModule)\r\n },\r\n {\r\n path:'publication-detail',\r\n children: [\r\n {\r\n path: ':id',\r\n loadChildren: ()=> import('../pages/publications/view-publications/publication-detail/publication-detail.module').then(m => m.PublicationDetailPageModule)\r\n },\r\n ]\r\n \r\n },\r\n ] \r\n },\r\n ]\r\n },\r\n {\r\n path: 'chat',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/chat/chat.module').then(m => m.ChatPageModule)\r\n }\r\n ]\r\n },\r\n ]\r\n },\r\n {\r\n path: '',\r\n redirectTo: '/home/events',\r\n pathMatch: 'full'\r\n }\r\n];\r\n\r\n@NgModule({\r\n imports: [RouterModule.forChild(routes)],\r\n exports: [RouterModule],\r\n})\r\nexport class HomePageRoutingModule {}\r\n","import { NgModule } from '@angular/core';\r\nimport { CommonModule } from '@angular/common';\r\nimport { FormsModule } from '@angular/forms';\r\n\r\nimport { IonicModule } from '@ionic/angular';\r\n\r\nimport { HomePageRoutingModule } from './home-routing.module';\r\n\r\nimport { HomePage } from './home.page';\r\n/* import { IonicSelectableModule } from 'ionic-selectable'; */\r\nimport { SharedModule } from 'src/app/shared/shared.module';\r\n\r\n@NgModule({\r\n imports: [\r\n CommonModule,\r\n FormsModule,\r\n IonicModule,\r\n HomePageRoutingModule,\r\n SharedModule\r\n ],\r\n declarations: [HomePage]\r\n})\r\nexport class HomePageModule {}\r\n","export default \"ion-tab-bar {\\n --background: #f9f9f9;\\n --color: #061b52;\\n}\\n\\nion-badge {\\n /* */\\n /* display: inline-block;*/\\n min-width: 18px;\\n font-size: 15px;\\n /* font-weight: $badge-font-weight;\\n line-height: 1;\\n\\n white-space: nowrap;\\n vertical-align: baseline; */\\n}\\n\\n.tab .bottoms {\\n display: flex;\\n justify-content: space-around;\\n}\\n/*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNyYy9hcHAvaG9tZS9DOlxcVXNlcnNcXHRpYWdvLmtheWF5YVxcZGV2ZWxvcG1lbnRcXGdhYmluZXRlLWRpZ2l0YWwvc3JjXFxhcHBcXGhvbWVcXGhvbWUucGFnZS5zY3NzIiwic3JjL2FwcC9ob21lL2hvbWUucGFnZS5zY3NzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBO0VBQ0kscUJBQUE7RUFDQSxnQkFBQTtBQ0FKOztBRGFBO0VBQVcsS0FBQTtFQUVULDBCQUFBO0VBRUEsZUFBQTtFQUNBLGVBWGU7RUFZZjs7Ozs2QkFBQTtBQ1BGOztBRGdCRTtFQUNFLGFBQUE7RUFDQSw2QkFBQTtBQ2JKIiwiZmlsZSI6InNyYy9hcHAvaG9tZS9ob21lLnBhZ2Uuc2NzcyIsInNvdXJjZXNDb250ZW50IjpbIlxyXG5pb24tdGFiLWJhcntcclxuICAgIC0tYmFja2dyb3VuZDogI2Y5ZjlmOTtcclxuICAgIC0tY29sb3I6ICMwNjFiNTI7XHJcbn1cclxuXHJcbi8vIEJhZGdlXHJcbi8vIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tXHJcblxyXG4vLy8gQHByb3AgLSBGb250IHNpemUgb2YgdGhlIGJhZGdlXHJcbiRiYWRnZS1mb250LXNpemU6MTVweCAhZGVmYXVsdDtcclxuXHJcbi8vLyBAcHJvcCAtIEZvbnQgd2VpZ2h0IG9mIHRoZSBiYWRnZVxyXG4kYmFkZ2UtZm9udC13ZWlnaHQ6Ym9sZCAhZGVmYXVsdDtcclxuXHJcblxyXG5pb24tYmFkZ2Ugey8qICAqL1xyXG5cclxuICAvKiBkaXNwbGF5OiBpbmxpbmUtYmxvY2s7Ki9cclxuXHJcbiAgbWluLXdpZHRoOiAxOHB4OyBcclxuICBmb250LXNpemU6ICRiYWRnZS1mb250LXNpemU7XHJcbiAgLyogZm9udC13ZWlnaHQ6ICRiYWRnZS1mb250LXdlaWdodDtcclxuICBsaW5lLWhlaWdodDogMTtcclxuXHJcbiAgd2hpdGUtc3BhY2U6IG5vd3JhcDtcclxuICB2ZXJ0aWNhbC1hbGlnbjogYmFzZWxpbmU7ICovXHJcbn1cclxuXHJcblxyXG4udGFie1xyXG4gIC5ib3R0b21ze1xyXG4gICAgZGlzcGxheTogZmxleDtcclxuICAgIGp1c3RpZnktY29udGVudDogc3BhY2UtYXJvdW5kO1xyXG4gIH1cclxufSIsImlvbi10YWItYmFyIHtcbiAgLS1iYWNrZ3JvdW5kOiAjZjlmOWY5O1xuICAtLWNvbG9yOiAjMDYxYjUyO1xufVxuXG5pb24tYmFkZ2Uge1xuICAvKiAgKi9cbiAgLyogZGlzcGxheTogaW5saW5lLWJsb2NrOyovXG4gIG1pbi13aWR0aDogMThweDtcbiAgZm9udC1zaXplOiAxNXB4O1xuICAvKiBmb250LXdlaWdodDogJGJhZGdlLWZvbnQtd2VpZ2h0O1xuICBsaW5lLWhlaWdodDogMTtcblxuICB3aGl0ZS1zcGFjZTogbm93cmFwO1xuICB2ZXJ0aWNhbC1hbGlnbjogYmFzZWxpbmU7ICovXG59XG5cbi50YWIgLmJvdHRvbXMge1xuICBkaXNwbGF5OiBmbGV4O1xuICBqdXN0aWZ5LWNvbnRlbnQ6IHNwYWNlLWFyb3VuZDtcbn0iXX0= */\";","import { Component, OnInit } from '@angular/core';\r\nimport { EventsService } from '../services/events.service';\r\nimport { formatDate } from '@angular/common';\r\nimport { Event } from '../models/event.model';\r\nimport { ProcessesService } from '../services/processes.service';\r\nimport { StorageService } from 'src/app/services/storage.service';\r\nimport { ModalController } from '@ionic/angular';\r\nimport { PublicationDetailPage } from '../../app/pages/publications/view-publications/publication-detail/publication-detail.page';\r\nimport { ViewPublicationsPage } from '../../app/pages/publications/view-publications/view-publications.page';\r\nimport { ExpedienteDetailPage } from '../../app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page'\r\n\r\nimport { Plugins, PushNotification, PushNotificationToken, PushNotificationActionPerformed, Modals } from '@capacitor/core';\r\nimport { Router } from '@angular/router';\r\nimport { MethodCall } from '@angular/compiler';\r\n\r\nconst { PushNotifications, LocalNotifications, LocalNotificationAction } = Plugins;\r\n\r\n@Component({\r\n selector: 'app-home',\r\n templateUrl: './home.page.html',\r\n styleUrls: ['./home.page.scss'],\r\n})\r\nexport class HomePage implements OnInit {\r\n eventsList: Event[];\r\n prEventList: Event[];\r\n mdEventList: Event[];\r\n\r\n totalEvent = 0;\r\n totalExpediente = 0;\r\n profile: string;\r\n\r\n constructor(private eventService: EventsService, private processesbackend: ProcessesService, private router: Router, private modalController: ModalController,) { }\r\n\r\n ngOnInit() {\r\n //Initialize profile as mdgpr\r\n this.profile = \"mdgpr\";\r\n if (this.profile == \"mdgpr\") {\r\n this.eventService.getAllMdEvents(formatDate(new Date(), 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => {\r\n this.eventsList = res;\r\n this.totalEvent = this.eventsList.length;\r\n });\r\n }\r\n else {\r\n this.eventService.getAllPrEvents(formatDate(new Date(), 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => {\r\n this.eventsList = res;\r\n this.totalEvent = this.eventsList.length;\r\n });\r\n\r\n }\r\n this.processesbackend.GetTasksList(\"Expediente\", true).subscribe(result => {\r\n this.totalExpediente = result;\r\n });\r\n /*\r\n (PushNotifications as any).requestPermission().then(result => {\r\n PushNotifications.register();\r\n });\r\n \r\n PushNotifications.addListener(\r\n 'registration',\r\n (token: PushNotificationToken) => {\r\n alert('Push registration success, token: ' + token.value);\r\n console.log('FIREBASE: ', token.value)\r\n this.storageService.store(this.username,token.value);\r\n },\r\n );\r\n \r\n console.log(this.storageService.get(this.username)) */\r\n\r\n PushNotifications.addListener('registrationError', (error: any) => {\r\n alert('Error on registration: ' + JSON.stringify(error));\r\n });\r\n\r\n PushNotifications.addListener('pushNotificationReceived', notification => { \r\n\r\n //const isPushNotification = !!notification.title || !!notification.body;\r\n \r\n // if this is a push notification received when the app is in the foreground on Android\r\n //if (isAndroid && isPushNotification) {\r\n \r\n // We schedule a LocalNotification 1 second later since Capacitor for Android doesn't show anything in this case\r\n LocalNotifications.schedule({\r\n notifications: [{\r\n title: notification.title,\r\n body: notification.body,\r\n id: new Date().getUTCMilliseconds(),\r\n schedule: {\r\n at: new Date(Date.now() + 1000)\r\n },\r\n extra: notification.data,\r\n channelId: 'pop-notifications'\r\n }]\r\n });\r\n //}\r\n });\r\n \r\n\r\n PushNotifications.addListener(\r\n 'pushNotificationActionPerformed',\r\n (notification: PushNotificationActionPerformed) => {\r\n let service = notification.notification.data.service;\r\n let object = notification.notification.data.object;\r\n let idObject = notification.notification.data.idObject;\r\n\r\n console.log('Service: ', service);\r\n console.log('Object: ', object);\r\n console.log('idObject: ', idObject);\r\n\r\n /* if (service === \"events\") {\r\n this.router.navigate(['/home/', service, idObject, 'home']);\r\n } else if (service === \"agenda\") {\r\n this.router.navigate(['/home/', service, idObject, 'home']);\r\n } else if (service === \"gabinete-digital\" && object != \"expediente\") {*/\r\n // this.router.navigate(['/home/', service]);\r\n // }\r\n\r\n //if (service != null) {\r\n\r\n /*const routeValue = {\r\n \"agenda\": this.router.navigate(['/home/', service, idObject, 'home']),\r\n \"gabinete-digital\": this.router.navigate(['/home/', service]),\r\n \"accoes\": this.viewExpedientDetail(idObject),\r\n\r\n }\r\n\r\n const route = routeValue[service] && object ;\r\n\r\n service = \"agenda\" ? this.router.navigate(['/home/', service, idObject, 'home']) : */\r\n\r\n if (service === \"agenda\") {\r\n this.router.navigate(['/home/', service, idObject, 'home']);\r\n } else if (service === \"gabinete-digital\" && object != \"expediente\") {\r\n this.router.navigate(['/home/', service]);\r\n } else if (service === \"gabinete-digital\" && object === \"expediente\") {\r\n this.viewExpedientDetail(idObject)\r\n } else if (service === \"accoes\" && object === \"accao\") {\r\n this.viewPublications(idObject)\r\n } else if (service === \"accoes\" && object === \"publicacao\") {\r\n this.viewPublicationDetail(idObject)\r\n }\r\n \r\n\r\n\r\n\r\n /*switch (service) {\r\n case \"events\":\r\n this.router.navigate(['/home/', service, idObject, 'home']);\r\n break;\r\n case \"agenda\":\r\n this.router.navigate(['/home/', service, idObject, 'home']);\r\n break;\r\n case \"gabinete-digital\":\r\n this.router.navigate(['/home/', service]);\r\n break;\r\n case \"gabinete-digital-expediente\":\r\n this.router.navigate(['/home/gabinete-digital/', object, idObject, 'home']);\r\n break;\r\n case \"\": {\r\n\r\n if(publicationId && processId != null) {\r\n this.viewPublicationDetail(publicationId,processId)\r\n }\r\n if (folder.ProcessId != null) {\r\n this.viewPublications(folder)\r\n }\r\n }\r\n\r\n default:\r\n this.router.navigate(['/home/']);\r\n }*/\r\n\r\n\r\n\r\n },\r\n );\r\n }\r\n\r\n async localNotificationPresent(notification) {\r\n\r\n LocalNotificationAction.\r\n\r\n LocalNotifications.schedule({\r\n notifications: [\r\n {\r\n title: notification.title,\r\n body: notification.body,\r\n id: 1,\r\n schedule: { at: new Date(Date.now() + 1000) },\r\n sound: null,\r\n attachments: null,\r\n actionTypeId: \"\",\r\n extra: null,\r\n foreground: true,\r\n }\r\n ]\r\n });\r\n }\r\n\r\n async viewExpedientDetail(serialNumber:any) {\r\n console.log(this.profile);\r\n \r\n const modal = await this.modalController.create({\r\n component: ExpedienteDetailPage,\r\n componentProps:{\r\n serialNumber: serialNumber,\r\n profile: this.profile,\r\n },\r\n cssClass: 'modal',\r\n backdropDismiss: false\r\n });\r\n await modal.present();\r\n modal.onDidDismiss().then((res)=>{\r\n if(res){\r\n console.log(res);\r\n }\r\n });\r\n }\r\n\r\n\r\n\r\n async viewPublicationDetail(folderId) {\r\n const modal = await this.modalController.create({\r\n component: PublicationDetailPage,\r\n componentProps: {\r\n folderId: folderId,\r\n },\r\n cssClass: 'publication-detail',\r\n backdropDismiss: false\r\n });\r\n await modal.present();\r\n modal.onDidDismiss();\r\n }\r\n\r\n async viewPublications(folderId) {\r\n\r\n\r\n const modal = await this.modalController.create({\r\n component: ViewPublicationsPage,\r\n /* enterAnimation,\r\n leaveAnimation, */\r\n componentProps: {\r\n item: folderId,\r\n },\r\n cssClass: 'new-action',\r\n backdropDismiss: false\r\n });\r\n await modal.present();\r\n modal.onDidDismiss();\r\n }\r\n\r\n}\r\n","import { Injectable } from '@angular/core';\r\nimport { AuthService } from '../services/auth.service';\r\n\r\n@Injectable({\r\n providedIn: 'root'\r\n})\r\nexport class UserDataResolver{ \r\n constructor(private authService: AuthService){}\r\n\r\n resolve(){\r\n return this.authService.getUserData();\r\n }\r\n}"],"sourceRoot":"webpack:///"}
\ No newline at end of file
+{"version":3,"sources":["./src/app/home/home.page.html","./src/app/home/home-routing.module.ts","./src/app/home/home.module.ts","./src/app/home/home.page.scss","./src/app/home/home.page.ts","./src/app/resolvers/userData.resolver.ts"],"names":[],"mappings":"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","file":"home-home-module-es2015.js","sourcesContent":["export default \"\\r\\n\\r\\n\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n {{totalEvent}}\\r\\n Início\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n Agenda\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n {{totalExpediente}}\\r\\n Gabinete\\r\\n \\r\\n \\r\\n \\r\\n Acções\\r\\n \\r\\n \\r\\n \\r\\n Chat\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n\";","import { NgModule } from '@angular/core';\r\nimport { Routes, RouterModule } from '@angular/router';\r\nimport { HomeGuard } from '../guards/home.guard';\r\nimport { UserDataResolver } from '../resolvers/userData.resolver';\r\n\r\nimport { HomePage } from './home.page';\r\n\r\nconst routes: Routes = [\r\n {\r\n path: 'home',\r\n component: HomePage,\r\n /* canActivate: [HomeGuard], */\r\n resolve: {\r\n userData: UserDataResolver\r\n },\r\n children: [\r\n {\r\n path: 'events',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/events/events.module').then(m => m.EventsPageModule)\r\n },\r\n {\r\n path:':eventId/:caller',\r\n loadChildren: ()=> import('../pages/events/event-detail/event-detail.module').then(m => m.EventDetailPageModule),\r\n },\r\n ]\r\n },\r\n {\r\n path: 'attachments',\r\n children: [\r\n {\r\n path:':eventId',\r\n loadChildren: ()=> import('../pages/events/attachments/attachments.module').then(m => m.AttachmentsPageModule)\r\n },\r\n\r\n ]\r\n },\r\n {\r\n path: 'attendees',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/events/attendees/attendees.module').then(m => m.AttendeesPageModule)\r\n },\r\n ]\r\n },\r\n {\r\n path: 'login',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/login/login.module').then(m => m.LoginPageModule)\r\n },\r\n ]\r\n },\r\n {\r\n path: 'agenda',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/agenda/agenda.module').then(m => m.AgendaPageModule)\r\n },\r\n {\r\n path:':eventId/:caller',\r\n loadChildren: ()=> import('../pages/events/event-detail/event-detail.module').then(m => m.EventDetailPageModule),\r\n }\r\n ]\r\n },\r\n {\r\n path: 'gabinete-digital',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/gabinete-digital/gabinete-digital.module').then(m => m.GabineteDigitalPageModule)\r\n },\r\n {\r\n path:'expediente',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/gabinete-digital/expediente/expediente.module').then(m => m.ExpedientePageModule)\r\n },\r\n {\r\n path:':SerialNumber',\r\n loadChildren: ()=> import('../pages/gabinete-digital/expediente/expediente-detail/expediente-detail.module').then(m => m.ExpedienteDetailPageModule)\r\n },\r\n {\r\n path:'events/:eventId/:caller',\r\n loadChildren: ()=> import('../pages/events/event-detail/event-detail.module').then(m => m.EventDetailPageModule),\r\n }\r\n ]\r\n },\r\n {\r\n path:'event-list',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/gabinete-digital/event-list/event-list.module').then(m => m.EventListPageModule)\r\n },\r\n ] \r\n },\r\n ]\r\n },\r\n {\r\n path: 'search',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/search/search.module').then(m => m.SearchPageModule)\r\n }\r\n ]\r\n },\r\n {\r\n path: 'publications',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/publications/publications.module').then(m => m.PublicationsPageModule)\r\n },\r\n {\r\n path:'view-publications',\r\n children: [\r\n {\r\n path:':folderId',\r\n loadChildren: ()=> import('../pages/publications/view-publications/view-publications.module').then(m => m.ViewPublicationsPageModule)\r\n },\r\n {\r\n path:'publication-detail',\r\n children: [\r\n {\r\n path: ':id',\r\n loadChildren: ()=> import('../pages/publications/view-publications/publication-detail/publication-detail.module').then(m => m.PublicationDetailPageModule)\r\n },\r\n ]\r\n \r\n },\r\n ] \r\n },\r\n ]\r\n },\r\n {\r\n path: 'chat',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/chat/chat.module').then(m => m.ChatPageModule)\r\n }\r\n ]\r\n },\r\n ]\r\n },\r\n {\r\n path: '',\r\n redirectTo: '/home/events',\r\n pathMatch: 'full'\r\n }\r\n];\r\n\r\n@NgModule({\r\n imports: [RouterModule.forChild(routes)],\r\n exports: [RouterModule],\r\n})\r\nexport class HomePageRoutingModule {}\r\n","import { NgModule } from '@angular/core';\r\nimport { CommonModule } from '@angular/common';\r\nimport { FormsModule } from '@angular/forms';\r\n\r\nimport { IonicModule } from '@ionic/angular';\r\n\r\nimport { HomePageRoutingModule } from './home-routing.module';\r\n\r\nimport { HomePage } from './home.page';\r\n/* import { IonicSelectableModule } from 'ionic-selectable'; */\r\nimport { SharedModule } from 'src/app/shared/shared.module';\r\n\r\n@NgModule({\r\n imports: [\r\n CommonModule,\r\n FormsModule,\r\n IonicModule,\r\n HomePageRoutingModule,\r\n SharedModule\r\n ],\r\n declarations: [HomePage]\r\n})\r\nexport class HomePageModule {}\r\n","export default \"ion-tab-bar {\\n --background: #f9f9f9;\\n --color: #061b52;\\n}\\n\\nion-badge {\\n /* */\\n /* display: inline-block;*/\\n min-width: 18px;\\n font-size: 15px;\\n /* font-weight: $badge-font-weight;\\n line-height: 1;\\n\\n white-space: nowrap;\\n vertical-align: baseline; */\\n}\\n\\n.tab .bottoms {\\n display: flex;\\n justify-content: space-around;\\n}\\n/*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNyYy9hcHAvaG9tZS9DOlxcVXNlcnNcXGV1ZGVzLmluYWNpb1xcR2FiaW5ldC1EaWdpdGFsUHJvamVjdFxcTmV3IGZvbGRlclxcZ2FiaW5ldGUtZGlnaXRhbC9zcmNcXGFwcFxcaG9tZVxcaG9tZS5wYWdlLnNjc3MiLCJzcmMvYXBwL2hvbWUvaG9tZS5wYWdlLnNjc3MiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0E7RUFDSSxxQkFBQTtFQUNBLGdCQUFBO0FDQUo7O0FEYUE7RUFBVyxLQUFBO0VBRVQsMEJBQUE7RUFFQSxlQUFBO0VBQ0EsZUFYZTtFQVlmOzs7OzZCQUFBO0FDUEY7O0FEZ0JFO0VBQ0UsYUFBQTtFQUNBLDZCQUFBO0FDYkoiLCJmaWxlIjoic3JjL2FwcC9ob21lL2hvbWUucGFnZS5zY3NzIiwic291cmNlc0NvbnRlbnQiOlsiXHJcbmlvbi10YWItYmFye1xyXG4gICAgLS1iYWNrZ3JvdW5kOiAjZjlmOWY5O1xyXG4gICAgLS1jb2xvcjogIzA2MWI1MjtcclxufVxyXG5cclxuLy8gQmFkZ2VcclxuLy8gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS1cclxuXHJcbi8vLyBAcHJvcCAtIEZvbnQgc2l6ZSBvZiB0aGUgYmFkZ2VcclxuJGJhZGdlLWZvbnQtc2l6ZToxNXB4ICFkZWZhdWx0O1xyXG5cclxuLy8vIEBwcm9wIC0gRm9udCB3ZWlnaHQgb2YgdGhlIGJhZGdlXHJcbiRiYWRnZS1mb250LXdlaWdodDpib2xkICFkZWZhdWx0O1xyXG5cclxuXHJcbmlvbi1iYWRnZSB7LyogICovXHJcblxyXG4gIC8qIGRpc3BsYXk6IGlubGluZS1ibG9jazsqL1xyXG5cclxuICBtaW4td2lkdGg6IDE4cHg7IFxyXG4gIGZvbnQtc2l6ZTogJGJhZGdlLWZvbnQtc2l6ZTtcclxuICAvKiBmb250LXdlaWdodDogJGJhZGdlLWZvbnQtd2VpZ2h0O1xyXG4gIGxpbmUtaGVpZ2h0OiAxO1xyXG5cclxuICB3aGl0ZS1zcGFjZTogbm93cmFwO1xyXG4gIHZlcnRpY2FsLWFsaWduOiBiYXNlbGluZTsgKi9cclxufVxyXG5cclxuXHJcbi50YWJ7XHJcbiAgLmJvdHRvbXN7XHJcbiAgICBkaXNwbGF5OiBmbGV4O1xyXG4gICAganVzdGlmeS1jb250ZW50OiBzcGFjZS1hcm91bmQ7XHJcbiAgfVxyXG59IiwiaW9uLXRhYi1iYXIge1xuICAtLWJhY2tncm91bmQ6ICNmOWY5Zjk7XG4gIC0tY29sb3I6ICMwNjFiNTI7XG59XG5cbmlvbi1iYWRnZSB7XG4gIC8qICAqL1xuICAvKiBkaXNwbGF5OiBpbmxpbmUtYmxvY2s7Ki9cbiAgbWluLXdpZHRoOiAxOHB4O1xuICBmb250LXNpemU6IDE1cHg7XG4gIC8qIGZvbnQtd2VpZ2h0OiAkYmFkZ2UtZm9udC13ZWlnaHQ7XG4gIGxpbmUtaGVpZ2h0OiAxO1xuXG4gIHdoaXRlLXNwYWNlOiBub3dyYXA7XG4gIHZlcnRpY2FsLWFsaWduOiBiYXNlbGluZTsgKi9cbn1cblxuLnRhYiAuYm90dG9tcyB7XG4gIGRpc3BsYXk6IGZsZXg7XG4gIGp1c3RpZnktY29udGVudDogc3BhY2UtYXJvdW5kO1xufSJdfQ== */\";","import { Component, OnInit } from '@angular/core';\r\nimport { EventsService } from '../services/events.service';\r\nimport { formatDate } from '@angular/common';\r\nimport { Event } from '../models/event.model';\r\nimport { ProcessesService } from '../services/processes.service';\r\nimport { StorageService } from 'src/app/services/storage.service';\r\nimport { ModalController } from '@ionic/angular';\r\nimport { PublicationDetailPage } from '../../app/pages/publications/view-publications/publication-detail/publication-detail.page';\r\nimport { ViewPublicationsPage } from '../../app/pages/publications/view-publications/view-publications.page';\r\nimport { ExpedienteDetailPage } from '../../app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page'\r\nimport { ViewEventPage } from '../../app/pages/agenda/view-event/view-event.page'\r\n\r\nimport { Plugins, PushNotification, PushNotificationToken, PushNotificationActionPerformed, Modals } from '@capacitor/core';\r\nimport { Router } from '@angular/router';\r\nimport { MethodCall } from '@angular/compiler';\r\n\r\nconst { PushNotifications, LocalNotifications, LocalNotificationAction } = Plugins;\r\n\r\n@Component({\r\n selector: 'app-home',\r\n templateUrl: './home.page.html',\r\n styleUrls: ['./home.page.scss'],\r\n})\r\nexport class HomePage implements OnInit {\r\n eventsList: Event[];\r\n prEventList: Event[];\r\n mdEventList: Event[];\r\n\r\n totalEvent = 0;\r\n totalExpediente = 0;\r\n profile: string;\r\n\r\n constructor(private eventService: EventsService, private processesbackend: ProcessesService, private router: Router, private modalController: ModalController,) { }\r\n\r\n ngOnInit() {\r\n //Initialize profile as mdgpr\r\n this.profile = \"mdgpr\";\r\n if (this.profile == \"mdgpr\") {\r\n this.eventService.getAllMdEvents(formatDate(new Date(), 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => {\r\n this.eventsList = res;\r\n this.totalEvent = this.eventsList.length;\r\n });\r\n }\r\n else {\r\n this.eventService.getAllPrEvents(formatDate(new Date(), 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => {\r\n this.eventsList = res;\r\n this.totalEvent = this.eventsList.length;\r\n });\r\n\r\n }\r\n this.processesbackend.GetTasksList(\"Expediente\", true).subscribe(result => {\r\n this.totalExpediente = result;\r\n });\r\n /*\r\n (PushNotifications as any).requestPermission().then(result => {\r\n PushNotifications.register();\r\n });\r\n \r\n PushNotifications.addListener(\r\n 'registration',\r\n (token: PushNotificationToken) => {\r\n alert('Push registration success, token: ' + token.value);\r\n console.log('FIREBASE: ', token.value)\r\n this.storageService.store(this.username,token.value);\r\n },\r\n );\r\n \r\n console.log(this.storageService.get(this.username)) */\r\n\r\n PushNotifications.addListener('registrationError', (error: any) => {\r\n alert('Error on registration: ' + JSON.stringify(error));\r\n });\r\n\r\n PushNotifications.addListener('pushNotificationReceived', notification => { \r\n\r\n //const isPushNotification = !!notification.title || !!notification.body;\r\n \r\n // if this is a push notification received when the app is in the foreground on Android\r\n //if (isAndroid && isPushNotification) {\r\n \r\n // We schedule a LocalNotification 1 second later since Capacitor for Android doesn't show anything in this case\r\n LocalNotifications.schedule({\r\n notifications: [{\r\n title: notification.title,\r\n body: notification.body,\r\n id: new Date().getUTCMilliseconds(),\r\n schedule: {\r\n at: new Date(Date.now() + 1000)\r\n },\r\n extra: notification.data,\r\n channelId: 'pop-notifications'\r\n }]\r\n });\r\n //}\r\n });\r\n \r\n\r\n PushNotifications.addListener(\r\n 'pushNotificationActionPerformed',\r\n (notification: PushNotificationActionPerformed) => {\r\n let service = notification.notification.data.service;\r\n let object = notification.notification.data.object;\r\n let idObject = notification.notification.data.idObject;\r\n\r\n console.log('Service: ', service);\r\n console.log('Object: ', object);\r\n console.log('idObject: ', idObject);\r\n\r\n /* if (service === \"events\") {\r\n this.router.navigate(['/home/', service, idObject, 'home']);\r\n } else if (service === \"agenda\") {\r\n this.router.navigate(['/home/', service, idObject, 'home']);\r\n } else if (service === \"gabinete-digital\" && object != \"expediente\") {*/\r\n // this.router.navigate(['/home/', service]);\r\n // }\r\n\r\n //if (service != null) {\r\n\r\n /*const routeValue = {\r\n \"agenda\": this.router.navigate(['/home/', service, idObject, 'home']),\r\n \"gabinete-digital\": this.router.navigate(['/home/', service]),\r\n \"accoes\": this.viewExpedientDetail(idObject),\r\n\r\n }\r\n\r\n const route = routeValue[service] && object ;\r\n\r\n service = \"agenda\" ? this.router.navigate(['/home/', service, idObject, 'home']) : */\r\n\r\n if (service === \"agenda\") {\r\n //this.router.navigate(['/home/', service, idObject, 'home']);\r\n this.viewEventDetail(idObject)\r\n } else if (service === \"gabinete-digital\" && object != \"expediente\") {\r\n this.router.navigate(['/home/', service]);\r\n } else if (service === \"gabinete-digital\" && object === \"expediente\") {\r\n this.viewExpedientDetail(idObject)\r\n } else if (service === \"accoes\" && object === \"accao\") {\r\n this.viewPublications(idObject)\r\n } else if (service === \"accoes\" && object === \"publicacao\") {\r\n this.viewPublicationDetail(idObject)\r\n }\r\n \r\n\r\n\r\n\r\n /*switch (service) {\r\n case \"events\":\r\n this.router.navigate(['/home/', service, idObject, 'home']);\r\n break;\r\n case \"agenda\":\r\n this.router.navigate(['/home/', service, idObject, 'home']);\r\n break;\r\n case \"gabinete-digital\":\r\n this.router.navigate(['/home/', service]);\r\n break;\r\n case \"gabinete-digital-expediente\":\r\n this.router.navigate(['/home/gabinete-digital/', object, idObject, 'home']);\r\n break;\r\n case \"\": {\r\n\r\n if(publicationId && processId != null) {\r\n this.viewPublicationDetail(publicationId,processId)\r\n }\r\n if (folder.ProcessId != null) {\r\n this.viewPublications(folder)\r\n }\r\n }\r\n\r\n default:\r\n this.router.navigate(['/home/']);\r\n }*/\r\n\r\n\r\n\r\n },\r\n );\r\n }\r\n\r\n async localNotificationPresent(notification) {\r\n\r\n LocalNotificationAction.\r\n\r\n LocalNotifications.schedule({\r\n notifications: [\r\n {\r\n title: notification.title,\r\n body: notification.body,\r\n id: 1,\r\n schedule: { at: new Date(Date.now() + 1000) },\r\n sound: null,\r\n attachments: null,\r\n actionTypeId: \"\",\r\n extra: null,\r\n foreground: true,\r\n }\r\n ]\r\n });\r\n }\r\n\r\n async viewEventDetail(eventId:any) {\r\n console.log(this.profile);\r\n \r\n const modal = await this.modalController.create({\r\n component: ViewEventPage,\r\n componentProps:{\r\n eventId: eventId,\r\n },\r\n cssClass: 'modal',\r\n backdropDismiss: false\r\n });\r\n await modal.present();\r\n modal.onDidDismiss().then((res)=>{\r\n if(res){\r\n console.log(res);\r\n //this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);\r\n }\r\n });\r\n }\r\n\r\n async viewExpedientDetail(serialNumber:any) {\r\n console.log(this.profile);\r\n \r\n const modal = await this.modalController.create({\r\n component: ExpedienteDetailPage,\r\n componentProps:{\r\n serialNumber: serialNumber,\r\n profile: this.profile,\r\n },\r\n cssClass: 'modal',\r\n backdropDismiss: false\r\n });\r\n await modal.present();\r\n modal.onDidDismiss().then((res)=>{\r\n if(res){\r\n console.log(res);\r\n }\r\n });\r\n }\r\n\r\n\r\n\r\n async viewPublicationDetail(folderId) {\r\n const modal = await this.modalController.create({\r\n component: PublicationDetailPage,\r\n componentProps: {\r\n folderId: folderId,\r\n },\r\n cssClass: 'publication-detail',\r\n backdropDismiss: false\r\n });\r\n await modal.present();\r\n modal.onDidDismiss();\r\n }\r\n\r\n async viewPublications(folderId) {\r\n\r\n\r\n const modal = await this.modalController.create({\r\n component: ViewPublicationsPage,\r\n /* enterAnimation,\r\n leaveAnimation, */\r\n componentProps: {\r\n item: folderId,\r\n },\r\n cssClass: 'new-action',\r\n backdropDismiss: false\r\n });\r\n await modal.present();\r\n modal.onDidDismiss();\r\n }\r\n\r\n}\r\n","import { Injectable } from '@angular/core';\r\nimport { AuthService } from '../services/auth.service';\r\n\r\n@Injectable({\r\n providedIn: 'root'\r\n})\r\nexport class UserDataResolver{ \r\n constructor(private authService: AuthService){}\r\n\r\n resolve(){\r\n return this.authService.getUserData();\r\n }\r\n}"],"sourceRoot":"webpack:///"}
diff --git a/android/app/src/main/assets/public/home-home-module-es5.js b/android/app/src/main/assets/public/home-home-module-es5.js
index 3fbda80dd..d15097da5 100644
--- a/android/app/src/main/assets/public/home-home-module-es5.js
+++ b/android/app/src/main/assets/public/home-home-module-es5.js
@@ -504,17 +504,23 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
/* harmony import */
- var _capacitor_core__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(
+ var _app_pages_agenda_view_event_view_event_page__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(
+ /*! ../../app/pages/agenda/view-event/view-event.page */
+ "./src/app/pages/agenda/view-event/view-event.page.ts");
+ /* harmony import */
+
+
+ var _capacitor_core__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(
/*! @capacitor/core */
"./node_modules/@capacitor/core/dist/esm/index.js");
/* harmony import */
- var _angular_router__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(
+ var _angular_router__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(
/*! @angular/router */
"./node_modules/@angular/router/__ivy_ngcc__/fesm2015/router.js");
- var _capacitor_core__WEBP = _capacitor_core__WEBPACK_IMPORTED_MODULE_9__["Plugins"],
+ var _capacitor_core__WEBP = _capacitor_core__WEBPACK_IMPORTED_MODULE_10__["Plugins"],
PushNotifications = _capacitor_core__WEBP.PushNotifications,
LocalNotifications = _capacitor_core__WEBP.LocalNotifications,
LocalNotificationAction = _capacitor_core__WEBP.LocalNotificationAction;
@@ -616,7 +622,8 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
service = "agenda" ? this.router.navigate(['/home/', service, idObject, 'home']) : */
if (service === "agenda") {
- _this.router.navigate(['/home/', service, idObject, 'home']);
+ //this.router.navigate(['/home/', service, idObject, 'home']);
+ _this.viewEventDetail(idObject);
} else if (service === "gabinete-digital" && object != "expediente") {
_this.router.navigate(['/home/', service]);
} else if (service === "gabinete-digital" && object === "expediente") {
@@ -686,8 +693,8 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
}));
}
}, {
- key: "viewExpedientDetail",
- value: function viewExpedientDetail(serialNumber) {
+ key: "viewEventDetail",
+ value: function viewEventDetail(eventId) {
return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
var modal;
return regeneratorRuntime.wrap(function _callee2$(_context2) {
@@ -697,10 +704,9 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
console.log(this.profile);
_context2.next = 3;
return this.modalController.create({
- component: _app_pages_gabinete_digital_expediente_expediente_detail_expediente_detail_page__WEBPACK_IMPORTED_MODULE_8__["ExpedienteDetailPage"],
+ component: _app_pages_agenda_view_event_view_event_page__WEBPACK_IMPORTED_MODULE_9__["ViewEventPage"],
componentProps: {
- serialNumber: serialNumber,
- profile: this.profile
+ eventId: eventId
},
cssClass: 'modal',
backdropDismiss: false
@@ -714,7 +720,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
case 6:
modal.onDidDismiss().then(function (res) {
if (res) {
- console.log(res);
+ console.log(res); //this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
}
});
@@ -727,33 +733,39 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
}));
}
}, {
- key: "viewPublicationDetail",
- value: function viewPublicationDetail(folderId) {
+ key: "viewExpedientDetail",
+ value: function viewExpedientDetail(serialNumber) {
return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee3() {
var modal;
return regeneratorRuntime.wrap(function _callee3$(_context3) {
while (1) {
switch (_context3.prev = _context3.next) {
case 0:
- _context3.next = 2;
+ console.log(this.profile);
+ _context3.next = 3;
return this.modalController.create({
- component: _app_pages_publications_view_publications_publication_detail_publication_detail_page__WEBPACK_IMPORTED_MODULE_6__["PublicationDetailPage"],
+ component: _app_pages_gabinete_digital_expediente_expediente_detail_expediente_detail_page__WEBPACK_IMPORTED_MODULE_8__["ExpedienteDetailPage"],
componentProps: {
- folderId: folderId
+ serialNumber: serialNumber,
+ profile: this.profile
},
- cssClass: 'publication-detail',
+ cssClass: 'modal',
backdropDismiss: false
});
- case 2:
+ case 3:
modal = _context3.sent;
- _context3.next = 5;
+ _context3.next = 6;
return modal.present();
- case 5:
- modal.onDidDismiss();
-
case 6:
+ modal.onDidDismiss().then(function (res) {
+ if (res) {
+ console.log(res);
+ }
+ });
+
+ case 7:
case "end":
return _context3.stop();
}
@@ -762,8 +774,8 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
}));
}
}, {
- key: "viewPublications",
- value: function viewPublications(folderId) {
+ key: "viewPublicationDetail",
+ value: function viewPublicationDetail(folderId) {
return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee4() {
var modal;
return regeneratorRuntime.wrap(function _callee4$(_context4) {
@@ -772,14 +784,11 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
case 0:
_context4.next = 2;
return this.modalController.create({
- component: _app_pages_publications_view_publications_view_publications_page__WEBPACK_IMPORTED_MODULE_7__["ViewPublicationsPage"],
-
- /* enterAnimation,
- leaveAnimation, */
+ component: _app_pages_publications_view_publications_publication_detail_publication_detail_page__WEBPACK_IMPORTED_MODULE_6__["PublicationDetailPage"],
componentProps: {
- item: folderId
+ folderId: folderId
},
- cssClass: 'new-action',
+ cssClass: 'publication-detail',
backdropDismiss: false
});
@@ -799,6 +808,44 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
}, _callee4, this);
}));
}
+ }, {
+ key: "viewPublications",
+ value: function viewPublications(folderId) {
+ return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee5() {
+ var modal;
+ return regeneratorRuntime.wrap(function _callee5$(_context5) {
+ while (1) {
+ switch (_context5.prev = _context5.next) {
+ case 0:
+ _context5.next = 2;
+ return this.modalController.create({
+ component: _app_pages_publications_view_publications_view_publications_page__WEBPACK_IMPORTED_MODULE_7__["ViewPublicationsPage"],
+
+ /* enterAnimation,
+ leaveAnimation, */
+ componentProps: {
+ item: folderId
+ },
+ cssClass: 'new-action',
+ backdropDismiss: false
+ });
+
+ case 2:
+ modal = _context5.sent;
+ _context5.next = 5;
+ return modal.present();
+
+ case 5:
+ modal.onDidDismiss();
+
+ case 6:
+ case "end":
+ return _context5.stop();
+ }
+ }
+ }, _callee5, this);
+ }));
+ }
}]);
return HomePage;
@@ -810,7 +857,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
}, {
type: _services_processes_service__WEBPACK_IMPORTED_MODULE_4__["ProcessesService"]
}, {
- type: _angular_router__WEBPACK_IMPORTED_MODULE_10__["Router"]
+ type: _angular_router__WEBPACK_IMPORTED_MODULE_11__["Router"]
}, {
type: _ionic_angular__WEBPACK_IMPORTED_MODULE_5__["ModalController"]
}];
diff --git a/android/app/src/main/assets/public/home-home-module-es5.js.map b/android/app/src/main/assets/public/home-home-module-es5.js.map
index 7e6cff07a..90819878e 100644
--- a/android/app/src/main/assets/public/home-home-module-es5.js.map
+++ b/android/app/src/main/assets/public/home-home-module-es5.js.map
@@ -1 +1,5 @@
-{"version":3,"sources":["webpack:///src/app/home/home.page.html","webpack:///src/app/home/home-routing.module.ts","webpack:///src/app/home/home.module.ts","webpack:///src/app/home/home.page.scss","webpack:///src/app/home/home.page.ts","webpack:///src/app/resolvers/userData.resolver.ts"],"names":["routes","path","component","resolve","userData","children","loadChildren","then","m","EventsPageModule","EventDetailPageModule","AttachmentsPageModule","AttendeesPageModule","LoginPageModule","AgendaPageModule","GabineteDigitalPageModule","ExpedientePageModule","ExpedienteDetailPageModule","EventListPageModule","SearchPageModule","PublicationsPageModule","ViewPublicationsPageModule","PublicationDetailPageModule","ChatPageModule","redirectTo","pathMatch","HomePageRoutingModule","imports","forChild","exports","HomePageModule","declarations","PushNotifications","LocalNotifications","LocalNotificationAction","HomePage","eventService","processesbackend","router","modalController","totalEvent","totalExpediente","profile","getAllMdEvents","Date","subscribe","res","eventsList","length","getAllPrEvents","GetTasksList","result","addListener","error","alert","JSON","stringify","notification","schedule","notifications","title","body","id","getUTCMilliseconds","at","now","extra","data","channelId","service","object","idObject","console","log","navigate","viewExpedientDetail","viewPublications","viewPublicationDetail","sound","attachments","actionTypeId","foreground","serialNumber","create","componentProps","cssClass","backdropDismiss","modal","present","onDidDismiss","folderId","item","selector","template","UserDataResolver","authService","getUserData","providedIn"],"mappings":"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","file":"home-home-module-es5.js","sourcesContent":["export default \"\\r\\n\\r\\n\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n {{totalEvent}}\\r\\n Início\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n Agenda\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n {{totalExpediente}}\\r\\n Gabinete\\r\\n \\r\\n \\r\\n \\r\\n Acções\\r\\n \\r\\n \\r\\n \\r\\n Chat\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n\";","import { NgModule } from '@angular/core';\r\nimport { Routes, RouterModule } from '@angular/router';\r\nimport { HomeGuard } from '../guards/home.guard';\r\nimport { UserDataResolver } from '../resolvers/userData.resolver';\r\n\r\nimport { HomePage } from './home.page';\r\n\r\nconst routes: Routes = [\r\n {\r\n path: 'home',\r\n component: HomePage,\r\n /* canActivate: [HomeGuard], */\r\n resolve: {\r\n userData: UserDataResolver\r\n },\r\n children: [\r\n {\r\n path: 'events',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/events/events.module').then(m => m.EventsPageModule)\r\n },\r\n {\r\n path:':eventId/:caller',\r\n loadChildren: ()=> import('../pages/events/event-detail/event-detail.module').then(m => m.EventDetailPageModule),\r\n },\r\n ]\r\n },\r\n {\r\n path: 'attachments',\r\n children: [\r\n {\r\n path:':eventId',\r\n loadChildren: ()=> import('../pages/events/attachments/attachments.module').then(m => m.AttachmentsPageModule)\r\n },\r\n\r\n ]\r\n },\r\n {\r\n path: 'attendees',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/events/attendees/attendees.module').then(m => m.AttendeesPageModule)\r\n },\r\n ]\r\n },\r\n {\r\n path: 'login',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/login/login.module').then(m => m.LoginPageModule)\r\n },\r\n ]\r\n },\r\n {\r\n path: 'agenda',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/agenda/agenda.module').then(m => m.AgendaPageModule)\r\n },\r\n {\r\n path:':eventId/:caller',\r\n loadChildren: ()=> import('../pages/events/event-detail/event-detail.module').then(m => m.EventDetailPageModule),\r\n }\r\n ]\r\n },\r\n {\r\n path: 'gabinete-digital',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/gabinete-digital/gabinete-digital.module').then(m => m.GabineteDigitalPageModule)\r\n },\r\n {\r\n path:'expediente',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/gabinete-digital/expediente/expediente.module').then(m => m.ExpedientePageModule)\r\n },\r\n {\r\n path:':SerialNumber',\r\n loadChildren: ()=> import('../pages/gabinete-digital/expediente/expediente-detail/expediente-detail.module').then(m => m.ExpedienteDetailPageModule)\r\n },\r\n {\r\n path:'events/:eventId/:caller',\r\n loadChildren: ()=> import('../pages/events/event-detail/event-detail.module').then(m => m.EventDetailPageModule),\r\n }\r\n ]\r\n },\r\n {\r\n path:'event-list',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/gabinete-digital/event-list/event-list.module').then(m => m.EventListPageModule)\r\n },\r\n ] \r\n },\r\n ]\r\n },\r\n {\r\n path: 'search',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/search/search.module').then(m => m.SearchPageModule)\r\n }\r\n ]\r\n },\r\n {\r\n path: 'publications',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/publications/publications.module').then(m => m.PublicationsPageModule)\r\n },\r\n {\r\n path:'view-publications',\r\n children: [\r\n {\r\n path:':folderId',\r\n loadChildren: ()=> import('../pages/publications/view-publications/view-publications.module').then(m => m.ViewPublicationsPageModule)\r\n },\r\n {\r\n path:'publication-detail',\r\n children: [\r\n {\r\n path: ':id',\r\n loadChildren: ()=> import('../pages/publications/view-publications/publication-detail/publication-detail.module').then(m => m.PublicationDetailPageModule)\r\n },\r\n ]\r\n \r\n },\r\n ] \r\n },\r\n ]\r\n },\r\n {\r\n path: 'chat',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/chat/chat.module').then(m => m.ChatPageModule)\r\n }\r\n ]\r\n },\r\n ]\r\n },\r\n {\r\n path: '',\r\n redirectTo: '/home/events',\r\n pathMatch: 'full'\r\n }\r\n];\r\n\r\n@NgModule({\r\n imports: [RouterModule.forChild(routes)],\r\n exports: [RouterModule],\r\n})\r\nexport class HomePageRoutingModule {}\r\n","import { NgModule } from '@angular/core';\r\nimport { CommonModule } from '@angular/common';\r\nimport { FormsModule } from '@angular/forms';\r\n\r\nimport { IonicModule } from '@ionic/angular';\r\n\r\nimport { HomePageRoutingModule } from './home-routing.module';\r\n\r\nimport { HomePage } from './home.page';\r\n/* import { IonicSelectableModule } from 'ionic-selectable'; */\r\nimport { SharedModule } from 'src/app/shared/shared.module';\r\n\r\n@NgModule({\r\n imports: [\r\n CommonModule,\r\n FormsModule,\r\n IonicModule,\r\n HomePageRoutingModule,\r\n SharedModule\r\n ],\r\n declarations: [HomePage]\r\n})\r\nexport class HomePageModule {}\r\n","export default \"ion-tab-bar {\\n --background: #f9f9f9;\\n --color: #061b52;\\n}\\n\\nion-badge {\\n /* */\\n /* display: inline-block;*/\\n min-width: 18px;\\n font-size: 15px;\\n /* font-weight: $badge-font-weight;\\n line-height: 1;\\n\\n white-space: nowrap;\\n vertical-align: baseline; */\\n}\\n\\n.tab .bottoms {\\n display: flex;\\n justify-content: space-around;\\n}\\n/*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNyYy9hcHAvaG9tZS9DOlxcVXNlcnNcXHRpYWdvLmtheWF5YVxcZGV2ZWxvcG1lbnRcXGdhYmluZXRlLWRpZ2l0YWwvc3JjXFxhcHBcXGhvbWVcXGhvbWUucGFnZS5zY3NzIiwic3JjL2FwcC9ob21lL2hvbWUucGFnZS5zY3NzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBO0VBQ0kscUJBQUE7RUFDQSxnQkFBQTtBQ0FKOztBRGFBO0VBQVcsS0FBQTtFQUVULDBCQUFBO0VBRUEsZUFBQTtFQUNBLGVBWGU7RUFZZjs7Ozs2QkFBQTtBQ1BGOztBRGdCRTtFQUNFLGFBQUE7RUFDQSw2QkFBQTtBQ2JKIiwiZmlsZSI6InNyYy9hcHAvaG9tZS9ob21lLnBhZ2Uuc2NzcyIsInNvdXJjZXNDb250ZW50IjpbIlxyXG5pb24tdGFiLWJhcntcclxuICAgIC0tYmFja2dyb3VuZDogI2Y5ZjlmOTtcclxuICAgIC0tY29sb3I6ICMwNjFiNTI7XHJcbn1cclxuXHJcbi8vIEJhZGdlXHJcbi8vIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tXHJcblxyXG4vLy8gQHByb3AgLSBGb250IHNpemUgb2YgdGhlIGJhZGdlXHJcbiRiYWRnZS1mb250LXNpemU6MTVweCAhZGVmYXVsdDtcclxuXHJcbi8vLyBAcHJvcCAtIEZvbnQgd2VpZ2h0IG9mIHRoZSBiYWRnZVxyXG4kYmFkZ2UtZm9udC13ZWlnaHQ6Ym9sZCAhZGVmYXVsdDtcclxuXHJcblxyXG5pb24tYmFkZ2Ugey8qICAqL1xyXG5cclxuICAvKiBkaXNwbGF5OiBpbmxpbmUtYmxvY2s7Ki9cclxuXHJcbiAgbWluLXdpZHRoOiAxOHB4OyBcclxuICBmb250LXNpemU6ICRiYWRnZS1mb250LXNpemU7XHJcbiAgLyogZm9udC13ZWlnaHQ6ICRiYWRnZS1mb250LXdlaWdodDtcclxuICBsaW5lLWhlaWdodDogMTtcclxuXHJcbiAgd2hpdGUtc3BhY2U6IG5vd3JhcDtcclxuICB2ZXJ0aWNhbC1hbGlnbjogYmFzZWxpbmU7ICovXHJcbn1cclxuXHJcblxyXG4udGFie1xyXG4gIC5ib3R0b21ze1xyXG4gICAgZGlzcGxheTogZmxleDtcclxuICAgIGp1c3RpZnktY29udGVudDogc3BhY2UtYXJvdW5kO1xyXG4gIH1cclxufSIsImlvbi10YWItYmFyIHtcbiAgLS1iYWNrZ3JvdW5kOiAjZjlmOWY5O1xuICAtLWNvbG9yOiAjMDYxYjUyO1xufVxuXG5pb24tYmFkZ2Uge1xuICAvKiAgKi9cbiAgLyogZGlzcGxheTogaW5saW5lLWJsb2NrOyovXG4gIG1pbi13aWR0aDogMThweDtcbiAgZm9udC1zaXplOiAxNXB4O1xuICAvKiBmb250LXdlaWdodDogJGJhZGdlLWZvbnQtd2VpZ2h0O1xuICBsaW5lLWhlaWdodDogMTtcblxuICB3aGl0ZS1zcGFjZTogbm93cmFwO1xuICB2ZXJ0aWNhbC1hbGlnbjogYmFzZWxpbmU7ICovXG59XG5cbi50YWIgLmJvdHRvbXMge1xuICBkaXNwbGF5OiBmbGV4O1xuICBqdXN0aWZ5LWNvbnRlbnQ6IHNwYWNlLWFyb3VuZDtcbn0iXX0= */\";","import { Component, OnInit } from '@angular/core';\r\nimport { EventsService } from '../services/events.service';\r\nimport { formatDate } from '@angular/common';\r\nimport { Event } from '../models/event.model';\r\nimport { ProcessesService } from '../services/processes.service';\r\nimport { StorageService } from 'src/app/services/storage.service';\r\nimport { ModalController } from '@ionic/angular';\r\nimport { PublicationDetailPage } from '../../app/pages/publications/view-publications/publication-detail/publication-detail.page';\r\nimport { ViewPublicationsPage } from '../../app/pages/publications/view-publications/view-publications.page';\r\nimport { ExpedienteDetailPage } from '../../app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page'\r\n\r\nimport { Plugins, PushNotification, PushNotificationToken, PushNotificationActionPerformed, Modals } from '@capacitor/core';\r\nimport { Router } from '@angular/router';\r\nimport { MethodCall } from '@angular/compiler';\r\n\r\nconst { PushNotifications, LocalNotifications, LocalNotificationAction } = Plugins;\r\n\r\n@Component({\r\n selector: 'app-home',\r\n templateUrl: './home.page.html',\r\n styleUrls: ['./home.page.scss'],\r\n})\r\nexport class HomePage implements OnInit {\r\n eventsList: Event[];\r\n prEventList: Event[];\r\n mdEventList: Event[];\r\n\r\n totalEvent = 0;\r\n totalExpediente = 0;\r\n profile: string;\r\n\r\n constructor(private eventService: EventsService, private processesbackend: ProcessesService, private router: Router, private modalController: ModalController,) { }\r\n\r\n ngOnInit() {\r\n //Initialize profile as mdgpr\r\n this.profile = \"mdgpr\";\r\n if (this.profile == \"mdgpr\") {\r\n this.eventService.getAllMdEvents(formatDate(new Date(), 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => {\r\n this.eventsList = res;\r\n this.totalEvent = this.eventsList.length;\r\n });\r\n }\r\n else {\r\n this.eventService.getAllPrEvents(formatDate(new Date(), 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => {\r\n this.eventsList = res;\r\n this.totalEvent = this.eventsList.length;\r\n });\r\n\r\n }\r\n this.processesbackend.GetTasksList(\"Expediente\", true).subscribe(result => {\r\n this.totalExpediente = result;\r\n });\r\n /*\r\n (PushNotifications as any).requestPermission().then(result => {\r\n PushNotifications.register();\r\n });\r\n \r\n PushNotifications.addListener(\r\n 'registration',\r\n (token: PushNotificationToken) => {\r\n alert('Push registration success, token: ' + token.value);\r\n console.log('FIREBASE: ', token.value)\r\n this.storageService.store(this.username,token.value);\r\n },\r\n );\r\n \r\n console.log(this.storageService.get(this.username)) */\r\n\r\n PushNotifications.addListener('registrationError', (error: any) => {\r\n alert('Error on registration: ' + JSON.stringify(error));\r\n });\r\n\r\n PushNotifications.addListener('pushNotificationReceived', notification => { \r\n\r\n //const isPushNotification = !!notification.title || !!notification.body;\r\n \r\n // if this is a push notification received when the app is in the foreground on Android\r\n //if (isAndroid && isPushNotification) {\r\n \r\n // We schedule a LocalNotification 1 second later since Capacitor for Android doesn't show anything in this case\r\n LocalNotifications.schedule({\r\n notifications: [{\r\n title: notification.title,\r\n body: notification.body,\r\n id: new Date().getUTCMilliseconds(),\r\n schedule: {\r\n at: new Date(Date.now() + 1000)\r\n },\r\n extra: notification.data,\r\n channelId: 'pop-notifications'\r\n }]\r\n });\r\n //}\r\n });\r\n \r\n\r\n PushNotifications.addListener(\r\n 'pushNotificationActionPerformed',\r\n (notification: PushNotificationActionPerformed) => {\r\n let service = notification.notification.data.service;\r\n let object = notification.notification.data.object;\r\n let idObject = notification.notification.data.idObject;\r\n\r\n console.log('Service: ', service);\r\n console.log('Object: ', object);\r\n console.log('idObject: ', idObject);\r\n\r\n /* if (service === \"events\") {\r\n this.router.navigate(['/home/', service, idObject, 'home']);\r\n } else if (service === \"agenda\") {\r\n this.router.navigate(['/home/', service, idObject, 'home']);\r\n } else if (service === \"gabinete-digital\" && object != \"expediente\") {*/\r\n // this.router.navigate(['/home/', service]);\r\n // }\r\n\r\n //if (service != null) {\r\n\r\n /*const routeValue = {\r\n \"agenda\": this.router.navigate(['/home/', service, idObject, 'home']),\r\n \"gabinete-digital\": this.router.navigate(['/home/', service]),\r\n \"accoes\": this.viewExpedientDetail(idObject),\r\n\r\n }\r\n\r\n const route = routeValue[service] && object ;\r\n\r\n service = \"agenda\" ? this.router.navigate(['/home/', service, idObject, 'home']) : */\r\n\r\n if (service === \"agenda\") {\r\n this.router.navigate(['/home/', service, idObject, 'home']);\r\n } else if (service === \"gabinete-digital\" && object != \"expediente\") {\r\n this.router.navigate(['/home/', service]);\r\n } else if (service === \"gabinete-digital\" && object === \"expediente\") {\r\n this.viewExpedientDetail(idObject)\r\n } else if (service === \"accoes\" && object === \"accao\") {\r\n this.viewPublications(idObject)\r\n } else if (service === \"accoes\" && object === \"publicacao\") {\r\n this.viewPublicationDetail(idObject)\r\n }\r\n \r\n\r\n\r\n\r\n /*switch (service) {\r\n case \"events\":\r\n this.router.navigate(['/home/', service, idObject, 'home']);\r\n break;\r\n case \"agenda\":\r\n this.router.navigate(['/home/', service, idObject, 'home']);\r\n break;\r\n case \"gabinete-digital\":\r\n this.router.navigate(['/home/', service]);\r\n break;\r\n case \"gabinete-digital-expediente\":\r\n this.router.navigate(['/home/gabinete-digital/', object, idObject, 'home']);\r\n break;\r\n case \"\": {\r\n\r\n if(publicationId && processId != null) {\r\n this.viewPublicationDetail(publicationId,processId)\r\n }\r\n if (folder.ProcessId != null) {\r\n this.viewPublications(folder)\r\n }\r\n }\r\n\r\n default:\r\n this.router.navigate(['/home/']);\r\n }*/\r\n\r\n\r\n\r\n },\r\n );\r\n }\r\n\r\n async localNotificationPresent(notification) {\r\n\r\n LocalNotificationAction.\r\n\r\n LocalNotifications.schedule({\r\n notifications: [\r\n {\r\n title: notification.title,\r\n body: notification.body,\r\n id: 1,\r\n schedule: { at: new Date(Date.now() + 1000) },\r\n sound: null,\r\n attachments: null,\r\n actionTypeId: \"\",\r\n extra: null,\r\n foreground: true,\r\n }\r\n ]\r\n });\r\n }\r\n\r\n async viewExpedientDetail(serialNumber:any) {\r\n console.log(this.profile);\r\n \r\n const modal = await this.modalController.create({\r\n component: ExpedienteDetailPage,\r\n componentProps:{\r\n serialNumber: serialNumber,\r\n profile: this.profile,\r\n },\r\n cssClass: 'modal',\r\n backdropDismiss: false\r\n });\r\n await modal.present();\r\n modal.onDidDismiss().then((res)=>{\r\n if(res){\r\n console.log(res);\r\n }\r\n });\r\n }\r\n\r\n\r\n\r\n async viewPublicationDetail(folderId) {\r\n const modal = await this.modalController.create({\r\n component: PublicationDetailPage,\r\n componentProps: {\r\n folderId: folderId,\r\n },\r\n cssClass: 'publication-detail',\r\n backdropDismiss: false\r\n });\r\n await modal.present();\r\n modal.onDidDismiss();\r\n }\r\n\r\n async viewPublications(folderId) {\r\n\r\n\r\n const modal = await this.modalController.create({\r\n component: ViewPublicationsPage,\r\n /* enterAnimation,\r\n leaveAnimation, */\r\n componentProps: {\r\n item: folderId,\r\n },\r\n cssClass: 'new-action',\r\n backdropDismiss: false\r\n });\r\n await modal.present();\r\n modal.onDidDismiss();\r\n }\r\n\r\n}\r\n","import { Injectable } from '@angular/core';\r\nimport { AuthService } from '../services/auth.service';\r\n\r\n@Injectable({\r\n providedIn: 'root'\r\n})\r\nexport class UserDataResolver{ \r\n constructor(private authService: AuthService){}\r\n\r\n resolve(){\r\n return this.authService.getUserData();\r\n }\r\n}"]}
\ No newline at end of file
+<<<<<<< HEAD
+{"version":3,"sources":["webpack:///src/app/home/home.page.html","webpack:///src/app/home/home-routing.module.ts","webpack:///src/app/home/home.module.ts","webpack:///src/app/home/home.page.scss","webpack:///src/app/home/home.page.ts","webpack:///src/app/resolvers/userData.resolver.ts"],"names":["routes","path","component","resolve","userData","children","loadChildren","then","m","EventsPageModule","EventDetailPageModule","AttachmentsPageModule","AttendeesPageModule","LoginPageModule","AgendaPageModule","GabineteDigitalPageModule","ExpedientePageModule","ExpedienteDetailPageModule","EventListPageModule","SearchPageModule","PublicationsPageModule","ViewPublicationsPageModule","PublicationDetailPageModule","ChatPageModule","redirectTo","pathMatch","HomePageRoutingModule","imports","forChild","exports","HomePageModule","declarations","PushNotifications","LocalNotifications","LocalNotificationAction","HomePage","eventService","processesbackend","router","modalController","totalEvent","totalExpediente","profile","getAllMdEvents","Date","subscribe","res","eventsList","length","getAllPrEvents","GetTasksList","result","addListener","error","alert","JSON","stringify","notification","schedule","notifications","title","body","id","getUTCMilliseconds","at","now","extra","data","channelId","service","object","idObject","console","log","navigate","viewExpedientDetail","viewPublications","viewPublicationDetail","sound","attachments","actionTypeId","foreground","serialNumber","create","componentProps","cssClass","backdropDismiss","modal","present","onDidDismiss","folderId","item","selector","template","UserDataResolver","authService","getUserData","providedIn"],"mappings":"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","file":"home-home-module-es5.js","sourcesContent":["export default \"\\r\\n\\r\\n\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n {{totalEvent}}\\r\\n Início\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n Agenda\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n {{totalExpediente}}\\r\\n Gabinete\\r\\n \\r\\n \\r\\n \\r\\n Acções\\r\\n \\r\\n \\r\\n \\r\\n Chat\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n\";","import { NgModule } from '@angular/core';\r\nimport { Routes, RouterModule } from '@angular/router';\r\nimport { HomeGuard } from '../guards/home.guard';\r\nimport { UserDataResolver } from '../resolvers/userData.resolver';\r\n\r\nimport { HomePage } from './home.page';\r\n\r\nconst routes: Routes = [\r\n {\r\n path: 'home',\r\n component: HomePage,\r\n /* canActivate: [HomeGuard], */\r\n resolve: {\r\n userData: UserDataResolver\r\n },\r\n children: [\r\n {\r\n path: 'events',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/events/events.module').then(m => m.EventsPageModule)\r\n },\r\n {\r\n path:':eventId/:caller',\r\n loadChildren: ()=> import('../pages/events/event-detail/event-detail.module').then(m => m.EventDetailPageModule),\r\n },\r\n ]\r\n },\r\n {\r\n path: 'attachments',\r\n children: [\r\n {\r\n path:':eventId',\r\n loadChildren: ()=> import('../pages/events/attachments/attachments.module').then(m => m.AttachmentsPageModule)\r\n },\r\n\r\n ]\r\n },\r\n {\r\n path: 'attendees',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/events/attendees/attendees.module').then(m => m.AttendeesPageModule)\r\n },\r\n ]\r\n },\r\n {\r\n path: 'login',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/login/login.module').then(m => m.LoginPageModule)\r\n },\r\n ]\r\n },\r\n {\r\n path: 'agenda',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/agenda/agenda.module').then(m => m.AgendaPageModule)\r\n },\r\n {\r\n path:':eventId/:caller',\r\n loadChildren: ()=> import('../pages/events/event-detail/event-detail.module').then(m => m.EventDetailPageModule),\r\n }\r\n ]\r\n },\r\n {\r\n path: 'gabinete-digital',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/gabinete-digital/gabinete-digital.module').then(m => m.GabineteDigitalPageModule)\r\n },\r\n {\r\n path:'expediente',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/gabinete-digital/expediente/expediente.module').then(m => m.ExpedientePageModule)\r\n },\r\n {\r\n path:':SerialNumber',\r\n loadChildren: ()=> import('../pages/gabinete-digital/expediente/expediente-detail/expediente-detail.module').then(m => m.ExpedienteDetailPageModule)\r\n },\r\n {\r\n path:'events/:eventId/:caller',\r\n loadChildren: ()=> import('../pages/events/event-detail/event-detail.module').then(m => m.EventDetailPageModule),\r\n }\r\n ]\r\n },\r\n {\r\n path:'event-list',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/gabinete-digital/event-list/event-list.module').then(m => m.EventListPageModule)\r\n },\r\n ] \r\n },\r\n ]\r\n },\r\n {\r\n path: 'search',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/search/search.module').then(m => m.SearchPageModule)\r\n }\r\n ]\r\n },\r\n {\r\n path: 'publications',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/publications/publications.module').then(m => m.PublicationsPageModule)\r\n },\r\n {\r\n path:'view-publications',\r\n children: [\r\n {\r\n path:':folderId',\r\n loadChildren: ()=> import('../pages/publications/view-publications/view-publications.module').then(m => m.ViewPublicationsPageModule)\r\n },\r\n {\r\n path:'publication-detail',\r\n children: [\r\n {\r\n path: ':id',\r\n loadChildren: ()=> import('../pages/publications/view-publications/publication-detail/publication-detail.module').then(m => m.PublicationDetailPageModule)\r\n },\r\n ]\r\n \r\n },\r\n ] \r\n },\r\n ]\r\n },\r\n {\r\n path: 'chat',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/chat/chat.module').then(m => m.ChatPageModule)\r\n }\r\n ]\r\n },\r\n ]\r\n },\r\n {\r\n path: '',\r\n redirectTo: '/home/events',\r\n pathMatch: 'full'\r\n }\r\n];\r\n\r\n@NgModule({\r\n imports: [RouterModule.forChild(routes)],\r\n exports: [RouterModule],\r\n})\r\nexport class HomePageRoutingModule {}\r\n","import { NgModule } from '@angular/core';\r\nimport { CommonModule } from '@angular/common';\r\nimport { FormsModule } from '@angular/forms';\r\n\r\nimport { IonicModule } from '@ionic/angular';\r\n\r\nimport { HomePageRoutingModule } from './home-routing.module';\r\n\r\nimport { HomePage } from './home.page';\r\n/* import { IonicSelectableModule } from 'ionic-selectable'; */\r\nimport { SharedModule } from 'src/app/shared/shared.module';\r\n\r\n@NgModule({\r\n imports: [\r\n CommonModule,\r\n FormsModule,\r\n IonicModule,\r\n HomePageRoutingModule,\r\n SharedModule\r\n ],\r\n declarations: [HomePage]\r\n})\r\nexport class HomePageModule {}\r\n","export default \"ion-tab-bar {\\n --background: #f9f9f9;\\n --color: #061b52;\\n}\\n\\nion-badge {\\n /* */\\n /* display: inline-block;*/\\n min-width: 18px;\\n font-size: 15px;\\n /* font-weight: $badge-font-weight;\\n line-height: 1;\\n\\n white-space: nowrap;\\n vertical-align: baseline; */\\n}\\n\\n.tab .bottoms {\\n display: flex;\\n justify-content: space-around;\\n}\\n/*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNyYy9hcHAvaG9tZS9DOlxcVXNlcnNcXHRpYWdvLmtheWF5YVxcZGV2ZWxvcG1lbnRcXGdhYmluZXRlLWRpZ2l0YWwvc3JjXFxhcHBcXGhvbWVcXGhvbWUucGFnZS5zY3NzIiwic3JjL2FwcC9ob21lL2hvbWUucGFnZS5zY3NzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBO0VBQ0kscUJBQUE7RUFDQSxnQkFBQTtBQ0FKOztBRGFBO0VBQVcsS0FBQTtFQUVULDBCQUFBO0VBRUEsZUFBQTtFQUNBLGVBWGU7RUFZZjs7Ozs2QkFBQTtBQ1BGOztBRGdCRTtFQUNFLGFBQUE7RUFDQSw2QkFBQTtBQ2JKIiwiZmlsZSI6InNyYy9hcHAvaG9tZS9ob21lLnBhZ2Uuc2NzcyIsInNvdXJjZXNDb250ZW50IjpbIlxyXG5pb24tdGFiLWJhcntcclxuICAgIC0tYmFja2dyb3VuZDogI2Y5ZjlmOTtcclxuICAgIC0tY29sb3I6ICMwNjFiNTI7XHJcbn1cclxuXHJcbi8vIEJhZGdlXHJcbi8vIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tXHJcblxyXG4vLy8gQHByb3AgLSBGb250IHNpemUgb2YgdGhlIGJhZGdlXHJcbiRiYWRnZS1mb250LXNpemU6MTVweCAhZGVmYXVsdDtcclxuXHJcbi8vLyBAcHJvcCAtIEZvbnQgd2VpZ2h0IG9mIHRoZSBiYWRnZVxyXG4kYmFkZ2UtZm9udC13ZWlnaHQ6Ym9sZCAhZGVmYXVsdDtcclxuXHJcblxyXG5pb24tYmFkZ2Ugey8qICAqL1xyXG5cclxuICAvKiBkaXNwbGF5OiBpbmxpbmUtYmxvY2s7Ki9cclxuXHJcbiAgbWluLXdpZHRoOiAxOHB4OyBcclxuICBmb250LXNpemU6ICRiYWRnZS1mb250LXNpemU7XHJcbiAgLyogZm9udC13ZWlnaHQ6ICRiYWRnZS1mb250LXdlaWdodDtcclxuICBsaW5lLWhlaWdodDogMTtcclxuXHJcbiAgd2hpdGUtc3BhY2U6IG5vd3JhcDtcclxuICB2ZXJ0aWNhbC1hbGlnbjogYmFzZWxpbmU7ICovXHJcbn1cclxuXHJcblxyXG4udGFie1xyXG4gIC5ib3R0b21ze1xyXG4gICAgZGlzcGxheTogZmxleDtcclxuICAgIGp1c3RpZnktY29udGVudDogc3BhY2UtYXJvdW5kO1xyXG4gIH1cclxufSIsImlvbi10YWItYmFyIHtcbiAgLS1iYWNrZ3JvdW5kOiAjZjlmOWY5O1xuICAtLWNvbG9yOiAjMDYxYjUyO1xufVxuXG5pb24tYmFkZ2Uge1xuICAvKiAgKi9cbiAgLyogZGlzcGxheTogaW5saW5lLWJsb2NrOyovXG4gIG1pbi13aWR0aDogMThweDtcbiAgZm9udC1zaXplOiAxNXB4O1xuICAvKiBmb250LXdlaWdodDogJGJhZGdlLWZvbnQtd2VpZ2h0O1xuICBsaW5lLWhlaWdodDogMTtcblxuICB3aGl0ZS1zcGFjZTogbm93cmFwO1xuICB2ZXJ0aWNhbC1hbGlnbjogYmFzZWxpbmU7ICovXG59XG5cbi50YWIgLmJvdHRvbXMge1xuICBkaXNwbGF5OiBmbGV4O1xuICBqdXN0aWZ5LWNvbnRlbnQ6IHNwYWNlLWFyb3VuZDtcbn0iXX0= */\";","import { Component, OnInit } from '@angular/core';\r\nimport { EventsService } from '../services/events.service';\r\nimport { formatDate } from '@angular/common';\r\nimport { Event } from '../models/event.model';\r\nimport { ProcessesService } from '../services/processes.service';\r\nimport { StorageService } from 'src/app/services/storage.service';\r\nimport { ModalController } from '@ionic/angular';\r\nimport { PublicationDetailPage } from '../../app/pages/publications/view-publications/publication-detail/publication-detail.page';\r\nimport { ViewPublicationsPage } from '../../app/pages/publications/view-publications/view-publications.page';\r\nimport { ExpedienteDetailPage } from '../../app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page'\r\n\r\nimport { Plugins, PushNotification, PushNotificationToken, PushNotificationActionPerformed, Modals } from '@capacitor/core';\r\nimport { Router } from '@angular/router';\r\nimport { MethodCall } from '@angular/compiler';\r\n\r\nconst { PushNotifications, LocalNotifications, LocalNotificationAction } = Plugins;\r\n\r\n@Component({\r\n selector: 'app-home',\r\n templateUrl: './home.page.html',\r\n styleUrls: ['./home.page.scss'],\r\n})\r\nexport class HomePage implements OnInit {\r\n eventsList: Event[];\r\n prEventList: Event[];\r\n mdEventList: Event[];\r\n\r\n totalEvent = 0;\r\n totalExpediente = 0;\r\n profile: string;\r\n\r\n constructor(private eventService: EventsService, private processesbackend: ProcessesService, private router: Router, private modalController: ModalController,) { }\r\n\r\n ngOnInit() {\r\n //Initialize profile as mdgpr\r\n this.profile = \"mdgpr\";\r\n if (this.profile == \"mdgpr\") {\r\n this.eventService.getAllMdEvents(formatDate(new Date(), 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => {\r\n this.eventsList = res;\r\n this.totalEvent = this.eventsList.length;\r\n });\r\n }\r\n else {\r\n this.eventService.getAllPrEvents(formatDate(new Date(), 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => {\r\n this.eventsList = res;\r\n this.totalEvent = this.eventsList.length;\r\n });\r\n\r\n }\r\n this.processesbackend.GetTasksList(\"Expediente\", true).subscribe(result => {\r\n this.totalExpediente = result;\r\n });\r\n /*\r\n (PushNotifications as any).requestPermission().then(result => {\r\n PushNotifications.register();\r\n });\r\n \r\n PushNotifications.addListener(\r\n 'registration',\r\n (token: PushNotificationToken) => {\r\n alert('Push registration success, token: ' + token.value);\r\n console.log('FIREBASE: ', token.value)\r\n this.storageService.store(this.username,token.value);\r\n },\r\n );\r\n \r\n console.log(this.storageService.get(this.username)) */\r\n\r\n PushNotifications.addListener('registrationError', (error: any) => {\r\n alert('Error on registration: ' + JSON.stringify(error));\r\n });\r\n\r\n PushNotifications.addListener('pushNotificationReceived', notification => { \r\n\r\n //const isPushNotification = !!notification.title || !!notification.body;\r\n \r\n // if this is a push notification received when the app is in the foreground on Android\r\n //if (isAndroid && isPushNotification) {\r\n \r\n // We schedule a LocalNotification 1 second later since Capacitor for Android doesn't show anything in this case\r\n LocalNotifications.schedule({\r\n notifications: [{\r\n title: notification.title,\r\n body: notification.body,\r\n id: new Date().getUTCMilliseconds(),\r\n schedule: {\r\n at: new Date(Date.now() + 1000)\r\n },\r\n extra: notification.data,\r\n channelId: 'pop-notifications'\r\n }]\r\n });\r\n //}\r\n });\r\n \r\n\r\n PushNotifications.addListener(\r\n 'pushNotificationActionPerformed',\r\n (notification: PushNotificationActionPerformed) => {\r\n let service = notification.notification.data.service;\r\n let object = notification.notification.data.object;\r\n let idObject = notification.notification.data.idObject;\r\n\r\n console.log('Service: ', service);\r\n console.log('Object: ', object);\r\n console.log('idObject: ', idObject);\r\n\r\n /* if (service === \"events\") {\r\n this.router.navigate(['/home/', service, idObject, 'home']);\r\n } else if (service === \"agenda\") {\r\n this.router.navigate(['/home/', service, idObject, 'home']);\r\n } else if (service === \"gabinete-digital\" && object != \"expediente\") {*/\r\n // this.router.navigate(['/home/', service]);\r\n // }\r\n\r\n //if (service != null) {\r\n\r\n /*const routeValue = {\r\n \"agenda\": this.router.navigate(['/home/', service, idObject, 'home']),\r\n \"gabinete-digital\": this.router.navigate(['/home/', service]),\r\n \"accoes\": this.viewExpedientDetail(idObject),\r\n\r\n }\r\n\r\n const route = routeValue[service] && object ;\r\n\r\n service = \"agenda\" ? this.router.navigate(['/home/', service, idObject, 'home']) : */\r\n\r\n if (service === \"agenda\") {\r\n this.router.navigate(['/home/', service, idObject, 'home']);\r\n } else if (service === \"gabinete-digital\" && object != \"expediente\") {\r\n this.router.navigate(['/home/', service]);\r\n } else if (service === \"gabinete-digital\" && object === \"expediente\") {\r\n this.viewExpedientDetail(idObject)\r\n } else if (service === \"accoes\" && object === \"accao\") {\r\n this.viewPublications(idObject)\r\n } else if (service === \"accoes\" && object === \"publicacao\") {\r\n this.viewPublicationDetail(idObject)\r\n }\r\n \r\n\r\n\r\n\r\n /*switch (service) {\r\n case \"events\":\r\n this.router.navigate(['/home/', service, idObject, 'home']);\r\n break;\r\n case \"agenda\":\r\n this.router.navigate(['/home/', service, idObject, 'home']);\r\n break;\r\n case \"gabinete-digital\":\r\n this.router.navigate(['/home/', service]);\r\n break;\r\n case \"gabinete-digital-expediente\":\r\n this.router.navigate(['/home/gabinete-digital/', object, idObject, 'home']);\r\n break;\r\n case \"\": {\r\n\r\n if(publicationId && processId != null) {\r\n this.viewPublicationDetail(publicationId,processId)\r\n }\r\n if (folder.ProcessId != null) {\r\n this.viewPublications(folder)\r\n }\r\n }\r\n\r\n default:\r\n this.router.navigate(['/home/']);\r\n }*/\r\n\r\n\r\n\r\n },\r\n );\r\n }\r\n\r\n async localNotificationPresent(notification) {\r\n\r\n LocalNotificationAction.\r\n\r\n LocalNotifications.schedule({\r\n notifications: [\r\n {\r\n title: notification.title,\r\n body: notification.body,\r\n id: 1,\r\n schedule: { at: new Date(Date.now() + 1000) },\r\n sound: null,\r\n attachments: null,\r\n actionTypeId: \"\",\r\n extra: null,\r\n foreground: true,\r\n }\r\n ]\r\n });\r\n }\r\n\r\n async viewExpedientDetail(serialNumber:any) {\r\n console.log(this.profile);\r\n \r\n const modal = await this.modalController.create({\r\n component: ExpedienteDetailPage,\r\n componentProps:{\r\n serialNumber: serialNumber,\r\n profile: this.profile,\r\n },\r\n cssClass: 'modal',\r\n backdropDismiss: false\r\n });\r\n await modal.present();\r\n modal.onDidDismiss().then((res)=>{\r\n if(res){\r\n console.log(res);\r\n }\r\n });\r\n }\r\n\r\n\r\n\r\n async viewPublicationDetail(folderId) {\r\n const modal = await this.modalController.create({\r\n component: PublicationDetailPage,\r\n componentProps: {\r\n folderId: folderId,\r\n },\r\n cssClass: 'publication-detail',\r\n backdropDismiss: false\r\n });\r\n await modal.present();\r\n modal.onDidDismiss();\r\n }\r\n\r\n async viewPublications(folderId) {\r\n\r\n\r\n const modal = await this.modalController.create({\r\n component: ViewPublicationsPage,\r\n /* enterAnimation,\r\n leaveAnimation, */\r\n componentProps: {\r\n item: folderId,\r\n },\r\n cssClass: 'new-action',\r\n backdropDismiss: false\r\n });\r\n await modal.present();\r\n modal.onDidDismiss();\r\n }\r\n\r\n}\r\n","import { Injectable } from '@angular/core';\r\nimport { AuthService } from '../services/auth.service';\r\n\r\n@Injectable({\r\n providedIn: 'root'\r\n})\r\nexport class UserDataResolver{ \r\n constructor(private authService: AuthService){}\r\n\r\n resolve(){\r\n return this.authService.getUserData();\r\n }\r\n}"]}
+=======
+{"version":3,"sources":["webpack:///src/app/home/home.page.html","webpack:///src/app/home/home-routing.module.ts","webpack:///src/app/home/home.module.ts","webpack:///src/app/home/home.page.scss","webpack:///src/app/home/home.page.ts","webpack:///src/app/resolvers/userData.resolver.ts"],"names":["routes","path","component","resolve","userData","children","loadChildren","then","m","EventsPageModule","EventDetailPageModule","AttachmentsPageModule","AttendeesPageModule","LoginPageModule","AgendaPageModule","GabineteDigitalPageModule","ExpedientePageModule","ExpedienteDetailPageModule","EventListPageModule","SearchPageModule","PublicationsPageModule","ViewPublicationsPageModule","PublicationDetailPageModule","ChatPageModule","redirectTo","pathMatch","HomePageRoutingModule","imports","forChild","exports","HomePageModule","declarations","PushNotifications","LocalNotifications","LocalNotificationAction","HomePage","eventService","processesbackend","router","modalController","totalEvent","totalExpediente","profile","getAllMdEvents","Date","subscribe","res","eventsList","length","getAllPrEvents","GetTasksList","result","addListener","error","alert","JSON","stringify","notification","schedule","notifications","title","body","id","getUTCMilliseconds","at","now","extra","data","channelId","service","object","idObject","console","log","viewEventDetail","navigate","viewExpedientDetail","viewPublications","viewPublicationDetail","sound","attachments","actionTypeId","foreground","eventId","create","componentProps","cssClass","backdropDismiss","modal","present","onDidDismiss","serialNumber","folderId","item","selector","template","UserDataResolver","authService","getUserData","providedIn"],"mappings":"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","file":"home-home-module-es5.js","sourcesContent":["export default \"\\r\\n\\r\\n\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n {{totalEvent}}\\r\\n Início\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n Agenda\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n {{totalExpediente}}\\r\\n Gabinete\\r\\n \\r\\n \\r\\n \\r\\n Acções\\r\\n \\r\\n \\r\\n \\r\\n Chat\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n\";","import { NgModule } from '@angular/core';\r\nimport { Routes, RouterModule } from '@angular/router';\r\nimport { HomeGuard } from '../guards/home.guard';\r\nimport { UserDataResolver } from '../resolvers/userData.resolver';\r\n\r\nimport { HomePage } from './home.page';\r\n\r\nconst routes: Routes = [\r\n {\r\n path: 'home',\r\n component: HomePage,\r\n /* canActivate: [HomeGuard], */\r\n resolve: {\r\n userData: UserDataResolver\r\n },\r\n children: [\r\n {\r\n path: 'events',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/events/events.module').then(m => m.EventsPageModule)\r\n },\r\n {\r\n path:':eventId/:caller',\r\n loadChildren: ()=> import('../pages/events/event-detail/event-detail.module').then(m => m.EventDetailPageModule),\r\n },\r\n ]\r\n },\r\n {\r\n path: 'attachments',\r\n children: [\r\n {\r\n path:':eventId',\r\n loadChildren: ()=> import('../pages/events/attachments/attachments.module').then(m => m.AttachmentsPageModule)\r\n },\r\n\r\n ]\r\n },\r\n {\r\n path: 'attendees',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/events/attendees/attendees.module').then(m => m.AttendeesPageModule)\r\n },\r\n ]\r\n },\r\n {\r\n path: 'login',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/login/login.module').then(m => m.LoginPageModule)\r\n },\r\n ]\r\n },\r\n {\r\n path: 'agenda',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/agenda/agenda.module').then(m => m.AgendaPageModule)\r\n },\r\n {\r\n path:':eventId/:caller',\r\n loadChildren: ()=> import('../pages/events/event-detail/event-detail.module').then(m => m.EventDetailPageModule),\r\n }\r\n ]\r\n },\r\n {\r\n path: 'gabinete-digital',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/gabinete-digital/gabinete-digital.module').then(m => m.GabineteDigitalPageModule)\r\n },\r\n {\r\n path:'expediente',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/gabinete-digital/expediente/expediente.module').then(m => m.ExpedientePageModule)\r\n },\r\n {\r\n path:':SerialNumber',\r\n loadChildren: ()=> import('../pages/gabinete-digital/expediente/expediente-detail/expediente-detail.module').then(m => m.ExpedienteDetailPageModule)\r\n },\r\n {\r\n path:'events/:eventId/:caller',\r\n loadChildren: ()=> import('../pages/events/event-detail/event-detail.module').then(m => m.EventDetailPageModule),\r\n }\r\n ]\r\n },\r\n {\r\n path:'event-list',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/gabinete-digital/event-list/event-list.module').then(m => m.EventListPageModule)\r\n },\r\n ] \r\n },\r\n ]\r\n },\r\n {\r\n path: 'search',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/search/search.module').then(m => m.SearchPageModule)\r\n }\r\n ]\r\n },\r\n {\r\n path: 'publications',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/publications/publications.module').then(m => m.PublicationsPageModule)\r\n },\r\n {\r\n path:'view-publications',\r\n children: [\r\n {\r\n path:':folderId',\r\n loadChildren: ()=> import('../pages/publications/view-publications/view-publications.module').then(m => m.ViewPublicationsPageModule)\r\n },\r\n {\r\n path:'publication-detail',\r\n children: [\r\n {\r\n path: ':id',\r\n loadChildren: ()=> import('../pages/publications/view-publications/publication-detail/publication-detail.module').then(m => m.PublicationDetailPageModule)\r\n },\r\n ]\r\n \r\n },\r\n ] \r\n },\r\n ]\r\n },\r\n {\r\n path: 'chat',\r\n children: [\r\n {\r\n path:'',\r\n loadChildren: ()=> import('../pages/chat/chat.module').then(m => m.ChatPageModule)\r\n }\r\n ]\r\n },\r\n ]\r\n },\r\n {\r\n path: '',\r\n redirectTo: '/home/events',\r\n pathMatch: 'full'\r\n }\r\n];\r\n\r\n@NgModule({\r\n imports: [RouterModule.forChild(routes)],\r\n exports: [RouterModule],\r\n})\r\nexport class HomePageRoutingModule {}\r\n","import { NgModule } from '@angular/core';\r\nimport { CommonModule } from '@angular/common';\r\nimport { FormsModule } from '@angular/forms';\r\n\r\nimport { IonicModule } from '@ionic/angular';\r\n\r\nimport { HomePageRoutingModule } from './home-routing.module';\r\n\r\nimport { HomePage } from './home.page';\r\n/* import { IonicSelectableModule } from 'ionic-selectable'; */\r\nimport { SharedModule } from 'src/app/shared/shared.module';\r\n\r\n@NgModule({\r\n imports: [\r\n CommonModule,\r\n FormsModule,\r\n IonicModule,\r\n HomePageRoutingModule,\r\n SharedModule\r\n ],\r\n declarations: [HomePage]\r\n})\r\nexport class HomePageModule {}\r\n","export default \"ion-tab-bar {\\n --background: #f9f9f9;\\n --color: #061b52;\\n}\\n\\nion-badge {\\n /* */\\n /* display: inline-block;*/\\n min-width: 18px;\\n font-size: 15px;\\n /* font-weight: $badge-font-weight;\\n line-height: 1;\\n\\n white-space: nowrap;\\n vertical-align: baseline; */\\n}\\n\\n.tab .bottoms {\\n display: flex;\\n justify-content: space-around;\\n}\\n/*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNyYy9hcHAvaG9tZS9DOlxcVXNlcnNcXGV1ZGVzLmluYWNpb1xcR2FiaW5ldC1EaWdpdGFsUHJvamVjdFxcTmV3IGZvbGRlclxcZ2FiaW5ldGUtZGlnaXRhbC9zcmNcXGFwcFxcaG9tZVxcaG9tZS5wYWdlLnNjc3MiLCJzcmMvYXBwL2hvbWUvaG9tZS5wYWdlLnNjc3MiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0E7RUFDSSxxQkFBQTtFQUNBLGdCQUFBO0FDQUo7O0FEYUE7RUFBVyxLQUFBO0VBRVQsMEJBQUE7RUFFQSxlQUFBO0VBQ0EsZUFYZTtFQVlmOzs7OzZCQUFBO0FDUEY7O0FEZ0JFO0VBQ0UsYUFBQTtFQUNBLDZCQUFBO0FDYkoiLCJmaWxlIjoic3JjL2FwcC9ob21lL2hvbWUucGFnZS5zY3NzIiwic291cmNlc0NvbnRlbnQiOlsiXHJcbmlvbi10YWItYmFye1xyXG4gICAgLS1iYWNrZ3JvdW5kOiAjZjlmOWY5O1xyXG4gICAgLS1jb2xvcjogIzA2MWI1MjtcclxufVxyXG5cclxuLy8gQmFkZ2VcclxuLy8gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS1cclxuXHJcbi8vLyBAcHJvcCAtIEZvbnQgc2l6ZSBvZiB0aGUgYmFkZ2VcclxuJGJhZGdlLWZvbnQtc2l6ZToxNXB4ICFkZWZhdWx0O1xyXG5cclxuLy8vIEBwcm9wIC0gRm9udCB3ZWlnaHQgb2YgdGhlIGJhZGdlXHJcbiRiYWRnZS1mb250LXdlaWdodDpib2xkICFkZWZhdWx0O1xyXG5cclxuXHJcbmlvbi1iYWRnZSB7LyogICovXHJcblxyXG4gIC8qIGRpc3BsYXk6IGlubGluZS1ibG9jazsqL1xyXG5cclxuICBtaW4td2lkdGg6IDE4cHg7IFxyXG4gIGZvbnQtc2l6ZTogJGJhZGdlLWZvbnQtc2l6ZTtcclxuICAvKiBmb250LXdlaWdodDogJGJhZGdlLWZvbnQtd2VpZ2h0O1xyXG4gIGxpbmUtaGVpZ2h0OiAxO1xyXG5cclxuICB3aGl0ZS1zcGFjZTogbm93cmFwO1xyXG4gIHZlcnRpY2FsLWFsaWduOiBiYXNlbGluZTsgKi9cclxufVxyXG5cclxuXHJcbi50YWJ7XHJcbiAgLmJvdHRvbXN7XHJcbiAgICBkaXNwbGF5OiBmbGV4O1xyXG4gICAganVzdGlmeS1jb250ZW50OiBzcGFjZS1hcm91bmQ7XHJcbiAgfVxyXG59IiwiaW9uLXRhYi1iYXIge1xuICAtLWJhY2tncm91bmQ6ICNmOWY5Zjk7XG4gIC0tY29sb3I6ICMwNjFiNTI7XG59XG5cbmlvbi1iYWRnZSB7XG4gIC8qICAqL1xuICAvKiBkaXNwbGF5OiBpbmxpbmUtYmxvY2s7Ki9cbiAgbWluLXdpZHRoOiAxOHB4O1xuICBmb250LXNpemU6IDE1cHg7XG4gIC8qIGZvbnQtd2VpZ2h0OiAkYmFkZ2UtZm9udC13ZWlnaHQ7XG4gIGxpbmUtaGVpZ2h0OiAxO1xuXG4gIHdoaXRlLXNwYWNlOiBub3dyYXA7XG4gIHZlcnRpY2FsLWFsaWduOiBiYXNlbGluZTsgKi9cbn1cblxuLnRhYiAuYm90dG9tcyB7XG4gIGRpc3BsYXk6IGZsZXg7XG4gIGp1c3RpZnktY29udGVudDogc3BhY2UtYXJvdW5kO1xufSJdfQ== */\";","import { Component, OnInit } from '@angular/core';\r\nimport { EventsService } from '../services/events.service';\r\nimport { formatDate } from '@angular/common';\r\nimport { Event } from '../models/event.model';\r\nimport { ProcessesService } from '../services/processes.service';\r\nimport { StorageService } from 'src/app/services/storage.service';\r\nimport { ModalController } from '@ionic/angular';\r\nimport { PublicationDetailPage } from '../../app/pages/publications/view-publications/publication-detail/publication-detail.page';\r\nimport { ViewPublicationsPage } from '../../app/pages/publications/view-publications/view-publications.page';\r\nimport { ExpedienteDetailPage } from '../../app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page'\r\nimport { ViewEventPage } from '../../app/pages/agenda/view-event/view-event.page'\r\n\r\nimport { Plugins, PushNotification, PushNotificationToken, PushNotificationActionPerformed, Modals } from '@capacitor/core';\r\nimport { Router } from '@angular/router';\r\nimport { MethodCall } from '@angular/compiler';\r\n\r\nconst { PushNotifications, LocalNotifications, LocalNotificationAction } = Plugins;\r\n\r\n@Component({\r\n selector: 'app-home',\r\n templateUrl: './home.page.html',\r\n styleUrls: ['./home.page.scss'],\r\n})\r\nexport class HomePage implements OnInit {\r\n eventsList: Event[];\r\n prEventList: Event[];\r\n mdEventList: Event[];\r\n\r\n totalEvent = 0;\r\n totalExpediente = 0;\r\n profile: string;\r\n\r\n constructor(private eventService: EventsService, private processesbackend: ProcessesService, private router: Router, private modalController: ModalController,) { }\r\n\r\n ngOnInit() {\r\n //Initialize profile as mdgpr\r\n this.profile = \"mdgpr\";\r\n if (this.profile == \"mdgpr\") {\r\n this.eventService.getAllMdEvents(formatDate(new Date(), 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => {\r\n this.eventsList = res;\r\n this.totalEvent = this.eventsList.length;\r\n });\r\n }\r\n else {\r\n this.eventService.getAllPrEvents(formatDate(new Date(), 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => {\r\n this.eventsList = res;\r\n this.totalEvent = this.eventsList.length;\r\n });\r\n\r\n }\r\n this.processesbackend.GetTasksList(\"Expediente\", true).subscribe(result => {\r\n this.totalExpediente = result;\r\n });\r\n /*\r\n (PushNotifications as any).requestPermission().then(result => {\r\n PushNotifications.register();\r\n });\r\n \r\n PushNotifications.addListener(\r\n 'registration',\r\n (token: PushNotificationToken) => {\r\n alert('Push registration success, token: ' + token.value);\r\n console.log('FIREBASE: ', token.value)\r\n this.storageService.store(this.username,token.value);\r\n },\r\n );\r\n \r\n console.log(this.storageService.get(this.username)) */\r\n\r\n PushNotifications.addListener('registrationError', (error: any) => {\r\n alert('Error on registration: ' + JSON.stringify(error));\r\n });\r\n\r\n PushNotifications.addListener('pushNotificationReceived', notification => { \r\n\r\n //const isPushNotification = !!notification.title || !!notification.body;\r\n \r\n // if this is a push notification received when the app is in the foreground on Android\r\n //if (isAndroid && isPushNotification) {\r\n \r\n // We schedule a LocalNotification 1 second later since Capacitor for Android doesn't show anything in this case\r\n LocalNotifications.schedule({\r\n notifications: [{\r\n title: notification.title,\r\n body: notification.body,\r\n id: new Date().getUTCMilliseconds(),\r\n schedule: {\r\n at: new Date(Date.now() + 1000)\r\n },\r\n extra: notification.data,\r\n channelId: 'pop-notifications'\r\n }]\r\n });\r\n //}\r\n });\r\n \r\n\r\n PushNotifications.addListener(\r\n 'pushNotificationActionPerformed',\r\n (notification: PushNotificationActionPerformed) => {\r\n let service = notification.notification.data.service;\r\n let object = notification.notification.data.object;\r\n let idObject = notification.notification.data.idObject;\r\n\r\n console.log('Service: ', service);\r\n console.log('Object: ', object);\r\n console.log('idObject: ', idObject);\r\n\r\n /* if (service === \"events\") {\r\n this.router.navigate(['/home/', service, idObject, 'home']);\r\n } else if (service === \"agenda\") {\r\n this.router.navigate(['/home/', service, idObject, 'home']);\r\n } else if (service === \"gabinete-digital\" && object != \"expediente\") {*/\r\n // this.router.navigate(['/home/', service]);\r\n // }\r\n\r\n //if (service != null) {\r\n\r\n /*const routeValue = {\r\n \"agenda\": this.router.navigate(['/home/', service, idObject, 'home']),\r\n \"gabinete-digital\": this.router.navigate(['/home/', service]),\r\n \"accoes\": this.viewExpedientDetail(idObject),\r\n\r\n }\r\n\r\n const route = routeValue[service] && object ;\r\n\r\n service = \"agenda\" ? this.router.navigate(['/home/', service, idObject, 'home']) : */\r\n\r\n if (service === \"agenda\") {\r\n //this.router.navigate(['/home/', service, idObject, 'home']);\r\n this.viewEventDetail(idObject)\r\n } else if (service === \"gabinete-digital\" && object != \"expediente\") {\r\n this.router.navigate(['/home/', service]);\r\n } else if (service === \"gabinete-digital\" && object === \"expediente\") {\r\n this.viewExpedientDetail(idObject)\r\n } else if (service === \"accoes\" && object === \"accao\") {\r\n this.viewPublications(idObject)\r\n } else if (service === \"accoes\" && object === \"publicacao\") {\r\n this.viewPublicationDetail(idObject)\r\n }\r\n \r\n\r\n\r\n\r\n /*switch (service) {\r\n case \"events\":\r\n this.router.navigate(['/home/', service, idObject, 'home']);\r\n break;\r\n case \"agenda\":\r\n this.router.navigate(['/home/', service, idObject, 'home']);\r\n break;\r\n case \"gabinete-digital\":\r\n this.router.navigate(['/home/', service]);\r\n break;\r\n case \"gabinete-digital-expediente\":\r\n this.router.navigate(['/home/gabinete-digital/', object, idObject, 'home']);\r\n break;\r\n case \"\": {\r\n\r\n if(publicationId && processId != null) {\r\n this.viewPublicationDetail(publicationId,processId)\r\n }\r\n if (folder.ProcessId != null) {\r\n this.viewPublications(folder)\r\n }\r\n }\r\n\r\n default:\r\n this.router.navigate(['/home/']);\r\n }*/\r\n\r\n\r\n\r\n },\r\n );\r\n }\r\n\r\n async localNotificationPresent(notification) {\r\n\r\n LocalNotificationAction.\r\n\r\n LocalNotifications.schedule({\r\n notifications: [\r\n {\r\n title: notification.title,\r\n body: notification.body,\r\n id: 1,\r\n schedule: { at: new Date(Date.now() + 1000) },\r\n sound: null,\r\n attachments: null,\r\n actionTypeId: \"\",\r\n extra: null,\r\n foreground: true,\r\n }\r\n ]\r\n });\r\n }\r\n\r\n async viewEventDetail(eventId:any) {\r\n console.log(this.profile);\r\n \r\n const modal = await this.modalController.create({\r\n component: ViewEventPage,\r\n componentProps:{\r\n eventId: eventId,\r\n },\r\n cssClass: 'modal',\r\n backdropDismiss: false\r\n });\r\n await modal.present();\r\n modal.onDidDismiss().then((res)=>{\r\n if(res){\r\n console.log(res);\r\n //this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);\r\n }\r\n });\r\n }\r\n\r\n async viewExpedientDetail(serialNumber:any) {\r\n console.log(this.profile);\r\n \r\n const modal = await this.modalController.create({\r\n component: ExpedienteDetailPage,\r\n componentProps:{\r\n serialNumber: serialNumber,\r\n profile: this.profile,\r\n },\r\n cssClass: 'modal',\r\n backdropDismiss: false\r\n });\r\n await modal.present();\r\n modal.onDidDismiss().then((res)=>{\r\n if(res){\r\n console.log(res);\r\n }\r\n });\r\n }\r\n\r\n\r\n\r\n async viewPublicationDetail(folderId) {\r\n const modal = await this.modalController.create({\r\n component: PublicationDetailPage,\r\n componentProps: {\r\n folderId: folderId,\r\n },\r\n cssClass: 'publication-detail',\r\n backdropDismiss: false\r\n });\r\n await modal.present();\r\n modal.onDidDismiss();\r\n }\r\n\r\n async viewPublications(folderId) {\r\n\r\n\r\n const modal = await this.modalController.create({\r\n component: ViewPublicationsPage,\r\n /* enterAnimation,\r\n leaveAnimation, */\r\n componentProps: {\r\n item: folderId,\r\n },\r\n cssClass: 'new-action',\r\n backdropDismiss: false\r\n });\r\n await modal.present();\r\n modal.onDidDismiss();\r\n }\r\n\r\n}\r\n","import { Injectable } from '@angular/core';\r\nimport { AuthService } from '../services/auth.service';\r\n\r\n@Injectable({\r\n providedIn: 'root'\r\n})\r\nexport class UserDataResolver{ \r\n constructor(private authService: AuthService){}\r\n\r\n resolve(){\r\n return this.authService.getUserData();\r\n }\r\n}"]}
+>>>>>>> origin/feature/pushNotifications
diff --git a/package-lock.json b/package-lock.json
index 7b0374f67..7c7b7654c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3072,11 +3072,6 @@
"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
},
- "@types/date-fns": {
- "version": "0.0.2",
- "resolved": "https://registry.npmjs.org/@types/date-fns/-/date-fns-0.0.2.tgz",
- "integrity": "sha1-px0uCyq1e7jegchD5ez24WF3m4w="
- },
"@types/glob": {
"version": "7.1.3",
"resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz",
@@ -3521,34 +3516,6 @@
}
}
},
- "angular2-calendar": {
- "version": "0.3.7",
- "resolved": "https://registry.npmjs.org/angular2-calendar/-/angular2-calendar-0.3.7.tgz",
- "integrity": "sha1-1hrZoQWNbjdrpOWs5C3QDaoNVb4=",
- "requires": {
- "@ng-bootstrap/ng-bootstrap": "^1.0.0-alpha.0",
- "@types/date-fns": "0.0.2",
- "calendar-utils": "0.0.35",
- "date-fns": "^1.3.0"
- },
- "dependencies": {
- "@ng-bootstrap/ng-bootstrap": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-1.1.2.tgz",
- "integrity": "sha512-lPB4WdFk3s4k1OMKiZsmbxSE3r8qBFapov0HudEVi8HYkm6LBxZmWqy9I6KAC9NnhVUVIYnCixvRSNwOQvIwwA=="
- },
- "calendar-utils": {
- "version": "0.0.35",
- "resolved": "https://registry.npmjs.org/calendar-utils/-/calendar-utils-0.0.35.tgz",
- "integrity": "sha1-BqlQdhAFRFyH8YpotAMhZIkcV5s="
- },
- "date-fns": {
- "version": "1.30.1",
- "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-1.30.1.tgz",
- "integrity": "sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw=="
- }
- }
- },
"ansi": {
"version": "0.3.1",
"resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz",
@@ -16077,6 +16044,11 @@
"pify": "^4.0.1"
}
},
+ "wordcloud": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/wordcloud/-/wordcloud-1.1.2.tgz",
+ "integrity": "sha512-YTaVrHbCM44xslcw5QOxTKT3v0vLhpNsgVb8vGH9NocO8aIugt0Rw+WhkzgVyo5E6vv7tJO5ISb/ujUO7mBAyw=="
+ },
"worker-farm": {
"version": "1.7.0",
"resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz",
diff --git a/package.json b/package.json
index 96bd8f2f1..4c1b25636 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,6 @@
"@logisticinfotech/ionic4-datepicker": "^1.4.4",
"angular-calendar": "^0.28.22",
"angular-tag-cloud-module": "^5.2.2",
- "angular2-calendar": "^0.3.7",
"cordova-ios": "6.1.0",
"cordova-plugin-file": "^6.0.2",
"cordova-plugin-filepath": "^1.5.8",
@@ -59,6 +58,7 @@
"sharp": "^0.25.4",
"socket.io-client": "^2.3.0",
"tslib": "^1.10.0",
+ "wordcloud": "^1.1.2",
"zone.js": "~0.10.2"
},
"devDependencies": {
diff --git a/src/app/models/top-search.ts b/src/app/models/top-search.ts
new file mode 100644
index 000000000..5ed821b80
--- /dev/null
+++ b/src/app/models/top-search.ts
@@ -0,0 +1,8 @@
+export class TopSearch {
+
+ Documents: {
+ Text: string;
+ Hits: number;
+ }[] = [];
+
+}
diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html
index 1b9ecc95a..77568cc28 100644
--- a/src/app/pages/agenda/agenda.page.html
+++ b/src/app/pages/agenda/agenda.page.html
@@ -35,16 +35,27 @@
-
-
-
-
+
+
-
-