src/Notes-master/Notes-master/.idea/misc.xml

@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" default="true">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>

src/Notes-master/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties

@@ -1,4 +1,4 @@
-#Thu Nov 13 18:48:31 CST 2025
+#Fri Nov 14 08:00:53 CST 2025
 net.micode.notes.app-main-34\:/color/primary_text_dark.xml=D\:\\git-test\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
 net.micode.notes.app-main-34\:/color/secondary_text_dark.xml=D\:\\git-test\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
 net.micode.notes.app-main-34\:/drawable-hdpi/bg_btn_set_color.png=D\:\\git-test\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat

src/Notes-master/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties

@@ -1,4 +1,4 @@
-#Thu Nov 13 18:48:31 CST 2025
+#Fri Nov 14 08:00:54 CST 2025
 net.micode.notes.app-main-5\:/color/primary_text_dark.xml=D\:\\git-test\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\color\\primary_text_dark.xml
 net.micode.notes.app-main-5\:/color/secondary_text_dark.xml=D\:\\git-test\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\color\\secondary_text_dark.xml
 net.micode.notes.app-main-5\:/drawable-hdpi/bg_btn_set_color.png=D\:\\git-test\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_btn_set_color.png

src/Notes-master/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt

@@ -1,4 +1,4 @@
-#Thu Nov 13 19:07:01 CST 2025
+#Fri Nov 14 08:01:04 CST 2025
 base.0=D\:\\git-test\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
 path.0=classes.dex
 renamed.0=classes.dex

src/Notes-master/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json

@@ -2190,10 +2190,10 @@
                     "from": {
                         "startLines": "18",
                         "startColumns": "4",
-                        "startOffsets": "712",
+                        "startOffsets": "730",
                         "endLines": "21",
                         "endColumns": "19",
-                        "endOffsets": "817"
+                        "endOffsets": "838"
                     },
                     "to": {
                         "startLines": "2",
@@ -2243,10 +2243,10 @@
                     "from": {
                         "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
                         "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",
-                        "startOffsets": "6523,3591,3525,3452,3402,843,883,931,6073,6118,6469,6419,1215,3851,3919,3792,3726,3663,4581,4521,4458,4051,2973,1385,1438,4105,1784,6175,3343,3130,1894,2175,2421,1947,2913,2860,2809,2614,2566,2472,2520,2660,2707,2218,3284,2757,3173,2132,2374,2318,2263,3075,2088,3033,1997,2038,3225,1334,1639,1735,1592,1688,1545,1500,1164,1111,4956,4897,5097,5998,5408,5339,5472,5550,5733,5660,5031,5284,5154,5219,4848,5837,5920,6381,6274,6226,6319,1277,3996,4399,4694,4636,4761,4351,4306,4258,4207,979,1045",
+                        "startOffsets": "6645,3663,3596,3522,3471,862,903,952,6185,6231,6590,6539,1241,3927,3996,3867,3800,3736,4670,4609,4545,4130,3034,1414,1468,4185,1821,6289,3411,3194,1933,2220,2471,1987,2973,2919,2867,2668,2619,2523,2572,2715,2763,2264,3351,2814,3238,2176,2423,2366,2310,3138,2131,3095,2038,2080,3291,1362,1673,1771,1625,1723,1577,1531,1189,1135,5052,4992,5195,6108,5511,5441,5576,5655,5840,5766,5128,5385,5253,5319,4942,5945,6029,6500,6391,6342,6437,1304,4074,4485,4785,4726,4853,4436,4390,4341,4289,1001,1068",
                         "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
                         "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
-                        "endOffsets": "6695,3658,3586,3520,3447,878,926,974,6113,6170,6518,6464,1272,3914,3991,3846,3787,3721,4631,4576,4516,4100,3028,1433,1495,4184,1859,6220,3397,3168,1942,2213,2467,1992,2968,2908,2855,2655,2609,2515,2561,2702,2752,2258,3338,2804,3220,2170,2416,2369,2313,3125,2127,3070,2033,2083,3279,1380,1683,1779,1634,1730,1587,1540,1210,1159,5026,4951,5149,6067,5467,5403,5545,5655,5832,5728,5092,5334,5214,5279,4892,5915,5993,6414,6314,6269,6376,1329,4046,4453,4756,4689,4818,4394,4346,4301,4253,1040,1106"
+                        "endOffsets": "6819,3730,3657,3590,3516,897,946,995,6225,6283,6639,6584,1298,3990,4068,3921,3861,3794,4720,4664,4603,4179,3089,1462,1525,4264,1896,6334,3465,3232,1981,2258,2517,2032,3028,2967,2913,2709,2662,2566,2613,2757,2808,2304,3405,2861,3285,2214,2465,2417,2360,3188,2170,3132,2074,2125,3345,1408,1717,1815,1667,1765,1619,1571,1235,1183,5122,5046,5247,6177,5570,5505,5649,5760,5939,5834,5189,5435,5313,5379,4986,6023,6102,6533,6431,6385,6494,1356,4124,4539,4847,4779,4910,4479,4430,4384,4335,1062,1129"
                     },
                     "to": {
                         "startLines": "10,40,41,42,43,44,45,46,52,53,57,58,59,61,62,63,64,65,66,67,68,70,71,72,73,74,75,76,78,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,163,164,165,166,167,168,169,170,171,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,194,195,197,198,199,200,201,202,203,204,205,206,207",
@@ -2548,10 +2548,10 @@
                     "from": {
                         "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
                         "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",
-                        "startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029",
+                        "startOffsets": "6653,3566,3499,3425,3374,846,887,936,6195,6241,6598,6547,1225,3938,4007,3878,3812,3748,4682,4621,4557,4141,2937,1398,1452,4196,3640,6299,3314,3097,1836,2123,2374,1890,2876,2822,2770,2571,2522,2426,2475,2618,2666,2167,3254,2717,3141,2079,2326,2269,2213,3041,2034,2998,1941,1983,3194,1346,1657,1755,1609,1707,1561,1515,1173,1119,5064,5004,5207,6120,5523,5453,5588,5667,5852,5778,5140,5397,5265,5331,4954,5957,6041,6508,6399,6350,6445,1288,4085,4497,4797,4738,4865,4448,4402,4353,4301,985,1052",
                         "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
                         "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
-                        "endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090"
+                        "endOffsets": "6827,3634,3560,3493,3419,881,930,979,6235,6293,6647,6592,1282,4001,4079,3932,3872,3806,4732,4676,4615,4190,2992,1446,1509,4276,3716,6344,3368,3135,1884,2161,2420,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3308,2764,3188,2117,2368,2320,2263,3091,2073,3035,1977,2028,3248,1392,1701,1799,1651,1749,1603,1555,1219,1167,5134,5058,5259,6189,5582,5517,5661,5772,5951,5846,5201,5447,5325,5391,4998,6035,6114,6541,6439,6393,6502,1340,4135,4551,4859,4791,4922,4491,4442,4396,4347,1046,1113"
                     },
                     "to": {
                         "startLines": "10,40,41,42,43,44,45,46,52,53,57,58,59,61,62,63,64,65,66,67,68,70,71,72,73,74,75,76,78,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,163,164,165,166,167,168,169,170,171,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,194,195,197,198,199,200,201,202,203,204,205,206,207",
@@ -2567,10 +2567,10 @@
                     "from": {
                         "startLines": "18",
                         "startColumns": "4",
-                        "startOffsets": "712",
+                        "startOffsets": "730",
                         "endLines": "21",
                         "endColumns": "19",
-                        "endOffsets": "817"
+                        "endOffsets": "838"
                     },
                     "to": {
                         "startLines": "2",
@@ -3019,9 +3019,9 @@
                     "from": {
                         "startLines": "18",
                         "startColumns": "4",
-                        "startOffsets": "712",
+                        "startOffsets": "730",
                         "endColumns": "56",
-                        "endOffsets": "764"
+                        "endOffsets": "782"
                     },
                     "to": {
                         "startLines": "887",
@@ -3053,9 +3053,9 @@
                     "from": {
                         "startLines": "19,20,21,22,18",
                         "startColumns": "4,4,4,4,4",
-                        "startOffsets": "764,816,869,922,712",
+                        "startOffsets": "783,836,890,944,730",
                         "endColumns": "51,52,52,51,51",
-                        "endOffsets": "811,864,917,969,759"
+                        "endOffsets": "830,884,938,991,777"
                     },
                     "to": {
                         "startLines": "1680,1681,1682,1683,1684",
@@ -3104,10 +3104,10 @@
                     "from": {
                         "startLines": "129,73,76,75,74,19,21,22,119,120,128,127,27,82,83,81,80,79,95,94,93,85,40,39,65,30,31,86,42,77,121,72,68,43,49,54,44,64,63,62,58,57,55,56,59,60,50,71,61,69,48,53,52,51,67,47,66,45,46,70,29,35,37,34,36,33,32,26,25,102,101,105,117,110,109,111,112,114,113,103,104,108,106,107,100,115,116,126,124,123,125,28,84,92,20,97,96,98,91,90,89,88,23,24",
                         "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",
-                        "startOffsets": "8097,3987,4248,4152,4083,827,959,1011,7595,7644,8039,7988,1371,4702,4796,4631,4547,4464,5663,5580,5478,4972,2093,2042,3486,1575,1628,5033,2186,4331,7707,3916,3671,2245,2560,2861,2303,3415,3354,3297,3075,3023,2920,2973,3125,3175,2607,3850,3235,3720,2513,2806,2718,2660,3609,2463,3564,2360,2403,3783,1520,1839,1947,1792,1894,1736,1688,1316,1263,6119,6052,6360,7498,6724,6643,6798,6887,7129,7050,6203,6278,6584,6424,6504,5997,7273,7395,7947,7820,7763,7873,1455,4904,5392,870,5798,5729,5878,5333,5278,5216,5156,1063,1173",
+                        "startOffsets": "8226,4060,4324,4227,4157,846,980,1033,7714,7764,8167,8115,1398,4784,4879,4712,4627,4543,5758,5674,5571,5057,2133,2081,3551,1605,1659,5119,2228,4408,7828,3988,3739,2288,2609,2915,2347,3479,3417,3359,3133,3080,2975,3029,3184,3235,2657,3921,3296,3789,2561,2859,2770,2711,3676,2510,3630,2405,2449,3853,1549,1874,1984,1826,1930,1769,1720,1342,1288,6221,6153,6465,7615,6834,6752,6909,6999,7243,7163,6306,6382,6692,6530,6611,6097,7388,7511,8073,7944,7886,7998,1483,4988,5484,890,5895,5825,5976,5424,5368,5305,5244,1086,1197",
                         "endLines": "133,73,76,75,74,19,21,22,119,120,128,127,27,82,83,81,80,79,95,94,93,85,40,39,65,30,31,86,42,77,121,72,68,43,49,54,44,64,63,62,58,57,55,56,59,60,50,71,61,69,48,53,52,51,67,47,66,45,46,70,29,35,37,34,36,33,32,26,25,102,101,105,117,110,109,111,112,114,113,103,104,108,106,107,100,115,116,126,124,123,125,28,84,92,20,97,96,98,91,90,89,88,23,24",
                         "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,65,79,68,93,58,54,61,59,109,89",
-                        "endOffsets": "8501,4078,4326,4243,4147,865,1006,1058,7639,7702,8092,8034,1450,4791,4899,4697,4626,4542,5724,5658,5575,5028,2150,2088,3559,1623,1683,5133,2240,4428,7757,3982,3715,2298,2602,2915,2355,3481,3410,3349,3120,3070,2968,3018,3170,3230,2655,3911,3292,3778,2555,2856,2801,2713,3666,2508,3604,2398,2458,3845,1570,1889,1995,1834,1942,1787,1731,1366,1311,6198,6114,6419,7589,6793,6719,6882,7045,7268,7124,6273,6355,6638,6499,6579,6047,7390,7493,7983,7868,7815,7942,1515,4967,5473,931,5873,5793,5967,5387,5328,5273,5211,1168,1258"
+                        "endOffsets": "8634,4151,4402,4318,4221,884,1027,1080,7758,7822,8220,8161,1477,4873,4982,4778,4706,4621,5819,5752,5668,5113,2190,2127,3624,1653,1714,5219,2282,4505,7878,4054,3783,2341,2651,2969,2399,3545,3473,3411,3178,3127,3023,3074,3229,3290,2705,3982,3353,3847,2603,2909,2853,2764,3733,2555,3670,2443,2504,3915,1599,1924,2032,1868,1978,1820,1763,1392,1336,6300,6215,6524,7706,6903,6828,6993,7157,7382,7237,6376,6459,6746,6605,6686,6147,7505,7609,8109,7992,7938,8067,1543,5051,5565,951,5970,5889,6065,5478,5418,5362,5299,1191,1282"
                     },
                     "to": {
                         "startLines": "1876,1908,1909,1910,1911,1913,1914,1915,1923,1924,1929,1930,1931,1936,1937,1938,1939,1940,1941,1942,1943,1947,1948,1949,1950,1951,1952,1953,1954,1955,1957,1959,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022,2023,2024,2025,2026,2095,2096,2097,2098,2099,2100,2101,2102,2103,2109,2110,2111,2112,2113,2114,2115,2116,2117,2118,2119,2120,2121,2122,2123,2124,2125,2126,2127,2128,2129,2131,2137,2141,2142,2143,2144,2145,2146,2147,2148,2149,2150,2151,2152",
@@ -3216,10 +3216,10 @@
                     "from": {
                         "startLines": "19,26",
                         "startColumns": "4,4",
-                        "startOffsets": "739,1047",
+                        "startOffsets": "758,1073",
                         "endLines": "24,29",
                         "endColumns": "19,19",
-                        "endOffsets": "1041,1162"
+                        "endOffsets": "1065,1191"
                     },
                     "to": {
                         "startLines": "2,8",
@@ -3254,10 +3254,10 @@
                     "from": {
                         "startLines": "50,55,64,60,22,26,30,35,40,18,45",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860",
+                        "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905",
                         "endLines": "53,58,67,62,25,29,33,38,43,21,48",
                         "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056"
+                        "endOffsets": "2314,2531,2910,2696,1098,1287,1476,1685,1897,911,2104"
                     },
                     "to": {
                         "startLines": "5558,5562,5660,5664,6381,6385,6389,6393,6397,6401,6405",

src/Notes-master/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json

@@ -42,10 +42,10 @@
                     "from": {
                         "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
                         "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",
-                        "startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029",
+                        "startOffsets": "6653,3566,3499,3425,3374,846,887,936,6195,6241,6598,6547,1225,3938,4007,3878,3812,3748,4682,4621,4557,4141,2937,1398,1452,4196,3640,6299,3314,3097,1836,2123,2374,1890,2876,2822,2770,2571,2522,2426,2475,2618,2666,2167,3254,2717,3141,2079,2326,2269,2213,3041,2034,2998,1941,1983,3194,1346,1657,1755,1609,1707,1561,1515,1173,1119,5064,5004,5207,6120,5523,5453,5588,5667,5852,5778,5140,5397,5265,5331,4954,5957,6041,6508,6399,6350,6445,1288,4085,4497,4797,4738,4865,4448,4402,4353,4301,985,1052",
                         "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
                         "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
-                        "endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090"
+                        "endOffsets": "6827,3634,3560,3493,3419,881,930,979,6235,6293,6647,6592,1282,4001,4079,3932,3872,3806,4732,4676,4615,4190,2992,1446,1509,4276,3716,6344,3368,3135,1884,2161,2420,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3308,2764,3188,2117,2368,2320,2263,3091,2073,3035,1977,2028,3248,1392,1701,1799,1651,1749,1603,1555,1219,1167,5134,5058,5259,6189,5582,5517,5661,5772,5951,5846,5201,5447,5325,5391,4998,6035,6114,6541,6439,6393,6502,1340,4135,4551,4859,4791,4922,4491,4442,4396,4347,1046,1113"
                     },
                     "to": {
                         "startLines": "10,40,41,42,43,44,45,46,52,53,57,58,59,61,62,63,64,65,66,67,68,70,71,72,73,74,75,76,78,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,163,164,165,166,167,168,169,170,171,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,194,195,197,198,199,200,201,202,203,204,205,206,207",
@@ -61,10 +61,10 @@
                     "from": {
                         "startLines": "18",
                         "startColumns": "4",
-                        "startOffsets": "712",
+                        "startOffsets": "730",
                         "endLines": "21",
                         "endColumns": "19",
-                        "endOffsets": "817"
+                        "endOffsets": "838"
                     },
                     "to": {
                         "startLines": "2",

src/Notes-master/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json

@@ -27,10 +27,10 @@
                     "from": {
                         "startLines": "18",
                         "startColumns": "4",
-                        "startOffsets": "712",
+                        "startOffsets": "730",
                         "endLines": "21",
                         "endColumns": "19",
-                        "endOffsets": "817"
+                        "endOffsets": "838"
                     },
                     "to": {
                         "startLines": "2",
@@ -80,10 +80,10 @@
                     "from": {
                         "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
                         "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",
-                        "startOffsets": "6523,3591,3525,3452,3402,843,883,931,6073,6118,6469,6419,1215,3851,3919,3792,3726,3663,4581,4521,4458,4051,2973,1385,1438,4105,1784,6175,3343,3130,1894,2175,2421,1947,2913,2860,2809,2614,2566,2472,2520,2660,2707,2218,3284,2757,3173,2132,2374,2318,2263,3075,2088,3033,1997,2038,3225,1334,1639,1735,1592,1688,1545,1500,1164,1111,4956,4897,5097,5998,5408,5339,5472,5550,5733,5660,5031,5284,5154,5219,4848,5837,5920,6381,6274,6226,6319,1277,3996,4399,4694,4636,4761,4351,4306,4258,4207,979,1045",
+                        "startOffsets": "6645,3663,3596,3522,3471,862,903,952,6185,6231,6590,6539,1241,3927,3996,3867,3800,3736,4670,4609,4545,4130,3034,1414,1468,4185,1821,6289,3411,3194,1933,2220,2471,1987,2973,2919,2867,2668,2619,2523,2572,2715,2763,2264,3351,2814,3238,2176,2423,2366,2310,3138,2131,3095,2038,2080,3291,1362,1673,1771,1625,1723,1577,1531,1189,1135,5052,4992,5195,6108,5511,5441,5576,5655,5840,5766,5128,5385,5253,5319,4942,5945,6029,6500,6391,6342,6437,1304,4074,4485,4785,4726,4853,4436,4390,4341,4289,1001,1068",
                         "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
                         "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
-                        "endOffsets": "6695,3658,3586,3520,3447,878,926,974,6113,6170,6518,6464,1272,3914,3991,3846,3787,3721,4631,4576,4516,4100,3028,1433,1495,4184,1859,6220,3397,3168,1942,2213,2467,1992,2968,2908,2855,2655,2609,2515,2561,2702,2752,2258,3338,2804,3220,2170,2416,2369,2313,3125,2127,3070,2033,2083,3279,1380,1683,1779,1634,1730,1587,1540,1210,1159,5026,4951,5149,6067,5467,5403,5545,5655,5832,5728,5092,5334,5214,5279,4892,5915,5993,6414,6314,6269,6376,1329,4046,4453,4756,4689,4818,4394,4346,4301,4253,1040,1106"
+                        "endOffsets": "6819,3730,3657,3590,3516,897,946,995,6225,6283,6639,6584,1298,3990,4068,3921,3861,3794,4720,4664,4603,4179,3089,1462,1525,4264,1896,6334,3465,3232,1981,2258,2517,2032,3028,2967,2913,2709,2662,2566,2613,2757,2808,2304,3405,2861,3285,2214,2465,2417,2360,3188,2170,3132,2074,2125,3345,1408,1717,1815,1667,1765,1619,1571,1235,1183,5122,5046,5247,6177,5570,5505,5649,5760,5939,5834,5189,5435,5313,5379,4986,6023,6102,6533,6431,6385,6494,1356,4124,4539,4847,4779,4910,4479,4430,4384,4335,1062,1129"
                     },
                     "to": {
                         "startLines": "10,40,41,42,43,44,45,46,52,53,57,58,59,61,62,63,64,65,66,67,68,70,71,72,73,74,75,76,78,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,163,164,165,166,167,168,169,170,171,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,194,195,197,198,199,200,201,202,203,204,205,206,207",

src/Notes-master/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json

@@ -65,9 +65,9 @@
                     "from": {
                         "startLines": "18",
                         "startColumns": "4",
-                        "startOffsets": "712",
+                        "startOffsets": "730",
                         "endColumns": "56",
-                        "endOffsets": "764"
+                        "endOffsets": "782"
                     },
                     "to": {
                         "startLines": "887",
@@ -99,9 +99,9 @@
                     "from": {
                         "startLines": "19,20,21,22,18",
                         "startColumns": "4,4,4,4,4",
-                        "startOffsets": "764,816,869,922,712",
+                        "startOffsets": "783,836,890,944,730",
                         "endColumns": "51,52,52,51,51",
-                        "endOffsets": "811,864,917,969,759"
+                        "endOffsets": "830,884,938,991,777"
                     },
                     "to": {
                         "startLines": "1680,1681,1682,1683,1684",
@@ -150,10 +150,10 @@
                     "from": {
                         "startLines": "129,73,76,75,74,19,21,22,119,120,128,127,27,82,83,81,80,79,95,94,93,85,40,39,65,30,31,86,42,77,121,72,68,43,49,54,44,64,63,62,58,57,55,56,59,60,50,71,61,69,48,53,52,51,67,47,66,45,46,70,29,35,37,34,36,33,32,26,25,102,101,105,117,110,109,111,112,114,113,103,104,108,106,107,100,115,116,126,124,123,125,28,84,92,20,97,96,98,91,90,89,88,23,24",
                         "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",
-                        "startOffsets": "8097,3987,4248,4152,4083,827,959,1011,7595,7644,8039,7988,1371,4702,4796,4631,4547,4464,5663,5580,5478,4972,2093,2042,3486,1575,1628,5033,2186,4331,7707,3916,3671,2245,2560,2861,2303,3415,3354,3297,3075,3023,2920,2973,3125,3175,2607,3850,3235,3720,2513,2806,2718,2660,3609,2463,3564,2360,2403,3783,1520,1839,1947,1792,1894,1736,1688,1316,1263,6119,6052,6360,7498,6724,6643,6798,6887,7129,7050,6203,6278,6584,6424,6504,5997,7273,7395,7947,7820,7763,7873,1455,4904,5392,870,5798,5729,5878,5333,5278,5216,5156,1063,1173",
+                        "startOffsets": "8226,4060,4324,4227,4157,846,980,1033,7714,7764,8167,8115,1398,4784,4879,4712,4627,4543,5758,5674,5571,5057,2133,2081,3551,1605,1659,5119,2228,4408,7828,3988,3739,2288,2609,2915,2347,3479,3417,3359,3133,3080,2975,3029,3184,3235,2657,3921,3296,3789,2561,2859,2770,2711,3676,2510,3630,2405,2449,3853,1549,1874,1984,1826,1930,1769,1720,1342,1288,6221,6153,6465,7615,6834,6752,6909,6999,7243,7163,6306,6382,6692,6530,6611,6097,7388,7511,8073,7944,7886,7998,1483,4988,5484,890,5895,5825,5976,5424,5368,5305,5244,1086,1197",
                         "endLines": "133,73,76,75,74,19,21,22,119,120,128,127,27,82,83,81,80,79,95,94,93,85,40,39,65,30,31,86,42,77,121,72,68,43,49,54,44,64,63,62,58,57,55,56,59,60,50,71,61,69,48,53,52,51,67,47,66,45,46,70,29,35,37,34,36,33,32,26,25,102,101,105,117,110,109,111,112,114,113,103,104,108,106,107,100,115,116,126,124,123,125,28,84,92,20,97,96,98,91,90,89,88,23,24",
                         "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,65,79,68,93,58,54,61,59,109,89",
-                        "endOffsets": "8501,4078,4326,4243,4147,865,1006,1058,7639,7702,8092,8034,1450,4791,4899,4697,4626,4542,5724,5658,5575,5028,2150,2088,3559,1623,1683,5133,2240,4428,7757,3982,3715,2298,2602,2915,2355,3481,3410,3349,3120,3070,2968,3018,3170,3230,2655,3911,3292,3778,2555,2856,2801,2713,3666,2508,3604,2398,2458,3845,1570,1889,1995,1834,1942,1787,1731,1366,1311,6198,6114,6419,7589,6793,6719,6882,7045,7268,7124,6273,6355,6638,6499,6579,6047,7390,7493,7983,7868,7815,7942,1515,4967,5473,931,5873,5793,5967,5387,5328,5273,5211,1168,1258"
+                        "endOffsets": "8634,4151,4402,4318,4221,884,1027,1080,7758,7822,8220,8161,1477,4873,4982,4778,4706,4621,5819,5752,5668,5113,2190,2127,3624,1653,1714,5219,2282,4505,7878,4054,3783,2341,2651,2969,2399,3545,3473,3411,3178,3127,3023,3074,3229,3290,2705,3982,3353,3847,2603,2909,2853,2764,3733,2555,3670,2443,2504,3915,1599,1924,2032,1868,1978,1820,1763,1392,1336,6300,6215,6524,7706,6903,6828,6993,7157,7382,7237,6376,6459,6746,6605,6686,6147,7505,7609,8109,7992,7938,8067,1543,5051,5565,951,5970,5889,6065,5478,5418,5362,5299,1191,1282"
                     },
                     "to": {
                         "startLines": "1876,1908,1909,1910,1911,1913,1914,1915,1923,1924,1929,1930,1931,1936,1937,1938,1939,1940,1941,1942,1943,1947,1948,1949,1950,1951,1952,1953,1954,1955,1957,1959,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022,2023,2024,2025,2026,2095,2096,2097,2098,2099,2100,2101,2102,2103,2109,2110,2111,2112,2113,2114,2115,2116,2117,2118,2119,2120,2121,2122,2123,2124,2125,2126,2127,2128,2129,2131,2137,2141,2142,2143,2144,2145,2146,2147,2148,2149,2150,2151,2152",
@@ -262,10 +262,10 @@
                     "from": {
                         "startLines": "19,26",
                         "startColumns": "4,4",
-                        "startOffsets": "739,1047",
+                        "startOffsets": "758,1073",
                         "endLines": "24,29",
                         "endColumns": "19,19",
-                        "endOffsets": "1041,1162"
+                        "endOffsets": "1065,1191"
                     },
                     "to": {
                         "startLines": "2,8",
@@ -300,10 +300,10 @@
                     "from": {
                         "startLines": "50,55,64,60,22,26,30,35,40,18,45",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860",
+                        "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905",
                         "endLines": "53,58,67,62,25,29,33,38,43,21,48",
                         "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056"
+                        "endOffsets": "2314,2531,2910,2696,1098,1287,1476,1685,1897,911,2104"
                     },
                     "to": {
                         "startLines": "5558,5562,5660,5664,6381,6385,6389,6393,6397,6401,6405",

src/Notes-master/Notes-master/app/build/intermediates/runtime_symbol_list/debug/R.txt

@@ -4053,16 +4053,16 @@ int string side_sheet_behavior 0x7f1100f8
 int string status_bar_notification_info_overflow 0x7f1100f9
 int string success_sdcard_export 0x7f1100fa
 int string success_sync_account 0x7f1100fb
-int string sync_notification_channel_desc 0x7f110105
-int string sync_progress_init_list 0x7f1100fc
-int string sync_progress_login 0x7f1100fd
-int string sync_progress_syncing 0x7f1100fe
-int string ticker_cancel 0x7f1100ff
-int string ticker_fail 0x7f110100
-int string ticker_success 0x7f110101
-int string ticker_syncing 0x7f110102
-int string widget_havenot_content 0x7f110103
-int string widget_under_visit_mode 0x7f110104
+int string sync_notification_channel_desc 0x7f1100fc
+int string sync_progress_init_list 0x7f1100fd
+int string sync_progress_login 0x7f1100fe
+int string sync_progress_syncing 0x7f1100ff
+int string ticker_cancel 0x7f110100
+int string ticker_fail 0x7f110101
+int string ticker_success 0x7f110102
+int string ticker_syncing 0x7f110103
+int string widget_havenot_content 0x7f110104
+int string widget_under_visit_mode 0x7f110105
 int style AlertDialog_AppCompat 0x7f120000
 int style AlertDialog_AppCompat_Light 0x7f120001
 int style Animation_AppCompat_Dialog 0x7f120002