diff --git a/doc/实践模板-开源软件泛读、标注和维护报告文档.docx b/doc/实践模板-开源软件泛读、标注和维护报告文档.docx
index 5c813be..ddd5363 100644
Binary files a/doc/实践模板-开源软件泛读、标注和维护报告文档.docx and b/doc/实践模板-开源软件泛读、标注和维护报告文档.docx differ
diff --git a/master/Notes-master1/.gradle/8.0/executionHistory/executionHistory.bin b/master/Notes-master1/.gradle/8.0/executionHistory/executionHistory.bin
index 488d21c..7142fef 100644
Binary files a/master/Notes-master1/.gradle/8.0/executionHistory/executionHistory.bin and b/master/Notes-master1/.gradle/8.0/executionHistory/executionHistory.bin differ
diff --git a/master/Notes-master1/.gradle/8.0/executionHistory/executionHistory.lock b/master/Notes-master1/.gradle/8.0/executionHistory/executionHistory.lock
index 859e321..07932e6 100644
Binary files a/master/Notes-master1/.gradle/8.0/executionHistory/executionHistory.lock and b/master/Notes-master1/.gradle/8.0/executionHistory/executionHistory.lock differ
diff --git a/master/Notes-master1/.gradle/8.0/fileHashes/fileHashes.bin b/master/Notes-master1/.gradle/8.0/fileHashes/fileHashes.bin
index 2997b6c..5bf3593 100644
Binary files a/master/Notes-master1/.gradle/8.0/fileHashes/fileHashes.bin and b/master/Notes-master1/.gradle/8.0/fileHashes/fileHashes.bin differ
diff --git a/master/Notes-master1/.gradle/8.0/fileHashes/fileHashes.lock b/master/Notes-master1/.gradle/8.0/fileHashes/fileHashes.lock
index 56e4b13..a1b96ea 100644
Binary files a/master/Notes-master1/.gradle/8.0/fileHashes/fileHashes.lock and b/master/Notes-master1/.gradle/8.0/fileHashes/fileHashes.lock differ
diff --git a/master/Notes-master1/.gradle/8.0/fileHashes/resourceHashesCache.bin b/master/Notes-master1/.gradle/8.0/fileHashes/resourceHashesCache.bin
index 3d61456..e42b5f9 100644
Binary files a/master/Notes-master1/.gradle/8.0/fileHashes/resourceHashesCache.bin and b/master/Notes-master1/.gradle/8.0/fileHashes/resourceHashesCache.bin differ
diff --git a/master/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/master/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index ade8ac6..e53be7e 100644
Binary files a/master/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/master/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/master/Notes-master1/.gradle/file-system.probe b/master/Notes-master1/.gradle/file-system.probe
index f33ec2d..f1823b0 100644
Binary files a/master/Notes-master1/.gradle/file-system.probe and b/master/Notes-master1/.gradle/file-system.probe differ
diff --git a/master/Notes-master1/.idea/sonarlint/issuestore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c b/master/Notes-master1/.idea/sonarlint/issuestore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c
index 3577f14..1261162 100644
--- a/master/Notes-master1/.idea/sonarlint/issuestore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c
+++ b/master/Notes-master1/.idea/sonarlint/issuestore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c
@@ -1,67 +1,69 @@
 
-t
-java:S2293W"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 ("<>").(���������

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

-o
-java:S2293q"YReplace the type specification in this constructor call with the diamond operator ("<>").(����
-p
-java:S2293�"YReplace the type specification in this constructor call with the diamond operator ("<>").(艥�
-?
-java:S1604�"(Make this anonymous inner class a lambda(��
+{
+java:S2293Z"YReplace the type specification in this constructor call with the diamond operator ("<>").(�ӏ������
8䵊��1
+{
+java:S2293c"YReplace the type specification in this constructor call with the diamond operator ("<>").(���������
8䵊��1
+{
+java:S2293l"YReplace the type specification in this constructor call with the diamond operator ("<>").(���������
8䵊��1
+v
+java:S2293t"YReplace the type specification in this constructor call with the diamond operator ("<>").(����8䵊��1
+w
+java:S2293�"YReplace the type specification in this constructor call with the diamond operator ("<>").(艥�8䵊��1
+K
+java:S1604�"(Make this anonymous inner class a lambda(���������
8浊��1
+F
+java:S1604�"(Make this anonymous inner class a lambda(��8�����1
+F
+java:S1604�"(Make this anonymous inner class a lambda(����8浊��1
+F
+java:S1604�"(Make this anonymous inner class a lambda(��ߒ8浊��1
+x
+java:S1104Q"VMake tvModified a static final constant or non-public and provide accessors if needed.(��ԣ�����
8赊��1
+y
+java:S1104S"WMake ivAlertIcon a static final constant or non-public and provide accessors if needed.(�න�����
8赊��1
+y
+java:S1104U"WMake tvAlertDate a static final constant or non-public and provide accessors if needed.(���������
8赊��1
+z
+java:S1104W"XMake ibSetBgColor a static final constant or non-public and provide accessors if needed.(��������
8赊��1
+u
+java:S1450�
"WRemove the "mPattern" field and declare it as a local variable in the relevant methods.(����8Ŷ���1
+u
+java:S3776�
"RRefactor this method to reduce its Cognitive Complexity from 26 to the 15 allowed.(ݨ�������
8϶���1
+^
+java:S1874�
"@Remove this use of "SOFT_INPUT_ADJUST_RESIZE"; it is deprecated.(ѯ��
8Ѷ���1
+c
+java:S1874�"@Remove this use of "SOFT_INPUT_ADJUST_RESIZE"; it is deprecated.(ң�������
8Ӷ���1
+V
+java:S1874�"9Remove this use of "setTextAppearance"; it is deprecated.(���(8Զ���1
+R
+java:S2864�"4Iterate over the "entrySet" instead of the "keySet".(�ԇ�8ն���1
+U
+java:S1135�"2Complete the task associated to this TODO comment.(���������
8ֶ���1
 ?
-java:S1604�"(Make this anonymous inner class a lambda(����
+java:S1116�"Remove this empty statement.(���������
8׶���1
+_
+java:S1126�"AReplace this if-then-else statement by a single return statement.(����8ٶ���1
 ?
-java:S1604�"(Make this anonymous inner class a lambda(��ߒ
-q
-java:S1104N"VMake tvModified a static final constant or non-public and provide accessors if needed.(��ԣ�����

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

-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.(��������

-n
-java:S1450�
"WRemove the "mPattern" field and declare it as a local variable in the relevant methods.(����
-n
-java:S3776�
"RRefactor this method to reduce its Cognitive Complexity from 26 to the 15 allowed.(ݨ�������

+java:S1116�"Remove this empty statement.(���������
8߶���1
 W
-java:S1874�
"@Remove this use of "SOFT_INPUT_ADJUST_RESIZE"; it is deprecated.(ѯ��

+java:S1874�"9Remove this use of "PreferenceManager"; it is deprecated.(����8߶���1
+a
+java:S1874�"CRemove this use of "getDefaultSharedPreferences"; it is deprecated.(����8߶���1
 \
-java:S1874�
"@Remove this use of "SOFT_INPUT_ADJUST_RESIZE"; it is deprecated.(ң�������

-O
-java:S1874�"9Remove this use of "setTextAppearance"; it is deprecated.(���(
-K
-java:S2864�"4Iterate over the "entrySet" instead of the "keySet".(�ԇ�
-N
-java:S1135�"2Complete the task associated to this TODO comment.(���������

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

+java:S1874�"9Remove this use of "setTextAppearance"; it is deprecated.(���������
8㶊��1
+m
+java:S1874�"JDon't override a deprecated method or explicitly mark it as "@Deprecated".(���������
8䶊��1
 X
-java:S1126�"AReplace this if-then-else statement by a single return statement.(����
-8
-java:S1116�"Remove this empty statement.(���������

-P
-java:S1874�"9Remove this use of "PreferenceManager"; it is deprecated.(����
-Z
-java:S1874�"CRemove this use of "getDefaultSharedPreferences"; it is deprecated.(����
-U
-java:S1874�"9Remove this use of "setTextAppearance"; it is deprecated.(���������

-f
-java:S1874�"JDon't override a deprecated method or explicitly mark it as "@Deprecated".(���������

-Q
-java:S1874�"5Remove this use of "onBackPressed"; it is deprecated.(���������

-G
-java:S1874�"0Remove this use of "getColor"; it is deprecated.(���
-d
-java:S3252�"MUse static access with "android.text.Spanned" for "SPAN_INCLUSIVE_EXCLUSIVE".(����

-U
-java:S1874�"9Remove this use of "setTextAppearance"; it is deprecated.(���������

-T
-java:S1874�"=Remove this use of "EXTRA_SHORTCUT_INTENT"; it is deprecated.(�ð�
-R
-java:S1874�";Remove this use of "EXTRA_SHORTCUT_NAME"; it is deprecated.(����
+java:S1874�"5Remove this use of "onBackPressed"; it is deprecated.(���������
8䶊��1
+N
+java:S1874�"0Remove this use of "getColor"; it is deprecated.(���8�����1
+k
+java:S3252�"MUse static access with "android.text.Spanned" for "SPAN_INCLUSIVE_EXCLUSIVE".(����
8�����1
+\
+java:S1874�"9Remove this use of "setTextAppearance"; it is deprecated.(���������
8�����1
 [
-java:S1874�"DRemove this use of "EXTRA_SHORTCUT_ICON_RESOURCE"; it is deprecated.(��Ǿ
\ No newline at end of file
+java:S1874�"=Remove this use of "EXTRA_SHORTCUT_INTENT"; it is deprecated.(�ð�8�����1
+Y
+java:S1874�";Remove this use of "EXTRA_SHORTCUT_NAME"; it is deprecated.(����8�����1
+b
+java:S1874�"DRemove this use of "EXTRA_SHORTCUT_ICON_RESOURCE"; it is deprecated.(��Ǿ8�����1
\ No newline at end of file
diff --git a/master/Notes-master1/app/build/intermediates/apk/debug/app-debug.apk b/master/Notes-master1/app/build/intermediates/apk/debug/app-debug.apk
index 6d45d28..c6164b0 100644
Binary files a/master/Notes-master1/app/build/intermediates/apk/debug/app-debug.apk and b/master/Notes-master1/app/build/intermediates/apk/debug/app-debug.apk differ
diff --git a/master/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar b/master/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar
index 2421e9d..870c000 100644
Binary files a/master/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar and b/master/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar differ
diff --git a/master/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/master/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex
index c8837f8..09aa47e 100644
Binary files a/master/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex and b/master/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex differ
diff --git a/master/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/master/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out
index a4da57a..708898c 100644
Binary files a/master/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and b/master/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ
diff --git a/master/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/master/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
index 6f960a5..c9eadc0 100644
--- a/master/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
+++ b/master/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
@@ -1,4 +1,4 @@
-#Tue Jan 02 20:48:30 SGT 2024
+#Tue Jan 09 14:54:26 SGT 2024
 net.micode.notes.app-main-6\:/color/primary_text_dark.xml=C\:\\Users\\admin\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
 net.micode.notes.app-main-6\:/color/secondary_text_dark.xml=C\:\\Users\\admin\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
 net.micode.notes.app-main-6\:/drawable-hdpi/bg_btn_set_color.png=C\:\\Users\\admin\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat
diff --git a/master/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml b/master/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml
index 6e62313..42b7713 100644
--- a/master/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml
+++ b/master/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml
@@ -82,6 +82,7 @@
     <string name="menu_sync">Sync</string>
     <string name="menu_sync_cancel">Cancel syncing</string>
     <string name="menu_title_select_folder">Select folder</string>
+    <string name="menu_voice_mix">voice_read</string>
     <string name="note_alert_expired">Expired</string>
     <string name="note_link_email">Send email</string>
     <string name="note_link_other">Open map</string>
diff --git a/master/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/master/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
index 4f37482..cff7b94 100644
--- a/master/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
+++ b/master/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
@@ -11,7 +11,7 @@
          <item quantity="one"><ns1:g example="1" id="number">%1$s</ns1:g> result for \"<ns1:g example="???" id="search">%2$s</ns1:g>\"</item>
         
         <item quantity="other"><ns1:g example="15" id="number">%1$s</ns1:g> results for \"<ns1:g example="???" id="search">%2$s</ns1:g>\"</item>
-    </plurals><string name="menu_quit_secret">quit secret model</string><string name="menu_secret">secret model</string></file><file path="C:\Users\admin\StudioProjects\Notes-master\app\src\main\res\values\styles.xml" qualifiers=""><style name="TextAppearanceSuper">
+    </plurals><string name="menu_quit_secret">quit secret model</string><string name="menu_secret">secret model</string><string name="menu_voice_mix">voice_read</string></file><file path="C:\Users\admin\StudioProjects\Notes-master\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">
diff --git a/master/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties b/master/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
index 028a20f..11b088e 100644
--- a/master/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
+++ b/master/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
@@ -1,4 +1,4 @@
-#Tue Jan 02 20:48:30 SGT 2024
+#Tue Jan 09 14:54:26 SGT 2024
 net.micode.notes.app-main-5\:/color/primary_text_dark.xml=C\:\\Users\\admin\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\color\\primary_text_dark.xml
 net.micode.notes.app-main-5\:/color/secondary_text_dark.xml=C\:\\Users\\admin\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\color\\secondary_text_dark.xml
 net.micode.notes.app-main-5\:/drawable-hdpi/bg_btn_set_color.png=C\:\\Users\\admin\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_btn_set_color.png
diff --git a/master/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml b/master/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml
index 6e62313..42b7713 100644
--- a/master/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml
+++ b/master/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml
@@ -82,6 +82,7 @@
     <string name="menu_sync">Sync</string>
     <string name="menu_sync_cancel">Cancel syncing</string>
     <string name="menu_title_select_folder">Select folder</string>
+    <string name="menu_voice_mix">voice_read</string>
     <string name="note_alert_expired">Expired</string>
     <string name="note_link_email">Send email</string>
     <string name="note_link_other">Open map</string>
diff --git a/master/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml b/master/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml
index 4f37482..cff7b94 100644
--- a/master/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml
+++ b/master/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml
@@ -11,7 +11,7 @@
          <item quantity="one"><ns1:g example="1" id="number">%1$s</ns1:g> result for \"<ns1:g example="???" id="search">%2$s</ns1:g>\"</item>
         
         <item quantity="other"><ns1:g example="15" id="number">%1$s</ns1:g> results for \"<ns1:g example="???" id="search">%2$s</ns1:g>\"</item>
-    </plurals><string name="menu_quit_secret">quit secret model</string><string name="menu_secret">secret model</string></file><file path="C:\Users\admin\StudioProjects\Notes-master\app\src\main\res\values\styles.xml" qualifiers=""><style name="TextAppearanceSuper">
+    </plurals><string name="menu_quit_secret">quit secret model</string><string name="menu_secret">secret model</string><string name="menu_voice_mix">voice_read</string></file><file path="C:\Users\admin\StudioProjects\Notes-master\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">
diff --git a/master/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/master/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
index dd169d1..db92a51 100644
--- a/master/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
+++ b/master/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
@@ -1,4 +1,4 @@
-#Wed Jan 03 09:04:05 SGT 2024
+#Tue Jan 09 14:54:28 SGT 2024
 base.0=C\:\\Users\\admin\\StudioProjects\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
 path.0=classes.dex
 renamed.0=classes.dex
diff --git a/master/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/master/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
index afb28ba..0b10829 100644
Binary files a/master/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/master/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ
diff --git a/master/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class b/master/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class
index 5416cd3..d94d8f0 100644
Binary files a/master/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class and b/master/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class differ
diff --git a/master/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class b/master/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class
index bb9f786..05be0e3 100644
Binary files a/master/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class and b/master/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class differ
diff --git a/master/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class b/master/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class
index 961f2f4..a1f093f 100644
Binary files a/master/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class and b/master/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class differ
diff --git a/master/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class b/master/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class
new file mode 100644
index 0000000..aab7567
Binary files /dev/null and b/master/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class differ
diff --git a/master/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class b/master/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class
index 8e1f0bf..ece883c 100644
Binary files a/master/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class and b/master/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class differ
diff --git a/master/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/master/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class
index 7d0a456..c9457df 100644
Binary files a/master/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class and b/master/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class differ
diff --git a/master/Notes-master1/app/build/intermediates/local_only_symbol_list/debug/R-def.txt b/master/Notes-master1/app/build/intermediates/local_only_symbol_list/debug/R-def.txt
index 7f4c38b..f60d438 100644
--- a/master/Notes-master1/app/build/intermediates/local_only_symbol_list/debug/R-def.txt
+++ b/master/Notes-master1/app/build/intermediates/local_only_symbol_list/debug/R-def.txt
@@ -123,6 +123,7 @@ id menu_send_to_desktop
 id menu_setting
 id menu_share
 id menu_sync
+id menu_voice_mix
 id minute
 id move
 id navigation_bar
@@ -229,6 +230,7 @@ string menu_share
 string menu_sync
 string menu_sync_cancel
 string menu_title_select_folder
+string menu_voice_mix
 string note_alert_expired
 string note_link_email
 string note_link_other
diff --git a/master/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/master/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
index 552e51b..b11fed4 100644
--- a/master/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
+++ b/master/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
@@ -54,7 +54,7 @@
 34-->C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:33:22-78
 35
 36    <application
-36-->C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:35:5-148:19
+36-->C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:35:5-149:19
 37        android:debuggable="true"
 38        android:extractNativeLibs="true"
 39        android:icon="@drawable/icon_app"
@@ -253,19 +253,19 @@
 139        </activity>
 140
 141        <service
-141-->C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:140:9-143:19
+141-->C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:141:9-144:19
 142            android:name="net.micode.notes.gtask.remote.GTaskSyncService"
-142-->C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:141:13-74
+142-->C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:142:13-74
 143            android:exported="false" >
-143-->C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:142:13-37
+143-->C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:143:13-37
 144        </service>
 145
 146        <meta-data
-146-->C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:145:9-147:52
+146-->C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:146:9-148:52
 147            android:name="android.app.default_searchable"
-147-->C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:146:13-58
+147-->C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:147:13-58
 148            android:value=".ui.NoteEditActivity" />
-148-->C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:147:13-49
+148-->C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:148:13-49
 149    </application>
 150
 151</manifest>
diff --git a/master/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat b/master/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat
index c025a60..1106d7f 100644
Binary files a/master/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat and b/master/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat differ
diff --git a/master/Notes-master1/app/build/intermediates/merged_res/debug/values_values.arsc.flat b/master/Notes-master1/app/build/intermediates/merged_res/debug/values_values.arsc.flat
index e9c34e9..fecf00a 100644
Binary files a/master/Notes-master1/app/build/intermediates/merged_res/debug/values_values.arsc.flat and b/master/Notes-master1/app/build/intermediates/merged_res/debug/values_values.arsc.flat differ
diff --git a/master/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/master/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
index c8c1a33..6bfc42a 100644
--- a/master/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
+++ b/master/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
@@ -26,12 +26,12 @@
                         "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
                     },
                     "to": {
-                        "startLines": "127,131,135,139,142,146,150,154,158,162,166",
+                        "startLines": "128,132,136,140,143,147,151,155,159,163,167",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "8240,8444,8655,8828,8988,9171,9356,9541,9744,9950,10133",
-                        "endLines": "130,134,138,141,145,149,153,157,161,165,169",
+                        "startOffsets": "8294,8498,8709,8882,9042,9225,9410,9595,9798,10004,10187",
+                        "endLines": "131,135,139,142,146,150,154,158,162,166,170",
                         "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "8439,8650,8823,8983,9166,9351,9536,9739,9945,10128,10329"
+                        "endOffsets": "8493,8704,8877,9037,9220,9405,9590,9793,9999,10182,10383"
                     }
                 },
                 {
@@ -68,20 +68,20 @@
                 {
                     "source": "C:\\Users\\admin\\StudioProjects\\Notes-master\\app\\src\\main\\res\\values\\strings.xml",
                     "from": {
-                        "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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,78,-1,-1,77,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startColumns": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-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",
-                        "startOffsets": "8124,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4397,-1,-1,4344,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,78,-1,-1,77,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,62,-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",
-                        "endOffsets": "8528,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4455,-1,-1,4392,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+                        "startLines": "131,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,79,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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",
+                        "startOffsets": "8178,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4460,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "135,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,79,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,53,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "8582,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4509,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
                     },
                     "to": {
-                        "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,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,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4417,4464,4517,4572,4660,4718,4780,4830,4875,4918,4978,5045,5100,5155,5208,5255,5308,5364,5412,5467,5520,5604,5671,5735,5831,5905,5986,6075,6238,6382,6461,6536,6618,6677,6757,6837,6892,7014,7117,7158,7211,7268,7342,7407,7475,7561,7641,7710,7804,7863,7918,7980,8040,8150",
-                        "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,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,62,46,52,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
-                        "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4412,4459,4512,4567,4655,4713,4775,4825,4870,4913,4973,5040,5095,5150,5203,5250,5303,5359,5407,5462,5515,5599,5666,5730,5826,5900,5981,6070,6233,6377,6456,6531,6613,6672,6752,6832,6887,7009,7112,7153,7206,7263,7337,7402,7470,7556,7636,7705,7799,7858,7913,7975,8035,8145,8235"
+                        "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,127",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4417,4464,4517,4572,4660,4718,4780,4830,4875,4918,4978,5045,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",
+                        "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,127",
+                        "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,62,46,52,54,87,57,61,49,44,42,59,66,53,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
+                        "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4412,4459,4512,4567,4655,4713,4775,4825,4870,4913,4973,5040,5094,5149,5204,5257,5304,5357,5413,5461,5516,5569,5653,5720,5784,5880,5954,6035,6124,6287,6431,6510,6585,6667,6726,6806,6886,6941,7063,7166,7207,7260,7317,7391,7456,7524,7610,7690,7759,7853,7912,7967,8029,8089,8199,8289"
                     }
                 }
             ]
diff --git a/master/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/master/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
index 228e8ac..67cf919 100644
--- a/master/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
+++ b/master/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
@@ -21,20 +21,17 @@
                 {
                     "source": "C:\\Users\\admin\\StudioProjects\\Notes-master\\app\\src\\main\\res\\values\\styles.xml",
                     "from": {
-                        "startLines": "-1,-1,64,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startColumns": "-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startOffsets": "-1,-1,2640,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endLines": "-1,-1,67,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endColumns": "-1,-1,12,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endOffsets": "-1,-1,2861,-1,-1,-1,-1,-1,-1,-1,-1"
+                        "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
                     },
                     "to": {
-                        "startLines": "125,129,133,137,140,144,148,152,156,160,164",
+                        "startLines": "128,132,136,140,143,147,151,155,159,163,167",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "8124,8328,8539,8712,8872,9055,9240,9425,9628,9834,10017",
-                        "endLines": "128,132,136,139,143,147,151,155,159,163,167",
+                        "startOffsets": "8293,8497,8708,8881,9041,9224,9409,9594,9797,10003,10186",
+                        "endLines": "131,135,139,142,146,150,154,158,162,166,170",
                         "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "8323,8534,8707,8867,9050,9235,9420,9623,9829,10012,10213"
+                        "endOffsets": "8492,8703,8876,9036,9219,9404,9589,9792,9998,10181,10382"
                     }
                 },
                 {
@@ -71,17 +68,20 @@
                 {
                     "source": "C:\\Users\\admin\\StudioProjects\\Notes-master\\app\\src\\main\\res\\values\\strings.xml",
                     "from": {
-                        "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+                        "startLines": "131,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,79,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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",
+                        "startOffsets": "8177,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4460,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "135,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,79,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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",
+                        "endOffsets": "8581,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4508,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
                     },
                     "to": {
-                        "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034",
-                        "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
-                        "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
-                        "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119"
+                        "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,127",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4417,4464,4517,4572,4660,4718,4780,4830,4875,4918,4978,5045,5098,5153,5208,5261,5308,5361,5417,5465,5520,5573,5657,5724,5788,5884,5958,6039,6128,6291,6435,6514,6589,6671,6730,6810,6890,6945,7067,7170,7211,7264,7321,7395,7460,7528,7614,7694,7763,7857,7916,7971,8033,8093,8203",
+                        "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,127",
+                        "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,62,46,52,54,87,57,61,49,44,42,59,66,52,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
+                        "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4412,4459,4512,4567,4655,4713,4775,4825,4870,4913,4973,5040,5093,5148,5203,5256,5303,5356,5412,5460,5515,5568,5652,5719,5783,5879,5953,6034,6123,6286,6430,6509,6584,6666,6725,6805,6885,6940,7062,7165,7206,7259,7316,7390,7455,7523,7609,7689,7758,7852,7911,7966,8028,8088,8198,8288"
                     }
                 }
             ]
@@ -112,12 +112,12 @@
                         "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
                     },
                     "to": {
-                        "startLines": "127,131,135,139,142,146,150,154,158,162,166",
+                        "startLines": "128,132,136,140,143,147,151,155,159,163,167",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "8240,8444,8655,8828,8988,9171,9356,9541,9744,9950,10133",
-                        "endLines": "130,134,138,141,145,149,153,157,161,165,169",
+                        "startOffsets": "8294,8498,8709,8882,9042,9225,9410,9595,9798,10004,10187",
+                        "endLines": "131,135,139,142,146,150,154,158,162,166,170",
                         "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "8439,8650,8823,8983,9166,9351,9536,9739,9945,10128,10329"
+                        "endOffsets": "8493,8704,8877,9037,9220,9405,9590,9793,9999,10182,10383"
                     }
                 },
                 {
@@ -154,20 +154,20 @@
                 {
                     "source": "C:\\Users\\admin\\StudioProjects\\Notes-master\\app\\src\\main\\res\\values\\strings.xml",
                     "from": {
-                        "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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,78,-1,-1,77,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startColumns": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-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",
-                        "startOffsets": "8124,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4397,-1,-1,4344,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,78,-1,-1,77,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,62,-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",
-                        "endOffsets": "8528,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4455,-1,-1,4392,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+                        "startLines": "131,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,79,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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",
+                        "startOffsets": "8178,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4460,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "135,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,79,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,53,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "8582,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4509,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
                     },
                     "to": {
-                        "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,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,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4417,4464,4517,4572,4660,4718,4780,4830,4875,4918,4978,5045,5100,5155,5208,5255,5308,5364,5412,5467,5520,5604,5671,5735,5831,5905,5986,6075,6238,6382,6461,6536,6618,6677,6757,6837,6892,7014,7117,7158,7211,7268,7342,7407,7475,7561,7641,7710,7804,7863,7918,7980,8040,8150",
-                        "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,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,62,46,52,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
-                        "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4412,4459,4512,4567,4655,4713,4775,4825,4870,4913,4973,5040,5095,5150,5203,5250,5303,5359,5407,5462,5515,5599,5666,5730,5826,5900,5981,6070,6233,6377,6456,6531,6613,6672,6752,6832,6887,7009,7112,7153,7206,7263,7337,7402,7470,7556,7636,7705,7799,7858,7913,7975,8035,8145,8235"
+                        "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,127",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4417,4464,4517,4572,4660,4718,4780,4830,4875,4918,4978,5045,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",
+                        "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,127",
+                        "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,62,46,52,54,87,57,61,49,44,42,59,66,53,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
+                        "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4412,4459,4512,4567,4655,4713,4775,4825,4870,4913,4973,5040,5094,5149,5204,5257,5304,5357,5413,5461,5516,5569,5653,5720,5784,5880,5954,6035,6124,6287,6431,6510,6585,6667,6726,6806,6886,6941,7063,7166,7207,7260,7317,7391,7456,7524,7610,7690,7759,7853,7912,7967,8029,8089,8199,8289"
                     }
                 }
             ]
diff --git a/master/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json b/master/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
index f8046ad..591c1aa 100644
--- a/master/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
+++ b/master/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
@@ -87,6 +87,10 @@
         "merged": "C:\\Users\\admin\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\menu_note_list_options.xml.flat",
         "source": "C:\\Users\\admin\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\menu\\note_list_options.xml"
     },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/menu_note_edit.xml.flat",
+        "source": "net.micode.notes.app-main-6:/menu/note_edit.xml"
+    },
     {
         "merged": "C:\\Users\\admin\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_red_down.9.png.flat",
         "source": "C:\\Users\\admin\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_red_down.9.png"
@@ -99,10 +103,6 @@
         "merged": "C:\\Users\\admin\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_yellow_up.9.png.flat",
         "source": "C:\\Users\\admin\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_yellow_up.9.png"
     },
-    {
-        "merged": "net.micode.notes.app-merged_res-4:/menu_note_list.xml.flat",
-        "source": "net.micode.notes.app-main-6:/menu/note_list.xml"
-    },
     {
         "merged": "C:\\Users\\admin\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\menu_sub_folder.xml.flat",
         "source": "C:\\Users\\admin\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\menu\\sub_folder.xml"
@@ -195,10 +195,6 @@
         "merged": "C:\\Users\\admin\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_title_bar_bg.9.png.flat",
         "source": "C:\\Users\\admin\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\title_bar_bg.9.png"
     },
-    {
-        "merged": "net.micode.notes.app-merged_res-4:/menu_sub_folder.xml.flat",
-        "source": "net.micode.notes.app-main-6:/menu/sub_folder.xml"
-    },
     {
         "merged": "C:\\Users\\admin\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_red_up.9.png.flat",
         "source": "C:\\Users\\admin\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_red_up.9.png"
diff --git a/master/Notes-master1/app/build/intermediates/packaged_res/debug/menu/note_edit.xml b/master/Notes-master1/app/build/intermediates/packaged_res/debug/menu/note_edit.xml
index 35cacd1..e82064e 100644
--- a/master/Notes-master1/app/build/intermediates/packaged_res/debug/menu/note_edit.xml
+++ b/master/Notes-master1/app/build/intermediates/packaged_res/debug/menu/note_edit.xml
@@ -49,4 +49,7 @@
     <item
         android:id="@+id/menu_delete_remind"
         android:title="@string/menu_remove_remind" />
+    <item
+        android:id="@+id/menu_voice_mix"
+        android:title="voice_read"/>
 </menu>
\ No newline at end of file
diff --git a/master/Notes-master1/app/build/intermediates/packaged_res/debug/menu/note_list.xml b/master/Notes-master1/app/build/intermediates/packaged_res/debug/menu/note_list.xml
index fe764a7..9903e2e 100644
--- a/master/Notes-master1/app/build/intermediates/packaged_res/debug/menu/note_list.xml
+++ b/master/Notes-master1/app/build/intermediates/packaged_res/debug/menu/note_list.xml
@@ -43,4 +43,5 @@
     <item
         android:id="@+id/menu_quit_secret"
         android:title="@string/menu_quit_secret"/>
+
 </menu>
diff --git a/master/Notes-master1/app/build/intermediates/packaged_res/debug/values/values.xml b/master/Notes-master1/app/build/intermediates/packaged_res/debug/values/values.xml
index 6e62313..42b7713 100644
--- a/master/Notes-master1/app/build/intermediates/packaged_res/debug/values/values.xml
+++ b/master/Notes-master1/app/build/intermediates/packaged_res/debug/values/values.xml
@@ -82,6 +82,7 @@
     <string name="menu_sync">Sync</string>
     <string name="menu_sync_cancel">Cancel syncing</string>
     <string name="menu_title_select_folder">Select folder</string>
+    <string name="menu_voice_mix">voice_read</string>
     <string name="note_alert_expired">Expired</string>
     <string name="note_link_email">Send email</string>
     <string name="note_link_other">Open map</string>
diff --git a/master/Notes-master1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/master/Notes-master1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_
index 72f28f9..db34be9 100644
Binary files a/master/Notes-master1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ and b/master/Notes-master1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ differ
diff --git a/master/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/b99652689dd960f6740958f49559e9c287ea0a784d6b77d15e8d949b7010872e_5.jar b/master/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/b99652689dd960f6740958f49559e9c287ea0a784d6b77d15e8d949b7010872e_5.jar
new file mode 100644
index 0000000..49fb804
Binary files /dev/null and b/master/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/b99652689dd960f6740958f49559e9c287ea0a784d6b77d15e8d949b7010872e_5.jar differ
diff --git a/master/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex b/master/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex
index 1edfd0a..d206c9c 100644
Binary files a/master/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex and b/master/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex differ
diff --git a/master/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex b/master/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex
index bc46bd9..754ca0e 100644
Binary files a/master/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex and b/master/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex differ
diff --git a/master/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex b/master/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex
index 6e54685..1009d73 100644
Binary files a/master/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex and b/master/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex differ
diff --git a/master/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$4.dex b/master/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$4.dex
new file mode 100644
index 0000000..13c5362
Binary files /dev/null and b/master/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$4.dex differ
diff --git a/master/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex b/master/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex
index 3a9b0bf..94f094f 100644
Binary files a/master/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex and b/master/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex differ
diff --git a/master/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex b/master/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex
index adcc2c3..2e9e834 100644
Binary files a/master/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex and b/master/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex differ
diff --git a/master/Notes-master1/app/build/intermediates/runtime_symbol_list/debug/R.txt b/master/Notes-master1/app/build/intermediates/runtime_symbol_list/debug/R.txt
index fc9be0c..f667dea 100644
--- a/master/Notes-master1/app/build/intermediates/runtime_symbol_list/debug/R.txt
+++ b/master/Notes-master1/app/build/intermediates/runtime_symbol_list/debug/R.txt
@@ -121,6 +121,7 @@ int id menu_send_to_desktop 0x7f050029
 int id menu_setting 0x7f05002a
 int id menu_share 0x7f05002b
 int id menu_sync 0x7f05002c
+int id menu_voice_mix 0x7f050045
 int id minute 0x7f05002d
 int id move 0x7f05002e
 int id navigation_bar 0x7f05002f
@@ -227,6 +228,7 @@ 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 menu_voice_mix 0x7f0a0068
 int string note_alert_expired 0x7f0a003b
 int string note_link_email 0x7f0a003c
 int string note_link_other 0x7f0a003d
diff --git a/master/Notes-master1/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt b/master/Notes-master1/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
index a54a678..c7ce71c 100644
--- a/master/Notes-master1/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
+++ b/master/Notes-master1/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
@@ -1,27 +1,30 @@
-net.micode.notes:string/menu_deselect_all = 0x7f0a0022
 net.micode.notes:string/preferences_last_sync_time = 0x7f0a004e
 net.micode.notes:string/preferences_menu_change_account = 0x7f0a0051
+net.micode.notes:string/menu_deselect_all = 0x7f0a0022
+net.micode.notes:id/menu_voice_mix = 0x7f050045
+net.micode.notes:string/menu_export_text = 0x7f0a0023
 net.micode.notes:string/menu_normal_mode = 0x7f0a002f
 net.micode.notes:menu/note_list = 0x7f070003
 net.micode.notes:id/account_dialog_subtitle = 0x7f050000
 net.micode.notes:string/menu_send_to_desktop = 0x7f0a0035
 net.micode.notes:string/search = 0x7f0a0056
 net.micode.notes:string/search_setting_description = 0x7f0a0059
-net.micode.notes:string/note_link_other = 0x7f0a003d
-net.micode.notes:string/preferences_title = 0x7f0a0053
-net.micode.notes:id/iv_bg_yellow_select = 0x7f050017
-net.micode.notes:style/HighlightTextAppearanceSecondary = 0x7f0b0001
 net.micode.notes:string/error_sdcard_unmounted = 0x7f0a0010
 net.micode.notes:xml/preferences = 0x7f0c0000
+net.micode.notes:style/HighlightTextAppearanceSecondary = 0x7f0b0001
+net.micode.notes:string/note_link_other = 0x7f0a003d
+net.micode.notes:id/iv_bg_yellow_select = 0x7f050017
+net.micode.notes:string/preferences_title = 0x7f0a0053
 net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a0055
 net.micode.notes:string/notealert_enter = 0x7f0a0040
 net.micode.notes:xml/widget_4x_info = 0x7f0c0003
 net.micode.notes:string/set_remind_time_message = 0x7f0a005a
 net.micode.notes:string/search_hint = 0x7f0a0057
+net.micode.notes:string/menu_voice_mix = 0x7f0a0068
 net.micode.notes:string/widget_under_visit_mode = 0x7f0a0065
-net.micode.notes:string/menu_share = 0x7f0a0037
 net.micode.notes:string/error_sync_network = 0x7f0a0013
 net.micode.notes:id/notes_list = 0x7f050035
+net.micode.notes:string/menu_share = 0x7f0a0037
 net.micode.notes:style/TextAppearanceSuper = 0x7f0b0009
 net.micode.notes:dimen/text_font_size_large = 0x7f030000
 net.micode.notes:id/ll_font_super = 0x7f05001f
@@ -35,28 +38,27 @@ net.micode.notes:style/TextAppearanceMedium = 0x7f0b0005
 net.micode.notes:id/menu_send_to_desktop = 0x7f050029
 net.micode.notes:string/menu_font_size = 0x7f0a0029
 net.micode.notes:string/info_note_enter_desktop = 0x7f0a001e
+net.micode.notes:layout/note_item = 0x7f060007
+net.micode.notes:string/datetime_dialog_cancel = 0x7f0a0009
+net.micode.notes:menu/sub_folder = 0x7f070006
 net.micode.notes:id/preference_sync_button = 0x7f050037
-net.micode.notes:menu/call_note_edit = 0x7f070000
-net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a004f
-net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0b000a
-net.micode.notes:id/navigation_bar = 0x7f05002f
 net.micode.notes:string/menu_setting = 0x7f0a0036
+net.micode.notes:id/navigation_bar = 0x7f05002f
 net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a004a
 net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0a0047
+net.micode.notes:menu/call_note_edit = 0x7f070000
+net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a004f
+net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0b000a
 net.micode.notes:string/menu_search = 0x7f0a0031
 net.micode.notes:xml/searchable = 0x7f0c0001
 net.micode.notes:style/TextAppearanceLarge = 0x7f0b0004
 net.micode.notes:string/menu_select_all = 0x7f0a0032
 net.micode.notes:string/note_link_email = 0x7f0a003c
 net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a004b
-net.micode.notes:string/menu_folder_change_name = 0x7f0a0024
-net.micode.notes:string/menu_sync_cancel = 0x7f0a0039
-net.micode.notes:string/menu_export_text = 0x7f0a0023
-net.micode.notes:menu/sub_folder = 0x7f070006
-net.micode.notes:layout/note_item = 0x7f060007
-net.micode.notes:string/datetime_dialog_cancel = 0x7f0a0009
 net.micode.notes:string/menu_remove_remind = 0x7f0a0030
 net.micode.notes:string/menu_font_large = 0x7f0a0027
+net.micode.notes:string/menu_folder_change_name = 0x7f0a0024
+net.micode.notes:string/menu_sync_cancel = 0x7f0a0039
 net.micode.notes:string/menu_create_folder = 0x7f0a0020
 net.micode.notes:string/delete_remind_time_message = 0x7f0a000b
 net.micode.notes:string/format_move_notes_to_folder = 0x7f0a001c
@@ -66,12 +68,6 @@ net.micode.notes:string/preferences_account_summary = 0x7f0a0044
 net.micode.notes:drawable/widget_4x_yellow = 0x7f040041
 net.micode.notes:drawable/widget_2x_red = 0x7f04003a
 net.micode.notes:string/file_name_txt_format = 0x7f0a0015
-net.micode.notes:drawable/new_note = 0x7f04002f
-net.micode.notes:string/folder_exist = 0x7f0a0017
-net.micode.notes:id/note_edit_list = 0x7f050031
-net.micode.notes:id/menu_secret = 0x7f050044
-net.micode.notes:string/failed_sdcard_export = 0x7f0a0014
-net.micode.notes:string/menu_select_none = 0x7f0a0033
 net.micode.notes:layout/widget_4x = 0x7f06000d
 net.micode.notes:layout/note_list_dropdown_menu = 0x7f060009
 net.micode.notes:string/error_sync_cancelled = 0x7f0a0011
@@ -88,13 +84,19 @@ net.micode.notes:string/menu_move_parent_folder = 0x7f0a002e
 net.micode.notes:string/notealert_ok = 0x7f0a0041
 net.micode.notes:string/note_link_web = 0x7f0a003f
 net.micode.notes:id/menu_sync = 0x7f05002c
+net.micode.notes:string/failed_sdcard_export = 0x7f0a0014
+net.micode.notes:id/menu_secret = 0x7f050044
+net.micode.notes:string/menu_select_none = 0x7f0a0033
+net.micode.notes:string/folder_exist = 0x7f0a0017
+net.micode.notes:drawable/new_note = 0x7f04002f
+net.micode.notes:id/note_edit_list = 0x7f050031
 net.micode.notes:drawable/widget_2x_yellow = 0x7f04003c
 net.micode.notes:id/amPm = 0x7f050003
 net.micode.notes:string/success_sync_account = 0x7f0a005c
-net.micode.notes:id/menu_quit_secret = 0x7f050043
 net.micode.notes:string/ticker_fail = 0x7f0a0061
 net.micode.notes:string/app_widget2x2 = 0x7f0a0005
 net.micode.notes:string/app_name = 0x7f0a0004
+net.micode.notes:id/menu_quit_secret = 0x7f050043
 net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0a004c
 net.micode.notes:string/search_label = 0x7f0a0058
 net.micode.notes:id/menu_list_mode = 0x7f050025
@@ -177,13 +179,13 @@ net.micode.notes:drawable/bg_btn_set_color = 0x7f040000
 net.micode.notes:id/iv_bg_yellow = 0x7f050016
 net.micode.notes:menu/note_edit = 0x7f070002
 net.micode.notes:drawable/list_white_down = 0x7f040025
-net.micode.notes:string/menu_quit_secret = 0x7f0a0066
-net.micode.notes:drawable/list_white_up = 0x7f040028
 net.micode.notes:id/iv_bg_green = 0x7f050010
+net.micode.notes:drawable/list_white_up = 0x7f040028
+net.micode.notes:string/menu_quit_secret = 0x7f0a0066
 net.micode.notes:drawable/delete = 0x7f040004
 net.micode.notes:id/iv_bg_blue = 0x7f05000e
-net.micode.notes:drawable/list_green_single = 0x7f04001f
 net.micode.notes:id/iv_alert_icon = 0x7f05000d
+net.micode.notes:drawable/list_green_single = 0x7f04001f
 net.micode.notes:drawable/list_yellow_single = 0x7f04002b
 net.micode.notes:id/cb_edit_item = 0x7f050006
 net.micode.notes:id/font_size_selector = 0x7f05000b
diff --git a/master/Notes-master1/app/build/outputs/logs/manifest-merger-debug-report.txt b/master/Notes-master1/app/build/outputs/logs/manifest-merger-debug-report.txt
index 8c4b8f9..8c15dbc 100644
--- a/master/Notes-master1/app/build/outputs/logs/manifest-merger-debug-report.txt
+++ b/master/Notes-master1/app/build/outputs/logs/manifest-merger-debug-report.txt
@@ -1,9 +1,9 @@
 -- Merging decision tree log ---
 manifest
-ADDED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:18:1-149:12
-INJECTED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:18:1-149:12
-INJECTED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:18:1-149:12
-INJECTED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:18:1-149:12
+ADDED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12
+INJECTED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12
+INJECTED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12
+INJECTED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12
 	package
 		ADDED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:19:5-31
 		INJECTED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml
@@ -61,8 +61,8 @@ ADDED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManife
 	android:name
 		ADDED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:33:22-78
 application
-ADDED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:35:5-148:19
-INJECTED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:35:5-148:19
+ADDED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:35:5-149:19
+INJECTED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:35:5-149:19
 	android:extractNativeLibs
 		INJECTED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml
 	android:label
@@ -212,14 +212,14 @@ ADDED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManife
 	android:name
 		ADDED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:134:13-71
 service#net.micode.notes.gtask.remote.GTaskSyncService
-ADDED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:140:9-143:19
+ADDED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:141:9-144:19
 	android:exported
-		ADDED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:142:13-37
+		ADDED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:143:13-37
 	android:name
-		ADDED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:141:13-74
+		ADDED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:142:13-74
 meta-data#android.app.default_searchable
-ADDED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:145:9-147:52
+ADDED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:146:9-148:52
 	android:value
-		ADDED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:147:13-49
+		ADDED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:148:13-49
 	android:name
-		ADDED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:146:13-58
+		ADDED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:147:13-58
diff --git a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/AlarmAlertActivity.class.uniqueId40 b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/AlarmAlertActivity.class.uniqueId40
new file mode 100644
index 0000000..98353eb
Binary files /dev/null and b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/AlarmAlertActivity.class.uniqueId40 differ
diff --git a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/BackupUtils$TextExport.class.uniqueId15 b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/BackupUtils$TextExport.class.uniqueId15
new file mode 100644
index 0000000..63e7f9c
Binary files /dev/null and b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/BackupUtils$TextExport.class.uniqueId15 differ
diff --git a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/BackupUtils.class.uniqueId35 b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/BackupUtils.class.uniqueId35
new file mode 100644
index 0000000..6a86737
Binary files /dev/null and b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/BackupUtils.class.uniqueId35 differ
diff --git a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker$1.class.uniqueId33 b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker$1.class.uniqueId33
new file mode 100644
index 0000000..029286f
Binary files /dev/null and b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker$1.class.uniqueId33 differ
diff --git a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker$2.class.uniqueId48 b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker$2.class.uniqueId48
new file mode 100644
index 0000000..e65c35c
Binary files /dev/null and b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker$2.class.uniqueId48 differ
diff --git a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker$3.class.uniqueId37 b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker$3.class.uniqueId37
new file mode 100644
index 0000000..de51bad
Binary files /dev/null and b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker$3.class.uniqueId37 differ
diff --git a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker$4.class.uniqueId34 b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker$4.class.uniqueId34
new file mode 100644
index 0000000..d04cbe7
Binary files /dev/null and b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker$4.class.uniqueId34 differ
diff --git a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker$OnDateTimeChangedListener.class.uniqueId56 b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker$OnDateTimeChangedListener.class.uniqueId56
new file mode 100644
index 0000000..255a4e6
Binary files /dev/null and b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker$OnDateTimeChangedListener.class.uniqueId56 differ
diff --git a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker.class.uniqueId29 b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker.class.uniqueId29
new file mode 100644
index 0000000..400d289
Binary files /dev/null and b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker.class.uniqueId29 differ
diff --git a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePickerDialog$1.class.uniqueId3 b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePickerDialog$1.class.uniqueId3
new file mode 100644
index 0000000..415e755
Binary files /dev/null and b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePickerDialog$1.class.uniqueId3 differ
diff --git a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePickerDialog$OnDateTimeSetListener.class.uniqueId28 b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePickerDialog$OnDateTimeSetListener.class.uniqueId28
new file mode 100644
index 0000000..70481dd
Binary files /dev/null and b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePickerDialog$OnDateTimeSetListener.class.uniqueId28 differ
diff --git a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePickerDialog.class.uniqueId5 b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePickerDialog.class.uniqueId5
new file mode 100644
index 0000000..71e5215
Binary files /dev/null and b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePickerDialog.class.uniqueId5 differ
diff --git a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/FoldersListAdapter$FolderListItem.class.uniqueId53 b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/FoldersListAdapter$FolderListItem.class.uniqueId53
new file mode 100644
index 0000000..fad3442
Binary files /dev/null and b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/FoldersListAdapter$FolderListItem.class.uniqueId53 differ
diff --git a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/FoldersListAdapter.class.uniqueId42 b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/FoldersListAdapter.class.uniqueId42
new file mode 100644
index 0000000..023f716
Binary files /dev/null and b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/FoldersListAdapter.class.uniqueId42 differ
diff --git a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask$1.class.uniqueId27 b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask$1.class.uniqueId27
new file mode 100644
index 0000000..2e8331f
Binary files /dev/null and b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask$1.class.uniqueId27 differ
diff --git a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask.class.uniqueId25 b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask.class.uniqueId25
new file mode 100644
index 0000000..1c49cbf
Binary files /dev/null and b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask.class.uniqueId25 differ
diff --git a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskManager.class.uniqueId57 b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskManager.class.uniqueId57
new file mode 100644
index 0000000..ac1834c
Binary files /dev/null and b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskManager.class.uniqueId57 differ
diff --git a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$1.class.uniqueId21 b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$1.class.uniqueId21
new file mode 100644
index 0000000..5416cd3
Binary files /dev/null and b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$1.class.uniqueId21 differ
diff --git a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$3.class.uniqueId50 b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$3.class.uniqueId50
new file mode 100644
index 0000000..961f2f4
Binary files /dev/null and b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$3.class.uniqueId50 differ
diff --git a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$HeadViewHolder.class.uniqueId59 b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$HeadViewHolder.class.uniqueId59
new file mode 100644
index 0000000..8e1f0bf
Binary files /dev/null and b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$HeadViewHolder.class.uniqueId59 differ
diff --git a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity.class.uniqueId22 b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity.class.uniqueId22
new file mode 100644
index 0000000..7d0a456
Binary files /dev/null and b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity.class.uniqueId22 differ
diff --git a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditText$1.class.uniqueId30 b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditText$1.class.uniqueId30
new file mode 100644
index 0000000..2040186
Binary files /dev/null and b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditText$1.class.uniqueId30 differ
diff --git a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditText$OnTextViewChangeListener.class.uniqueId19 b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditText$OnTextViewChangeListener.class.uniqueId19
new file mode 100644
index 0000000..9874f47
Binary files /dev/null and b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditText$OnTextViewChangeListener.class.uniqueId19 differ
diff --git a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditText.class.uniqueId12 b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditText.class.uniqueId12
new file mode 100644
index 0000000..3a19d3b
Binary files /dev/null and b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditText.class.uniqueId12 differ
diff --git a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteItemData.class.uniqueId32 b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteItemData.class.uniqueId32
new file mode 100644
index 0000000..771aa91
Binary files /dev/null and b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteItemData.class.uniqueId32 differ
diff --git a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteWidgetProvider.class.uniqueId44 b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteWidgetProvider.class.uniqueId44
new file mode 100644
index 0000000..a00281f
Binary files /dev/null and b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteWidgetProvider.class.uniqueId44 differ
diff --git a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$1.class.uniqueId41 b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$1.class.uniqueId41
new file mode 100644
index 0000000..1ceb678
Binary files /dev/null and b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$1.class.uniqueId41 differ
diff --git a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$11.class.uniqueId58 b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$11.class.uniqueId58
new file mode 100644
index 0000000..73ac480
Binary files /dev/null and b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$11.class.uniqueId58 differ
diff --git a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$12.class.uniqueId18 b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$12.class.uniqueId18
new file mode 100644
index 0000000..f797c39
Binary files /dev/null and b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$12.class.uniqueId18 differ
diff --git a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$2.class.uniqueId46 b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$2.class.uniqueId46
new file mode 100644
index 0000000..bc780d6
Binary files /dev/null and b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$2.class.uniqueId46 differ
diff --git a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$4.class.uniqueId20 b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$4.class.uniqueId20
new file mode 100644
index 0000000..46303ff
Binary files /dev/null and b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$4.class.uniqueId20 differ
diff --git a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$5.class.uniqueId43 b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$5.class.uniqueId43
new file mode 100644
index 0000000..757f94d
Binary files /dev/null and b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$5.class.uniqueId43 differ
diff --git a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$6.class.uniqueId55 b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$6.class.uniqueId55
new file mode 100644
index 0000000..f463311
Binary files /dev/null and b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$6.class.uniqueId55 differ
diff --git a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$7.class.uniqueId17 b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$7.class.uniqueId17
new file mode 100644
index 0000000..113ea13
Binary files /dev/null and b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$7.class.uniqueId17 differ
diff --git a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$8.class.uniqueId38 b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$8.class.uniqueId38
new file mode 100644
index 0000000..547fc9b
Binary files /dev/null and b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$8.class.uniqueId38 differ
diff --git a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$9.class.uniqueId54 b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$9.class.uniqueId54
new file mode 100644
index 0000000..7d84c0c
Binary files /dev/null and b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$9.class.uniqueId54 differ
diff --git a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ListEditState.class.uniqueId24 b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ListEditState.class.uniqueId24
new file mode 100644
index 0000000..2edab7b
Binary files /dev/null and b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ListEditState.class.uniqueId24 differ
diff --git a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$1.class.uniqueId6 b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$1.class.uniqueId6
new file mode 100644
index 0000000..e0b44ff
Binary files /dev/null and b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$1.class.uniqueId6 differ
diff --git a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$2.class.uniqueId51 b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$2.class.uniqueId51
new file mode 100644
index 0000000..5e68562
Binary files /dev/null and b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$2.class.uniqueId51 differ
diff --git a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$NewNoteOnTouchListener.class.uniqueId4 b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$NewNoteOnTouchListener.class.uniqueId4
new file mode 100644
index 0000000..1e7b9f0
Binary files /dev/null and b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$NewNoteOnTouchListener.class.uniqueId4 differ
diff --git a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$OnListItemClickListener.class.uniqueId49 b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$OnListItemClickListener.class.uniqueId49
new file mode 100644
index 0000000..5794890
Binary files /dev/null and b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$OnListItemClickListener.class.uniqueId49 differ
diff --git a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity.class.uniqueId10 b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity.class.uniqueId10
index d85cb2f..e3964b1 100644
Binary files a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity.class.uniqueId10 and b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity.class.uniqueId10 differ
diff --git a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListItem.class.uniqueId2 b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListItem.class.uniqueId2
new file mode 100644
index 0000000..4596834
Binary files /dev/null and b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListItem.class.uniqueId2 differ
diff --git a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$1.class.uniqueId45 b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$1.class.uniqueId45
new file mode 100644
index 0000000..362fa05
Binary files /dev/null and b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$1.class.uniqueId45 differ
diff --git a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$2.class.uniqueId31 b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$2.class.uniqueId31
new file mode 100644
index 0000000..8523228
Binary files /dev/null and b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$2.class.uniqueId31 differ
diff --git a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$4.class.uniqueId52 b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$4.class.uniqueId52
new file mode 100644
index 0000000..99c7a64
Binary files /dev/null and b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$4.class.uniqueId52 differ
diff --git a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$5.class.uniqueId36 b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$5.class.uniqueId36
new file mode 100644
index 0000000..17e4d3b
Binary files /dev/null and b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$5.class.uniqueId36 differ
diff --git a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$6.class.uniqueId47 b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$6.class.uniqueId47
new file mode 100644
index 0000000..7b80036
Binary files /dev/null and b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$6.class.uniqueId47 differ
diff --git a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$7.class.uniqueId7 b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$7.class.uniqueId7
new file mode 100644
index 0000000..d9abeb9
Binary files /dev/null and b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$7.class.uniqueId7 differ
diff --git a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$8.class.uniqueId23 b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$8.class.uniqueId23
new file mode 100644
index 0000000..39e534a
Binary files /dev/null and b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$8.class.uniqueId23 differ
diff --git a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$GTaskReceiver.class.uniqueId39 b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$GTaskReceiver.class.uniqueId39
new file mode 100644
index 0000000..eb938cf
Binary files /dev/null and b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$GTaskReceiver.class.uniqueId39 differ
diff --git a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity.class.uniqueId26 b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity.class.uniqueId26
new file mode 100644
index 0000000..0937be2
Binary files /dev/null and b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity.class.uniqueId26 differ
diff --git a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin
index 4fdc43d..935d555 100644
Binary files a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin and b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin differ
diff --git a/master/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/master/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
index 862883b..7a6182d 100644
--- a/master/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
+++ b/master/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
@@ -51,6 +51,8 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
+import android.speech.tts.TextToSpeech;
+import android.speech.tts.TextToSpeech.OnInitListener;
 
 import net.micode.notes.R;
 import net.micode.notes.data.Notes;
@@ -67,6 +69,7 @@ import net.micode.notes.widget.NoteWidgetProvider_4x;
 
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Locale;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -145,7 +148,6 @@ public class NoteEditActivity extends Activity implements OnClickListener,
     public static final String TAG_UNCHECKED = String.valueOf('\u25A1');
 
     private LinearLayout mEditTextList;
-
     private String mUserQuery;
     private Pattern mPattern;
 
@@ -362,8 +364,18 @@ public class NoteEditActivity extends Activity implements OnClickListener,
                 }
         return true;
     }
-
+    private TextToSpeech mTTS;
     private void initResources() {
+        mTTS = new TextToSpeech(this, new OnInitListener() {
+            @Override
+            public void onInit(int status) {
+                if(status==TextToSpeech.SUCCESS){
+                    mTTS.setLanguage(Locale.US);
+                    mTTS.setPitch(1.5f);
+                    mTTS.setSpeechRate(0.5f);
+                }
+            }
+        });
         mHeadViewPanel = findViewById(R.id.note_title);
         mNoteHeaderHolder = new HeadViewHolder();
         mNoteHeaderHolder.tvModified = (TextView) findViewById(R.id.tv_modified_date);
@@ -429,8 +441,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         int id = v.getId();
         if (id == R.id.btn_set_bg_color) {
             mNoteBgColorSelector.setVisibility(View.VISIBLE);
-            findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(
-                    -                    View.VISIBLE);
+            findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(View.VISIBLE);
         } else if (sBgSelectorBtnsMap.containsKey(id)) {
             findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(
                     View.GONE);
@@ -452,6 +463,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         }
     }
 
+
     @Override
     public void onBackPressed() {
         if(clearSettingState()) {
@@ -505,6 +517,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         return true;
     }
 
+
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         int itemId = item.getItemId();
@@ -539,6 +552,9 @@ public class NoteEditActivity extends Activity implements OnClickListener,
             setReminder();
         } else if (itemId == R.id.menu_delete_remind) {
             mWorkingNote.setAlertDate(0, false);
+        }else if(itemId==R.id.menu_voice_read){
+            Log.d("voice mix","in");
+            texttoSpeech();
         }
         return true;
     }
@@ -552,6 +568,9 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         });
         d.show();
     }
+    private void texttoSpeech(){
+        mTTS.speak(mNoteEditor.getText().toString(),TextToSpeech.QUEUE_FLUSH,null,null);
+    }
 
     /**
      * Share note to apps that support {@link Intent#ACTION_SEND} action
diff --git a/master/Notes-master1/app/src/main/res/menu/note_edit.xml b/master/Notes-master1/app/src/main/res/menu/note_edit.xml
index 35cacd1..654a6ff 100644
--- a/master/Notes-master1/app/src/main/res/menu/note_edit.xml
+++ b/master/Notes-master1/app/src/main/res/menu/note_edit.xml
@@ -49,4 +49,7 @@
     <item
         android:id="@+id/menu_delete_remind"
         android:title="@string/menu_remove_remind" />
+    <item
+        android:id="@+id/menu_voice_read"
+        android:title="voice_read"/>
 </menu>
\ No newline at end of file
diff --git a/master/Notes-master1/app/src/main/res/values/strings.xml b/master/Notes-master1/app/src/main/res/values/strings.xml
index c54b8ad..e21cac2 100644
--- a/master/Notes-master1/app/src/main/res/values/strings.xml
+++ b/master/Notes-master1/app/src/main/res/values/strings.xml
@@ -77,6 +77,7 @@
     <string name="format_move_notes_to_folder">Have moved selected %1$d notes to %2$s folder</string>
     <string name="menu_secret">secret model</string>
     <string name="menu_quit_secret">quit secret model</string>
+    <string name="menu_voice_read">voice_read</string>
     <!-- Error information -->
     <string name="error_sdcard_unmounted">SD card busy, not available now</string>
     <string name="error_sdcard_export">Export failed, please check SD card</string>
diff --git a/src/Notes-master/src/net/micode/notes/data/Contact.java b/src/Notes-master/src/net/micode/notes/data/Contact.java
index fe5b5ab..a71e6db 100644
--- a/src/Notes-master/src/net/micode/notes/data/Contact.java
+++ b/src/Notes-master/src/net/micode/notes/data/Contact.java
@@ -26,31 +26,11 @@ import android.provider.ContactsContract.Data;
 import android.telephony.PhoneNumberUtils;
 //引用android.telephony.PhoneNumberUtils
 import android.util.Log;//引用android.util.Log
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
- 
-import java.util.HashMap;//引用java.util.HashMap
-
-//联系人
-public class Contact { 
-=======
-=======
->>>>>>> 曾晨曦_branch
-=======
->>>>>>> 曾晨曦_branch
 
 import java.util.HashMap;//引用java.util.HashMap
 
 //联系人
 public class Contact {
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> 曾晨曦_branch
-=======
->>>>>>> 曾晨曦_branch
-=======
->>>>>>> 曾晨曦_branch
     private static HashMap<String, String> sContactCache;
     private static final String TAG = "Contact";
 
@@ -89,41 +69,15 @@ public class Contact {
         // 判定查询结果
         // moveToFirst()返回第一条
         if (cursor != null && cursor.moveToFirst()) {
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-		  try {
-=======
             // 找到相关信息
             try {
->>>>>>> 曾晨曦_branch
-=======
-            // 找到相关信息
-            try {
->>>>>>> 曾晨曦_branch
-=======
-            // 找到相关信息
-            try {
->>>>>>> 曾晨曦_branch
                 String name = cursor.getString(0);
                 sContactCache.put(phoneNumber, name);
                 return name;
                 // 异常处理
             } catch (IndexOutOfBoundsException e) {
                 Log.e(TAG, " Cursor get string error " + e.toString());
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-		//输出相关string error错误信息
-=======
-                //输出相关string error错误信息
->>>>>>> 曾晨曦_branch
-=======
-                //输出相关string error错误信息
->>>>>>> 曾晨曦_branch
-=======
                 //输出相关string error错误信息
->>>>>>> 曾晨曦_branch
                 return null;
             } finally {
                 cursor.close();
@@ -131,19 +85,7 @@ public class Contact {
             // 未找到相关信息处理
         } else {
             Log.d(TAG, "No contact matched with number:" + phoneNumber);
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-		//输出No contact matched错误信息
-=======
-            //输出No contact matched错误信息
->>>>>>> 曾晨曦_branch
-=======
-            //输出No contact matched错误信息
->>>>>>> 曾晨曦_branch
-=======
             //输出No contact matched错误信息
->>>>>>> 曾晨曦_branch
             return null;
         }
     }
diff --git a/src/Notes-master/src/net/micode/notes/data/Notes.java b/src/Notes-master/src/net/micode/notes/data/Notes.java
index 0868db2..f33623a 100644
--- a/src/Notes-master/src/net/micode/notes/data/Notes.java
+++ b/src/Notes-master/src/net/micode/notes/data/Notes.java
@@ -15,36 +15,12 @@
  */
 
 package net.micode.notes.data;//此类在文件中的位置
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
- 
-=======
 
->>>>>>> 曾晨曦_branch
-=======
-
->>>>>>> 曾晨曦_branch
-=======
-
->>>>>>> 曾晨曦_branch
 import android.content.ContentUris;//引用android.content.ContentUris
 import android.net.Uri;//引用android.net.Uri
 // Notes 类中定义了很多常量，这些常量大多是int型和string型
 public class Notes {
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-   //定义两个常量
-=======
-    //定义两个常量
->>>>>>> 曾晨曦_branch
-=======
-    //定义两个常量
->>>>>>> 曾晨曦_branch
-=======
     //定义两个常量
->>>>>>> 曾晨曦_branch
     public static final String AUTHORITY = "micode_notes";
     public static final String TAG = "Notes";
 
@@ -63,35 +39,6 @@ public class Notes {
     public static final int ID_TEMPARAY_FOLDER = -1;
     public static final int ID_CALL_RECORD_FOLDER = -2;
     public static final int ID_TRASH_FOLER = -3;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
- 
-    public static final String INTENT_EXTRA_ALERT_DATE = 
- //定义net.micode.notes.alert_date的常量
-"net.micode.notes.alert_date";
-    public static final String INTENT_EXTRA_BACKGROUND_ID = 
- //定义net.micode.notes.background_color_id的常量
-"net.micode.notes.background_color_id";
-    public static final String INTENT_EXTRA_WIDGET_ID = 
- //定义net.micode.notes.widget_id的常量
-"net.micode.notes.widget_id";
-    public static final String INTENT_EXTRA_WIDGET_TYPE = 
- //定义net.micode.notes.widget_type的常量
-"net.micode.notes.widget_type";
-    public static final String INTENT_EXTRA_FOLDER_ID = 
- //定义net.micode.notes.folder_id的常量
-"net.micode.notes.folder_id";
-    public static final String INTENT_EXTRA_CALL_DATE = 
- //定义net.micode.notes.call_date的常量
-"net.micode.notes.call_date";
- 
-//定义使用widget挂件的常量
-=======
-=======
->>>>>>> 曾晨曦_branch
-=======
->>>>>>> 曾晨曦_branch
 
     public static final String INTENT_EXTRA_ALERT_DATE =
             //定义net.micode.notes.alert_date的常量
@@ -113,13 +60,6 @@ public class Notes {
             "net.micode.notes.call_date";
 
     //定义使用widget挂件的常量
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> 曾晨曦_branch
-=======
->>>>>>> 曾晨曦_branch
-=======
->>>>>>> 曾晨曦_branch
     public static final int TYPE_WIDGET_INVALIDE      = -1;
     public static final int TYPE_WIDGET_2X            = 0;
     public static final int TYPE_WIDGET_4X            = 1;
@@ -132,31 +72,11 @@ public class Notes {
     /**
      * 用于查询所有便笺和文件夹的 URI
      */
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-    public static final Uri CONTENT_NOTE_URI = Uri.parse("content://" + 
- 
-AUTHORITY + "/note");//定义查询便签和文件夹的指针。
-     public static final Uri my_URI = ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI , 10);
-   
-=======
-=======
->>>>>>> 曾晨曦_branch
-=======
->>>>>>> 曾晨曦_branch
     public static final Uri CONTENT_NOTE_URI = Uri.parse("content://" +
 
             AUTHORITY + "/note");//定义查询便签和文件夹的指针。
     public static final Uri my_URI = ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI , 10);
 
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> 曾晨曦_branch
-=======
->>>>>>> 曾晨曦_branch
-=======
->>>>>>> 曾晨曦_branch
     /**
      * 用于查询数据的 URI
      */
diff --git a/src/Notes-master/src/net/micode/notes/data/NotesDatabaseHelper.java b/src/Notes-master/src/net/micode/notes/data/NotesDatabaseHelper.java
index 8fcb088..0acc5c9 100644
--- a/src/Notes-master/src/net/micode/notes/data/NotesDatabaseHelper.java
+++ b/src/Notes-master/src/net/micode/notes/data/NotesDatabaseHelper.java
@@ -205,19 +205,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
         "  UPDATE " + TABLE.NOTE +
         "   SET " + NoteColumns.PARENT_ID + "=" + Notes.ID_TRASH_FOLER +
         "  WHERE " + NoteColumns.PARENT_ID + "=old." + NoteColumns.ID + ";" +
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-        " END";。
-=======
         " END";
->>>>>>> 曾晨曦_branch
-=======
-        " END";
->>>>>>> 曾晨曦_branch
-=======
-        " END";
->>>>>>> 曾晨曦_branch
  
     public NotesDatabaseHelper(Context context) {
         super(context, DB_NAME, null, DB_VERSION);
diff --git a/src/Notes-master/src/net/micode/notes/ui/.idea/misc.xml b/src/Notes-master/src/net/micode/notes/ui/.idea/misc.xml
deleted file mode 100644
index 639900d..0000000
--- a/src/Notes-master/src/net/micode/notes/ui/.idea/misc.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/Notes-master/src/net/micode/notes/ui/.idea/modules.xml b/src/Notes-master/src/net/micode/notes/ui/.idea/modules.xml
deleted file mode 100644
index f16767d..0000000
--- a/src/Notes-master/src/net/micode/notes/ui/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/ui.iml" filepath="$PROJECT_DIR$/ui.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/Notes-master/src/net/micode/notes/ui/AlarmAlertActivity.java b/src/Notes-master/src/net/micode/notes/ui/AlarmAlertActivity.java
index 09b0778..b8620c2 100644
--- a/src/Notes-master/src/net/micode/notes/ui/AlarmAlertActivity.java
+++ b/src/Notes-master/src/net/micode/notes/ui/AlarmAlertActivity.java
@@ -104,7 +104,8 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD
     
     //功能：闹钟提示音激发
     private void playAlarmSound() {
-        Uri url = RingtoneManager.getActualDefaultRingtoneUri(this, RingtoneManager.TYPE_ALARM);//调用系统的铃声管理URI，得到闹钟提示音
+        Uri url = RingtoneManager.getActualDefaultRingtoneUri(this, RingtoneManager.TYPE_ALARM);
+        //调用系统的铃声管理URI，得到闹钟提示音
         int silentModeStreams = Settings.System.getInt(getContentResolver(),
                 Settings.System.MODE_RINGER_STREAMS_AFFECTED, 0);
  
@@ -126,7 +127,7 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD
         } catch (IllegalStateException e) {
             e.printStackTrace();
         } catch (IOException e) {
-            e.printStackTrace();//e.printStackTrace()方法打印出异常，并且输出在哪里出现的异常
+            e.printStackTrace();//e.printStackTrace()，这个方法打印出异常，并且输出在哪里出现的异常
         }
     }
  
@@ -134,7 +135,6 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD
         AlertDialog.Builder dialog = new AlertDialog.Builder(this);
         //AlertDialog的构造方法全部是Protected的，所以不能直接通过new一个AlertDialog来创建出一个AlertDialog
         //要创建一个AlertDialog，就要用到AlertDialog.Builder中的create()方法，如这里的dialog就是新建了一个AlertDialog
-        
         dialog.setTitle(R.string.app_name);//为对话框设置标题
         dialog.setMessage(mSnippet); //为对话框设置内容
         dialog.setPositiveButton(R.string.notealert_ok, this);//给对话框添加"Yes"按钮
diff --git a/src/Notes-master/src/net/micode/notes/ui/AlarmInitReceiver.java b/src/Notes-master/src/net/micode/notes/ui/AlarmInitReceiver.java
index c7d8111..fd8eb62 100644
--- a/src/Notes-master/src/net/micode/notes/ui/AlarmInitReceiver.java
+++ b/src/Notes-master/src/net/micode/notes/ui/AlarmInitReceiver.java
@@ -67,8 +67,8 @@ public class AlarmInitReceiver extends BroadcastReceiver {
                 } while (c.moveToNext());
             }
             c.close();
-        }        
-		//通过查找资料发现，对于闹钟机制的启动，通常需要上面的几个步骤        
-		//如新建Intent、PendingIntent以及AlarmManager等
+        }
+        //通过查找资料发现，对于闹钟机制的启动，通常需要上面的几个步骤
+        //如新建Intent、PendingIntent以及AlarmManager等
     }
 }
\ No newline at end of file
diff --git a/src/Notes-master/src/net/micode/notes/ui/DateTimePicker.java b/src/Notes-master/src/net/micode/notes/ui/DateTimePicker.java
index 309ebf1..400a6b5 100644
--- a/src/Notes-master/src/net/micode/notes/ui/DateTimePicker.java
+++ b/src/Notes-master/src/net/micode/notes/ui/DateTimePicker.java
@@ -29,20 +29,20 @@ import android.widget.NumberPicker;
 //DateTimePicker功能：选择日期和时间的界面元素，FrameLayout是布局模板之一，所有的子元素全部在屏幕的右上方
 public class DateTimePicker extends FrameLayout {
     //初始化控件
-    private static final boolean DEFAULT_ENABLE_STATE = true;// 默认启用状态
-    private static final int HOURS_IN_HALF_DAY = 12;// 一半天的小时数
-    private static final int HOURS_IN_ALL_DAY = 24;// 一整天的小时数
-    private static final int DAYS_IN_ALL_WEEK = 7;// 一周的天数
-    private static final int DATE_SPINNER_MIN_VAL = 0;// 日期选择器的最小值
-    private static final int DATE_SPINNER_MAX_VAL = DAYS_IN_ALL_WEEK - 1;// 日期选择器的最大值
-    private static final int HOUR_SPINNER_MIN_VAL_24_HOUR_VIEW = 0;// 24小时制下小时选择器的最小值
-    private static final int HOUR_SPINNER_MAX_VAL_24_HOUR_VIEW = 23;// 24小时制下小时选择器的最大值
-    private static final int HOUR_SPINNER_MIN_VAL_12_HOUR_VIEW = 1;// 12小时制下小时选择器的最小值
-    private static final int HOUR_SPINNER_MAX_VAL_12_HOUR_VIEW = 12;// 12小时制下小时选择器的最大值
-    private static final int MINUT_SPINNER_MIN_VAL = 0;// 分钟选择器的最小值
-    private static final int MINUT_SPINNER_MAX_VAL = 59;// 分钟选择器的最大值
-    private static final int AMPM_SPINNER_MIN_VAL = 0;// 上午下午选择器的最小值
-    private static final int AMPM_SPINNER_MAX_VAL = 1;// 上午下午选择器的最大值
+    private static final boolean DEFAULT_ENABLE_STATE = true;
+    private static final int HOURS_IN_HALF_DAY = 12;
+    private static final int HOURS_IN_ALL_DAY = 24;
+    private static final int DAYS_IN_ALL_WEEK = 7;
+    private static final int DATE_SPINNER_MIN_VAL = 0;
+    private static final int DATE_SPINNER_MAX_VAL = DAYS_IN_ALL_WEEK - 1;
+    private static final int HOUR_SPINNER_MIN_VAL_24_HOUR_VIEW = 0;
+    private static final int HOUR_SPINNER_MAX_VAL_24_HOUR_VIEW = 23;
+    private static final int HOUR_SPINNER_MIN_VAL_12_HOUR_VIEW = 1;
+    private static final int HOUR_SPINNER_MAX_VAL_12_HOUR_VIEW = 12;
+    private static final int MINUT_SPINNER_MIN_VAL = 0;
+    private static final int MINUT_SPINNER_MAX_VAL = 59;
+    private static final int AMPM_SPINNER_MIN_VAL = 0;
+    private static final int AMPM_SPINNER_MAX_VAL = 1;
 
     //NumberPicker是数字选择器
     //这里定义的四个变量全部是在设置闹钟时需要选择的变量（如日期、时、分、上午或者下午）
@@ -117,9 +117,9 @@ public class DateTimePicker extends FrameLayout {
             
             onDateTimeChanged();
             if (isDateChanged) {
-                setCurrentYear(cal.get(Calendar.YEAR));//设置当前年
-                setCurrentMonth(cal.get(Calendar.MONTH));//设置当前月
-                setCurrentDay(cal.get(Calendar.DAY_OF_MONTH));//设置当前日
+                setCurrentYear(cal.get(Calendar.YEAR));
+                setCurrentMonth(cal.get(Calendar.MONTH));
+                setCurrentDay(cal.get(Calendar.DAY_OF_MONTH));
             }
         }
     };
@@ -216,20 +216,20 @@ public class DateTimePicker extends FrameLayout {
         
         //获取hour和minute
         mHourSpinner = (NumberPicker) findViewById(R.id.hour);
-        mHourSpinner.setOnValueChangedListener(mOnHourChangedListener);// 设置小时选择器的值变化监听器
+        mHourSpinner.setOnValueChangedListener(mOnHourChangedListener);
         mMinuteSpinner = (NumberPicker) findViewById(R.id.minute);
-        mMinuteSpinner.setMinValue(MINUT_SPINNER_MIN_VAL);//设置分钟选择器的最小值为MINUT_SPINNER_MIN_VAL
-        mMinuteSpinner.setMaxValue(MINUT_SPINNER_MAX_VAL);//设置分钟选择器的最大值为MINUT_SPINNER_MAX_VAL
-        mMinuteSpinner.setOnLongPressUpdateInterval(100);// 设置长按按钮时数值的更新间隔为100毫秒
-        mMinuteSpinner.setOnValueChangedListener(mOnMinuteChangedListener);// 设置分钟选择器的值变化监听器
+        mMinuteSpinner.setMinValue(MINUT_SPINNER_MIN_VAL);  
+        mMinuteSpinner.setMaxValue(MINUT_SPINNER_MAX_VAL);
+        mMinuteSpinner.setOnLongPressUpdateInterval(100);
+        mMinuteSpinner.setOnValueChangedListener(mOnMinuteChangedListener);
         
         //获取am和pm
-        String[] stringsForAmPm = new DateFormatSymbols().getAmPmStrings();// 获取上午和下午的字符串数组
-        mAmPmSpinner = (NumberPicker) findViewById(R.id.amPm);// 获取上午下午选择器的引用
-        mAmPmSpinner.setMinValue(AMPM_SPINNER_MIN_VAL);//设置上午下午选择器的最小值
-        mAmPmSpinner.setMaxValue(AMPM_SPINNER_MAX_VAL);//设置上午下午选择器的最大值
-        mAmPmSpinner.setDisplayedValues(stringsForAmPm);// 设置上午下午选择器的显示值为获取到的上午和下午字符串数组
-        mAmPmSpinner.setOnValueChangedListener(mOnAmPmChangedListener);// 设置上午下午选择器的值变化监听器
+        String[] stringsForAmPm = new DateFormatSymbols().getAmPmStrings();
+        mAmPmSpinner = (NumberPicker) findViewById(R.id.amPm);
+        mAmPmSpinner.setMinValue(AMPM_SPINNER_MIN_VAL);
+        mAmPmSpinner.setMaxValue(AMPM_SPINNER_MAX_VAL);
+        mAmPmSpinner.setDisplayedValues(stringsForAmPm);
+        mAmPmSpinner.setOnValueChangedListener(mOnAmPmChangedListener);
  
         // 将控件更新为初始状态
         updateDateControl();
diff --git a/src/Notes-master/src/net/micode/notes/ui/NotesListItem.java b/src/Notes-master/src/net/micode/notes/ui/NotesListItem.java
index 8ac03c9..1a1fdb0 100644
--- a/src/Notes-master/src/net/micode/notes/ui/NotesListItem.java
+++ b/src/Notes-master/src/net/micode/notes/ui/NotesListItem.java
@@ -104,33 +104,12 @@ public class NotesListItem extends LinearLayout {
             mTitle.setText(DataUtils.getFormattedSnippet(data.getSnippet()));
             // 如果数据有提醒，则显示提醒图标，否则隐藏
             if (data.hasAlert()) {
-                mAlert.setImageResource(R.drawable.clock);//图片来源的设置
+                mAlert.setImageResource(R.drawable.clock);
                 mAlert.setVisibility(View.VISIBLE);
             } else {
                 mAlert.setVisibility(View.GONE);
             }
-        } else {
-            mCallName.setVisibility(View.GONE);
-            mTitle.setTextAppearance(context, R.style.TextAppearancePrimaryItem);
-            if (data.getType() == Notes.TYPE_FOLDER) {
-                mTitle.setText(data.getSnippet()
-                        + context.getString(R.string.format_folder_files_count,
-                                data.getNotesCount()));
-                mAlert.setVisibility(View.GONE);
-            } else {
-                mTitle.setText(DataUtils.getFormattedSnippet(data.getSnippet()));
-                if (data.hasAlert()) {
-                    mAlert.setImageResource(R.drawable.clock);
-                    mAlert.setVisibility(View.VISIBLE);
-                } else {
-                    mAlert.setVisibility(View.GONE);
-                }
-            }
         }
-        
-        mTime. setText(DateUtils.getRelativeTimeSpanString(data.getModifiedDate()));//获取相关时间，从data里编辑的日期中获取
-       
-        setBackground(data);
     }
     mTime.setText(DateUtils.getRelativeTimeSpanString(data.getModifiedDate()));// 设置时间文本为相对时间跨度字符串，从数据的修改日期中获取
     setBackground(data);// 设置背景
diff --git a/src/Notes-master/src/net/micode/notes/ui/NotesPreferenceActivity.java b/src/Notes-master/src/net/micode/notes/ui/NotesPreferenceActivity.java
index bbd0a5e..91ddc9d 100644
--- a/src/Notes-master/src/net/micode/notes/ui/NotesPreferenceActivity.java
+++ b/src/Notes-master/src/net/micode/notes/ui/NotesPreferenceActivity.java
@@ -240,9 +240,9 @@ public class NotesPreferenceActivity extends PreferenceActivity {
      * 功能：显示账户选择的对话框并进行账户的设置
      */
     private void showSelectAccountAlertDialog() {
-        AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this); //创建一个新的对话框
-       
-        //设置标题以及子标题的内容
+        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_select_account_title)); // 设置标题文本
@@ -279,7 +279,6 @@ public class NotesPreferenceActivity extends PreferenceActivity {
                             dialog.dismiss(); // 关闭对话框
                             refreshUI(); // 刷新界面
                         }
-                        
                     });
         }
     
@@ -303,7 +302,6 @@ public class NotesPreferenceActivity extends PreferenceActivity {
                 dialog.dismiss(); // 关闭对话框
             }
         });
-
     }
  
     /*
diff --git a/src/Notes-master/src/net/micode/notes/ui/ui.iml b/src/Notes-master/src/net/micode/notes/ui/ui.iml
deleted file mode 100644
index 20b42f5..0000000
--- a/src/Notes-master/src/net/micode/notes/ui/ui.iml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" packagePrefix="net.micode.notes.ui" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-  <component name="SonarLintModuleSettings">
-    <option name="uniqueId" value="45fcb6d8-9284-402d-a006-e950b807a38c" />
-  </component>
-</module>
\ No newline at end of file