diff --git a/.gradle/7.5/checksums/checksums.lock b/.gradle/7.5/checksums/checksums.lock
index 60ac4eb..0f8d754 100644
Binary files a/.gradle/7.5/checksums/checksums.lock and b/.gradle/7.5/checksums/checksums.lock differ
diff --git a/.gradle/7.5/checksums/sha1-checksums.bin b/.gradle/7.5/checksums/sha1-checksums.bin
index 976ee9f..0d68e38 100644
Binary files a/.gradle/7.5/checksums/sha1-checksums.bin and b/.gradle/7.5/checksums/sha1-checksums.bin differ
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index a0de2a1..239e8d2 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="Embedded JDK" />
+        <option name="gradleJvm" value="temurin-17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index fdbe460..e9092cf 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+<<<<<<< HEAD:.idea/misc.xml
   <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
+=======
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17_PREVIEW" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
+>>>>>>> master:src/.idea/misc.xml
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 7fb321c..a54e1c7 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -88,6 +88,7 @@
 >>>>>>> local
 =======
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+<<<<<<< HEAD
       <change beforePath="$PROJECT_DIR$/src/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/.idea/compiler.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/.idea/deploymentTargetDropDown.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/.idea/deploymentTargetDropDown.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/.idea/gradle.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/.idea/gradle.xml" afterDir="false" />
@@ -110,13 +111,15 @@
       <change beforePath="$PROJECT_DIR$/src/local.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/local.properties" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/minote.iml" beforeDir="false" afterPath="$PROJECT_DIR$/src/minote.iml" afterDir="false" />
 >>>>>>> 97f59e709a754d9ac92f018b602c051baead5aac
+=======
+>>>>>>> master
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[C:\Users\蔡玉祥\.android\avd\Pixel_2_API_30.avd]" />
+  <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[b63e5c7f]" />
   <component name="ExternalProjectsData">
     <projectState path="$PROJECT_DIR$">
       <ProjectState />
@@ -136,21 +139,20 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;ASKED_ADD_EXTERNAL_FILES&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.cidr.known.project.marker&quot;: &quot;true&quot;,
-    &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
-    &quot;cidr.known.project.marker&quot;: &quot;true&quot;,
-    &quot;last_opened_file_path&quot;: &quot;D:/TOUGE/gitProject&quot;,
-    &quot;project.structure.last.edited&quot;: &quot;Modules&quot;,
-    &quot;project.structure.proportion&quot;: &quot;0.17&quot;,
-    &quot;project.structure.side.proportion&quot;: &quot;0.2&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;preferences.customizations&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "ASKED_ADD_EXTERNAL_FILES": "true",
+    "RunOnceActivity.OpenProjectViewOnStart": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "RunOnceActivity.cidr.known.project.marker": "true",
+    "cidr.known.project.marker": "true",
+    "last_opened_file_path": "D:/softwareengineering/minote/src/app",
+    "project.structure.last.edited": "SDK",
+    "project.structure.proportion": "0.17",
+    "project.structure.side.proportion": "0.2",
+    "settings.editor.selected.configurable": "preferences.customizations"
   }
-}</component>
+}]]></component>
   <component name="RunManager" selected="Android App.app">
     <configuration name="app" type="AndroidRunConfigurationType" factoryName="Android App">
       <module name="minote.app.main" />
@@ -284,12 +286,51 @@
       <option name="project" value="LOCAL" />
       <updated>1681312464473</updated>
     </task>
-    <option name="localTasksCounter" value="7" />
+    <task id="LOCAL-00007" summary="庞浩的注释">
+      <created>1681747296097</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1681747296097</updated>
+    </task>
+    <task id="LOCAL-00008" summary="庞浩的注释">
+      <created>1681747316246</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1681747316246</updated>
+    </task>
+    <option name="localTasksCounter" value="9" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
     <option name="TAB_STATES">
       <map>
+        <entry key="0cba35e6-7d90-42f0-b34c-310376a71413">
+          <value>
+            <State>
+              <option name="SHOW_ONLY_AFFECTED_CHANGES" value="true" />
+              <option name="FILTERS">
+                <map>
+                  <entry key="branch">
+                    <value>
+                      <list>
+                        <option value="HEAD" />
+                      </list>
+                    </value>
+                  </entry>
+                  <entry key="roots">
+                    <value>
+                      <list>
+                        <option value="$PROJECT_DIR$" />
+                      </list>
+                    </value>
+                  </entry>
+                </map>
+              </option>
+            </State>
+          </value>
+        </entry>
         <entry key="MAIN">
           <value>
             <State>
@@ -309,6 +350,11 @@
         </entry>
       </map>
     </option>
+    <option name="OPEN_GENERIC_TABS">
+      <map>
+        <entry key="0cba35e6-7d90-42f0-b34c-310376a71413" value="TOOL_WINDOW" />
+      </map>
+    </option>
   </component>
   <component name="VcsManagerConfiguration">
     <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
diff --git a/README.md b/README.md
index 0319c63..8ad465c 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,9 @@
-# gitProject
+# 基于小米便签的二次功能开发
+一、统计文件夹下便签数量
+新增按钮可以统计便签数量
+二、优化了笔记的修改时间
+例如：
+修改前：3天前
+修改后：5月1日，09：<> 上午
+三、增加了统计每个便签字数的功能
 
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class
index df71afc..9261ec0 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class differ
diff --git a/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat b/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat
index 951dd2f..3055c6c 100644
Binary files a/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat and b/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat differ
diff --git a/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat b/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat
index b092461..f07c2bc 100644
Binary files a/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat and b/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat differ
diff --git a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
index a93b83e..f7db949 100644
--- a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
+++ b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
@@ -1,6 +1,7 @@
 {
     "logs": [
         {
+<<<<<<< HEAD:app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
             "outputFile": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\values-zh-rCN_values-zh-rCN.arsc.flat",
             "map": [
                 {
@@ -12,17 +13,116 @@
                         "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": "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"
+=======
+            "outputFile": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\values_values.arsc.flat",
+            "map": [
+                {
+                    "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values\\dimens.xml",
+                    "from": {
+                        "startLines": "-1,-1,-1,-1,-1",
+                        "startColumns": "-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,-1,-1,-1,-1"
                     },
                     "to": {
-                        "startLines": "6,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",
-                        "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": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925",
-                        "endLines": "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",
-                        "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": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986"
+                        "startLines": "13,14,15,16,17",
+                        "startColumns": "4,4,4,4,4",
+                        "startOffsets": "477,529,582,635,687",
+                        "endColumns": "51,52,52,51,51",
+                        "endOffsets": "524,577,630,682,734"
+                    }
+                },
+                {
+                    "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values\\strings.xml",
+                    "from": {
+                        "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+                    },
+                    "to": {
+                        "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034",
+                        "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
+                        "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
+                        "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119"
+                    }
+                },
+                {
+                    "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values\\styles.xml",
+                    "from": {
+                        "startLines": "-1,-1,64,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,-1,2704,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endLines": "-1,-1,67,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "-1,-1,12,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endOffsets": "-1,-1,2920,-1,-1,-1,-1,-1,-1,-1,-1"
+                    },
+                    "to": {
+                        "startLines": "125,129,133,137,140,144,148,152,156,160,164",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "8124,8328,8539,8712,8872,9055,9240,9425,9628,9834,10017",
+                        "endLines": "128,132,136,139,143,147,151,155,159,163,167",
+                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
+                        "endOffsets": "8323,8534,8707,8867,9050,9235,9420,9623,9829,10012,10213"
                     }
                 },
                 {
+                    "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values\\arrays.xml",
+                    "from": {
+                        "startLines": "-1,-1",
+                        "startColumns": "-1,-1",
+                        "startOffsets": "-1,-1"
+                    },
+                    "to": {
+                        "startLines": "2,8",
+                        "startColumns": "4,4",
+                        "startOffsets": "105,300",
+                        "endLines": "7,11",
+                        "endColumns": "19,19",
+                        "endOffsets": "295,415"
+                    }
+                },
+                {
+                    "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values\\colors.xml",
+                    "from": {
+                        "startLines": "-1",
+                        "startColumns": "-1",
+                        "startOffsets": "-1"
+                    },
+                    "to": {
+                        "startLines": "12",
+                        "startColumns": "4",
+                        "startOffsets": "420",
+                        "endColumns": "56",
+                        "endOffsets": "472"
+                    }
+                }
+            ]
+        },
+        {
+            "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rCN_values-zh-rCN.arsc.flat",
+            "map": [
+                {
+                    "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
+                    "from": {
+                        "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,124,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6833,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,42,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6871,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+>>>>>>> master:src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
+                    },
+                    "to": {
+                        "startLines": "6,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",
+                        "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",
+                        "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3547,3596,3645,3692,3739,3786,3831,3882,3935,4010,4069,4126,4200,4264,4333,4411,4521,4625,4698,4764,4819,4884,4949,4998,5081,5159,5197,5242,5290,5352,5409,5464,5523,5590,5648,5710,5758,5803,5851,5902,5968",
+                        "endLines": "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",
+                        "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,42,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": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3542,3591,3640,3687,3734,3781,3826,3877,3930,4005,4064,4121,4195,4259,4328,4406,4516,4620,4693,4759,4814,4879,4944,4993,5076,5154,5192,5237,5285,5347,5404,5459,5518,5585,5643,5705,5753,5798,5846,5897,5963,6029"
+                    }
+                },
+                {
+<<<<<<< HEAD:app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
                     "source": "D:\\gitProjs\\gitProject\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
                     "from": {
                         "startLines": "18",
@@ -31,6 +131,13 @@
                         "endLines": "21",
                         "endColumns": "19",
                         "endOffsets": "838"
+=======
+                    "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
+                    "from": {
+                        "startLines": "-1",
+                        "startColumns": "-1",
+                        "startOffsets": "-1"
+>>>>>>> master:src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
                     },
                     "to": {
                         "startLines": "2",
@@ -47,6 +154,7 @@
             "outputFile": "net.micode.notes.app-merged_res-5:/values_values.arsc.flat",
             "map": [
                 {
+<<<<<<< HEAD:app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
                     "source": "D:\\gitProjs\\gitProject\\app\\src\\main\\res\\values\\colors.xml",
                     "from": {
                         "startLines": "-1",
@@ -64,6 +172,60 @@
                 {
                     "source": "D:\\gitProjs\\gitProject\\app\\src\\main\\res\\values\\arrays.xml",
                     "from": {
+=======
+                    "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values\\dimens.xml",
+                    "from": {
+                        "startLines": "-1,-1,-1,-1,-1",
+                        "startColumns": "-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,-1,-1,-1,-1"
+                    },
+                    "to": {
+                        "startLines": "13,14,15,16,17",
+                        "startColumns": "4,4,4,4,4",
+                        "startOffsets": "477,529,582,635,687",
+                        "endColumns": "51,52,52,51,51",
+                        "endOffsets": "524,577,630,682,734"
+                    }
+                },
+                {
+                    "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values\\strings.xml",
+                    "from": {
+                        "startLines": "128,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,133,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "8136,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8550,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endLines": "132,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,133,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,46,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endOffsets": "8544,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8592,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+                    },
+                    "to": {
+                        "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125",
+                        "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": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5031,5086,5139,5186,5239,5295,5343,5398,5451,5535,5602,5666,5762,5836,5917,6006,6169,6313,6392,6467,6549,6608,6688,6768,6823,6945,7048,7089,7142,7199,7273,7338,7406,7492,7572,7641,7735,7794,7849,7911,7971,8081",
+                        "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125",
+                        "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,46,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
+                        "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5026,5081,5134,5181,5234,5290,5338,5393,5446,5530,5597,5661,5757,5831,5912,6001,6164,6308,6387,6462,6544,6603,6683,6763,6818,6940,7043,7084,7137,7194,7268,7333,7401,7487,7567,7636,7730,7789,7844,7906,7966,8076,8166"
+                    }
+                },
+                {
+                    "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values\\styles.xml",
+                    "from": {
+                        "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+                    },
+                    "to": {
+                        "startLines": "126,130,134,138,141,145,149,153,157,161,165",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "8171,8375,8586,8759,8919,9102,9287,9472,9675,9881,10064",
+                        "endLines": "129,133,137,140,144,148,152,156,160,164,168",
+                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
+                        "endOffsets": "8370,8581,8754,8914,9097,9282,9467,9670,9876,10059,10260"
+                    }
+                },
+                {
+                    "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values\\arrays.xml",
+                    "from": {
+>>>>>>> master:src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
                         "startLines": "-1,-1",
                         "startColumns": "-1,-1",
                         "startOffsets": "-1,-1"
@@ -78,6 +240,7 @@
                     }
                 },
                 {
+<<<<<<< HEAD:app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
                     "source": "D:\\gitProjs\\gitProject\\app\\src\\main\\res\\values\\strings.xml",
                     "from": {
                         "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
@@ -125,19 +288,41 @@
                         "startOffsets": "477,529,582,635,687",
                         "endColumns": "51,52,52,51,51",
                         "endOffsets": "524,577,630,682,734"
+=======
+                    "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values\\colors.xml",
+                    "from": {
+                        "startLines": "-1",
+                        "startColumns": "-1",
+                        "startOffsets": "-1"
+                    },
+                    "to": {
+                        "startLines": "12",
+                        "startColumns": "4",
+                        "startOffsets": "420",
+                        "endColumns": "56",
+                        "endOffsets": "472"
+>>>>>>> master:src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
                     }
                 }
             ]
         },
         {
+<<<<<<< HEAD:app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
             "outputFile": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\values_values.arsc.flat",
             "map": [
                 {
                     "source": "D:\\gitProjs\\gitProject\\app\\src\\main\\res\\values\\colors.xml",
+=======
+            "outputFile": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\values-zh-rTW_values-zh-rTW.arsc.flat",
+            "map": [
+                {
+                    "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
+>>>>>>> master:src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
                     "from": {
                         "startLines": "18",
                         "startColumns": "4",
                         "startOffsets": "730",
+<<<<<<< HEAD:app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
                         "endColumns": "56",
                         "endOffsets": "782"
                     },
@@ -230,6 +415,23 @@
             "map": [
                 {
                     "source": "D:\\gitProjs\\gitProject\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
+=======
+                        "endLines": "21",
+                        "endColumns": "19",
+                        "endOffsets": "838"
+                    },
+                    "to": {
+                        "startLines": "2",
+                        "startColumns": "4",
+                        "startOffsets": "105",
+                        "endLines": "5",
+                        "endColumns": "19",
+                        "endOffsets": "210"
+                    }
+                },
+                {
+                    "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
+>>>>>>> master:src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
                     "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",
@@ -246,9 +448,76 @@
                         "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": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984"
                     }
+                }
+            ]
+        },
+        {
+            "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rTW_values-zh-rTW.arsc.flat",
+            "map": [
+                {
+                    "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
+                    "from": {
+                        "startLines": "-1",
+                        "startColumns": "-1",
+                        "startOffsets": "-1"
+                    },
+                    "to": {
+                        "startLines": "2",
+                        "startColumns": "4",
+                        "startOffsets": "105",
+                        "endLines": "5",
+                        "endColumns": "19",
+                        "endOffsets": "210"
+                    }
                 },
                 {
+<<<<<<< HEAD:app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
                     "source": "D:\\gitProjs\\gitProject\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
+=======
+                    "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
+                    "from": {
+                        "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,125,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6809,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,42,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6847,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+                    },
+                    "to": {
+                        "startLines": "6,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",
+                        "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",
+                        "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3545,3594,3643,3690,3737,3784,3829,3880,3933,4008,4067,4124,4198,4262,4331,4409,4519,4623,4696,4762,4817,4882,4947,4996,5079,5157,5195,5240,5288,5350,5407,5462,5521,5588,5646,5708,5756,5801,5849,5900,5966",
+                        "endLines": "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",
+                        "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,42,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": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3540,3589,3638,3685,3732,3779,3824,3875,3928,4003,4062,4119,4193,4257,4326,4404,4514,4618,4691,4757,4812,4877,4942,4991,5074,5152,5190,5235,5283,5345,5402,5457,5516,5583,5641,5703,5751,5796,5844,5895,5961,6027"
+                    }
+                }
+            ]
+        },
+        {
+            "outputFile": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\values-zh-rCN_values-zh-rCN.arsc.flat",
+            "map": [
+                {
+                    "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
+                    "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": "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": "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": "6,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",
+                        "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": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925",
+                        "endLines": "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",
+                        "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": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986"
+                    }
+                },
+                {
+                    "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
+>>>>>>> master:src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
                     "from": {
                         "startLines": "18",
                         "startColumns": "4",
diff --git a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
index 495d4c3..9ede1b7 100644
--- a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
+++ b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
@@ -1,10 +1,14 @@
 {
     "logs": [
         {
-            "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rCN/values-zh-rCN.xml",
+            "outputFile": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-3:\\values-zh-rCN\\values-zh-rCN.xml",
             "map": [
                 {
+<<<<<<< HEAD:app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
                     "source": "D:\\gitProjs\\gitProject\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
+=======
+                    "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
+>>>>>>> master:src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
                     "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",
@@ -23,7 +27,11 @@
                     }
                 },
                 {
+<<<<<<< HEAD:app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
                     "source": "D:\\gitProjs\\gitProject\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
+=======
+                    "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
+>>>>>>> master:src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
                     "from": {
                         "startLines": "18",
                         "startColumns": "4",
@@ -31,6 +39,48 @@
                         "endLines": "21",
                         "endColumns": "19",
                         "endOffsets": "838"
+<<<<<<< HEAD:app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
+=======
+                    },
+                    "to": {
+                        "startLines": "2",
+                        "startColumns": "4",
+                        "startOffsets": "105",
+                        "endLines": "5",
+                        "endColumns": "19",
+                        "endOffsets": "210"
+                    }
+                }
+            ]
+        },
+        {
+            "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rCN/values-zh-rCN.xml",
+            "map": [
+                {
+                    "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
+                    "from": {
+                        "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,124,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6833,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,42,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6871,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+                    },
+                    "to": {
+                        "startLines": "6,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",
+                        "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",
+                        "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3547,3596,3645,3692,3739,3786,3831,3882,3935,4010,4069,4126,4200,4264,4333,4411,4521,4625,4698,4764,4819,4884,4949,4998,5081,5159,5197,5242,5290,5352,5409,5464,5523,5590,5648,5710,5758,5803,5851,5902,5968",
+                        "endLines": "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",
+                        "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,42,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": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3542,3591,3640,3687,3734,3781,3826,3877,3930,4005,4064,4121,4195,4259,4328,4406,4516,4620,4693,4759,4814,4879,4944,4993,5076,5154,5192,5237,5285,5347,5404,5459,5518,5585,5643,5705,5753,5798,5846,5897,5963,6029"
+                    }
+                },
+                {
+                    "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
+                    "from": {
+                        "startLines": "-1",
+                        "startColumns": "-1",
+                        "startOffsets": "-1"
+>>>>>>> master:src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
                     },
                     "to": {
                         "startLines": "2",
diff --git a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
index f0cbe7e..c094815 100644
--- a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
+++ b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
@@ -1,9 +1,10 @@
 {
     "logs": [
         {
-            "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rTW/values-zh-rTW.xml",
+            "outputFile": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-3:\\values-zh-rTW\\values-zh-rTW.xml",
             "map": [
                 {
+<<<<<<< HEAD:app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
                     "source": "D:\\gitProjs\\gitProject\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
                     "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",
@@ -24,6 +25,9 @@
                 },
                 {
                     "source": "D:\\gitProjs\\gitProject\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
+=======
+                    "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
+>>>>>>> master:src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
                     "from": {
                         "startLines": "18",
                         "startColumns": "4",
@@ -40,6 +44,64 @@
                         "endColumns": "19",
                         "endOffsets": "210"
                     }
+                },
+                {
+                    "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
+                    "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": "6629,3647,3580,3506,3455,846,887,936,6169,6215,6574,6523,1225,3911,3980,3851,3784,3720,4654,4593,4529,4114,3018,1398,1452,4169,1805,6273,3395,3178,1917,2204,2455,1971,2957,2903,2851,2652,2603,2507,2556,2699,2747,2248,3335,2798,3222,2160,2407,2350,2294,3122,2115,3079,2022,2064,3275,1346,1657,1755,1609,1707,1561,1515,1173,1119,5036,4976,5179,6092,5495,5425,5560,5639,5824,5750,5112,5369,5237,5303,4926,5929,6013,6484,6375,6326,6421,1288,4058,4469,4769,4710,4837,4420,4374,4325,4273,985,1052",
+                        "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": "6803,3714,3641,3574,3500,881,930,979,6209,6267,6623,6568,1282,3974,4052,3905,3845,3778,4704,4648,4587,4163,3073,1446,1509,4248,1880,6318,3449,3216,1965,2242,2501,2016,3012,2951,2897,2693,2646,2550,2597,2741,2792,2288,3389,2845,3269,2198,2449,2401,2344,3172,2154,3116,2058,2109,3329,1392,1701,1799,1651,1749,1603,1555,1219,1167,5106,5030,5231,6161,5554,5489,5633,5744,5923,5818,5173,5419,5297,5363,4970,6007,6086,6517,6415,6369,6478,1340,4108,4523,4831,4763,4894,4463,4414,4368,4319,1046,1113"
+                    },
+                    "to": {
+                        "startLines": "6,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",
+                        "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": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923",
+                        "endLines": "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",
+                        "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": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984"
+                    }
+                }
+            ]
+        },
+        {
+            "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rTW/values-zh-rTW.xml",
+            "map": [
+                {
+                    "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
+                    "from": {
+                        "startLines": "-1",
+                        "startColumns": "-1",
+                        "startOffsets": "-1"
+                    },
+                    "to": {
+                        "startLines": "2",
+                        "startColumns": "4",
+                        "startOffsets": "105",
+                        "endLines": "5",
+                        "endColumns": "19",
+                        "endOffsets": "210"
+                    }
+                },
+                {
+                    "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
+                    "from": {
+                        "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,125,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6809,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,42,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6847,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+                    },
+                    "to": {
+                        "startLines": "6,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",
+                        "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",
+                        "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3545,3594,3643,3690,3737,3784,3829,3880,3933,4008,4067,4124,4198,4262,4331,4409,4519,4623,4696,4762,4817,4882,4947,4996,5079,5157,5195,5240,5288,5350,5407,5462,5521,5588,5646,5708,5756,5801,5849,5900,5966",
+                        "endLines": "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",
+                        "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,42,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": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3540,3589,3638,3685,3732,3779,3824,3875,3928,4003,4062,4119,4193,4257,4326,4404,4514,4618,4691,4757,4812,4877,4942,4991,5074,5152,5190,5235,5283,5345,5402,5457,5516,5583,5641,5703,5751,5796,5844,5895,5961,6027"
+                    }
                 }
             ]
         }
diff --git a/app/build/intermediates/runtime_symbol_list/debug/R.txt b/app/build/intermediates/runtime_symbol_list/debug/R.txt
index afc4688..d44cfba 100644
--- a/app/build/intermediates/runtime_symbol_list/debug/R.txt
+++ b/app/build/intermediates/runtime_symbol_list/debug/R.txt
@@ -114,6 +114,7 @@ int id menu_font_size 0x7f050024
 int id menu_list_mode 0x7f050025
 int id menu_new_folder 0x7f050026
 int id menu_new_note 0x7f050027
+<<<<<<< HEAD:app/build/intermediates/runtime_symbol_list/debug/R.txt
 int id menu_restore 0x7f050028
 int id menu_search 0x7f050029
 int id menu_send_to_desktop 0x7f05002a
@@ -142,6 +143,36 @@ int id tv_title 0x7f050040
 int id tv_title_bar 0x7f050041
 int id widget_bg_image 0x7f050042
 int id widget_text 0x7f050043
+=======
+int id menu_search 0x7f050028
+int id menu_send_to_desktop 0x7f050029
+int id menu_setting 0x7f05002a
+int id menu_share 0x7f05002b
+int id menu_sync 0x7f05002c
+int id minute 0x7f05002d
+int id move 0x7f05002e
+int id navigation_bar 0x7f05002f
+int id note_bg_color_selector 0x7f050030
+int id note_edit_list 0x7f050031
+int id note_edit_view 0x7f050032
+int id note_item 0x7f050033
+int id note_title 0x7f050034
+int id notes_list 0x7f050035
+int id prefenerece_sync_status_textview 0x7f050036
+int id preference_sync_button 0x7f050037
+int id selection_menu 0x7f050038
+int id sv_note_edit 0x7f050039
+int id text_num 0x7f050044
+int id tv_alert_date 0x7f05003a
+int id tv_folder_name 0x7f05003b
+int id tv_modified_date 0x7f05003c
+int id tv_name 0x7f05003d
+int id tv_time 0x7f05003e
+int id tv_title 0x7f05003f
+int id tv_title_bar 0x7f050040
+int id widget_bg_image 0x7f050041
+int id widget_text 0x7f050042
+>>>>>>> master:src/app/build/intermediates/runtime_symbol_list/debug/R.txt
 int layout account_dialog_title 0x7f060000
 int layout add_account_text 0x7f060001
 int layout datetime_picker 0x7f060002
@@ -225,6 +256,7 @@ int string menu_sync 0x7f0a0038
 int string menu_sync_cancel 0x7f0a0039
 int string menu_title_select_folder 0x7f0a003a
 int string note_alert_expired 0x7f0a003b
+int string note_length 0x7f0a0066
 int string note_link_email 0x7f0a003c
 int string note_link_other 0x7f0a003d
 int string note_link_tel 0x7f0a003e
diff --git a/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt b/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
index aaeb162..f4168ba 100644
--- a/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
+++ b/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
@@ -1,23 +1,41 @@
+<<<<<<< HEAD:app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
+=======
+net.micode.notes:id/text_num = 0x7f050044
+>>>>>>> master:src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
 net.micode.notes:string/ticker_success = 0x7f0a0062
 net.micode.notes:string/preferences_menu_remove_account = 0x7f0a0052
 net.micode.notes:string/preferences_account_summary = 0x7f0a0044
 net.micode.notes:string/menu_export_text = 0x7f0a0023
+<<<<<<< HEAD:app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
 net.micode.notes:layout/note_list = 0x7f060008
+=======
+>>>>>>> master:src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
 net.micode.notes:string/file_path = 0x7f0a0016
 net.micode.notes:string/menu_folder_change_name = 0x7f0a0024
 net.micode.notes:string/note_link_other = 0x7f0a003d
 net.micode.notes:string/note_alert_expired = 0x7f0a003b
+<<<<<<< HEAD:app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
 net.micode.notes:id/tv_title_bar = 0x7f050041
+=======
+net.micode.notes:id/tv_title_bar = 0x7f050040
+>>>>>>> master:src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
 net.micode.notes:string/menu_font_small = 0x7f0a002a
 net.micode.notes:string/ticker_syncing = 0x7f0a0063
 net.micode.notes:style/HighlightTextAppearancePrimary = 0x7f0b0000
 net.micode.notes:xml/preferences = 0x7f0c0000
 net.micode.notes:string/sync_progress_syncing = 0x7f0a005f
+<<<<<<< HEAD:app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
 net.micode.notes:menu/sub_folder = 0x7f070006
 net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a0054
 net.micode.notes:string/alert_message_delete_notes = 0x7f0a0002
 net.micode.notes:string/search_label = 0x7f0a0058
 net.micode.notes:id/selection_menu = 0x7f050039
+=======
+net.micode.notes:string/alert_message_delete_notes = 0x7f0a0002
+net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a0054
+net.micode.notes:string/search_label = 0x7f0a0058
+net.micode.notes:id/selection_menu = 0x7f050038
+>>>>>>> master:src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
 net.micode.notes:style/NoteActionBarStyle = 0x7f0b0002
 net.micode.notes:string/preferences_menu_change_account = 0x7f0a0051
 net.micode.notes:string/menu_sync = 0x7f0a0038
@@ -26,25 +44,43 @@ net.micode.notes:string/preferences_menu_cancel = 0x7f0a0050
 net.micode.notes:string/menu_normal_mode = 0x7f0a002f
 net.micode.notes:string/menu_sync_cancel = 0x7f0a0039
 net.micode.notes:drawable/title_alert = 0x7f040036
+<<<<<<< HEAD:app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
 net.micode.notes:id/note_title = 0x7f050035
+=======
+net.micode.notes:id/note_title = 0x7f050034
+>>>>>>> master:src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
 net.micode.notes:string/menu_search = 0x7f0a0031
 net.micode.notes:string/preferences_last_sync_time = 0x7f0a004e
 net.micode.notes:string/datetime_dialog_cancel = 0x7f0a0009
 net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0a004d
+<<<<<<< HEAD:app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
 net.micode.notes:id/menu_search = 0x7f050029
+=======
+net.micode.notes:id/menu_search = 0x7f050028
+>>>>>>> master:src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
 net.micode.notes:xml/widget_4x_info = 0x7f0c0003
 net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a004b
 net.micode.notes:style/TextAppearanceNormal = 0x7f0b0006
 net.micode.notes:string/preferences_title = 0x7f0a0053
 net.micode.notes:string/datetime_dialog_ok = 0x7f0a000a
+<<<<<<< HEAD:app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
 net.micode.notes:id/notes_list = 0x7f050036
+=======
+net.micode.notes:id/notes_list = 0x7f050035
+>>>>>>> master:src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
 net.micode.notes:layout/note_edit = 0x7f060005
 net.micode.notes:string/widget_havenot_content = 0x7f0a0064
 net.micode.notes:string/preferences_button_sync_immediately = 0x7f0a0049
 net.micode.notes:string/preferences_button_sync_cancel = 0x7f0a0048
 net.micode.notes:style/TextAppearanceSecondaryItem = 0x7f0b0008
 net.micode.notes:string/notelist_menu_new = 0x7f0a0042
+<<<<<<< HEAD:app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
 net.micode.notes:string/menu_remove_remind = 0x7f0a0030
+=======
+net.micode.notes:menu/sub_folder = 0x7f070006
+net.micode.notes:id/tv_text_num = 0x7f050043
+net.micode.notes:layout/note_list = 0x7f060008
+>>>>>>> master:src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
 net.micode.notes:string/menu_share = 0x7f0a0037
 net.micode.notes:style/HighlightTextAppearanceSecondary = 0x7f0b0001
 net.micode.notes:string/ticker_cancel = 0x7f0a0060
@@ -52,10 +88,13 @@ net.micode.notes:string/notealert_ok = 0x7f0a0041
 net.micode.notes:string/note_link_web = 0x7f0a003f
 net.micode.notes:string/menu_title_select_folder = 0x7f0a003a
 net.micode.notes:string/menu_select_all = 0x7f0a0032
+<<<<<<< HEAD:app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
 net.micode.notes:layout/note_list_footer = 0x7f06000a
 net.micode.notes:id/btn_new_note = 0x7f050004
 net.micode.notes:string/note_link_tel = 0x7f0a003e
 net.micode.notes:id/widget_text = 0x7f050043
+=======
+>>>>>>> master:src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
 net.micode.notes:string/note_link_email = 0x7f0a003c
 net.micode.notes:string/menu_move_parent_folder = 0x7f0a002e
 net.micode.notes:string/notelist_string_info = 0x7f0a0043
@@ -70,7 +109,11 @@ net.micode.notes:string/error_note_empty_for_clock = 0x7f0a000c
 net.micode.notes:string/menu_font_super = 0x7f0a002b
 net.micode.notes:string/menu_deselect_all = 0x7f0a0022
 net.micode.notes:string/menu_create_folder = 0x7f0a0020
+<<<<<<< HEAD:app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
 net.micode.notes:id/menu_share = 0x7f05002c
+=======
+net.micode.notes:id/menu_share = 0x7f05002b
+>>>>>>> master:src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
 net.micode.notes:string/info_note_enter_desktop = 0x7f0a001e
 net.micode.notes:style/TextAppearanceMedium = 0x7f0b0005
 net.micode.notes:string/menu_select_none = 0x7f0a0033
@@ -79,7 +122,11 @@ net.micode.notes:string/folder_exist = 0x7f0a0017
 net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0b0007
 net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a0055
 net.micode.notes:string/widget_under_visit_mode = 0x7f0a0065
+<<<<<<< HEAD:app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
 net.micode.notes:id/menu_send_to_desktop = 0x7f05002a
+=======
+net.micode.notes:id/menu_send_to_desktop = 0x7f050029
+>>>>>>> master:src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
 net.micode.notes:string/format_date_ymd = 0x7f0a0018
 net.micode.notes:string/set_remind_time_message = 0x7f0a005a
 net.micode.notes:string/error_sync_network = 0x7f0a0013
@@ -95,8 +142,14 @@ net.micode.notes:string/alert_message_delete_folder = 0x7f0a0000
 net.micode.notes:layout/datetime_picker = 0x7f060002
 net.micode.notes:xml/widget_2x_info = 0x7f0c0002
 net.micode.notes:string/notealert_enter = 0x7f0a0040
+<<<<<<< HEAD:app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
 net.micode.notes:drawable/new_note = 0x7f04002f
 net.micode.notes:id/sv_note_edit = 0x7f05003a
+=======
+net.micode.notes:id/sv_note_edit = 0x7f050039
+net.micode.notes:drawable/new_note = 0x7f04002f
+net.micode.notes:string/menu_remove_remind = 0x7f0a0030
+>>>>>>> master:src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
 net.micode.notes:string/delete_remind_time_message = 0x7f0a000b
 net.micode.notes:drawable/selected = 0x7f040035
 net.micode.notes:plurals/search_results_title = 0x7f080000
@@ -109,12 +162,17 @@ net.micode.notes:id/iv_bg_blue = 0x7f05000e
 net.micode.notes:layout/settings_header = 0x7f06000b
 net.micode.notes:drawable/new_note_pressed = 0x7f040031
 net.micode.notes:id/iv_bg_yellow_select = 0x7f050017
+<<<<<<< HEAD:app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
 net.micode.notes:id/move = 0x7f05002f
+=======
+net.micode.notes:id/move = 0x7f05002e
+>>>>>>> master:src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
 net.micode.notes:menu/call_note_edit = 0x7f070000
 net.micode.notes:color/secondary_text_dark = 0x7f020001
 net.micode.notes:style/TextAppearanceSuper = 0x7f0b0009
 net.micode.notes:drawable/list_white_single = 0x7f040027
 net.micode.notes:layout/note_item = 0x7f060007
+<<<<<<< HEAD:app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
 net.micode.notes:drawable/widget_2x_blue = 0x7f040038
 net.micode.notes:id/tv_time = 0x7f05003f
 net.micode.notes:id/tv_name = 0x7f05003e
@@ -132,6 +190,26 @@ net.micode.notes:id/menu_setting = 0x7f05002b
 net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0b000a
 net.micode.notes:id/delete = 0x7f050008
 net.micode.notes:id/menu_restore = 0x7f050028
+=======
+net.micode.notes:string/note_link_tel = 0x7f0a003e
+net.micode.notes:id/widget_text = 0x7f050042
+net.micode.notes:id/btn_new_note = 0x7f050004
+net.micode.notes:layout/note_list_footer = 0x7f06000a
+net.micode.notes:drawable/widget_2x_blue = 0x7f040038
+net.micode.notes:id/tv_time = 0x7f05003e
+net.micode.notes:id/tv_name = 0x7f05003d
+net.micode.notes:string/error_sdcard_export = 0x7f0a000f
+net.micode.notes:id/preference_sync_button = 0x7f050037
+net.micode.notes:id/note_edit_view = 0x7f050032
+net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a004f
+net.micode.notes:id/navigation_bar = 0x7f05002f
+net.micode.notes:string/app_widget4x4 = 0x7f0a0006
+net.micode.notes:id/minute = 0x7f05002d
+net.micode.notes:drawable/font_normal = 0x7f040011
+net.micode.notes:drawable/font_super = 0x7f040014
+net.micode.notes:id/menu_sync = 0x7f05002c
+net.micode.notes:id/menu_setting = 0x7f05002a
+>>>>>>> master:src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
 net.micode.notes:drawable/list_green_down = 0x7f04001d
 net.micode.notes:id/menu_new_note = 0x7f050027
 net.micode.notes:string/error_note_not_exist = 0x7f0a000e
@@ -143,7 +221,11 @@ net.micode.notes:string/menu_folder_view = 0x7f0a0026
 net.micode.notes:id/menu_delete = 0x7f050021
 net.micode.notes:string/file_name_txt_format = 0x7f0a0015
 net.micode.notes:string/ticker_fail = 0x7f0a0061
+<<<<<<< HEAD:app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
 net.micode.notes:id/prefenerece_sync_status_textview = 0x7f050037
+=======
+net.micode.notes:id/prefenerece_sync_status_textview = 0x7f050036
+>>>>>>> master:src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
 net.micode.notes:drawable/edit_blue = 0x7f040006
 net.micode.notes:id/menu_alert = 0x7f050020
 net.micode.notes:string/menu_font_size = 0x7f0a0029
@@ -155,7 +237,11 @@ net.micode.notes:id/ll_font_small = 0x7f05001e
 net.micode.notes:menu/call_record_folder = 0x7f070001
 net.micode.notes:id/ll_font_normal = 0x7f05001d
 net.micode.notes:id/ll_font_large = 0x7f05001c
+<<<<<<< HEAD:app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
 net.micode.notes:id/note_bg_color_selector = 0x7f050031
+=======
+net.micode.notes:id/note_bg_color_selector = 0x7f050030
+>>>>>>> master:src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
 net.micode.notes:id/iv_super_select = 0x7f05001b
 net.micode.notes:drawable/search_result = 0x7f040034
 net.micode.notes:id/iv_bg_yellow = 0x7f050016
@@ -164,7 +250,11 @@ net.micode.notes:string/error_sync_cancelled = 0x7f0a0011
 net.micode.notes:id/iv_bg_white_select = 0x7f050015
 net.micode.notes:string/format_move_notes_to_folder = 0x7f0a001c
 net.micode.notes:drawable/widget_2x_red = 0x7f04003a
+<<<<<<< HEAD:app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
 net.micode.notes:id/tv_alert_date = 0x7f05003b
+=======
+net.micode.notes:id/tv_alert_date = 0x7f05003a
+>>>>>>> master:src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
 net.micode.notes:dimen/text_font_size_large = 0x7f030000
 net.micode.notes:drawable/notification = 0x7f040033
 net.micode.notes:id/iv_bg_red = 0x7f050012
@@ -172,7 +262,11 @@ net.micode.notes:id/iv_large_select = 0x7f050018
 net.micode.notes:string/menu_font_large = 0x7f0a0027
 net.micode.notes:drawable/widget_4x_blue = 0x7f04003d
 net.micode.notes:id/iv_bg_green_select = 0x7f050011
+<<<<<<< HEAD:app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
 net.micode.notes:id/widget_bg_image = 0x7f050042
+=======
+net.micode.notes:id/widget_bg_image = 0x7f050041
+>>>>>>> master:src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
 net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a004a
 net.micode.notes:drawable/menu_move = 0x7f04002e
 net.micode.notes:drawable/widget_4x_white = 0x7f040040
@@ -192,6 +286,11 @@ net.micode.notes:id/hour = 0x7f05000c
 net.micode.notes:drawable/note_edit_color_selector_panel = 0x7f040032
 net.micode.notes:style/NoteTheme = 0x7f0b0003
 net.micode.notes:drawable/widget_2x_yellow = 0x7f04003c
+<<<<<<< HEAD:app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
+=======
+net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0b000a
+net.micode.notes:id/delete = 0x7f050008
+>>>>>>> master:src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
 net.micode.notes:drawable/title_bar_bg = 0x7f040037
 net.micode.notes:drawable/menu_delete = 0x7f04002d
 net.micode.notes:string/error_sync_internal = 0x7f0a0012
@@ -280,5 +379,6 @@ net.micode.notes:menu/note_list_dropdown = 0x7f070004
 net.micode.notes:string/menu_setting = 0x7f0a0036
 net.micode.notes:dimen/text_font_size_medium = 0x7f030001
 net.micode.notes:layout/note_edit_list_item = 0x7f060006
+net.micode.notes:string/note_length = 0x7f0a0066
 net.micode.notes:layout/account_dialog_title = 0x7f060000
 net.micode.notes:array/format_for_exported_note = 0x7f010000
diff --git a/app/src/main/java/net/micode/notes/gtask/data/SqlData.java b/app/src/main/java/net/micode/notes/gtask/data/SqlData.java
index 5eaaac9..1923709 100644
--- a/app/src/main/java/net/micode/notes/gtask/data/SqlData.java
+++ b/app/src/main/java/net/micode/notes/gtask/data/SqlData.java
@@ -50,14 +50,26 @@ public class SqlData {
 第二行定义了一个名为INVALID_ID的私有静态常量整数，用于表示无效的ID。该值被设置为-99999。
 第三行定义了一个名为PROJECTION_DATA的公共静态常量字符串数组，用于定义一个查询所需返回的列。这些列包括DataColumns类中定义的ID、MIME_TYPE、CONTENT、DATA1和DATA3。
 这些变量和常量都被声明为静态的，这意味着它们属于类本身，而不是类的实例。因此，它们可以在类的所有实例之间共享和访问。
+<<<<<<< HEAD:app/src/main/java/net/micode/notes/gtask/data/SqlData.java
 这些变量和常量的使用可以提高代码的可读性和可维护性，并避免在代码中多次重复相同的值。
 第一行定义了一个名为TAG的静态常量字符串，用于在日志中标识该类。这个字符串的值是SqlData类的简单名称。
+=======
+这些变量和常量的使用可以提高代码的可读性和可维护性，并避免在代码中多次重复相同的值。*/
+//=======
 
-第二行定义了一个名为INVALID_ID的私有静态常量整数，用于表示无效的ID。该值被设置为-99999。
+//第一行定义了一个名为TAG的静态常量字符串，用于在日志中标识该类。这个字符串的值是SqlData类的简单名称。
+>>>>>>> master:src/app/src/main/java/net/micode/notes/gtask/data/SqlData.java
 
-第三行定义了一个名为PROJECTION_DATA的公共静态常量字符串数组，用于定义一个查询所需返回的列。这些列包括DataColumns类中定义的ID、MIME_TYPE、CONTENT、DATA1和DATA3。
+//第二行定义了一个名为INVALID_ID的私有静态常量整数，用于表示无效的ID。该值被设置为-99999。
+
+//第三行定义了一个名为PROJECTION_DATA的公共静态常量字符串数组，用于定义一个查询所需返回的列。这些列包括DataColumns类中定义的ID、MIME_TYPE、CONTENT、DATA1和DATA3。
 
+<<<<<<< HEAD:app/src/main/java/net/micode/notes/gtask/data/SqlData.java
 这些变量和常量都被声明为静态的，这意味着它们属于类本身，而不是类的实例。因此，它们可以在类的所有实例之间共享和访问。这些变量和常量的使用可以提高代码的可读性和可维护性，并避免在代码中多次重复相同的值。*/
+=======
+//这些变量和常量都被声明为静态的，这意味着它们属于类本身，而不是类的实例。因此，它们可以在类的所有实例之间共享和访问。这些变量和常量的使用可以提高代码的可读性和可维护性，并避免在代码中多次重复相同的值。*/
+//>>>>>>> 25eb5a04c09307c5edd9569e8d491a90234c9d82
+>>>>>>> master:src/app/src/main/java/net/micode/notes/gtask/data/SqlData.java
     public static final int DATA_ID_COLUMN = 0;
 
     public static final int DATA_MIME_TYPE_COLUMN = 1;
diff --git a/app/src/main/java/net/micode/notes/model/WorkingNote.java b/app/src/main/java/net/micode/notes/model/WorkingNote.java
index fbb91fe..2107b30 100644
--- a/app/src/main/java/net/micode/notes/model/WorkingNote.java
+++ b/app/src/main/java/net/micode/notes/model/WorkingNote.java
@@ -66,71 +66,75 @@ public class WorkingNote {
             DataColumns.ID,// ID列
             DataColumns.CONTENT, // 内容列
             DataColumns.MIME_TYPE, // MIME类型列
-            DataColumns.DATA1,
-            DataColumns.DATA2,
-            DataColumns.DATA3,
-            DataColumns.DATA4,
+            DataColumns.DATA1, // 数据列1
+            DataColumns.DATA2,// 数据列2
+            DataColumns.DATA3, // 数据列3
+            DataColumns.DATA4,// 数据列4
     };
 
     public static final String[] NOTE_PROJECTION = new String[] {
-            NoteColumns.PARENT_ID,
-            NoteColumns.ALERTED_DATE,
-            NoteColumns.BG_COLOR_ID,
-            NoteColumns.WIDGET_ID,
-            NoteColumns.WIDGET_TYPE,
-            NoteColumns.MODIFIED_DATE
+            NoteColumns.PARENT_ID,// 父ID列
+            NoteColumns.ALERTED_DATE,// 提醒日期列
+            NoteColumns.BG_COLOR_ID,// 背景颜色ID列
+            NoteColumns.WIDGET_ID,// 小部件ID列
+            NoteColumns.WIDGET_TYPE,// 小部件类型列
+            NoteColumns.MODIFIED_DATE // 修改日期列
     };
 
-    private static final int DATA_ID_COLUMN = 0;
+    private static final int DATA_ID_COLUMN = 0;// 数据表中数据ID列的索引，常量整数值为0
 
-    private static final int DATA_CONTENT_COLUMN = 1;
 
-    private static final int DATA_MIME_TYPE_COLUMN = 2;
+    private static final int DATA_CONTENT_COLUMN = 1;  // 数据表中数据内容列的索引，常量整数值为1
 
-    private static final int DATA_MODE_COLUMN = 3;
 
-    private static final int NOTE_PARENT_ID_COLUMN = 0;
+    private static final int DATA_MIME_TYPE_COLUMN = 2;// 数据表中数据MIME类型列的索引，常量整数值为2
 
-    private static final int NOTE_ALERTED_DATE_COLUMN = 1;
 
-    private static final int NOTE_BG_COLOR_ID_COLUMN = 2;
+    private static final int DATA_MODE_COLUMN = 3; // 数据表中数据模式列的索引，常量整数值为3
 
-    private static final int NOTE_WIDGET_ID_COLUMN = 3;
 
-    private static final int NOTE_WIDGET_TYPE_COLUMN = 4;
+    private static final int NOTE_PARENT_ID_COLUMN = 0; // 笔记表中笔记父ID列的索引，常量整数值为0
 
-    private static final int NOTE_MODIFIED_DATE_COLUMN = 5;
+    private static final int NOTE_ALERTED_DATE_COLUMN = 1;// 笔记表中笔记提醒日期列的索引，常量整数值为1
 
-    // New note construct
+    private static final int NOTE_BG_COLOR_ID_COLUMN = 2;// 笔记表中笔记背景色ID列的索引，常量整数值为2
+
+    private static final int NOTE_WIDGET_ID_COLUMN = 3; // 笔记表中笔记小部件ID列的索引，常量整数值为3
+
+    private static final int NOTE_WIDGET_TYPE_COLUMN = 4;// 笔记表中笔记小部件类型列的索引，常量整数值为4
+
+    private static final int NOTE_MODIFIED_DATE_COLUMN = 5;// 笔记表中笔记修改日期列的索引，常量整数值为5
+
+    // New note construct创建新的笔记构造函数，传入上下文和文件夹ID
     private WorkingNote(Context context, long folderId) {
-        mContext = context;
-        mAlertDate = 0;
-        mModifiedDate = System.currentTimeMillis();
-        mFolderId = folderId;
-        mNote = new Note();
-        mNoteId = 0;
-        mIsDeleted = false;
-        mMode = 0;
-        mWidgetType = Notes.TYPE_WIDGET_INVALIDE;
+        mContext = context;// 初始化上下文
+        mAlertDate = 0;// 提醒日期设置为0
+        mModifiedDate = System.currentTimeMillis(); // 修改日期设置为当前时间
+        mFolderId = folderId;// 设置文件夹ID
+        mNote = new Note(); // 创建一个新的Note对象
+        mNoteId = 0;// 设置笔记ID为0
+        mIsDeleted = false;// 设置是否已删除为false
+        mMode = 0;// 设置工作模式为0
+        mWidgetType = Notes.TYPE_WIDGET_INVALIDE;// 设置小部件类型为无效类型
     }
 
-    // Existing note construct
+    // Existing note construct加载现有笔记的构造函数，传入上下文、笔记ID和文件夹ID
     private WorkingNote(Context context, long noteId, long folderId) {
-        mContext = context;
-        mNoteId = noteId;
-        mFolderId = folderId;
-        mIsDeleted = false;
-        mNote = new Note();
-        loadNote();
+        mContext = context; // 初始化上下文
+        mNoteId = noteId;// 设置笔记ID
+        mFolderId = folderId;// 设置文件夹ID
+        mIsDeleted = false;// 设置是否已删除为false
+        mNote = new Note(); // 创建一个新的Note对象
+        loadNote();// 加载现有笔记
     }
 
-    private void loadNote() {
-        Cursor cursor = mContext.getContentResolver().query(
+    private void loadNote() {// 通过笔记ID查询笔记的游标
+        Cursor cursor = mContext.getContentResolver().query(// 通过笔记ID查询笔记的游标
                 ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, mNoteId), NOTE_PROJECTION, null,
                 null, null);
 
         if (cursor != null) {
-            if (cursor.moveToFirst()) {
+            if (cursor.moveToFirst()) {// 从游标中获取笔记的相关信息
                 mFolderId = cursor.getLong(NOTE_PARENT_ID_COLUMN);
                 mBgColorId = cursor.getInt(NOTE_BG_COLOR_ID_COLUMN);
                 mWidgetId = cursor.getInt(NOTE_WIDGET_ID_COLUMN);
@@ -139,14 +143,14 @@ public class WorkingNote {
                 mModifiedDate = cursor.getLong(NOTE_MODIFIED_DATE_COLUMN);
             }
             cursor.close();
-        } else {
+        } else {// 如果找不到笔记，则记录错误日志并抛出异常
             Log.e(TAG, "No note with id:" + mNoteId);
             throw new IllegalArgumentException("Unable to find note with id " + mNoteId);
-        }
+        }// 加载笔记的数据
         loadNoteData();
     }
 
-    private void loadNoteData() {
+    private void loadNoteData() {  // 通过笔记ID查询笔记数据的游标
         Cursor cursor = mContext.getContentResolver().query(Notes.CONTENT_DATA_URI, DATA_PROJECTION,
                 DataColumns.NOTE_ID + "=?", new String[] {
                     String.valueOf(mNoteId)
@@ -154,26 +158,26 @@ public class WorkingNote {
 
         if (cursor != null) {
             if (cursor.moveToFirst()) {
-                do {
+                do {// 获取笔记数据的类型
                     String type = cursor.getString(DATA_MIME_TYPE_COLUMN);
-                    if (DataConstants.NOTE.equals(type)) {
+                    if (DataConstants.NOTE.equals(type)) {// 如果是笔记文本数据，则获取内容和模式，并设置笔记的文本数据ID
                         mContent = cursor.getString(DATA_CONTENT_COLUMN);
                         mMode = cursor.getInt(DATA_MODE_COLUMN);
                         mNote.setTextDataId(cursor.getLong(DATA_ID_COLUMN));
                     } else if (DataConstants.CALL_NOTE.equals(type)) {
-                        mNote.setCallDataId(cursor.getLong(DATA_ID_COLUMN));
+                        mNote.setCallDataId(cursor.getLong(DATA_ID_COLUMN));// 如果是电话笔记数据，则设置笔记的电话数据ID
                     } else {
                         Log.d(TAG, "Wrong note type with type:" + type);
-                    }
+                    }// 如果是其他类型的笔记数据，则记录错误日志
                 } while (cursor.moveToNext());
             }
             cursor.close();
-        } else {
+        } else {  // 如果找不到笔记数据，则记录错误日志并抛出异常
             Log.e(TAG, "No data with id:" + mNoteId);
             throw new IllegalArgumentException("Unable to find note's data with id " + mNoteId);
         }
     }
-
+    // 创建一个空笔记
     public static WorkingNote createEmptyNote(Context context, long folderId, int widgetId,
             int widgetType, int defaultBgColorId) {
         WorkingNote note = new WorkingNote(context, folderId);
@@ -182,24 +186,24 @@ public class WorkingNote {
         note.setWidgetType(widgetType);
         return note;
     }
-
+    // 加载笔记
     public static WorkingNote load(Context context, long id) {
         return new WorkingNote(context, id, 0);
     }
-
+    // 保存笔记
     public synchronized boolean saveNote() {
         if (isWorthSaving()) {
-            if (!existInDatabase()) {
+            if (!existInDatabase()) {// 如果笔记还不存在于数据库中，则为其生成一个新的ID
                 if ((mNoteId = Note.getNewNoteId(mContext, mFolderId)) == 0) {
                     Log.e(TAG, "Create new note fail with id:" + mNoteId);
                     return false;
                 }
             }
-
+            // 将笔记同步到数据库中
             mNote.syncNote(mContext, mNoteId);
 
             /**
-             * Update widget content if there exist any widget of this note
+             * Update widget content if there exist any widget of this note如果笔记存在小部件，则更新小部件的内容
              */
             if (mWidgetId != AppWidgetManager.INVALID_APPWIDGET_ID
                     && mWidgetType != Notes.TYPE_WIDGET_INVALIDE
@@ -211,11 +215,11 @@ public class WorkingNote {
             return false;
         }
     }
-
+    // 判断笔记是否已经存在于数据库中
     public boolean existInDatabase() {
         return mNoteId > 0;
     }
-
+    // 判断笔记是否值得保存
     private boolean isWorthSaving() {
         if (mIsDeleted || (!existInDatabase() && TextUtils.isEmpty(mContent))
                 || (existInDatabase() && !mNote.isLocalModified())) {
@@ -224,11 +228,11 @@ public class WorkingNote {
             return true;
         }
     }
-
+    // 设置笔记设置状态改变的监听器
     public void setOnSettingStatusChangedListener(NoteSettingChangedListener l) {
         mNoteSettingStatusListener = l;
     }
-
+    // 设置提醒日期
     public void setAlertDate(long date, boolean set) {
         if (date != mAlertDate) {
             mAlertDate = date;
@@ -238,7 +242,7 @@ public class WorkingNote {
             mNoteSettingStatusListener.onClockAlertChanged(date, set);
         }
     }
-
+    // 标记笔记是否被删除
     public void markDeleted(boolean mark) {
         mIsDeleted = mark;
         if (mWidgetId != AppWidgetManager.INVALID_APPWIDGET_ID
@@ -246,7 +250,7 @@ public class WorkingNote {
                 mNoteSettingStatusListener.onWidgetChanged();
         }
     }
-
+    // 设置笔记的背景颜色
     public void setBgColorId(int id) {
         if (id != mBgColorId) {
             mBgColorId = id;
@@ -256,7 +260,7 @@ public class WorkingNote {
             mNote.setNoteValue(NoteColumns.BG_COLOR_ID, String.valueOf(id));
         }
     }
-
+    // 设置笔记的检查列表模式
     public void setCheckListMode(int mode) {
         if (mMode != mode) {
             if (mNoteSettingStatusListener != null) {
@@ -266,78 +270,78 @@ public class WorkingNote {
             mNote.setTextData(TextNote.MODE, String.valueOf(mMode));
         }
     }
-
+    // 设置笔记的小部件类型
     public void setWidgetType(int type) {
         if (type != mWidgetType) {
             mWidgetType = type;
             mNote.setNoteValue(NoteColumns.WIDGET_TYPE, String.valueOf(mWidgetType));
         }
     }
-
+    // 设置笔记的小部件ID
     public void setWidgetId(int id) {
         if (id != mWidgetId) {
             mWidgetId = id;
             mNote.setNoteValue(NoteColumns.WIDGET_ID, String.valueOf(mWidgetId));
         }
     }
-
+    //设置文本内容
     public void setWorkingText(String text) {
         if (!TextUtils.equals(mContent, text)) {
             mContent = text;
             mNote.setTextData(DataColumns.CONTENT, mContent);
         }
     }
-
+    //这是一个将笔记转换为电话记录的方法。它包含电话号码和通话日期，并更新笔记对象的值
     public void convertToCallNote(String phoneNumber, long callDate) {
         mNote.setCallData(CallNote.CALL_DATE, String.valueOf(callDate));
         mNote.setCallData(CallNote.PHONE_NUMBER, phoneNumber);
         mNote.setNoteValue(NoteColumns.PARENT_ID, String.valueOf(Notes.ID_CALL_RECORD_FOLDER));
     }
-
+    //指示笔记是否有闹钟提醒
     public boolean hasClockAlert() {
         return (mAlertDate > 0 ? true : false);
     }
-
+    // 返回笔记的文本内容
     public String getContent() {
         return mContent;
     }
-
+    // 返回笔记的警报日期
     public long getAlertDate() {
         return mAlertDate;
     }
-
+    // 返回笔记的修改日期
     public long getModifiedDate() {
         return mModifiedDate;
     }
-
+    // 返回笔记的背景颜色资源ID
     public int getBgColorResId() {
         return NoteBgResources.getNoteBgResource(mBgColorId);
     }
-
+    // 返回笔记的背景颜色ID
     public int getBgColorId() {
         return mBgColorId;
     }
-
+    // 返回笔记标题的背景颜色资源ID
     public int getTitleBgResId() {
         return NoteBgResources.getNoteTitleBgResource(mBgColorId);
     }
-
+    // 返回笔记的检查清单模式
     public int getCheckListMode() {
         return mMode;
     }
-
+    // 返回笔记的ID
     public long getNoteId() {
         return mNoteId;
     }
-
+    // 返回笔记所在文件夹的ID
     public long getFolderId() {
         return mFolderId;
     }
-
+    // 返回笔记所属的小部件ID
     public int getWidgetId() {
         return mWidgetId;
     }
-
+    // 返回笔记所属的小部件类型
     public int getWidgetType() {
         return mWidgetType;
     }
diff --git a/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
index 8389b1d..033569c 100644
--- a/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
+++ b/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
@@ -30,9 +30,11 @@ import android.content.SharedPreferences;
 import android.graphics.Paint;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
+import android.text.Editable;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.TextUtils;
+import android.text.TextWatcher;
 import android.text.format.DateUtils;
 import android.text.style.BackgroundColorSpan;
 import android.util.Log;
@@ -159,6 +161,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
             return;
         }
         initResources();
+        count();
     }
 
     /**
@@ -870,4 +873,59 @@ public class NoteEditActivity extends Activity implements OnClickListener,
     private void showToast(int resId, int duration) {
         Toast.makeText(this, resId, duration).show();
     }
+
+    private EditText editText;
+    private TextView textView;
+
+    private String Textchange(String oriText){
+        StringBuffer stringBuffer = new StringBuffer(oriText);
+        int Flag1 = -1;
+        int Flag2 = -1;
+        do {//不计入表示图片的字符
+            Flag1 = stringBuffer.indexOf("<img");
+            Flag2 = stringBuffer.indexOf(">");
+            if (Flag1 != -1 && Flag2 != -1) {
+                stringBuffer = stringBuffer.replace(Flag1, Flag2+1, "");
+            }
+        } while (Flag1 != -1 && Flag2 != -1);
+
+        do {//不计入换行字符
+            Flag1 = stringBuffer.indexOf("\n");
+
+            if (Flag1 != -1){
+                stringBuffer = stringBuffer.replace(Flag1, Flag1+1, "");
+            }
+        } while (Flag1 != -1);
+        do {//不计入空格字符
+            Flag1 = stringBuffer.indexOf(" ");
+
+            if (Flag1 != -1) {
+                stringBuffer = stringBuffer.replace(Flag1, Flag1+1, "");
+            }
+        } while (Flag1 != -1);
+        return stringBuffer.toString();
+    }
+    private void count() {
+
+        mNoteEditor.addTextChangedListener(new TextWatcher() {
+            int currentLength = 0;
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+                textView.setText("字数:" + currentLength);
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                currentLength = Textchange(mNoteEditor.getText().toString()).length();
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+                textView.setText("字数:" + currentLength);
+            }
+        });
+        textView = (TextView) findViewById(R.id.text_num);
+
+    }
+
 }
diff --git a/app/src/main/res/layout/note_edit.xml b/app/src/main/res/layout/note_edit.xml
index 10b2aa7..b079410 100644
--- a/app/src/main/res/layout/note_edit.xml
+++ b/app/src/main/res/layout/note_edit.xml
@@ -40,6 +40,15 @@
                 android:layout_marginRight="8dip"
                 android:textAppearance="@style/TextAppearanceSecondaryItem" />
 
+            <TextView
+                android:id="@+id/text_num"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="right|center_vertical"
+                android:layout_marginRight="8dip" />
+
+
+
             <ImageView
                 android:id="@+id/iv_alert_icon"
                 android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/note_list.xml b/app/src/main/res/layout/note_list.xml
index 6b25d38..4075c52 100644
--- a/app/src/main/res/layout/note_list.xml
+++ b/app/src/main/res/layout/note_list.xml
@@ -43,9 +43,9 @@
             android:layout_height="0dip"
             android:layout_weight="1"
             android:cacheColorHint="@null"
-            android:listSelector="@android:color/transparent"
             android:divider="@null"
-            android:fadingEdge="@null" />
+            android:fadingEdge="@null"
+            android:listSelector="@android:color/transparent" />
     </LinearLayout>
 
     <Button
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 09f75ed..618e04e 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -122,5 +122,6 @@
     <plurals name="search_results_title">
         <item quantity="other"><xliff:g id="NUMBER">%1$s</xliff:g> 条符合“<xliff:g id="SEARCH">%2$s</xliff:g>”的搜索结果</item>
     </plurals>
+    <string name="note_length">字数</string>
 
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index e29b79b..27431fb 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -123,5 +123,6 @@
     <plurals name="search_results_title">
         <item quantity="other"><xliff:g id="NUMBER">%1$s</xliff:g> 條符合”<xliff:g id="SEARCH">%2$s</xliff:g>“的搜尋結果</item>
     </plurals>
+    <string name="note_length">字數</string>
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 55df868..d88549e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -131,5 +131,6 @@
         <!-- Case of 0 or 2 or more results. -->
         <item quantity="other"><xliff:g id="number" example="15">%1$s</xliff:g> results for \"<xliff:g id="search" example="???">%2$s</xliff:g>\"</item>
     </plurals>
+    <string name="note_length">Length</string>
 
 </resources>
diff --git a/doc/190341301蔡玉祥.docx b/doc/190341301蔡玉祥.docx
new file mode 100644
index 0000000..a5fda11
Binary files /dev/null and b/doc/190341301蔡玉祥.docx differ
diff --git a/doc/小米便签开源代码的泛读报告.docx b/doc/小米便签开源代码的泛读报告.docx
index 84f70f8..225b1bc 100644
Binary files a/doc/小米便签开源代码的泛读报告.docx and b/doc/小米便签开源代码的泛读报告.docx differ
diff --git a/doc/庞浩注释的代码/WorkingNote.java b/doc/庞浩注释的代码/WorkingNote.java
new file mode 100644
index 0000000..8ae0c83
--- /dev/null
+++ b/doc/庞浩注释的代码/WorkingNote.java
@@ -0,0 +1,372 @@
+/*
+ * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.micode.notes.model;
+
+import android.appwidget.AppWidgetManager;
+import android.content.ContentUris;
+import android.content.Context;
+import android.database.Cursor;
+import android.text.TextUtils;
+import android.util.Log;
+
+import net.micode.notes.data.Notes;
+import net.micode.notes.data.Notes.CallNote;
+import net.micode.notes.data.Notes.DataColumns;
+import net.micode.notes.data.Notes.DataConstants;
+import net.micode.notes.data.Notes.NoteColumns;
+import net.micode.notes.data.Notes.TextNote;
+import net.micode.notes.tool.ResourceParser.NoteBgResources;
+
+
+public class WorkingNote {
+    // Note for the working note（工作笔记类)
+    private Note mNote;// 笔记
+    // Note Id/笔记ID
+    private long mNoteId;
+    // Note content笔记内容
+    private String mContent;
+    // Note mode笔记模式
+    private int mMode;
+
+    private long mAlertDate;// 提醒日期
+
+    private long mModifiedDate;// 修改日期
+
+    private int mBgColorId;// 背景颜色ID
+
+    private int mWidgetId;// 小部件ID
+
+    private int mWidgetType;// 小部件类型
+
+    private long mFolderId;// 文件夹ID
+
+    private Context mContext;// 上下文
+
+    private static final String TAG = "WorkingNote";// 标签
+
+    private boolean mIsDeleted;// 是否已删除
+
+    private NoteSettingChangedListener mNoteSettingStatusListener;// 笔记设置改变监听器
+
+    public static final String[] DATA_PROJECTION = new String[] {// 查询数据时需要返回的列名数组
+            DataColumns.ID,// ID列
+            DataColumns.CONTENT, // 内容列
+            DataColumns.MIME_TYPE, // MIME类型列
+            DataColumns.DATA1, // 数据列1
+            DataColumns.DATA2,// 数据列2
+            DataColumns.DATA3, // 数据列3
+            DataColumns.DATA4,// 数据列4
+    };
+
+    public static final String[] NOTE_PROJECTION = new String[] {
+            NoteColumns.PARENT_ID,// 父ID列
+            NoteColumns.ALERTED_DATE,// 提醒日期列
+            NoteColumns.BG_COLOR_ID,// 背景颜色ID列
+            NoteColumns.WIDGET_ID,// 小部件ID列
+            NoteColumns.WIDGET_TYPE,// 小部件类型列
+            NoteColumns.MODIFIED_DATE // 修改日期列
+    };
+
+    private static final int DATA_ID_COLUMN = 0;// 数据表中数据ID列的索引，常量整数值为0
+
+
+    private static final int DATA_CONTENT_COLUMN = 1;  // 数据表中数据内容列的索引，常量整数值为1
+
+
+    private static final int DATA_MIME_TYPE_COLUMN = 2;// 数据表中数据MIME类型列的索引，常量整数值为2
+
+
+    private static final int DATA_MODE_COLUMN = 3; // 数据表中数据模式列的索引，常量整数值为3
+
+
+    private static final int NOTE_PARENT_ID_COLUMN = 0; // 笔记表中笔记父ID列的索引，常量整数值为0
+
+    private static final int NOTE_ALERTED_DATE_COLUMN = 1;// 笔记表中笔记提醒日期列的索引，常量整数值为1
+
+    private static final int NOTE_BG_COLOR_ID_COLUMN = 2;// 笔记表中笔记背景色ID列的索引，常量整数值为2
+
+    private static final int NOTE_WIDGET_ID_COLUMN = 3; // 笔记表中笔记小部件ID列的索引，常量整数值为3
+
+    private static final int NOTE_WIDGET_TYPE_COLUMN = 4;// 笔记表中笔记小部件类型列的索引，常量整数值为4
+
+    private static final int NOTE_MODIFIED_DATE_COLUMN = 5;// 笔记表中笔记修改日期列的索引，常量整数值为5
+
+    // New note construct创建新的笔记构造函数，传入上下文和文件夹ID
+    private WorkingNote(Context context, long folderId) {
+        mContext = context;// 初始化上下文
+        mAlertDate = 0;// 提醒日期设置为0
+        mModifiedDate = System.currentTimeMillis(); // 修改日期设置为当前时间
+        mFolderId = folderId;// 设置文件夹ID
+        mNote = new Note(); // 创建一个新的Note对象
+        mNoteId = 0;// 设置笔记ID为0
+        mIsDeleted = false;// 设置是否已删除为false
+        mMode = 0;// 设置工作模式为0
+        mWidgetType = Notes.TYPE_WIDGET_INVALIDE;// 设置小部件类型为无效类型
+    }
+
+    // Existing note construct加载现有笔记的构造函数，传入上下文、笔记ID和文件夹ID
+    private WorkingNote(Context context, long noteId, long folderId) {
+        mContext = context; // 初始化上下文
+        mNoteId = noteId;// 设置笔记ID
+        mFolderId = folderId;---------------------------// 设置文件夹ID
+        mIsDeleted = false;// 设置是否已删除为false
+        mNote = new Note(); // 创建一个新的Note对象
+        loadNote();// 加载现有笔记
+    }
+
+    private void loadNote() {// 通过笔记ID查询笔记的游标
+        Cursor cursor = mContext.getContentResolver().query(// 通过笔记ID查询笔记的游标
+                ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, mNoteId), NOTE_PROJECTION, null,
+                null, null);
+
+        if (cursor != null) {
+            if (cursor.moveToFirst()) {// 从游标中获取笔记的相关信息
+                mFolderId = cursor.getLong(NOTE_PARENT_ID_COLUMN);
+                mBgColorId = cursor.getInt(NOTE_BG_COLOR_ID_COLUMN);
+                mWidgetId = cursor.getInt(NOTE_WIDGET_ID_COLUMN);
+                mWidgetType = cursor.getInt(NOTE_WIDGET_TYPE_COLUMN);
+                mAlertDate = cursor.getLong(NOTE_ALERTED_DATE_COLUMN);
+                mModifiedDate = cursor.getLong(NOTE_MODIFIED_DATE_COLUMN);
+            }
+            cursor.close();
+        } else {// 如果找不到笔记，则记录错误日志并抛出异常
+            Log.e(TAG, "No note with id:" + mNoteId);
+            throw new IllegalArgumentException("Unable to find note with id " + mNoteId);
+        }// 加载笔记的数据
+        loadNoteData();
+    }
+
+    private void loadNoteData() {  // 通过笔记ID查询笔记数据的游标
+        Cursor cursor = mContext.getContentResolver().query(Notes.CONTENT_DATA_URI, DATA_PROJECTION,
+                DataColumns.NOTE_ID + "=?", new String[] {
+                    String.valueOf(mNoteId)
+                }, null);
+
+        if (cursor != null) {
+            if (cursor.moveToFirst()) {
+                do {// 获取笔记数据的类型
+                    String type = cursor.getString(DATA_MIME_TYPE_COLUMN);
+                    if (DataConstants.NOTE.equals(type)) {// 如果是笔记文本数据，则获取内容和模式，并设置笔记的文本数据ID
+                        mContent = cursor.getString(DATA_CONTENT_COLUMN);
+                        mMode = cursor.getInt(DATA_MODE_COLUMN);
+                        mNote.setTextDataId(cursor.getLong(DATA_ID_COLUMN));
+                    } else if (DataConstants.CALL_NOTE.equals(type)) {
+                        mNote.setCallDataId(cursor.getLong(DATA_ID_COLUMN));// 如果是电话笔记数据，则设置笔记的电话数据ID
+                    } else {
+                        Log.d(TAG, "Wrong note type with type:" + type);
+                    }// 如果是其他类型的笔记数据，则记录错误日志
+                } while (cursor.moveToNext());
+            }
+            cursor.close();
+        } else {  // 如果找不到笔记数据，则记录错误日志并抛出异常
+            Log.e(TAG, "No data with id:" + mNoteId);
+            throw new IllegalArgumentException("Unable to find note's data with id " + mNoteId);
+        }
+    }
+    // 创建一个空笔记
+    public static WorkingNote createEmptyNote(Context context, long folderId, int widgetId,
+            int widgetType, int defaultBgColorId) {
+        WorkingNote note = new WorkingNote(context, folderId);
+        note.setBgColorId(defaultBgColorId);
+        note.setWidgetId(widgetId);
+        note.setWidgetType(widgetType);
+        return note;
+    }
+    // 加载笔记
+    public static WorkingNote load(Context context, long id) {
+        return new WorkingNote(context, id, 0);
+    }
+    // 保存笔记
+    public synchronized boolean saveNote() {
+        if (isWorthSaving()) {
+            if (!existInDatabase()) {// 如果笔记还不存在于数据库中，则为其生成一个新的ID
+                if ((mNoteId = Note.getNewNoteId(mContext, mFolderId)) == 0) {
+                    Log.e(TAG, "Create new note fail with id:" + mNoteId);
+                    return false;
+                }
+            }
+            // 将笔记同步到数据库中
+            mNote.syncNote(mContext, mNoteId);
+
+            /**
+             * Update widget content if there exist any widget of this note如果笔记存在小部件，则更新小部件的内容
+             */
+            if (mWidgetId != AppWidgetManager.INVALID_APPWIDGET_ID
+                    && mWidgetType != Notes.TYPE_WIDGET_INVALIDE
+                    && mNoteSettingStatusListener != null) {
+                mNoteSettingStatusListener.onWidgetChanged();
+            }
+            return true;
+        } else {
+            return false;
+        }
+    }
+    // 判断笔记是否已经存在于数据库中
+    public boolean existInDatabase() {
+        return mNoteId > 0;
+    }
+    // 判断笔记是否值得保存
+    private boolean isWorthSaving() {
+        if (mIsDeleted || (!existInDatabase() && TextUtils.isEmpty(mContent))
+                || (existInDatabase() && !mNote.isLocalModified())) {
+            return false;
+        } else {
+            return true;
+        }
+    }
+    // 设置笔记设置状态改变的监听器
+    public void setOnSettingStatusChangedListener(NoteSettingChangedListener l) {
+        mNoteSettingStatusListener = l;
+    }
+    // 设置提醒日期
+    public void setAlertDate(long date, boolean set) {
+        if (date != mAlertDate) {
+            mAlertDate = date;
+            mNote.setNoteValue(NoteColumns.ALERTED_DATE, String.valueOf(mAlertDate));
+        }
+        if (mNoteSettingStatusListener != null) {
+            mNoteSettingStatusListener.onClockAlertChanged(date, set);
+        }
+    }
+    // 标记笔记是否被删除
+    public void markDeleted(boolean mark) {
+        mIsDeleted = mark;
+        if (mWidgetId != AppWidgetManager.INVALID_APPWIDGET_ID
+                && mWidgetType != Notes.TYPE_WIDGET_INVALIDE && mNoteSettingStatusListener != null) {
+                mNoteSettingStatusListener.onWidgetChanged();
+        }
+    }
+    // 设置笔记的背景颜色
+    public void setBgColorId(int id) {
+        if (id != mBgColorId) {
+            mBgColorId = id;
+            if (mNoteSettingStatusListener != null) {
+                mNoteSettingStatusListener.onBackgroundColorChanged();
+            }
+            mNote.setNoteValue(NoteColumns.BG_COLOR_ID, String.valueOf(id));
+        }
+    }
+    // 设置笔记的检查列表模式
+    public void setCheckListMode(int mode) {
+        if (mMode != mode) {
+            if (mNoteSettingStatusListener != null) {
+                mNoteSettingStatusListener.onCheckListModeChanged(mMode, mode);
+            }
+            mMode = mode;
+            mNote.setTextData(TextNote.MODE, String.valueOf(mMode));
+        }
+    }
+    // 设置笔记的小部件类型
+    public void setWidgetType(int type) {
+        if (type != mWidgetType) {
+            mWidgetType = type;
+            mNote.setNoteValue(NoteColumns.WIDGET_TYPE, String.valueOf(mWidgetType));
+        }
+    }
+    // 设置笔记的小部件ID
+    public void setWidgetId(int id) {
+        if (id != mWidgetId) {
+            mWidgetId = id;
+            mNote.setNoteValue(NoteColumns.WIDGET_ID, String.valueOf(mWidgetId));
+        }
+    }
+    //设置文本内容
+    public void setWorkingText(String text) {
+        if (!TextUtils.equals(mContent, text)) {
+            mContent = text;
+            mNote.setTextData(DataColumns.CONTENT, mContent);
+        }
+    }
+    //这是一个将笔记转换为电话记录的方法。它包含电话号码和通话日期，并更新笔记对象的值
+    public void convertToCallNote(String phoneNumber, long callDate) {
+        mNote.setCallData(CallNote.CALL_DATE, String.valueOf(callDate));
+        mNote.setCallData(CallNote.PHONE_NUMBER, phoneNumber);
+        mNote.setNoteValue(NoteColumns.PARENT_ID, String.valueOf(Notes.ID_CALL_RECORD_FOLDER));
+    }
+    //指示笔记是否有闹钟提醒
+    public boolean hasClockAlert() {
+        return (mAlertDate > 0 ? true : false);
+    }
+    // 返回笔记的文本内容
+    public String getContent() {
+        return mContent;
+    }
+    // 返回笔记的警报日期
+    public long getAlertDate() {
+        return mAlertDate;
+    }
+    // 返回笔记的修改日期
+    public long getModifiedDate() {
+        return mModifiedDate;
+    }
+    // 返回笔记的背景颜色资源ID
+    public int getBgColorResId() {
+        return NoteBgResources.getNoteBgResource(mBgColorId);
+    }
+    // 返回笔记的背景颜色ID
+    public int getBgColorId() {
+        return mBgColorId;
+    }
+    // 返回笔记标题的背景颜色资源ID
+    public int getTitleBgResId() {
+        return NoteBgResources.getNoteTitleBgResource(mBgColorId);
+    }
+    // 返回笔记的检查清单模式
+    public int getCheckListMode() {
+        return mMode;
+    }
+    // 返回笔记的ID
+    public long getNoteId() {
+        return mNoteId;
+    }
+    // 返回笔记所在文件夹的ID
+    public long getFolderId() {
+        return mFolderId;
+    }
+    // 返回笔记所属的小部件ID
+    public int getWidgetId() {
+        return mWidgetId;
+    }
+    // 返回笔记所属的小部件类型
+    public int getWidgetType() {
+        return mWidgetType;
+    }
+
+    public interface NoteSettingChangedListener {
+        /**
+         * Called when the background color of current note has just changed
+         */
+        void onBackgroundColorChanged();
+
+        /**
+         * Called when user set clock
+         */
+        void onClockAlertChanged(long date, boolean set);
+
+        /**
+         * Call when user create note from widget
+         */
+        void onWidgetChanged();
+
+        /**
+         * Call when switch between check list mode and normal mode
+         * @param oldMode is previous mode before change
+         * @param newMode is new mode
+         */
+        void onCheckListModeChanged(int oldMode, int newMode);
+    }
+}
diff --git a/doc/新增统计字数功能（庞浩）.docx b/doc/新增统计字数功能（庞浩）.docx
new file mode 100644
index 0000000..b9d7c64
Binary files /dev/null and b/doc/新增统计字数功能（庞浩）.docx differ
diff --git a/doc/新增统计文件夹下多少便签功能(邹兴云).wps b/doc/新增统计文件夹下多少便签功能(邹兴云).wps
new file mode 100644
index 0000000..88f7b47
Binary files /dev/null and b/doc/新增统计文件夹下多少便签功能(邹兴云).wps differ
diff --git a/local.properties b/local.properties
index 4c356d2..2e49918 100644
--- a/local.properties
+++ b/local.properties
@@ -4,5 +4,10 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
+<<<<<<< HEAD:local.properties
 #Wed Jun 07 13:25:38 CST 2023
 sdk.dir=D\:\\Android\\SDK
+=======
+#Thu Apr 27 00:30:42 CST 2023
+sdk.dir=D\:\\Androidsdk
+>>>>>>> master:src/local.properties
diff --git a/src/.gradle/7.5/executionHistory/executionHistory.bin b/src/.gradle/7.5/executionHistory/executionHistory.bin
new file mode 100644
index 0000000..dfae0ba
Binary files /dev/null and b/src/.gradle/7.5/executionHistory/executionHistory.bin differ
diff --git a/src/.gradle/7.5/executionHistory/executionHistory.lock b/src/.gradle/7.5/executionHistory/executionHistory.lock
new file mode 100644
index 0000000..0a5eb02
Binary files /dev/null and b/src/.gradle/7.5/executionHistory/executionHistory.lock differ
diff --git a/src/.gradle/7.5/fileHashes/fileHashes.bin b/src/.gradle/7.5/fileHashes/fileHashes.bin
new file mode 100644
index 0000000..8003f14
Binary files /dev/null and b/src/.gradle/7.5/fileHashes/fileHashes.bin differ
diff --git a/src/.gradle/7.5/fileHashes/fileHashes.lock b/src/.gradle/7.5/fileHashes/fileHashes.lock
new file mode 100644
index 0000000..54d4320
Binary files /dev/null and b/src/.gradle/7.5/fileHashes/fileHashes.lock differ
diff --git a/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock
new file mode 100644
index 0000000..a0aa15a
Binary files /dev/null and b/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/src/.gradle/buildOutputCleanup/outputFiles.bin b/src/.gradle/buildOutputCleanup/outputFiles.bin
new file mode 100644
index 0000000..bad072f
Binary files /dev/null and b/src/.gradle/buildOutputCleanup/outputFiles.bin differ
diff --git a/src/.gradle/file-system.probe b/src/.gradle/file-system.probe
new file mode 100644
index 0000000..a0aa51c
Binary files /dev/null and b/src/.gradle/file-system.probe differ
diff --git a/src/.idea/vcs.xml b/src/.idea/vcs.xml
index 6c0b863..343e6f8 100644
--- a/src/.idea/vcs.xml
+++ b/src/.idea/vcs.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
+<<<<<<< HEAD
+=======
+    <mapping directory="" vcs="Git" />
+>>>>>>> master
     <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin
new file mode 100644
index 0000000..601f245
Binary files /dev/null and b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin differ
diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin
new file mode 100644
index 0000000..601f245
Binary files /dev/null and b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin differ
diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin
new file mode 100644
index 0000000..601f245
Binary files /dev/null and b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin differ
diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin
new file mode 100644
index 0000000..601f245
Binary files /dev/null and b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin differ
diff --git a/src/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/src/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex
new file mode 100644
index 0000000..2102212
Binary files /dev/null and b/src/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex differ
diff --git a/src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out
new file mode 100644
index 0000000..039aa1c
Binary files /dev/null and b/src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ
diff --git a/src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
new file mode 100644
index 0000000..26a7a10
--- /dev/null
+++ b/src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
@@ -0,0 +1,96 @@
+#Wed Jun 07 10:58:20 CST 2023
+net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/edit_yellow.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_green.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat
+net.micode.notes.app-main-7\:/menu/sub_folder.xml=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/font_small.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_white.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/edit_white.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat
+net.micode.notes.app-main-7\:/layout/account_dialog_title.xml=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_green.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_down.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat
+net.micode.notes.app-main-7\:/color/secondary_text_dark.xml=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
+net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat
+net.micode.notes.app-main-7\:/layout/widget_4x.xml=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/menu_delete.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/font_normal.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat
+net.micode.notes.app-main-7\:/layout/note_edit.xml=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_green_single.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_white_single.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat
+net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat
+net.micode.notes.app-main-7\:/xml/preferences.xml=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat
+net.micode.notes.app-main-7\:/menu/call_record_folder.xml=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_red.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat
+net.micode.notes.app-main-7\:/layout/widget_2x.xml=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_green_down.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat
+net.micode.notes.app-main-7\:/layout/note_edit_list_item.xml=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_blue.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat
+net.micode.notes.app-main-7\:/layout/add_account_text.xml=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat
+net.micode.notes.app-main-7\:/xml/widget_4x_info.xml=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/selected.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_white.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_middle.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_green_middle.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_white_down.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_single.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/font_large.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_up.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_red_middle.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat
+net.micode.notes.app-main-7\:/layout/settings_header.xml=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat
+net.micode.notes.app-main-7\:/menu/note_list.xml=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat
+net.micode.notes.app-main-7\:/menu/call_note_edit.xml=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat
+net.micode.notes.app-main-7\:/drawable/new_note.xml=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/edit_red.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat
+net.micode.notes.app-main-7\:/layout/note_list.xml=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat
+net.micode.notes.app-main-7\:/color/primary_text_dark.xml=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
+net.micode.notes.app-main-7\:/layout/datetime_picker.xml=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat
+net.micode.notes.app-main-7\:/raw/introduction=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_single.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_yellow.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_red.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/title_alert.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_red_down.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat
+net.micode.notes.app-main-7\:/menu/note_list_options.xml=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_yellow.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/icon_app.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat
+net.micode.notes.app-main-7\:/layout/note_item.xml=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_red.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/title_bar_bg.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_footer_bg.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/new_note_pressed.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_green_up.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat
+net.micode.notes.app-main-7\:/layout/note_list_dropdown_menu.xml=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat
+net.micode.notes.app-main-7\:/layout/note_list_footer.xml=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_red_up.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat
+net.micode.notes.app-main-7\:/menu/note_list_dropdown.xml=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_white_up.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_blue.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/edit_blue.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/bg_btn_set_color.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_white.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat
+net.micode.notes.app-main-7\:/xml/searchable.xml=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_up.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat
+net.micode.notes.app-main-7\:/xml/widget_2x_info.xml=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_white_middle.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat
+net.micode.notes.app-main-7\:/layout/folder_list_item.xml=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_folder.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_blue.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_down.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat
+net.micode.notes.app-main-7\:/menu/note_edit.xml=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat
diff --git a/src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
new file mode 100644
index 0000000..a760c24
--- /dev/null
+++ b/src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:ns1="urn:oasis:names:tc:xliff:document:1.2">
+    <string-array name="menu_share_ways">
+        <item>短信</item>
+        <item>邮件</item>
+    </string-array>
+    <plurals name="search_results_title">
+        <item quantity="other"><ns1:g id="NUMBER">%1$s</ns1:g> 条符合“<ns1:g id="SEARCH">%2$s</ns1:g>”的搜索结果</item>
+    </plurals>
+    <string name="alert_message_delete_folder">确认删除文件夹及所包含的便签吗？</string>
+    <string name="alert_message_delete_note">确认要删除该条便签吗?</string>
+    <string name="alert_message_delete_notes">确认要删除所选的 %d 条便签吗?</string>
+    <string name="alert_title_delete">删除</string>
+    <string name="app_name">便签</string>
+    <string name="app_widget2x2">便签2x2</string>
+    <string name="app_widget4x4">便签4x4</string>
+    <string name="button_delete">删除</string>
+    <string name="call_record_folder_name">通话便签</string>
+    <string name="datetime_dialog_cancel">取消</string>
+    <string name="datetime_dialog_ok">设置</string>
+    <string name="delete_remind_time_message">成功删除提醒</string>
+    <string name="error_note_empty_for_clock">不能为空便签设置闹钟提醒</string>
+    <string name="error_note_empty_for_send_to_desktop">不能将空便签发送到桌面</string>
+    <string name="error_note_not_exist">要查看的便签不存在</string>
+    <string name="error_sdcard_export">导出文本时发生错误，请检查SD卡</string>
+    <string name="error_sdcard_unmounted">SD卡被占用，不能操作</string>
+    <string name="error_sync_cancelled">同步已取消</string>
+    <string name="error_sync_internal">同步失败，发生内部错误</string>
+    <string name="error_sync_network">同步失败，请检查网络和帐号设置</string>
+    <string name="failed_sdcard_export">导出失败</string>
+    <string name="folder_exist">文件夹 %1$s 已存在，请重新命名</string>
+    <string name="format_date_ymd">yyyyMMdd</string>
+    <string name="format_datetime_mdhm">MM月dd日 kk:mm</string>
+    <string name="format_exported_file_location">已将文本文件(%1$s)输出至SD卡(%2$s)目录</string>
+    <string name="format_move_notes_to_folder">已将所选 %1$d 条便签移到 %2$s 文件夹</string>
+    <string name="hint_foler_name">请输入名称</string>
+    <string name="info_note_enter_desktop">已添加到桌面</string>
+    <string name="menu_alert">提醒我</string>
+    <string name="menu_create_folder">新建文件夹</string>
+    <string name="menu_delete">删除</string>
+    <string name="menu_deselect_all">取消全选</string>
+    <string name="menu_export_text">导出文本</string>
+    <string name="menu_folder_change_name">修改文件夹名称</string>
+    <string name="menu_folder_delete">刪除文件夹</string>
+    <string name="menu_folder_view">查看文件夹</string>
+    <string name="menu_font_large">大</string>
+    <string name="menu_font_normal">正常</string>
+    <string name="menu_font_size">文字大小</string>
+    <string name="menu_font_small">小</string>
+    <string name="menu_font_super">超大</string>
+    <string name="menu_list_mode">进入清单模式</string>
+    <string name="menu_move">移动到文件夹</string>
+    <string name="menu_move_parent_folder">上一级文件夹</string>
+    <string name="menu_normal_mode">退出清单模式</string>
+    <string name="menu_remove_remind">删除提醒</string>
+    <string name="menu_search">搜索</string>
+    <string name="menu_select_all">全选</string>
+    <string name="menu_select_none">没有选中项，操作无效</string>
+    <string name="menu_select_title">选中了 %d 项</string>
+    <string name="menu_send_to_desktop">发送到桌面</string>
+    <string name="menu_setting">设置</string>
+    <string name="menu_share">分享</string>
+    <string name="menu_sync">同步</string>
+    <string name="menu_sync_cancel">取消同步</string>
+    <string name="menu_title_select_folder">选择文件夹</string>
+    <string name="note_alert_expired">已过期</string>
+    <string name="note_length">字数</string>
+    <string name="note_link_email">发送邮件</string>
+    <string name="note_link_other">打开地图</string>
+    <string name="note_link_tel">呼叫电话</string>
+    <string name="note_link_web">浏览网页</string>
+    <string name="notealert_enter">查看</string>
+    <string name="notealert_ok">知道了</string>
+    <string name="notelist_menu_new">新建便签</string>
+    <string name="notelist_string_info">...</string>
+    <string name="preferences_account_summary">与google task同步便签记录</string>
+    <string name="preferences_account_title">同步账号</string>
+    <string name="preferences_add_account">添加账号</string>
+    <string name="preferences_bg_random_appear_title">新建便签背景颜色随机</string>
+    <string name="preferences_button_sync_cancel">取消同步</string>
+    <string name="preferences_button_sync_immediately">立即同步</string>
+    <string name="preferences_dialog_change_account_title">当前帐号 %1$s</string>
+    <string name="preferences_dialog_change_account_warn_msg">如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复</string>
+    <string name="preferences_dialog_select_account_tips">请选择google帐号，便签将与该帐号的google task内容同步。</string>
+    <string name="preferences_dialog_select_account_title">同步便签</string>
+    <string name="preferences_last_sync_time">上次同步于 %1$s</string>
+    <string name="preferences_menu_cancel">取消</string>
+    <string name="preferences_menu_change_account">更换账号</string>
+    <string name="preferences_menu_remove_account">删除账号</string>
+    <string name="preferences_title">设置</string>
+    <string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帐号</string>
+    <string name="preferences_toast_success_set_accout">同步帐号已设置为%1$s</string>
+    <string name="search">便签</string>
+    <string name="search_hint">搜索便签</string>
+    <string name="search_label">正在搜索便签</string>
+    <string name="search_setting_description">便签中的文字</string>
+    <string name="set_remind_time_message">创建提醒</string>
+    <string name="success_sdcard_export">导出成功</string>
+    <string name="success_sync_account">与%1$s同步成功</string>
+    <string name="sync_progress_init_list">正在获取服务器便签列表...</string>
+    <string name="sync_progress_login">登录%1$s...</string>
+    <string name="sync_progress_syncing">正在同步本地便签...</string>
+    <string name="ticker_cancel">同步已取消</string>
+    <string name="ticker_fail">同步失败</string>
+    <string name="ticker_success">同步成功</string>
+    <string name="ticker_syncing">同步便签...</string>
+    <string name="widget_havenot_content">没有关联内容，点击新建便签。</string>
+    <string name="widget_under_visit_mode">访客模式下，便签内容不可见</string>
+</resources>
\ No newline at end of file
diff --git a/src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml b/src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml
new file mode 100644
index 0000000..437283a
--- /dev/null
+++ b/src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:ns1="urn:oasis:names:tc:xliff:document:1.2">
+    <string-array name="menu_share_ways">
+        <item>短信</item>
+        <item>郵件</item>
+    </string-array>
+    <plurals name="search_results_title">
+        <item quantity="other"><ns1:g id="NUMBER">%1$s</ns1:g> 條符合”<ns1:g id="SEARCH">%2$s</ns1:g>“的搜尋結果</item>
+    </plurals>
+    <string name="alert_message_delete_folder">確認刪除檔夾及所包含的便簽嗎？</string>
+    <string name="alert_message_delete_note">确认要删除該條便籤嗎?</string>
+    <string name="alert_message_delete_notes">确认要刪除所選的 %d 條便籤嗎?</string>
+    <string name="alert_title_delete">刪除</string>
+    <string name="app_name">便簽</string>
+    <string name="app_widget2x2">便簽2x2</string>
+    <string name="app_widget4x4">便簽4x4</string>
+    <string name="button_delete">刪除</string>
+    <string name="call_record_folder_name">通話便籤</string>
+    <string name="datetime_dialog_cancel">取消</string>
+    <string name="datetime_dialog_ok">設置</string>
+    <string name="delete_remind_time_message">成功刪除提醒</string>
+    <string name="error_note_empty_for_clock">不能爲空便籤設置鬧鐘提醒</string>
+    <string name="error_note_empty_for_send_to_desktop">不能將空便籤發送到桌面</string>
+    <string name="error_note_not_exist">要查看的便籤不存在</string>
+    <string name="error_sdcard_export">導出TXT時發生錯誤，請檢查SD卡</string>
+    <string name="error_sdcard_unmounted">SD卡被佔用，不能操作</string>
+    <string name="error_sync_cancelled">同步已取消</string>
+    <string name="error_sync_internal">同步失敗，發生內部錯誤</string>
+    <string name="error_sync_network">同步失敗，請檢查網絡和帳號設置</string>
+    <string name="failed_sdcard_export">導出失敗</string>
+    <string name="folder_exist">文件夾 %1$s 已存在，請重新命名</string>
+    <string name="format_date_ymd">yyyyMMdd</string>
+    <string name="format_datetime_mdhm">MM月dd日 kk:mm</string>
+    <string name="format_exported_file_location">已將文本文件(%1$s)導出至SD(%2$s)目錄</string>
+    <string name="format_move_notes_to_folder">已將所選 %1$d 便籤移到 %2$s 文件夾</string>
+    <string name="hint_foler_name">請輸入名稱</string>
+    <string name="info_note_enter_desktop">已添加到桌面</string>
+    <string name="menu_alert">提醒我</string>
+    <string name="menu_create_folder">新建文件夾</string>
+    <string name="menu_delete">刪除</string>
+    <string name="menu_deselect_all">取消全選</string>
+    <string name="menu_export_text">導出文本</string>
+    <string name="menu_folder_change_name">修改文件夾名稱</string>
+    <string name="menu_folder_delete">刪除文件夾</string>
+    <string name="menu_folder_view">查看文件夾</string>
+    <string name="menu_font_large">大</string>
+    <string name="menu_font_normal">正常</string>
+    <string name="menu_font_size">文字大小</string>
+    <string name="menu_font_small">小</string>
+    <string name="menu_font_super">超大</string>
+    <string name="menu_list_mode">進入清單模式</string>
+    <string name="menu_move">移動到文件夾</string>
+    <string name="menu_move_parent_folder">上一級文件夾</string>
+    <string name="menu_normal_mode">退出清單模式</string>
+    <string name="menu_remove_remind">刪除提醒</string>
+    <string name="menu_search">搜尋</string>
+    <string name="menu_select_all">全選</string>
+    <string name="menu_select_none">沒有選中項，操作無效</string>
+    <string name="menu_select_title">選中了 %d 項</string>
+    <string name="menu_send_to_desktop">發送到桌面</string>
+    <string name="menu_setting">設置</string>
+    <string name="menu_share">分享</string>
+    <string name="menu_sync">同步</string>
+    <string name="menu_sync_cancel">取消同步</string>
+    <string name="menu_title_select_folder">選擇文件夾</string>
+    <string name="note_alert_expired">已過期</string>
+    <string name="note_length">字數</string>
+    <string name="note_link_email">發送郵件</string>
+    <string name="note_link_other">打開地圖</string>
+    <string name="note_link_tel">呼叫電話</string>
+    <string name="note_link_web">浏覽網頁</string>
+    <string name="notealert_enter">查看</string>
+    <string name="notealert_ok">知道了</string>
+    <string name="notelist_menu_new">新建便簽</string>
+    <string name="notelist_string_info">...</string>
+    <string name="preferences_account_summary">与google task同步便簽記錄</string>
+    <string name="preferences_account_title">同步賬號</string>
+    <string name="preferences_add_account">添加賬號</string>
+    <string name="preferences_bg_random_appear_title">新建便籤背景顏色隨機</string>
+    <string name="preferences_button_sync_cancel">取消同步</string>
+    <string name="preferences_button_sync_immediately">立即同步</string>
+    <string name="preferences_dialog_change_account_title">當前帳號 %1$s</string>
+    <string name="preferences_dialog_change_account_warn_msg">如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復</string>
+    <string name="preferences_dialog_select_account_tips">請選擇google帳號，便簽將與該帳號的google task內容同步。</string>
+    <string name="preferences_dialog_select_account_title">同步便簽</string>
+    <string name="preferences_last_sync_time">上次同步于 %1$s</string>
+    <string name="preferences_menu_cancel">取消</string>
+    <string name="preferences_menu_change_account">更換賬號</string>
+    <string name="preferences_menu_remove_account">刪除賬號</string>
+    <string name="preferences_title">設置</string>
+    <string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帳號</string>
+    <string name="preferences_toast_success_set_accout">同步帳號已設置為%1$s</string>
+    <string name="search">便籤</string>
+    <string name="search_hint">搜索便籤</string>
+    <string name="search_label">正在搜索便籤</string>
+    <string name="search_setting_description">便籤中的文字</string>
+    <string name="set_remind_time_message">創建提醒</string>
+    <string name="success_sdcard_export">導出成功</string>
+    <string name="success_sync_account">與%1$s同步成功</string>
+    <string name="sync_progress_init_list">正在獲取服務器便籤列表...</string>
+    <string name="sync_progress_login">登陸%1$s...</string>
+    <string name="sync_progress_syncing">正在同步本地便籤...</string>
+    <string name="ticker_cancel">同步已取消</string>
+    <string name="ticker_fail">同步失敗</string>
+    <string name="ticker_success">同步成功</string>
+    <string name="ticker_syncing">同步便簽...</string>
+    <string name="widget_havenot_content">沒有關聯內容，點擊新建便簽。</string>
+    <string name="widget_under_visit_mode">訪客模式下，便籤內容不可見</string>
+</resources>
\ No newline at end of file
diff --git a/src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml b/src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml
new file mode 100644
index 0000000..4825bcf
--- /dev/null
+++ b/src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:ns1="urn:oasis:names:tc:xliff:document:1.2">
+    <string-array name="format_for_exported_note">
+        <item>-%s</item>      
+        <item>--%s</item>     
+        <item>--%s</item>     
+        <item>--%s</item>     
+    </string-array>
+    <string-array name="menu_share_ways">
+        <item>Messaging</item>
+        <item>Email</item>
+    </string-array>
+    <color name="user_query_highlight">#335b5b5b</color>
+    <dimen name="text_font_size_large">26sp</dimen>
+    <dimen name="text_font_size_medium">20sp</dimen>
+    <dimen name="text_font_size_normal">17sp</dimen>
+    <dimen name="text_font_size_small">14sp</dimen>
+    <dimen name="text_font_size_super">33sp</dimen>
+    <plurals name="search_results_title">
+         <item quantity="one"><ns1:g example="1" id="number">%1$s</ns1:g> result for \"<ns1:g example="???" id="search">%2$s</ns1:g>\"</item>
+        
+        <item quantity="other"><ns1:g example="15" id="number">%1$s</ns1:g> results for \"<ns1:g example="???" id="search">%2$s</ns1:g>\"</item>
+    </plurals>
+    <string name="alert_message_delete_folder">Confirm to delete folder and its notes?</string>
+    <string name="alert_message_delete_note">Confirm to delete this note?</string>
+    <string name="alert_message_delete_notes">Confirm to delete the selected %d notes?</string>
+    <string name="alert_title_delete">Delete selected notes</string>
+    <string name="app_name">Notes</string>
+    <string name="app_widget2x2">Notes 2x2</string>
+    <string name="app_widget4x4">Notes 4x4</string>
+    <string name="button_delete">Delete</string>
+    <string name="call_record_folder_name">Call notes</string>
+    <string name="datetime_dialog_cancel">cancel</string>
+    <string name="datetime_dialog_ok">set</string>
+    <string name="delete_remind_time_message">Delete reminder successfully</string>
+    <string name="error_note_empty_for_clock">Sorry, can not set clock on empty note</string>
+    <string name="error_note_empty_for_send_to_desktop">Sorry, can not send and empty note to home</string>
+    <string name="error_note_not_exist">The note is not exist</string>
+    <string name="error_sdcard_export">Export failed, please check SD card</string>
+    <string name="error_sdcard_unmounted">SD card busy, not available now</string>
+    <string name="error_sync_cancelled">Sync is canceled</string>
+    <string name="error_sync_internal">Sync failed, internal error occurs</string>
+    <string name="error_sync_network">Sync failed, please check network and account settings</string>
+    <string name="failed_sdcard_export">Export fail</string>
+    <string name="file_name_txt_format">notes_%s.txt</string>
+    <string name="file_path">/MIUI/notes/</string>
+    <string name="folder_exist">The folder %1$s exist, please rename</string>
+    <string name="format_date_ymd">yyyyMMdd</string>
+    <string name="format_datetime_mdhm">MMMd kk:mm</string>
+    <string name="format_exported_file_location">Export text file (%1$s) to SD (%2$s) directory</string>
+    <string name="format_folder_files_count">(%d)</string>
+    <string name="format_move_notes_to_folder">Have moved selected %1$d notes to %2$s folder</string>
+    <string name="hint_foler_name">Input name</string>
+    <string name="info_note_enter_desktop">Note added to home</string>
+    <string name="menu_alert">Remind me</string>
+    <string name="menu_create_folder">New Folder</string>
+    <string name="menu_delete">Delete</string>
+    <string name="menu_deselect_all">Deselect all</string>
+    <string name="menu_export_text">Export text</string>
+    <string name="menu_folder_change_name">Change folder name</string>
+    <string name="menu_folder_delete">Delete folder</string>
+    <string name="menu_folder_view">View folder</string>
+    <string name="menu_font_large">Large</string>
+    <string name="menu_font_normal">Medium</string>
+    <string name="menu_font_size">Font size</string>
+    <string name="menu_font_small">Small</string>
+    <string name="menu_font_super">Super</string>
+    <string name="menu_list_mode">Enter check list</string>
+    <string name="menu_move">Move to folder</string>
+    <string name="menu_move_parent_folder">Parent folder</string>
+    <string name="menu_normal_mode">Leave check list</string>
+    <string name="menu_remove_remind">Delete reminder</string>
+    <string name="menu_search">Search</string>
+    <string name="menu_select_all">Select all</string>
+    <string name="menu_select_none">Nothing selected, the operation is invalid</string>
+    <string name="menu_select_title">%d selected</string>
+    <string name="menu_send_to_desktop">Send to home</string>
+    <string name="menu_setting">Settings</string>
+    <string name="menu_share">Share</string>
+    <string name="menu_sync">Sync</string>
+    <string name="menu_sync_cancel">Cancel syncing</string>
+    <string name="menu_title_select_folder">Select folder</string>
+    <string name="note_alert_expired">Expired</string>
+    <string name="note_length">Length</string>
+    <string name="note_link_email">Send email</string>
+    <string name="note_link_other">Open map</string>
+    <string name="note_link_tel">Call</string>
+    <string name="note_link_web">Browse web</string>
+    <string name="notealert_enter">Take a look</string>
+    <string name="notealert_ok">Got it</string>
+    <string name="notelist_menu_new">Add note</string>
+    <string name="notelist_string_info">...</string>
+    <string name="preferences_account_summary">Sync notes with google task</string>
+    <string name="preferences_account_title">Sync account</string>
+    <string name="preferences_add_account">Add account</string>
+    <string name="preferences_bg_random_appear_title">New note background color random</string>
+    <string name="preferences_button_sync_cancel">Cancel syncing</string>
+    <string name="preferences_button_sync_immediately">Sync immediately</string>
+    <string name="preferences_dialog_change_account_title">Current account %1$s</string>
+    <string name="preferences_dialog_change_account_warn_msg">All sync related information will be deleted, which may result in duplicated items sometime</string>
+    <string name="preferences_dialog_select_account_tips">Please select a google account. Local notes will be synced with google task.</string>
+    <string name="preferences_dialog_select_account_title">Sync notes</string>
+    <string name="preferences_last_sync_time">Last sync time %1$s</string>
+    <string name="preferences_last_sync_time_format">yyyy-MM-dd hh:mm:ss</string>
+    <string name="preferences_menu_cancel">Cancel</string>
+    <string name="preferences_menu_change_account">Change sync account</string>
+    <string name="preferences_menu_remove_account">Remove sync account</string>
+    <string name="preferences_title">Settings</string>
+    <string name="preferences_toast_cannot_change_account">Cannot change the account because sync is in progress</string>
+    <string name="preferences_toast_success_set_accout">%1$s has been set as the sync account</string>
+    <string name="search">Notes</string>
+    <string name="search_hint">Search notes</string>
+    <string name="search_label">Searching Notes</string>
+    <string name="search_setting_description">Text in your notes</string>
+    <string name="set_remind_time_message">Set reminder</string>
+    <string name="success_sdcard_export">Export successful</string>
+    <string name="success_sync_account">Sync is successful with account %1$s</string>
+    <string name="sync_progress_init_list">Getting remote note list...</string>
+    <string name="sync_progress_login">Logging into %1$s...</string>
+    <string name="sync_progress_syncing">Synchronize local notes with Google Task...</string>
+    <string name="ticker_cancel">Sync is canceled</string>
+    <string name="ticker_fail">Sync is failed</string>
+    <string name="ticker_success">Sync is successful</string>
+    <string name="ticker_syncing">Syncing notes...</string>
+    <string name="widget_havenot_content">No associated note found, click to create associated note.</string>
+    <string name="widget_under_visit_mode">Privacy mode，can not see note content</string>
+    <style name="HighlightTextAppearancePrimary">
+    <item name="android:textSize">@dimen/text_font_size_normal</item>
+        <item name="android:textColor">@color/primary_text_dark</item>
+    </style>
+    <style name="HighlightTextAppearanceSecondary">
+        <item name="android:textSize">@dimen/text_font_size_small</item>
+        <item name="android:textColor">@color/secondary_text_dark</item>
+    </style>
+    <style name="NoteActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid">
+        
+        <item name="android:visibility">visible</item>
+    </style>
+    <style name="NoteTheme" parent="@android:style/Theme.Holo.Light">
+        <item name="android:actionBarStyle">@style/NoteActionBarStyle</item>
+    </style>
+    <style name="TextAppearanceLarge">
+        <item name="android:textSize">@dimen/text_font_size_large</item>
+        <item name="android:textColorLink">#0000ff</item>
+    </style>
+    <style name="TextAppearanceMedium">
+        <item name="android:textSize">@dimen/text_font_size_medium</item>
+        <item name="android:textColorLink">#0000ff</item>
+    </style>
+    <style name="TextAppearanceNormal">
+        <item name="android:textSize">@dimen/text_font_size_normal</item>
+        <item name="android:textColorLink">#0000ff</item>
+    </style>
+    <style name="TextAppearancePrimaryItem">
+        <item name="android:textSize">@dimen/text_font_size_normal</item>
+        <item name="android:textColor">@color/primary_text_dark</item>
+    </style>
+    <style name="TextAppearanceSecondaryItem">
+        <item name="android:textSize">@dimen/text_font_size_small</item>
+        <item name="android:textColor">@color/secondary_text_dark</item>
+    </style>
+    <style name="TextAppearanceSuper">
+        <item name="android:textSize">@dimen/text_font_size_super</item>
+        <item name="android:textColorLink">#0000ff</item>
+    </style>
+    <style name="TextAppearanceUnderMenuIcon">
+        <item name="android:textSize">@dimen/text_font_size_normal</item>
+        <item name="android:textColor">@android:color/black</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/src/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/src/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
new file mode 100644
index 0000000..750d281
--- /dev/null
+++ b/src/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merger version="3" xmlns:ns1="urn:oasis:names:tc:xliff:document:1.2"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\softwareengineering\minote\src\app\src\main\res"/><source path="D:\softwareengineering\minote\src\app\build\generated\res\rs\debug"/><source path="D:\softwareengineering\minote\src\app\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\softwareengineering\minote\src\app\src\main\res"><file name="primary_text_dark" path="D:\softwareengineering\minote\src\app\src\main\res\color\primary_text_dark.xml" qualifiers="" type="color"/><file name="secondary_text_dark" path="D:\softwareengineering\minote\src\app\src\main\res\color\secondary_text_dark.xml" qualifiers="" type="color"/><file name="new_note" path="D:\softwareengineering\minote\src\app\src\main\res\drawable\new_note.xml" qualifiers="" type="drawable"/><file name="bg_btn_set_color" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\bg_btn_set_color.png" qualifiers="hdpi-v4" type="drawable"/><file name="bg_color_btn_mask" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\bg_color_btn_mask.png" qualifiers="hdpi-v4" type="drawable"/><file name="call_record" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\call_record.png" qualifiers="hdpi-v4" type="drawable"/><file name="clock" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\clock.png" qualifiers="hdpi-v4" type="drawable"/><file name="delete" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\delete.png" qualifiers="hdpi-v4" type="drawable"/><file name="dropdown_icon" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\dropdown_icon.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_blue" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\edit_blue.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_green" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\edit_green.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_red" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\edit_red.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_blue" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\edit_title_blue.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_green" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\edit_title_green.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_red" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\edit_title_red.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_white" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\edit_title_white.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_yellow" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\edit_title_yellow.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_white" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\edit_white.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_yellow" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\edit_yellow.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_large" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\font_large.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_normal" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\font_normal.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_size_selector_bg" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\font_size_selector_bg.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_small" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\font_small.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_super" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\font_super.png" qualifiers="hdpi-v4" type="drawable"/><file name="icon_app" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\icon_app.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_background" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\list_background.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_down" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\list_blue_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_middle" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\list_blue_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_single" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\list_blue_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_up" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\list_blue_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_folder" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\list_folder.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_footer_bg" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\list_footer_bg.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_down" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\list_green_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_middle" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\list_green_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_single" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\list_green_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_up" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\list_green_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_down" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\list_red_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_middle" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\list_red_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_single" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\list_red_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_up" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\list_red_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_down" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\list_white_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_middle" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\list_white_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_single" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\list_white_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_up" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\list_white_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_down" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\list_yellow_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_middle" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\list_yellow_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_single" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\list_yellow_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_up" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\list_yellow_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="menu_delete" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\menu_delete.png" qualifiers="hdpi-v4" type="drawable"/><file name="menu_move" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\menu_move.png" qualifiers="hdpi-v4" type="drawable"/><file name="new_note_normal" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\new_note_normal.png" qualifiers="hdpi-v4" type="drawable"/><file name="new_note_pressed" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\new_note_pressed.png" qualifiers="hdpi-v4" type="drawable"/><file name="note_edit_color_selector_panel" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\note_edit_color_selector_panel.png" qualifiers="hdpi-v4" type="drawable"/><file name="notification" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\notification.png" qualifiers="hdpi-v4" type="drawable"/><file name="search_result" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\search_result.png" qualifiers="hdpi-v4" type="drawable"/><file name="selected" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\selected.png" qualifiers="hdpi-v4" type="drawable"/><file name="title_alert" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\title_alert.png" qualifiers="hdpi-v4" type="drawable"/><file name="title_bar_bg" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\title_bar_bg.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_blue" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\widget_2x_blue.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_green" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\widget_2x_green.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_red" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\widget_2x_red.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_white" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\widget_2x_white.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_yellow" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\widget_2x_yellow.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_blue" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\widget_4x_blue.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_green" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\widget_4x_green.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_red" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\widget_4x_red.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_white" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\widget_4x_white.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_yellow" path="D:\softwareengineering\minote\src\app\src\main\res\drawable-hdpi\widget_4x_yellow.png" qualifiers="hdpi-v4" type="drawable"/><file name="account_dialog_title" path="D:\softwareengineering\minote\src\app\src\main\res\layout\account_dialog_title.xml" qualifiers="" type="layout"/><file name="add_account_text" path="D:\softwareengineering\minote\src\app\src\main\res\layout\add_account_text.xml" qualifiers="" type="layout"/><file name="datetime_picker" path="D:\softwareengineering\minote\src\app\src\main\res\layout\datetime_picker.xml" qualifiers="" type="layout"/><file name="dialog_edit_text" path="D:\softwareengineering\minote\src\app\src\main\res\layout\dialog_edit_text.xml" qualifiers="" type="layout"/><file name="folder_list_item" path="D:\softwareengineering\minote\src\app\src\main\res\layout\folder_list_item.xml" qualifiers="" type="layout"/><file name="note_edit" path="D:\softwareengineering\minote\src\app\src\main\res\layout\note_edit.xml" qualifiers="" type="layout"/><file name="note_edit_list_item" path="D:\softwareengineering\minote\src\app\src\main\res\layout\note_edit_list_item.xml" qualifiers="" type="layout"/><file name="note_item" path="D:\softwareengineering\minote\src\app\src\main\res\layout\note_item.xml" qualifiers="" type="layout"/><file name="note_list" path="D:\softwareengineering\minote\src\app\src\main\res\layout\note_list.xml" qualifiers="" type="layout"/><file name="note_list_dropdown_menu" path="D:\softwareengineering\minote\src\app\src\main\res\layout\note_list_dropdown_menu.xml" qualifiers="" type="layout"/><file name="note_list_footer" path="D:\softwareengineering\minote\src\app\src\main\res\layout\note_list_footer.xml" qualifiers="" type="layout"/><file name="settings_header" path="D:\softwareengineering\minote\src\app\src\main\res\layout\settings_header.xml" qualifiers="" type="layout"/><file name="widget_2x" path="D:\softwareengineering\minote\src\app\src\main\res\layout\widget_2x.xml" qualifiers="" type="layout"/><file name="widget_4x" path="D:\softwareengineering\minote\src\app\src\main\res\layout\widget_4x.xml" qualifiers="" type="layout"/><file name="call_note_edit" path="D:\softwareengineering\minote\src\app\src\main\res\menu\call_note_edit.xml" qualifiers="" type="menu"/><file name="call_record_folder" path="D:\softwareengineering\minote\src\app\src\main\res\menu\call_record_folder.xml" qualifiers="" type="menu"/><file name="note_edit" path="D:\softwareengineering\minote\src\app\src\main\res\menu\note_edit.xml" qualifiers="" type="menu"/><file name="note_list" path="D:\softwareengineering\minote\src\app\src\main\res\menu\note_list.xml" qualifiers="" type="menu"/><file name="note_list_dropdown" path="D:\softwareengineering\minote\src\app\src\main\res\menu\note_list_dropdown.xml" qualifiers="" type="menu"/><file name="note_list_options" path="D:\softwareengineering\minote\src\app\src\main\res\menu\note_list_options.xml" qualifiers="" type="menu"/><file name="sub_folder" path="D:\softwareengineering\minote\src\app\src\main\res\menu\sub_folder.xml" qualifiers="" type="menu"/><file name="introduction" path="D:\softwareengineering\minote\src\app\src\main\res\raw\introduction" qualifiers="" type="raw"/><file name="introduction" path="D:\softwareengineering\minote\src\app\src\main\res\raw-zh-rCN\introduction" qualifiers="zh-rCN" type="raw"/><file path="D:\softwareengineering\minote\src\app\src\main\res\values\arrays.xml" qualifiers=""><string-array name="format_for_exported_note">
+        <item>-%s</item>      
+        <item>--%s</item>     
+        <item>--%s</item>     
+        <item>--%s</item>     
+    </string-array><string-array name="menu_share_ways">
+        <item>Messaging</item>
+        <item>Email</item>
+    </string-array></file><file path="D:\softwareengineering\minote\src\app\src\main\res\values\colors.xml" qualifiers=""><color name="user_query_highlight">#335b5b5b</color></file><file path="D:\softwareengineering\minote\src\app\src\main\res\values\dimens.xml" qualifiers=""><dimen name="text_font_size_super">33sp</dimen><dimen name="text_font_size_large">26sp</dimen><dimen name="text_font_size_medium">20sp</dimen><dimen name="text_font_size_normal">17sp</dimen><dimen name="text_font_size_small">14sp</dimen></file><file path="D:\softwareengineering\minote\src\app\src\main\res\values\strings.xml" qualifiers=""><string name="app_name">Notes</string><string name="app_widget2x2">Notes 2x2</string><string name="app_widget4x4">Notes 4x4</string><string name="widget_havenot_content">No associated note found, click to create associated note.</string><string name="widget_under_visit_mode">Privacy mode，can not see note content</string><string name="notelist_string_info">...</string><string name="notelist_menu_new">Add note</string><string name="delete_remind_time_message">Delete reminder successfully</string><string name="set_remind_time_message">Set reminder</string><string name="note_alert_expired">Expired</string><string name="format_date_ymd">yyyyMMdd</string><string name="format_datetime_mdhm">MMMd kk:mm</string><string name="notealert_ok">Got it</string><string name="notealert_enter">Take a look</string><string name="note_link_tel">Call</string><string name="note_link_email">Send email</string><string name="note_link_web">Browse web</string><string name="note_link_other">Open map</string><string name="file_path">/MIUI/notes/</string><string name="file_name_txt_format">notes_%s.txt</string><string name="format_folder_files_count">(%d)</string><string name="menu_create_folder">New Folder</string><string name="menu_export_text">Export text</string><string name="menu_sync">Sync</string><string name="menu_sync_cancel">Cancel syncing</string><string name="menu_setting">Settings</string><string name="menu_search">Search</string><string name="menu_delete">Delete</string><string name="menu_move">Move to folder</string><string name="menu_select_title">%d selected</string><string name="menu_select_none">Nothing selected, the operation is invalid</string><string name="menu_select_all">Select all</string><string name="menu_deselect_all">Deselect all</string><string name="menu_font_size">Font size</string><string name="menu_font_small">Small</string><string name="menu_font_normal">Medium</string><string name="menu_font_large">Large</string><string name="menu_font_super">Super</string><string name="menu_list_mode">Enter check list</string><string name="menu_normal_mode">Leave check list</string><string name="menu_folder_view">View folder</string><string name="menu_folder_delete">Delete folder</string><string name="menu_folder_change_name">Change folder name</string><string name="folder_exist">The folder %1$s exist, please rename</string><string name="menu_share">Share</string><string name="menu_send_to_desktop">Send to home</string><string name="menu_alert">Remind me</string><string name="menu_remove_remind">Delete reminder</string><string name="menu_title_select_folder">Select folder</string><string name="menu_move_parent_folder">Parent folder</string><string name="info_note_enter_desktop">Note added to home</string><string name="alert_message_delete_folder">Confirm to delete folder and its notes?</string><string name="alert_title_delete">Delete selected notes</string><string name="alert_message_delete_notes">Confirm to delete the selected %d notes?</string><string name="alert_message_delete_note">Confirm to delete this note?</string><string name="format_move_notes_to_folder">Have moved selected %1$d notes to %2$s folder</string><string name="error_sdcard_unmounted">SD card busy, not available now</string><string name="error_sdcard_export">Export failed, please check SD card</string><string name="error_note_not_exist">The note is not exist</string><string name="error_note_empty_for_clock">Sorry, can not set clock on empty note</string><string name="error_note_empty_for_send_to_desktop">Sorry, can not send and empty note to home</string><string name="success_sdcard_export">Export successful</string><string name="failed_sdcard_export">Export fail</string><string name="format_exported_file_location">Export text file (%1$s) to SD (%2$s) directory</string><string name="ticker_syncing">Syncing notes...</string><string name="ticker_success">Sync is successful</string><string name="ticker_fail">Sync is failed</string><string name="ticker_cancel">Sync is canceled</string><string name="success_sync_account">Sync is successful with account %1$s</string><string name="error_sync_network">Sync failed, please check network and account settings</string><string name="error_sync_internal">Sync failed, internal error occurs</string><string name="error_sync_cancelled">Sync is canceled</string><string name="sync_progress_login">Logging into %1$s...</string><string name="sync_progress_init_list">Getting remote note list...</string><string name="sync_progress_syncing">Synchronize local notes with Google Task...</string><string name="preferences_title">Settings</string><string name="preferences_account_title">Sync account</string><string name="preferences_account_summary">Sync notes with google task</string><string name="preferences_last_sync_time">Last sync time %1$s</string><string name="preferences_last_sync_time_format">yyyy-MM-dd hh:mm:ss</string><string name="preferences_add_account">Add account</string><string name="preferences_menu_change_account">Change sync account</string><string name="preferences_menu_remove_account">Remove sync account</string><string name="preferences_menu_cancel">Cancel</string><string name="preferences_button_sync_immediately">Sync immediately</string><string name="preferences_button_sync_cancel">Cancel syncing</string><string name="preferences_dialog_change_account_title">Current account %1$s</string><string name="preferences_dialog_change_account_warn_msg">All sync related information will be deleted, which may result in duplicated items sometime</string><string name="preferences_dialog_select_account_title">Sync notes</string><string name="preferences_dialog_select_account_tips">Please select a google account. Local notes will be synced with google task.</string><string name="preferences_toast_cannot_change_account">Cannot change the account because sync is in progress</string><string name="preferences_toast_success_set_accout">%1$s has been set as the sync account</string><string name="preferences_bg_random_appear_title">New note background color random</string><string name="button_delete">Delete</string><string name="call_record_folder_name">Call notes</string><string name="hint_foler_name">Input name</string><string name="search_label">Searching Notes</string><string name="search_hint">Search notes</string><string name="search_setting_description">Text in your notes</string><string name="search">Notes</string><string name="datetime_dialog_ok">set</string><string name="datetime_dialog_cancel">cancel</string><plurals name="search_results_title">
+         <item quantity="one"><ns1:g example="1" id="number">%1$s</ns1:g> result for \"<ns1:g example="???" id="search">%2$s</ns1:g>\"</item>
+        
+        <item quantity="other"><ns1:g example="15" id="number">%1$s</ns1:g> results for \"<ns1:g example="???" id="search">%2$s</ns1:g>\"</item>
+    </plurals><string name="note_length">Length</string></file><file path="D:\softwareengineering\minote\src\app\src\main\res\values\styles.xml" qualifiers=""><style name="TextAppearanceSuper">
+        <item name="android:textSize">@dimen/text_font_size_super</item>
+        <item name="android:textColorLink">#0000ff</item>
+    </style><style name="TextAppearanceLarge">
+        <item name="android:textSize">@dimen/text_font_size_large</item>
+        <item name="android:textColorLink">#0000ff</item>
+    </style><style name="TextAppearanceMedium">
+        <item name="android:textSize">@dimen/text_font_size_medium</item>
+        <item name="android:textColorLink">#0000ff</item>
+    </style><style name="TextAppearanceNormal">
+        <item name="android:textSize">@dimen/text_font_size_normal</item>
+        <item name="android:textColorLink">#0000ff</item>
+    </style><style name="TextAppearancePrimaryItem">
+        <item name="android:textSize">@dimen/text_font_size_normal</item>
+        <item name="android:textColor">@color/primary_text_dark</item>
+    </style><style name="TextAppearanceSecondaryItem">
+        <item name="android:textSize">@dimen/text_font_size_small</item>
+        <item name="android:textColor">@color/secondary_text_dark</item>
+    </style><style name="TextAppearanceUnderMenuIcon">
+        <item name="android:textSize">@dimen/text_font_size_normal</item>
+        <item name="android:textColor">@android:color/black</item>
+    </style><style name="HighlightTextAppearancePrimary">
+    <item name="android:textSize">@dimen/text_font_size_normal</item>
+        <item name="android:textColor">@color/primary_text_dark</item>
+    </style><style name="HighlightTextAppearanceSecondary">
+        <item name="android:textSize">@dimen/text_font_size_small</item>
+        <item name="android:textColor">@color/secondary_text_dark</item>
+    </style><style name="NoteTheme" parent="@android:style/Theme.Holo.Light">
+        <item name="android:actionBarStyle">@style/NoteActionBarStyle</item>
+    </style><style name="NoteActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid">
+        
+        <item name="android:visibility">visible</item>
+    </style></file><file path="D:\softwareengineering\minote\src\app\src\main\res\values-zh-rCN\arrays.xml" qualifiers="zh-rCN"><string-array name="menu_share_ways">
+        <item>短信</item>
+        <item>邮件</item>
+    </string-array></file><file path="D:\softwareengineering\minote\src\app\src\main\res\values-zh-rCN\strings.xml" qualifiers="zh-rCN"><string name="app_name">便签</string><string name="app_widget2x2">便签2x2</string><string name="app_widget4x4">便签4x4</string><string name="widget_havenot_content">没有关联内容，点击新建便签。</string><string name="widget_under_visit_mode">访客模式下，便签内容不可见</string><string name="notelist_string_info">...</string><string name="notelist_menu_new">新建便签</string><string name="delete_remind_time_message">成功删除提醒</string><string name="set_remind_time_message">创建提醒</string><string name="note_alert_expired">已过期</string><string name="format_date_ymd">yyyyMMdd</string><string name="format_datetime_mdhm">MM月dd日 kk:mm</string><string name="notealert_ok">知道了</string><string name="notealert_enter">查看</string><string name="note_link_tel">呼叫电话</string><string name="note_link_email">发送邮件</string><string name="note_link_web">浏览网页</string><string name="note_link_other">打开地图</string><string name="menu_create_folder">新建文件夹</string><string name="menu_export_text">导出文本</string><string name="menu_sync">同步</string><string name="menu_sync_cancel">取消同步</string><string name="menu_setting">设置</string><string name="menu_search">搜索</string><string name="menu_delete">删除</string><string name="menu_move">移动到文件夹</string><string name="menu_select_title">选中了 %d 项</string><string name="menu_select_none">没有选中项，操作无效</string><string name="menu_select_all">全选</string><string name="menu_deselect_all">取消全选</string><string name="menu_font_size">文字大小</string><string name="menu_font_small">小</string><string name="menu_font_normal">正常</string><string name="menu_font_large">大</string><string name="menu_font_super">超大</string><string name="menu_list_mode">进入清单模式</string><string name="menu_normal_mode">退出清单模式</string><string name="menu_folder_view">查看文件夹</string><string name="menu_folder_delete">刪除文件夹</string><string name="menu_folder_change_name">修改文件夹名称</string><string name="folder_exist">文件夹 %1$s 已存在，请重新命名</string><string name="menu_share">分享</string><string name="menu_send_to_desktop">发送到桌面</string><string name="menu_alert">提醒我</string><string name="menu_remove_remind">删除提醒</string><string name="menu_title_select_folder">选择文件夹</string><string name="menu_move_parent_folder">上一级文件夹</string><string name="info_note_enter_desktop">已添加到桌面</string><string name="alert_title_delete">删除</string><string name="alert_message_delete_notes">确认要删除所选的 %d 条便签吗?</string><string name="alert_message_delete_note">确认要删除该条便签吗?</string><string name="alert_message_delete_folder">确认删除文件夹及所包含的便签吗？</string><string name="format_move_notes_to_folder">已将所选 %1$d 条便签移到 %2$s 文件夹</string><string name="error_sdcard_unmounted">SD卡被占用，不能操作</string><string name="error_sdcard_export">导出文本时发生错误，请检查SD卡</string><string name="error_note_not_exist">要查看的便签不存在</string><string name="error_note_empty_for_clock">不能为空便签设置闹钟提醒</string><string name="error_note_empty_for_send_to_desktop">不能将空便签发送到桌面</string><string name="success_sdcard_export">导出成功</string><string name="failed_sdcard_export">导出失败</string><string name="format_exported_file_location">已将文本文件(%1$s)输出至SD卡(%2$s)目录</string><string name="ticker_syncing">同步便签...</string><string name="ticker_success">同步成功</string><string name="ticker_fail">同步失败</string><string name="ticker_cancel">同步已取消</string><string name="success_sync_account">与%1$s同步成功</string><string name="error_sync_network">同步失败，请检查网络和帐号设置</string><string name="error_sync_internal">同步失败，发生内部错误</string><string name="error_sync_cancelled">同步已取消</string><string name="sync_progress_login">登录%1$s...</string><string name="sync_progress_init_list">正在获取服务器便签列表...</string><string name="sync_progress_syncing">正在同步本地便签...</string><string name="preferences_title">设置</string><string name="preferences_account_title">同步账号</string><string name="preferences_account_summary">与google task同步便签记录</string><string name="preferences_last_sync_time">上次同步于 %1$s</string><string name="preferences_add_account">添加账号</string><string name="preferences_menu_change_account">更换账号</string><string name="preferences_menu_remove_account">删除账号</string><string name="preferences_menu_cancel">取消</string><string name="preferences_button_sync_immediately">立即同步</string><string name="preferences_button_sync_cancel">取消同步</string><string name="preferences_dialog_change_account_title">当前帐号 %1$s</string><string name="preferences_dialog_change_account_warn_msg">如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复</string><string name="preferences_dialog_select_account_title">同步便签</string><string name="preferences_dialog_select_account_tips">请选择google帐号，便签将与该帐号的google task内容同步。</string><string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帐号</string><string name="preferences_toast_success_set_accout">同步帐号已设置为%1$s</string><string name="preferences_bg_random_appear_title">新建便签背景颜色随机</string><string name="button_delete">删除</string><string name="call_record_folder_name">通话便签</string><string name="hint_foler_name">请输入名称</string><string name="search_label">正在搜索便签</string><string name="search_hint">搜索便签</string><string name="search_setting_description">便签中的文字</string><string name="search">便签</string><string name="datetime_dialog_ok">设置</string><string name="datetime_dialog_cancel">取消</string><plurals name="search_results_title">
+        <item quantity="other"><ns1:g id="NUMBER">%1$s</ns1:g> 条符合“<ns1:g id="SEARCH">%2$s</ns1:g>”的搜索结果</item>
+    </plurals><string name="note_length">字数</string></file><file path="D:\softwareengineering\minote\src\app\src\main\res\values-zh-rTW\arrays.xml" qualifiers="zh-rTW"><string-array name="menu_share_ways">
+        <item>短信</item>
+        <item>郵件</item>
+    </string-array></file><file path="D:\softwareengineering\minote\src\app\src\main\res\values-zh-rTW\strings.xml" qualifiers="zh-rTW"><string name="app_name">便簽</string><string name="app_widget2x2">便簽2x2</string><string name="app_widget4x4">便簽4x4</string><string name="widget_havenot_content">沒有關聯內容，點擊新建便簽。</string><string name="widget_under_visit_mode">訪客模式下，便籤內容不可見</string><string name="notelist_string_info">...</string><string name="notelist_menu_new">新建便簽</string><string name="delete_remind_time_message">成功刪除提醒</string><string name="set_remind_time_message">創建提醒</string><string name="note_alert_expired">已過期</string><string name="format_date_ymd">yyyyMMdd</string><string name="format_datetime_mdhm">MM月dd日 kk:mm</string><string name="notealert_ok">知道了</string><string name="notealert_enter">查看</string><string name="note_link_tel">呼叫電話</string><string name="note_link_email">發送郵件</string><string name="note_link_web">浏覽網頁</string><string name="note_link_other">打開地圖</string><string name="format_move_notes_to_folder">已將所選 %1$d 便籤移到 %2$s 文件夾</string><string name="menu_create_folder">新建文件夾</string><string name="menu_export_text">導出文本</string><string name="menu_sync">同步</string><string name="menu_sync_cancel">取消同步</string><string name="menu_setting">設置</string><string name="menu_search">搜尋</string><string name="menu_delete">刪除</string><string name="menu_move">移動到文件夾</string><string name="menu_select_title">選中了 %d 項</string><string name="menu_select_none">沒有選中項，操作無效</string><string name="menu_select_all">全選</string><string name="menu_deselect_all">取消全選</string><string name="menu_font_size">文字大小</string><string name="menu_font_small">小</string><string name="menu_font_normal">正常</string><string name="menu_font_large">大</string><string name="menu_font_super">超大</string><string name="menu_list_mode">進入清單模式</string><string name="menu_normal_mode">退出清單模式</string><string name="menu_folder_view">查看文件夾</string><string name="menu_folder_delete">刪除文件夾</string><string name="menu_folder_change_name">修改文件夾名稱</string><string name="folder_exist">文件夾 %1$s 已存在，請重新命名</string><string name="menu_share">分享</string><string name="menu_send_to_desktop">發送到桌面</string><string name="menu_alert">提醒我</string><string name="menu_remove_remind">刪除提醒</string><string name="menu_title_select_folder">選擇文件夾</string><string name="menu_move_parent_folder">上一級文件夾</string><string name="info_note_enter_desktop">已添加到桌面</string><string name="alert_title_delete">刪除</string><string name="alert_message_delete_notes">确认要刪除所選的 %d 條便籤嗎?</string><string name="alert_message_delete_note">确认要删除該條便籤嗎?</string><string name="alert_message_delete_folder">確認刪除檔夾及所包含的便簽嗎？</string><string name="error_sdcard_unmounted">SD卡被佔用，不能操作</string><string name="error_sdcard_export">導出TXT時發生錯誤，請檢查SD卡</string><string name="error_note_not_exist">要查看的便籤不存在</string><string name="error_note_empty_for_clock">不能爲空便籤設置鬧鐘提醒</string><string name="error_note_empty_for_send_to_desktop">不能將空便籤發送到桌面</string><string name="success_sdcard_export">導出成功</string><string name="failed_sdcard_export">導出失敗</string><string name="format_exported_file_location">已將文本文件(%1$s)導出至SD(%2$s)目錄</string><string name="ticker_syncing">同步便簽...</string><string name="ticker_success">同步成功</string><string name="ticker_fail">同步失敗</string><string name="ticker_cancel">同步已取消</string><string name="success_sync_account">與%1$s同步成功</string><string name="error_sync_network">同步失敗，請檢查網絡和帳號設置</string><string name="error_sync_internal">同步失敗，發生內部錯誤</string><string name="error_sync_cancelled">同步已取消</string><string name="sync_progress_login">登陸%1$s...</string><string name="sync_progress_init_list">正在獲取服務器便籤列表...</string><string name="sync_progress_syncing">正在同步本地便籤...</string><string name="preferences_title">設置</string><string name="preferences_account_title">同步賬號</string><string name="preferences_account_summary">与google task同步便簽記錄</string><string name="preferences_last_sync_time">上次同步于 %1$s</string><string name="preferences_add_account">添加賬號</string><string name="preferences_menu_change_account">更換賬號</string><string name="preferences_menu_remove_account">刪除賬號</string><string name="preferences_menu_cancel">取消</string><string name="preferences_button_sync_immediately">立即同步</string><string name="preferences_button_sync_cancel">取消同步</string><string name="preferences_dialog_change_account_title">當前帳號 %1$s</string><string name="preferences_dialog_change_account_warn_msg">如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復</string><string name="preferences_dialog_select_account_title">同步便簽</string><string name="preferences_dialog_select_account_tips">請選擇google帳號，便簽將與該帳號的google task內容同步。</string><string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帳號</string><string name="preferences_toast_success_set_accout">同步帳號已設置為%1$s</string><string name="preferences_bg_random_appear_title">新建便籤背景顏色隨機</string><string name="button_delete">刪除</string><string name="call_record_folder_name">通話便籤</string><string name="hint_foler_name">請輸入名稱</string><string name="search_label">正在搜索便籤</string><string name="search_hint">搜索便籤</string><string name="search_setting_description">便籤中的文字</string><string name="search">便籤</string><string name="datetime_dialog_ok">設置</string><string name="datetime_dialog_cancel">取消</string><plurals name="search_results_title">
+        <item quantity="other"><ns1:g id="NUMBER">%1$s</ns1:g> 條符合”<ns1:g id="SEARCH">%2$s</ns1:g>“的搜尋結果</item>
+    </plurals><string name="note_length">字數</string></file><file name="preferences" path="D:\softwareengineering\minote\src\app\src\main\res\xml\preferences.xml" qualifiers="" type="xml"/><file name="searchable" path="D:\softwareengineering\minote\src\app\src\main\res\xml\searchable.xml" qualifiers="" type="xml"/><file name="widget_2x_info" path="D:\softwareengineering\minote\src\app\src\main\res\xml\widget_2x_info.xml" qualifiers="" type="xml"/><file name="widget_4x_info" path="D:\softwareengineering\minote\src\app\src\main\res\xml\widget_4x_info.xml" qualifiers="" type="xml"/></source><source path="D:\softwareengineering\minote\src\app\build\generated\res\rs\debug"/><source path="D:\softwareengineering\minote\src\app\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\softwareengineering\minote\src\app\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\softwareengineering\minote\src\app\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><mergedItems/></merger>
\ No newline at end of file
diff --git a/src/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/src/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
new file mode 100644
index 0000000..26942b7
--- /dev/null
+++ b/src/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\softwareengineering\minote\src\app\src\main\assets"/><source path="D:\softwareengineering\minote\src\app\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\softwareengineering\minote\src\app\src\debug\assets"/></dataSet></merger>
\ No newline at end of file
diff --git a/src/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/src/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
new file mode 100644
index 0000000..e0ce255
--- /dev/null
+++ b/src/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\softwareengineering\minote\src\app\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\softwareengineering\minote\src\app\src\debug\jniLibs"/></dataSet></merger>
\ No newline at end of file
diff --git a/src/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/src/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
new file mode 100644
index 0000000..92a3eab
--- /dev/null
+++ b/src/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\softwareengineering\minote\src\app\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\softwareengineering\minote\src\app\src\debug\shaders"/></dataSet></merger>
\ No newline at end of file
diff --git a/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
new file mode 100644
index 0000000..fca1b35
--- /dev/null
+++ b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
@@ -0,0 +1,4 @@
+#Wed Jun 07 11:22:27 CST 2023
+base.0=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
+renamed.0=classes.dex
+path.0=classes.dex
diff --git a/src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
new file mode 100644
index 0000000..b63f522
--- /dev/null
+++ b/src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
@@ -0,0 +1,273 @@
+1<?xml version="1.0" encoding="utf-8"?>
+2<!--
+3 Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+4
+5     Licensed under the Apache License, Version 2.0 (the "License");
+6     you may not use this file except in compliance with the License.
+7     You may obtain a copy of the License at
+8
+9          http://www.apache.org/licenses/LICENSE-2.0
+10
+11     Unless required by applicable law or agreed to in writing, software
+12     distributed under the License is distributed on an "AS IS" BASIS,
+13     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+14     See the License for the specific language governing permissions and
+15     limitations under the License.
+16-->
+17<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+18    package="net.micode.notes"
+19    android:versionCode="1"
+20    android:versionName="0.1" >
+21
+22    <uses-sdk
+22-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:23:5-44
+23        android:minSdkVersion="14"
+23-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:23:15-41
+24        android:targetSdkVersion="14" />
+24-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:23:5-44
+25
+26    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+26-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:25:5-81
+26-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:25:22-78
+27    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
+27-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:26:5-88
+27-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:26:22-85
+28    <uses-permission android:name="android.permission.INTERNET" />
+28-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:27:5-67
+28-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:27:22-64
+29    <uses-permission android:name="android.permission.READ_CONTACTS" />
+29-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:28:5-72
+29-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:28:22-69
+30    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
+30-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:29:5-74
+30-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:29:22-71
+31    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
+31-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:30:5-80
+31-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:30:22-77
+32    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
+32-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:31:5-71
+32-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:31:22-68
+33    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
+33-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:32:5-74
+33-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:32:22-71
+34    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+34-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:33:5-81
+34-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:33:22-78
+35
+36    <application
+36-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:35:5-149:19
+37        android:debuggable="true"
+38        android:icon="@drawable/icon_app"
+38-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:36:9-42
+39        android:label="@string/app_name"
+39-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:37:9-41
+40        android:testOnly="true" >
+41        <activity
+41-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:38:9-51:20
+42            android:name="net.micode.notes.ui.NotesListActivity"
+42-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:39:13-49
+43            android:configChanges="keyboardHidden|orientation|screenSize"
+43-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:40:13-74
+44            android:label="@string/app_name"
+44-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:41:13-45
+45            android:launchMode="singleTop"
+45-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:42:13-43
+46            android:theme="@style/NoteTheme"
+46-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:43:13-45
+47            android:uiOptions="splitActionBarWhenNarrow"
+47-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:44:13-57
+48            android:windowSoftInputMode="adjustPan" >
+48-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:45:13-52
+49            <intent-filter>
+49-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:47:13-50:29
+50                <action android:name="android.intent.action.MAIN" />
+50-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:48:17-69
+50-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:48:25-66
+51
+52                <category android:name="android.intent.category.LAUNCHER" />
+52-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:49:17-77
+52-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:49:27-74
+53            </intent-filter>
+54        </activity>
+55        <activity
+55-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:53:9-81:20
+56            android:name="net.micode.notes.ui.NoteEditActivity"
+56-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:54:13-48
+57            android:configChanges="keyboardHidden|orientation|screenSize"
+57-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:55:13-74
+58            android:launchMode="singleTop"
+58-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:56:13-43
+59            android:theme="@style/NoteTheme" >
+59-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:57:13-45
+60            <intent-filter>
+60-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:59:13-64:29
+61                <action android:name="android.intent.action.VIEW" />
+61-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:60:17-69
+61-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:60:25-66
+62
+63                <category android:name="android.intent.category.DEFAULT" />
+63-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:61:17-76
+63-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:61:27-73
+64
+65                <data android:mimeType="vnd.android.cursor.item/text_note" />
+65-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:62:17-78
+65-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:62:23-75
+66                <data android:mimeType="vnd.android.cursor.item/call_note" />
+66-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:62:17-78
+66-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:62:23-75
+67            </intent-filter>
+68            <intent-filter>
+68-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:66:13-71:29
+69                <action android:name="android.intent.action.INSERT_OR_EDIT" />
+69-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:67:17-79
+69-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:67:25-76
+70
+71                <category android:name="android.intent.category.DEFAULT" />
+71-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:61:17-76
+71-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:61:27-73
+72
+73                <data android:mimeType="vnd.android.cursor.item/text_note" />
+73-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:62:17-78
+73-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:62:23-75
+74                <data android:mimeType="vnd.android.cursor.item/call_note" />
+74-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:62:17-78
+74-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:62:23-75
+75            </intent-filter>
+76            <intent-filter>
+76-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:73:13-76:29
+77                <action android:name="android.intent.action.SEARCH" />
+77-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:74:17-71
+77-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:74:25-68
+78
+79                <category android:name="android.intent.category.DEFAULT" />
+79-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:61:17-76
+79-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:61:27-73
+80            </intent-filter>
+81
+82            <meta-data
+82-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:78:13-80:54
+83                android:name="android.app.searchable"
+83-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:79:17-54
+84                android:resource="@xml/searchable" />
+84-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:80:17-51
+85        </activity>
+86
+87        <provider
+87-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:83:9-86:43
+88            android:name="net.micode.notes.data.NotesProvider"
+88-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:84:13-63
+89            android:authorities="micode_notes"
+89-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:85:13-47
+90            android:multiprocess="true" />
+90-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:86:13-40
+91
+92        <receiver
+92-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:88:9-100:20
+93            android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
+93-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:89:13-57
+94            android:label="@string/app_widget2x2" >
+94-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:90:13-50
+95            <intent-filter>
+95-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:91:13-95:29
+96                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+96-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:92:17-84
+96-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:92:25-81
+97                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
+97-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:93:17-85
+97-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:93:25-82
+98                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
+98-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:94:17-85
+98-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:94:25-82
+99            </intent-filter>
+100
+101            <meta-data
+101-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:97:13-99:58
+102                android:name="android.appwidget.provider"
+102-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:98:17-58
+103                android:resource="@xml/widget_2x_info" />
+103-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:99:17-55
+104        </receiver>
+105        <receiver
+105-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:101:9-114:20
+106            android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
+106-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:102:13-57
+107            android:label="@string/app_widget4x4" >
+107-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:103:13-50
+108            <intent-filter>
+108-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:91:13-95:29
+109                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+109-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:92:17-84
+109-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:92:25-81
+110                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
+110-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:93:17-85
+110-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:93:25-82
+111                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
+111-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:94:17-85
+111-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:94:25-82
+112            </intent-filter>
+113
+114            <meta-data
+114-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:97:13-99:58
+115                android:name="android.appwidget.provider"
+115-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:98:17-58
+116                android:resource="@xml/widget_4x_info" />
+116-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:99:17-55
+117        </receiver>
+118        <receiver android:name="net.micode.notes.ui.AlarmInitReceiver" >
+118-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:116:9-120:20
+118-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:116:19-55
+119            <intent-filter>
+119-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:117:13-119:29
+120                <action android:name="android.intent.action.BOOT_COMPLETED" />
+120-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:118:17-79
+120-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:118:25-76
+121            </intent-filter>
+122        </receiver>
+123        <receiver
+123-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:122:9-125:20
+124            android:name="net.micode.notes.ui.AlarmReceiver"
+124-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:123:13-61
+125            android:process=":remote" >
+125-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:124:13-38
+126        </receiver>
+127
+128        <activity
+128-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:127:9-132:20
+129            android:name="net.micode.notes.ui.AlarmAlertActivity"
+129-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:128:13-50
+130            android:label="@string/app_name"
+130-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:129:13-45
+131            android:launchMode="singleInstance"
+131-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:130:13-48
+132            android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
+132-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:131:13-75
+133        </activity>
+134        <activity
+134-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:134:9-139:20
+135            android:name="net.micode.notes.ui.NotesPreferenceActivity"
+135-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:135:13-71
+136            android:label="@string/preferences_title"
+136-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:136:13-54
+137            android:launchMode="singleTop"
+137-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:137:13-43
+138            android:theme="@android:style/Theme.Holo.Light" >
+138-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:138:13-60
+139        </activity>
+140
+141        <service
+141-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:141:9-144:19
+142            android:name="net.micode.notes.gtask.remote.GTaskSyncService"
+142-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:142:13-74
+143            android:exported="false" >
+143-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:143:13-37
+144        </service>
+145
+146        <meta-data
+146-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:146:9-148:52
+147            android:name="android.app.default_searchable"
+147-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:147:13-58
+148            android:value=".ui.NoteEditActivity" />
+148-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:148:13-49
+149    </application>
+150
+151</manifest>
diff --git a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
new file mode 100644
index 0000000..f863400
--- /dev/null
+++ b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
@@ -0,0 +1,186 @@
+{
+    "logs": [
+        {
+            "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values/values.xml",
+            "map": [
+                {
+                    "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values\\dimens.xml",
+                    "from": {
+                        "startLines": "-1,-1,-1,-1,-1",
+                        "startColumns": "-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,-1,-1,-1,-1"
+                    },
+                    "to": {
+                        "startLines": "13,14,15,16,17",
+                        "startColumns": "4,4,4,4,4",
+                        "startOffsets": "477,529,582,635,687",
+                        "endColumns": "51,52,52,51,51",
+                        "endOffsets": "524,577,630,682,734"
+                    }
+                },
+                {
+                    "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values\\strings.xml",
+                    "from": {
+                        "startLines": "128,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,133,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "8136,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8550,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endLines": "132,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,133,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,46,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endOffsets": "8544,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8592,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+                    },
+                    "to": {
+                        "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125",
+                        "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": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5031,5086,5139,5186,5239,5295,5343,5398,5451,5535,5602,5666,5762,5836,5917,6006,6169,6313,6392,6467,6549,6608,6688,6768,6823,6945,7048,7089,7142,7199,7273,7338,7406,7492,7572,7641,7735,7794,7849,7911,7971,8081",
+                        "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125",
+                        "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,46,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
+                        "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5026,5081,5134,5181,5234,5290,5338,5393,5446,5530,5597,5661,5757,5831,5912,6001,6164,6308,6387,6462,6544,6603,6683,6763,6818,6940,7043,7084,7137,7194,7268,7333,7401,7487,7567,7636,7730,7789,7844,7906,7966,8076,8166"
+                    }
+                },
+                {
+                    "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values\\styles.xml",
+                    "from": {
+                        "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+                    },
+                    "to": {
+                        "startLines": "126,130,134,138,141,145,149,153,157,161,165",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "8171,8375,8586,8759,8919,9102,9287,9472,9675,9881,10064",
+                        "endLines": "129,133,137,140,144,148,152,156,160,164,168",
+                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
+                        "endOffsets": "8370,8581,8754,8914,9097,9282,9467,9670,9876,10059,10260"
+                    }
+                },
+                {
+                    "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values\\arrays.xml",
+                    "from": {
+                        "startLines": "-1,-1",
+                        "startColumns": "-1,-1",
+                        "startOffsets": "-1,-1"
+                    },
+                    "to": {
+                        "startLines": "2,8",
+                        "startColumns": "4,4",
+                        "startOffsets": "105,300",
+                        "endLines": "7,11",
+                        "endColumns": "19,19",
+                        "endOffsets": "295,415"
+                    }
+                },
+                {
+                    "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values\\colors.xml",
+                    "from": {
+                        "startLines": "-1",
+                        "startColumns": "-1",
+                        "startOffsets": "-1"
+                    },
+                    "to": {
+                        "startLines": "12",
+                        "startColumns": "4",
+                        "startOffsets": "420",
+                        "endColumns": "56",
+                        "endOffsets": "472"
+                    }
+                }
+            ]
+        },
+        {
+            "outputFile": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-3:\\values\\values.xml",
+            "map": [
+                {
+                    "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values\\dimens.xml",
+                    "from": {
+                        "startLines": "19,20,21,22,18",
+                        "startColumns": "4,4,4,4,4",
+                        "startOffsets": "783,836,890,944,730",
+                        "endColumns": "51,52,52,51,51",
+                        "endOffsets": "830,884,938,991,777"
+                    },
+                    "to": {
+                        "startLines": "13,14,15,16,17",
+                        "startColumns": "4,4,4,4,4",
+                        "startOffsets": "477,529,582,635,687",
+                        "endColumns": "51,52,52,51,51",
+                        "endOffsets": "524,577,630,682,734"
+                    }
+                },
+                {
+                    "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values\\strings.xml",
+                    "from": {
+                        "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "8136,3970,4234,4137,4067,846,890,943,7624,7674,8077,8025,1308,4694,4789,4622,4537,4453,5668,5584,5481,4967,2043,1991,3461,1515,1569,5029,2138,4318,7738,3898,3649,2198,2519,2825,2257,3389,3327,3269,3043,2990,2885,2939,3094,3145,2567,3831,3206,3699,2471,2769,2680,2621,3586,2420,3540,2315,2359,3763,1459,1784,1894,1736,1840,1679,1630,1252,1198,6131,6063,6375,7525,6744,6662,6819,6909,7153,7073,6216,6292,6602,6440,6521,6007,7298,7421,7983,7854,7796,7908,1393,4898,5394,5805,5735,5886,5334,5278,5215,5154,996,1107",
+                        "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
+                        "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
+                        "endOffsets": "8544,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,1834,1942,1778,1888,1730,1673,1302,1246,6210,6125,6434,7616,6813,6738,6903,7067,7292,7147,6286,6369,6656,6515,6596,6057,7415,7519,8019,7902,7848,7977,1453,4961,5475,5880,5799,5975,5388,5328,5272,5209,1101,1192"
+                    },
+                    "to": {
+                        "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034",
+                        "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
+                        "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
+                        "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119"
+                    }
+                },
+                {
+                    "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values\\styles.xml",
+                    "from": {
+                        "startLines": "50,55,64,60,22,26,30,35,40,18,45",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905",
+                        "endLines": "53,58,67,62,25,29,33,38,43,21,48",
+                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
+                        "endOffsets": "2314,2531,2910,2696,1098,1287,1476,1685,1897,911,2104"
+                    },
+                    "to": {
+                        "startLines": "125,129,133,137,140,144,148,152,156,160,164",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051",
+                        "endLines": "128,132,136,139,143,147,151,155,159,163,167",
+                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
+                        "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247"
+                    }
+                },
+                {
+                    "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values\\arrays.xml",
+                    "from": {
+                        "startLines": "19,26",
+                        "startColumns": "4,4",
+                        "startOffsets": "758,1073",
+                        "endLines": "24,29",
+                        "endColumns": "19,19",
+                        "endOffsets": "1065,1191"
+                    },
+                    "to": {
+                        "startLines": "2,8",
+                        "startColumns": "4,4",
+                        "startOffsets": "105,300",
+                        "endLines": "7,11",
+                        "endColumns": "19,19",
+                        "endOffsets": "295,415"
+                    }
+                },
+                {
+                    "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values\\colors.xml",
+                    "from": {
+                        "startLines": "18",
+                        "startColumns": "4",
+                        "startOffsets": "730",
+                        "endColumns": "56",
+                        "endOffsets": "782"
+                    },
+                    "to": {
+                        "startLines": "12",
+                        "startColumns": "4",
+                        "startOffsets": "420",
+                        "endColumns": "56",
+                        "endOffsets": "472"
+                    }
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/src/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json b/src/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
new file mode 100644
index 0000000..085d2de
--- /dev/null
+++ b/src/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
@@ -0,0 +1,386 @@
+[
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_super.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_super.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_menu_delete.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\menu_delete.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\color_secondary_text_dark.xml.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\color\\secondary_text_dark.xml"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_down.9.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_down.9.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_widget_4x_info.xml.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\xml\\widget_4x_info.xml"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_selected.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\selected.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\raw_introduction.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\raw\\introduction"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_list_dropdown.xml.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_list_dropdown.xml"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_list_footer.xml.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_list_footer.xml"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_menu_move.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\menu_move.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_blue.9.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_blue.9.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_normal.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_normal.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_down.9.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_down.9.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_single.9.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_single.9.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_blue.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_blue.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_green.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_green.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\color_primary_text_dark.xml.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\color\\primary_text_dark.xml"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_new_note.xml.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\new_note.xml"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_up.9.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_up.9.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_edit_list_item.xml.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_edit_list_item.xml"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_call_record.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\call_record.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_title_bar_bg.9.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\title_bar_bg.9.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_new_note_pressed.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\new_note_pressed.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_green.9.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_green.9.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_red.9.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_red.9.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_searchable.xml.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\xml\\searchable.xml"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_bg_color_btn_mask.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\bg_color_btn_mask.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/layout_note_edit.xml.flat",
+        "source": "net.micode.notes.app-main-7:/layout/note_edit.xml"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_single.9.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_single.9.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_yellow.9.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_yellow.9.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_middle.9.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_middle.9.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_green.9.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_green.9.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_clock.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\clock.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_widget_2x.xml.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\widget_2x.xml"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_yellow.9.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_yellow.9.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_large.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_large.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_dropdown_icon.9.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\dropdown_icon.9.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_down.9.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_down.9.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_title_alert.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\title_alert.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_middle.9.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_middle.9.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_single.9.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_single.9.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_edit.xml.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_edit.xml"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_up.9.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_up.9.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_list_options.xml.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_list_options.xml"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_single.9.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_single.9.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_middle.9.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_middle.9.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_up.9.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_up.9.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_widget_4x.xml.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\widget_4x.xml"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_account_dialog_title.xml.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\account_dialog_title.xml"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_notification.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\notification.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_widget_2x_info.xml.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\xml\\widget_2x_info.xml"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_size_selector_bg.9.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_size_selector_bg.9.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_list.xml.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_list.xml"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_folder.9.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_folder.9.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_red.9.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_red.9.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_call_record_folder.xml.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\call_record_folder.xml"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_red.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_red.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_sub_folder.xml.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\sub_folder.xml"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_yellow.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_yellow.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_edit.xml.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_edit.xml"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_settings_header.xml.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\settings_header.xml"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_list.xml.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_list.xml"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\raw-zh-rCN_introduction.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\raw-zh-rCN\\introduction"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_middle.9.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_middle.9.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_white.9.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_white.9.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_list_dropdown_menu.xml.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_list_dropdown_menu.xml"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_small.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_small.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_white.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_white.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_bg_btn_set_color.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\bg_btn_set_color.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_preferences.xml.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\xml\\preferences.xml"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_blue.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_blue.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_up.9.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_up.9.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_blue.9.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_blue.9.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_down.9.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_down.9.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_delete.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\delete.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_footer_bg.9.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_footer_bg.9.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_white.9.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_white.9.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_background.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_background.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_call_note_edit.xml.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\call_note_edit.xml"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_green.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_green.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_up.9.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_up.9.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_dialog_edit_text.xml.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\dialog_edit_text.xml"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_search_result.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\search_result.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_yellow.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_yellow.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_white.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_white.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_new_note_normal.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\new_note_normal.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_single.9.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_single.9.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_folder_list_item.xml.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\folder_list_item.xml"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_down.9.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_down.9.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_icon_app.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\icon_app.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_note_edit_color_selector_panel.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\note_edit_color_selector_panel.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_add_account_text.xml.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\add_account_text.xml"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_datetime_picker.xml.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\datetime_picker.xml"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_middle.9.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_middle.9.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_red.png.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_red.png"
+    },
+    {
+        "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_item.xml.flat",
+        "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_item.xml"
+    }
+]
\ No newline at end of file
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex
new file mode 100644
index 0000000..3a428ed
Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex
new file mode 100644
index 0000000..dee7677
Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex
new file mode 100644
index 0000000..b7191bb
Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex
new file mode 100644
index 0000000..57f0908
Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex
new file mode 100644
index 0000000..7768165
Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex
new file mode 100644
index 0000000..49221ea
Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex
new file mode 100644
index 0000000..61a84ce
Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex
new file mode 100644
index 0000000..0df2655
Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex
new file mode 100644
index 0000000..d9419a5
Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex
new file mode 100644
index 0000000..054f849
Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex
new file mode 100644
index 0000000..1d1ec6b
Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex
new file mode 100644
index 0000000..ddd806d
Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex
new file mode 100644
index 0000000..5421f6c
Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex
new file mode 100644
index 0000000..1f8fb0e
Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex
new file mode 100644
index 0000000..092ed94
Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex
new file mode 100644
index 0000000..a0cf8e6
Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex
new file mode 100644
index 0000000..643f437
Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex differ
diff --git a/src/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json b/src/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json
new file mode 100644
index 0000000..51f6368
--- /dev/null
+++ b/src/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json
@@ -0,0 +1 @@
+{"enableV1Signing":false,"enableV2Signing":true,"enableV3Signing":false,"enableV4Signing":false}
\ No newline at end of file
diff --git a/src/app/build/intermediates/source_set_path_map/debug/file-map.txt b/src/app/build/intermediates/source_set_path_map/debug/file-map.txt
new file mode 100644
index 0000000..a3cd696
--- /dev/null
+++ b/src/app/build/intermediates/source_set_path_map/debug/file-map.txt
@@ -0,0 +1,8 @@
+net.micode.notes.app-pngs-0 D:\softwareengineering\minote\src\app\build\generated\res\pngs\debug
+net.micode.notes.app-resValues-1 D:\softwareengineering\minote\src\app\build\generated\res\resValues\debug
+net.micode.notes.app-rs-2 D:\softwareengineering\minote\src\app\build\generated\res\rs\debug
+net.micode.notes.app-mergeDebugResources-3 D:\softwareengineering\minote\src\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir
+net.micode.notes.app-mergeDebugResources-4 D:\softwareengineering\minote\src\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir
+net.micode.notes.app-merged_res-5 D:\softwareengineering\minote\src\app\build\intermediates\merged_res\debug
+net.micode.notes.app-debug-6 D:\softwareengineering\minote\src\app\src\debug\res
+net.micode.notes.app-main-7 D:\softwareengineering\minote\src\app\src\main\res
diff --git a/src/app/build/outputs/logs/manifest-merger-debug-report.txt b/src/app/build/outputs/logs/manifest-merger-debug-report.txt
new file mode 100644
index 0000000..cd271db
--- /dev/null
+++ b/src/app/build/outputs/logs/manifest-merger-debug-report.txt
@@ -0,0 +1,235 @@
+-- Merging decision tree log ---
+manifest
+ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:18:1-150:12
+INJECTED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:18:1-150:12
+INJECTED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:18:1-150:12
+INJECTED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:18:1-150:12
+INJECTED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:18:1-150:12
+INJECTED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:18:1-150:12
+INJECTED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:18:1-150:12
+	package
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:19:5-31
+		INJECTED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml
+		INJECTED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml
+	android:versionName
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:21:5-30
+		INJECTED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml
+		INJECTED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml
+	xmlns:android
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:18:11-69
+	android:versionCode
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:20:5-28
+		INJECTED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml
+		INJECTED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml
+uses-sdk
+ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:23:5-44
+INJECTED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:23:5-44
+INJECTED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:23:5-44
+INJECTED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:23:5-44
+INJECTED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:23:5-44
+	android:targetSdkVersion
+		INJECTED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:23:5-44
+		INJECTED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml
+	android:minSdkVersion
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:23:15-41
+		INJECTED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml
+		INJECTED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml
+uses-permission#android.permission.WRITE_EXTERNAL_STORAGE
+ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:25:5-81
+	android:name
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:25:22-78
+uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT
+ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:26:5-88
+	android:name
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:26:22-85
+uses-permission#android.permission.INTERNET
+ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:27:5-67
+	android:name
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:27:22-64
+uses-permission#android.permission.READ_CONTACTS
+ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:28:5-72
+	android:name
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:28:22-69
+uses-permission#android.permission.MANAGE_ACCOUNTS
+ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:29:5-74
+	android:name
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:29:22-71
+uses-permission#android.permission.AUTHENTICATE_ACCOUNTS
+ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:30:5-80
+	android:name
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:30:22-77
+uses-permission#android.permission.GET_ACCOUNTS
+ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:31:5-71
+	android:name
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:31:22-68
+uses-permission#android.permission.USE_CREDENTIALS
+ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:32:5-74
+	android:name
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:32:22-71
+uses-permission#android.permission.RECEIVE_BOOT_COMPLETED
+ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:33:5-81
+	android:name
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:33:22-78
+application
+ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:35:5-149:19
+	android:label
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:37:9-41
+	android:icon
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:36:9-42
+activity#net.micode.notes.ui.NotesListActivity
+ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:38:9-51:20
+	android:label
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:41:13-45
+	android:launchMode
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:42:13-43
+	android:windowSoftInputMode
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:45:13-52
+	android:uiOptions
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:44:13-57
+	android:configChanges
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:40:13-74
+	android:theme
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:43:13-45
+	android:name
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:39:13-49
+intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER
+ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:47:13-50:29
+action#android.intent.action.MAIN
+ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:48:17-69
+	android:name
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:48:25-66
+category#android.intent.category.LAUNCHER
+ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:49:17-77
+	android:name
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:49:27-74
+activity#net.micode.notes.ui.NoteEditActivity
+ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:53:9-81:20
+	android:launchMode
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:56:13-43
+	android:configChanges
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:55:13-74
+	android:theme
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:57:13-45
+	android:name
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:54:13-48
+intent-filter#action:name:android.intent.action.VIEW+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note
+ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:59:13-64:29
+action#android.intent.action.VIEW
+ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:60:17-69
+	android:name
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:60:25-66
+category#android.intent.category.DEFAULT
+ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:61:17-76
+	android:name
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:61:27-73
+data
+ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:62:17-78
+	android:mimeType
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:62:23-75
+intent-filter#action:name:android.intent.action.INSERT_OR_EDIT+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note
+ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:66:13-71:29
+action#android.intent.action.INSERT_OR_EDIT
+ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:67:17-79
+	android:name
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:67:25-76
+intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT
+ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:73:13-76:29
+action#android.intent.action.SEARCH
+ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:74:17-71
+	android:name
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:74:25-68
+meta-data#android.app.searchable
+ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:78:13-80:54
+	android:resource
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:80:17-51
+	android:name
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:79:17-54
+provider#net.micode.notes.data.NotesProvider
+ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:83:9-86:43
+	android:authorities
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:85:13-47
+	android:multiprocess
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:86:13-40
+	android:name
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:84:13-63
+receiver#net.micode.notes.widget.NoteWidgetProvider_2x
+ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:88:9-100:20
+	android:label
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:90:13-50
+	android:name
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:89:13-57
+intent-filter#action:name:android.appwidget.action.APPWIDGET_DELETED+action:name:android.appwidget.action.APPWIDGET_UPDATE+action:name:android.intent.action.PRIVACY_MODE_CHANGED
+ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:91:13-95:29
+action#android.appwidget.action.APPWIDGET_UPDATE
+ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:92:17-84
+	android:name
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:92:25-81
+action#android.appwidget.action.APPWIDGET_DELETED
+ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:93:17-85
+	android:name
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:93:25-82
+action#android.intent.action.PRIVACY_MODE_CHANGED
+ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:94:17-85
+	android:name
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:94:25-82
+meta-data#android.appwidget.provider
+ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:97:13-99:58
+	android:resource
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:99:17-55
+	android:name
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:98:17-58
+receiver#net.micode.notes.widget.NoteWidgetProvider_4x
+ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:101:9-114:20
+	android:label
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:103:13-50
+	android:name
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:102:13-57
+receiver#net.micode.notes.ui.AlarmInitReceiver
+ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:116:9-120:20
+	android:name
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:116:19-55
+intent-filter#action:name:android.intent.action.BOOT_COMPLETED
+ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:117:13-119:29
+action#android.intent.action.BOOT_COMPLETED
+ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:118:17-79
+	android:name
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:118:25-76
+receiver#net.micode.notes.ui.AlarmReceiver
+ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:122:9-125:20
+	android:process
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:124:13-38
+	android:name
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:123:13-61
+activity#net.micode.notes.ui.AlarmAlertActivity
+ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:127:9-132:20
+	android:label
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:129:13-45
+	android:launchMode
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:130:13-48
+	android:theme
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:131:13-75
+	android:name
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:128:13-50
+activity#net.micode.notes.ui.NotesPreferenceActivity
+ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:134:9-139:20
+	android:label
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:136:13-54
+	android:launchMode
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:137:13-43
+	android:theme
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:138:13-60
+	android:name
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:135:13-71
+service#net.micode.notes.gtask.remote.GTaskSyncService
+ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:141:9-144:19
+	android:exported
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:143:13-37
+	android:name
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:142:13-74
+meta-data#android.app.default_searchable
+ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:146:9-148:52
+	android:value
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:148:13-49
+	android:name
+		ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:147:13-58