diff --git a/src/Notes-master1/.gradle/7.3.3/executionHistory/executionHistory.bin b/src/Notes-master1/.gradle/7.3.3/executionHistory/executionHistory.bin
index 1e166f8..49c5a24 100644
Binary files a/src/Notes-master1/.gradle/7.3.3/executionHistory/executionHistory.bin and b/src/Notes-master1/.gradle/7.3.3/executionHistory/executionHistory.bin differ
diff --git a/src/Notes-master1/.gradle/7.3.3/executionHistory/executionHistory.lock b/src/Notes-master1/.gradle/7.3.3/executionHistory/executionHistory.lock
index 0cd08e8..f970cf5 100644
Binary files a/src/Notes-master1/.gradle/7.3.3/executionHistory/executionHistory.lock and b/src/Notes-master1/.gradle/7.3.3/executionHistory/executionHistory.lock differ
diff --git a/src/Notes-master1/.gradle/7.3.3/fileHashes/fileHashes.bin b/src/Notes-master1/.gradle/7.3.3/fileHashes/fileHashes.bin
index f6db7b2..7841b99 100644
Binary files a/src/Notes-master1/.gradle/7.3.3/fileHashes/fileHashes.bin and b/src/Notes-master1/.gradle/7.3.3/fileHashes/fileHashes.bin differ
diff --git a/src/Notes-master1/.gradle/7.3.3/fileHashes/fileHashes.lock b/src/Notes-master1/.gradle/7.3.3/fileHashes/fileHashes.lock
index 4eeecce..bb0f8c5 100644
Binary files a/src/Notes-master1/.gradle/7.3.3/fileHashes/fileHashes.lock and b/src/Notes-master1/.gradle/7.3.3/fileHashes/fileHashes.lock differ
diff --git a/src/Notes-master1/.gradle/7.3.3/fileHashes/resourceHashesCache.bin b/src/Notes-master1/.gradle/7.3.3/fileHashes/resourceHashesCache.bin
index 97e43bd..f35f108 100644
Binary files a/src/Notes-master1/.gradle/7.3.3/fileHashes/resourceHashesCache.bin and b/src/Notes-master1/.gradle/7.3.3/fileHashes/resourceHashesCache.bin differ
diff --git a/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 95efb97..fbfd48f 100644
Binary files a/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/src/Notes-master1/.gradle/file-system.probe b/src/Notes-master1/.gradle/file-system.probe
index 9d08dd7..29bff0e 100644
Binary files a/src/Notes-master1/.gradle/file-system.probe and b/src/Notes-master1/.gradle/file-system.probe differ
diff --git a/src/Notes-master1/.idea/misc.xml b/src/Notes-master1/.idea/misc.xml
index 66c5228..442a24e 100644
--- a/src/Notes-master1/.idea/misc.xml
+++ b/src/Notes-master1/.idea/misc.xml
@@ -4,17 +4,24 @@
     <option name="filePathToZoomLevelMap">
       <map>
         <entry key="..\:/Android_new/Notes-master1/app/src/main/res/drawable/new_note.xml" value="0.1525" />
-        <entry key="..\:/Android_new/Notes-master1/app/src/main/res/layout-sw600dp/note_edit.xml" value="0.264" />
+        <entry key="..\:/Android_new/Notes-master1/app/src/main/res/layout-sw600dp/note_edit.xml" value="0.176" />
         <entry key="..\:/Android_new/Notes-master1/app/src/main/res/layout/account_dialog_title.xml" value="0.1" />
         <entry key="..\:/Android_new/Notes-master1/app/src/main/res/layout/add_account_text.xml" value="0.1" />
+        <entry key="..\:/Android_new/Notes-master1/app/src/main/res/layout/folder_list_item.xml" value="0.109375" />
         <entry key="..\:/Android_new/Notes-master1/app/src/main/res/layout/note_edit.xml" value="0.152" />
         <entry key="..\:/Android_new/Notes-master1/app/src/main/res/layout/note_edit_list_item.xml" value="0.14270833333333333" />
-        <entry key="..\:/Android_new/Notes-master1/app/src/main/res/layout/note_item.xml" value="0.1" />
-        <entry key="..\:/Android_new/Notes-master1/app/src/main/res/layout/note_list.xml" value="0.1" />
-        <entry key="..\:/Android_new/Notes-master1/app/src/main/res/menu/call_note_edit.xml" value="0.1" />
+        <entry key="..\:/Android_new/Notes-master1/app/src/main/res/layout/note_item.xml" value="0.2" />
+        <entry key="..\:/Android_new/Notes-master1/app/src/main/res/layout/note_list.xml" value="0.2" />
+        <entry key="..\:/Android_new/Notes-master1/app/src/main/res/layout/note_list_dropdown_menu.xml" value="0.109375" />
+        <entry key="..\:/Android_new/Notes-master1/app/src/main/res/layout/note_list_footer.xml" value="0.109375" />
+        <entry key="..\:/Android_new/Notes-master1/app/src/main/res/layout/settings_header.xml" value="0.1816123188405797" />
+        <entry key="..\:/Android_new/Notes-master1/app/src/main/res/menu/call_note_edit.xml" value="0.264" />
         <entry key="..\:/Android_new/Notes-master1/app/src/main/res/menu/call_record_folder.xml" value="0.109375" />
-        <entry key="..\:/Android_new/Notes-master1/app/src/main/res/menu/note_edit.xml" value="0.10833333333333334" />
-        <entry key="..\:/Android_new/Notes-master1/app/src/main/res/menu/note_list.xml" value="0.14270833333333333" />
+        <entry key="..\:/Android_new/Notes-master1/app/src/main/res/menu/note_edit.xml" value="0.264" />
+        <entry key="..\:/Android_new/Notes-master1/app/src/main/res/menu/note_list.xml" value="0.264" />
+        <entry key="..\:/Android_new/Notes-master1/app/src/main/res/menu/note_list_dropdown.xml" value="0.1" />
+        <entry key="..\:/Android_new/Notes-master1/app/src/main/res/menu/note_list_options.xml" value="0.1" />
+        <entry key="..\:/Android_new/Notes-master1/app/src/main/res/menu/sub_folder.xml" value="0.1" />
         <entry key="..\:/Android_new/Notes-master1/app/src/main/res/xml/preferences.xml" value="0.109375" />
       </map>
     </option>
diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32 b/src/Notes-master1/.idea/sonarlint/issuestore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32
index c6d4eb1..c7ec64b 100644
--- a/src/Notes-master1/.idea/sonarlint/issuestore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32
+++ b/src/Notes-master1/.idea/sonarlint/issuestore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32
@@ -1,96 +1,102 @@
 
 p
-java:S2293�"YReplace the type specification in this constructor call with the diamond operator ("<>").(艥�
+java:S2293�"YReplace the type specification in this constructor call with the diamond operator ("<>").(艥�
 >
-java:S1604�"(Make this anonymous inner class a lambda(�̺V
+java:S1604�"(Make this anonymous inner class a lambda(�̺V
 ?
-java:S1604�"(Make this anonymous inner class a lambda(��
+java:S1604�"(Make this anonymous inner class a lambda(��
 ?
-java:S1604�"(Make this anonymous inner class a lambda(�ܴ�
+java:S1604�"(Make this anonymous inner class a lambda(�ܴ�
 D
-java:S1604�"(Make this anonymous inner class a lambda(��������

+java:S1604�"(Make this anonymous inner class a lambda(��������

 ?
-java:S1604�"(Make this anonymous inner class a lambda(���
+java:S1604�"(Make this anonymous inner class a lambda(���
 ?
-java:S1604�"(Make this anonymous inner class a lambda(۱��
+java:S1604�"(Make this anonymous inner class a lambda(۱��
 ?
-java:S1604�"(Make this anonymous inner class a lambda(��
+java:S1604�"(Make this anonymous inner class a lambda(��
 g
-java:S1301�"KReplace this "switch" statement by "if" statements to increase readability.(ד�������

+java:S1301�"KReplace this "switch" statement by "if" statements to increase readability.(ד�������

 Z
-java:S2583�
"CChange this condition so that it does not always evaluate to "true"(����
+java:S2583�
"CChange this condition so that it does not always evaluate to "true"(����
+n	java:S116R"TRename this field "time_mode" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(��������

+z
+java:S1450R"XRemove the "time_mode" field and declare it as a local variable in the relevant methods.(��������
8�넾�0
 7
-java:S1116`"Remove this empty statement.(���������

+java:S1116b"Remove this empty statement.(���������

 a
-java:S1124�
"EReorder the modifiers to comply with the Java Language Specification.(��������

+java:S1124�
"EReorder the modifiers to comply with the Java Language Specification.(��������

 [
-java:S1124�
"EReorder the modifiers to comply with the Java Language Specification.(�Ѿk
+java:S1124�
"EReorder the modifiers to comply with the Java Language Specification.(�Ѿk
 n
-java:S3776�
"RRefactor this method to reduce its Cognitive Complexity from 17 to the 15 allowed.(��������

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

 2
-java:S3626�
"Remove this redundant jump.(��݅

+java:S3626�
"Remove this redundant jump.(��݅

 2
-java:S3626�
"Remove this redundant jump.(��݅

+java:S3626�
"Remove this redundant jump.(��݅

 2
-java:S3626�
"Remove this redundant jump.(��݅

+java:S3626�
"Remove this redundant jump.(��݅

 P
-java:S1874�
"9Remove this use of "PreferenceManager"; it is deprecated.(­��
+java:S1874�
"9Remove this use of "PreferenceManager"; it is deprecated.(­��
 Z
-java:S1874�
"CRemove this use of "getDefaultSharedPreferences"; it is deprecated.(­��
+java:S1874�
"CRemove this use of "getDefaultSharedPreferences"; it is deprecated.(­��
 N
-java:S1135�
"2Complete the task associated to this TODO comment.(�̐������

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

 F
-java:S2093�
"*Change this "try" to a try-with-resources.(���������

+java:S2093�
"*Change this "try" to a try-with-resources.(���������

 o
-java:S1450�
"XRemove the "mMoveMenu" field and declare it as a local variable in the relevant methods.(����

+java:S1450�
"XRemove the "mMoveMenu" field and declare it as a local variable in the relevant methods.(����

 n
-java:S3252�
"RUse static access with "android.widget.AbsListView" for "MultiChoiceModeListener".(��������

+java:S3252�
"RUse static access with "android.widget.AbsListView" for "MultiChoiceModeListener".(��������

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

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

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

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

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

+java:S1874�"9Remove this use of "getDefaultDisplay"; it is deprecated.(ĸ�������

 M
-java:S1874�"1Remove this use of "getHeight"; it is deprecated.(���������

+java:S1874�"1Remove this use of "getHeight"; it is deprecated.(���������

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

+java:S1116�"Remove this empty statement.(���������

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

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

 C
-java:S1874�".Remove this use of "<init>"; it is deprecated.(��?
-?	java:S108�")Either remove or fill this block of code.(��ʥ
+java:S1874�".Remove this use of "<init>"; it is deprecated.(��?
+?	java:S108�")Either remove or fill this block of code.(��ʥ
 K
-java:S1874�"/Remove this use of "execute"; it is deprecated.(�嫏�����

+java:S1874�"/Remove this use of "execute"; it is deprecated.(�嫏�����

 S
-java:S1874�"7Remove this use of "toggleSoftInput"; it is deprecated.(���������

+java:S1874�"7Remove this use of "toggleSoftInput"; it is deprecated.(���������

 O
-java:S1874�"3Remove this use of "SHOW_FORCED"; it is deprecated.(���������

+java:S1874�"3Remove this use of "SHOW_FORCED"; it is deprecated.(���������

 h
-java:S3776�"RRefactor this method to reduce its Cognitive Complexity from 17 to the 15 allowed.(���#
+java:S3776�"RRefactor this method to reduce its Cognitive Complexity from 17 to the 15 allowed.(���#
 N
-java:S1135�"2Complete the task associated to this TODO comment.(��������

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

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

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

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

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

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

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

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

+^	java:S125�"<This block of commented-out lines of code should be removed.(Ȟޖ�����
8����0
 J
-java:S1874�".Remove this use of "<init>"; it is deprecated.(�������

+java:S1874�".Remove this use of "<init>"; it is deprecated.(�������

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

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

 K
-java:S1874�"/Remove this use of "execute"; it is deprecated.(�嫏�����

+java:S1874�"/Remove this use of "execute"; it is deprecated.(�嫏�����

 h
-java:S3776�"RRefactor this method to reduce its Cognitive Complexity from 18 to the 15 allowed.(��b
-G
-java:S3398�"0Move this method into "OnListItemClickListener".(���
-K
-java:S3398�"/Move this method into "BackgroundQueryHandler".(���������

-A
-java:S3398�"%Move this method into "ModeCallback".(���������

+java:S3776�"RRefactor this method to reduce its Cognitive Complexity from 18 to the 15 allowed.(��b
 <
-java:S3398�"%Move this method into "ModeCallback".(����

\ No newline at end of file
+java:S3398�"%Move this method into "ModeCallback".(����

+A
+java:S3398�"%Move this method into "ModeCallback".(���������

+K
+java:S3398�"/Move this method into "BackgroundQueryHandler".(���������

+G
+java:S3398�"0Move this method into "OnListItemClickListener".(���
+H
+java:S1068R"-Remove this unused "time_mode" private field.(��������

\ No newline at end of file
diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/index.pb b/src/Notes-master1/.idea/sonarlint/issuestore/index.pb
index 35f302a..a3ae317 100644
--- a/src/Notes-master1/.idea/sonarlint/issuestore/index.pb
+++ b/src/Notes-master1/.idea/sonarlint/issuestore/index.pb
@@ -28,18 +28,12 @@ k
 .classpath,3\5\354079a72b91a4280407c16a36f47d1986fd85a5
 d
 4app/src/main/java/net/micode/notes/data/Contact.java,9\a\9a3a19793537958b8b1b03a81985999e22705a2f
-p
-@app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java,1\e\1eb2363b523dbcae43d3c6e4790c64436af61b13
-j
-:app/src/main/java/net/micode/notes/data/NotesProvider.java,6\a\6a65e747031f27aef20597b4181148a9fbf963d5
 k
 ;app/src/main/java/net/micode/notes/gtask/data/MetaData.java,c\1\c182d0c9c237ea8a46a92ccaae9bb5c751923a88
 s
 Capp/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java,0\2\023468cfdd0b71d4098903b9070e364658e2fbcf
 m
 =app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java,3\e\3e688be40dc69cfd1062f41d0fc27fe261a26710
-b
-2app/src/main/java/net/micode/notes/data/Notes.java,a\7\a7641cfac724321d508c2a284223a711011a93f5
 k
 ;app/src/main/java/net/micode/notes/tool/ResourceParser.java,c\6\c65f5dc8218ef1da6f6bfb5d1b14aea855a54d7f
 m
@@ -48,15 +42,25 @@ f
 6app/src/main/java/net/micode/notes/tool/DataUtils.java,3\2\32360bf24febc78f20db52498c7576b3d8650d56
 h
 8app/src/main/java/net/micode/notes/tool/BackupUtils.java,a\4\a446c87b1013132f8adaf83656b582028e8809af
-b
-2app/src/main/java/net/micode/notes/model/Note.java,d\d\dd970bd8ce083850fca1d4d159647ccd110e57cb
 ~
 Napp/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java,5\f\5f6162ca79fcea353b280c5dc84973a9c37d2c74
 
 Oapp/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java,0\f\0f0f0549145d0e2bfb972ba1ed2e2c38bfd6d1b1
-@
-app/build.gradle,f\4\f4a01d6a4fcb971362ec00a83903fd3902f52164
 <
 build.gradle,f\0\f07866736216be0ee2aba49e392191aeae700a35
 P
- app/src/main/AndroidManifest.xml,8\c\8c55c3ccc257e5907959013f99656e4c8ec3903e
\ No newline at end of file
+ app/src/main/AndroidManifest.xml,8\c\8c55c3ccc257e5907959013f99656e4c8ec3903e
+@
+app/build.gradle,f\4\f4a01d6a4fcb971362ec00a83903fd3902f52164
+p
+@app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java,1\e\1eb2363b523dbcae43d3c6e4790c64436af61b13
+l
+<app/src/main/java/net/micode/notes/ui/NotesListActivity.java,a\d\ad72331a1bed265bb9c0fe838faa74dbf69fce32
+b
+2app/src/main/java/net/micode/notes/data/Notes.java,a\7\a7641cfac724321d508c2a284223a711011a93f5
+b
+2app/src/main/java/net/micode/notes/model/Note.java,d\d\dd970bd8ce083850fca1d4d159647ccd110e57cb
+i
+9app/src/main/java/net/micode/notes/model/WorkingNote.java,8\7\876016634c6642b35109680ccac740dc8271b236
+j
+:app/src/main/java/net/micode/notes/data/NotesProvider.java,6\a\6a65e747031f27aef20597b4181148a9fbf963d5
\ No newline at end of file
diff --git a/src/Notes-master1/app/build.gradle b/src/Notes-master1/app/build.gradle
index 9c526f6..865d9e3 100644
--- a/src/Notes-master1/app/build.gradle
+++ b/src/Notes-master1/app/build.gradle
@@ -13,6 +13,8 @@ android {
         applicationId "net.micode.notes"
         minSdkVersion 23
         targetSdkVersion 23
+        versionCode 1
+        versionName "1.0"
     }
 
     buildTypes {
diff --git a/src/Notes-master1/app/build/generated/source/buildConfig/debug/net/micode/notes/BuildConfig.java b/src/Notes-master1/app/build/generated/source/buildConfig/debug/net/micode/notes/BuildConfig.java
index db17690..287d38f 100644
--- a/src/Notes-master1/app/build/generated/source/buildConfig/debug/net/micode/notes/BuildConfig.java
+++ b/src/Notes-master1/app/build/generated/source/buildConfig/debug/net/micode/notes/BuildConfig.java
@@ -8,5 +8,5 @@ public final class BuildConfig {
   public static final String APPLICATION_ID = "net.micode.notes";
   public static final String BUILD_TYPE = "debug";
   public static final int VERSION_CODE = 1;
-  public static final String VERSION_NAME = "0.1";
+  public static final String VERSION_NAME = "1.0";
 }
diff --git a/src/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar b/src/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar
index 6c01fb1..3f17359 100644
Binary files a/src/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar and b/src/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar differ
diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin
index de32ef7..75fa432 100644
Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin differ
diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin
index 105c2e3..a1a80a4 100644
Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin differ
diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin
index 223f749..40ba364 100644
Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin differ
diff --git a/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex b/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex
index 71ed74b..94d69e3 100644
Binary files a/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex and b/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/13/classes.dex b/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/13/classes.dex
index a06af55..0d5d8ee 100644
Binary files a/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/13/classes.dex and b/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/13/classes.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/15/classes.dex b/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/15/classes.dex
index ef7cab7..66fbb91 100644
Binary files a/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/15/classes.dex and b/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/15/classes.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex b/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex
index ca921a3..62b3820 100644
Binary files a/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex and b/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out
index b9f54b1..1d7611c 100644
Binary files a/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and b/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
index 54ca234..5a17af8 100644
--- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
+++ b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
@@ -1,4 +1,4 @@
-#Sat Oct 22 10:45:48 CST 2022
+#Fri Oct 28 10:17:53 CST 2022
 D\:\\Android_new\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png=D\:\\Android_new\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat
 D\:\\Android_new\\Notes-master1\\app\\src\\main\\res\\layout\\note_list.xml=D\:\\Android_new\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat
 D\:\\Android_new\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\clock.png=D\:\\Android_new\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat
@@ -9,14 +9,14 @@ D\:\\Android_new\\Notes-master1\\app\\src\\main\\res\\menu\\call_note_edit.xml=D
 D\:\\Android_new\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png=D\:\\Android_new\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat
 D\:\\Android_new\\Notes-master1\\app\\src\\main\\res\\layout\\note_edit.xml=D\:\\Android_new\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat
 D\:\\Android_new\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png=D\:\\Android_new\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat
-D\:\\Android_new\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png=D\:\\Android_new\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat
 D\:\\Android_new\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_large.png=D\:\\Android_new\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat
+D\:\\Android_new\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png=D\:\\Android_new\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat
 D\:\\Android_new\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png=D\:\\Android_new\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat
 D\:\\Android_new\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png=D\:\\Android_new\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat
 D\:\\Android_new\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\notification.png=D\:\\Android_new\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat
 D\:\\Android_new\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_middle.9.png=D\:\\Android_new\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat
-D\:\\Android_new\\Notes-master1\\app\\src\\main\\res\\layout\\widget_2x.xml=D\:\\Android_new\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat
 D\:\\Android_new\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\search_result.png=D\:\\Android_new\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat
+D\:\\Android_new\\Notes-master1\\app\\src\\main\\res\\layout\\widget_2x.xml=D\:\\Android_new\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat
 D\:\\Android_new\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png=D\:\\Android_new\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat
 D\:\\Android_new\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png=D\:\\Android_new\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat
 D\:\\Android_new\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png=D\:\\Android_new\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat
@@ -30,8 +30,8 @@ D\:\\Android_new\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_s
 D\:\\Android_new\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png=D\:\\Android_new\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat
 D\:\\Android_new\\Notes-master1\\app\\src\\main\\res\\layout\\add_account_text.xml=D\:\\Android_new\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat
 D\:\\Android_new\\Notes-master1\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml=D\:\\Android_new\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat
-D\:\\Android_new\\Notes-master1\\app\\src\\main\\res\\layout\\folder_list_item.xml=D\:\\Android_new\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat
 D\:\\Android_new\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png=D\:\\Android_new\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat
+D\:\\Android_new\\Notes-master1\\app\\src\\main\\res\\layout\\folder_list_item.xml=D\:\\Android_new\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat
 D\:\\Android_new\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png=D\:\\Android_new\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat
 D\:\\Android_new\\Notes-master1\\app\\src\\main\\res\\color\\secondary_text_dark.xml=D\:\\Android_new\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
 D\:\\Android_new\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png=D\:\\Android_new\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat
@@ -45,8 +45,8 @@ D\:\\Android_new\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\lock.png=D\
 D\:\\Android_new\\Notes-master1\\app\\src\\main\\res\\layout-sw600dp\\note_edit.xml=D\:\\Android_new\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout-sw600dp_note_edit.xml.flat
 D\:\\Android_new\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png=D\:\\Android_new\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat
 D\:\\Android_new\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_green.9.png=D\:\\Android_new\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat
-D\:\\Android_new\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_up.9.png=D\:\\Android_new\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat
 D\:\\Android_new\\Notes-master1\\app\\src\\main\\res\\menu\\note_edit.xml=D\:\\Android_new\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat
+D\:\\Android_new\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_up.9.png=D\:\\Android_new\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat
 D\:\\Android_new\\Notes-master1\\app\\src\\main\\res\\layout\\account_dialog_title.xml=D\:\\Android_new\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat
 D\:\\Android_new\\Notes-master1\\app\\src\\main\\res\\layout\\note_edit_list_item.xml=D\:\\Android_new\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat
 D\:\\Android_new\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png=D\:\\Android_new\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat
@@ -72,6 +72,7 @@ D\:\\Android_new\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_white.
 D\:\\Android_new\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png=D\:\\Android_new\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat
 D\:\\Android_new\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png=D\:\\Android_new\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat
 D\:\\Android_new\\Notes-master1\\app\\src\\main\\res\\xml\\widget_2x_info.xml=D\:\\Android_new\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat
+D\:\\Android_new\\Notes-master1\\app\\src\\main\\res\\xml\\shortcuts.xml=D\:\\Android_new\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_shortcuts.xml.flat
 D\:\\Android_new\\Notes-master1\\app\\src\\main\\res\\layout\\widget_4x.xml=D\:\\Android_new\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat
 D\:\\Android_new\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png=D\:\\Android_new\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat
 D\:\\Android_new\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png=D\:\\Android_new\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merger.xml
index 6ab4b4e..01b02c2 100644
--- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merger.xml
+++ b/src/Notes-master1/app/build/intermediates/incremental/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="night_time">night mode</string><string name="day_time">light mode</string></file><file path="D:\Android_new\Notes-master1\app\src\main\res\values\styles.xml" qualifiers=""><style name="TextAppearanceSuper">
+    </plurals><string name="night_time">night mode</string><string name="day_time">light mode</string><string name="voice_mix">voice mix</string><string name="menu_set_passcode">Lock</string><string name="menu_delete_passcode">Delete Lock</string></file><file path="D:\Android_new\Notes-master1\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">
@@ -48,7 +48,7 @@
         <item>邮件</item>
     </string-array></file><file path="D:\Android_new\Notes-master1\app\src\main\res\values-zh-rCN\strings.xml" qualifiers="zh-rCN"><string name="app_name">便签</string><string name="app_widget2x2">便签2x2</string><string name="app_widget4x4">便签4x4</string><string name="widget_havenot_content">没有关联内容，点击新建便签。</string><string name="widget_under_visit_mode">访客模式下，便签内容不可见</string><string name="notelist_string_info">...</string><string name="notelist_menu_new">新建便签</string><string name="delete_remind_time_message">成功删除提醒</string><string name="set_remind_time_message">创建提醒</string><string name="note_alert_expired">已过期</string><string name="format_date_ymd">yyyyMMdd</string><string name="format_datetime_mdhm">MM月dd日 kk:mm</string><string name="notealert_ok">知道了</string><string name="notealert_enter">查看</string><string name="note_link_tel">呼叫电话</string><string name="note_link_email">发送邮件</string><string name="note_link_web">浏览网页</string><string name="note_link_other">打开地图</string><string name="menu_create_folder">新建文件夹</string><string name="menu_export_text">导出文本</string><string name="menu_sync">同步</string><string name="menu_sync_cancel">取消同步</string><string name="menu_setting">设置</string><string name="menu_search">搜索</string><string name="menu_delete">删除</string><string name="menu_move">移动到文件夹</string><string name="menu_select_title">选中了 %d 项</string><string name="menu_select_none">没有选中项，操作无效</string><string name="menu_select_all">全选</string><string name="menu_deselect_all">取消全选</string><string name="menu_font_size">文字大小</string><string name="menu_font_small">小</string><string name="menu_font_normal">正常</string><string name="menu_font_large">大</string><string name="menu_font_super">超大</string><string name="menu_list_mode">进入清单模式</string><string name="menu_normal_mode">退出清单模式</string><string name="menu_folder_view">查看文件夹</string><string name="menu_folder_delete">刪除文件夹</string><string name="menu_folder_change_name">修改文件夹名称</string><string name="folder_exist">文件夹 %1$s 已存在，请重新命名</string><string name="menu_share">分享</string><string name="menu_send_to_desktop">发送到桌面</string><string name="menu_alert">提醒我</string><string name="menu_remove_remind">删除提醒</string><string name="menu_title_select_folder">选择文件夹</string><string name="menu_move_parent_folder">上一级文件夹</string><string name="info_note_enter_desktop">已添加到桌面</string><string name="alert_title_delete">删除</string><string name="alert_message_delete_notes">确认要删除所选的 %d 条便签吗?</string><string name="alert_message_delete_note">确认要删除该条便签吗?</string><string name="alert_message_delete_folder">确认删除文件夹及所包含的便签吗？</string><string name="format_move_notes_to_folder">已将所选 %1$d 条便签移到 %2$s 文件夹</string><string name="menu_set_password">设置密码</string><string name="error_sdcard_unmounted">SD卡被占用，不能操作</string><string name="error_sdcard_export">导出文本时发生错误，请检查SD卡</string><string name="error_note_not_exist">要查看的便签不存在</string><string name="error_note_empty_for_clock">不能为空便签设置闹钟提醒</string><string name="error_note_empty_for_send_to_desktop">不能将空便签发送到桌面</string><string name="success_sdcard_export">导出成功</string><string name="failed_sdcard_export">导出失败</string><string name="format_exported_file_location">已将文本文件(%1$s)输出至SD卡(%2$s)目录</string><string name="ticker_syncing">同步便签...</string><string name="ticker_success">同步成功</string><string name="ticker_fail">同步失败</string><string name="ticker_cancel">同步已取消</string><string name="success_sync_account">与%1$s同步成功</string><string name="error_sync_network">同步失败，请检查网络和帐号设置</string><string name="error_sync_internal">同步失败，发生内部错误</string><string name="error_sync_cancelled">同步已取消</string><string name="sync_progress_login">登录%1$s...</string><string name="sync_progress_init_list">正在获取服务器便签列表...</string><string name="sync_progress_syncing">正在同步本地便签...</string><string name="preferences_title">设置</string><string name="preferences_account_title">同步账号</string><string name="preferences_account_summary">与google task同步便签记录</string><string name="preferences_last_sync_time">上次同步于 %1$s</string><string name="preferences_add_account">添加账号</string><string name="preferences_menu_change_account">更换账号</string><string name="preferences_menu_remove_account">删除账号</string><string name="preferences_menu_cancel">取消</string><string name="preferences_button_sync_immediately">立即同步</string><string name="preferences_button_sync_cancel">取消同步</string><string name="preferences_dialog_change_account_title">当前帐号 %1$s</string><string name="preferences_dialog_change_account_warn_msg">如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复</string><string name="preferences_dialog_select_account_title">同步便签</string><string name="preferences_dialog_select_account_tips">请选择google帐号，便签将与该帐号的google task内容同步。</string><string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帐号</string><string name="preferences_toast_success_set_accout">同步帐号已设置为%1$s</string><string name="preferences_bg_random_appear_title">新建便签背景颜色随机</string><string name="button_delete">删除</string><string name="call_record_folder_name">通话便签</string><string name="hint_foler_name">请输入名称</string><string name="search_label">正在搜索便签</string><string name="search_hint">搜索便签</string><string name="search_setting_description">便签中的文字</string><string name="search">便签</string><string name="datetime_dialog_ok">设置</string><string name="datetime_dialog_cancel">取消</string><plurals name="search_results_title">
         <item quantity="other"><ns1:g id="NUMBER">%1$s</ns1:g> 条符合“<ns1:g id="SEARCH">%2$s</ns1:g>”的搜索结果</item>
-    </plurals><string name="night_time">夜晚模式</string><string name="day_time">日间模式</string></file><file path="D:\Android_new\Notes-master1\app\src\main\res\values-zh-rTW\arrays.xml" qualifiers="zh-rTW"><string-array name="menu_share_ways">
+    </plurals><string name="night_time">夜晚模式</string><string name="day_time">日间模式</string><string name="voice_mix">语音合成</string><string name="menu_delete_passcode">解锁</string><string name="menu_set_passcode">上锁</string></file><file path="D:\Android_new\Notes-master1\app\src\main\res\values-zh-rTW\arrays.xml" qualifiers="zh-rTW"><string-array name="menu_share_ways">
         <item>短信</item>
         <item>郵件</item>
     </string-array></file><file path="D:\Android_new\Notes-master1\app\src\main\res\values-zh-rTW\strings.xml" qualifiers="zh-rTW"><string name="app_name">便簽</string><string name="app_widget2x2">便簽2x2</string><string name="app_widget4x4">便簽4x4</string><string name="widget_havenot_content">沒有關聯內容，點擊新建便簽。</string><string name="widget_under_visit_mode">訪客模式下，便籤內容不可見</string><string name="notelist_string_info">...</string><string name="notelist_menu_new">新建便簽</string><string name="delete_remind_time_message">成功刪除提醒</string><string name="set_remind_time_message">創建提醒</string><string name="note_alert_expired">已過期</string><string name="format_date_ymd">yyyyMMdd</string><string name="format_datetime_mdhm">MM月dd日 kk:mm</string><string name="notealert_ok">知道了</string><string name="notealert_enter">查看</string><string name="note_link_tel">呼叫電話</string><string name="note_link_email">發送郵件</string><string name="note_link_web">浏覽網頁</string><string name="note_link_other">打開地圖</string><string name="format_move_notes_to_folder">已將所選 %1$d 便籤移到 %2$s 文件夾</string><string name="menu_create_folder">新建文件夾</string><string name="menu_export_text">導出文本</string><string name="menu_sync">同步</string><string name="menu_sync_cancel">取消同步</string><string name="menu_setting">設置</string><string name="menu_search">搜尋</string><string name="menu_delete">刪除</string><string name="menu_move">移動到文件夾</string><string name="menu_select_title">選中了 %d 項</string><string name="menu_select_none">沒有選中項，操作無效</string><string name="menu_select_all">全選</string><string name="menu_deselect_all">取消全選</string><string name="menu_font_size">文字大小</string><string name="menu_font_small">小</string><string name="menu_font_normal">正常</string><string name="menu_font_large">大</string><string name="menu_font_super">超大</string><string name="menu_list_mode">進入清單模式</string><string name="menu_normal_mode">退出清單模式</string><string name="menu_folder_view">查看文件夾</string><string name="menu_folder_delete">刪除文件夾</string><string name="menu_folder_change_name">修改文件夾名稱</string><string name="folder_exist">文件夾 %1$s 已存在，請重新命名</string><string name="menu_share">分享</string><string name="menu_send_to_desktop">發送到桌面</string><string name="menu_alert">提醒我</string><string name="menu_remove_remind">刪除提醒</string><string name="menu_title_select_folder">選擇文件夾</string><string name="menu_move_parent_folder">上一級文件夾</string><string name="info_note_enter_desktop">已添加到桌面</string><string name="alert_title_delete">刪除</string><string name="alert_message_delete_notes">确认要刪除所選的 %d 條便籤嗎?</string><string name="alert_message_delete_note">确认要删除該條便籤嗎?</string><string name="alert_message_delete_folder">確認刪除檔夾及所包含的便簽嗎？</string><string name="error_sdcard_unmounted">SD卡被佔用，不能操作</string><string name="error_sdcard_export">導出TXT時發生錯誤，請檢查SD卡</string><string name="error_note_not_exist">要查看的便籤不存在</string><string name="error_note_empty_for_clock">不能爲空便籤設置鬧鐘提醒</string><string name="error_note_empty_for_send_to_desktop">不能將空便籤發送到桌面</string><string name="success_sdcard_export">導出成功</string><string name="failed_sdcard_export">導出失敗</string><string name="format_exported_file_location">已將文本文件(%1$s)導出至SD(%2$s)目錄</string><string name="menu_set_password">设置密码</string><string name="ticker_syncing">同步便簽...</string><string name="ticker_success">同步成功</string><string name="ticker_fail">同步失敗</string><string name="ticker_cancel">同步已取消</string><string name="success_sync_account">與%1$s同步成功</string><string name="error_sync_network">同步失敗，請檢查網絡和帳號設置</string><string name="error_sync_internal">同步失敗，發生內部錯誤</string><string name="error_sync_cancelled">同步已取消</string><string name="sync_progress_login">登陸%1$s...</string><string name="sync_progress_init_list">正在獲取服務器便籤列表...</string><string name="sync_progress_syncing">正在同步本地便籤...</string><string name="preferences_title">設置</string><string name="preferences_account_title">同步賬號</string><string name="preferences_account_summary">与google task同步便簽記錄</string><string name="preferences_last_sync_time">上次同步于 %1$s</string><string name="preferences_add_account">添加賬號</string><string name="preferences_menu_change_account">更換賬號</string><string name="preferences_menu_remove_account">刪除賬號</string><string name="preferences_menu_cancel">取消</string><string name="preferences_button_sync_immediately">立即同步</string><string name="preferences_button_sync_cancel">取消同步</string><string name="preferences_dialog_change_account_title">當前帳號 %1$s</string><string name="preferences_dialog_change_account_warn_msg">如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復</string><string name="preferences_dialog_select_account_title">同步便簽</string><string name="preferences_dialog_select_account_tips">請選擇google帳號，便簽將與該帳號的google task內容同步。</string><string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帳號</string><string name="preferences_toast_success_set_accout">同步帳號已設置為%1$s</string><string name="preferences_bg_random_appear_title">新建便籤背景顏色隨機</string><string name="button_delete">刪除</string><string name="call_record_folder_name">通話便籤</string><string name="hint_foler_name">請輸入名稱</string><string name="search_label">正在搜索便籤</string><string name="search_hint">搜索便籤</string><string name="search_setting_description">便籤中的文字</string><string name="search">便籤</string><string name="datetime_dialog_ok">設置</string><string name="datetime_dialog_cancel">取消</string><plurals name="search_results_title">
diff --git a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
index fd9714f..1c6ac98 100644
--- a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
+++ b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
@@ -1,4 +1,4 @@
-#Sat Oct 22 10:45:50 CST 2022
+#Fri Oct 28 10:18:03 CST 2022
 path.4=15/classes.dex
 path.3=13/classes.dex
 path.2=12/classes.dex
diff --git a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
index 60e3716..7dc2e07 100644
Binary files a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/BuildConfig.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/BuildConfig.class
index f98637b..1edbc5b 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/BuildConfig.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/BuildConfig.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class
index bff0ccd..40bae86 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class
index 1606d91..0d94b05 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class
index 6ffd9b8..e5fa1af 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class
index 82a0b76..0f865ed 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class
index 62300c9..9a267ba 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class
index 78e9f27..251220d 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class
index 587eabf..32ea0c9 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class
index d1a82b6..ca3b83e 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class
index ca19e9d..1e563e2 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class
index 538d7e5..a3f2c62 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class
index e5f04c6..189b86c 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$5.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$5.class
index 775f32f..5f19dec 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$5.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$5.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class
index 12bb0ad..7010e73 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class
index f0c7a20..9d851cd 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class
index 3d6ff26..8ffbba0 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class
index a195fc6..e4e6265 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class
index 64f67b1..8c75fa4 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class
index e62226f..2b3e9c3 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class
index d235279..c702681 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class
index fa2ad93..b24d0b2 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class
index 1587aa7..79933a1 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class
index 259f8fa..c76e72a 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class
index aec2ac2..c7112d3 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class
index d6feb60..70a6c32 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class
index 0b2edb0..b1e1063 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class
index 4ec2047..c611459 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class
index 28e9059..249af2c 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class
index 79539c4..77158e4 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class
index caf1bc9..80d68f0 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class
index 5c79672..80eff38 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class
index 12053f2..43f1084 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class
index 2ac228d..5c523d8 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class
index 2cfbcc9..2daea39 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class
index bfb02ed..783ae75 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class
index e65abbf..fcad8e7 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class
index b64454d..24a9a8d 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class differ
diff --git a/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
index 036ecc1..77912a3 100644
--- a/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
+++ b/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
@@ -17,7 +17,7 @@
 17<manifest xmlns:android="http://schemas.android.com/apk/res/android"
 18    package="net.micode.notes"
 19    android:versionCode="1"
-20    android:versionName="0.1" >
+20    android:versionName="1.0" >
 21
 22    <uses-sdk
 22-->D:\Android_new\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44
diff --git a/src/Notes-master1/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml b/src/Notes-master1/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml
index efa9510..adb9e76 100644
--- a/src/Notes-master1/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml
+++ b/src/Notes-master1/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml
@@ -17,7 +17,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="net.micode.notes"
     android:versionCode="1"
-    android:versionName="0.1" >
+    android:versionName="1.0" >
 
     <uses-sdk
         android:minSdkVersion="23"
diff --git a/src/Notes-master1/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml b/src/Notes-master1/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml
index efa9510..adb9e76 100644
--- a/src/Notes-master1/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml
+++ b/src/Notes-master1/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml
@@ -17,7 +17,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="net.micode.notes"
     android:versionCode="1"
-    android:versionName="0.1" >
+    android:versionName="1.0" >
 
     <uses-sdk
         android:minSdkVersion="23"
diff --git a/src/Notes-master1/app/build/intermediates/merged_manifests/debug/output-metadata.json b/src/Notes-master1/app/build/intermediates/merged_manifests/debug/output-metadata.json
index a56d03a..d00465c 100644
--- a/src/Notes-master1/app/build/intermediates/merged_manifests/debug/output-metadata.json
+++ b/src/Notes-master1/app/build/intermediates/merged_manifests/debug/output-metadata.json
@@ -12,7 +12,7 @@
       "filters": [],
       "attributes": [],
       "versionCode": 1,
-      "versionName": "0.1",
+      "versionName": "1.0",
       "outputFile": "AndroidManifest.xml"
     }
   ],
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat
index f0c3b40..0b72554 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat
index 3fcf71c..fbf2de3 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat
index df00a7c..c3dc57a 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat
index 6128d29..63594f7 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values_values.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values_values.arsc.flat
index 1aa1a69..5531edd 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values_values.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values_values.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
index 7a802b3..0cc2521 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
@@ -6,20 +6,20 @@
                 {
                     "source": "D:\\Android_new\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml",
                     "from": {
-                        "startLines": "131,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,78,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,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,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": "8165,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4403,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4451,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,78,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,47,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,49,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "8569,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4446,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4496,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "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,70,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,69,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,4,-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,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "8325,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,3745,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,3694,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "138,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,70,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,69,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,60,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,50,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "8729,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,3801,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,3740,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,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,1132,1228,1311,1407,1476,1519,1571,1623,1672,1735,1793,1844,1892,1976,2070,2178,2249,2333,2416,2482,2565,2667,2728,2790,2841,2919,2972,3032,3137,3196,3298,3353,3424,3473,3531,3578,3637,3694,3765,3826,3883,3933,3985,4038,4088,4138,4198,4251,4317,4379,4442,4489,4544,4632,4690,4752,4811,4861,4906,4949,5009,5076,5126,5181,5236,5289,5336,5389,5445,5493,5548,5601,5685,5752,5816,5912,5986,6067,6156,6319,6463,6542,6617,6699,6758,6838,6918,6973,7095,7198,7239,7292,7349,7423,7488,7556,7642,7722,7791,7885,7944,7999,8061,8121,8231",
-                        "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,47,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,58,49,44,42,59,66,49,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
-                        "endOffsets": "1127,1223,1306,1402,1471,1514,1566,1618,1667,1730,1788,1839,1887,1971,2065,2173,2244,2328,2411,2477,2560,2662,2723,2785,2836,2914,2967,3027,3132,3191,3293,3348,3419,3468,3526,3573,3632,3689,3760,3821,3878,3928,3980,4033,4083,4133,4193,4246,4312,4374,4437,4484,4539,4627,4685,4747,4806,4856,4901,4944,5004,5071,5121,5176,5231,5284,5331,5384,5440,5488,5543,5596,5680,5747,5811,5907,5981,6062,6151,6314,6458,6537,6612,6694,6753,6833,6913,6968,7090,7193,7234,7287,7344,7418,7483,7551,7637,7717,7786,7880,7939,7994,8056,8116,8226,8316"
+                        "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,128,129,130",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "739,1132,1228,1311,1407,1476,1519,1571,1623,1672,1735,1793,1844,1892,1976,2070,2178,2249,2333,2416,2482,2565,2667,2728,2790,2841,2919,2972,3032,3137,3196,3298,3353,3424,3473,3531,3578,3639,3698,3755,3826,3887,3944,3994,4046,4099,4149,4199,4259,4312,4378,4440,4503,4550,4605,4693,4751,4813,4864,4923,4973,5018,5061,5121,5188,5238,5293,5348,5401,5448,5501,5557,5605,5660,5713,5797,5864,5928,6024,6098,6179,6268,6431,6575,6654,6729,6811,6870,6950,7030,7085,7207,7310,7351,7404,7461,7535,7600,7668,7754,7834,7903,7997,8056,8111,8173,8233,8281,8391",
+                        "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,128,129,130",
+                        "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,47,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,60,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,50,58,49,44,42,59,66,49,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,47,109,89",
+                        "endOffsets": "1127,1223,1306,1402,1471,1514,1566,1618,1667,1730,1788,1839,1887,1971,2065,2173,2244,2328,2411,2477,2560,2662,2723,2785,2836,2914,2967,3027,3132,3191,3293,3348,3419,3468,3526,3573,3634,3693,3750,3821,3882,3939,3989,4041,4094,4144,4194,4254,4307,4373,4435,4498,4545,4600,4688,4746,4808,4859,4918,4968,5013,5056,5116,5183,5233,5288,5343,5396,5443,5496,5552,5600,5655,5708,5792,5859,5923,6019,6093,6174,6263,6426,6570,6649,6724,6806,6865,6945,7025,7080,7202,7305,7346,7399,7456,7530,7595,7663,7749,7829,7898,7992,8051,8106,8168,8228,8276,8386,8476"
                     }
                 },
                 {
@@ -30,12 +30,12 @@
                         "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
                     },
                     "to": {
-                        "startLines": "128,132,136,140,143,147,151,155,159,163,167",
+                        "startLines": "131,135,139,143,146,150,154,158,162,166,170",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "8321,8525,8736,8909,9069,9252,9437,9622,9825,10031,10214",
-                        "endLines": "131,135,139,142,146,150,154,158,162,166,170",
+                        "startOffsets": "8481,8685,8896,9069,9229,9412,9597,9782,9985,10191,10374",
+                        "endLines": "134,138,142,145,149,153,157,161,165,169,173",
                         "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "8520,8731,8904,9064,9247,9432,9617,9820,10026,10209,10410"
+                        "endOffsets": "8680,8891,9064,9224,9407,9592,9777,9980,10186,10369,10570"
                     }
                 },
                 {
@@ -135,19 +135,19 @@
                 {
                     "source": "D:\\Android_new\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
                     "from": {
-                        "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,74,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,75,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,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,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,3700,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,3742,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,41,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,43,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,3737,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,3781,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,66,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,65,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,4,-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,-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,3178,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,3129,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,51,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,48,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,3225,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,3173,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
                     },
                     "to": {
-                        "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109",
-                        "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",
-                        "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1030,1092,1160,1237,1296,1361,1424,1479,1539,1602,1656,1716,1769,1831,1916,1997,2047,2106,2149,2202,2245,2296,2346,2406,2459,2510,2556,2604,2652,2698,2745,2795,2840,2899,2951,3003,3046,3093,3149,3204,3259,3310,3354,3396,3437,3487,3546,3590,3641,3690,3739,3786,3833,3880,3925,3976,4029,4104,4163,4220,4294,4358,4427,4505,4615,4719,4792,4858,4913,4978,5043,5092,5175,5253,5291,5336,5384,5446,5503,5558,5617,5684,5742,5804,5852,5897,5945,5996,6062",
-                        "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109",
-                        "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,41,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,50,43,41,40,49,58,43,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
-                        "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1025,1087,1155,1232,1291,1356,1419,1474,1534,1597,1651,1711,1764,1826,1911,1992,2042,2101,2144,2197,2240,2291,2341,2401,2454,2505,2551,2599,2647,2693,2740,2790,2835,2894,2946,2998,3041,3088,3144,3199,3254,3305,3349,3391,3432,3482,3541,3585,3636,3685,3734,3781,3828,3875,3920,3971,4024,4099,4158,4215,4289,4353,4422,4500,4610,4714,4787,4853,4908,4973,5038,5087,5170,5248,5286,5331,5379,5441,5498,5553,5612,5679,5737,5799,5847,5892,5940,5991,6057,6123"
+                        "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112",
+                        "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": "215,384,457,523,596,646,686,734,782,827,884,938,988,1030,1092,1160,1237,1296,1361,1424,1479,1539,1602,1656,1716,1769,1831,1916,1997,2047,2106,2149,2202,2245,2297,2348,2398,2458,2511,2562,2608,2656,2704,2750,2797,2847,2892,2951,3003,3055,3098,3145,3201,3256,3311,3360,3411,3455,3497,3538,3588,3647,3691,3742,3791,3840,3887,3934,3981,4026,4077,4130,4205,4264,4321,4395,4459,4528,4606,4716,4820,4893,4959,5014,5079,5144,5193,5276,5354,5392,5437,5485,5547,5604,5659,5718,5785,5843,5905,5953,5998,6046,6097,6140,6206",
+                        "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112",
+                        "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,41,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,51,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,48,50,43,41,40,49,58,43,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,42,65,65",
+                        "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1025,1087,1155,1232,1291,1356,1419,1474,1534,1597,1651,1711,1764,1826,1911,1992,2042,2101,2144,2197,2240,2292,2343,2393,2453,2506,2557,2603,2651,2699,2745,2792,2842,2887,2946,2998,3050,3093,3140,3196,3251,3306,3355,3406,3450,3492,3533,3583,3642,3686,3737,3786,3835,3882,3929,3976,4021,4072,4125,4200,4259,4316,4390,4454,4523,4601,4711,4815,4888,4954,5009,5074,5139,5188,5271,5349,5387,5432,5480,5542,5599,5654,5713,5780,5838,5900,5948,5993,6041,6092,6135,6201,6267"
                     }
                 },
                 {
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
index 8e13b0c..67a09ba 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
@@ -6,19 +6,19 @@
                 {
                     "source": "D:\\Android_new\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
                     "from": {
-                        "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,74,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,75,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,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,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,3700,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,3742,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,41,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,43,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,3737,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,3781,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,66,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,65,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,4,-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,-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,3178,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,3129,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,51,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,48,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,3225,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,3173,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
                     },
                     "to": {
-                        "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109",
-                        "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",
-                        "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1030,1092,1160,1237,1296,1361,1424,1479,1539,1602,1656,1716,1769,1831,1916,1997,2047,2106,2149,2202,2245,2296,2346,2406,2459,2510,2556,2604,2652,2698,2745,2795,2840,2899,2951,3003,3046,3093,3149,3204,3259,3310,3354,3396,3437,3487,3546,3590,3641,3690,3739,3786,3833,3880,3925,3976,4029,4104,4163,4220,4294,4358,4427,4505,4615,4719,4792,4858,4913,4978,5043,5092,5175,5253,5291,5336,5384,5446,5503,5558,5617,5684,5742,5804,5852,5897,5945,5996,6062",
-                        "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109",
-                        "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,41,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,50,43,41,40,49,58,43,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
-                        "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1025,1087,1155,1232,1291,1356,1419,1474,1534,1597,1651,1711,1764,1826,1911,1992,2042,2101,2144,2197,2240,2291,2341,2401,2454,2505,2551,2599,2647,2693,2740,2790,2835,2894,2946,2998,3041,3088,3144,3199,3254,3305,3349,3391,3432,3482,3541,3585,3636,3685,3734,3781,3828,3875,3920,3971,4024,4099,4158,4215,4289,4353,4422,4500,4610,4714,4787,4853,4908,4973,5038,5087,5170,5248,5286,5331,5379,5441,5498,5553,5612,5679,5737,5799,5847,5892,5940,5991,6057,6123"
+                        "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112",
+                        "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": "215,384,457,523,596,646,686,734,782,827,884,938,988,1030,1092,1160,1237,1296,1361,1424,1479,1539,1602,1656,1716,1769,1831,1916,1997,2047,2106,2149,2202,2245,2297,2348,2398,2458,2511,2562,2608,2656,2704,2750,2797,2847,2892,2951,3003,3055,3098,3145,3201,3256,3311,3360,3411,3455,3497,3538,3588,3647,3691,3742,3791,3840,3887,3934,3981,4026,4077,4130,4205,4264,4321,4395,4459,4528,4606,4716,4820,4893,4959,5014,5079,5144,5193,5276,5354,5392,5437,5485,5547,5604,5659,5718,5785,5843,5905,5953,5998,6046,6097,6140,6206",
+                        "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112",
+                        "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,41,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,51,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,48,50,43,41,40,49,58,43,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,42,65,65",
+                        "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1025,1087,1155,1232,1291,1356,1419,1474,1534,1597,1651,1711,1764,1826,1911,1992,2042,2101,2144,2197,2240,2292,2343,2393,2453,2506,2557,2603,2651,2699,2745,2792,2842,2887,2946,2998,3050,3093,3140,3196,3251,3306,3355,3406,3450,3492,3533,3583,3642,3686,3737,3786,3835,3882,3929,3976,4021,4072,4125,4200,4259,4316,4390,4454,4523,4601,4711,4815,4888,4954,5009,5074,5139,5188,5271,5349,5387,5432,5480,5542,5599,5654,5713,5780,5838,5900,5948,5993,6041,6092,6135,6201,6267"
                     }
                 },
                 {
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
index a1a208b..b32102d 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
@@ -6,20 +6,20 @@
                 {
                     "source": "D:\\Android_new\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml",
                     "from": {
-                        "startLines": "131,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,78,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,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,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": "8165,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4403,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4451,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,78,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,47,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,49,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "8569,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4446,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4496,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "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,70,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,69,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,4,-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,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "8325,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,3745,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,3694,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "138,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,70,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,69,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,60,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,50,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "8729,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,3801,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,3740,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,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,1132,1228,1311,1407,1476,1519,1571,1623,1672,1735,1793,1844,1892,1976,2070,2178,2249,2333,2416,2482,2565,2667,2728,2790,2841,2919,2972,3032,3137,3196,3298,3353,3424,3473,3531,3578,3637,3694,3765,3826,3883,3933,3985,4038,4088,4138,4198,4251,4317,4379,4442,4489,4544,4632,4690,4752,4811,4861,4906,4949,5009,5076,5126,5181,5236,5289,5336,5389,5445,5493,5548,5601,5685,5752,5816,5912,5986,6067,6156,6319,6463,6542,6617,6699,6758,6838,6918,6973,7095,7198,7239,7292,7349,7423,7488,7556,7642,7722,7791,7885,7944,7999,8061,8121,8231",
-                        "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,47,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,58,49,44,42,59,66,49,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
-                        "endOffsets": "1127,1223,1306,1402,1471,1514,1566,1618,1667,1730,1788,1839,1887,1971,2065,2173,2244,2328,2411,2477,2560,2662,2723,2785,2836,2914,2967,3027,3132,3191,3293,3348,3419,3468,3526,3573,3632,3689,3760,3821,3878,3928,3980,4033,4083,4133,4193,4246,4312,4374,4437,4484,4539,4627,4685,4747,4806,4856,4901,4944,5004,5071,5121,5176,5231,5284,5331,5384,5440,5488,5543,5596,5680,5747,5811,5907,5981,6062,6151,6314,6458,6537,6612,6694,6753,6833,6913,6968,7090,7193,7234,7287,7344,7418,7483,7551,7637,7717,7786,7880,7939,7994,8056,8116,8226,8316"
+                        "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,128,129,130",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "739,1132,1228,1311,1407,1476,1519,1571,1623,1672,1735,1793,1844,1892,1976,2070,2178,2249,2333,2416,2482,2565,2667,2728,2790,2841,2919,2972,3032,3137,3196,3298,3353,3424,3473,3531,3578,3639,3698,3755,3826,3887,3944,3994,4046,4099,4149,4199,4259,4312,4378,4440,4503,4550,4605,4693,4751,4813,4864,4923,4973,5018,5061,5121,5188,5238,5293,5348,5401,5448,5501,5557,5605,5660,5713,5797,5864,5928,6024,6098,6179,6268,6431,6575,6654,6729,6811,6870,6950,7030,7085,7207,7310,7351,7404,7461,7535,7600,7668,7754,7834,7903,7997,8056,8111,8173,8233,8281,8391",
+                        "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,128,129,130",
+                        "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,47,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,60,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,50,58,49,44,42,59,66,49,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,47,109,89",
+                        "endOffsets": "1127,1223,1306,1402,1471,1514,1566,1618,1667,1730,1788,1839,1887,1971,2065,2173,2244,2328,2411,2477,2560,2662,2723,2785,2836,2914,2967,3027,3132,3191,3293,3348,3419,3468,3526,3573,3634,3693,3750,3821,3882,3939,3989,4041,4094,4144,4194,4254,4307,4373,4435,4498,4545,4600,4688,4746,4808,4859,4918,4968,5013,5056,5116,5183,5233,5288,5343,5396,5443,5496,5552,5600,5655,5708,5792,5859,5923,6019,6093,6174,6263,6426,6570,6649,6724,6806,6865,6945,7025,7080,7202,7305,7346,7399,7456,7530,7595,7663,7749,7829,7898,7992,8051,8106,8168,8228,8276,8386,8476"
                     }
                 },
                 {
@@ -30,12 +30,12 @@
                         "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
                     },
                     "to": {
-                        "startLines": "128,132,136,140,143,147,151,155,159,163,167",
+                        "startLines": "131,135,139,143,146,150,154,158,162,166,170",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "8321,8525,8736,8909,9069,9252,9437,9622,9825,10031,10214",
-                        "endLines": "131,135,139,142,146,150,154,158,162,166,170",
+                        "startOffsets": "8481,8685,8896,9069,9229,9412,9597,9782,9985,10191,10374",
+                        "endLines": "134,138,142,145,149,153,157,161,165,169,173",
                         "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "8520,8731,8904,9064,9247,9432,9617,9820,10026,10209,10410"
+                        "endOffsets": "8680,8891,9064,9224,9407,9592,9777,9980,10186,10369,10570"
                     }
                 },
                 {
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
index f9054a0..32e5157 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
@@ -159,14 +159,14 @@
         "merged": "D:\\Android_new\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat",
         "source": "D:\\Android_new\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png"
     },
-    {
-        "merged": "D:\\Android_new\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat",
-        "source": "D:\\Android_new\\Notes-master1\\app\\src\\main\\res\\layout\\settings_header.xml"
-    },
     {
         "merged": "D:\\Android_new\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat",
         "source": "D:\\Android_new\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png"
     },
+    {
+        "merged": "D:\\Android_new\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat",
+        "source": "D:\\Android_new\\Notes-master1\\app\\src\\main\\res\\layout\\settings_header.xml"
+    },
     {
         "merged": "D:\\Android_new\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat",
         "source": "D:\\Android_new\\Notes-master1\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml"
diff --git a/src/Notes-master1/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml b/src/Notes-master1/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml
index efa9510..adb9e76 100644
--- a/src/Notes-master1/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml
+++ b/src/Notes-master1/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml
@@ -17,7 +17,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="net.micode.notes"
     android:versionCode="1"
-    android:versionName="0.1" >
+    android:versionName="1.0" >
 
     <uses-sdk
         android:minSdkVersion="23"
diff --git a/src/Notes-master1/app/build/intermediates/packaged_manifests/debug/output-metadata.json b/src/Notes-master1/app/build/intermediates/packaged_manifests/debug/output-metadata.json
index eea66e3..aa7abaa 100644
--- a/src/Notes-master1/app/build/intermediates/packaged_manifests/debug/output-metadata.json
+++ b/src/Notes-master1/app/build/intermediates/packaged_manifests/debug/output-metadata.json
@@ -12,7 +12,7 @@
       "filters": [],
       "attributes": [],
       "versionCode": 1,
-      "versionName": "0.1",
+      "versionName": "1.0",
       "outputFile": "AndroidManifest.xml"
     }
   ],
diff --git a/src/Notes-master1/app/build/intermediates/processed_res/debug/out/output-metadata.json b/src/Notes-master1/app/build/intermediates/processed_res/debug/out/output-metadata.json
index 1eefece..85ff320 100644
--- a/src/Notes-master1/app/build/intermediates/processed_res/debug/out/output-metadata.json
+++ b/src/Notes-master1/app/build/intermediates/processed_res/debug/out/output-metadata.json
@@ -12,7 +12,7 @@
       "filters": [],
       "attributes": [],
       "versionCode": 1,
-      "versionName": "0.1",
+      "versionName": "1.0",
       "outputFile": "resources-debug.ap_"
     }
   ],
diff --git a/src/Notes-master1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/src/Notes-master1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_
index 633ca86..f428c0a 100644
Binary files a/src/Notes-master1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ and b/src/Notes-master1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex
index 07744fa..b984b4c 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex
index c9944aa..409e9d9 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex
index 8a6cae6..a25ee7c 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex
index 1cbad22..037ab68 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex
index 7676660..c4a7831 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex
index a3a4d45..6c8d879 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex
index 0e4145c..d5b268f 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex
index 1bf948d..46de1e7 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex
index 5a1eb59..fae3347 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex
index ec7162f..ced9beb 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex
index c181040..45e0196 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$4.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$4.dex
index efa60c9..95f9a24 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$4.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$4.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$5.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$5.dex
index be74a70..83baf90 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$5.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$5.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex
index ccc6d4b..dafec16 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex
index 645d185..aa30a11 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex
index 30a9a1a..8131ad6 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex
index 8300ee7..a7be333 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex
index 6ec4b05..d7f73c9 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex
index 422d640..5cb5eb2 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex
index 38e3898..7ba9abb 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex
index 9f52d89..9ec0a0e 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex
index 1482d72..6d844a0 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex
index dff794c..f0b2ffa 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex
index 3500574..720352e 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex
index 76a05d4..8a900e1 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex
index 32b3591..eedc607 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex
index 65bd058..3210309 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex
index c5a8ad6..69463d8 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex
index b0c70ba..4c0d63c 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex
index 1f1e87b..dcf65a9 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex
index a0e278a..d04a32f 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex
index 92ebd7f..c3dd774 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex
index 766f245..fc5c761 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex
index e7a6ab8..a246a73 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex
index 10bda43..33677d7 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex
index 9413fb0..0824b65 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex
index 9ac9840..7b05d3e 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/runtime_symbol_list/debug/R.txt b/src/Notes-master1/app/build/intermediates/runtime_symbol_list/debug/R.txt
index fc5f095..b6d73ae 100644
--- a/src/Notes-master1/app/build/intermediates/runtime_symbol_list/debug/R.txt
+++ b/src/Notes-master1/app/build/intermediates/runtime_symbol_list/debug/R.txt
@@ -115,40 +115,43 @@ int id ll_font_super 0x7f050021
 int id menu_alert 0x7f050022
 int id menu_day_time 0x7f050023
 int id menu_delete 0x7f050024
-int id menu_delete_remind 0x7f050025
-int id menu_export_text 0x7f050026
-int id menu_font_size 0x7f050027
-int id menu_list_mode 0x7f050028
-int id menu_new_folder 0x7f050029
-int id menu_new_note 0x7f05002a
-int id menu_night_time 0x7f05002b
-int id menu_search 0x7f05002c
-int id menu_send_to_desktop 0x7f05002d
-int id menu_setting 0x7f05002e
-int id menu_share 0x7f05002f
-int id menu_sync 0x7f050030
-int id minute 0x7f050031
-int id move 0x7f050032
-int id navigation_bar 0x7f050033
-int id note_bg_color_selector 0x7f050034
-int id note_edit_list 0x7f050035
-int id note_edit_view 0x7f050036
-int id note_item 0x7f050037
-int id note_title 0x7f050038
-int id notes_list 0x7f050039
-int id prefenerece_sync_status_textview 0x7f05003a
-int id preference_sync_button 0x7f05003b
-int id selection_menu 0x7f05003c
-int id sv_note_edit 0x7f05003d
-int id tv_alert_date 0x7f05003e
-int id tv_folder_name 0x7f05003f
-int id tv_modified_date 0x7f050040
-int id tv_name 0x7f050041
-int id tv_time 0x7f050042
-int id tv_title 0x7f050043
-int id tv_title_bar 0x7f050044
-int id widget_bg_image 0x7f050045
-int id widget_text 0x7f050046
+int id menu_delete_passcode 0x7f050025
+int id menu_delete_remind 0x7f050026
+int id menu_export_text 0x7f050027
+int id menu_font_size 0x7f050028
+int id menu_list_mode 0x7f050029
+int id menu_new_folder 0x7f05002a
+int id menu_new_note 0x7f05002b
+int id menu_night_time 0x7f05002c
+int id menu_search 0x7f05002d
+int id menu_send_to_desktop 0x7f05002e
+int id menu_set_passcode 0x7f05002f
+int id menu_setting 0x7f050030
+int id menu_share 0x7f050031
+int id menu_sync 0x7f050032
+int id menu_voice_mix 0x7f050033
+int id minute 0x7f050034
+int id move 0x7f050035
+int id navigation_bar 0x7f050036
+int id note_bg_color_selector 0x7f050037
+int id note_edit_list 0x7f050038
+int id note_edit_view 0x7f050039
+int id note_item 0x7f05003a
+int id note_title 0x7f05003b
+int id notes_list 0x7f05003c
+int id prefenerece_sync_status_textview 0x7f05003d
+int id preference_sync_button 0x7f05003e
+int id selection_menu 0x7f05003f
+int id sv_note_edit 0x7f050040
+int id tv_alert_date 0x7f050041
+int id tv_folder_name 0x7f050042
+int id tv_modified_date 0x7f050043
+int id tv_name 0x7f050044
+int id tv_time 0x7f050045
+int id tv_title 0x7f050046
+int id tv_title_bar 0x7f050047
+int id widget_bg_image 0x7f050048
+int id widget_text 0x7f050049
 int layout account_dialog_title 0x7f060000
 int layout add_account_text 0x7f060001
 int layout datetime_picker 0x7f060002
@@ -207,76 +210,79 @@ int string info_note_enter_desktop 0x7f0a001f
 int string menu_alert 0x7f0a0020
 int string menu_create_folder 0x7f0a0021
 int string menu_delete 0x7f0a0022
-int string menu_deselect_all 0x7f0a0023
-int string menu_export_text 0x7f0a0024
-int string menu_folder_change_name 0x7f0a0025
-int string menu_folder_delete 0x7f0a0026
-int string menu_folder_view 0x7f0a0027
-int string menu_font_large 0x7f0a0028
-int string menu_font_normal 0x7f0a0029
-int string menu_font_size 0x7f0a002a
-int string menu_font_small 0x7f0a002b
-int string menu_font_super 0x7f0a002c
-int string menu_list_mode 0x7f0a002d
-int string menu_move 0x7f0a002e
-int string menu_move_parent_folder 0x7f0a002f
-int string menu_normal_mode 0x7f0a0030
-int string menu_remove_remind 0x7f0a0031
-int string menu_search 0x7f0a0032
-int string menu_select_all 0x7f0a0033
-int string menu_select_none 0x7f0a0034
-int string menu_select_title 0x7f0a0035
-int string menu_send_to_desktop 0x7f0a0036
-int string menu_set_password 0x7f0a0037
-int string menu_setting 0x7f0a0038
-int string menu_share 0x7f0a0039
-int string menu_sync 0x7f0a003a
-int string menu_sync_cancel 0x7f0a003b
-int string menu_title_select_folder 0x7f0a003c
-int string night_time 0x7f0a003d
-int string note_alert_expired 0x7f0a003e
-int string note_link_email 0x7f0a003f
-int string note_link_other 0x7f0a0040
-int string note_link_tel 0x7f0a0041
-int string note_link_web 0x7f0a0042
-int string notealert_enter 0x7f0a0043
-int string notealert_ok 0x7f0a0044
-int string notelist_menu_new 0x7f0a0045
-int string notelist_string_info 0x7f0a0046
-int string preferences_account_summary 0x7f0a0047
-int string preferences_account_title 0x7f0a0048
-int string preferences_add_account 0x7f0a0049
-int string preferences_bg_random_appear_title 0x7f0a004a
-int string preferences_button_sync_cancel 0x7f0a004b
-int string preferences_button_sync_immediately 0x7f0a004c
-int string preferences_dialog_change_account_title 0x7f0a004d
-int string preferences_dialog_change_account_warn_msg 0x7f0a004e
-int string preferences_dialog_select_account_tips 0x7f0a004f
-int string preferences_dialog_select_account_title 0x7f0a0050
-int string preferences_last_sync_time 0x7f0a0051
-int string preferences_last_sync_time_format 0x7f0a0052
-int string preferences_menu_cancel 0x7f0a0053
-int string preferences_menu_change_account 0x7f0a0054
-int string preferences_menu_remove_account 0x7f0a0055
-int string preferences_title 0x7f0a0056
-int string preferences_toast_cannot_change_account 0x7f0a0057
-int string preferences_toast_success_set_accout 0x7f0a0058
-int string search 0x7f0a0059
-int string search_hint 0x7f0a005a
-int string search_label 0x7f0a005b
-int string search_setting_description 0x7f0a005c
-int string set_remind_time_message 0x7f0a005d
-int string success_sdcard_export 0x7f0a005e
-int string success_sync_account 0x7f0a005f
-int string sync_progress_init_list 0x7f0a0060
-int string sync_progress_login 0x7f0a0061
-int string sync_progress_syncing 0x7f0a0062
-int string ticker_cancel 0x7f0a0063
-int string ticker_fail 0x7f0a0064
-int string ticker_success 0x7f0a0065
-int string ticker_syncing 0x7f0a0066
-int string widget_havenot_content 0x7f0a0067
-int string widget_under_visit_mode 0x7f0a0068
+int string menu_delete_passcode 0x7f0a0023
+int string menu_deselect_all 0x7f0a0024
+int string menu_export_text 0x7f0a0025
+int string menu_folder_change_name 0x7f0a0026
+int string menu_folder_delete 0x7f0a0027
+int string menu_folder_view 0x7f0a0028
+int string menu_font_large 0x7f0a0029
+int string menu_font_normal 0x7f0a002a
+int string menu_font_size 0x7f0a002b
+int string menu_font_small 0x7f0a002c
+int string menu_font_super 0x7f0a002d
+int string menu_list_mode 0x7f0a002e
+int string menu_move 0x7f0a002f
+int string menu_move_parent_folder 0x7f0a0030
+int string menu_normal_mode 0x7f0a0031
+int string menu_remove_remind 0x7f0a0032
+int string menu_search 0x7f0a0033
+int string menu_select_all 0x7f0a0034
+int string menu_select_none 0x7f0a0035
+int string menu_select_title 0x7f0a0036
+int string menu_send_to_desktop 0x7f0a0037
+int string menu_set_passcode 0x7f0a0038
+int string menu_set_password 0x7f0a0039
+int string menu_setting 0x7f0a003a
+int string menu_share 0x7f0a003b
+int string menu_sync 0x7f0a003c
+int string menu_sync_cancel 0x7f0a003d
+int string menu_title_select_folder 0x7f0a003e
+int string night_time 0x7f0a003f
+int string note_alert_expired 0x7f0a0040
+int string note_link_email 0x7f0a0041
+int string note_link_other 0x7f0a0042
+int string note_link_tel 0x7f0a0043
+int string note_link_web 0x7f0a0044
+int string notealert_enter 0x7f0a0045
+int string notealert_ok 0x7f0a0046
+int string notelist_menu_new 0x7f0a0047
+int string notelist_string_info 0x7f0a0048
+int string preferences_account_summary 0x7f0a0049
+int string preferences_account_title 0x7f0a004a
+int string preferences_add_account 0x7f0a004b
+int string preferences_bg_random_appear_title 0x7f0a004c
+int string preferences_button_sync_cancel 0x7f0a004d
+int string preferences_button_sync_immediately 0x7f0a004e
+int string preferences_dialog_change_account_title 0x7f0a004f
+int string preferences_dialog_change_account_warn_msg 0x7f0a0050
+int string preferences_dialog_select_account_tips 0x7f0a0051
+int string preferences_dialog_select_account_title 0x7f0a0052
+int string preferences_last_sync_time 0x7f0a0053
+int string preferences_last_sync_time_format 0x7f0a0054
+int string preferences_menu_cancel 0x7f0a0055
+int string preferences_menu_change_account 0x7f0a0056
+int string preferences_menu_remove_account 0x7f0a0057
+int string preferences_title 0x7f0a0058
+int string preferences_toast_cannot_change_account 0x7f0a0059
+int string preferences_toast_success_set_accout 0x7f0a005a
+int string search 0x7f0a005b
+int string search_hint 0x7f0a005c
+int string search_label 0x7f0a005d
+int string search_setting_description 0x7f0a005e
+int string set_remind_time_message 0x7f0a005f
+int string success_sdcard_export 0x7f0a0060
+int string success_sync_account 0x7f0a0061
+int string sync_progress_init_list 0x7f0a0062
+int string sync_progress_login 0x7f0a0063
+int string sync_progress_syncing 0x7f0a0064
+int string ticker_cancel 0x7f0a0065
+int string ticker_fail 0x7f0a0066
+int string ticker_success 0x7f0a0067
+int string ticker_syncing 0x7f0a0068
+int string voice_mix 0x7f0a0069
+int string widget_havenot_content 0x7f0a006a
+int string widget_under_visit_mode 0x7f0a006b
 int style HighlightTextAppearancePrimary 0x7f0b0000
 int style HighlightTextAppearanceSecondary 0x7f0b0001
 int style NoteActionBarStyle 0x7f0b0002
diff --git a/src/Notes-master1/app/build/outputs/apk/debug/app-debug.apk b/src/Notes-master1/app/build/outputs/apk/debug/app-debug.apk
index d4704cc..55ff3b2 100644
Binary files a/src/Notes-master1/app/build/outputs/apk/debug/app-debug.apk and b/src/Notes-master1/app/build/outputs/apk/debug/app-debug.apk differ
diff --git a/src/Notes-master1/app/build/outputs/apk/debug/output-metadata.json b/src/Notes-master1/app/build/outputs/apk/debug/output-metadata.json
index b2231b9..d6b0043 100644
--- a/src/Notes-master1/app/build/outputs/apk/debug/output-metadata.json
+++ b/src/Notes-master1/app/build/outputs/apk/debug/output-metadata.json
@@ -12,7 +12,7 @@
       "filters": [],
       "attributes": [],
       "versionCode": 1,
-      "versionName": "0.1",
+      "versionName": "1.0",
       "outputFile": "app-debug.apk"
     }
   ],
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin
index deb4fdd..d34dd61 100644
Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin and b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin differ
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/model/WorkingNote.java b/src/Notes-master1/app/src/main/java/net/micode/notes/model/WorkingNote.java
index dc4484a..8deb26b 100644
--- a/src/Notes-master1/app/src/main/java/net/micode/notes/model/WorkingNote.java
+++ b/src/Notes-master1/app/src/main/java/net/micode/notes/model/WorkingNote.java
@@ -38,7 +38,7 @@ public class WorkingNote {
     // Note Id
     private long mNoteId;
     // Note content
-   public String mContent;
+    public String mContent;
     // Note mode
     private int mMode;
 
@@ -62,8 +62,12 @@ public class WorkingNote {
 
     private NoteSettingChangedListener mNoteSettingStatusListener;
 
-    private String mPassword;
+    private String mPassword = "";
 
+    public  boolean hasmPassword(){
+        if (mPassword == "") return false;
+        else return true;
+    }
     /**
      * 设置便签的访问密码
      * @param  password 新的访问密码
@@ -72,7 +76,7 @@ public class WorkingNote {
         //将该类的mPassword属性设置为新的访问密码
         mPassword = password;
         //将修改后的便签密码写入到便签数据库中
-        mNote.setNoteValue(NoteColumns.PASSWORD,mPassword);
+        mNote.setNoteValue(NoteColumns.PASSWORD,String.valueOf(mPassword));
     }
 
 
@@ -126,6 +130,7 @@ public class WorkingNote {
         mIsDeleted = false;
         mMode = 0;
         mWidgetType = Notes.TYPE_WIDGET_INVALIDE;
+
     }
 
     // Existing note construct
@@ -135,6 +140,7 @@ public class WorkingNote {
         mFolderId = folderId;
         mIsDeleted = false;
         mNote = new Note();
+
         loadNote();
     }
 
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
index f237158..8deee36 100644
--- a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
+++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
@@ -19,6 +19,7 @@ package net.micode.notes.ui;
 import android.app.Activity;
 import android.app.AlarmManager;
 import android.app.AlertDialog;
+import android.app.Dialog;
 import android.app.PendingIntent;
 import android.app.SearchManager;
 import android.appwidget.AppWidgetManager;
@@ -58,6 +59,7 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.WindowManager;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
@@ -68,6 +70,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;
@@ -86,6 +90,7 @@ import net.micode.notes.widget.NoteWidgetProvider_4x;
 import java.io.FileNotFoundException;
 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;
@@ -137,10 +142,13 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         sFontSelectorSelectionMap.put(ResourceParser.TEXT_SUPER, R.id.iv_super_select);
     }
 
+
     private static final String TAG = "NoteEditActivity";
 
     private HeadViewHolder mNoteHeaderHolder;
 
+    private int time_mode = 1;
+
     private View mHeadViewPanel;
 
     private View mNoteBgColorSelector;
@@ -308,6 +316,41 @@ public class NoteEditActivity extends Activity implements OnClickListener,
     }
 
     private void initNoteScreen() {
+        /*String mPassword = mWorkingNote.getmPassword();//读取数据库中的密码
+        if (mPassword!=null && mPassword.length() != 0) {
+            //创建dialog，插入edittext，用户输入密码并做出检验。
+            final AlertDialog.Builder builder = new AlertDialog.Builder(this);
+            View view = LayoutInflater.from(this).inflate(R.layout.dialog_edit_text, null);
+            //编辑Text
+            final EditText etName = (EditText) view.findViewById(R.id.et_foler_name);
+            etName.setText("");
+            etName.setHint("请输入密码");
+            builder.setTitle("密码检验");
+            builder.setPositiveButton("OK", new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    //获取输入的字符串
+                    String password = etName.getText().toString();
+                    Log.d("mPassword: ", mPassword);
+                    Log.d("password: ", password);
+                    //判断密码正确性
+                    if (!password.equals(mPassword)) {
+                        Log.d("密码不正确,正确密码是：",mPassword);
+                        dialog.dismiss();
+                        onBackPressed();
+                    }
+                }
+            });
+            builder.setNegativeButton("cancel", new DialogInterface.OnClickListener(){
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    dialog.dismiss();
+                    onBackPressed();
+                }
+            });
+            final Dialog dialog = builder.setView(view).show();
+            dialog.show();
+        }*/
         mNoteEditor.setTextAppearance(this, TextAppearanceResources.getTexAppearanceResource(mFontSizeId));
         if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) {
             switchToListMode(mWorkingNote.getContent());
@@ -348,6 +391,11 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         };
     }
 
+
+    private void texttoSpeech(){
+        mTTS.speak(mNoteEditor.getText().toString(),TextToSpeech.QUEUE_FLUSH,null,null);
+    }
+
     //路径字符串格式 转换为 图片image格式
     private void convertToImage() {
         NoteEditText noteEditText = (NoteEditText) findViewById(R.id.note_edit_view); //获取当前的edit
@@ -440,7 +488,19 @@ 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);// 设置音调，值越大声音越尖（女生），值越小则变成男声,1.0是常规
+                    mTTS.setSpeechRate(0.5f);
+                }
+            }
+        });
         mHeadViewPanel = findViewById(R.id.note_title);
         mNoteHeaderHolder = new HeadViewHolder();
         mNoteHeaderHolder.tvModified = (TextView) findViewById(R.id.tv_modified_date);
@@ -564,6 +624,13 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         }
         clearSettingState();
         menu.clear();
+        if (mWorkingNote.hasmPassword()){
+            if (menu.findItem(R.id.menu_set_passcode) != null)
+                menu.findItem(R.id.menu_set_passcode).setVisible(false);
+        }else {
+            if (menu.findItem(R.id.menu_delete_passcode) != null)
+            menu.findItem(R.id.menu_delete_passcode).setVisible(false);
+        }
         if (mWorkingNote.getFolderId() == Notes.ID_CALL_RECORD_FOLDER) {
             getMenuInflater().inflate(R.menu.call_note_edit, menu);
         } else {
@@ -611,6 +678,10 @@ public class NoteEditActivity extends Activity implements OnClickListener,
                 mWorkingNote.setCheckListMode(mWorkingNote.getCheckListMode() == 0 ?
                         TextNote.MODE_CHECK_LIST : 0);
                 break;
+            case R.id.menu_voice_mix:
+                Log.d("voice mix","in");
+                texttoSpeech();
+                break;
             case R.id.menu_share:
                 getWorkingText();
                 sendTo(this, mWorkingNote.getContent());
@@ -621,6 +692,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
             case R.id.menu_alert:
                 setReminder();
                 break;
+
             case R.id.menu_delete_remind:
                 mWorkingNote.setAlertDate(0, false);
                 break;
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
index 5d7a7af..9303602 100644
--- a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
+++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
@@ -213,6 +213,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
     }
 
     private void initResources() {
+
         mContentResolver = this.getContentResolver();
         mBackgroundQueryHandler = new BackgroundQueryHandler(this.getContentResolver());
         mCurrentFolderId = Notes.ID_ROOT_FOLDER;
@@ -807,6 +808,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
             case R.id.menu_day_time:{
                 time_mode = 1;
                 getWindow().setBackgroundDrawableResource(R.drawable.light_mode);
+                break;
             }
             case R.id.menu_night_time: {
                 time_mode = 0;
@@ -821,6 +823,10 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
                 createNewNote();
                 break;
             }
+            case R.id.menu_voice_mix:{
+                //Log.d("voice mix","in");
+                break;
+            }
             case R.id.menu_search:
                 onSearchRequested();
                 break;
diff --git a/src/Notes-master1/app/src/main/res/layout/note_edit.xml b/src/Notes-master1/app/src/main/res/layout/note_edit.xml
index 6a63bff..d96eed9 100644
--- a/src/Notes-master1/app/src/main/res/layout/note_edit.xml
+++ b/src/Notes-master1/app/src/main/res/layout/note_edit.xml
@@ -56,13 +56,7 @@
                 android:layout_marginRight="8dip"
                 android:textAppearance="@style/TextAppearanceSecondaryItem" />
 
-            <ImageButton
-                android:id="@+id/image_of_lock"
-                android:layout_width="77dp"
-                android:layout_height="match_parent"
-                android:layout_gravity="center"
-                android:background="@drawable/lock"
-                tools:ignore="SpeakableTextPresentCheck" />
+
 
             <ImageButton
                 android:layout_width="48dp"
@@ -104,6 +98,7 @@
                         android:autoLink="all"
                         android:background="@null"
                         android:gravity="left|top"
+                        android:typeface="monospace"
                         android:lineSpacingMultiplier="1.2"
                         android:linksClickable="false"
                         android:minLines="12"
diff --git a/src/Notes-master1/app/src/main/res/menu/call_note_edit.xml b/src/Notes-master1/app/src/main/res/menu/call_note_edit.xml
index 02c0528..28e6e59 100644
--- a/src/Notes-master1/app/src/main/res/menu/call_note_edit.xml
+++ b/src/Notes-master1/app/src/main/res/menu/call_note_edit.xml
@@ -26,6 +26,10 @@
         android:id="@+id/menu_font_size"
         android:title="@string/menu_font_size"/>
 
+    <item
+        android:id="@+id/menu_voice_mix"
+        android:title="@string/voice_mix"/>
+
     <item
         android:id="@+id/menu_list_mode"
         android:title="@string/menu_list_mode" />
@@ -45,4 +49,14 @@
     <item
         android:id="@+id/menu_delete_remind"
         android:title="@string/menu_remove_remind" />
+
+    <item
+        android:id="@+id/menu_set_passcode"
+        android:title="@string/menu_set_passcode"/>
+
+    <item
+        android:id="@+id/menu_delete_passcode"
+        android:title="@string/menu_delete_passcode"/>
+
+
 </menu>
diff --git a/src/Notes-master1/app/src/main/res/menu/note_edit.xml b/src/Notes-master1/app/src/main/res/menu/note_edit.xml
index 085284d..b39f17d 100644
--- a/src/Notes-master1/app/src/main/res/menu/note_edit.xml
+++ b/src/Notes-master1/app/src/main/res/menu/note_edit.xml
@@ -30,6 +30,10 @@
         android:id="@+id/menu_font_size"
         android:title="@string/menu_font_size"/>
 
+    <item
+        android:id="@+id/menu_voice_mix"
+        android:title="@string/voice_mix"/>
+
     <item
         android:id="@+id/menu_list_mode"
         android:title="@string/menu_list_mode" />
@@ -50,4 +54,6 @@
         android:id="@+id/menu_delete_remind"
         android:title="@string/menu_remove_remind" />
 
+
+
 </menu>
\ No newline at end of file
diff --git a/src/Notes-master1/app/src/main/res/menu/note_list.xml b/src/Notes-master1/app/src/main/res/menu/note_list.xml
index 45aa504..58c1a90 100644
--- a/src/Notes-master1/app/src/main/res/menu/note_list.xml
+++ b/src/Notes-master1/app/src/main/res/menu/note_list.xml
@@ -44,4 +44,5 @@
     <item
         android:id="@+id/menu_night_time"
         android:title="@string/night_time"/>
+
 </menu>
diff --git a/src/Notes-master1/app/src/main/res/values-zh-rCN/strings.xml b/src/Notes-master1/app/src/main/res/values-zh-rCN/strings.xml
index ccb9138..ea3c5ae 100644
--- a/src/Notes-master1/app/src/main/res/values-zh-rCN/strings.xml
+++ b/src/Notes-master1/app/src/main/res/values-zh-rCN/strings.xml
@@ -63,6 +63,8 @@
     <string name="menu_send_to_desktop">发送到桌面</string>
     <string name="menu_alert">提醒我</string>
     <string name="menu_remove_remind">删除提醒</string>
+    <string name="menu_set_passcode">上锁</string>
+    <string name="menu_delete_passcode">解锁</string>
     <string name="menu_title_select_folder">选择文件夹</string>
     <string name="menu_move_parent_folder">上一级文件夹</string>
     <string name="info_note_enter_desktop">已添加到桌面</string>
@@ -74,6 +76,7 @@
     <string name="menu_set_password">设置密码</string>
     <string name="day_time">日间模式</string>
     <string name="night_time">夜晚模式</string>
+    <string name="voice_mix">语音合成</string>
     <!-- export text -->
     <string name="error_sdcard_unmounted">SD卡被占用，不能操作</string>
     <string name="error_sdcard_export">导出文本时发生错误，请检查SD卡</string>
diff --git a/src/Notes-master1/app/src/main/res/values/strings.xml b/src/Notes-master1/app/src/main/res/values/strings.xml
index df8d431..c3947df 100644
--- a/src/Notes-master1/app/src/main/res/values/strings.xml
+++ b/src/Notes-master1/app/src/main/res/values/strings.xml
@@ -67,6 +67,9 @@
     <string name="menu_send_to_desktop">Send to home</string>
     <string name="menu_alert">Remind me</string>
     <string name="menu_remove_remind">Delete reminder</string>
+    <string name="menu_set_passcode">Lock</string>
+    <string name="menu_delete_passcode">Delete Lock</string>
+    <string name="voice_mix">voice mix</string>
     <string name="menu_title_select_folder">Select folder</string>
     <string name="menu_move_parent_folder">Parent folder</string>
     <string name="info_note_enter_desktop">Note added to home</string>