diff --git a/doc/~$便签代码泛读报告‘Š.docx b/doc/~$便签代码泛读报告‘Š.docx
deleted file mode 100644
index cb77dc2..0000000
Binary files a/doc/~$便签代码泛读报告‘Š.docx and /dev/null differ
diff --git a/doc/~WRL0348.tmp b/doc/~WRL0348.tmp
deleted file mode 100644
index bd1cae9..0000000
Binary files a/doc/~WRL0348.tmp and /dev/null differ
diff --git a/src/.gradle/6.1.1/executionHistory/executionHistory.bin b/src/.gradle/6.1.1/executionHistory/executionHistory.bin
index 1bfffe0..1aa1b73 100644
Binary files a/src/.gradle/6.1.1/executionHistory/executionHistory.bin and b/src/.gradle/6.1.1/executionHistory/executionHistory.bin differ
diff --git a/src/.gradle/6.1.1/executionHistory/executionHistory.lock b/src/.gradle/6.1.1/executionHistory/executionHistory.lock
index cfd048a..ca44cfb 100644
Binary files a/src/.gradle/6.1.1/executionHistory/executionHistory.lock and b/src/.gradle/6.1.1/executionHistory/executionHistory.lock differ
diff --git a/src/.gradle/6.1.1/fileHashes/fileHashes.bin b/src/.gradle/6.1.1/fileHashes/fileHashes.bin
index 583d2be..fd454d9 100644
Binary files a/src/.gradle/6.1.1/fileHashes/fileHashes.bin and b/src/.gradle/6.1.1/fileHashes/fileHashes.bin differ
diff --git a/src/.gradle/6.1.1/fileHashes/fileHashes.lock b/src/.gradle/6.1.1/fileHashes/fileHashes.lock
index d82faad..c50c049 100644
Binary files a/src/.gradle/6.1.1/fileHashes/fileHashes.lock and b/src/.gradle/6.1.1/fileHashes/fileHashes.lock differ
diff --git a/src/.gradle/6.1.1/fileHashes/resourceHashesCache.bin b/src/.gradle/6.1.1/fileHashes/resourceHashesCache.bin
index a3e82b9..51c3a12 100644
Binary files a/src/.gradle/6.1.1/fileHashes/resourceHashesCache.bin and b/src/.gradle/6.1.1/fileHashes/resourceHashesCache.bin differ
diff --git a/src/.gradle/6.1.1/javaCompile/classAnalysis.bin b/src/.gradle/6.1.1/javaCompile/classAnalysis.bin
index 327a5a2..259c223 100644
Binary files a/src/.gradle/6.1.1/javaCompile/classAnalysis.bin and b/src/.gradle/6.1.1/javaCompile/classAnalysis.bin differ
diff --git a/src/.gradle/6.1.1/javaCompile/jarAnalysis.bin b/src/.gradle/6.1.1/javaCompile/jarAnalysis.bin
index 98f5d94..2516159 100644
Binary files a/src/.gradle/6.1.1/javaCompile/jarAnalysis.bin and b/src/.gradle/6.1.1/javaCompile/jarAnalysis.bin differ
diff --git a/src/.gradle/6.1.1/javaCompile/javaCompile.lock b/src/.gradle/6.1.1/javaCompile/javaCompile.lock
index 46a7003..ea3d368 100644
Binary files a/src/.gradle/6.1.1/javaCompile/javaCompile.lock and b/src/.gradle/6.1.1/javaCompile/javaCompile.lock differ
diff --git a/src/.gradle/6.1.1/javaCompile/taskHistory.bin b/src/.gradle/6.1.1/javaCompile/taskHistory.bin
index 522d881..d90e796 100644
Binary files a/src/.gradle/6.1.1/javaCompile/taskHistory.bin and b/src/.gradle/6.1.1/javaCompile/taskHistory.bin differ
diff --git a/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 3fae02c..ecedbef 100644
Binary files a/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/src/.idea/sonarIssues.xml b/src/.idea/sonarIssues.xml
index 9169376..bd726aa 100644
--- a/src/.idea/sonarIssues.xml
+++ b/src/.idea/sonarIssues.xml
@@ -3,6 +3,11 @@
   <component name="issues">
     <option name="index">
       <map>
+        <entry key="/fragment.java">
+          <value>
+            <set />
+          </value>
+        </entry>
         <entry key="$USER_HOME$/.gradle/gradle.properties">
           <value>
             <set />
@@ -18,11 +23,41 @@
             <set />
           </value>
         </entry>
+        <entry key="$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java">
+          <value>
+            <set />
+          </value>
+        </entry>
+        <entry key="$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NoteEditText.java">
+          <value>
+            <set />
+          </value>
+        </entry>
+        <entry key="$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NoteItemData.java">
+          <value>
+            <set />
+          </value>
+        </entry>
         <entry key="$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java">
           <value>
             <set />
           </value>
         </entry>
+        <entry key="$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java">
+          <value>
+            <set />
+          </value>
+        </entry>
+        <entry key="$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListItem.java">
+          <value>
+            <set />
+          </value>
+        </entry>
+        <entry key="$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java">
+          <value>
+            <set />
+          </value>
+        </entry>
         <entry key="$PROJECT_DIR$/app/src/main/res/layout/note_edit.xml">
           <value>
             <set />
@@ -33,6 +68,11 @@
             <set />
           </value>
         </entry>
+        <entry key="$PROJECT_DIR$/app/src/main/res/layout/note_list_dropdown_menu.xml">
+          <value>
+            <set />
+          </value>
+        </entry>
         <entry key="$PROJECT_DIR$/app/src/main/res/layout/note_list_footer.xml">
           <value>
             <set />
diff --git a/src/.idea/sonarlint/issuestore/5/0/503adcf2a0be1ecdb94a15efba4433b6589877b9 b/src/.idea/sonarlint/issuestore/5/0/503adcf2a0be1ecdb94a15efba4433b6589877b9
index c22ca93..4978033 100644
--- a/src/.idea/sonarlint/issuestore/5/0/503adcf2a0be1ecdb94a15efba4433b6589877b9
+++ b/src/.idea/sonarlint/issuestore/5/0/503adcf2a0be1ecdb94a15efba4433b6589877b9
@@ -1,12 +1,12 @@
 
-<	java:S131h""Add a default case to this switch.(��������

-P
-java:S2864�
"4Iterate over the "entrySet" instead of the "keySet".(�������

-^
-java:S1126�
"BReplace this if-then-else statement by a single method invocation.(�忥�����

 M
 java:S1135c"2Complete the task associated to this TODO comment.(���������

+K
+java:S2864�
"4Iterate over the "entrySet" instead of the "keySet".(��̯
+o
+java:S22931"YReplace the type specification in this constructor call with the diamond operator ("<>").(����
+^
+java:S1126�
"BReplace this if-then-else statement by a single method invocation.(�忥�����

 f
 java:S1301h"KReplace this "switch" statement by "if" statements to increase readability.(��������

-o
-java:S22931"YReplace the type specification in this constructor call with the diamond operator ("<>").(����
\ No newline at end of file
+<	java:S131h""Add a default case to this switch.(��������

\ No newline at end of file
diff --git a/src/.idea/sonarlint/issuestore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c b/src/.idea/sonarlint/issuestore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c
index 95d576b..ef00407 100644
--- a/src/.idea/sonarlint/issuestore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c
+++ b/src/.idea/sonarlint/issuestore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c
@@ -1,35 +1,35 @@
 
-X
-java:S1126�"AReplace this if-then-else statement by a single return statement.(����
 t
-java:S2293i"YReplace the type specification in this constructor call with the diamond operator ("<>").(���������

-r
-java:S1104P"WMake ivAlertIcon a static final constant or non-public and provide accessors if needed.(�න�����

+java:S2293W"YReplace the type specification in this constructor call with the diamond operator ("<>").(�ӏ������

 n
-java:S3776�
"RRefactor this method to reduce its Cognitive Complexity from 26 to the 15 allowed.(ݨ�������

+java:S1450�
"WRemove the "mPattern" field and declare it as a local variable in the relevant methods.(����
 o
 java:S2293q"YReplace the type specification in this constructor call with the diamond operator ("<>").(����
+8
+java:S1116�"Remove this empty statement.(���������

+n
+java:S3776�
"RRefactor this method to reduce its Cognitive Complexity from 26 to the 15 allowed.(ݨ�������

 K
 java:S2864�"4Iterate over the "entrySet" instead of the "keySet".(�ԇ�
+X
+java:S1126�"AReplace this if-then-else statement by a single return statement.(����
+t
+java:S2293i"YReplace the type specification in this constructor call with the diamond operator ("<>").(���������

 t
 java:S2293`"YReplace the type specification in this constructor call with the diamond operator ("<>").(���������

 N
 java:S1135�"2Complete the task associated to this TODO comment.(���������

-t
-java:S2293W"YReplace the type specification in this constructor call with the diamond operator ("<>").(�ӏ������

-n
-java:S1450�
"WRemove the "mPattern" field and declare it as a local variable in the relevant methods.(����
+r
+java:S1104P"WMake ivAlertIcon a static final constant or non-public and provide accessors if needed.(�න�����

+w
+java:S2293�"YReplace the type specification in this constructor call with the diamond operator ("<>").(艥�8�����.
 r
 java:S1104R"WMake tvAlertDate a static final constant or non-public and provide accessors if needed.(���������

 s
 java:S1104T"XMake ibSetBgColor a static final constant or non-public and provide accessors if needed.(��������

 8
-java:S1116�"Remove this empty statement.(���������

-p
-java:S2293�"YReplace the type specification in this constructor call with the diamond operator ("<>").(艥�
+java:S1116�"Remove this empty statement.(���������

 q
 java:S1104N"VMake tvModified a static final constant or non-public and provide accessors if needed.(��ԣ�����

-d
-java:S3252�"MUse static access with "android.text.Spanned" for "SPAN_INCLUSIVE_EXCLUSIVE".(����

-8
-java:S1116�"Remove this empty statement.(���������

\ No newline at end of file
+k
+java:S3252�"MUse static access with "android.text.Spanned" for "SPAN_INCLUSIVE_EXCLUSIVE".(����
8�����.
\ No newline at end of file
diff --git a/src/.idea/sonarlint/issuestore/8/7/876016634c6642b35109680ccac740dc8271b236 b/src/.idea/sonarlint/issuestore/8/7/876016634c6642b35109680ccac740dc8271b236
index e485476..f71e534 100644
--- a/src/.idea/sonarlint/issuestore/8/7/876016634c6642b35109680ccac740dc8271b236
+++ b/src/.idea/sonarlint/issuestore/8/7/876016634c6642b35109680ccac740dc8271b236
@@ -1,11 +1,11 @@
 
 X
 java:S1126�
"AReplace this if-then-else statement by a single return statement.(����
-?
-java:S1125�"(Remove the literal "true" boolean value.(���
-F
-java:S1066�
"/Merge this if statement with the enclosing one.(�
 8
 java:S2386K"Make this member "protected".(�㳎�����

 3
-java:S2386A"Make this member "protected".(����
\ No newline at end of file
+java:S2386A"Make this member "protected".(����
+?
+java:S1125�"(Remove the literal "true" boolean value.(���
+F
+java:S1066�
"/Merge this if statement with the enclosing one.(�
\ No newline at end of file
diff --git a/src/.idea/sonarlint/issuestore/index.pb b/src/.idea/sonarlint/issuestore/index.pb
index f7ca4c2..5057267 100644
--- a/src/.idea/sonarlint/issuestore/index.pb
+++ b/src/.idea/sonarlint/issuestore/index.pb
@@ -26,4 +26,24 @@ k
 k
 ;app/src/main/java/net/micode/notes/tool/ResourceParser.java,c\6\c65f5dc8218ef1da6f6bfb5d1b14aea855a54d7f
 p
-@app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java,1\e\1eb2363b523dbcae43d3c6e4790c64436af61b13
\ No newline at end of file
+@app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java,1\e\1eb2363b523dbcae43d3c6e4790c64436af61b13
+g
+7app/src/main/java/net/micode/notes/ui/DropdownMenu.java,d\1\d1cc822fa9d783a8d4563bf6e139b7ae10de2fb1
+r
+Bapp/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java,d\a\da57ce446af85bbd9aefee65e969869f0cff78b0
+h
+8app/src/main/java/net/micode/notes/ui/NotesListItem.java,5\d\5dfe6902d8ec740690f88d644e74362c3be08fad
+g
+7app/src/main/java/net/micode/notes/ui/NoteItemData.java,0\8\08c35f02f11c35ae9ebf8db0a482054dfa1cf493
+m
+=app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java,f\9\f9f49497f95afd327db7a7a512612aa1089003d4
+o
+?app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java,2\b\2bfc771e07e87c37d3a76a2c815bc8fb30649798
+i
+9app/src/main/java/net/micode/notes/ui/DateTimePicker.java,6\c\6cbf8bd9aa98eff862b1dc067330ba66ba4493aa
+h
+8app/src/main/java/net/micode/notes/ui/AlarmReceiver.java,5\8\5836a695995df8fadacfa6409fe8d21d88946842
+u
+Eapp/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java,f\0\f087b1ba1b9c91b7293fea0fb071eaed62a42137
+f
+6app/src/main/java/net/micode/notes/tool/DataUtils.java,3\2\32360bf24febc78f20db52498c7576b3d8650d56
\ No newline at end of file
diff --git a/src/app/build/intermediates/blame/res/debug/multi-v2/debug.json b/src/app/build/intermediates/blame/res/debug/multi-v2/debug.json
index 2dbce15..77285c5 100644
--- a/src/app/build/intermediates/blame/res/debug/multi-v2/debug.json
+++ b/src/app/build/intermediates/blame/res/debug/multi-v2/debug.json
@@ -6,31 +6,27 @@
                 {
                     "source": "F:\\Git\\work_room\\p3p7sqtgz\\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": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029",
-                        "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
-                        "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
-                        "endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090"
+                        "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,21,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,20,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,4,-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,-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,937,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,883,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,55,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,52,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,988,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,931,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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",
-                        "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": "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,108",
+                        "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",
+                        "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,2163,2216,2259,2310,2360,2420,2473,2524,2570,2618,2666,2712,2759,2809,2862,2907,2966,3018,3070,3113,3160,3216,3271,3326,3370,3412,3453,3503,3562,3613,3662,3711,3758,3805,3852,3897,3948,4001,4076,4135,4192,4266,4330,4399,4477,4587,4691,4764,4830,4885,4950,5015,5064,5147,5225,5263,5308,5356,5418,5475,5530,5589,5656,5714,5776,5824,5869,5917,5968,6034",
+                        "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,108",
+                        "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,55,52,42,50,49,59,52,50,45,47,47,45,46,49,52,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,2158,2211,2254,2305,2355,2415,2468,2519,2565,2613,2661,2707,2754,2804,2857,2902,2961,3013,3065,3108,3155,3211,3266,3321,3365,3407,3448,3498,3557,3608,3657,3706,3753,3800,3847,3892,3943,3996,4071,4130,4187,4261,4325,4394,4472,4582,4686,4759,4825,4880,4945,5010,5059,5142,5220,5258,5303,5351,5413,5470,5525,5584,5651,5709,5771,5819,5864,5912,5963,6029,6095"
                     }
                 },
                 {
                     "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
                     "from": {
-                        "startLines": "18",
-                        "startColumns": "4",
-                        "startOffsets": "712",
-                        "endLines": "21",
-                        "endColumns": "19",
-                        "endOffsets": "817"
+                        "startLines": "-1",
+                        "startColumns": "-1",
+                        "startOffsets": "-1"
                     },
                     "to": {
                         "startLines": "2",
@@ -49,92 +45,85 @@
                 {
                     "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\values\\colors.xml",
                     "from": {
-                        "startLines": "18",
-                        "startColumns": "4",
-                        "startOffsets": "712",
-                        "endColumns": "56",
-                        "endOffsets": "764"
+                        "startLines": "-1",
+                        "startColumns": "-1",
+                        "startOffsets": "-1"
                     },
                     "to": {
                         "startLines": "12",
                         "startColumns": "4",
-                        "startOffsets": "532",
+                        "startOffsets": "420",
                         "endColumns": "56",
-                        "endOffsets": "584"
+                        "endOffsets": "472"
                     }
                 },
                 {
                     "source": "F:\\Git\\work_room\\p3p7sqtgz\\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": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084",
-                        "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": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169"
+                        "startLines": "130,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,20,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,19,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,4,-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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "8273,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,904,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,846,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "134,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,20,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,19,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,77,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,56,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "8681,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,977,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,898,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "851,1244,1340,1423,1519,1588,1631,1683,1735,1784,1847,1905,1956,2040,2134,2242,2313,2397,2480,2546,2629,2731,2792,2854,2905,2983,3036,3096,3201,3260,3362,3417,3488,3537,3595,3642,3701,3758,3829,3890,3947,3997,4049,4102,4152,4202,4262,4315,4381,4443,4506,4553,4608,4696,4754,4816,4866,4911,4954,5014,5081,5136,5191,5244,5291,5344,5400,5448,5503,5556,5640,5707,5771,5867,5941,6022,6111,6274,6418,6497,6572,6654,6713,6793,6873,6928,7050,7153,7194,7247,7304,7378,7443,7511,7597,7677,7746,7840,7899,7954,8016,8076,8186",
-                        "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": "1239,1335,1418,1514,1583,1626,1678,1730,1779,1842,1900,1951,2035,2129,2237,2308,2392,2475,2541,2624,2726,2787,2849,2900,2978,3031,3091,3196,3255,3357,3412,3483,3532,3590,3637,3696,3753,3824,3885,3942,3992,4044,4097,4147,4197,4257,4310,4376,4438,4501,4548,4603,4691,4749,4811,4861,4906,4949,5009,5076,5131,5186,5239,5286,5339,5395,5443,5498,5551,5635,5702,5766,5862,5936,6017,6106,6269,6413,6492,6567,6649,6708,6788,6868,6923,7045,7148,7189,7242,7299,7373,7438,7506,7592,7672,7741,7835,7894,7949,8011,8071,8181,8271"
+                        "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,126",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "739,1132,1228,1311,1407,1476,1519,1571,1623,1672,1735,1793,1844,1928,2022,2130,2201,2285,2368,2434,2517,2619,2680,2742,2793,2871,2924,2984,3089,3148,3250,3305,3376,3425,3503,3561,3608,3667,3724,3795,3856,3913,3963,4015,4068,4118,4168,4228,4285,4338,4404,4466,4529,4576,4631,4719,4777,4839,4889,4934,4977,5037,5104,5159,5214,5267,5314,5367,5423,5471,5526,5579,5663,5730,5794,5890,5964,6045,6134,6297,6441,6520,6595,6677,6736,6816,6896,6951,7073,7176,7217,7270,7327,7401,7466,7534,7620,7700,7769,7863,7922,7977,8039,8099,8209",
+                        "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,126",
+                        "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,77,57,46,58,56,70,60,56,49,51,52,49,49,59,56,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": "1127,1223,1306,1402,1471,1514,1566,1618,1667,1730,1788,1839,1923,2017,2125,2196,2280,2363,2429,2512,2614,2675,2737,2788,2866,2919,2979,3084,3143,3245,3300,3371,3420,3498,3556,3603,3662,3719,3790,3851,3908,3958,4010,4063,4113,4163,4223,4280,4333,4399,4461,4524,4571,4626,4714,4772,4834,4884,4929,4972,5032,5099,5154,5209,5262,5309,5362,5418,5466,5521,5574,5658,5725,5789,5885,5959,6040,6129,6292,6436,6515,6590,6672,6731,6811,6891,6946,7068,7171,7212,7265,7322,7396,7461,7529,7615,7695,7764,7858,7917,7972,8034,8094,8204,8294"
                     }
                 },
                 {
                     "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\values\\arrays.xml",
                     "from": {
-                        "startLines": "19,26",
-                        "startColumns": "4,4",
-                        "startOffsets": "739,1047",
-                        "endLines": "24,29",
-                        "endColumns": "19,19",
-                        "endOffsets": "1041,1162"
+                        "startLines": "-1,-1",
+                        "startColumns": "-1,-1",
+                        "startOffsets": "-1,-1"
                     },
                     "to": {
                         "startLines": "2,8",
                         "startColumns": "4,4",
-                        "startOffsets": "105,412",
+                        "startOffsets": "105,300",
                         "endLines": "7,11",
                         "endColumns": "19,19",
-                        "endOffsets": "407,527"
+                        "endOffsets": "295,415"
                     }
                 },
                 {
                     "source": "F:\\Git\\work_room\\p3p7sqtgz\\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": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860",
-                        "endLines": "53,58,67,62,25,29,33,38,43,21,48",
-                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "2261,2473,2846,2634,1073,1258,1443,1647,1854,890,2056"
+                        "startLines": "-1,-1,64,-1,22,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "-1,-1,4,-1,4,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,-1,2704,-1,917,-1,-1,-1,-1,-1,-1",
+                        "endLines": "-1,-1,66,-1,25,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "-1,-1,12,-1,12,-1,-1,-1,-1,-1,-1",
+                        "endOffsets": "-1,-1,2865,-1,1098,-1,-1,-1,-1,-1,-1"
                     },
                     "to": {
-                        "startLines": "125,129,133,137,140,144,148,152,156,160,164",
+                        "startLines": "127,131,135,138,141,145,149,153,157,161,165",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "8276,8480,8691,8901,9061,9244,9429,9614,9817,10023,10206",
-                        "endLines": "128,132,136,139,143,147,151,155,159,163,167",
+                        "startOffsets": "8299,8503,8714,8878,9038,9221,9406,9591,9794,10000,10183",
+                        "endLines": "130,134,137,140,144,148,152,156,160,164,168",
                         "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "8475,8686,8896,9056,9239,9424,9609,9812,10018,10201,10402"
+                        "endOffsets": "8498,8709,8873,9033,9216,9401,9586,9789,9995,10178,10379"
                     }
                 },
                 {
                     "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\values\\dimens.xml",
                     "from": {
-                        "startLines": "19,20,21,22,18",
-                        "startColumns": "4,4,4,4,4",
-                        "startOffsets": "764,816,869,922,712",
-                        "endColumns": "51,52,52,51,51",
-                        "endOffsets": "811,864,917,969,759"
+                        "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": "589,641,694,747,799",
+                        "startOffsets": "477,529,582,635,687",
                         "endColumns": "51,52,52,51,51",
-                        "endOffsets": "636,689,742,794,846"
+                        "endOffsets": "524,577,630,682,734"
                     }
                 }
             ]
@@ -147,10 +136,10 @@
                     "from": {
                         "startLines": "18",
                         "startColumns": "4",
-                        "startOffsets": "712",
+                        "startOffsets": "730",
                         "endLines": "21",
                         "endColumns": "19",
-                        "endOffsets": "817"
+                        "endOffsets": "838"
                     },
                     "to": {
                         "startLines": "2",
@@ -166,10 +155,10 @@
                     "from": {
                         "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029",
+                        "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": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090"
+                        "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",
diff --git a/src/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rCN.json b/src/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rCN.json
index 9dd7a82..8004cff 100644
--- a/src/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rCN.json
+++ b/src/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rCN.json
@@ -6,31 +6,27 @@
                 {
                     "source": "F:\\Git\\work_room\\p3p7sqtgz\\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": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029",
-                        "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
-                        "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
-                        "endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090"
+                        "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,21,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,20,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,4,-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,-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,937,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,883,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,55,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,52,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,988,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,931,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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",
-                        "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": "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,108",
+                        "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",
+                        "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,2163,2216,2259,2310,2360,2420,2473,2524,2570,2618,2666,2712,2759,2809,2862,2907,2966,3018,3070,3113,3160,3216,3271,3326,3370,3412,3453,3503,3562,3613,3662,3711,3758,3805,3852,3897,3948,4001,4076,4135,4192,4266,4330,4399,4477,4587,4691,4764,4830,4885,4950,5015,5064,5147,5225,5263,5308,5356,5418,5475,5530,5589,5656,5714,5776,5824,5869,5917,5968,6034",
+                        "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,108",
+                        "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,55,52,42,50,49,59,52,50,45,47,47,45,46,49,52,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,2158,2211,2254,2305,2355,2415,2468,2519,2565,2613,2661,2707,2754,2804,2857,2902,2961,3013,3065,3108,3155,3211,3266,3321,3365,3407,3448,3498,3557,3608,3657,3706,3753,3800,3847,3892,3943,3996,4071,4130,4187,4261,4325,4394,4472,4582,4686,4759,4825,4880,4945,5010,5059,5142,5220,5258,5303,5351,5413,5470,5525,5584,5651,5709,5771,5819,5864,5912,5963,6029,6095"
                     }
                 },
                 {
                     "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
                     "from": {
-                        "startLines": "18",
-                        "startColumns": "4",
-                        "startOffsets": "712",
-                        "endLines": "21",
-                        "endColumns": "19",
-                        "endOffsets": "817"
+                        "startLines": "-1",
+                        "startColumns": "-1",
+                        "startOffsets": "-1"
                     },
                     "to": {
                         "startLines": "2",
diff --git a/src/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rTW.json b/src/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rTW.json
index 0a0f4cb..2e3357e 100644
--- a/src/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rTW.json
+++ b/src/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rTW.json
@@ -8,10 +8,10 @@
                     "from": {
                         "startLines": "18",
                         "startColumns": "4",
-                        "startOffsets": "712",
+                        "startOffsets": "730",
                         "endLines": "21",
                         "endColumns": "19",
-                        "endOffsets": "817"
+                        "endOffsets": "838"
                     },
                     "to": {
                         "startLines": "2",
@@ -27,10 +27,10 @@
                     "from": {
                         "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029",
+                        "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": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090"
+                        "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",
diff --git a/src/app/build/intermediates/blame/res/debug/multi-v2/values.json b/src/app/build/intermediates/blame/res/debug/multi-v2/values.json
index 23b2a0f..2728595 100644
--- a/src/app/build/intermediates/blame/res/debug/multi-v2/values.json
+++ b/src/app/build/intermediates/blame/res/debug/multi-v2/values.json
@@ -6,92 +6,85 @@
                 {
                     "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\values\\colors.xml",
                     "from": {
-                        "startLines": "18",
-                        "startColumns": "4",
-                        "startOffsets": "712",
-                        "endColumns": "56",
-                        "endOffsets": "764"
+                        "startLines": "-1",
+                        "startColumns": "-1",
+                        "startOffsets": "-1"
                     },
                     "to": {
                         "startLines": "12",
                         "startColumns": "4",
-                        "startOffsets": "532",
+                        "startOffsets": "420",
                         "endColumns": "56",
-                        "endOffsets": "584"
+                        "endOffsets": "472"
                     }
                 },
                 {
                     "source": "F:\\Git\\work_room\\p3p7sqtgz\\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": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084",
-                        "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": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169"
+                        "startLines": "130,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,20,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,19,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,4,-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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "8273,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,904,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,846,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "134,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,20,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,19,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,77,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,56,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "8681,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,977,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,898,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "851,1244,1340,1423,1519,1588,1631,1683,1735,1784,1847,1905,1956,2040,2134,2242,2313,2397,2480,2546,2629,2731,2792,2854,2905,2983,3036,3096,3201,3260,3362,3417,3488,3537,3595,3642,3701,3758,3829,3890,3947,3997,4049,4102,4152,4202,4262,4315,4381,4443,4506,4553,4608,4696,4754,4816,4866,4911,4954,5014,5081,5136,5191,5244,5291,5344,5400,5448,5503,5556,5640,5707,5771,5867,5941,6022,6111,6274,6418,6497,6572,6654,6713,6793,6873,6928,7050,7153,7194,7247,7304,7378,7443,7511,7597,7677,7746,7840,7899,7954,8016,8076,8186",
-                        "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": "1239,1335,1418,1514,1583,1626,1678,1730,1779,1842,1900,1951,2035,2129,2237,2308,2392,2475,2541,2624,2726,2787,2849,2900,2978,3031,3091,3196,3255,3357,3412,3483,3532,3590,3637,3696,3753,3824,3885,3942,3992,4044,4097,4147,4197,4257,4310,4376,4438,4501,4548,4603,4691,4749,4811,4861,4906,4949,5009,5076,5131,5186,5239,5286,5339,5395,5443,5498,5551,5635,5702,5766,5862,5936,6017,6106,6269,6413,6492,6567,6649,6708,6788,6868,6923,7045,7148,7189,7242,7299,7373,7438,7506,7592,7672,7741,7835,7894,7949,8011,8071,8181,8271"
+                        "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,126",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "739,1132,1228,1311,1407,1476,1519,1571,1623,1672,1735,1793,1844,1928,2022,2130,2201,2285,2368,2434,2517,2619,2680,2742,2793,2871,2924,2984,3089,3148,3250,3305,3376,3425,3503,3561,3608,3667,3724,3795,3856,3913,3963,4015,4068,4118,4168,4228,4285,4338,4404,4466,4529,4576,4631,4719,4777,4839,4889,4934,4977,5037,5104,5159,5214,5267,5314,5367,5423,5471,5526,5579,5663,5730,5794,5890,5964,6045,6134,6297,6441,6520,6595,6677,6736,6816,6896,6951,7073,7176,7217,7270,7327,7401,7466,7534,7620,7700,7769,7863,7922,7977,8039,8099,8209",
+                        "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,126",
+                        "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,77,57,46,58,56,70,60,56,49,51,52,49,49,59,56,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": "1127,1223,1306,1402,1471,1514,1566,1618,1667,1730,1788,1839,1923,2017,2125,2196,2280,2363,2429,2512,2614,2675,2737,2788,2866,2919,2979,3084,3143,3245,3300,3371,3420,3498,3556,3603,3662,3719,3790,3851,3908,3958,4010,4063,4113,4163,4223,4280,4333,4399,4461,4524,4571,4626,4714,4772,4834,4884,4929,4972,5032,5099,5154,5209,5262,5309,5362,5418,5466,5521,5574,5658,5725,5789,5885,5959,6040,6129,6292,6436,6515,6590,6672,6731,6811,6891,6946,7068,7171,7212,7265,7322,7396,7461,7529,7615,7695,7764,7858,7917,7972,8034,8094,8204,8294"
                     }
                 },
                 {
                     "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\values\\arrays.xml",
                     "from": {
-                        "startLines": "19,26",
-                        "startColumns": "4,4",
-                        "startOffsets": "739,1047",
-                        "endLines": "24,29",
-                        "endColumns": "19,19",
-                        "endOffsets": "1041,1162"
+                        "startLines": "-1,-1",
+                        "startColumns": "-1,-1",
+                        "startOffsets": "-1,-1"
                     },
                     "to": {
                         "startLines": "2,8",
                         "startColumns": "4,4",
-                        "startOffsets": "105,412",
+                        "startOffsets": "105,300",
                         "endLines": "7,11",
                         "endColumns": "19,19",
-                        "endOffsets": "407,527"
+                        "endOffsets": "295,415"
                     }
                 },
                 {
                     "source": "F:\\Git\\work_room\\p3p7sqtgz\\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": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860",
-                        "endLines": "53,58,67,62,25,29,33,38,43,21,48",
-                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "2261,2473,2846,2634,1073,1258,1443,1647,1854,890,2056"
+                        "startLines": "-1,-1,64,-1,22,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "-1,-1,4,-1,4,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,-1,2704,-1,917,-1,-1,-1,-1,-1,-1",
+                        "endLines": "-1,-1,66,-1,25,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "-1,-1,12,-1,12,-1,-1,-1,-1,-1,-1",
+                        "endOffsets": "-1,-1,2865,-1,1098,-1,-1,-1,-1,-1,-1"
                     },
                     "to": {
-                        "startLines": "125,129,133,137,140,144,148,152,156,160,164",
+                        "startLines": "127,131,135,138,141,145,149,153,157,161,165",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "8276,8480,8691,8901,9061,9244,9429,9614,9817,10023,10206",
-                        "endLines": "128,132,136,139,143,147,151,155,159,163,167",
+                        "startOffsets": "8299,8503,8714,8878,9038,9221,9406,9591,9794,10000,10183",
+                        "endLines": "130,134,137,140,144,148,152,156,160,164,168",
                         "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "8475,8686,8896,9056,9239,9424,9609,9812,10018,10201,10402"
+                        "endOffsets": "8498,8709,8873,9033,9216,9401,9586,9789,9995,10178,10379"
                     }
                 },
                 {
                     "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\values\\dimens.xml",
                     "from": {
-                        "startLines": "19,20,21,22,18",
-                        "startColumns": "4,4,4,4,4",
-                        "startOffsets": "764,816,869,922,712",
-                        "endColumns": "51,52,52,51,51",
-                        "endOffsets": "811,864,917,969,759"
+                        "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": "589,641,694,747,799",
+                        "startOffsets": "477,529,582,635,687",
                         "endColumns": "51,52,52,51,51",
-                        "endOffsets": "636,689,742,794,846"
+                        "endOffsets": "524,577,630,682,734"
                     }
                 }
             ]
diff --git a/src/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar b/src/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar
index 017706b..befafb1 100644
Binary files a/src/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar and b/src/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar differ
diff --git a/src/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/src/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex
index 19c918d..fee62bd 100644
Binary files a/src/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex 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
index 2d2aa6d..ccacba6 100644
Binary files a/src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and b/src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ
diff --git a/src/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties b/src/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
index 74ef0e8..2a8bcb1 100644
--- a/src/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
+++ b/src/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
@@ -1,4 +1,4 @@
-#Mon Oct 12 09:10:18 CST 2020
+#Sun Oct 25 09:05:51 CST 2020
 F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_red.png.flat
 F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_middle.9.png.flat
 F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\layout\\account_dialog_title.xml=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\layout_account_dialog_title.xml.flat
@@ -78,19 +78,19 @@ F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\list_gr
 F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat
 F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\menu\\note_list_dropdown.xml=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_dropdown.xml.flat
 F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\list_background.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_background.png.flat
-F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_up.9.png.flat
 F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_white.9.png.flat
+F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_up.9.png.flat
 F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_green.9.png.flat
 F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\menu\\note_list_options.xml=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_options.xml.flat
 F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\xml\\preferences.xml=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\xml_preferences.xml.flat
-F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_single.9.png.flat
-F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\search_result.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_search_result.png.flat
 F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\color\\primary_text_dark.xml=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\color_primary_text_dark.xml.flat
-F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_pressed.png.flat
+F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\search_result.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_search_result.png.flat
+F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_single.9.png.flat
 F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat
-F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_up.9.png.flat
+F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_pressed.png.flat
 F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\font_large.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_large.png.flat
+F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_up.9.png.flat
 F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\layout\\note_item.xml=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_item.xml.flat
 F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_blue.png.flat
-F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\layout\\widget_4x.xml=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_4x.xml.flat
 F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_red.9.png.flat
+F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\layout\\widget_4x.xml=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_4x.xml.flat
diff --git a/src/app/build/intermediates/incremental/mergeDebugResources/merger.xml b/src/app/build/intermediates/incremental/mergeDebugResources/merger.xml
index af8b9de..a932637 100644
--- a/src/app/build/intermediates/incremental/mergeDebugResources/merger.xml
+++ b/src/app/build/intermediates/incremental/mergeDebugResources/merger.xml
@@ -11,12 +11,12 @@
          <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></file><file path="F:\Git\work_room\p3p7sqtgz\src\app\src\main\res\values\styles.xml" qualifiers=""><style name="TextAppearanceSuper">
+    </plurals><string name="menu_countAllNotes">count how many notes are there</string><string name="menu_message_pop">Pop message</string></file><file path="F:\Git\work_room\p3p7sqtgz\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">#2D2D9A</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>
@@ -41,14 +41,13 @@
     </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:displayOptions"/>
         <item name="android:visibility">visible</item>
     </style></file><file path="F:\Git\work_room\p3p7sqtgz\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="F:\Git\work_room\p3p7sqtgz\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></file><file path="F:\Git\work_room\p3p7sqtgz\src\app\src\main\res\values-zh-rTW\arrays.xml" qualifiers="zh-rTW"><string-array name="menu_share_ways">
+    </plurals><string name="menu_message_pop">弹出自定义消息</string><string name="menu_countAllNotes">显示目前便签数量</string></file><file path="F:\Git\work_room\p3p7sqtgz\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="F:\Git\work_room\p3p7sqtgz\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">
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
index 55aab2c..9331e06 100644
--- 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
@@ -1,4 +1,4 @@
-#Mon Oct 12 09:26:16 CST 2020
+#Mon Oct 26 10:05:03 CST 2020
 base.0=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
 path.0=classes.dex
 renamed.0=classes.dex
diff --git a/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
index 3f61bfb..e9c390e 100644
Binary files a/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class
index d13e818..e650367 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class
index 03b143b..0b7e26c 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class
index f21b88b..f63a108 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class
index 8c369b7..be3984f 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class
index c166e99..95bd3b7 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class
index 51e6b34..e40fb62 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class
index 3ae9087..9f9d92c 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class
index 6102411..e3b3e3e 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class
index 0b3a3d4..33f599c 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class
index 25b89b1..a8b5b66 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class
index 41671ab..f40bb51 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class
index d828034..6bd6f98 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class
index b66b35b..4911262 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class
index 04f4c75..f4ef82f 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class
index 9b60113..f74689d 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class
index 711bdf3..cba00b2 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class
index 19f9291..484795b 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class
index 0ee08d9..3b42a27 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class
index 14beb26..0c0ef6e 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class
index f0a7397..13eb7db 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class
index 0d942f3..33eb9b2 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class
index c7fe353..dcec846 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class
index 48e3ed4..f1e80ae 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class
index c161d09..00eb5b1 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class
index d361bc6..5bb50d8 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class
index f6c7814..0bacf6e 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class
index 88c3a02..5a7f8f0 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class
index 732b6aa..c1eeca9 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class
index 1e3e0f7..e6e7ffc 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class
index b8f887a..c9d8d39 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class
index 282522d..7ddad1a 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class
index 01a4267..249c9d2 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class
index b4d341e..b153f89 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class
index 9a8fb0c..ffa0d8f 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class
index fc41031..4c3c46a 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class
index 5aea3c1..f7898a1 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class differ
diff --git a/src/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/src/app/build/intermediates/processed_res/debug/out/resources-debug.ap_
index bd3df6b..e65a8de 100644
Binary files a/src/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ and b/src/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/ddb88bfb83247526ad206bd6c23362086669110a80eeecb006db8d8dd65926ca_0.jar b/src/app/build/intermediates/project_dex_archive/debug/out/ddb88bfb83247526ad206bd6c23362086669110a80eeecb006db8d8dd65926ca_0.jar
deleted file mode 100644
index c0e840a..0000000
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/ddb88bfb83247526ad206bd6c23362086669110a80eeecb006db8d8dd65926ca_0.jar and /dev/null differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/ddb88bfb83247526ad206bd6c23362086669110a80eeecb006db8d8dd65926ca_1.jar b/src/app/build/intermediates/project_dex_archive/debug/out/ddb88bfb83247526ad206bd6c23362086669110a80eeecb006db8d8dd65926ca_1.jar
deleted file mode 100644
index 3f42232..0000000
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/ddb88bfb83247526ad206bd6c23362086669110a80eeecb006db8d8dd65926ca_1.jar and /dev/null differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/ddb88bfb83247526ad206bd6c23362086669110a80eeecb006db8d8dd65926ca_2.jar b/src/app/build/intermediates/project_dex_archive/debug/out/ddb88bfb83247526ad206bd6c23362086669110a80eeecb006db8d8dd65926ca_2.jar
deleted file mode 100644
index 199a008..0000000
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/ddb88bfb83247526ad206bd6c23362086669110a80eeecb006db8d8dd65926ca_2.jar and /dev/null differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/ddb88bfb83247526ad206bd6c23362086669110a80eeecb006db8d8dd65926ca_3.jar b/src/app/build/intermediates/project_dex_archive/debug/out/ddb88bfb83247526ad206bd6c23362086669110a80eeecb006db8d8dd65926ca_3.jar
deleted file mode 100644
index 495d068..0000000
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/ddb88bfb83247526ad206bd6c23362086669110a80eeecb006db8d8dd65926ca_3.jar and /dev/null differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/ddb88bfb83247526ad206bd6c23362086669110a80eeecb006db8d8dd65926ca_4.jar b/src/app/build/intermediates/project_dex_archive/debug/out/ddb88bfb83247526ad206bd6c23362086669110a80eeecb006db8d8dd65926ca_4.jar
deleted file mode 100644
index 4986845..0000000
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/ddb88bfb83247526ad206bd6c23362086669110a80eeecb006db8d8dd65926ca_4.jar and /dev/null differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/ddb88bfb83247526ad206bd6c23362086669110a80eeecb006db8d8dd65926ca_5.jar b/src/app/build/intermediates/project_dex_archive/debug/out/ddb88bfb83247526ad206bd6c23362086669110a80eeecb006db8d8dd65926ca_5.jar
deleted file mode 100644
index 21718e9..0000000
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/ddb88bfb83247526ad206bd6c23362086669110a80eeecb006db8d8dd65926ca_5.jar and /dev/null differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex
index 8912558..bbb718e 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex
index 71e70e2..4f5c1ba 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex
index ee0455b..83273bd 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex
index c6ccf82..8db099c 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex
index 6cadfc6..f15d66f 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.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
index 0bee083..42e48fe 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex 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.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex
index d743057..051c2a5 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.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
index 06e8c97..5d372fb 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex 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$1.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex
index 285163c..4487869 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.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
index eb89034..505c589 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex 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$3.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex
index c6d7798..5872776 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex
index 651d87c..d38e496 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex
index a8689dc..361e4b2 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex
index 5aacb8c..e797f73 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex
index 0ef77aa..dff02e1 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex
index 00ffe5d..44aa692 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex
index a734dba..a56b877 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex
index 6ee0d76..340ac3f 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex
index b8d6417..6905df1 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.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
index 505b47f..87ba21c 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex 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$OnListItemClickListener.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex
index 52fdb63..f3c13c0 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.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
index fa6731f..167170d 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex 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
index 030b901..c1da81a 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex 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/NotesListAdapter.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex
index e134e00..c468f92 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex
index 4f7249c..769cea4 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex
index 650c055..c3fcdd8 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex
index 91bb107..7d10f00 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex
index 5b13567..567a18e 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.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
index 7d795a4..f70bca3 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex 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/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex
index 18dd3c6..1a0ea15 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex
index 0534fe4..74de7e8 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex
index d8e73e0..db363be 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex
index 193356e..2452261 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex
index 48423c9..0480c55 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex
index e5e6a69..ceee330 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex
index 96b992c..ee676a3 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex differ
diff --git a/src/app/build/intermediates/res/merged/debug/layout_note_edit.xml.flat b/src/app/build/intermediates/res/merged/debug/layout_note_edit.xml.flat
index 51476c6..9663233 100644
Binary files a/src/app/build/intermediates/res/merged/debug/layout_note_edit.xml.flat and b/src/app/build/intermediates/res/merged/debug/layout_note_edit.xml.flat differ
diff --git a/src/app/build/intermediates/res/merged/debug/layout_note_list.xml.flat b/src/app/build/intermediates/res/merged/debug/layout_note_list.xml.flat
index 92a508d..4c5ee8c 100644
Binary files a/src/app/build/intermediates/res/merged/debug/layout_note_list.xml.flat and b/src/app/build/intermediates/res/merged/debug/layout_note_list.xml.flat differ
diff --git a/src/app/build/intermediates/res/merged/debug/layout_settings_header.xml.flat b/src/app/build/intermediates/res/merged/debug/layout_settings_header.xml.flat
index ce0d908..89580dc 100644
Binary files a/src/app/build/intermediates/res/merged/debug/layout_settings_header.xml.flat and b/src/app/build/intermediates/res/merged/debug/layout_settings_header.xml.flat differ
diff --git a/src/app/build/intermediates/res/merged/debug/menu_note_edit.xml.flat b/src/app/build/intermediates/res/merged/debug/menu_note_edit.xml.flat
index 28568b2..811b919 100644
Binary files a/src/app/build/intermediates/res/merged/debug/menu_note_edit.xml.flat and b/src/app/build/intermediates/res/merged/debug/menu_note_edit.xml.flat differ
diff --git a/src/app/build/intermediates/res/merged/debug/menu_note_list.xml.flat b/src/app/build/intermediates/res/merged/debug/menu_note_list.xml.flat
index 6e14095..533fc8e 100644
Binary files a/src/app/build/intermediates/res/merged/debug/menu_note_list.xml.flat and b/src/app/build/intermediates/res/merged/debug/menu_note_list.xml.flat differ
diff --git a/src/app/build/intermediates/res/merged/debug/menu_note_list_options.xml.flat b/src/app/build/intermediates/res/merged/debug/menu_note_list_options.xml.flat
index 3d5f18b..647078c 100644
Binary files a/src/app/build/intermediates/res/merged/debug/menu_note_list_options.xml.flat and b/src/app/build/intermediates/res/merged/debug/menu_note_list_options.xml.flat differ
diff --git a/src/app/build/intermediates/res/merged/debug/raw-zh-rCN_introduction.flat b/src/app/build/intermediates/res/merged/debug/raw-zh-rCN_introduction.flat
index 703ad2d..7173688 100644
Binary files a/src/app/build/intermediates/res/merged/debug/raw-zh-rCN_introduction.flat and b/src/app/build/intermediates/res/merged/debug/raw-zh-rCN_introduction.flat differ
diff --git a/src/app/build/intermediates/res/merged/debug/values-zh-rCN_values-zh-rCN.arsc.flat b/src/app/build/intermediates/res/merged/debug/values-zh-rCN_values-zh-rCN.arsc.flat
index 19f498f..1dde685 100644
Binary files a/src/app/build/intermediates/res/merged/debug/values-zh-rCN_values-zh-rCN.arsc.flat and b/src/app/build/intermediates/res/merged/debug/values-zh-rCN_values-zh-rCN.arsc.flat differ
diff --git a/src/app/build/intermediates/res/merged/debug/values_values.arsc.flat b/src/app/build/intermediates/res/merged/debug/values_values.arsc.flat
index aa9ab55..fa521c7 100644
Binary files a/src/app/build/intermediates/res/merged/debug/values_values.arsc.flat and b/src/app/build/intermediates/res/merged/debug/values_values.arsc.flat differ
diff --git a/src/app/build/intermediates/runtime_symbol_list/debug/R.txt b/src/app/build/intermediates/runtime_symbol_list/debug/R.txt
index 00d6e91..98322fd 100644
--- a/src/app/build/intermediates/runtime_symbol_list/debug/R.txt
+++ b/src/app/build/intermediates/runtime_symbol_list/debug/R.txt
@@ -107,40 +107,42 @@ int id ll_font_normal 0x7f05001d
 int id ll_font_small 0x7f05001e
 int id ll_font_super 0x7f05001f
 int id menu_alert 0x7f050020
-int id menu_delete 0x7f050021
-int id menu_delete_remind 0x7f050022
-int id menu_export_text 0x7f050023
-int id menu_font_size 0x7f050024
-int id menu_list_mode 0x7f050025
-int id menu_new_folder 0x7f050026
-int id menu_new_note 0x7f050027
-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 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
+int id menu_countAllNotes 0x7f050021
+int id menu_delete 0x7f050022
+int id menu_delete_remind 0x7f050023
+int id menu_export_text 0x7f050024
+int id menu_font_size 0x7f050025
+int id menu_list_mode 0x7f050026
+int id menu_messageRemind 0x7f050027
+int id menu_new_folder 0x7f050028
+int id menu_new_note 0x7f050029
+int id menu_search 0x7f05002a
+int id menu_send_to_desktop 0x7f05002b
+int id menu_setting 0x7f05002c
+int id menu_share 0x7f05002d
+int id menu_sync 0x7f05002e
+int id minute 0x7f05002f
+int id move 0x7f050030
+int id navigation_bar 0x7f050031
+int id note_bg_color_selector 0x7f050032
+int id note_edit_list 0x7f050033
+int id note_edit_view 0x7f050034
+int id note_item 0x7f050035
+int id note_title 0x7f050036
+int id notes_list 0x7f050037
+int id prefenerece_sync_status_textview 0x7f050038
+int id preference_sync_button 0x7f050039
+int id selection_menu 0x7f05003a
+int id sv_note_edit 0x7f05003b
+int id tv_alert_date 0x7f05003c
+int id tv_folder_name 0x7f05003d
+int id tv_modified_date 0x7f05003e
+int id tv_name 0x7f05003f
+int id tv_time 0x7f050040
+int id tv_title 0x7f050041
+int id tv_title_bar 0x7f050042
+int id widget_bg_image 0x7f050043
+int id widget_text 0x7f050044
 int layout account_dialog_title 0x7f060000
 int layout add_account_text 0x7f060001
 int layout datetime_picker 0x7f060002
@@ -196,76 +198,78 @@ int string format_move_notes_to_folder 0x7f0a001c
 int string hint_foler_name 0x7f0a001d
 int string info_note_enter_desktop 0x7f0a001e
 int string menu_alert 0x7f0a001f
-int string menu_create_folder 0x7f0a0020
-int string menu_delete 0x7f0a0021
-int string menu_deselect_all 0x7f0a0022
-int string menu_export_text 0x7f0a0023
-int string menu_folder_change_name 0x7f0a0024
-int string menu_folder_delete 0x7f0a0025
-int string menu_folder_view 0x7f0a0026
-int string menu_font_large 0x7f0a0027
-int string menu_font_normal 0x7f0a0028
-int string menu_font_size 0x7f0a0029
-int string menu_font_small 0x7f0a002a
-int string menu_font_super 0x7f0a002b
-int string menu_list_mode 0x7f0a002c
-int string menu_move 0x7f0a002d
-int string menu_move_parent_folder 0x7f0a002e
-int string menu_normal_mode 0x7f0a002f
-int string menu_remove_remind 0x7f0a0030
-int string menu_search 0x7f0a0031
-int string menu_select_all 0x7f0a0032
-int string menu_select_none 0x7f0a0033
-int string menu_select_title 0x7f0a0034
-int string menu_send_to_desktop 0x7f0a0035
-int string menu_setting 0x7f0a0036
-int string menu_share 0x7f0a0037
-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_link_email 0x7f0a003c
-int string note_link_other 0x7f0a003d
-int string note_link_tel 0x7f0a003e
-int string note_link_web 0x7f0a003f
-int string notealert_enter 0x7f0a0040
-int string notealert_ok 0x7f0a0041
-int string notelist_menu_new 0x7f0a0042
-int string notelist_string_info 0x7f0a0043
-int string preferences_account_summary 0x7f0a0044
-int string preferences_account_title 0x7f0a0045
-int string preferences_add_account 0x7f0a0046
-int string preferences_bg_random_appear_title 0x7f0a0047
-int string preferences_button_sync_cancel 0x7f0a0048
-int string preferences_button_sync_immediately 0x7f0a0049
-int string preferences_dialog_change_account_title 0x7f0a004a
-int string preferences_dialog_change_account_warn_msg 0x7f0a004b
-int string preferences_dialog_select_account_tips 0x7f0a004c
-int string preferences_dialog_select_account_title 0x7f0a004d
-int string preferences_last_sync_time 0x7f0a004e
-int string preferences_last_sync_time_format 0x7f0a004f
-int string preferences_menu_cancel 0x7f0a0050
-int string preferences_menu_change_account 0x7f0a0051
-int string preferences_menu_remove_account 0x7f0a0052
-int string preferences_title 0x7f0a0053
-int string preferences_toast_cannot_change_account 0x7f0a0054
-int string preferences_toast_success_set_accout 0x7f0a0055
-int string search 0x7f0a0056
-int string search_hint 0x7f0a0057
-int string search_label 0x7f0a0058
-int string search_setting_description 0x7f0a0059
-int string set_remind_time_message 0x7f0a005a
-int string success_sdcard_export 0x7f0a005b
-int string success_sync_account 0x7f0a005c
-int string sync_progress_init_list 0x7f0a005d
-int string sync_progress_login 0x7f0a005e
-int string sync_progress_syncing 0x7f0a005f
-int string ticker_cancel 0x7f0a0060
-int string ticker_fail 0x7f0a0061
-int string ticker_success 0x7f0a0062
-int string ticker_syncing 0x7f0a0063
-int string widget_havenot_content 0x7f0a0064
-int string widget_under_visit_mode 0x7f0a0065
+int string menu_countAllNotes 0x7f0a0020
+int string menu_create_folder 0x7f0a0021
+int string menu_delete 0x7f0a0022
+int string menu_deselect_all 0x7f0a0023
+int string menu_export_text 0x7f0a0024
+int string menu_folder_change_name 0x7f0a0025
+int string menu_folder_delete 0x7f0a0026
+int string menu_folder_view 0x7f0a0027
+int string menu_font_large 0x7f0a0028
+int string menu_font_normal 0x7f0a0029
+int string menu_font_size 0x7f0a002a
+int string menu_font_small 0x7f0a002b
+int string menu_font_super 0x7f0a002c
+int string menu_list_mode 0x7f0a002d
+int string menu_message_pop 0x7f0a002e
+int string menu_move 0x7f0a002f
+int string menu_move_parent_folder 0x7f0a0030
+int string menu_normal_mode 0x7f0a0031
+int string menu_remove_remind 0x7f0a0032
+int string menu_search 0x7f0a0033
+int string menu_select_all 0x7f0a0034
+int string menu_select_none 0x7f0a0035
+int string menu_select_title 0x7f0a0036
+int string menu_send_to_desktop 0x7f0a0037
+int string menu_setting 0x7f0a0038
+int string menu_share 0x7f0a0039
+int string menu_sync 0x7f0a003a
+int string menu_sync_cancel 0x7f0a003b
+int string menu_title_select_folder 0x7f0a003c
+int string note_alert_expired 0x7f0a003d
+int string note_link_email 0x7f0a003e
+int string note_link_other 0x7f0a003f
+int string note_link_tel 0x7f0a0040
+int string note_link_web 0x7f0a0041
+int string notealert_enter 0x7f0a0042
+int string notealert_ok 0x7f0a0043
+int string notelist_menu_new 0x7f0a0044
+int string notelist_string_info 0x7f0a0045
+int string preferences_account_summary 0x7f0a0046
+int string preferences_account_title 0x7f0a0047
+int string preferences_add_account 0x7f0a0048
+int string preferences_bg_random_appear_title 0x7f0a0049
+int string preferences_button_sync_cancel 0x7f0a004a
+int string preferences_button_sync_immediately 0x7f0a004b
+int string preferences_dialog_change_account_title 0x7f0a004c
+int string preferences_dialog_change_account_warn_msg 0x7f0a004d
+int string preferences_dialog_select_account_tips 0x7f0a004e
+int string preferences_dialog_select_account_title 0x7f0a004f
+int string preferences_last_sync_time 0x7f0a0050
+int string preferences_last_sync_time_format 0x7f0a0051
+int string preferences_menu_cancel 0x7f0a0052
+int string preferences_menu_change_account 0x7f0a0053
+int string preferences_menu_remove_account 0x7f0a0054
+int string preferences_title 0x7f0a0055
+int string preferences_toast_cannot_change_account 0x7f0a0056
+int string preferences_toast_success_set_accout 0x7f0a0057
+int string search 0x7f0a0058
+int string search_hint 0x7f0a0059
+int string search_label 0x7f0a005a
+int string search_setting_description 0x7f0a005b
+int string set_remind_time_message 0x7f0a005c
+int string success_sdcard_export 0x7f0a005d
+int string success_sync_account 0x7f0a005e
+int string sync_progress_init_list 0x7f0a005f
+int string sync_progress_login 0x7f0a0060
+int string sync_progress_syncing 0x7f0a0061
+int string ticker_cancel 0x7f0a0062
+int string ticker_fail 0x7f0a0063
+int string ticker_success 0x7f0a0064
+int string ticker_syncing 0x7f0a0065
+int string widget_havenot_content 0x7f0a0066
+int string widget_under_visit_mode 0x7f0a0067
 int style HighlightTextAppearancePrimary 0x7f0b0000
 int style HighlightTextAppearanceSecondary 0x7f0b0001
 int style NoteActionBarStyle 0x7f0b0002
diff --git a/src/app/build/outputs/apk/debug/app-debug.apk b/src/app/build/outputs/apk/debug/app-debug.apk
index ece8af9..1ba40f0 100644
Binary files a/src/app/build/outputs/apk/debug/app-debug.apk and b/src/app/build/outputs/apk/debug/app-debug.apk differ
diff --git a/src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
index 8dc8be7..168d18e 100644
--- a/src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
+++ b/src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
@@ -141,8 +141,8 @@ public class NoteEditActivity extends Activity implements OnClickListener,
 
     private static final int SHORTCUT_ICON_TITLE_MAX_LEN = 10;
 
-    public static final String TAG_CHECKED = String.valueOf('\u221A');
-    public static final String TAG_UNCHECKED = String.valueOf('\u25A1');
+    public static final String TAG_CHECKED = String.valueOf('\u221A');//打勾的符号
+    public static final String TAG_UNCHECKED = String.valueOf('\u25A1');//方框的符号
 
     private LinearLayout mEditTextList;
 
diff --git a/src/app/src/main/java/net/micode/notes/ui/NoteEditText.java b/src/app/src/main/java/net/micode/notes/ui/NoteEditText.java
index 2afe2a8..628490a 100644
--- a/src/app/src/main/java/net/micode/notes/ui/NoteEditText.java
+++ b/src/app/src/main/java/net/micode/notes/ui/NoteEditText.java
@@ -123,19 +123,19 @@ public class NoteEditText extends EditText {
 
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
-        switch (keyCode) {
-            case KeyEvent.KEYCODE_ENTER:
+         switch (keyCode) {
+            case KeyEvent.KEYCODE_ENTER://回车键
                 if (mOnTextViewChangeListener != null) {
                     return false;
                 }
                 break;
-            case KeyEvent.KEYCODE_DEL:
+            case KeyEvent.KEYCODE_DEL://Backspace键
                 mSelectionStartBeforeDelete = getSelectionStart();
                 break;
             default:
                 break;
         }
-        return super.onKeyDown(keyCode, event);
+        return super.onKeyDown(keyCode, event);//其他按键，如数字键和字母键等
     }
 
     @Override
@@ -168,7 +168,7 @@ public class NoteEditText extends EditText {
     }
 
     @Override
-    protected void onFocusChanged(boolean focused, int direction, Rect previouslyFocusedRect) {
+    protected void onFocusChanged(boolean focused, int direction, Rect previouslyFocusedRect) {//选择的便签改变，改变文档的内容
         if (mOnTextViewChangeListener != null) {
             if (!focused && TextUtils.isEmpty(getText())) {
                 mOnTextViewChangeListener.onTextChange(mIndex, false);
@@ -180,7 +180,7 @@ public class NoteEditText extends EditText {
     }
 
     @Override
-    protected void onCreateContextMenu(ContextMenu menu) {
+    protected void onCreateContextMenu(ContextMenu menu) {//长按便签后，一些对应便签内容的菜单
         if (getText() instanceof Spanned) {
             int selStart = getSelectionStart();
             int selEnd = getSelectionEnd();
@@ -188,10 +188,10 @@ public class NoteEditText extends EditText {
             int min = Math.min(selStart, selEnd);
             int max = Math.max(selStart, selEnd);
 
-            final URLSpan[] urls = ((Spanned) getText()).getSpans(min, max, URLSpan.class);
+            final URLSpan[] urls = ((Spanned) getText()).getSpans(min, max, URLSpan.class);//获得连接和电话号码
             if (urls.length == 1) {
                 int defaultResId = 0;
-                for(String schema: sSchemaActionResMap.keySet()) {
+                for(String schema: sSchemaActionResMap.keySet()) {//可以
                     if(urls[0].getURL().indexOf(schema) >= 0) {
                         defaultResId = sSchemaActionResMap.get(schema);
                         break;
@@ -199,7 +199,7 @@ public class NoteEditText extends EditText {
                 }
 
                 if (defaultResId == 0) {
-                    defaultResId = R.string.note_link_other;
+                    defaultResId = R.string.note_link_other;//打开地图
                 }
 
                 menu.add(0, 0, 0, defaultResId).setOnMenuItemClickListener(
diff --git a/src/app/src/main/java/net/micode/notes/ui/NoteItemData.java b/src/app/src/main/java/net/micode/notes/ui/NoteItemData.java
index 0f5a878..f79d921 100644
--- a/src/app/src/main/java/net/micode/notes/ui/NoteItemData.java
+++ b/src/app/src/main/java/net/micode/notes/ui/NoteItemData.java
@@ -56,8 +56,8 @@ public class NoteItemData {
     private static final int WIDGET_TYPE_COLUMN           = 11;
 
     private long mId;
-    private long mAlertDate;
-    private int mBgColorId;
+    private long mAlertDate;//提醒时间
+    private int mBgColorId;//背景颜色id
     private long mCreatedDate;
     private boolean mHasAttachment;
     private long mModifiedDate;
diff --git a/src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
index a86ce75..4d7d080 100644
--- a/src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
+++ b/src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
@@ -139,7 +139,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
     private final static int REQUEST_CODE_NEW_NODE  = 103;//新建便签时返回的
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {//只在开机的时候有用
+    protected void onCreate(Bundle savedInstanceState) {//创建活动，为防止切换到别的活动时，因为内存不足此活动被回收，所以用存储的状态做参数
         super.onCreate(savedInstanceState);//调用父类的创建，以保存的状态为参数
         setContentView(R.layout.note_list);//设置视图
         initResources();//初始化内容
@@ -151,13 +151,13 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
     }
 
     @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {//从一个活动转换成另一个活动时会调用
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {//从一个活动被销毁时，转换成另一个活动时会调用
         if (resultCode == RESULT_OK
                 && (requestCode == REQUEST_CODE_OPEN_NODE || requestCode == REQUEST_CODE_NEW_NODE)) {
-            mNotesListAdapter.changeCursor(null);//从编辑界面返回应该把光标删除
+            mNotesListAdapter.changeCursor(null);//从编辑界面返回应该把在便签内的光标删除
             //RESULT_OK是另外一个活动返回的数据，保存便签时会出现，删除与桌面挂件有关联的便签或文件夹会出现
         } else {
-            super.onActivityResult(requestCode, resultCode, data);
+            super.onActivityResult(requestCode, resultCode, data);//调用父类的方法
         }
     }
 //try语句允许我们定义在执行时进行错误测试的代码块。
@@ -212,12 +212,11 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
     }
 
     @Override
-    protected void onStart() {//从其他界面到主界面就会调用,在onActivityResult之后调用
+    protected void onStart() {//在onActivityResult之后调用，此活动变为可见时使用
         super.onStart();//调用父类，启动活动
         startAsyncNotesListQuery();//同步便签列表
     }
-//Ontouch 可以获得更多的信息，比如多点，触摸的强度，按下，松开，拖动等。。。。
-//但Onclick 只适用于组件的事件触发
+
     private void initResources() {
         mContentResolver = this.getContentResolver();//获取应用数据
         mBackgroundQueryHandler = new BackgroundQueryHandler(this.getContentResolver());//？
@@ -227,12 +226,12 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
                 null, false);//增加页脚  ？
         mNotesListView.setOnItemClickListener(new OnListItemClickListener());//设置视图点击监听器
         mNotesListView.setOnItemLongClickListener(this);//设置长按监听器
-        mNotesListAdapter = new NotesListAdapter(this);
+        mNotesListAdapter = new NotesListAdapter(this);//设置便签视图配置器
         mNotesListView.setAdapter(mNotesListAdapter);
         mAddNewNote = (Button) findViewById(R.id.btn_new_note);//获得最下方的创建便签的按键
         mAddNewNote.setOnClickListener(this);//只对应下方的按键的点击监听器
-        mAddNewNote.setOnTouchListener(new NewNoteOnTouchListener());//获得更多的信息的监听器包括down-touch/up-touch/no-drag等
-        mDispatch = false;
+        mAddNewNote.setOnTouchListener(new NewNoteOnTouchListener());//获得更多的信息的监听器包括down-touch/up-touch/move等
+        mDispatch = false;//是否调度，主要用于新建便签模块
         mDispatchY = 0;
         mOriginY = 0;
         mTitleBar = (TextView) findViewById(R.id.tv_title_bar);//文件夹下的标头
@@ -246,12 +245,13 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         private MenuItem mMoveMenu;//移动的选项的实例
 
         public boolean onCreateActionMode(ActionMode mode, Menu menu) {
-            getMenuInflater().inflate(R.menu.note_list_options, menu);//R是个文件，所有东西都在里面注册了 只有两种行为模式删除和移动到文件夹
+            getMenuInflater().inflate(R.menu.note_list_options, menu);//配置menu
+            //R是个文件，所有东西都在里面注册了 只有两种行为模式删除和移动到文件夹
             menu.findItem(R.id.delete).setOnMenuItemClickListener(this);//这里关联上了listerner，专门关联在菜单的按键
             mMoveMenu = menu.findItem(R.id.move);
             if (mFocusNoteDataItem.getParentId() == Notes.ID_CALL_RECORD_FOLDER
                     || DataUtils.getUserFolderCount(mContentResolver) == 0) {
-                mMoveMenu.setVisible(false);// call note 或者没有文件夹
+                mMoveMenu.setVisible(false);// call note? 或者没有文件夹
             } else {
                 mMoveMenu.setVisible(true);//当长按某一标签时，会执行这个，让 移动 按键变得可见
                 mMoveMenu.setOnMenuItemClickListener(this);
@@ -259,18 +259,18 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
             mActionMode = mode;
             mNotesListAdapter.setChoiceMode(true);//进入选择模式，设置为true才能勾选便签
             mNotesListView.setLongClickable(false);//选择模式下，不能长按
-            mAddNewNote.setVisibility(View.GONE);
+            mAddNewNote.setVisibility(View.GONE);//选择模式下，不能添加性便签
 
             View customView = LayoutInflater.from(NotesListActivity.this).inflate(
-                    R.layout.note_list_dropdown_menu, null);
+                    R.layout.note_list_dropdown_menu, null);//？
             mode.setCustomView(customView);
             mDropDownMenu = new DropdownMenu(NotesListActivity.this,
                     (Button) customView.findViewById(R.id.selection_menu),
-                    R.menu.note_list_dropdown);
+                    R.menu.note_list_dropdown);//
             mDropDownMenu.setOnDropdownMenuItemClickListener(new PopupMenu.OnMenuItemClickListener(){
-                public boolean onMenuItemClick(MenuItem item) {
-                    mNotesListAdapter.selectAll(!mNotesListAdapter.isAllSelected());
-                    updateMenu();
+                public boolean onMenuItemClick(MenuItem item) {//点击全选
+                    mNotesListAdapter.selectAll(!mNotesListAdapter.isAllSelected());//把便签全选
+                    updateMenu();//更新菜单界面
                     return true;
                 }
 
@@ -346,7 +346,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
                     builder.show();
                     break;
                 case R.id.move:
-                    startQueryDestinationFolders();
+                    startQueryDestinationFolders();//查询目的文件夹
                     break;
                 default:
                     return false;
@@ -354,22 +354,23 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
             return true;
         }
     }
-
+    //Ontouch 可以获得更多的信息，比如多点，触摸的强度，按下，松开，拖动等。。。。
+    //但Onclick 只适用于组件的事件触发
     private class NewNoteOnTouchListener implements OnTouchListener {
 
-        public boolean onTouch(View v, MotionEvent event) {
+        public boolean onTouch(View v, MotionEvent event) {//行为动作和视图
             switch (event.getAction()) {
                 case MotionEvent.ACTION_DOWN: {
                     Display display = getWindowManager().getDefaultDisplay();
-                    int screenHeight = display.getHeight();
-                    int newNoteViewHeight = mAddNewNote.getHeight();
-                    int start = screenHeight - newNoteViewHeight;
-                    int eventY = start + (int) event.getY();
+                    int screenHeight = display.getHeight();//2712总高度
+                    int newNoteViewHeight = mAddNewNote.getHeight();//2456-2059下面那个“新建标签”按钮的高度
+                    int start = screenHeight - newNoteViewHeight;//2315起始的y值
+                    int eventY = start + (int) event.getY();//event.getY相当于点击到的地方的y值
                     /**
                      * Minus TitleBar's height
                      */
-                    if (mState == ListEditState.SUB_FOLDER) {
-                        eventY -= mTitleBar.getHeight();//title上面用子文件夹的名字
+                    if (mState == ListEditState.SUB_FOLDER) {//减去子文件夹的title的高度
+                        eventY -= mTitleBar.getHeight();
                         start -= mTitleBar.getHeight();
                     }
                     /**
@@ -381,16 +382,21 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
                      * Notice that, if the background of the button changes, the formula should
                      * also change. This is very bad, just for the UI designer's strong requirement.
                      */
-                    if (event.getY() < (event.getX() * (-0.12) + 94)) {//是下面写便签的那条斜线
-                        View view = mNotesListView.getChildAt(mNotesListView.getChildCount() - 1
-                                - mNotesListView.getFooterViewsCount());
+                    if (event.getY() < (event.getX() * (-0.12) + 94)) {//是下面写便签的那条斜线，此处判断是否在创建便签的按钮上
+                        View view = mNotesListView.getChildAt(mNotesListView.getChildCount() - 1//getcount在此布局下的子元素个数，减一是因为索引从0开始
+                                - mNotesListView.getFooterViewsCount());//减去页脚下元素布局数量
+                        //最后得到最后一个元素的view
+                        //Log.d(TAG,Integer.toString(mNotesListView.getChildCount()));
+                        //Log.d(TAG,Integer.toString(mNotesListView.getFooterViewsCount()));
+                        //Log.d(TAG,Integer.toString(view.getTop()));
+                        //Log.d(TAG,Integer.toString(view.getBottom()));
                         if (view != null && view.getBottom() > start
-                                && (view.getTop() < (start + 94))) {
+                                && (view.getTop() < (start + 94))) {//如果不在新建便签的按钮上
                             mOriginY = (int) event.getY();
                             mDispatchY = eventY;
-                            event.setLocation(event.getX(), mDispatchY);
+                            event.setLocation(event.getX(), mDispatchY);//重新赋值
                             mDispatch = true;
-                            return mNotesListView.dispatchTouchEvent(event);
+                            return mNotesListView.dispatchTouchEvent(event);//重新调度，即重新执行
                         }
                     }
                     break;
@@ -398,16 +404,16 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
                 case MotionEvent.ACTION_MOVE: {
                     if (mDispatch) {
                         mDispatchY += (int) event.getY() - mOriginY;
-                        event.setLocation(event.getX(), mDispatchY);
-                        return mNotesListView.dispatchTouchEvent(event);
+                        event.setLocation(event.getX(), mDispatchY);//重新赋值
+                        return mNotesListView.dispatchTouchEvent(event);//重新调度，即重新执行
                     }
                     break;
                 }
-                default: {
+                default: {//其他情况
                     if (mDispatch) {
-                        event.setLocation(event.getX(), mDispatchY);
+                        event.setLocation(event.getX(), mDispatchY);//重新赋值
                         mDispatch = false;
-                        return mNotesListView.dispatchTouchEvent(event);
+                        return mNotesListView.dispatchTouchEvent(event);//重新调度，即重新执行
                     }
                     break;
                 }
@@ -422,24 +428,28 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
                 : NORMAL_SELECTION;//如果当前ID和父文件夹ID相同，则为父文件夹模式，否则是常规模式
         mBackgroundQueryHandler.startQuery(FOLDER_NOTE_LIST_QUERY_TOKEN, null,
                 Notes.CONTENT_NOTE_URI, NoteItemData.PROJECTION, selection, new String[] {
-                    String.valueOf(mCurrentFolderId)
+                    String.valueOf(mCurrentFolderId)//后台异步对数据库进行操作，加快数据处理速度
                 }, NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC");
     }
-
+//3.函数：AsyncQueryHandler异步查询操作帮助类，可以处理增删改ContentProvider提供的数据。
+// 通过提供onxxxComplete的回调窗口，实现事件的完成处理，API中提供Insert，Delete，updata,Query四种方法，
+// BackgroundQueryHandler继承这个类，可以实现对数据库的查询操作
     private final class BackgroundQueryHandler extends AsyncQueryHandler {//背景处理
-        public BackgroundQueryHandler(ContentResolver contentResolver) {
+        //可以使用Activity提供的getContentResolver()方法来获取ContentResolver对象
+        public BackgroundQueryHandler(ContentResolver contentResolver) {//使用ContentResolver调用ContentProvider提供的接口，
+            // 对ContentProvider中的数据进行添加、删除、修改和查询操作时
             super(contentResolver);
         }
-
+//1.异步查询框架AsyncQueryHandler，当单查询完毕后，会调用onQueryComplete(token, cookie, cursor)通知查询完毕，并且传回cursor
         @Override
-        protected void onQueryComplete(int token, Object cookie, Cursor cursor) {
+        protected void onQueryComplete(int token, Object cookie, Cursor cursor) {//token判断情况，cookie，cursor光标判断选择的那个
             switch (token) {
-                case FOLDER_NOTE_LIST_QUERY_TOKEN://便签列表请求
-                    mNotesListAdapter.changeCursor(cursor);
+                case FOLDER_NOTE_LIST_QUERY_TOKEN://便签列表请求，打开便签时会调用
+                    mNotesListAdapter.changeCursor(cursor);// 如果是便签查询被采用，更改光标位置
                     break;
-                case FOLDER_LIST_QUERY_TOKEN://文件夹请求（长按便签然后点移动到文件夹）
-                    if (cursor != null && cursor.getCount() > 0) {
-                        showFolderListMenu(cursor);
+                case FOLDER_LIST_QUERY_TOKEN://移动到文件夹请求（长按便签然后点移动到文件夹）
+                    if (cursor != null && cursor.getCount() > 0) {//下面有便签
+                        showFolderListMenu(cursor);//打开文件夹列表弹窗
                     } else {
                         Log.e(TAG, "Query folder failed");
                     }
@@ -450,28 +460,28 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         }
     }
 
-    private void showFolderListMenu(Cursor cursor) {//长按便签后，点移动到文件夹，就会弹出文件夹列表
-        AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this);
-        builder.setTitle(R.string.menu_title_select_folder);
-        final FoldersListAdapter adapter = new FoldersListAdapter(this, cursor);
-        builder.setAdapter(adapter, new DialogInterface.OnClickListener() {
+    private void showFolderListMenu(Cursor cursor) {//长按便签后，点移动到文件夹，就会弹出文件夹列表弹窗
+        AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this);//创建对话框实例
+        builder.setTitle(R.string.menu_title_select_folder);//title是选择文件夹
+        final FoldersListAdapter adapter = new FoldersListAdapter(this, cursor);//文件夹列表配适器
+        builder.setAdapter(adapter, new DialogInterface.OnClickListener() {//绑定配适器，对话框接口是点击监听器
 
             public void onClick(DialogInterface dialog, int which) {
-                DataUtils.batchMoveToFolder(mContentResolver,
+                DataUtils.batchMoveToFolder(mContentResolver,//移动到文件夹下
                         mNotesListAdapter.getSelectedItemIds(), adapter.getItemId(which));
-                Toast.makeText(
+                Toast.makeText(//发送消息
                         NotesListActivity.this,
                         getString(R.string.format_move_notes_to_folder,
                                 mNotesListAdapter.getSelectedCount(),
                                 adapter.getFolderName(NotesListActivity.this, which)),
                         Toast.LENGTH_SHORT).show();
-                mModeCallBack.finishActionMode();
+                mModeCallBack.finishActionMode();//完成动作
             }
         });
-        builder.show();
+        builder.show();//显示对话框
     }
 
-    private void createNewNote() {
+    private void createNewNote() {//创建新便签
         Intent intent = new Intent(this, NoteEditActivity.class);
         intent.setAction(Intent.ACTION_INSERT_OR_EDIT);
         intent.putExtra(Notes.INTENT_EXTRA_FOLDER_ID, mCurrentFolderId);
@@ -481,18 +491,18 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         this.startActivityForResult(intent, REQUEST_CODE_NEW_NODE);//这个活动发出请求，等待下一个活动返回数据
     }
 
-    private void batchDelete() {//删除时候，会判断是否为桌面挂件
+    private void batchDelete() {//删除时候，会判断是否为桌面挂件 批量删除
         new AsyncTask<Void, Void, HashSet<AppWidgetAttribute>>() {
             protected HashSet<AppWidgetAttribute> doInBackground(Void... unused) {
                 HashSet<AppWidgetAttribute> widgets = mNotesListAdapter.getSelectedWidget();
-                if (!isSyncMode()) {
+                if (!isSyncMode()) {//如果不为同步模式则删除笔记，若删除不成功打印错误信息
                     // if not synced, delete notes directly
                     if (DataUtils.batchDeleteNotes(mContentResolver, mNotesListAdapter
                             .getSelectedItemIds())) {
                     } else {
                         Log.e(TAG, "Delete notes error, should not happens");
                     }
-                } else {
+                } else {//下面的注释挺好
                     // in sync mode, we'll move the deleted note into the trash
                     // folder
                     if (!DataUtils.batchMoveToFolder(mContentResolver, mNotesListAdapter
@@ -500,16 +510,16 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
                         Log.e(TAG, "Move notes to trash folder error, should not happens");
                     }
                 }
-                return widgets;
+                return widgets;//桌面widget修改
             }
 
             @Override
-            protected void onPostExecute(HashSet<AppWidgetAttribute> widgets) {
+            protected void onPostExecute(HashSet<AppWidgetAttribute> widgets) {//遍历桌面挂件如果与刚才删除的便签有联系
                 if (widgets != null) {
                     for (AppWidgetAttribute widget : widgets) {
-                        if (widget.widgetId != AppWidgetManager.INVALID_APPWIDGET_ID//此处判断
-                                && widget.widgetType != Notes.TYPE_WIDGET_INVALIDE) {
-                            updateWidget(widget.widgetId, widget.widgetType);
+                        if (widget.widgetId != AppWidgetManager.INVALID_APPWIDGET_ID//此处判断是否为一个widget
+                                && widget.widgetType != Notes.TYPE_WIDGET_INVALIDE) {//widget是否有效
+                            updateWidget(widget.widgetId, widget.widgetType);//更新桌面挂件
                         }
                     }
                 }
@@ -518,12 +528,12 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         }.execute();
     }
 
-    private void deleteFolder(long folderId) {
-        if (folderId == Notes.ID_ROOT_FOLDER) {
+    private void deleteFolder(long folderId) {//删除文件夹
+        if (folderId == Notes.ID_ROOT_FOLDER) {//如果是父文件夹，则报错
             Log.e(TAG, "Wrong folder id, should not happen " + folderId);
             return;
         }
-
+//下面会判断删除的文件夹里是否包含与桌面挂件相关联的便签
         HashSet<Long> ids = new HashSet<Long>();
         ids.add(folderId);
         HashSet<AppWidgetAttribute> widgets = DataUtils.getFolderNoteWidget(mContentResolver,
@@ -545,33 +555,34 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         }
     }
 
-    private void openNode(NoteItemData data) {
+    private void openNode(NoteItemData data) {//打开便签，参数为数据
         Intent intent = new Intent(this, NoteEditActivity.class);
         intent.setAction(Intent.ACTION_VIEW);
         intent.putExtra(Intent.EXTRA_UID, data.getId());
         this.startActivityForResult(intent, REQUEST_CODE_OPEN_NODE);
 
     }
-    private void openFolder(NoteItemData data) {
-        mCurrentFolderId = data.getId();
-        startAsyncNotesListQuery();
-        if (data.getId() == Notes.ID_CALL_RECORD_FOLDER) {
-            mState = ListEditState.CALL_RECORD_FOLDER;
-            mAddNewNote.setVisibility(View.GONE);
+    private void openFolder(NoteItemData data) {//.打开文件夹
+        mCurrentFolderId = data.getId();//获取当前文件夹的id
+        startAsyncNotesListQuery();//开始开始异步的便签列表反馈
+        if (data.getId() == Notes.ID_CALL_RECORD_FOLDER) {//如果是call_record_folder类型的文件夹
+            mState = ListEditState.CALL_RECORD_FOLDER;//切换状态
+            mAddNewNote.setVisibility(View.GONE);//将新加便签的按钮设置为不可见
         } else {
-            mState = ListEditState.SUB_FOLDER;
+            mState = ListEditState.SUB_FOLDER;//不然设置为子文件夹
         }
         if (data.getId() == Notes.ID_CALL_RECORD_FOLDER) {
-            mTitleBar.setText(R.string.call_record_folder_name);
+            mTitleBar.setText(R.string.call_record_folder_name);//title设置为call notes
         } else {
-            mTitleBar.setText(data.getSnippet());
+            mTitleBar.setText(data.getSnippet());//否则文本的前部片段内容，即文件夹名称
+            Log.d(TAG,data.getSnippet());
         }
-        mTitleBar.setVisibility(View.VISIBLE);
+        mTitleBar.setVisibility(View.VISIBLE);//设置title可见
     }
 
-    public void onClick(View v) {
+    public void onClick(View v) {//文件夹界面的点击相应的函数
         switch (v.getId()) {
-            case R.id.btn_new_note:
+            case R.id.btn_new_note://创建新便签
                 createNewNote();
                 break;
             default:
@@ -579,97 +590,98 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         }
     }
 
-    private void showSoftInput() {
-        InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+    private void showSoftInput() {//显示软键盘
+        InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);//获取方法的管理者对象
         if (inputMethodManager != null) {
-            inputMethodManager.toggleSoftInput(InputMethodManager.SHOW_FORCED, 0);
+            inputMethodManager.toggleSoftInput(InputMethodManager.SHOW_FORCED, 0);//使软键盘显示，第二个参数hideFlags等于0
         }
     }
 
-    private void hideSoftInput(View view) {
+    private void hideSoftInput(View view) {//隐藏软键盘
         InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-        inputMethodManager.hideSoftInputFromWindow(view.getWindowToken(), 0);
+        inputMethodManager.hideSoftInputFromWindow(view.getWindowToken(), 0);//隐藏软键盘
     }
 
-    private void showCreateOrModifyFolderDialog(final boolean create) {
-        final AlertDialog.Builder builder = new AlertDialog.Builder(this);
-        View view = LayoutInflater.from(this).inflate(R.layout.dialog_edit_text, null);
-        final EditText etName = (EditText) view.findViewById(R.id.et_foler_name);
-        showSoftInput();
-        if (!create) {
+    private void showCreateOrModifyFolderDialog(final boolean create) {//显示创建或者修改文件夹的对话框，菜单里的创建文件夹或者改名
+        final AlertDialog.Builder builder = new AlertDialog.Builder(this);//初始化对话框
+        View view = LayoutInflater.from(this).inflate(R.layout.dialog_edit_text, null);//加载对话框的布局文件
+        final EditText etName = (EditText) view.findViewById(R.id.et_foler_name);//初始化对话框里的文本对象
+        showSoftInput();//显示软键盘
+        if (!create) {//给文件夹改名
             if (mFocusNoteDataItem != null) {
-                etName.setText(mFocusNoteDataItem.getSnippet());
-                builder.setTitle(getString(R.string.menu_folder_change_name));
+                etName.setText(mFocusNoteDataItem.getSnippet());//提取文件夹的title
+                Log.d(TAG,mFocusNoteDataItem.getSnippet());
+                builder.setTitle(getString(R.string.menu_folder_change_name));//设置文本框，内容是change_name
             } else {
                 Log.e(TAG, "The long click data item is null");
                 return;
             }
-        } else {
-            etName.setText("");
-            builder.setTitle(this.getString(R.string.menu_create_folder));
+        } else {//创建文件夹
+            etName.setText("");//title为空
+            builder.setTitle(this.getString(R.string.menu_create_folder));//设置文本框，内容是new Folder
         }
 
-        builder.setPositiveButton(android.R.string.ok, null);
+        builder.setPositiveButton(android.R.string.ok, null);//确定按钮
         builder.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
-            public void onClick(DialogInterface dialog, int which) {
-                hideSoftInput(etName);
+            public void onClick(DialogInterface dialog, int which) {//取消按钮
+                hideSoftInput(etName);//隐藏软键盘
             }
         });
 
-        final Dialog dialog = builder.setView(view).show();
-        final Button positive = (Button)dialog.findViewById(android.R.id.button1);
+        final Dialog dialog = builder.setView(view).show();//显示出来
+        final Button positive = (Button)dialog.findViewById(android.R.id.button1);//加载确定按钮布局文件
         positive.setOnClickListener(new OnClickListener() {
-            public void onClick(View v) {
-                hideSoftInput(etName);
-                String name = etName.getText().toString();
-                if (DataUtils.checkVisibleFolderName(mContentResolver, name)) {
-                    Toast.makeText(NotesListActivity.this, getString(R.string.folder_exist, name),
+            public void onClick(View v) {//设置确定按钮的接收器
+                hideSoftInput(etName);//点击确定后收起软键盘
+                String name = etName.getText().toString();//
+                if (DataUtils.checkVisibleFolderName(mContentResolver, name)) {//得到输入文件夹的名字判断文件夹名称是否已经存在
+                    Toast.makeText(NotesListActivity.this, getString(R.string.folder_exist, name),//提示重新命名
                             Toast.LENGTH_LONG).show();
-                    etName.setSelection(0, etName.length());
+                    etName.setSelection(0, etName.length());//设置名称
                     return;
                 }
-                if (!create) {
-                    if (!TextUtils.isEmpty(name)) {
-                        ContentValues values = new ContentValues();
-                        values.put(NoteColumns.SNIPPET, name);
-                        values.put(NoteColumns.TYPE, Notes.TYPE_FOLDER);
-                        values.put(NoteColumns.LOCAL_MODIFIED, 1);
+                if (!create) {//如果是改名
+                    if (!TextUtils.isEmpty(name)) {//输入不为空
+                        ContentValues values = new ContentValues();//与Hashtable类似，负责存储名值对，名为string类型，值为基本类型
+                        values.put(NoteColumns.SNIPPET, name);//存储snippet和文件夹名称的键值对
+                        values.put(NoteColumns.TYPE, Notes.TYPE_FOLDER);//存储类型为文件夹
+                        values.put(NoteColumns.LOCAL_MODIFIED, 1);//local_modified对应1 添加值到value里
                         mContentResolver.update(Notes.CONTENT_NOTE_URI, values, NoteColumns.ID
                                 + "=?", new String[] {
                             String.valueOf(mFocusNoteDataItem.getId())
-                        });
+                        });//将内容笔记URI及笔记专栏ID更新至内容解决器
                     }
-                } else if (!TextUtils.isEmpty(name)) {
+                } else if (!TextUtils.isEmpty(name)) {//如果是新建，输入不空
                     ContentValues values = new ContentValues();
                     values.put(NoteColumns.SNIPPET, name);
                     values.put(NoteColumns.TYPE, Notes.TYPE_FOLDER);
-                    mContentResolver.insert(Notes.CONTENT_NOTE_URI, values);
+                    mContentResolver.insert(Notes.CONTENT_NOTE_URI, values);//将内容_笔记的URI插入到内容解决器
                 }
-                dialog.dismiss();
+                dialog.dismiss();//撤销对话框
             }
         });
 
-        if (TextUtils.isEmpty(etName.getText())) {
+        if (TextUtils.isEmpty(etName.getText())) {//如果文件夹名称为空，则不能选择确定按钮
             positive.setEnabled(false);
         }
         /**
          * When the name edit text is null, disable the positive button
          */
-        etName.addTextChangedListener(new TextWatcher() {
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+        etName.addTextChangedListener(new TextWatcher() {//添加文本更改监听器,即判断文本更改状态
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {//文本更改之前（未完成）
                 // TODO Auto-generated method stub
 
             }
 
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-                if (TextUtils.isEmpty(etName.getText())) {
+            public void onTextChanged(CharSequence s, int start, int before, int count) {//当前文本改变触发，
+                if (TextUtils.isEmpty(etName.getText())) {//文本为空确定按键不可用，不为空则可用
                     positive.setEnabled(false);
                 } else {
                     positive.setEnabled(true);
                 }
             }
 
-            public void afterTextChanged(Editable s) {
+            public void afterTextChanged(Editable s) {//文本修改之后（未完成）
                 // TODO Auto-generated method stub
 
             }
@@ -678,30 +690,30 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
 
     @Override
     public void onBackPressed() {//从文件夹，主界面退出的一些操作
-        switch (mState) {
-            case SUB_FOLDER://从文件夹里退出
-                mCurrentFolderId = Notes.ID_ROOT_FOLDER;
-                mState = ListEditState.NOTE_LIST;
-                startAsyncNotesListQuery();
-                mTitleBar.setVisibility(View.GONE);
+        switch (mState) {//判断当前状态
+            case SUB_FOLDER://从文件夹里退出，当前状态是子文件夹
+                mCurrentFolderId = Notes.ID_ROOT_FOLDER;//改变文件夹名称
+                mState = ListEditState.NOTE_LIST;//变为列表模式
+                startAsyncNotesListQuery();//对列表显示请求同步
+                mTitleBar.setVisibility(View.GONE);//将文件夹的标题设置不可见
                 break;
-            case CALL_RECORD_FOLDER:
+            case CALL_RECORD_FOLDER://call_record_folder状态
                 mCurrentFolderId = Notes.ID_ROOT_FOLDER;
                 mState = ListEditState.NOTE_LIST;
-                mAddNewNote.setVisibility(View.VISIBLE);
+                mAddNewNote.setVisibility(View.VISIBLE);//新建便签设置为可见
                 mTitleBar.setVisibility(View.GONE);
                 startAsyncNotesListQuery();
                 break;
             case NOTE_LIST://从主界面退出
-                super.onBackPressed();
+                super.onBackPressed();//调用父类退出方法
                 break;
-            default:
+            default://其他情况直接break
                 break;
         }
     }
 
-    private void updateWidget(int appWidgetId, int appWidgetType) {//只有删除在桌面上的便签才运行
-        Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE);
+    private void updateWidget(int appWidgetId, int appWidgetType) {//只有删除在桌面上的便签才运行，设置格式
+        Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE);//动作：更新，创建intent，用于创建新活动
         if (appWidgetType == Notes.TYPE_WIDGET_2X) {
             intent.setClass(this, NoteWidgetProvider_2x.class);
         } else if (appWidgetType == Notes.TYPE_WIDGET_4X) {
@@ -713,14 +725,14 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
 
         intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, new int[] {
             appWidgetId
-        });
+        });//储存id的键值对
 
-        sendBroadcast(intent);
+        sendBroadcast(intent);//发送广播
         setResult(RESULT_OK, intent);//返回给上一个活动数据
     }
 
     private final OnCreateContextMenuListener mFolderOnCreateContextMenuListener = new OnCreateContextMenuListener() {
-        public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
+        public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {//对添加文件操作的内容
             if (mFocusNoteDataItem != null) {
                 menu.setHeaderTitle(mFocusNoteDataItem.getSnippet());
                 menu.add(0, MENU_FOLDER_VIEW, 0, R.string.menu_folder_view);
@@ -731,7 +743,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
     };
 
     @Override
-    public void onContextMenuClosed(Menu menu) {
+    public void onContextMenuClosed(Menu menu) {//关闭文件夹的菜单
         if (mNotesListView != null) {
             mNotesListView.setOnCreateContextMenuListener(null);
         }
@@ -739,7 +751,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
     }
 
     @Override
-    public boolean onContextItemSelected(MenuItem item) {
+    public boolean onContextItemSelected(MenuItem item) {//对文件夹操作的实现
         if (mFocusNoteDataItem == null) {
             Log.e(TAG, "The long click data item is null");
             return false;
@@ -773,8 +785,8 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
     }
 
     @Override
-    public boolean onPrepareOptionsMenu(Menu menu) {
-        menu.clear();
+    public boolean onPrepareOptionsMenu(Menu menu) {//准备菜单，根据不同的状态加载不同的菜单
+        menu.clear();//先把原先的菜单删除
         if (mState == ListEditState.NOTE_LIST) {
             getMenuInflater().inflate(R.menu.note_list, menu);
             // set sync or sync_cancel
@@ -791,24 +803,28 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
     }
 
     @Override
-    public boolean onOptionsItemSelected(MenuItem item) {//五个菜单
+    public boolean onOptionsItemSelected(MenuItem item) {//六个菜单
         switch (item.getItemId()) {
+            case R.id.menu_countAllNotes:{
+                showNumberofNotes();
+                break;
+            }
             case R.id.menu_new_folder: {
                 showCreateOrModifyFolderDialog(true);
                 break;
             }
             case R.id.menu_export_text: {
-                exportNoteToText();
+                exportNoteToText();//输出到SD卡
                 break;
             }
             case R.id.menu_sync: {
-                if (isSyncMode()) {
+                if (isSyncMode()) {//开始同步
                     if (TextUtils.equals(item.getTitle(), getString(R.string.menu_sync))) {
                         GTaskSyncService.startSync(this);
-                    } else {
+                    } else {//取消同步
                         GTaskSyncService.cancelSync(this);
                     }
-                } else {
+                } else {//切换到设置活动界面
                     startPreferenceActivity();
                 }
                 break;
@@ -830,20 +846,26 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         return true;
     }
 
+
+
     @Override
-    public boolean onSearchRequested() {
+    public boolean onSearchRequested() {//查找功能
         startSearch(null, false, null /* appData */, false);//好像还没实现
         return true;
     }
-
-    private void exportNoteToText() {
-        final BackupUtils backup = BackupUtils.getInstance(NotesListActivity.this);
+    private void showNumberofNotes() {
+        StringBuilder strbdr = new StringBuilder("");
+        strbdr.append("当前有 " + Integer.toString(mNotesListAdapter.retCount()) + " 个便签");
+        Toast.makeText(this, strbdr.toString(), Toast.LENGTH_LONG).show();
+    }
+    private void exportNoteToText() {//输出便签到SD卡
+        final BackupUtils backup = BackupUtils.getInstance(NotesListActivity.this);//备份笔记信息
         new AsyncTask<Void, Void, Integer>() {
 
             @Override
             protected Integer doInBackground(Void... unused) {
                 return backup.exportToText();
-            }
+            }//后台运行
 
             @Override
             protected void onPostExecute(Integer result) {
@@ -878,8 +900,8 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         }.execute();
     }
 
-    private boolean isSyncMode() {
-        return NotesPreferenceActivity.getSyncAccountName(this).trim().length() > 0;
+    private boolean isSyncMode() {//判断是否在同步模式
+        return NotesPreferenceActivity.getSyncAccountName(this).trim().length() > 0;//查看NotePrefereActivity同步账户的名字的长度是否大于0，若大于，则为同步模式
     }
 
     private void startPreferenceActivity() {//切换到设置和同步界面
@@ -888,33 +910,33 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         from.startActivityIfNeeded(intent, -1);//此活动结束后不会通知原活动
     }
 
-    private class OnListItemClickListener implements OnItemClickListener {
-
-        public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-            if (view instanceof NotesListItem) {
+    private class OnListItemClickListener implements OnItemClickListener {//监听列表点击监听器，接口是OnItemClickListener
+//position代表选中的便签项在视图中的索引
+        public void onItemClick(AdapterView<?> parent, View view, int position, long id) {//项目被点击的响应
+            if (view instanceof NotesListItem) {//判断view是否是NotesListItem的一个实例，如果是就获取他的项目信息装入item中
                 NoteItemData item = ((NotesListItem) view).getItemData();
-                if (mNotesListAdapter.isInChoiceMode()) {
-                    if (item.getType() == Notes.TYPE_NOTE) {
-                        position = position - mNotesListView.getHeaderViewsCount();
+                if (mNotesListAdapter.isInChoiceMode()) {//如果目前正处在选择模式下
+                    if (item.getType() == Notes.TYPE_NOTE) {//如果点到的item是便签
+                        position = position - mNotesListView.getHeaderViewsCount();//减去头部视图的元素项，得到列表的元素索引值
                         mModeCallBack.onItemCheckedStateChanged(null, position, id,
-                                !mNotesListAdapter.isSelectedItem(position));
+                                !mNotesListAdapter.isSelectedItem(position));//改变对应索引的Item是否被选中的状态
                     }
                     return;
                 }
 
-                switch (mState) {
-                    case NOTE_LIST:
+                switch (mState) {//当前状态判断
+                    case NOTE_LIST://当在主列表下
                         if (item.getType() == Notes.TYPE_FOLDER
                                 || item.getType() == Notes.TYPE_SYSTEM) {
-                            openFolder(item);
+                            openFolder(item);//如果点到文件夹，就打开
                         } else if (item.getType() == Notes.TYPE_NOTE) {
-                            openNode(item);
+                            openNode(item);//打开便签
                         } else {
                             Log.e(TAG, "Wrong note type in NOTE_LIST");
                         }
                         break;
                     case SUB_FOLDER:
-                    case CALL_RECORD_FOLDER:
+                    case CALL_RECORD_FOLDER://子文件夹下的情况
                         if (item.getType() == Notes.TYPE_NOTE) {
                             openNode(item);
                         } else {
@@ -948,17 +970,17 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
     }
 
     public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) {
-        if (view instanceof NotesListItem) {
-            mFocusNoteDataItem = ((NotesListItem) view).getItemData();
-            if (mFocusNoteDataItem.getType() == Notes.TYPE_NOTE && !mNotesListAdapter.isInChoiceMode()) {
-                if (mNotesListView.startActionMode(mModeCallBack) != null) {
+        if (view instanceof NotesListItem) {//判断view是否是NotesListItem的一个实例，如果是就获取他的项目信息装入item中
+            mFocusNoteDataItem = ((NotesListItem) view).getItemData();//聚焦的Item对象
+            if (mFocusNoteDataItem.getType() == Notes.TYPE_NOTE && !mNotesListAdapter.isInChoiceMode()) {//如果对象是便签，并且不在选择模式下
+                if (mNotesListView.startActionMode(mModeCallBack) != null) {//开始对单个便签进行操作
                     mModeCallBack.onItemCheckedStateChanged(null, position, id, true);
-                    mNotesListView.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
+                    mNotesListView.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);//执行长按动作触发震动反馈
                 } else {
                     Log.e(TAG, "startActionMode fails");
                 }
-            } else if (mFocusNoteDataItem.getType() == Notes.TYPE_FOLDER) {
-                mNotesListView.setOnCreateContextMenuListener(mFolderOnCreateContextMenuListener);
+            } else if (mFocusNoteDataItem.getType() == Notes.TYPE_FOLDER) {//如果长按对象是文件夹
+                mNotesListView.setOnCreateContextMenuListener(mFolderOnCreateContextMenuListener);//创建文件夹长按的监听器，创建对文件夹的菜单
             }
         }
         return false;
diff --git a/src/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java b/src/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java
index 5ba0853..d30ed8f 100644
--- a/src/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java
+++ b/src/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java
@@ -31,65 +31,81 @@ import java.util.HashSet;
 import java.util.Iterator;
 
 
-public class NotesListAdapter extends CursorAdapter {
-    private static final String TAG = "NotesListAdapter";
-    private Context mContext;
-    private HashMap<Integer, Boolean> mSelectedIndex;
-    private int mNotesCount;
-    private boolean mChoiceMode;
-
-    public static class AppWidgetAttribute {
+public class NotesListAdapter extends CursorAdapter {//类NotesListAdopter实现的是鼠标和编辑便签连接的桥梁，继承了光标配适器
+    private static final String TAG = "NotesListAdapter";//名称，一般用于输出日志文件
+    private Context mContext;//便签相关内容
+    private HashMap<Integer, Boolean> mSelectedIndex;//哈希表表示的便签是否勾选
+    private int mNotesCount;//便签数量
+    private boolean mChoiceMode;//判断是否处于选择模式
+    public int retCount(){
+        int NotesCount = mNotesCount;
+        int ItemCount = getCount();
+        for (int i = 0; i < ItemCount; i++) {
+            Cursor c = (Cursor) getItem(i);
+            if (c != null) {
+                if (NoteItemData.getNoteType(c) == Notes.TYPE_FOLDER) {
+                    NoteItemData NoteItem = new NoteItemData(mContext, c);
+                    NotesCount += NoteItem.getNotesCount();
+                }
+            } else {
+                Log.e(TAG, "Invalid cursor");
+                return -1;
+            }
+        }
+        return NotesCount;
+    }
+    public static class AppWidgetAttribute {//类里声明了桌面挂件widget的属性，包括编号和类型
         public int widgetId;
         public int widgetType;
     };
 
-    public NotesListAdapter(Context context) {
+    public NotesListAdapter(Context context) {//以便签列表的context初始化便签列表配适器
         super(context, null);
-        mSelectedIndex = new HashMap<Integer, Boolean>();
+        mSelectedIndex = new HashMap<Integer, Boolean>();//初始化哈希表
         mContext = context;
-        mNotesCount = 0;
+        mNotesCount = 0;//初始便签数为0
     }
 
     @Override
     public View newView(Context context, Cursor cursor, ViewGroup parent) {
-        return new NotesListItem(context);
+        return new NotesListItem(context);//创建便签列表的数据项
     }
 
     @Override
-    public void bindView(View view, Context context, Cursor cursor) {
-        if (view instanceof NotesListItem) {
+    public void bindView(View view, Context context, Cursor cursor) {//将已经存在的视图和光标指向的数据进行捆绑
+        if (view instanceof NotesListItem) {//如果视图是NotesListItem的一个实例
             NoteItemData itemData = new NoteItemData(context, cursor);
-            ((NotesListItem) view).bind(context, itemData, mChoiceMode,
+            ((NotesListItem) view).bind(context, itemData, mChoiceMode,//绑定光标指向的数据
                     isSelectedItem(cursor.getPosition()));
         }
     }
 
-    public void setCheckedItem(final int position, final boolean checked) {
-        mSelectedIndex.put(position, checked);
-        notifyDataSetChanged();
+    public void setCheckedItem(final int position, final boolean checked) {//设置勾选框
+        mSelectedIndex.put(position, checked);//添加便签和是否被选中的键值对
+        notifyDataSetChanged();//提醒数据已经改变
     }
 
     public boolean isInChoiceMode() {
         return mChoiceMode;
-    }
+    }//判断是否处于选择模式中
 
-    public void setChoiceMode(boolean mode) {
-        mSelectedIndex.clear();
-        mChoiceMode = mode;
+    public void setChoiceMode(boolean mode) {//设置模式，在选择模式和普通模式中切换
+        mSelectedIndex.clear();//将原先的勾选数据清空
+        mChoiceMode = mode;//设置模式
     }
 
-    public void selectAll(boolean checked) {
+    public void selectAll(boolean checked) {//全选操作
         Cursor cursor = getCursor();
         for (int i = 0; i < getCount(); i++) {
             if (cursor.moveToPosition(i)) {
-                if (NoteItemData.getNoteType(cursor) == Notes.TYPE_NOTE) {
+                if (NoteItemData.getNoteType(cursor) == Notes.TYPE_NOTE) {//如果是便签，则选
                     setCheckedItem(i, checked);
                 }
             }
         }
     }
 
-    public HashSet<Long> getSelectedItemIds() {
+    public HashSet<Long> getSelectedItemIds() {//以哈希表形式返回被选中便签的id号
         HashSet<Long> itemSet = new HashSet<Long>();
         for (Integer position : mSelectedIndex.keySet()) {
             if (mSelectedIndex.get(position) == true) {
@@ -105,7 +121,7 @@ public class NotesListAdapter extends CursorAdapter {
         return itemSet;
     }
 
-    public HashSet<AppWidgetAttribute> getSelectedWidget() {
+    public HashSet<AppWidgetAttribute> getSelectedWidget() {//已哈希表形式返回选中的桌面挂件
         HashSet<AppWidgetAttribute> itemSet = new HashSet<AppWidgetAttribute>();
         for (Integer position : mSelectedIndex.keySet()) {
             if (mSelectedIndex.get(position) == true) {
@@ -143,12 +159,12 @@ public class NotesListAdapter extends CursorAdapter {
         return count;
     }
 
-    public boolean isAllSelected() {
+    public boolean isAllSelected() {//是否全部选中
         int checkedCount = getSelectedCount();
         return (checkedCount != 0 && checkedCount == mNotesCount);
     }
 
-    public boolean isSelectedItem(final int position) {
+    public boolean isSelectedItem(final int position) {//改变Item是否被选中的状态
         if (null == mSelectedIndex.get(position)) {
             return false;
         }
@@ -156,18 +172,18 @@ public class NotesListAdapter extends CursorAdapter {
     }
 
     @Override
-    protected void onContentChanged() {
+    protected void onContentChanged() {//内容变动时调用calcNotesCount计算便签数量
         super.onContentChanged();
         calcNotesCount();
     }
 
     @Override
-    public void changeCursor(Cursor cursor) {
+    public void changeCursor(Cursor cursor) {//在activity光标发生局部变动的时候回调该函数计算便签的数量
         super.changeCursor(cursor);
         calcNotesCount();
     }
 
-    private void calcNotesCount() {
+    private void calcNotesCount() {//计算当前界面便签的数量
         mNotesCount = 0;
         for (int i = 0; i < getCount(); i++) {
             Cursor c = (Cursor) getItem(i);
diff --git a/src/app/src/main/java/net/micode/notes/ui/NotesListItem.java b/src/app/src/main/java/net/micode/notes/ui/NotesListItem.java
index 1221e80..eb2b430 100644
--- a/src/app/src/main/java/net/micode/notes/ui/NotesListItem.java
+++ b/src/app/src/main/java/net/micode/notes/ui/NotesListItem.java
@@ -28,17 +28,17 @@ import net.micode.notes.R;
 import net.micode.notes.data.Notes;
 import net.micode.notes.tool.DataUtils;
 import net.micode.notes.tool.ResourceParser.NoteItemBgResources;
-
+//构建便签列表的各个项目的详细具体信息，如显示提醒标签的图标，设置列表项的背景颜色，继承线性列表，例如设置便签最后修改时间等
 
 public class NotesListItem extends LinearLayout {
-    private ImageView mAlert;
-    private TextView mTitle;
-    private TextView mTime;
-    private TextView mCallName;
-    private NoteItemData mItemData;
-    private CheckBox mCheckBox;
+    private ImageView mAlert;//提醒的图片视图
+    private TextView mTitle;//标题的文本视图
+    private TextView mTime;//最后修改的时间的文本视图
+    private TextView mCallName;//CallName的文本视图
+    private NoteItemData mItemData;//便签数据项
+    private CheckBox mCheckBox;//选择模式下，便签项前勾选的列表
 
-    public NotesListItem(Context context) {
+    public NotesListItem(Context context) {//加载视图和对应的资源文件
         super(context);
         inflate(context, R.layout.note_item, this);
         mAlert = (ImageView) findViewById(R.id.iv_alert_icon);
@@ -48,45 +48,45 @@ public class NotesListItem extends LinearLayout {
         mCheckBox = (CheckBox) findViewById(android.R.id.checkbox);
     }
 
-    public void bind(Context context, NoteItemData data, boolean choiceMode, boolean checked) {
-        if (choiceMode && data.getType() == Notes.TYPE_NOTE) {
+    public void bind(Context context, NoteItemData data, boolean choiceMode, boolean checked) {//对于当前列表的每一项，都需要绑定对于的checkBox
+        if (choiceMode && data.getType() == Notes.TYPE_NOTE) {//如果在选择模式下，并且对应的时间是便签项，则设置勾选项为可见
             mCheckBox.setVisibility(View.VISIBLE);
-            mCheckBox.setChecked(checked);
+            mCheckBox.setChecked(checked);//设置是否处于选择模式
         } else {
             mCheckBox.setVisibility(View.GONE);
         }
 
         mItemData = data;
-        if (data.getId() == Notes.ID_CALL_RECORD_FOLDER) {
-            mCallName.setVisibility(View.GONE);
-            mAlert.setVisibility(View.VISIBLE);
-            mTitle.setTextAppearance(context, R.style.TextAppearancePrimaryItem);
+        if (data.getId() == Notes.ID_CALL_RECORD_FOLDER) {//数据项对应的类型是CALL_RECORD_FOLDER
+            mCallName.setVisibility(View.GONE);//设置联系人名字不可见
+            mAlert.setVisibility(View.VISIBLE);//设置时间提醒图标可见
+            mTitle.setTextAppearance(context, R.style.TextAppearancePrimaryItem);//设置文本框内容
             mTitle.setText(context.getString(R.string.call_record_folder_name)
                     + context.getString(R.string.format_folder_files_count, data.getNotesCount()));
-            mAlert.setImageResource(R.drawable.call_record);
-        } else if (data.getParentId() == Notes.ID_CALL_RECORD_FOLDER) {
+            mAlert.setImageResource(R.drawable.call_record);//设置提醒的图标
+        } else if (data.getParentId() == Notes.ID_CALL_RECORD_FOLDER) {//数据项的父文件夹对应的类型是CALL_RECORD_FOLDER
             mCallName.setVisibility(View.VISIBLE);
             mCallName.setText(data.getCallName());
             mTitle.setTextAppearance(context,R.style.TextAppearanceSecondaryItem);
-            mTitle.setText(DataUtils.getFormattedSnippet(data.getSnippet()));
-            if (data.hasAlert()) {
+            mTitle.setText(DataUtils.getFormattedSnippet(data.getSnippet()));//设置title的文本内容为便签内容的前面片段
+            if (data.hasAlert()) {//如果便签有提醒，则加载对应的图片
                 mAlert.setImageResource(R.drawable.clock);
                 mAlert.setVisibility(View.VISIBLE);
             } else {
                 mAlert.setVisibility(View.GONE);
             }
         } else {
-            mCallName.setVisibility(View.GONE);
+            mCallName.setVisibility(View.GONE);//设置联系人姓名不可见
             mTitle.setTextAppearance(context, R.style.TextAppearancePrimaryItem);
 
-            if (data.getType() == Notes.TYPE_FOLDER) {
+            if (data.getType() == Notes.TYPE_FOLDER) {//如果是数据项是文件夹
                 mTitle.setText(data.getSnippet()
                         + context.getString(R.string.format_folder_files_count,
-                                data.getNotesCount()));
-                mAlert.setVisibility(View.GONE);
+                                data.getNotesCount()));//设置便签标题内容为便签的前面部分的内容+文件数+便签数
+                mAlert.setVisibility(View.GONE);//设置提醒不可见
             } else {
-                mTitle.setText(DataUtils.getFormattedSnippet(data.getSnippet()));
-                if (data.hasAlert()) {
+                mTitle.setText(DataUtils.getFormattedSnippet(data.getSnippet()));//如果是便签，则设置便签标题内容为便签的前面部分的内容
+                if (data.hasAlert()) {//如果数据项是有提醒的便签，则显示相应的图片
                     mAlert.setImageResource(R.drawable.clock);
                     mAlert.setVisibility(View.VISIBLE);
                 } else {
@@ -94,25 +94,25 @@ public class NotesListItem extends LinearLayout {
                 }
             }
         }
-        mTime.setText(DateUtils.getRelativeTimeSpanString(data.getModifiedDate()));
+        mTime.setText(DateUtils.getRelativeTimeSpanString(data.getModifiedDate()));//设置最后一次改变的时间
 
-        setBackground(data);
+        setBackground(data);//设置数据项的背景
     }
 
-    private void setBackground(NoteItemData data) {
-        int id = data.getBgColorId();
-        if (data.getType() == Notes.TYPE_NOTE) {
-            if (data.isSingle() || data.isOneFollowingFolder()) {
+    private void setBackground(NoteItemData data) {//所有的，每一个数据项，设置其背景，默认五种颜色
+        int id = data.getBgColorId();//获得数据项的背景颜色的索引值
+        if (data.getType() == Notes.TYPE_NOTE) {//如果是便签项，设置相应的背景资源
+            if (data.isSingle() || data.isOneFollowingFolder()) {//如果只有一个便签，或者文件夹下只有一个便签
                 setBackgroundResource(NoteItemBgResources.getNoteBgSingleRes(id));
-            } else if (data.isLast()) {
+            } else if (data.isLast()) {//如果是最后一个便签
                 setBackgroundResource(NoteItemBgResources.getNoteBgLastRes(id));
-            } else if (data.isFirst() || data.isMultiFollowingFolder()) {
+            } else if (data.isFirst() || data.isMultiFollowingFolder()) {//如果是第一个便签，或者是文件夹下有多个便签
                 setBackgroundResource(NoteItemBgResources.getNoteBgFirstRes(id));
             } else {
-                setBackgroundResource(NoteItemBgResources.getNoteBgNormalRes(id));
+                setBackgroundResource(NoteItemBgResources.getNoteBgNormalRes(id));//一般情况
             }
         } else {
-            setBackgroundResource(NoteItemBgResources.getFolderBgRes());
+            setBackgroundResource(NoteItemBgResources.getFolderBgRes());//设置文件夹的显示样式
         }
     }
 
diff --git a/src/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java b/src/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
index 07c5f7e..c1ea444 100644
--- a/src/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
+++ b/src/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
@@ -46,50 +46,51 @@ import net.micode.notes.R;
 import net.micode.notes.data.Notes;
 import net.micode.notes.data.Notes.NoteColumns;
 import net.micode.notes.gtask.remote.GTaskSyncService;
-
-
+//主要是用于登录账号；将便签的内容与Google Task上的数据进行同步；设置新建便签默认颜色随机等
+// 类：NotesPreferenceActivity，在小米便签中主要实现的是对背景颜色和字体大小的数据储存。
+// 继承了PreferenceActivity主要功能为对系统信息和配置进行自动保存的Activity
 public class NotesPreferenceActivity extends PreferenceActivity {
     public static final String PREFERENCE_NAME = "notes_preferences";
-
+    //偏好的名称
     public static final String PREFERENCE_SYNC_ACCOUNT_NAME = "pref_key_account_name";
-
+    //同步账户名称
     public static final String PREFERENCE_LAST_SYNC_TIME = "pref_last_sync_time";
-
+    //最后同步的时间
     public static final String PREFERENCE_SET_BG_COLOR_KEY = "pref_key_bg_random_appear";
-
+    //背景颜色
     private static final String PREFERENCE_SYNC_ACCOUNT_KEY = "pref_sync_account_key";
-
+    //同步账户密码
     private static final String AUTHORITIES_FILTER_KEY = "authorities";
 
     private PreferenceCategory mAccountCategory;
-
+    //账户分组
     private GTaskReceiver mReceiver;
-
+    //广播接收器
     private Account[] mOriAccounts;
-
+    //账户列表
     private boolean mHasAddedAccount;
-
+    //是否添加账户
     @Override
-    protected void onCreate(Bundle icicle) {
+    protected void onCreate(Bundle icicle) {//加载布局，初始化广播接收器
         super.onCreate(icicle);
-
+        //Action Bar取代了传统的tittle bar和menu，在程序运行中一直置于顶部
         /* using the app icon for navigation */
-        getActionBar().setDisplayHomeAsUpEnabled(true);
+        getActionBar().setDisplayHomeAsUpEnabled(true);//设置左上方的退出按键，一个左向的箭头
 
-        addPreferencesFromResource(R.xml.preferences);
-        mAccountCategory = (PreferenceCategory) findPreference(PREFERENCE_SYNC_ACCOUNT_KEY);
-        mReceiver = new GTaskReceiver();
-        IntentFilter filter = new IntentFilter();
-        filter.addAction(GTaskSyncService.GTASK_SERVICE_BROADCAST_NAME);
-        registerReceiver(mReceiver, filter);
+        addPreferencesFromResource(R.xml.preferences);//从资源里添加布局文件,包括随机设置便签背景颜色
+        mAccountCategory = (PreferenceCategory) findPreference(PREFERENCE_SYNC_ACCOUNT_KEY);//设置的布局配置
+        mReceiver = new GTaskReceiver();//广播接收器
+        IntentFilter filter = new IntentFilter();//过滤其他的action
+        filter.addAction(GTaskSyncService.GTASK_SERVICE_BROADCAST_NAME);//点击“同步账号”按钮时，它就会通知后台处于监听状态的gtask同步账号服务，
+        registerReceiver(mReceiver, filter);//动态注册接收器
 
         mOriAccounts = null;
-        View header = LayoutInflater.from(this).inflate(R.layout.settings_header, null);
+        View header = LayoutInflater.from(this).inflate(R.layout.settings_header, null);//头部（立即同步的按键）的资源布局
         getListView().addHeaderView(header, null, true);
     }
 
     @Override
-    protected void onResume() {
+    protected void onResume() {//活动重启，由不可见变为可见，自动如果用户添加了一个新账户，则同步账户，
         super.onResume();
 
         // need to set sync account automatically if user has added a new
@@ -113,36 +114,36 @@ public class NotesPreferenceActivity extends PreferenceActivity {
             }
         }
 
-        refreshUI();
+        refreshUI();//刷新界面
     }
 
     @Override
-    protected void onDestroy() {
+    protected void onDestroy() {//取消广播器的监听
         if (mReceiver != null) {
             unregisterReceiver(mReceiver);
         }
         super.onDestroy();
     }
 
-    private void loadAccountPreference() {
-        mAccountCategory.removeAll();
+    private void loadAccountPreference() {//按下同步后，选择账户的设置
+        mAccountCategory.removeAll();//先清除之前的所有偏好元素，包括布局等
 
-        Preference accountPref = new Preference(this);
+        Preference accountPref = new Preference(this);//同步账户的按钮
         final String defaultAccount = getSyncAccountName(this);
         accountPref.setTitle(getString(R.string.preferences_account_title));
-        accountPref.setSummary(getString(R.string.preferences_account_summary));
+        accountPref.setSummary(getString(R.string.preferences_account_summary));//（类似副标题）
         accountPref.setOnPreferenceClickListener(new OnPreferenceClickListener() {
-            public boolean onPreferenceClick(Preference preference) {
-                if (!GTaskSyncService.isSyncing()) {
-                    if (TextUtils.isEmpty(defaultAccount)) {
+            public boolean onPreferenceClick(Preference preference) {//设置preference的的监听器
+                if (!GTaskSyncService.isSyncing()) {//不在同步状态下
+                    if (TextUtils.isEmpty(defaultAccount)) {//如果没有默认的账户
                         // the first time to set account
-                        showSelectAccountAlertDialog();
+                        showSelectAccountAlertDialog();//显示选择账户的对话框
                     } else {
                         // if the account has already been set, we need to promp
                         // user about the risk
-                        showChangeAccountConfirmAlertDialog();
+                        showChangeAccountConfirmAlertDialog();//显示需要改变账户的对话框
                     }
-                } else {
+                } else {//正在同步，不能切换同步的账号
                     Toast.makeText(NotesPreferenceActivity.this,
                             R.string.preferences_toast_cannot_change_account, Toast.LENGTH_SHORT)
                             .show();
@@ -151,22 +152,22 @@ public class NotesPreferenceActivity extends PreferenceActivity {
             }
         });
 
-        mAccountCategory.addPreference(accountPref);
+        mAccountCategory.addPreference(accountPref);//加载抓胡的偏好元素
     }
 
-    private void loadSyncButton() {
-        Button syncButton = (Button) findViewById(R.id.preference_sync_button);
-        TextView lastSyncTimeView = (TextView) findViewById(R.id.prefenerece_sync_status_textview);
+    private void loadSyncButton() {//加载同步按键
+        Button syncButton = (Button) findViewById(R.id.preference_sync_button);//同步按键的布局
+        TextView lastSyncTimeView = (TextView) findViewById(R.id.prefenerece_sync_status_textview);//最后一次同步的时间
 
         // set button state
-        if (GTaskSyncService.isSyncing()) {
+        if (GTaskSyncService.isSyncing()) {//如果在同步状态下，则按钮设置未取消同步
             syncButton.setText(getString(R.string.preferences_button_sync_cancel));
             syncButton.setOnClickListener(new View.OnClickListener() {
-                public void onClick(View v) {
+                public void onClick(View v) {//点击后执行取消同步方法
                     GTaskSyncService.cancelSync(NotesPreferenceActivity.this);
                 }
             });
-        } else {
+        } else {//否则立即同步，按钮设置立即同步
             syncButton.setText(getString(R.string.preferences_button_sync_immediately));
             syncButton.setOnClickListener(new View.OnClickListener() {
                 public void onClick(View v) {
@@ -174,10 +175,10 @@ public class NotesPreferenceActivity extends PreferenceActivity {
                 }
             });
         }
-        syncButton.setEnabled(!TextUtils.isEmpty(getSyncAccountName(this)));
+        syncButton.setEnabled(!TextUtils.isEmpty(getSyncAccountName(this)));//如果没有账户，则不可选立即同步的按键
 
         // set last sync time
-        if (GTaskSyncService.isSyncing()) {
+        if (GTaskSyncService.isSyncing()) {//如果正在同步则读取正在同步的进度，否则显示最后同步的时间
             lastSyncTimeView.setText(GTaskSyncService.getProgressString());
             lastSyncTimeView.setVisibility(View.VISIBLE);
         } else {
@@ -193,12 +194,12 @@ public class NotesPreferenceActivity extends PreferenceActivity {
         }
     }
 
-    private void refreshUI() {
+    private void refreshUI() {//刷新界面，包括偏好元素和按键
         loadAccountPreference();
         loadSyncButton();
     }
 
-    private void showSelectAccountAlertDialog() {
+    private void showSelectAccountAlertDialog() {//设置选择账户的对话框
         AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this);
 
         View titleView = LayoutInflater.from(this).inflate(R.layout.account_dialog_title, null);
@@ -208,15 +209,15 @@ public class NotesPreferenceActivity extends PreferenceActivity {
         subtitleTextView.setText(getString(R.string.preferences_dialog_select_account_tips));
 
         dialogBuilder.setCustomTitle(titleView);
-        dialogBuilder.setPositiveButton(null, null);
+        dialogBuilder.setPositiveButton(null, null);//无确定的按钮
 
-        Account[] accounts = getGoogleAccounts();
-        String defAccount = getSyncAccountName(this);
+        Account[] accounts = getGoogleAccounts();//获得谷歌账户
+        String defAccount = getSyncAccountName(this);//默认的庄户
 
         mOriAccounts = accounts;
         mHasAddedAccount = false;
 
-        if (accounts.length > 0) {
+        if (accounts.length > 0) {//如果有谷歌账户，则显示所有账户的名称，并设置为选项
             CharSequence[] items = new CharSequence[accounts.length];
             final CharSequence[] itemMapping = items;
             int checkedItem = -1;
@@ -227,10 +228,10 @@ public class NotesPreferenceActivity extends PreferenceActivity {
                 }
                 items[index++] = account.name;
             }
-            dialogBuilder.setSingleChoiceItems(items, checkedItem,
+            dialogBuilder.setSingleChoiceItems(items, checkedItem,//设置为选项
                     new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialog, int which) {
-                            setSyncAccount(itemMapping[which].toString());
+                            setSyncAccount(itemMapping[which].toString());//点击则开始设置同步账户
                             dialog.dismiss();
                             refreshUI();
                         }
@@ -238,25 +239,25 @@ public class NotesPreferenceActivity extends PreferenceActivity {
         }
 
         View addAccountView = LayoutInflater.from(this).inflate(R.layout.add_account_text, null);
-        dialogBuilder.setView(addAccountView);
+        dialogBuilder.setView(addAccountView);//设置添加账户的视图
 
         final AlertDialog dialog = dialogBuilder.show();
-        addAccountView.setOnClickListener(new View.OnClickListener() {
-            public void onClick(View v) {
-                mHasAddedAccount = true;
+        addAccountView.setOnClickListener(new View.OnClickListener() {//并设置监听器
+            public void onClick(View v) {//当点击添加账户时，创建新活动，因为请求码是-1，所以此活动结束后不会反馈给源活动
+                mHasAddedAccount = true;//设置为true，表示添加了账户
                 Intent intent = new Intent("android.settings.ADD_ACCOUNT_SETTINGS");
-                intent.putExtra(AUTHORITIES_FILTER_KEY, new String[] {
+                intent.putExtra(AUTHORITIES_FILTER_KEY, new String[] {//放入AUTHORITIES_FILTER_KEY对应gmail-ls的键值对
                     "gmail-ls"
                 });
                 startActivityForResult(intent, -1);
-                dialog.dismiss();
+                dialog.dismiss();//清楚对话框
             }
         });
     }
 
-    private void showChangeAccountConfirmAlertDialog() {
+    private void showChangeAccountConfirmAlertDialog() {//设置改变账户的对话框
         AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this);
-
+        //加载一些布局，设置一些语句
         View titleView = LayoutInflater.from(this).inflate(R.layout.account_dialog_title, null);
         TextView titleTextView = (TextView) titleView.findViewById(R.id.account_dialog_title);
         titleTextView.setText(getString(R.string.preferences_dialog_change_account_title,
@@ -265,7 +266,7 @@ public class NotesPreferenceActivity extends PreferenceActivity {
         subtitleTextView.setText(getString(R.string.preferences_dialog_change_account_warn_msg));
         dialogBuilder.setCustomTitle(titleView);
 
-        CharSequence[] menuItemArray = new CharSequence[] {
+        CharSequence[] menuItemArray = new CharSequence[] {//三种模式：改变同步账户，删除同步账户，取消
                 getString(R.string.preferences_menu_change_account),
                 getString(R.string.preferences_menu_remove_account),
                 getString(R.string.preferences_menu_cancel)
@@ -273,37 +274,37 @@ public class NotesPreferenceActivity extends PreferenceActivity {
         dialogBuilder.setItems(menuItemArray, new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialog, int which) {
                 if (which == 0) {
-                    showSelectAccountAlertDialog();
-                } else if (which == 1) {
+                    showSelectAccountAlertDialog();//如果是改变同步账户，则显示可选择的账户
+                } else if (which == 1) {//删除同步账户
                     removeSyncAccount();
-                    refreshUI();
+                    refreshUI();//刷新界面
                 }
             }
         });
         dialogBuilder.show();
     }
 
-    private Account[] getGoogleAccounts() {
+    private Account[] getGoogleAccounts() {//得到谷歌账户信息
         AccountManager accountManager = AccountManager.get(this);
-        return accountManager.getAccountsByType("com.google");
+        return accountManager.getAccountsByType("com.google");//通过google方式返回账户
     }
 
-    private void setSyncAccount(String account) {
-        if (!getSyncAccountName(this).equals(account)) {
+    private void setSyncAccount(String account) {//设置同步账户
+        if (!getSyncAccountName(this).equals(account)) {//如果该账号不在同步账号列表中
             SharedPreferences settings = getSharedPreferences(PREFERENCE_NAME, Context.MODE_PRIVATE);
             SharedPreferences.Editor editor = settings.edit();
-            if (account != null) {
+            if (account != null) {//编辑共享的首选项
                 editor.putString(PREFERENCE_SYNC_ACCOUNT_NAME, account);
             } else {
                 editor.putString(PREFERENCE_SYNC_ACCOUNT_NAME, "");
             }
-            editor.commit();
+            editor.commit();//提交修改的数据
 
             // clean up last sync time
-            setLastSyncTime(this, 0);
+            setLastSyncTime(this, 0);//清楚最后同步的时间
 
             // clean up local gtask related info
-            new Thread(new Runnable() {
+            new Thread(new Runnable() {//清楚本地的gtask关联的信息
                 public void run() {
                     ContentValues values = new ContentValues();
                     values.put(NoteColumns.GTASK_ID, "");
@@ -313,12 +314,12 @@ public class NotesPreferenceActivity extends PreferenceActivity {
             }).start();
 
             Toast.makeText(NotesPreferenceActivity.this,
-                    getString(R.string.preferences_toast_success_set_accout, account),
+                    getString(R.string.preferences_toast_success_set_accout, account),//提示已经设置同步账户成功
                     Toast.LENGTH_SHORT).show();
         }
     }
 
-    private void removeSyncAccount() {
+    private void removeSyncAccount() {//移除同步账户
         SharedPreferences settings = getSharedPreferences(PREFERENCE_NAME, Context.MODE_PRIVATE);
         SharedPreferences.Editor editor = settings.edit();
         if (settings.contains(PREFERENCE_SYNC_ACCOUNT_NAME)) {
@@ -330,7 +331,7 @@ public class NotesPreferenceActivity extends PreferenceActivity {
         editor.commit();
 
         // clean up local gtask related info
-        new Thread(new Runnable() {
+        new Thread(new Runnable() {//清除本地与gtask有关的信息
             public void run() {
                 ContentValues values = new ContentValues();
                 values.put(NoteColumns.GTASK_ID, "");
@@ -340,32 +341,32 @@ public class NotesPreferenceActivity extends PreferenceActivity {
         }).start();
     }
 
-    public static String getSyncAccountName(Context context) {
+    public static String getSyncAccountName(Context context) {//得到同步账户的名称
         SharedPreferences settings = context.getSharedPreferences(PREFERENCE_NAME,
                 Context.MODE_PRIVATE);
         return settings.getString(PREFERENCE_SYNC_ACCOUNT_NAME, "");
     }
 
-    public static void setLastSyncTime(Context context, long time) {
+    public static void setLastSyncTime(Context context, long time) {//设置最后同步的时间
         SharedPreferences settings = context.getSharedPreferences(PREFERENCE_NAME,
                 Context.MODE_PRIVATE);
         SharedPreferences.Editor editor = settings.edit();
-        editor.putLong(PREFERENCE_LAST_SYNC_TIME, time);
-        editor.commit();
+        editor.putLong(PREFERENCE_LAST_SYNC_TIME, time);//输入键值对
+        editor.commit();//提交编辑内容
     }
 
-    public static long getLastSyncTime(Context context) {
+    public static long getLastSyncTime(Context context) {//得到最后同步的时间
         SharedPreferences settings = context.getSharedPreferences(PREFERENCE_NAME,
                 Context.MODE_PRIVATE);
         return settings.getLong(PREFERENCE_LAST_SYNC_TIME, 0);
     }
 
-    private class GTaskReceiver extends BroadcastReceiver {
+    private class GTaskReceiver extends BroadcastReceiver {//广播接收器
 
         @Override
         public void onReceive(Context context, Intent intent) {
-            refreshUI();
-            if (intent.getBooleanExtra(GTaskSyncService.GTASK_SERVICE_BROADCAST_IS_SYNCING, false)) {
+            refreshUI();//接受到广播就刷新界面
+            if (intent.getBooleanExtra(GTaskSyncService.GTASK_SERVICE_BROADCAST_IS_SYNCING, false)) {//如果在同步状态，改变同步按钮显示的文本
                 TextView syncStatus = (TextView) findViewById(R.id.prefenerece_sync_status_textview);
                 syncStatus.setText(intent
                         .getStringExtra(GTaskSyncService.GTASK_SERVICE_BROADCAST_PROGRESS_MSG));
@@ -376,10 +377,10 @@ public class NotesPreferenceActivity extends PreferenceActivity {
 
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
-            case android.R.id.home:
+            case android.R.id.home://返回主界面
                 Intent intent = new Intent(this, NotesListActivity.class);
                 intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-                startActivity(intent);
+                startActivity(intent);//创建活动
                 return true;
             default:
                 return false;
diff --git a/src/app/src/main/res/layout/note_edit.xml b/src/app/src/main/res/layout/note_edit.xml
index de146f4..c0a8bfb 100644
--- a/src/app/src/main/res/layout/note_edit.xml
+++ b/src/app/src/main/res/layout/note_edit.xml
@@ -35,9 +35,9 @@
                 android:id="@+id/tv_modified_date"
                 android:layout_width="0dip"
                 android:layout_height="wrap_content"
+                android:layout_weight="1"
                 android:layout_gravity="left|center_vertical"
                 android:layout_marginRight="8dip"
-                android:layout_weight="1"
                 android:textAppearance="@style/TextAppearanceSecondaryItem" />
 
             <ImageView
@@ -58,7 +58,7 @@
 
             <ImageButton
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
                 android:layout_gravity="center"
                 android:background="@drawable/bg_btn_set_color" />
         </LinearLayout>
@@ -90,7 +90,7 @@
                     <net.micode.notes.ui.NoteEditText
                         android:id="@+id/note_edit_view"
                         android:layout_width="fill_parent"
-                        android:layout_height="wrap_content"
+                        android:layout_height="566dp"
                         android:autoLink="all"
                         android:background="@null"
                         android:gravity="left|top"
@@ -118,10 +118,10 @@
 
     <ImageView
         android:id="@+id/btn_set_bg_color"
-        android:layout_height="43dip"
         android:layout_width="wrap_content"
-        android:background="@drawable/bg_color_btn_mask"
-        android:layout_gravity="top|right" />
+        android:layout_height="43dp"
+        android:layout_gravity="top|right"
+        android:background="@drawable/bg_color_btn_mask" />
 
     <LinearLayout
         android:id="@+id/note_bg_color_selector"
diff --git a/src/app/src/main/res/layout/note_list.xml b/src/app/src/main/res/layout/note_list.xml
index f5e32b2..e163cf4 100644
--- a/src/app/src/main/res/layout/note_list.xml
+++ b/src/app/src/main/res/layout/note_list.xml
@@ -28,19 +28,19 @@
 
         <TextView
             android:id="@+id/tv_title_bar"
-            android:layout_width="30dp"
-            android:layout_height="335dp"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
             android:background="@drawable/title_bar_bg"
+            android:visibility="gone"
             android:gravity="center_vertical"
             android:singleLine="true"
             android:textColor="#FFEAD1AE"
-            android:textSize="@dimen/text_font_size_medium"
-            android:visibility="gone" />
+            android:textSize="@dimen/text_font_size_medium" />
 
         <ListView
             android:id="@+id/notes_list"
             android:layout_width="fill_parent"
-            android:layout_height="819dp"
+            android:layout_height="0dip"
             android:layout_weight="1"
             android:cacheColorHint="@null"
             android:divider="@null"
@@ -50,9 +50,9 @@
 
     <Button
         android:id="@+id/btn_new_note"
-        android:background="@drawable/new_note"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:focusable="false"
-        android:layout_gravity="bottom" />
+        android:layout_gravity="bottom"
+        android:background="@drawable/new_note"
+        android:focusable="false" />
 </FrameLayout>
diff --git a/src/app/src/main/res/layout/settings_header.xml b/src/app/src/main/res/layout/settings_header.xml
index 842327d..5eb8c50 100644
--- a/src/app/src/main/res/layout/settings_header.xml
+++ b/src/app/src/main/res/layout/settings_header.xml
@@ -23,13 +23,13 @@
 
     <Button
         android:id="@+id/preference_sync_button"
-        style="?android:attr/textAppearanceMedium"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="30dip"
         android:layout_marginTop="15dip"
+        android:layout_marginLeft="30dip"
         android:layout_marginRight="30dip"
-        android:text="@string/preferences_button_sync_immediately" />
+        style="?android:attr/textAppearanceMedium"
+        android:text="@string/preferences_button_sync_immediately"/>
 
     <TextView
         android:id="@+id/prefenerece_sync_status_textview"
diff --git a/src/app/src/main/res/menu/note_edit.xml b/src/app/src/main/res/menu/note_edit.xml
index 35cacd1..338c4e1 100644
--- a/src/app/src/main/res/menu/note_edit.xml
+++ b/src/app/src/main/res/menu/note_edit.xml
@@ -49,4 +49,8 @@
     <item
         android:id="@+id/menu_delete_remind"
         android:title="@string/menu_remove_remind" />
+
+    <item
+        android:id="@+id/menu_messageRemind"
+        android:title="@string/menu_message_pop"/>
 </menu>
\ No newline at end of file
diff --git a/src/app/src/main/res/menu/note_list.xml b/src/app/src/main/res/menu/note_list.xml
index 42ea736..34cd21b 100644
--- a/src/app/src/main/res/menu/note_list.xml
+++ b/src/app/src/main/res/menu/note_list.xml
@@ -23,7 +23,7 @@
 
     <item
         android:id="@+id/menu_export_text"
-        android:title="@string/menu_export_text"/>
+        android:title="@string/menu_export_text" />
 
     <item
         android:id="@+id/menu_sync"
@@ -36,4 +36,8 @@
     <item
         android:id="@+id/menu_search"
         android:title="@string/menu_search"/>
+
+    <item
+        android:id="@+id/menu_countAllNotes"
+        android:title="@string/menu_countAllNotes"/>
 </menu>
diff --git a/src/app/src/main/res/menu/note_list_options.xml b/src/app/src/main/res/menu/note_list_options.xml
index 770963d..daac008 100644
--- a/src/app/src/main/res/menu/note_list_options.xml
+++ b/src/app/src/main/res/menu/note_list_options.xml
@@ -21,7 +21,7 @@
         android:id="@+id/move"
         android:title="@string/menu_move"
         android:icon="@drawable/menu_move"
-        android:showAsAction="always|withText" /><!--never是放在。。。里的，always是直接显示的-->
+        android:showAsAction="always|withText" />
 
     <item
         android:id="@+id/delete"
diff --git a/src/app/src/main/res/raw-zh-rCN/introduction b/src/app/src/main/res/raw-zh-rCN/introduction
index 7188359..e76397a 100644
--- a/src/app/src/main/res/raw-zh-rCN/introduction
+++ b/src/app/src/main/res/raw-zh-rCN/introduction
@@ -4,4 +4,6 @@
 
       除了调整文字大小、便签背景、文件夹等基础功能外，你会发现MIUI便签也提供了清单模式、便签提醒、软件加密、导出到SD卡、同步google task的高级功能，让你的生活记录更加美好和安全；
 
-      来分享你的使用体验吧：http://www.miui.com/index.php
+      这是来自9年后的编辑，你可以在知士荟上和众多dalao讨论如何在9年后根据开源代码改进小米便签，增强它的功能
+
+      来分享你的使用体验和开发思路吧：http://www.learnerhub.net/
diff --git a/src/app/src/main/res/values-zh-rCN/strings.xml b/src/app/src/main/res/values-zh-rCN/strings.xml
index 09f75ed..127480a 100644
--- a/src/app/src/main/res/values-zh-rCN/strings.xml
+++ b/src/app/src/main/res/values-zh-rCN/strings.xml
@@ -17,6 +17,11 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!--    Self design strings -->
+    <string name="menu_message_pop">弹出自定义消息</string>
+    <string name="menu_countAllNotes">显示目前便签数量</string>
+    <!--    Self design strings -->
+
     <string name="app_name">便签</string>
     <string name="app_widget2x2">便签2x2</string>
     <string name="app_widget4x4">便签4x4</string>
diff --git a/src/app/src/main/res/values/strings.xml b/src/app/src/main/res/values/strings.xml
index 55df868..fce541e 100644
--- a/src/app/src/main/res/values/strings.xml
+++ b/src/app/src/main/res/values/strings.xml
@@ -17,6 +17,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="menu_message_pop">Pop message</string>
+    <string name="menu_countAllNotes">count how many notes are there</string>
     <string name="app_name">Notes</string>
     <string name="app_widget2x2">Notes 2x2</string>
     <string name="app_widget4x4">Notes 4x4</string>
diff --git a/src/app/src/main/res/values/styles.xml b/src/app/src/main/res/values/styles.xml
index 00b90e9..c1eddb2 100644
--- a/src/app/src/main/res/values/styles.xml
+++ b/src/app/src/main/res/values/styles.xml
@@ -22,7 +22,7 @@
     </style>
     <style name="TextAppearanceLarge">
         <item name="android:textSize">@dimen/text_font_size_large</item>
-        <item name="android:textColorLink">#2D2D9A</item>
+        <item name="android:textColorLink">#0000ff</item>
     </style>
     <style name="TextAppearanceMedium">
         <item name="android:textSize">@dimen/text_font_size_medium</item>
@@ -63,7 +63,6 @@
     </style>
 
     <style name="NoteActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid">
-        <item name="android:displayOptions" />
         <item name="android:visibility">visible</item>
     </style>
 </resources>
\ No newline at end of file