Squashed commit of the following:

commit d809f5ae65 Author: zcx <1078327420@qq.com> Date: Tue Jan 9 15:29:18 2024 +0800 1 commit efcb4613c5 Merge: 261f44d 86290a8 Author: zcx <1078327420@qq.com> Date: Tue Jan 9 15:25:21 2024 +0800 Merge branch 'main' of https://bdgit.educoder.net/pq3fnjual/Minotes into 曾晨曦_branch # Conflicts: # doc/实践模板-开源软件泛读、标注和维护报告文档.docx # master/Notes-master1/.idea/.gitignore # master/Notes-master1/app/build/intermediates/packaged_res/debug/color/primary_text_dark.xml # master/Notes-master1/app/build/intermediates/packaged_res/debug/color/secondary_text_dark.xml # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/bg_btn_set_color.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/bg_color_btn_mask.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/call_record.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/clock.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/delete.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/dropdown_icon.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_blue.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_green.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_red.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_title_blue.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_title_green.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_title_red.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_title_white.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_title_yellow.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_white.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_yellow.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/font_large.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/font_normal.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/font_size_selector_bg.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/font_small.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/font_super.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/icon_app.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_background.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_blue_down.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_blue_middle.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_blue_single.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_blue_up.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_folder.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_footer_bg.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_green_down.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_green_middle.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_green_single.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_green_up.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_red_down.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_red_middle.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_red_single.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_red_up.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_white_down.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_white_middle.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_white_single.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_white_up.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_yellow_down.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_yellow_middle.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_yellow_single.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_yellow_up.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/menu_delete.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/menu_move.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/new_note_normal.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/new_note_pressed.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/note_edit_color_selector_panel.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/notification.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/search_result.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/selected.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/title_alert.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/title_bar_bg.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_2x_blue.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_2x_green.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_2x_red.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_2x_white.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_2x_yellow.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_4x_blue.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_4x_green.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_4x_red.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_4x_white.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_4x_yellow.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable/new_note.xml # master/Notes-master1/app/build/intermediates/packaged_res/debug/layout/account_dialog_title.xml # master/Notes-master1/app/build/intermediates/packaged_res/debug/layout/add_account_text.xml # master/Notes-master1/app/build/intermediates/packaged_res/debug/layout/datetime_picker.xml # master/Notes-master1/app/build/intermediates/packaged_res/debug/layout/dialog_edit_text.xml # master/Notes-master1/app/build/intermediates/packaged_res/debug/layout/folder_list_item.xml # master/Notes-master1/app/build/intermediates/packaged_res/debug/layout/note_edit.xml # master/Notes-master1/app/build/intermediates/packaged_res/debug/layout/note_edit_list_item.xml # master/Notes-master1/app/build/intermediates/packaged_res/debug/layout/note_item.xml # master/Notes-master1/app/build/intermediates/packaged_res/debug/layout/note_list.xml # master/Notes-master1/app/build/intermediates/packaged_res/debug/layout/note_list_dropdown_menu.xml # master/Notes-master1/app/build/intermediates/packaged_res/debug/layout/note_list_footer.xml # master/Notes-master1/app/build/intermediates/packaged_res/debug/layout/settings_header.xml # master/Notes-master1/app/build/intermediates/packaged_res/debug/layout/widget_2x.xml # master/Notes-master1/app/build/intermediates/packaged_res/debug/layout/widget_4x.xml # master/Notes-master1/app/build/intermediates/packaged_res/debug/menu/call_note_edit.xml # master/Notes-master1/app/build/intermediates/packaged_res/debug/menu/call_record_folder.xml # master/Notes-master1/app/build/intermediates/packaged_res/debug/menu/note_edit.xml # master/Notes-master1/app/build/intermediates/packaged_res/debug/menu/note_list.xml # master/Notes-master1/app/build/intermediates/packaged_res/debug/menu/note_list_dropdown.xml # master/Notes-master1/app/build/intermediates/packaged_res/debug/menu/note_list_options.xml # master/Notes-master1/app/build/intermediates/packaged_res/debug/menu/sub_folder.xml # master/Notes-master1/app/build/intermediates/packaged_res/debug/raw-zh-rCN/introduction # master/Notes-master1/app/build/intermediates/packaged_res/debug/raw/introduction # master/Notes-master1/app/build/intermediates/packaged_res/debug/xml/preferences.xml # master/Notes-master1/app/build/intermediates/packaged_res/debug/xml/searchable.xml # master/Notes-master1/app/build/intermediates/packaged_res/debug/xml/widget_2x_info.xml # master/Notes-master1/app/build/intermediates/packaged_res/debug/xml/widget_4x_info.xml # master/Notes-master1/app/src/main/AndroidManifest.xml # master/Notes-master1/app/src/main/java/net/micode/notes/data/Contact.java # master/Notes-master1/app/src/main/java/net/micode/notes/data/Notes.java # master/Notes-master1/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java # master/Notes-master1/app/src/main/java/net/micode/notes/data/NotesProvider.java # master/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/MetaData.java # master/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/Node.java # master/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/SqlData.java # master/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java # master/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/Task.java # master/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/TaskList.java # master/Notes-master1/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java # master/Notes-master1/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java # master/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java # master/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java # master/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java # master/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java # master/Notes-master1/app/src/main/java/net/micode/notes/model/Note.java # master/Notes-master1/app/src/main/java/net/micode/notes/model/WorkingNote.java # master/Notes-master1/app/src/main/java/net/micode/notes/tool/BackupUtils.java # master/Notes-master1/app/src/main/java/net/micode/notes/tool/DataUtils.java # master/Notes-master1/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java # master/Notes-master1/app/src/main/java/net/micode/notes/tool/ResourceParser.java # master/Notes-master1/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java # master/Notes-master1/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java # master/Notes-master1/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java # master/Notes-master1/app/src/main/java/net/micode/notes/ui/DateTimePicker.java # master/Notes-master1/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java # master/Notes-master1/app/src/main/java/net/micode/notes/ui/DropdownMenu.java # master/Notes-master1/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java # master/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java # master/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditText.java # master/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteItemData.java # master/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java # master/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java # master/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListItem.java # master/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java # master/Notes-master1/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java # master/Notes-master1/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java # master/Notes-master1/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java # master/Notes-master1/app/src/main/res/values-zh-rCN/arrays.xml # master/Notes-master1/app/src/main/res/values-zh-rCN/strings.xml # master/Notes-master1/app/src/main/res/values-zh-rTW/arrays.xml # master/Notes-master1/app/src/main/res/values-zh-rTW/strings.xml # master/Notes-master1/app/src/main/res/values/arrays.xml # master/Notes-master1/app/src/main/res/values/colors.xml # master/Notes-master1/app/src/main/res/values/dimens.xml # master/Notes-master1/app/src/main/res/values/strings.xml # master/Notes-master1/app/src/main/res/values/styles.xml # src/Notes-master/src/net/micode/notes/data/Contact.java # src/Notes-master/src/net/micode/notes/data/Notes.java # src/Notes-master/src/net/micode/notes/data/NotesDatabaseHelper.java # src/Notes-master/src/net/micode/notes/ui/.idea/misc.xml # src/Notes-master/src/net/micode/notes/ui/.idea/modules.xml # src/Notes-master/src/net/micode/notes/ui/AlarmAlertActivity.java # src/Notes-master/src/net/micode/notes/ui/AlarmInitReceiver.java # src/Notes-master/src/net/micode/notes/ui/DateTimePicker.java # src/Notes-master/src/net/micode/notes/ui/NotesListItem.java # src/Notes-master/src/net/micode/notes/ui/NotesPreferenceActivity.java # src/Notes-master/src/net/micode/notes/ui/ui.iml commit 261f44dedb Author: zcx <1078327420@qq.com> Date: Tue Jan 9 15:19:32 2024 +0800 1 commit 9f451086c2 Author: zcx <1078327420@qq.com> Date: Sat Dec 23 16:04:43 2023 +0800 12.23添加 commit e5572d51b9 Author: zcx <1078327420@qq.com> Date: Sat Dec 23 10:21:14 2023 +0800 12.23 commit d09e80db11 Author: zcx <1078327420@qq.com> Date: Fri Dec 22 20:54:32 2023 +0800 1 commit 4853527fe5 Author: zcx <1078327420@qq.com> Date: Thu Dec 21 21:16:22 2023 +0800 1 commit b145d72307 Author: zcx <1078327420@qq.com> Date: Thu Dec 21 21:14:41 2023 +0800 1 commit fcc509a830 Author: zcx <1078327420@qq.com> Date: Thu Dec 21 10:01:45 2023 +0800 1 commit 197dfc861e Author: zcx <1078327420@qq.com> Date: Tue Dec 19 11:54:49 2023 +0800 1 commit ed719ab579 Author: zcx <1078327420@qq.com> Date: Tue Dec 19 11:47:13 2023 +0800 最近标注 commit 48849a21d6 Merge: c7b8dfe d23da33 Author: zcx <1078327420@qq.com> Date: Tue Dec 19 07:38:32 2023 +0800 Merge branch 'main' of https://bdgit.educoder.net/pq3fnjual/Minotes into 曾晨曦_branch # Conflicts: # doc/实践模板-开源软件泛读、标注和维护报告文档.docx commit c7b8dfe14a Author: zcx <1078327420@qq.com> Date: Tue Dec 19 07:27:37 2023 +0800 1 commit 781d628f8f Author: zcx <1078327420@qq.com> Date: Sat Dec 16 08:03:54 2023 +0800 标注 commit fe88fa8706 Merge: 40a106a 50cfb15 Author: zcx <1078327420@qq.com> Date: Sat Dec 16 08:02:00 2023 +0800 Merge branch 'main' of https://bdgit.educoder.net/pq3fnjual/Minotes into 曾晨曦_branch commit 40a106ab72 Author: zcx <1078327420@qq.com> Date: Thu Dec 14 18:50:49 2023 +0800 1 commit a6bf1d5701 Author: zcx <1078327420@qq.com> Date: Thu Dec 14 18:36:19 2023 +0800 UI包一部分 commit a99095dbf9 Author: zcx <1078327420@qq.com> Date: Thu Dec 14 18:25:02 2023 +0800 data包 commit b7353d6c78 Merge: b5f43d0 0b1994e Author: zcx <1078327420@qq.com> Date: Thu Dec 14 18:22:15 2023 +0800 Merge branch 'main' of https://bdgit.educoder.net/pq3fnjual/Minotes into 曾晨曦_branch # Conflicts: # .gitignore # doc/实践模板-开源软件泛读、标注和维护报告文档.docx commit b5f43d0721 Author: zcx <1078327420@qq.com> Date: Sun Dec 10 10:38:18 2023 +0800 1 commit a8c79ccdc5 Author: zcx <1078327420@qq.com> Date: Mon Dec 4 21:09:41 2023 +0800 。
2 years ago · 24cf290765
parent 86290a8c43
commit 24cf290765
115 changed files with 245 additions and 412 deletions
--- a/doc/实践模板-开源软件泛读、标注和维护报告文档.docx
+++ b/doc/实践模板-开源软件泛读、标注和维护报告文档.docx
--- a/master/Notes-master1/.gradle/8.0/executionHistory/executionHistory.bin
+++ b/master/Notes-master1/.gradle/8.0/executionHistory/executionHistory.bin
--- a/master/Notes-master1/.gradle/8.0/executionHistory/executionHistory.lock
+++ b/master/Notes-master1/.gradle/8.0/executionHistory/executionHistory.lock
--- a/master/Notes-master1/.gradle/8.0/fileHashes/fileHashes.bin
+++ b/master/Notes-master1/.gradle/8.0/fileHashes/fileHashes.bin
--- a/master/Notes-master1/.gradle/8.0/fileHashes/fileHashes.lock
+++ b/master/Notes-master1/.gradle/8.0/fileHashes/fileHashes.lock
--- a/master/Notes-master1/.gradle/8.0/fileHashes/resourceHashesCache.bin
+++ b/master/Notes-master1/.gradle/8.0/fileHashes/resourceHashesCache.bin
--- a/master/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock
+++ b/master/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock
--- a/master/Notes-master1/.gradle/file-system.probe
+++ b/master/Notes-master1/.gradle/file-system.probe
--- a/master/Notes-master1/.idea/sonarlint/issuestore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c
+++ b/master/Notes-master1/.idea/sonarlint/issuestore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c
@ -1,67 +1,69 @@

-t
-java:S2293W"YReplace the type specification in this constructor call with the diamond operator ("<>").(ÑÓ<C391>¥üÿÿÿÿ
-t
-java:S2293`"YReplace the type specification in this constructor call with the diamond operator ("<>").(®ú÷õþÿÿÿÿ
-t
-java:S2293i"YReplace the type specification in this constructor call with the diamond operator ("<>").(êÝýÂþÿÿÿÿ
-o
-java:S2293q"YReplace the type specification in this constructor call with the diamond operator ("<>").(À—’¢
-p
-java:S2293Å"YReplace the type specification in this constructor call with the diamond operator ("<>").(è‰¥ð
-?
-java:S1604‡"(Make this anonymous inner class a lambda(Î¬¯”
+{
+java:S2293Z"YReplace the type specification in this constructor call with the diamond operator ("<>").(ÑÓ<C391>¥üÿÿÿÿ8äµŠáÎ1
+{
+java:S2293c"YReplace the type specification in this constructor call with the diamond operator ("<>").(®ú÷õþÿÿÿÿ8äµŠáÎ1
+{
+java:S2293l"YReplace the type specification in this constructor call with the diamond operator ("<>").(êÝýÂþÿÿÿÿ8äµŠáÎ1
+v
+java:S2293t"YReplace the type specification in this constructor call with the diamond operator ("<>").(À—’¢8äµŠáÎ1
+w
+java:S2293Ø"YReplace the type specification in this constructor call with the diamond operator ("<>").(è‰¥ð8äµŠáÎ1
+K
+java:S1604ñ"(Make this anonymous inner class a lambda(×îðóÿÿÿÿÿ8æµŠáÎ1
+F
+java:S1604”"(Make this anonymous inner class a lambda(Î¬¯”8ÎÁ£áÎ1
+F
+java:S1604´"(Make this anonymous inner class a lambda(¨›Ì÷8æµŠáÎ1
+F
+java:S1604æ"(Make this anonymous inner class a lambda(××ß’8æµŠáÎ1
+x
+java:S1104Q"VMake tvModified a static final constant or non-public and provide accessors if needed.(ƒëÔ£ÿÿÿÿÿ8èµŠáÎ1
+y
+java:S1104S"WMake ivAlertIcon a static final constant or non-public and provide accessors if needed.(ªà¶±ûÿÿÿÿ8èµŠáÎ1
+y
+java:S1104U"WMake tvAlertDate a static final constant or non-public and provide accessors if needed.(“²<E2809C>Öúÿÿÿÿ8èµŠáÎ1
+z
+java:S1104W"XMake ibSetBgColor a static final constant or non-public and provide accessors if needed.(ýãä¬üÿÿÿÿ8èµŠáÎ1
+u
+java:S1450˜"WRemove the "mPattern" field and declare it as a local variable in the relevant methods.(©´ÖÛ8Å¶ŠáÎ1
+u
+java:S3776¸"RRefactor this method to reduce its Cognitive Complexity from 26 to the 15 allowed.(Ý¨Á±øÿÿÿÿ8Ï¶ŠáÎ1
+^
+java:S1874Ú"@Remove this use of "SOFT_INPUT_ADJUST_RESIZE"; it is deprecated.(Ñ¯”<C2AF>8Ñ¶ŠáÎ1
+c
+java:S1874€"@Remove this use of "SOFT_INPUT_ADJUST_RESIZE"; it is deprecated.(Ò£ú¿ÿÿÿÿÿ8Ó¶ŠáÎ1
+V
+java:S1874’"9Remove this use of "setTextAppearance"; it is deprecated.(½õË(8Ô¶ŠáÎ1
+R
+java:S2864š"4Iterate over the "entrySet" instead of the "keySet".(Ô‡ï8Õ¶ŠáÎ1
+U
+java:S1135¦"2Complete the task associated to this TODO comment.(Ùü§“ýÿÿÿÿ8Ö¶ŠáÎ1
 ?
-java:S1604¤"(Make this anonymous inner class a lambda(¨›Ì÷
+java:S1116º"Remove this empty statement.(ôŸŽìúÿÿÿÿ8×¶ŠáÎ1
+_
+java:S1126ç"AReplace this if-then-else statement by a single return statement.(®ÎÚÉ8Ù¶ŠáÎ1
 ?
-java:S1604Ó"(Make this anonymous inner class a lambda(××ß’
-q
-java:S1104N"VMake tvModified a static final constant or non-public and provide accessors if needed.(ƒëÔ£ÿÿÿÿÿ
-r
-java:S1104P"WMake ivAlertIcon a static final constant or non-public and provide accessors if needed.(ªà¶±ûÿÿÿÿ
-r
-java:S1104R"WMake tvAlertDate a static final constant or non-public and provide accessors if needed.(“²<E2809C>Öúÿÿÿÿ
-s
-java:S1104T"XMake ibSetBgColor a static final constant or non-public and provide accessors if needed.(ýãä¬üÿÿÿÿ
-n
-java:S1450–"WRemove the "mPattern" field and declare it as a local variable in the relevant methods.(©´ÖÛ
-n
-java:S3776¶"RRefactor this method to reduce its Cognitive Complexity from 26 to the 15 allowed.(Ý¨Á±øÿÿÿÿ
+java:S1116Ž"Remove this empty statement.(ôŸŽìúÿÿÿÿ8ß¶ŠáÎ1
 W
-java:S1874Ø"@Remove this use of "SOFT_INPUT_ADJUST_RESIZE"; it is deprecated.(Ñ¯”<C2AF>
+java:S1874<18>"9Remove this use of "PreferenceManager"; it is deprecated.(ª¦úÅ8ß¶ŠáÎ1
+a
+java:S1874<18>"CRemove this use of "getDefaultSharedPreferences"; it is deprecated.(ª¦úÅ8ß¶ŠáÎ1
 \
-java:S1874þ"@Remove this use of "SOFT_INPUT_ADJUST_RESIZE"; it is deprecated.(Ò£ú¿ÿÿÿÿÿ
-O
-java:S1874<18>"9Remove this use of "setTextAppearance"; it is deprecated.(½õË(
-K
-java:S2864˜"4Iterate over the "entrySet" instead of the "keySet".(Ô‡ï
-N
-java:S1135¤"2Complete the task associated to this TODO comment.(Ùü§“ýÿÿÿÿ
-8
-java:S1116¸"Remove this empty statement.(ôŸŽìúÿÿÿÿ
+java:S1874Ë"9Remove this use of "setTextAppearance"; it is deprecated.(ÑëÊäüÿÿÿÿ8ã¶ŠáÎ1
+m
+java:S1874Ô"JDon't override a deprecated method or explicitly mark it as "@Deprecated".(œƒƒ©ùÿÿÿÿ8ä¶ŠáÎ1
 X
-java:S1126å"AReplace this if-then-else statement by a single return statement.(®ÎÚÉ
-8
-java:S1116‚"Remove this empty statement.(ôŸŽìúÿÿÿÿ
-P
-java:S1874ƒ"9Remove this use of "PreferenceManager"; it is deprecated.(ª¦úÅ
-Z
-java:S1874ƒ"CRemove this use of "getDefaultSharedPreferences"; it is deprecated.(ª¦úÅ
-U
-java:S1874À"9Remove this use of "setTextAppearance"; it is deprecated.(ÑëÊäüÿÿÿÿ
-f
-java:S1874È"JDon't override a deprecated method or explicitly mark it as "@Deprecated".(œƒƒ©ùÿÿÿÿ
-Q
-java:S1874Î"5Remove this use of "onBackPressed"; it is deprecated.(<28>‘Ñàÿÿÿÿÿ
-G
-java:S1874Å"0Remove this use of "getColor"; it is deprecated.(è¤ÔÃ
-d
-java:S3252Ç"MUse static access with "android.text.Spanned" for "SPAN_INCLUSIVE_EXCLUSIVE".(ŸÍÃó
-U
-java:S1874Ñ"9Remove this use of "setTextAppearance"; it is deprecated.(Ùú˜Êøÿÿÿÿ
-T
-java:S1874½"=Remove this use of "EXTRA_SHORTCUT_INTENT"; it is deprecated.(·Ã°Ÿ
-R
-java:S1874¾";Remove this use of "EXTRA_SHORTCUT_NAME"; it is deprecated.(ÒÀ‘ç
+java:S1874Ú"5Remove this use of "onBackPressed"; it is deprecated.(<28>‘Ñàÿÿÿÿÿ8ä¶ŠáÎ1
+N
+java:S1874Ø"0Remove this use of "getColor"; it is deprecated.(è¤ÔÃ8õ¶ŠáÎ1
+k
+java:S3252Ú"MUse static access with "android.text.Spanned" for "SPAN_INCLUSIVE_EXCLUSIVE".(ŸÍÃó8õ¶ŠáÎ1
+\
+java:S1874ä"9Remove this use of "setTextAppearance"; it is deprecated.(Ùú˜Êøÿÿÿÿ8÷¶ŠáÎ1
 [
-java:S1874À"DRemove this use of "EXTRA_SHORTCUT_ICON_RESOURCE"; it is deprecated.(§éÇ¾
+java:S1874Ð"=Remove this use of "EXTRA_SHORTCUT_INTENT"; it is deprecated.(·Ã°Ÿ8þ¶ŠáÎ1
+Y
+java:S1874Ñ";Remove this use of "EXTRA_SHORTCUT_NAME"; it is deprecated.(ÒÀ‘ç8þ¶ŠáÎ1
+b
+java:S1874Ó"DRemove this use of "EXTRA_SHORTCUT_ICON_RESOURCE"; it is deprecated.(§éÇ¾8þ¶ŠáÎ1
--- a/master/Notes-master1/app/build/intermediates/apk/debug/app-debug.apk
+++ b/master/Notes-master1/app/build/intermediates/apk/debug/app-debug.apk
--- a/master/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar
+++ b/master/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar
--- a/master/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex
+++ b/master/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex
--- a/master/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out
+++ b/master/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out
--- a/master/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
+++ b/master/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
@ -1,4 +1,4 @@
-#Tue Jan 02 20:48:30 SGT 2024
+#Tue Jan 09 14:54:26 SGT 2024
 net.micode.notes.app-main-6\:/color/primary_text_dark.xml=C\:\\Users\\admin\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
 net.micode.notes.app-main-6\:/color/secondary_text_dark.xml=C\:\\Users\\admin\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
 net.micode.notes.app-main-6\:/drawable-hdpi/bg_btn_set_color.png=C\:\\Users\\admin\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat
--- a/master/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml
+++ b/master/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml
@ -82,6 +82,7 @@
    <string name="menu_sync">Sync</string>
    <string name="menu_sync_cancel">Cancel syncing</string>
    <string name="menu_title_select_folder">Select folder</string>
+    <string name="menu_voice_mix">voice_read</string>
    <string name="note_alert_expired">Expired</string>
    <string name="note_link_email">Send email</string>
    <string name="note_link_other">Open map</string>
--- a/master/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
+++ b/master/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
@ -11,7 +11,7 @@
         <item quantity="one"><ns1:g example="1" id="number">%1$s</ns1:g> result for \"<ns1:g example="???" id="search">%2$s</ns1:g>\"</item>
        
        <item quantity="other"><ns1:g example="15" id="number">%1$s</ns1:g> results for \"<ns1:g example="???" id="search">%2$s</ns1:g>\"</item>
-    </plurals><string name="menu_quit_secret">quit secret model</string><string name="menu_secret">secret model</string></file><file path="C:\Users\admin\StudioProjects\Notes-master\app\src\main\res\values\styles.xml" qualifiers=""><style name="TextAppearanceSuper">
+    </plurals><string name="menu_quit_secret">quit secret model</string><string name="menu_secret">secret model</string><string name="menu_voice_mix">voice_read</string></file><file path="C:\Users\admin\StudioProjects\Notes-master\app\src\main\res\values\styles.xml" qualifiers=""><style name="TextAppearanceSuper">
        <item name="android:textSize">@dimen/text_font_size_super</item>
        <item name="android:textColorLink">#0000ff</item>
    </style><style name="TextAppearanceLarge">
--- a/master/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
+++ b/master/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
@ -1,4 +1,4 @@
-#Tue Jan 02 20:48:30 SGT 2024
+#Tue Jan 09 14:54:26 SGT 2024
 net.micode.notes.app-main-5\:/color/primary_text_dark.xml=C\:\\Users\\admin\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\color\\primary_text_dark.xml
 net.micode.notes.app-main-5\:/color/secondary_text_dark.xml=C\:\\Users\\admin\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\color\\secondary_text_dark.xml
 net.micode.notes.app-main-5\:/drawable-hdpi/bg_btn_set_color.png=C\:\\Users\\admin\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_btn_set_color.png
--- a/master/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml
+++ b/master/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml
@ -82,6 +82,7 @@
    <string name="menu_sync">Sync</string>
    <string name="menu_sync_cancel">Cancel syncing</string>
    <string name="menu_title_select_folder">Select folder</string>
+    <string name="menu_voice_mix">voice_read</string>
    <string name="note_alert_expired">Expired</string>
    <string name="note_link_email">Send email</string>
    <string name="note_link_other">Open map</string>
--- a/master/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml
+++ b/master/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml
@ -11,7 +11,7 @@
         <item quantity="one"><ns1:g example="1" id="number">%1$s</ns1:g> result for \"<ns1:g example="???" id="search">%2$s</ns1:g>\"</item>
        
        <item quantity="other"><ns1:g example="15" id="number">%1$s</ns1:g> results for \"<ns1:g example="???" id="search">%2$s</ns1:g>\"</item>
-    </plurals><string name="menu_quit_secret">quit secret model</string><string name="menu_secret">secret model</string></file><file path="C:\Users\admin\StudioProjects\Notes-master\app\src\main\res\values\styles.xml" qualifiers=""><style name="TextAppearanceSuper">
+    </plurals><string name="menu_quit_secret">quit secret model</string><string name="menu_secret">secret model</string><string name="menu_voice_mix">voice_read</string></file><file path="C:\Users\admin\StudioProjects\Notes-master\app\src\main\res\values\styles.xml" qualifiers=""><style name="TextAppearanceSuper">
        <item name="android:textSize">@dimen/text_font_size_super</item>
        <item name="android:textColorLink">#0000ff</item>
    </style><style name="TextAppearanceLarge">
--- a/master/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
+++ b/master/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
@ -1,4 +1,4 @@
-#Wed Jan 03 09:04:05 SGT 2024
+#Tue Jan 09 14:54:28 SGT 2024
 base.0=C\:\\Users\\admin\\StudioProjects\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
 path.0=classes.dex
 renamed.0=classes.dex
--- a/master/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
+++ b/master/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
--- a/master/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class
+++ b/master/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class
--- a/master/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class
+++ b/master/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class
--- a/master/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class
+++ b/master/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class
--- a/master/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class
+++ b/master/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class
--- a/master/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class
+++ b/master/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class
--- a/master/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class
+++ b/master/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class
--- a/master/Notes-master1/app/build/intermediates/local_only_symbol_list/debug/R-def.txt
+++ b/master/Notes-master1/app/build/intermediates/local_only_symbol_list/debug/R-def.txt
@ -123,6 +123,7 @@ id menu_send_to_desktop
 id menu_setting
 id menu_share
 id menu_sync
+id menu_voice_mix
 id minute
 id move
 id navigation_bar
@ -229,6 +230,7 @@ string menu_share
 string menu_sync
 string menu_sync_cancel
 string menu_title_select_folder
+string menu_voice_mix
 string note_alert_expired
 string note_link_email
 string note_link_other
--- a/master/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
+++ b/master/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
@ -54,7 +54,7 @@
 34-->C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:33:22-78
 35
 36    <application
-36-->C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:35:5-148:19
+36-->C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:35:5-149:19
 37        android:debuggable="true"
 38        android:extractNativeLibs="true"
 39        android:icon="@drawable/icon_app"
@ -253,19 +253,19 @@
 139        </activity>
 140
 141        <service
-141-->C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:140:9-143:19
+141-->C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:141:9-144:19
 142            android:name="net.micode.notes.gtask.remote.GTaskSyncService"
-142-->C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:141:13-74
+142-->C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:142:13-74
 143            android:exported="false" >
-143-->C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:142:13-37
+143-->C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:143:13-37
 144        </service>
 145
 146        <meta-data
-146-->C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:145:9-147:52
+146-->C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:146:9-148:52
 147            android:name="android.app.default_searchable"
-147-->C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:146:13-58
+147-->C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:147:13-58
 148            android:value=".ui.NoteEditActivity" />
-148-->C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:147:13-49
+148-->C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:148:13-49
 149    </application>
 150
 151</manifest>
--- a/master/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat
+++ b/master/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat
--- a/master/Notes-master1/app/build/intermediates/merged_res/debug/values_values.arsc.flat
+++ b/master/Notes-master1/app/build/intermediates/merged_res/debug/values_values.arsc.flat
--- a/master/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
+++ b/master/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
@ -26,12 +26,12 @@
                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
                    },
                    "to": {
-                        "startLines": "127,131,135,139,142,146,150,154,158,162,166",
+                        "startLines": "128,132,136,140,143,147,151,155,159,163,167",
                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "8240,8444,8655,8828,8988,9171,9356,9541,9744,9950,10133",
-                        "endLines": "130,134,138,141,145,149,153,157,161,165,169",
+                        "startOffsets": "8294,8498,8709,8882,9042,9225,9410,9595,9798,10004,10187",
+                        "endLines": "131,135,139,142,146,150,154,158,162,166,170",
                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "8439,8650,8823,8983,9166,9351,9536,9739,9945,10128,10329"
+                        "endOffsets": "8493,8704,8877,9037,9220,9405,9590,9793,9999,10182,10383"
                    }
                },
                {
@ -68,20 +68,20 @@
                {
                    "source": "C:\\Users\\admin\\StudioProjects\\Notes-master\\app\\src\\main\\res\\values\\strings.xml",
                    "from": {
-                        "startLines": "130,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,78,-1,-1,77,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startColumns": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startOffsets": "8124,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4397,-1,-1,4344,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endLines": "134,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,78,-1,-1,77,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,62,-1,-1,52,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endOffsets": "8528,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4455,-1,-1,4392,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+                        "startLines": "131,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,79,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "8178,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4460,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endLines": "135,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,79,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,53,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endOffsets": "8582,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4509,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
                    },
                    "to": {
-                        "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4417,4464,4517,4572,4660,4718,4780,4830,4875,4918,4978,5045,5100,5155,5208,5255,5308,5364,5412,5467,5520,5604,5671,5735,5831,5905,5986,6075,6238,6382,6461,6536,6618,6677,6757,6837,6892,7014,7117,7158,7211,7268,7342,7407,7475,7561,7641,7710,7804,7863,7918,7980,8040,8150",
-                        "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126",
-                        "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,62,46,52,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
-                        "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4412,4459,4512,4567,4655,4713,4775,4825,4870,4913,4973,5040,5095,5150,5203,5250,5303,5359,5407,5462,5515,5599,5666,5730,5826,5900,5981,6070,6233,6377,6456,6531,6613,6672,6752,6832,6887,7009,7112,7153,7206,7263,7337,7402,7470,7556,7636,7705,7799,7858,7913,7975,8035,8145,8235"
+                        "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4417,4464,4517,4572,4660,4718,4780,4830,4875,4918,4978,5045,5099,5154,5209,5262,5309,5362,5418,5466,5521,5574,5658,5725,5789,5885,5959,6040,6129,6292,6436,6515,6590,6672,6731,6811,6891,6946,7068,7171,7212,7265,7322,7396,7461,7529,7615,7695,7764,7858,7917,7972,8034,8094,8204",
+                        "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127",
+                        "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,62,46,52,54,87,57,61,49,44,42,59,66,53,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
+                        "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4412,4459,4512,4567,4655,4713,4775,4825,4870,4913,4973,5040,5094,5149,5204,5257,5304,5357,5413,5461,5516,5569,5653,5720,5784,5880,5954,6035,6124,6287,6431,6510,6585,6667,6726,6806,6886,6941,7063,7166,7207,7260,7317,7391,7456,7524,7610,7690,7759,7853,7912,7967,8029,8089,8199,8289"
                    }
                }
            ]
--- a/master/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
+++ b/master/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
@ -21,20 +21,17 @@
                {
                    "source": "C:\\Users\\admin\\StudioProjects\\Notes-master\\app\\src\\main\\res\\values\\styles.xml",
                    "from": {
-                        "startLines": "-1,-1,64,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startColumns": "-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startOffsets": "-1,-1,2640,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endLines": "-1,-1,67,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endColumns": "-1,-1,12,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endOffsets": "-1,-1,2861,-1,-1,-1,-1,-1,-1,-1,-1"
+                        "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
                    },
                    "to": {
-                        "startLines": "125,129,133,137,140,144,148,152,156,160,164",
+                        "startLines": "128,132,136,140,143,147,151,155,159,163,167",
                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "8124,8328,8539,8712,8872,9055,9240,9425,9628,9834,10017",
-                        "endLines": "128,132,136,139,143,147,151,155,159,163,167",
+                        "startOffsets": "8293,8497,8708,8881,9041,9224,9409,9594,9797,10003,10186",
+                        "endLines": "131,135,139,142,146,150,154,158,162,166,170",
                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "8323,8534,8707,8867,9050,9235,9420,9623,9829,10012,10213"
+                        "endOffsets": "8492,8703,8876,9036,9219,9404,9589,9792,9998,10181,10382"
                    }
                },
                {
@ -71,17 +68,20 @@
                {
                    "source": "C:\\Users\\admin\\StudioProjects\\Notes-master\\app\\src\\main\\res\\values\\strings.xml",
                    "from": {
-                        "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+                        "startLines": "131,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,79,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "8177,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4460,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endLines": "135,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,79,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,52,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endOffsets": "8581,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4508,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
                    },
                    "to": {
-                        "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034",
-                        "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
-                        "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
-                        "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119"
+                        "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4417,4464,4517,4572,4660,4718,4780,4830,4875,4918,4978,5045,5098,5153,5208,5261,5308,5361,5417,5465,5520,5573,5657,5724,5788,5884,5958,6039,6128,6291,6435,6514,6589,6671,6730,6810,6890,6945,7067,7170,7211,7264,7321,7395,7460,7528,7614,7694,7763,7857,7916,7971,8033,8093,8203",
+                        "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127",
+                        "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,62,46,52,54,87,57,61,49,44,42,59,66,52,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
+                        "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4412,4459,4512,4567,4655,4713,4775,4825,4870,4913,4973,5040,5093,5148,5203,5256,5303,5356,5412,5460,5515,5568,5652,5719,5783,5879,5953,6034,6123,6286,6430,6509,6584,6666,6725,6805,6885,6940,7062,7165,7206,7259,7316,7390,7455,7523,7609,7689,7758,7852,7911,7966,8028,8088,8198,8288"
                    }
                }
            ]
@ -112,12 +112,12 @@
                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
                    },
                    "to": {
-                        "startLines": "127,131,135,139,142,146,150,154,158,162,166",
+                        "startLines": "128,132,136,140,143,147,151,155,159,163,167",
                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "8240,8444,8655,8828,8988,9171,9356,9541,9744,9950,10133",
-                        "endLines": "130,134,138,141,145,149,153,157,161,165,169",
+                        "startOffsets": "8294,8498,8709,8882,9042,9225,9410,9595,9798,10004,10187",
+                        "endLines": "131,135,139,142,146,150,154,158,162,166,170",
                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "8439,8650,8823,8983,9166,9351,9536,9739,9945,10128,10329"
+                        "endOffsets": "8493,8704,8877,9037,9220,9405,9590,9793,9999,10182,10383"
                    }
                },
                {
@ -154,20 +154,20 @@
                {
                    "source": "C:\\Users\\admin\\StudioProjects\\Notes-master\\app\\src\\main\\res\\values\\strings.xml",
                    "from": {
-                        "startLines": "130,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,78,-1,-1,77,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startColumns": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startOffsets": "8124,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4397,-1,-1,4344,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endLines": "134,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,78,-1,-1,77,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,62,-1,-1,52,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endOffsets": "8528,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4455,-1,-1,4392,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+                        "startLines": "131,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,79,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "8178,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4460,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endLines": "135,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,79,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,53,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endOffsets": "8582,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4509,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
                    },
                    "to": {
-                        "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4417,4464,4517,4572,4660,4718,4780,4830,4875,4918,4978,5045,5100,5155,5208,5255,5308,5364,5412,5467,5520,5604,5671,5735,5831,5905,5986,6075,6238,6382,6461,6536,6618,6677,6757,6837,6892,7014,7117,7158,7211,7268,7342,7407,7475,7561,7641,7710,7804,7863,7918,7980,8040,8150",
-                        "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126",
-                        "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,62,46,52,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
-                        "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4412,4459,4512,4567,4655,4713,4775,4825,4870,4913,4973,5040,5095,5150,5203,5250,5303,5359,5407,5462,5515,5599,5666,5730,5826,5900,5981,6070,6233,6377,6456,6531,6613,6672,6752,6832,6887,7009,7112,7153,7206,7263,7337,7402,7470,7556,7636,7705,7799,7858,7913,7975,8035,8145,8235"
+                        "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4417,4464,4517,4572,4660,4718,4780,4830,4875,4918,4978,5045,5099,5154,5209,5262,5309,5362,5418,5466,5521,5574,5658,5725,5789,5885,5959,6040,6129,6292,6436,6515,6590,6672,6731,6811,6891,6946,7068,7171,7212,7265,7322,7396,7461,7529,7615,7695,7764,7858,7917,7972,8034,8094,8204",
+                        "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127",
+                        "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,62,46,52,54,87,57,61,49,44,42,59,66,53,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
+                        "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4412,4459,4512,4567,4655,4713,4775,4825,4870,4913,4973,5040,5094,5149,5204,5257,5304,5357,5413,5461,5516,5569,5653,5720,5784,5880,5954,6035,6124,6287,6431,6510,6585,6667,6726,6806,6886,6941,7063,7166,7207,7260,7317,7391,7456,7524,7610,7690,7759,7853,7912,7967,8029,8089,8199,8289"
                    }
                }
            ]
--- a/master/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
+++ b/master/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
@ -87,6 +87,10 @@
        "merged": "C:\\Users\\admin\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\menu_note_list_options.xml.flat",
        "source": "C:\\Users\\admin\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\menu\\note_list_options.xml"
    },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/menu_note_edit.xml.flat",
+        "source": "net.micode.notes.app-main-6:/menu/note_edit.xml"
+    },
    {
        "merged": "C:\\Users\\admin\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_red_down.9.png.flat",
        "source": "C:\\Users\\admin\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_red_down.9.png"
@ -99,10 +103,6 @@
        "merged": "C:\\Users\\admin\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_yellow_up.9.png.flat",
        "source": "C:\\Users\\admin\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_yellow_up.9.png"
    },
-    {
-        "merged": "net.micode.notes.app-merged_res-4:/menu_note_list.xml.flat",
-        "source": "net.micode.notes.app-main-6:/menu/note_list.xml"
-    },
    {
        "merged": "C:\\Users\\admin\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\menu_sub_folder.xml.flat",
        "source": "C:\\Users\\admin\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\menu\\sub_folder.xml"
@ -195,10 +195,6 @@
        "merged": "C:\\Users\\admin\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_title_bar_bg.9.png.flat",
        "source": "C:\\Users\\admin\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\title_bar_bg.9.png"
    },
-    {
-        "merged": "net.micode.notes.app-merged_res-4:/menu_sub_folder.xml.flat",
-        "source": "net.micode.notes.app-main-6:/menu/sub_folder.xml"
-    },
    {
        "merged": "C:\\Users\\admin\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_red_up.9.png.flat",
        "source": "C:\\Users\\admin\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_red_up.9.png"
--- a/master/Notes-master1/app/build/intermediates/packaged_res/debug/menu/note_edit.xml
+++ b/master/Notes-master1/app/build/intermediates/packaged_res/debug/menu/note_edit.xml
@ -49,4 +49,7 @@
    <item
        android:id="@+id/menu_delete_remind"
        android:title="@string/menu_remove_remind" />
+    <item
+        android:id="@+id/menu_voice_mix"
+        android:title="voice_read"/>
 </menu>
--- a/master/Notes-master1/app/build/intermediates/packaged_res/debug/menu/note_list.xml
+++ b/master/Notes-master1/app/build/intermediates/packaged_res/debug/menu/note_list.xml
@ -43,4 +43,5 @@
    <item
        android:id="@+id/menu_quit_secret"
        android:title="@string/menu_quit_secret"/>
+
 </menu>
--- a/master/Notes-master1/app/build/intermediates/packaged_res/debug/values/values.xml
+++ b/master/Notes-master1/app/build/intermediates/packaged_res/debug/values/values.xml
@ -82,6 +82,7 @@
    <string name="menu_sync">Sync</string>
    <string name="menu_sync_cancel">Cancel syncing</string>
    <string name="menu_title_select_folder">Select folder</string>
+    <string name="menu_voice_mix">voice_read</string>
    <string name="note_alert_expired">Expired</string>
    <string name="note_link_email">Send email</string>
    <string name="note_link_other">Open map</string>
--- a/master/Notes-master1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_
+++ b/master/Notes-master1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_
--- a/master/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/b99652689dd960f6740958f49559e9c287ea0a784d6b77d15e8d949b7010872e_5.jar
+++ b/master/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/b99652689dd960f6740958f49559e9c287ea0a784d6b77d15e8d949b7010872e_5.jar
--- a/master/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex
+++ b/master/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex
--- a/master/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex
+++ b/master/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex
--- a/master/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex
+++ b/master/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex
--- a/master/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$4.dex
+++ b/master/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$4.dex
--- a/master/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex
+++ b/master/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex
--- a/master/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex
+++ b/master/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex
--- a/master/Notes-master1/app/build/intermediates/runtime_symbol_list/debug/R.txt
+++ b/master/Notes-master1/app/build/intermediates/runtime_symbol_list/debug/R.txt
@ -121,6 +121,7 @@ int id menu_send_to_desktop 0x7f050029
 int id menu_setting 0x7f05002a
 int id menu_share 0x7f05002b
 int id menu_sync 0x7f05002c
+int id menu_voice_mix 0x7f050045
 int id minute 0x7f05002d
 int id move 0x7f05002e
 int id navigation_bar 0x7f05002f
@ -227,6 +228,7 @@ int string menu_share 0x7f0a0037
 int string menu_sync 0x7f0a0038
 int string menu_sync_cancel 0x7f0a0039
 int string menu_title_select_folder 0x7f0a003a
+int string menu_voice_mix 0x7f0a0068
 int string note_alert_expired 0x7f0a003b
 int string note_link_email 0x7f0a003c
 int string note_link_other 0x7f0a003d
--- a/master/Notes-master1/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
+++ b/master/Notes-master1/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
@ -1,27 +1,30 @@
-net.micode.notes:string/menu_deselect_all = 0x7f0a0022
 net.micode.notes:string/preferences_last_sync_time = 0x7f0a004e
 net.micode.notes:string/preferences_menu_change_account = 0x7f0a0051
+net.micode.notes:string/menu_deselect_all = 0x7f0a0022
+net.micode.notes:id/menu_voice_mix = 0x7f050045
+net.micode.notes:string/menu_export_text = 0x7f0a0023
 net.micode.notes:string/menu_normal_mode = 0x7f0a002f
 net.micode.notes:menu/note_list = 0x7f070003
 net.micode.notes:id/account_dialog_subtitle = 0x7f050000
 net.micode.notes:string/menu_send_to_desktop = 0x7f0a0035
 net.micode.notes:string/search = 0x7f0a0056
 net.micode.notes:string/search_setting_description = 0x7f0a0059
-net.micode.notes:string/note_link_other = 0x7f0a003d
-net.micode.notes:string/preferences_title = 0x7f0a0053
-net.micode.notes:id/iv_bg_yellow_select = 0x7f050017
-net.micode.notes:style/HighlightTextAppearanceSecondary = 0x7f0b0001
 net.micode.notes:string/error_sdcard_unmounted = 0x7f0a0010
 net.micode.notes:xml/preferences = 0x7f0c0000
+net.micode.notes:style/HighlightTextAppearanceSecondary = 0x7f0b0001
+net.micode.notes:string/note_link_other = 0x7f0a003d
+net.micode.notes:id/iv_bg_yellow_select = 0x7f050017
+net.micode.notes:string/preferences_title = 0x7f0a0053
 net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a0055
 net.micode.notes:string/notealert_enter = 0x7f0a0040
 net.micode.notes:xml/widget_4x_info = 0x7f0c0003
 net.micode.notes:string/set_remind_time_message = 0x7f0a005a
 net.micode.notes:string/search_hint = 0x7f0a0057
+net.micode.notes:string/menu_voice_mix = 0x7f0a0068
 net.micode.notes:string/widget_under_visit_mode = 0x7f0a0065
-net.micode.notes:string/menu_share = 0x7f0a0037
 net.micode.notes:string/error_sync_network = 0x7f0a0013
 net.micode.notes:id/notes_list = 0x7f050035
+net.micode.notes:string/menu_share = 0x7f0a0037
 net.micode.notes:style/TextAppearanceSuper = 0x7f0b0009
 net.micode.notes:dimen/text_font_size_large = 0x7f030000
 net.micode.notes:id/ll_font_super = 0x7f05001f
@ -35,28 +38,27 @@ net.micode.notes:style/TextAppearanceMedium = 0x7f0b0005
 net.micode.notes:id/menu_send_to_desktop = 0x7f050029
 net.micode.notes:string/menu_font_size = 0x7f0a0029
 net.micode.notes:string/info_note_enter_desktop = 0x7f0a001e
+net.micode.notes:layout/note_item = 0x7f060007
+net.micode.notes:string/datetime_dialog_cancel = 0x7f0a0009
+net.micode.notes:menu/sub_folder = 0x7f070006
 net.micode.notes:id/preference_sync_button = 0x7f050037
-net.micode.notes:menu/call_note_edit = 0x7f070000
-net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a004f
-net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0b000a
-net.micode.notes:id/navigation_bar = 0x7f05002f
 net.micode.notes:string/menu_setting = 0x7f0a0036
+net.micode.notes:id/navigation_bar = 0x7f05002f
 net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a004a
 net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0a0047
+net.micode.notes:menu/call_note_edit = 0x7f070000
+net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a004f
+net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0b000a
 net.micode.notes:string/menu_search = 0x7f0a0031
 net.micode.notes:xml/searchable = 0x7f0c0001
 net.micode.notes:style/TextAppearanceLarge = 0x7f0b0004
 net.micode.notes:string/menu_select_all = 0x7f0a0032
 net.micode.notes:string/note_link_email = 0x7f0a003c
 net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a004b
-net.micode.notes:string/menu_folder_change_name = 0x7f0a0024
-net.micode.notes:string/menu_sync_cancel = 0x7f0a0039
-net.micode.notes:string/menu_export_text = 0x7f0a0023
-net.micode.notes:menu/sub_folder = 0x7f070006
-net.micode.notes:layout/note_item = 0x7f060007
-net.micode.notes:string/datetime_dialog_cancel = 0x7f0a0009
 net.micode.notes:string/menu_remove_remind = 0x7f0a0030
 net.micode.notes:string/menu_font_large = 0x7f0a0027
+net.micode.notes:string/menu_folder_change_name = 0x7f0a0024
+net.micode.notes:string/menu_sync_cancel = 0x7f0a0039
 net.micode.notes:string/menu_create_folder = 0x7f0a0020
 net.micode.notes:string/delete_remind_time_message = 0x7f0a000b
 net.micode.notes:string/format_move_notes_to_folder = 0x7f0a001c
@ -66,12 +68,6 @@ net.micode.notes:string/preferences_account_summary = 0x7f0a0044
 net.micode.notes:drawable/widget_4x_yellow = 0x7f040041
 net.micode.notes:drawable/widget_2x_red = 0x7f04003a
 net.micode.notes:string/file_name_txt_format = 0x7f0a0015
-net.micode.notes:drawable/new_note = 0x7f04002f
-net.micode.notes:string/folder_exist = 0x7f0a0017
-net.micode.notes:id/note_edit_list = 0x7f050031
-net.micode.notes:id/menu_secret = 0x7f050044
-net.micode.notes:string/failed_sdcard_export = 0x7f0a0014
-net.micode.notes:string/menu_select_none = 0x7f0a0033
 net.micode.notes:layout/widget_4x = 0x7f06000d
 net.micode.notes:layout/note_list_dropdown_menu = 0x7f060009
 net.micode.notes:string/error_sync_cancelled = 0x7f0a0011
@ -88,13 +84,19 @@ net.micode.notes:string/menu_move_parent_folder = 0x7f0a002e
 net.micode.notes:string/notealert_ok = 0x7f0a0041
 net.micode.notes:string/note_link_web = 0x7f0a003f
 net.micode.notes:id/menu_sync = 0x7f05002c
+net.micode.notes:string/failed_sdcard_export = 0x7f0a0014
+net.micode.notes:id/menu_secret = 0x7f050044
+net.micode.notes:string/menu_select_none = 0x7f0a0033
+net.micode.notes:string/folder_exist = 0x7f0a0017
+net.micode.notes:drawable/new_note = 0x7f04002f
+net.micode.notes:id/note_edit_list = 0x7f050031
 net.micode.notes:drawable/widget_2x_yellow = 0x7f04003c
 net.micode.notes:id/amPm = 0x7f050003
 net.micode.notes:string/success_sync_account = 0x7f0a005c
-net.micode.notes:id/menu_quit_secret = 0x7f050043
 net.micode.notes:string/ticker_fail = 0x7f0a0061
 net.micode.notes:string/app_widget2x2 = 0x7f0a0005
 net.micode.notes:string/app_name = 0x7f0a0004
+net.micode.notes:id/menu_quit_secret = 0x7f050043
 net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0a004c
 net.micode.notes:string/search_label = 0x7f0a0058
 net.micode.notes:id/menu_list_mode = 0x7f050025
@ -177,13 +179,13 @@ net.micode.notes:drawable/bg_btn_set_color = 0x7f040000
 net.micode.notes:id/iv_bg_yellow = 0x7f050016
 net.micode.notes:menu/note_edit = 0x7f070002
 net.micode.notes:drawable/list_white_down = 0x7f040025
-net.micode.notes:string/menu_quit_secret = 0x7f0a0066
-net.micode.notes:drawable/list_white_up = 0x7f040028
 net.micode.notes:id/iv_bg_green = 0x7f050010
+net.micode.notes:drawable/list_white_up = 0x7f040028
+net.micode.notes:string/menu_quit_secret = 0x7f0a0066
 net.micode.notes:drawable/delete = 0x7f040004
 net.micode.notes:id/iv_bg_blue = 0x7f05000e
-net.micode.notes:drawable/list_green_single = 0x7f04001f
 net.micode.notes:id/iv_alert_icon = 0x7f05000d
+net.micode.notes:drawable/list_green_single = 0x7f04001f
 net.micode.notes:drawable/list_yellow_single = 0x7f04002b
 net.micode.notes:id/cb_edit_item = 0x7f050006
 net.micode.notes:id/font_size_selector = 0x7f05000b
--- a/master/Notes-master1/app/build/outputs/logs/manifest-merger-debug-report.txt
+++ b/master/Notes-master1/app/build/outputs/logs/manifest-merger-debug-report.txt
@ -1,9 +1,9 @@
 -- Merging decision tree log ---
 manifest
-ADDED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:18:1-149:12
-INJECTED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:18:1-149:12
-INJECTED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:18:1-149:12
-INJECTED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:18:1-149:12
+ADDED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12
+INJECTED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12
+INJECTED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12
+INJECTED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12
 	package
 		ADDED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:19:5-31
 		INJECTED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml
@ -61,8 +61,8 @@ ADDED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManife
 	android:name
 		ADDED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:33:22-78
 application
-ADDED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:35:5-148:19
-INJECTED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:35:5-148:19
+ADDED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:35:5-149:19
+INJECTED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:35:5-149:19
 	android:extractNativeLibs
 		INJECTED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml
 	android:label
@ -212,14 +212,14 @@ ADDED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManife
 	android:name
 		ADDED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:134:13-71
 service#net.micode.notes.gtask.remote.GTaskSyncService
-ADDED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:140:9-143:19
+ADDED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:141:9-144:19
 	android:exported
-		ADDED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:142:13-37
+		ADDED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:143:13-37
 	android:name
-		ADDED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:141:13-74
+		ADDED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:142:13-74
 meta-data#android.app.default_searchable
-ADDED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:145:9-147:52
+ADDED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:146:9-148:52
 	android:value
-		ADDED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:147:13-49
+		ADDED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:148:13-49
 	android:name
-		ADDED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:146:13-58
+		ADDED from C:\Users\admin\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:147:13-58
--- a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/AlarmAlertActivity.class.uniqueId40
+++ b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/AlarmAlertActivity.class.uniqueId40
--- a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/BackupUtils$TextExport.class.uniqueId15
+++ b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/BackupUtils$TextExport.class.uniqueId15
--- a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/BackupUtils.class.uniqueId35
+++ b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/BackupUtils.class.uniqueId35
--- a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker$1.class.uniqueId33
+++ b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker$1.class.uniqueId33
--- a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker$2.class.uniqueId48
+++ b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker$2.class.uniqueId48
--- a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker$3.class.uniqueId37
+++ b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker$3.class.uniqueId37
--- a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker$4.class.uniqueId34
+++ b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker$4.class.uniqueId34
--- a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker$OnDateTimeChangedListener.class.uniqueId56
+++ b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker$OnDateTimeChangedListener.class.uniqueId56
--- a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker.class.uniqueId29
+++ b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker.class.uniqueId29
--- a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePickerDialog$1.class.uniqueId3
+++ b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePickerDialog$1.class.uniqueId3
--- a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePickerDialog$OnDateTimeSetListener.class.uniqueId28
+++ b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePickerDialog$OnDateTimeSetListener.class.uniqueId28
--- a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePickerDialog.class.uniqueId5
+++ b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePickerDialog.class.uniqueId5
--- a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/FoldersListAdapter$FolderListItem.class.uniqueId53
+++ b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/FoldersListAdapter$FolderListItem.class.uniqueId53
--- a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/FoldersListAdapter.class.uniqueId42
+++ b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/FoldersListAdapter.class.uniqueId42
--- a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask$1.class.uniqueId27
+++ b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask$1.class.uniqueId27
--- a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask.class.uniqueId25
+++ b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask.class.uniqueId25
--- a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskManager.class.uniqueId57
+++ b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskManager.class.uniqueId57
--- a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$1.class.uniqueId21
+++ b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$1.class.uniqueId21
--- a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$3.class.uniqueId50
+++ b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$3.class.uniqueId50
--- a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$HeadViewHolder.class.uniqueId59
+++ b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$HeadViewHolder.class.uniqueId59
--- a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity.class.uniqueId22
+++ b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity.class.uniqueId22
--- a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditText$1.class.uniqueId30
+++ b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditText$1.class.uniqueId30
--- a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditText$OnTextViewChangeListener.class.uniqueId19
+++ b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditText$OnTextViewChangeListener.class.uniqueId19
--- a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditText.class.uniqueId12
+++ b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditText.class.uniqueId12
--- a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteItemData.class.uniqueId32
+++ b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteItemData.class.uniqueId32
--- a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteWidgetProvider.class.uniqueId44
+++ b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteWidgetProvider.class.uniqueId44
--- a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$1.class.uniqueId41
+++ b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$1.class.uniqueId41
--- a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$11.class.uniqueId58
+++ b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$11.class.uniqueId58
--- a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$12.class.uniqueId18
+++ b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$12.class.uniqueId18
--- a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$2.class.uniqueId46
+++ b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$2.class.uniqueId46
--- a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$4.class.uniqueId20
+++ b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$4.class.uniqueId20
--- a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$5.class.uniqueId43
+++ b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$5.class.uniqueId43
--- a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$6.class.uniqueId55
+++ b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$6.class.uniqueId55
--- a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$7.class.uniqueId17
+++ b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$7.class.uniqueId17
--- a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$8.class.uniqueId38
+++ b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$8.class.uniqueId38
--- a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$9.class.uniqueId54
+++ b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$9.class.uniqueId54
--- a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ListEditState.class.uniqueId24
+++ b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ListEditState.class.uniqueId24
--- a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$1.class.uniqueId6
+++ b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$1.class.uniqueId6
--- a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$2.class.uniqueId51
+++ b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$2.class.uniqueId51
--- a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$NewNoteOnTouchListener.class.uniqueId4
+++ b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$NewNoteOnTouchListener.class.uniqueId4
--- a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$OnListItemClickListener.class.uniqueId49
+++ b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$OnListItemClickListener.class.uniqueId49
--- a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity.class.uniqueId10
+++ b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity.class.uniqueId10
--- a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListItem.class.uniqueId2
+++ b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListItem.class.uniqueId2
--- a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$1.class.uniqueId45
+++ b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$1.class.uniqueId45
--- a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$2.class.uniqueId31
+++ b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$2.class.uniqueId31
--- a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$4.class.uniqueId52
+++ b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$4.class.uniqueId52
--- a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$5.class.uniqueId36
+++ b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$5.class.uniqueId36
--- a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$6.class.uniqueId47
+++ b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$6.class.uniqueId47
--- a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$7.class.uniqueId7
+++ b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$7.class.uniqueId7
--- a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$8.class.uniqueId23
+++ b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$8.class.uniqueId23
--- a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$GTaskReceiver.class.uniqueId39
+++ b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$GTaskReceiver.class.uniqueId39
--- a/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity.class.uniqueId26
+++ b/master/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity.class.uniqueId26
--- a/Show More
+++ b/Show More