diff --git a/doc/实践模板-开源软件泛读.docx b/doc/实践模板-开源软件泛读.docx
deleted file mode 100644
index ef33a20..0000000
Binary files a/doc/实践模板-开源软件泛读.docx and /dev/null differ
diff --git a/doc/实践模板-开源软件泛读、标注和维护报告文档.docx b/doc/实践模板-开源软件泛读、标注和维护报告文档.docx
new file mode 100644
index 0000000..be27aaa
Binary files /dev/null and b/doc/实践模板-开源软件泛读、标注和维护报告文档.docx differ
diff --git a/doc/实践模板-开源软件的质量分析报告文档.docx b/doc/实践模板-开源软件的质量分析报告文档.docx
index 545a44e..b585916 100644
Binary files a/doc/实践模板-开源软件的质量分析报告文档.docx and b/doc/实践模板-开源软件的质量分析报告文档.docx differ
diff --git a/doc/实践考评-阅读维护开源软件的团队自评报告.docx b/doc/实践考评-阅读维护开源软件的团队自评报告.docx
new file mode 100644
index 0000000..e8ca99d
Binary files /dev/null and b/doc/实践考评-阅读维护开源软件的团队自评报告.docx differ
diff --git a/doc/实践考评-阅读维护开源软件的团队自评报告模板.xlsx b/doc/实践考评-阅读维护开源软件的团队自评报告模板.xlsx
new file mode 100644
index 0000000..f2c78b4
Binary files /dev/null and b/doc/实践考评-阅读维护开源软件的团队自评报告模板.xlsx differ
diff --git a/doc/实践考评-阅读维护开源软件的汇报模板.pptx b/doc/实践考评-阅读维护开源软件的汇报模板.pptx
new file mode 100644
index 0000000..f6c2196
Binary files /dev/null and b/doc/实践考评-阅读维护开源软件的汇报模板.pptx differ
diff --git a/src/Notes-master/.gradle/8.0/checksums/checksums.lock b/src/Notes-master/.gradle/8.0/checksums/checksums.lock
index 9109fd3..6f50620 100644
Binary files a/src/Notes-master/.gradle/8.0/checksums/checksums.lock and b/src/Notes-master/.gradle/8.0/checksums/checksums.lock differ
diff --git a/src/Notes-master/.gradle/8.0/checksums/md5-checksums.bin b/src/Notes-master/.gradle/8.0/checksums/md5-checksums.bin
index 7ca11fc..9532cae 100644
Binary files a/src/Notes-master/.gradle/8.0/checksums/md5-checksums.bin and b/src/Notes-master/.gradle/8.0/checksums/md5-checksums.bin differ
diff --git a/src/Notes-master/.gradle/8.0/checksums/sha1-checksums.bin b/src/Notes-master/.gradle/8.0/checksums/sha1-checksums.bin
index 129a44b..ab21fbb 100644
Binary files a/src/Notes-master/.gradle/8.0/checksums/sha1-checksums.bin and b/src/Notes-master/.gradle/8.0/checksums/sha1-checksums.bin differ
diff --git a/src/Notes-master/.gradle/8.0/executionHistory/executionHistory.bin b/src/Notes-master/.gradle/8.0/executionHistory/executionHistory.bin
index 7f5ccd0..9876d6f 100644
Binary files a/src/Notes-master/.gradle/8.0/executionHistory/executionHistory.bin and b/src/Notes-master/.gradle/8.0/executionHistory/executionHistory.bin differ
diff --git a/src/Notes-master/.gradle/8.0/executionHistory/executionHistory.lock b/src/Notes-master/.gradle/8.0/executionHistory/executionHistory.lock
index 1516823..b2d57aa 100644
Binary files a/src/Notes-master/.gradle/8.0/executionHistory/executionHistory.lock and b/src/Notes-master/.gradle/8.0/executionHistory/executionHistory.lock differ
diff --git a/src/Notes-master/.gradle/8.0/fileHashes/fileHashes.bin b/src/Notes-master/.gradle/8.0/fileHashes/fileHashes.bin
index 3043530..586e51f 100644
Binary files a/src/Notes-master/.gradle/8.0/fileHashes/fileHashes.bin and b/src/Notes-master/.gradle/8.0/fileHashes/fileHashes.bin differ
diff --git a/src/Notes-master/.gradle/8.0/fileHashes/fileHashes.lock b/src/Notes-master/.gradle/8.0/fileHashes/fileHashes.lock
index a326983..12f8296 100644
Binary files a/src/Notes-master/.gradle/8.0/fileHashes/fileHashes.lock and b/src/Notes-master/.gradle/8.0/fileHashes/fileHashes.lock differ
diff --git a/src/Notes-master/.gradle/8.0/fileHashes/resourceHashesCache.bin b/src/Notes-master/.gradle/8.0/fileHashes/resourceHashesCache.bin
index 3655efb..a76b1bc 100644
Binary files a/src/Notes-master/.gradle/8.0/fileHashes/resourceHashesCache.bin and b/src/Notes-master/.gradle/8.0/fileHashes/resourceHashesCache.bin differ
diff --git a/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 782a6f0..a7dd837 100644
Binary files a/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin b/src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin
index 95d0167..259ac27 100644
Binary files a/src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin and b/src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin differ
diff --git a/src/Notes-master/.gradle/file-system.probe b/src/Notes-master/.gradle/file-system.probe
index 02191a4..226f5c5 100644
Binary files a/src/Notes-master/.gradle/file-system.probe and b/src/Notes-master/.gradle/file-system.probe differ
diff --git a/src/Notes-master/.idea/checkstyle-idea.xml b/src/Notes-master/.idea/checkstyle-idea.xml
deleted file mode 100644
index 628b54f..0000000
--- a/src/Notes-master/.idea/checkstyle-idea.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
- 10.12.5
- JavaOnly
- true
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Notes-master/.idea/jarRepositories.xml b/src/Notes-master/.idea/jarRepositories.xml
index ab0b144..ad50eb3 100644
--- a/src/Notes-master/.idea/jarRepositories.xml
+++ b/src/Notes-master/.idea/jarRepositories.xml
@@ -11,6 +11,11 @@
+
+
+
+
+
diff --git a/src/Notes-master/.idea/misc.xml b/src/Notes-master/.idea/misc.xml
index 8978d23..22fd288 100644
--- a/src/Notes-master/.idea/misc.xml
+++ b/src/Notes-master/.idea/misc.xml
@@ -1,8 +1,6 @@
-
-
-
+
diff --git a/src/Notes-master/.idea/modules/app/Notes-master.app.androidTest.iml b/src/Notes-master/.idea/modules/app/Notes-master.app.androidTest.iml
index f870750..96ef48a 100644
--- a/src/Notes-master/.idea/modules/app/Notes-master.app.androidTest.iml
+++ b/src/Notes-master/.idea/modules/app/Notes-master.app.androidTest.iml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/src/Notes-master/.idea/modules/app/Notes-master.app.iml b/src/Notes-master/.idea/modules/app/Notes-master.app.iml
index 236f48f..70bb907 100644
--- a/src/Notes-master/.idea/modules/app/Notes-master.app.iml
+++ b/src/Notes-master/.idea/modules/app/Notes-master.app.iml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/src/Notes-master/.idea/modules/app/Notes-master.app.main.iml b/src/Notes-master/.idea/modules/app/Notes-master.app.main.iml
index 6409e4f..27d3018 100644
--- a/src/Notes-master/.idea/modules/app/Notes-master.app.main.iml
+++ b/src/Notes-master/.idea/modules/app/Notes-master.app.main.iml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/src/Notes-master/.idea/modules/app/Notes-master.app.unitTest.iml b/src/Notes-master/.idea/modules/app/Notes-master.app.unitTest.iml
index 8b748dc..5bcaf9f 100644
--- a/src/Notes-master/.idea/modules/app/Notes-master.app.unitTest.iml
+++ b/src/Notes-master/.idea/modules/app/Notes-master.app.unitTest.iml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/src/Notes-master/.idea/sonarlint/issuestore/8/c/8c55c3ccc257e5907959013f99656e4c8ec3903e b/src/Notes-master/.idea/sonarlint/issuestore/8/c/8c55c3ccc257e5907959013f99656e4c8ec3903e
index 7336bbb..e19aef0 100644
--- a/src/Notes-master/.idea/sonarlint/issuestore/8/c/8c55c3ccc257e5907959013f99656e4c8ec3903e
+++ b/src/Notes-master/.idea/sonarlint/issuestore/8/c/8c55c3ccc257e5907959013f99656e4c8ec3903e
@@ -1,2 +1,2 @@
-K xml:S55944"1Implement permissions on this exported component.(
\ No newline at end of file
+R xml:S5594A"1Implement permissions on this exported component.(81
\ No newline at end of file
diff --git a/src/Notes-master/.idea/sonarlint/issuestore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32 b/src/Notes-master/.idea/sonarlint/issuestore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32
index 7a639b9..609187d 100644
--- a/src/Notes-master/.idea/sonarlint/issuestore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32
+++ b/src/Notes-master/.idea/sonarlint/issuestore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32
@@ -1,97 +1,125 @@
w
-java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(艥81
+java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(艥81
+i
+java:S1192"FDefine a constant instead of duplicating this literal " DESC" 3 times.(ͨ81
+m java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(#81
E
-java:S1604"(Make this anonymous inner class a lambda(̺V81
+java:S1604"(Make this anonymous inner class a lambda(̺V81
F
-java:S1604"(Make this anonymous inner class a lambda(ά81
+java:S1604"(Make this anonymous inner class a lambda(ά81
F
-java:S1604"(Make this anonymous inner class a lambda(ܴ81
+java:S1604"(Make this anonymous inner class a lambda(ܴ81
K
-java:S1604"(Make this anonymous inner class a lambda(81
+java:S1604"(Make this anonymous inner class a lambda(81
F
-java:S1604"(Make this anonymous inner class a lambda(81
+java:S1604"(Make this anonymous inner class a lambda(81
F
-java:S1604"(Make this anonymous inner class a lambda(۱81
+java:S1604"(Make this anonymous inner class a lambda(۱81
F
-java:S1604"(Make this anonymous inner class a lambda(ά81
-i java:S116R"TRename this field "time_mode" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(
-7
-java:S1116a"Remove this empty statement.(
-a
-java:S1124"EReorder the modifiers to comply with the Java Language Specification.(
-[
-java:S1124"EReorder the modifiers to comply with the Java Language Specification.(Ѿk
+java:S1604"(Make this anonymous inner class a lambda(ά81
+K
+java:S1604"(Make this anonymous inner class a lambda(81
+K
+java:S1604"(Make this anonymous inner class a lambda(81
+K
+java:S1604"(Make this anonymous inner class a lambda(81
+K
+java:S1604"(Make this anonymous inner class a lambda(81
+y
+java:S1104T"WMake secret_mode a static final constant or non-public and provide accessors if needed.(81
+S
+java:S1444T"1Make this "public static secret_mode" field final(81
+
+java:S1862"This branch can not be reached because the condition duplicates a previous condition in the same sequence of "if/else if" statements(81
+p java:S116S"TRename this field "time_mode" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(81
+x
+java:S3008T"VRename this field "secret_mode" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(81
+>
+java:S1116e"Remove this empty statement.(81
+h
+java:S1124"EReorder the modifiers to comply with the Java Language Specification.(81
+b
+java:S1124"EReorder the modifiers to comply with the Java Language Specification.(Ѿk81
u
-java:S3776"RRefactor this method to reduce its Cognitive Complexity from 17 to the 15 allowed.(81
+java:S3776"RRefactor this method to reduce its Cognitive Complexity from 17 to the 15 allowed.(81
9
-java:S3626"Remove this redundant jump.(݅81
+java:S3626"Remove this redundant jump.(݅81
9
-java:S3626"Remove this redundant jump.(݅8߷1
+java:S3626"Remove this redundant jump.(݅81
9
-java:S3626"Remove this redundant jump.(݅8߷1
+java:S3626"Remove this redundant jump.(݅81
W
-java:S1874"9Remove this use of "PreferenceManager"; it is deprecated.(81
+java:S1874"9Remove this use of "PreferenceManager"; it is deprecated.(81
a
-java:S1874"CRemove this use of "getDefaultSharedPreferences"; it is deprecated.(81
+java:S1874"CRemove this use of "getDefaultSharedPreferences"; it is deprecated.(81
U
-java:S1135"2Complete the task associated to this TODO comment.(̐81
+java:S1135"2Complete the task associated to this TODO comment.(̐81
M
-java:S2093"*Change this "try" to a try-with-resources.(81
+java:S2093"*Change this "try" to a try-with-resources.(81
v
-java:S1450"XRemove the "mMoveMenu" field and declare it as a local variable in the relevant methods.(81
+java:S1450"XRemove the "mMoveMenu" field and declare it as a local variable in the relevant methods.(81
u
-java:S3252"RUse static access with "android.widget.AbsListView" for "MultiChoiceModeListener".(81
+java:S3252"RUse static access with "android.widget.AbsListView" for "MultiChoiceModeListener".(81
U
-java:S1135"2Complete the task associated to this TODO comment.(81
+java:S1135"2Complete the task associated to this TODO comment.(81
U
-java:S1135"2Complete the task associated to this TODO comment.(81
-U
-java:S1874"9Remove this use of "getDefaultDisplay"; it is deprecated.(ĸ
+java:S1135"2Complete the task associated to this TODO comment.(81
+\
+java:S1874"9Remove this use of "getDefaultDisplay"; it is deprecated.(ĸ81
T
-java:S1874"1Remove this use of "getHeight"; it is deprecated.(81
+java:S1874"1Remove this use of "getHeight"; it is deprecated.(81
?
-java:S1116"Remove this empty statement.(81
+java:S1116"Remove this empty statement.(81
+Y java:S125""; it is deprecated.(?81
-F java:S108")Either remove or fill this block of code.(ʥ81
+java:S1874".Remove this use of ""; it is deprecated.(?81
+F java:S108")Either remove or fill this block of code.(ʥ81
h
-java:S1874"JDon't override a deprecated method or explicitly mark it as "@Deprecated".(Ϳ81
+java:S1874"JDon't override a deprecated method or explicitly mark it as "@Deprecated".(Ϳ81
R
-java:S1874"/Remove this use of "execute"; it is deprecated.(嫏81
+java:S1874"/Remove this use of "execute"; it is deprecated.(嫏81
Z
-java:S1874"7Remove this use of "toggleSoftInput"; it is deprecated.(81
+java:S1874"7Remove this use of "toggleSoftInput"; it is deprecated.(81
V
-java:S1874"3Remove this use of "SHOW_FORCED"; it is deprecated.(81
+java:S1874"3Remove this use of "SHOW_FORCED"; it is deprecated.(81
o
-java:S3776"RRefactor this method to reduce its Cognitive Complexity from 17 to the 15 allowed.(#81
+java:S3776"RRefactor this method to reduce its Cognitive Complexity from 17 to the 15 allowed.(#81
U
-java:S1135"2Complete the task associated to this TODO comment.(8θ1
+java:S1135"2Complete the task associated to this TODO comment.(81
e
-java:S1126"BReplace this if-then-else statement by a single method invocation.(玒8ϸ1
+java:S1126"BReplace this if-then-else statement by a single method invocation.(玒81
U
-java:S1135"2Complete the task associated to this TODO comment.(8Ѹ1
+java:S1135"2Complete the task associated to this TODO comment.(81
m
-java:S1874"JDon't override a deprecated method or explicitly mark it as "@Deprecated".(8Ѹ1
+java:S1874"JDon't override a deprecated method or explicitly mark it as "@Deprecated".(81
X
-java:S1874"5Remove this use of "onBackPressed"; it is deprecated.(8ո1
-Z
-java:S3972"7Move this "if" to a new line or add the missing "else".(81
+java:S1874"5Remove this use of "onBackPressed"; it is deprecated.(81
+p
+java:S3776"RRefactor this method to reduce its Cognitive Complexity from 17 to the 15 allowed.(81
+T
+java:S2696"6Make the enclosing method "static" or remove this set.(܁81
+
+java:S1186"Add a nested comment explaining why this method is empty, throw an UnsupportedOperationException or complete the implementation.(81
+T
+java:S2696"6Make the enclosing method "static" or remove this set.(81
+
+java:S1186"Add a nested comment explaining why this method is empty, throw an UnsupportedOperationException or complete the implementation.(81
Q
-java:S1874".Remove this use of ""; it is deprecated.(Ч81
+java:S1874".Remove this use of ""; it is deprecated.(Ч81
m
-java:S1874"JDon't override a deprecated method or explicitly mark it as "@Deprecated".(ች81
+java:S1874"JDon't override a deprecated method or explicitly mark it as "@Deprecated".(ች81
R
-java:S1874"/Remove this use of "execute"; it is deprecated.(嫏81
+java:S1874"/Remove this use of "execute"; it is deprecated.(嫏81
o
-java:S3776"RRefactor this method to reduce its Cognitive Complexity from 18 to the 15 allowed.(b81
+java:S3776"RRefactor this method to reduce its Cognitive Complexity from 18 to the 15 allowed.(b81
R
-java:S3398"/Move this method into "BackgroundQueryHandler".(81
-N
-java:S3398"0Move this method into "OnListItemClickListener".(81
-H
-java:S3398"%Move this method into "ModeCallback".(81
+java:S3398"/Move this method into "BackgroundQueryHandler".(81
C
-java:S3398"%Move this method into "ModeCallback".(81
\ No newline at end of file
+java:S3398"%Move this method into "ModeCallback".(81
+H
+java:S3398"%Move this method into "ModeCallback".(81
+N
+java:S3398"0Move this method into "OnListItemClickListener".(81
\ No newline at end of file
diff --git a/src/Notes-master/.idea/sonarlint/issuestore/index.pb b/src/Notes-master/.idea/sonarlint/issuestore/index.pb
index 35e85fb..b16bcb6 100644
--- a/src/Notes-master/.idea/sonarlint/issuestore/index.pb
+++ b/src/Notes-master/.idea/sonarlint/issuestore/index.pb
@@ -1,17 +1,99 @@
-l
-
-
\ No newline at end of file
+ 字符数
\ No newline at end of file
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties b/src/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
index 6ee538a..eed3274 100644
--- a/src/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
+++ b/src/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
@@ -1,98 +1,102 @@
-#Thu Jan 18 10:49:16 CST 2024
-net.micode.notes.app-main-5\:/color/primary_text_dark.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\color\\primary_text_dark.xml
-net.micode.notes.app-main-5\:/color/secondary_text_dark.xml=D\:\\Project1\\MiNotes\\src\\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=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_btn_set_color.png
-net.micode.notes.app-main-5\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_color_btn_mask.png
-net.micode.notes.app-main-5\:/drawable-hdpi/call_record.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\call_record.png
-net.micode.notes.app-main-5\:/drawable-hdpi/clock.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\clock.png
-net.micode.notes.app-main-5\:/drawable-hdpi/delete.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\delete.png
-net.micode.notes.app-main-5\:/drawable-hdpi/dropdown_icon.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\dropdown_icon.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/edit_blue.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_blue.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/edit_green.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_green.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/edit_red.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_red.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_blue.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_blue.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_green.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_green.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_red.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_red.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_white.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_white.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_yellow.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/edit_white.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_white.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/edit_yellow.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_yellow.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/font_large.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_large.png
-net.micode.notes.app-main-5\:/drawable-hdpi/font_normal.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_normal.png
-net.micode.notes.app-main-5\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_size_selector_bg.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/font_small.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_small.png
-net.micode.notes.app-main-5\:/drawable-hdpi/font_super.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_super.png
-net.micode.notes.app-main-5\:/drawable-hdpi/icon_app.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\icon_app.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_background.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_background.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_down.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_down.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_middle.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_middle.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_single.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_single.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_up.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_up.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_folder.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_folder.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_footer_bg.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_footer_bg.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_green_down.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_down.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_green_middle.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_middle.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_green_single.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_single.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_green_up.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_up.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_red_down.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_down.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_red_middle.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_middle.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_red_single.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_single.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_red_up.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_up.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_white_down.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_down.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_white_middle.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_middle.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_white_single.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_single.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_white_up.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_up.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_down.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_down.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_middle.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_single.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_single.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_up.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_up.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/menu_delete.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\menu_delete.png
-net.micode.notes.app-main-5\:/drawable-hdpi/menu_move.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\menu_move.png
-net.micode.notes.app-main-5\:/drawable-hdpi/new_note_normal.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\new_note_normal.png
-net.micode.notes.app-main-5\:/drawable-hdpi/new_note_pressed.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\new_note_pressed.png
-net.micode.notes.app-main-5\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\note_edit_color_selector_panel.png
-net.micode.notes.app-main-5\:/drawable-hdpi/notification.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\notification.png
-net.micode.notes.app-main-5\:/drawable-hdpi/search_result.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\search_result.png
-net.micode.notes.app-main-5\:/drawable-hdpi/selected.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\selected.png
-net.micode.notes.app-main-5\:/drawable-hdpi/title_alert.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\title_alert.png
-net.micode.notes.app-main-5\:/drawable-hdpi/title_bar_bg.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\title_bar_bg.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_blue.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_blue.png
-net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_green.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_green.png
-net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_red.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_red.png
-net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_white.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_white.png
-net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_yellow.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_yellow.png
-net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_blue.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_blue.png
-net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_green.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_green.png
-net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_red.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_red.png
-net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_white.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_white.png
-net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_yellow.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_yellow.png
-net.micode.notes.app-main-5\:/drawable/new_note.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable\\new_note.xml
-net.micode.notes.app-main-5\:/drawable/p1.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable\\p1.png
-net.micode.notes.app-main-5\:/drawable/p2.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable\\p2.png
-net.micode.notes.app-main-5\:/layout/account_dialog_title.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\account_dialog_title.xml
-net.micode.notes.app-main-5\:/layout/add_account_text.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\add_account_text.xml
-net.micode.notes.app-main-5\:/layout/datetime_picker.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\datetime_picker.xml
-net.micode.notes.app-main-5\:/layout/dialog_edit_text.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\dialog_edit_text.xml
-net.micode.notes.app-main-5\:/layout/folder_list_item.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\folder_list_item.xml
-net.micode.notes.app-main-5\:/layout/note_edit.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_edit.xml
-net.micode.notes.app-main-5\:/layout/note_edit_list_item.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_edit_list_item.xml
-net.micode.notes.app-main-5\:/layout/note_item.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_item.xml
-net.micode.notes.app-main-5\:/layout/note_list.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list.xml
-net.micode.notes.app-main-5\:/layout/note_list_dropdown_menu.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list_dropdown_menu.xml
-net.micode.notes.app-main-5\:/layout/note_list_footer.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list_footer.xml
-net.micode.notes.app-main-5\:/layout/settings_header.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\settings_header.xml
-net.micode.notes.app-main-5\:/layout/widget_2x.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\widget_2x.xml
-net.micode.notes.app-main-5\:/layout/widget_4x.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\widget_4x.xml
-net.micode.notes.app-main-5\:/menu/call_note_edit.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\call_note_edit.xml
-net.micode.notes.app-main-5\:/menu/call_record_folder.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\call_record_folder.xml
-net.micode.notes.app-main-5\:/menu/note_edit.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_edit.xml
-net.micode.notes.app-main-5\:/menu/note_list.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list.xml
-net.micode.notes.app-main-5\:/menu/note_list_dropdown.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list_dropdown.xml
-net.micode.notes.app-main-5\:/menu/note_list_options.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list_options.xml
-net.micode.notes.app-main-5\:/menu/sub_folder.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\sub_folder.xml
-net.micode.notes.app-main-5\:/raw-zh-rCN/introduction=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\raw-zh-rCN\\introduction
-net.micode.notes.app-main-5\:/raw/introduction=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\raw\\introduction
-net.micode.notes.app-main-5\:/xml/preferences.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\preferences.xml
-net.micode.notes.app-main-5\:/xml/searchable.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\searchable.xml
-net.micode.notes.app-main-5\:/xml/widget_2x_info.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_2x_info.xml
-net.micode.notes.app-main-5\:/xml/widget_4x_info.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_4x_info.xml
+#Fri Jan 19 02:49:24 CST 2024
+net.micode.notes.app-main-5\:/color/primary_text_dark.xml=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\color\\primary_text_dark.xml
+net.micode.notes.app-main-5\:/color/secondary_text_dark.xml=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\color\\secondary_text_dark.xml
+net.micode.notes.app-main-5\:/drawable-hdpi/action_bold.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\action_bold.png
+net.micode.notes.app-main-5\:/drawable-hdpi/action_italic.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\action_italic.png
+net.micode.notes.app-main-5\:/drawable-hdpi/bg_btn_set_color.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_btn_set_color.png
+net.micode.notes.app-main-5\:/drawable-hdpi/bg_color_btn_mask.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_color_btn_mask.png
+net.micode.notes.app-main-5\:/drawable-hdpi/call_record.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\call_record.png
+net.micode.notes.app-main-5\:/drawable-hdpi/clock.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\clock.png
+net.micode.notes.app-main-5\:/drawable-hdpi/delete.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\delete.png
+net.micode.notes.app-main-5\:/drawable-hdpi/dropdown_icon.9.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\dropdown_icon.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/edit_blue.9.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_blue.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/edit_green.9.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_green.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/edit_red.9.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_red.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_blue.9.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_blue.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_green.9.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_green.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_red.9.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_red.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_white.9.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_white.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_yellow.9.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_yellow.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/edit_white.9.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_white.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/edit_yellow.9.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_yellow.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/font_large.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_large.png
+net.micode.notes.app-main-5\:/drawable-hdpi/font_normal.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_normal.png
+net.micode.notes.app-main-5\:/drawable-hdpi/font_size_selector_bg.9.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_size_selector_bg.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/font_small.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_small.png
+net.micode.notes.app-main-5\:/drawable-hdpi/font_super.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_super.png
+net.micode.notes.app-main-5\:/drawable-hdpi/icon_app.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\icon_app.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_background.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_background.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_down.9.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_down.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_middle.9.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_middle.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_single.9.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_single.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_up.9.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_up.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_folder.9.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_folder.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_footer_bg.9.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_footer_bg.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_green_down.9.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_down.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_green_middle.9.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_middle.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_green_single.9.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_single.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_green_up.9.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_up.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_red_down.9.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_down.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_red_middle.9.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_middle.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_red_single.9.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_single.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_red_up.9.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_up.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_white_down.9.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_down.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_white_middle.9.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_middle.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_white_single.9.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_single.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_white_up.9.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_up.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_down.9.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_down.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_middle.9.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_middle.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_single.9.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_single.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_up.9.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_up.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/menu_delete.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\menu_delete.png
+net.micode.notes.app-main-5\:/drawable-hdpi/menu_move.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\menu_move.png
+net.micode.notes.app-main-5\:/drawable-hdpi/new_note_normal.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\new_note_normal.png
+net.micode.notes.app-main-5\:/drawable-hdpi/new_note_pressed.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\new_note_pressed.png
+net.micode.notes.app-main-5\:/drawable-hdpi/note_edit_color_selector_panel.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\note_edit_color_selector_panel.png
+net.micode.notes.app-main-5\:/drawable-hdpi/notification.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\notification.png
+net.micode.notes.app-main-5\:/drawable-hdpi/search_result.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\search_result.png
+net.micode.notes.app-main-5\:/drawable-hdpi/selected.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\selected.png
+net.micode.notes.app-main-5\:/drawable-hdpi/title_alert.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\title_alert.png
+net.micode.notes.app-main-5\:/drawable-hdpi/title_bar_bg.9.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\title_bar_bg.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_blue.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_blue.png
+net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_green.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_green.png
+net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_red.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_red.png
+net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_white.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_white.png
+net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_yellow.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_yellow.png
+net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_blue.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_blue.png
+net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_green.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_green.png
+net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_red.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_red.png
+net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_white.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_white.png
+net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_yellow.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_yellow.png
+net.micode.notes.app-main-5\:/drawable/new_note.xml=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable\\new_note.xml
+net.micode.notes.app-main-5\:/drawable/p1.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable\\p1.png
+net.micode.notes.app-main-5\:/drawable/p2.png=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\drawable\\p2.png
+net.micode.notes.app-main-5\:/font/msyh.ttc=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\font\\msyh.ttc
+net.micode.notes.app-main-5\:/layout/account_dialog_title.xml=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\layout\\account_dialog_title.xml
+net.micode.notes.app-main-5\:/layout/activity_loging.xml=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\layout\\activity_loging.xml
+net.micode.notes.app-main-5\:/layout/add_account_text.xml=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\layout\\add_account_text.xml
+net.micode.notes.app-main-5\:/layout/datetime_picker.xml=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\layout\\datetime_picker.xml
+net.micode.notes.app-main-5\:/layout/dialog_edit_text.xml=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\layout\\dialog_edit_text.xml
+net.micode.notes.app-main-5\:/layout/folder_list_item.xml=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\layout\\folder_list_item.xml
+net.micode.notes.app-main-5\:/layout/note_edit.xml=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_edit.xml
+net.micode.notes.app-main-5\:/layout/note_edit_list_item.xml=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_edit_list_item.xml
+net.micode.notes.app-main-5\:/layout/note_item.xml=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_item.xml
+net.micode.notes.app-main-5\:/layout/note_list.xml=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list.xml
+net.micode.notes.app-main-5\:/layout/note_list_dropdown_menu.xml=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list_dropdown_menu.xml
+net.micode.notes.app-main-5\:/layout/note_list_footer.xml=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list_footer.xml
+net.micode.notes.app-main-5\:/layout/settings_header.xml=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\layout\\settings_header.xml
+net.micode.notes.app-main-5\:/layout/widget_2x.xml=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\layout\\widget_2x.xml
+net.micode.notes.app-main-5\:/layout/widget_4x.xml=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\layout\\widget_4x.xml
+net.micode.notes.app-main-5\:/menu/call_note_edit.xml=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\menu\\call_note_edit.xml
+net.micode.notes.app-main-5\:/menu/call_record_folder.xml=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\menu\\call_record_folder.xml
+net.micode.notes.app-main-5\:/menu/note_edit.xml=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_edit.xml
+net.micode.notes.app-main-5\:/menu/note_list.xml=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list.xml
+net.micode.notes.app-main-5\:/menu/note_list_dropdown.xml=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list_dropdown.xml
+net.micode.notes.app-main-5\:/menu/note_list_options.xml=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list_options.xml
+net.micode.notes.app-main-5\:/menu/sub_folder.xml=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\menu\\sub_folder.xml
+net.micode.notes.app-main-5\:/raw-zh-rCN/introduction=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\raw-zh-rCN\\introduction
+net.micode.notes.app-main-5\:/raw/introduction=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\raw\\introduction
+net.micode.notes.app-main-5\:/xml/preferences.xml=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\xml\\preferences.xml
+net.micode.notes.app-main-5\:/xml/searchable.xml=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\xml\\searchable.xml
+net.micode.notes.app-main-5\:/xml/widget_2x_info.xml=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_2x_info.xml
+net.micode.notes.app-main-5\:/xml/widget_4x_info.xml=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_4x_info.xml
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml b/src/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml
index 4fc4c71..f654817 100644
--- a/src/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml
+++ b/src/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml
@@ -1,5 +1,5 @@
-
+
- -%s
- --%s
- --%s
@@ -7,11 +7,11 @@
- Messaging
- Email
- #335b5b5b33sp26sp20sp17sp14spNotesNotes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode,can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txt(%d)New FolderExport textSyncCancel syncingSettingsSearchDeletelight modenight modeMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel
+ #335b5b5b33sp26sp20sp17sp14spNotesNotes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode,can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txt(%d)New FolderExport textSyncCancel syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent foldersecret modelquit secret modelNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel
- %1$s result for \"%2$s\"
- %1$s results for \"%2$s\"
-
+
- 短信
- 邮件
- 便签便签2x2便签4x4没有关联内容,点击新建便签。访客模式下,便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项,操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在,请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗?已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用,不能操作导出文本时发生错误,请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败,请检查网络和帐号设置同步失败,发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号,过去的帐号同步信息将被清空,再次切换的同时可能会造成数据重复同步便签请选择google帐号,便签将与该帐号的google task内容同步。正在同步中,不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消
+ 便签便签2x2便签4x4没有关联内容,点击新建便签。访客模式下,便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项,操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在,请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹私密模式退出私密模式已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗?已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用,不能操作导出文本时发生错误,请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败,请检查网络和帐号设置同步失败,发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号,过去的帐号同步信息将被清空,再次切换的同时可能会造成数据重复同步便签请选择google帐号,便签将与该帐号的google task内容同步。正在同步中,不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消
- %1$s 条符合“%2$s”的搜索结果
- 夜间模式白天模式
+ 登录退出账号密码加载中...无效...字符数日用夜用选择字体
- 短信
- 郵件
- 便簽便簽2x2便簽4x4沒有關聯內容,點擊新建便簽。訪客模式下,便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項,操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在,請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎?SD卡被佔用,不能操作導出TXT時發生錯誤,請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗,請檢查網絡和帳號設置同步失敗,發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號,過去的帳號同步信息將被清空,再次切換的同時可能會造成數據重復同步便簽請選擇google帳號,便簽將與該帳號的google task內容同步。正在同步中,不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消
+ 便簽便簽2x2便簽4x4沒有關聯內容,點擊新建便簽。訪客模式下,便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項,操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在,請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎?SD卡被佔用,不能操作導出TXT時發生錯誤,請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗,請檢查網絡和帳號設置同步失敗,發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號,過去的帳號同步信息將被清空,再次切換的同時可能會造成數據重復同步便簽請選擇google帳號,便簽將與該帳號的google task內容同步。正在同步中,不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消
- %1$s 條符合”%2$s“的搜尋結果
-
\ No newline at end of file
+ 字符数
\ No newline at end of file
diff --git a/src/Notes-master/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/compile-file-map.properties b/src/Notes-master/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/compile-file-map.properties
index 7f60336..9d169f2 100644
--- a/src/Notes-master/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/compile-file-map.properties
+++ b/src/Notes-master/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/compile-file-map.properties
@@ -1 +1 @@
-#Wed Dec 20 23:43:26 CST 2023
+#Tue Jan 09 20:29:49 CST 2024
diff --git a/src/Notes-master/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/merger.xml b/src/Notes-master/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/merger.xml
index 51a8ddd..b580b97 100644
--- a/src/Notes-master/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/merger.xml
+++ b/src/Notes-master/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/merger.xml
@@ -1,2 +1,2 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/Notes-master/app/build/intermediates/incremental/mergeDebugAndroidTestAssets/merger.xml b/src/Notes-master/app/build/intermediates/incremental/mergeDebugAndroidTestAssets/merger.xml
index 90bce7d..6b157a9 100644
--- a/src/Notes-master/app/build/intermediates/incremental/mergeDebugAndroidTestAssets/merger.xml
+++ b/src/Notes-master/app/build/intermediates/incremental/mergeDebugAndroidTestAssets/merger.xml
@@ -1,2 +1,2 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/Notes-master/app/build/intermediates/incremental/mergeDebugAndroidTestJniLibFolders/merger.xml b/src/Notes-master/app/build/intermediates/incremental/mergeDebugAndroidTestJniLibFolders/merger.xml
index 7b7c7ff..9a7e7dc 100644
--- a/src/Notes-master/app/build/intermediates/incremental/mergeDebugAndroidTestJniLibFolders/merger.xml
+++ b/src/Notes-master/app/build/intermediates/incremental/mergeDebugAndroidTestJniLibFolders/merger.xml
@@ -1,2 +1,2 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/Notes-master/app/build/intermediates/incremental/mergeDebugAndroidTestShaders/merger.xml b/src/Notes-master/app/build/intermediates/incremental/mergeDebugAndroidTestShaders/merger.xml
index aa1f577..4526f1f 100644
--- a/src/Notes-master/app/build/intermediates/incremental/mergeDebugAndroidTestShaders/merger.xml
+++ b/src/Notes-master/app/build/intermediates/incremental/mergeDebugAndroidTestShaders/merger.xml
@@ -1,2 +1,2 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/Notes-master/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/src/Notes-master/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
index 62b869b..9f12f4a 100644
--- a/src/Notes-master/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
+++ b/src/Notes-master/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
@@ -1,2 +1,2 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/Notes-master/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/src/Notes-master/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
index 86bb24c..ad13032 100644
--- a/src/Notes-master/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
+++ b/src/Notes-master/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
@@ -1,2 +1,2 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/Notes-master/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/src/Notes-master/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
index 801f470..b35b4c4 100644
--- a/src/Notes-master/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
+++ b/src/Notes-master/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
@@ -1,2 +1,2 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
index 25934d3..895e412 100644
--- a/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
+++ b/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
@@ -1,4 +1,4 @@
-#Thu Jan 18 10:49:21 CST 2024
-base.0=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
+#Fri Jan 19 02:58:09 CST 2024
+base.0=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
path.0=classes.dex
renamed.0=classes.dex
diff --git a/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
index 5dce7a5..5bf00bd 100644
Binary files a/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/packageDebugAndroidTest/tmp/debugAndroidTest/dex-renamer-state.txt b/src/Notes-master/app/build/intermediates/incremental/packageDebugAndroidTest/tmp/debugAndroidTest/dex-renamer-state.txt
index 3804fdf..809098c 100644
--- a/src/Notes-master/app/build/intermediates/incremental/packageDebugAndroidTest/tmp/debugAndroidTest/dex-renamer-state.txt
+++ b/src/Notes-master/app/build/intermediates/incremental/packageDebugAndroidTest/tmp/debugAndroidTest/dex-renamer-state.txt
@@ -1,4 +1,4 @@
-#Thu Jan 18 10:49:19 CST 2024
-base.0=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\dex\\debugAndroidTest\\mergeDexDebugAndroidTest\\classes.dex
+#Fri Jan 19 01:56:45 CST 2024
+base.0=C\:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\build\\intermediates\\dex\\debugAndroidTest\\mergeDexDebugAndroidTest\\classes.dex
path.0=classes.dex
renamed.0=classes.dex
diff --git a/src/Notes-master/app/build/intermediates/incremental/packageDebugAndroidTest/tmp/debugAndroidTest/zip-cache/androidResources b/src/Notes-master/app/build/intermediates/incremental/packageDebugAndroidTest/tmp/debugAndroidTest/zip-cache/androidResources
index 3fdc0b4..a40567b 100644
Binary files a/src/Notes-master/app/build/intermediates/incremental/packageDebugAndroidTest/tmp/debugAndroidTest/zip-cache/androidResources and b/src/Notes-master/app/build/intermediates/incremental/packageDebugAndroidTest/tmp/debugAndroidTest/zip-cache/androidResources differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class
index 20ff3f7..cff1d60 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class
index 5236c5e..5688579 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class
index 099f3ba..ec76630 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class
index 2783ae3..d4a8f6c 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class
index 5aaf1d4..3b9f4f1 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class
index 359609e..7af9628 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class
index f7afcae..60776c2 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class
index 41b0479..efa9b15 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class
index 4b72deb..c8f3b75 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class
index 8e1f0bf..f465292 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class
index 7584b8b..ccb9ea9 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class
index 14805a4..0e58b97 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class
index f452595..a2a0efe 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class
index ac00dce..fcd4ce6 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class
index 49a0a54..007ac17 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class
index c192db7..9d3d1d1 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class
index e4866ff..52503ec 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class
index 13d127c..5496a2c 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class
index 865cabd..3836a68 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class
index 47dabba..757ce3a 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class
index d7a4585..0656827 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class
index 6b1021f..e1ec48d 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class
index a71429f..13a884d 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class
index e122732..94c95b1 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class
index 4e6294f..16b2cc8 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class
index 4bc3a45..3486ded 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class
index bdf61ac..44b1f3b 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class
index df4a72d..8ddc509 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class differ
diff --git a/src/Notes-master/app/build/intermediates/local_only_symbol_list/debug/R-def.txt b/src/Notes-master/app/build/intermediates/local_only_symbol_list/debug/R-def.txt
index b9565f5..9ea56ae 100644
--- a/src/Notes-master/app/build/intermediates/local_only_symbol_list/debug/R-def.txt
+++ b/src/Notes-master/app/build/intermediates/local_only_symbol_list/debug/R-def.txt
@@ -10,6 +10,8 @@ dimen text_font_size_medium
dimen text_font_size_normal
dimen text_font_size_small
dimen text_font_size_super
+drawable action_bold
+drawable action_italic
drawable bg_btn_set_color
drawable bg_color_btn_mask
drawable call_record
@@ -78,12 +80,15 @@ drawable widget_4x_green
drawable widget_4x_red
drawable widget_4x_white
drawable widget_4x_yellow
+font msyh
+id account
id account_dialog_subtitle
id account_dialog_title
id action_select_all
id amPm
id btn_new_note
id btn_set_bg_color
+id cancel
id cb_edit_item
id date
id delete
@@ -110,21 +115,26 @@ id ll_font_large
id ll_font_normal
id ll_font_small
id ll_font_super
+id login
id menu_alert
id menu_daytime
id menu_delete
id menu_delete_remind
id menu_export_text
+id menu_font_select
id menu_font_size
id menu_list_mode
id menu_new_folder
id menu_new_note
id menu_night_time
+id menu_quit_secret
id menu_search
+id menu_secret
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
@@ -134,6 +144,7 @@ id note_edit_view
id note_item
id note_title
id notes_list
+id password
id prefenerece_sync_status_textview
id preference_sync_button
id selection_menu
@@ -148,6 +159,7 @@ id tv_title_bar
id widget_bg_image
id widget_text
layout account_dialog_title
+layout activity_loging
layout add_account_text
layout datetime_picker
layout dialog_edit_text
@@ -170,6 +182,7 @@ menu note_list_options
menu sub_folder
plurals search_results_title
raw introduction
+string Loading
string alert_message_delete_folder
string alert_message_delete_note
string alert_message_delete_notes
@@ -179,6 +192,7 @@ string app_widget2x2
string app_widget4x4
string button_delete
string call_record_folder_name
+string cancel
string datetime_dialog_cancel
string datetime_dialog_ok
string day_time
@@ -202,6 +216,7 @@ string format_folder_files_count
string format_move_notes_to_folder
string hint_foler_name
string info_note_enter_desktop
+string invalid
string menu_alert
string menu_create_folder
string menu_delete
@@ -214,13 +229,16 @@ string menu_font_large
string menu_font_normal
string menu_font_size
string menu_font_small
+string menu_font_style
string menu_font_super
string menu_list_mode
string menu_move
string menu_move_parent_folder
string menu_normal_mode
+string menu_quit_secret
string menu_remove_remind
string menu_search
+string menu_secret
string menu_select_all
string menu_select_none
string menu_select_title
@@ -232,6 +250,7 @@ string menu_sync_cancel
string menu_title_select_folder
string night_time
string note_alert_expired
+string note_length
string note_link_email
string note_link_other
string note_link_tel
@@ -258,6 +277,9 @@ string preferences_menu_remove_account
string preferences_title
string preferences_toast_cannot_change_account
string preferences_toast_success_set_accout
+string prompt_account
+string prompt_login
+string prompt_password
string search
string search_hint
string search_label
diff --git a/src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
index 874dbeb..19aa1c3 100644
--- a/src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
+++ b/src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
@@ -20,252 +20,271 @@
20 android:versionName="0.1" >
21
22 D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:23:5-44
+22-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:24:5-44
23 android:minSdkVersion="14"
-23-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:23:15-41
+23-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:24:15-41
24 android:targetSdkVersion="14" />
25
26
-26-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:25:5-81
-26-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:25:22-78
+26-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:26:5-81
+26-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:26:22-78
27
-27-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:26:5-88
-27-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:26:22-85
+27-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:27:5-88
+27-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:27:22-85
28
-28-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:27:5-67
-28-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:27:22-64
+28-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:28:5-67
+28-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:28:22-64
29
-29-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:28:5-72
-29-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:28:22-69
+29-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:29:5-72
+29-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:29:22-69
30
-30-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:29:5-74
-30-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:29:22-71
+30-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:30:5-74
+30-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:30:22-71
31
-31-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:30:5-80
-31-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:30:22-77
+31-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:31:5-80
+31-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:31:22-77
32
-32-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:31:5-71
-32-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:31:22-68
+32-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:32:5-71
+32-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:32:22-68
33
-33-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:32:5-74
-33-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:32:22-71
+33-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:33:5-74
+33-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:33:22-71
34
-34-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:33:5-81
-34-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:33:22-78
+34-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:34:5-81
+34-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:34:22-78
35
36 D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:35:5-148:19
+36-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:36:5-161:19
37 android:debuggable="true"
38 android:extractNativeLibs="true"
39 android:icon="@drawable/icon_app"
-39-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:36:9-42
+39-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:37:9-42
40 android:label="@string/app_name"
-40-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:37:9-41
+40-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:38:9-41
41 android:testOnly="true" >
42 D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:38:9-50:20
+42-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:39:9-51:20
43 android:name="net.micode.notes.ui.NotesListActivity"
-43-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:39:13-49
+43-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:40:13-49
44 android:configChanges="keyboardHidden|orientation|screenSize"
-44-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:40:13-74
+44-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:41:13-74
45 android:label="@string/app_name"
-45-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:41:13-45
+45-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:42:13-45
46 android:launchMode="singleTop"
-46-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:42:13-43
+46-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:43:13-43
47 android:theme="@style/NoteTheme"
-47-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:43:13-45
+47-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:44:13-45
48 android:windowSoftInputMode="adjustPan" >
-48-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:44:13-52
+48-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:45:13-52
49
-49-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:46:13-49:29
+49-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:47:13-50:29
50
-50-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:47:17-69
-50-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:47:25-66
+50-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:48:17-69
+50-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:48:25-66
51
-52
-52-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:48:17-77
-52-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:48:27-74
+52
+52-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:49:17-76
+52-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:49:27-73
53
54
55 D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:52:9-80:20
-56 android:name="net.micode.notes.ui.NoteEditActivity"
-56-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:53:13-48
-57 android:configChanges="keyboardHidden|orientation|screenSize"
-57-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:54:13-74
-58 android:launchMode="singleTop"
-58-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:55:13-43
-59 android:theme="@style/NoteTheme" >
-59-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:56:13-45
-60
-60-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:58:13-63:29
-61
-61-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:59:17-69
-61-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:59:25-66
-62
-63
-63-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:17-76
-63-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:27-73
-64
-65
-65-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:17-78
-65-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:23-75
-66
-66-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:17-78
-66-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:23-75
-67
-68
-68-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:65:13-70:29
-69
-69-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:66:17-79
-69-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:66:25-76
-70
-71
-71-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:17-76
-71-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:27-73
+55-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:53:9-63:20
+56 android:name="net.micode.notes.ui.LoginActivity"
+56-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:54:13-45
+57 android:label="@string/app_name"
+57-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:55:13-45
+58 android:theme="@style/NoteTheme" >
+58-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:56:13-45
+59
+59-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:59:13-62:29
+60
+60-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:48:17-69
+60-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:48:25-66
+61
+62
+62-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:61:17-77
+62-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:61:27-74
+63
+64
+65 C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:65:9-93:20
+66 android:name="net.micode.notes.ui.NoteEditActivity"
+66-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:66:13-48
+67 android:configChanges="keyboardHidden|orientation|screenSize"
+67-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:67:13-74
+68 android:launchMode="singleTop"
+68-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:68:13-43
+69 android:theme="@style/NoteTheme" >
+69-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:69:13-45
+70
+70-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:71:13-76:29
+71
+71-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:72:17-69
+71-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:72:25-66
72
-73
-73-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:17-78
-73-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:23-75
-74
-74-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:17-78
-74-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:23-75
-75
-76
-76-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:72:13-75:29
-77
-77-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:73:17-71
-77-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:73:25-68
-78
-79
-79-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:17-76
-79-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:27-73
-80
-81
-82 D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:77:13-79:54
-83 android:name="android.app.searchable"
-83-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:78:17-54
-84 android:resource="@xml/searchable" />
-84-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:79:17-51
-85
-86
-87 D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:82:9-85:43
-88 android:name="net.micode.notes.data.NotesProvider"
-88-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:83:13-63
-89 android:authorities="micode_notes"
-89-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:84:13-47
-90 android:multiprocess="true" />
-90-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:85:13-40
+73
+73-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:49:17-76
+73-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:49:27-73
+74
+75
+75-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:74:17-78
+75-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:74:23-75
+76
+76-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:74:17-78
+76-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:74:23-75
+77
+78
+78-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:78:13-83:29
+79
+79-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:79:17-79
+79-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:79:25-76
+80
+81
+81-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:49:17-76
+81-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:49:27-73
+82
+83
+83-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:74:17-78
+83-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:74:23-75
+84
+84-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:74:17-78
+84-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:74:23-75
+85
+86
+86-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:85:13-88:29
+87
+87-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:86:17-71
+87-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:86:25-68
+88
+89
+89-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:49:17-76
+89-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:49:27-73
+90
91
-92 D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:87:9-99:20
-93 android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
-93-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:88:13-57
-94 android:label="@string/app_widget2x2" >
-94-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:89:13-50
-95
-95-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:90:13-94:29
-96
-96-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:91:17-84
-96-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:91:25-81
-97
-97-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:92:17-85
-97-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:92:25-82
-98
-98-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:93:17-85
-98-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:93:25-82
-99
-100
-101 D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:96:13-98:58
-102 android:name="android.appwidget.provider"
-102-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:97:17-58
-103 android:resource="@xml/widget_2x_info" />
-103-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:98:17-55
-104
-105 D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:100:9-113:20
-106 android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
-106-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:101:13-57
-107 android:label="@string/app_widget4x4" >
-107-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:102:13-50
-108
-108-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:90:13-94:29
-109
-109-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:91:17-84
-109-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:91:25-81
-110
-110-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:92:17-85
-110-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:92:25-82
-111
-111-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:93:17-85
-111-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:93:25-82
-112
-113
-114 D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:96:13-98:58
-115 android:name="android.appwidget.provider"
-115-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:97:17-58
-116 android:resource="@xml/widget_4x_info" />
-116-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:98:17-55
-117
-118
-118-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:115:9-119:20
-118-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:115:19-55
-119
-119-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:116:13-118:29
-120
-120-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:117:17-79
-120-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:117:25-76
-121
-122
-123 D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:121:9-124:20
-124 android:name="net.micode.notes.ui.AlarmReceiver"
-124-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:122:13-61
-125 android:process=":remote" >
-125-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:123:13-38
-126
-127
-128 D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:126:9-131:20
-129 android:name="net.micode.notes.ui.AlarmAlertActivity"
-129-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:127:13-50
-130 android:label="@string/app_name"
-130-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:128:13-45
-131 android:launchMode="singleInstance"
-131-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:129:13-48
-132 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
-132-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:130:13-75
-133
-134 D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:133:9-138:20
-135 android:name="net.micode.notes.ui.NotesPreferenceActivity"
-135-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:134:13-71
-136 android:label="@string/preferences_title"
-136-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:135:13-54
-137 android:launchMode="singleTop"
-137-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:136:13-43
-138 android:theme="@android:style/Theme.Holo.Light" >
-138-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:137:13-60
-139
-140
-141 D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:140:9-143:19
-142 android:name="net.micode.notes.gtask.remote.GTaskSyncService"
-142-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:141:13-74
-143 android:exported="false" >
-143-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:142:13-37
-144
-145
-146 D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:145:9-147:52
-147 android:name="android.app.default_searchable"
-147-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:146:13-58
-148 android:value=".ui.NoteEditActivity" />
-148-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:147:13-49
-149
+92 C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:90:13-92:54
+93 android:name="android.app.searchable"
+93-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:91:17-54
+94 android:resource="@xml/searchable" />
+94-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:92:17-51
+95
+96
+97 C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:95:9-98:43
+98 android:name="net.micode.notes.data.NotesProvider"
+98-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:96:13-63
+99 android:authorities="micode_notes"
+99-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:97:13-47
+100 android:multiprocess="true" />
+100-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:98:13-40
+101
+102 C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:100:9-112:20
+103 android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
+103-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:101:13-57
+104 android:label="@string/app_widget2x2" >
+104-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:102:13-50
+105
+105-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:103:13-107:29
+106
+106-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:104:17-84
+106-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:104:25-81
+107
+107-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:105:17-85
+107-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:105:25-82
+108
+108-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:106:17-85
+108-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:106:25-82
+109
+110
+111 C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:109:13-111:58
+112 android:name="android.appwidget.provider"
+112-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:110:17-58
+113 android:resource="@xml/widget_2x_info" />
+113-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:111:17-55
+114
+115 C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:113:9-126:20
+116 android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
+116-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:114:13-57
+117 android:label="@string/app_widget4x4" >
+117-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:115:13-50
+118
+118-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:103:13-107:29
+119
+119-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:104:17-84
+119-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:104:25-81
+120
+120-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:105:17-85
+120-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:105:25-82
+121
+121-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:106:17-85
+121-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:106:25-82
+122
+123
+124 C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:109:13-111:58
+125 android:name="android.appwidget.provider"
+125-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:110:17-58
+126 android:resource="@xml/widget_4x_info" />
+126-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:111:17-55
+127
+128
+128-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:128:9-132:20
+128-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:128:19-55
+129
+129-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:129:13-131:29
+130
+130-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:130:17-79
+130-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:130:25-76
+131
+132
+133 C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:134:9-137:20
+134 android:name="net.micode.notes.ui.AlarmReceiver"
+134-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:135:13-61
+135 android:process=":remote" >
+135-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:136:13-38
+136
+137
+138 C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:139:9-144:20
+139 android:name="net.micode.notes.ui.AlarmAlertActivity"
+139-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:140:13-50
+140 android:label="@string/app_name"
+140-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:141:13-45
+141 android:launchMode="singleInstance"
+141-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:142:13-48
+142 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
+142-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:143:13-75
+143
+144 C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:146:9-151:20
+145 android:name="net.micode.notes.ui.NotesPreferenceActivity"
+145-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:147:13-71
+146 android:label="@string/preferences_title"
+146-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:148:13-54
+147 android:launchMode="singleTop"
+147-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:149:13-43
+148 android:theme="@android:style/Theme.Holo.Light" >
+148-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:150:13-60
+149
150
-151
+151 C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:153:9-156:19
+152 android:name="net.micode.notes.gtask.remote.GTaskSyncService"
+152-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:154:13-74
+153 android:exported="false" >
+153-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:155:13-37
+154
+155
+156 C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:158:9-160:52
+157 android:name="android.app.default_searchable"
+157-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:159:13-58
+158 android:value=".ui.NoteEditActivity" />
+158-->C:\Users\lenovo\Desktop\Notes-master22222\app\src\main\AndroidManifest.xml:160:13-49
+159
+160
+161
diff --git a/src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt b/src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt
index e4090c8..e107b76 100644
--- a/src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt
+++ b/src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt
@@ -3,32 +3,32 @@
3 package="net.micode.notes.test" >
4
5 D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest15820545187547679684.xml:5:5-74
+5-->C:\Users\lenovo\Desktop\Notes-master22222\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest4525418906631105929.xml:5:5-74
6 android:minSdkVersion="14"
-6-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest15820545187547679684.xml:5:15-41
+6-->C:\Users\lenovo\Desktop\Notes-master22222\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest4525418906631105929.xml:5:15-41
7 android:targetSdkVersion="14" />
-7-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest15820545187547679684.xml:5:42-71
+7-->C:\Users\lenovo\Desktop\Notes-master22222\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest4525418906631105929.xml:5:42-71
8
9 D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest15820545187547679684.xml:11:5-15:66
+9-->C:\Users\lenovo\Desktop\Notes-master22222\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest4525418906631105929.xml:11:5-15:66
10 android:name="android.test.InstrumentationTestRunner"
-10-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest15820545187547679684.xml:11:22-75
+10-->C:\Users\lenovo\Desktop\Notes-master22222\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest4525418906631105929.xml:11:22-75
11 android:functionalTest="false"
-11-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest15820545187547679684.xml:14:22-52
+11-->C:\Users\lenovo\Desktop\Notes-master22222\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest4525418906631105929.xml:14:22-52
12 android:handleProfiling="false"
-12-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest15820545187547679684.xml:13:22-53
+12-->C:\Users\lenovo\Desktop\Notes-master22222\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest4525418906631105929.xml:13:22-53
13 android:label="Tests for net.micode.notes"
-13-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest15820545187547679684.xml:15:22-64
+13-->C:\Users\lenovo\Desktop\Notes-master22222\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest4525418906631105929.xml:15:22-64
14 android:targetPackage="net.micode.notes" />
-14-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest15820545187547679684.xml:12:22-62
+14-->C:\Users\lenovo\Desktop\Notes-master22222\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest4525418906631105929.xml:12:22-62
15
16 D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest15820545187547679684.xml:7:5-9:19
+16-->C:\Users\lenovo\Desktop\Notes-master22222\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest4525418906631105929.xml:7:5-9:19
17 android:debuggable="true"
18 android:extractNativeLibs="true" >
19
-19-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest15820545187547679684.xml:8:9-60
-19-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest15820545187547679684.xml:8:23-57
+19-->C:\Users\lenovo\Desktop\Notes-master22222\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest4525418906631105929.xml:8:9-60
+19-->C:\Users\lenovo\Desktop\Notes-master22222\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest4525418906631105929.xml:8:23-57
20
21
22
diff --git a/src/Notes-master/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml b/src/Notes-master/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml
index 3067a07..7175b02 100644
--- a/src/Notes-master/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml
+++ b/src/Notes-master/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml
@@ -49,6 +49,16 @@
+
+
+
+
+
+
+
diff --git a/src/Notes-master/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml b/src/Notes-master/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml
index 3067a07..7175b02 100644
--- a/src/Notes-master/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml
+++ b/src/Notes-master/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml
@@ -49,6 +49,16 @@
+
+
+
+
+
+
+
diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat
index 6c97e3d..5b0e1c2 100644
Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat and b/src/Notes-master/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat differ
diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat
index 24a703b..804125b 100644
Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat and b/src/Notes-master/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat differ
diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat
index c025a60..93066dc 100644
Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat and b/src/Notes-master/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat differ
diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat
index 8e75cd6..178614d 100644
Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat and b/src/Notes-master/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat differ
diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat
index ad66757..0f7184c 100644
Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat and b/src/Notes-master/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat differ
diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat
index 68b46ae..00291c5 100644
Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat and b/src/Notes-master/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat differ
diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat
index b353e0d..ace6546 100644
Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat and b/src/Notes-master/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat differ
diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat
index 0e5932b..e73c0d4 100644
Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat and b/src/Notes-master/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat differ
diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/values_values.arsc.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/values_values.arsc.flat
index fc5724c..821862f 100644
Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/values_values.arsc.flat and b/src/Notes-master/app/build/intermediates/merged_res/debug/values_values.arsc.flat differ
diff --git a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
index 82611f9..a266958 100644
--- a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
+++ b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
@@ -1,36 +1,36 @@
{
"logs": [
{
- "outputFile": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\values-zh-rCN_values-zh-rCN.arsc.flat",
+ "outputFile": "net.micode.notes.app-merged_res-4:/values-zh-rCN_values-zh-rCN.arsc.flat",
"map": [
{
- "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
+ "source": "C:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
"from": {
- "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029",
- "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
- "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
- "endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090"
+ "startLines": "125,133,75,74,73,72,19,20,21,116,117,130,124,123,137,26,81,82,80,79,78,94,93,92,84,60,29,30,85,76,118,71,134,63,38,44,49,39,59,58,57,53,52,50,51,140,54,55,45,66,56,69,64,43,68,48,47,46,62,42,61,40,41,65,138,28,135,34,36,33,35,32,31,25,24,101,100,103,115,108,107,109,110,112,111,102,106,104,105,99,113,114,131,129,132,122,120,119,121,27,83,91,96,95,97,90,89,88,87,22,23",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "6756,7117,3669,3602,3528,3477,846,887,936,6298,6344,6983,6701,6650,7251,1225,4041,4110,3981,3915,3851,4785,4724,4660,4244,2937,1398,1452,4299,3743,6402,3417,7161,3097,1836,2123,2374,1890,2876,2822,2770,2571,2522,2426,2475,7337,2618,2666,2167,3254,2717,3362,3141,2079,3316,2326,2269,2213,3041,2034,2998,1941,1983,3194,7292,1346,7204,1657,1755,1609,1707,1561,1515,1173,1119,5167,5107,5310,6223,5626,5556,5691,5770,5955,5881,5243,5500,5368,5434,5057,6060,6144,7022,6938,7069,6611,6502,6453,6548,1288,4188,4600,4900,4841,4968,4551,4505,4456,4404,985,1052",
+ "endLines": "127,133,75,74,73,72,19,20,21,116,117,130,124,123,137,26,81,82,80,79,78,94,93,92,84,60,29,30,85,76,118,71,134,63,38,44,49,39,59,58,57,53,52,50,51,140,54,55,45,66,56,69,64,43,68,48,47,46,62,42,61,40,41,65,138,28,135,34,36,33,35,32,31,25,24,101,100,103,115,108,107,109,110,112,111,102,106,104,105,99,113,114,131,129,132,122,120,119,121,27,83,91,96,95,97,90,89,88,87,22,23",
+ "endColumns": "14,42,72,65,72,49,39,47,47,44,56,37,53,49,39,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,41,42,52,42,50,49,59,52,50,45,47,47,45,48,46,49,44,58,51,51,51,42,44,46,55,54,54,43,41,40,49,58,41,50,43,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,45,43,46,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+ "endOffsets": "6930,7155,3737,3663,3596,3522,881,930,979,6338,6396,7016,6750,6695,7286,1282,4104,4182,4035,3975,3909,4835,4779,4718,4293,2992,1446,1509,4379,3819,6447,3471,7198,3135,1884,2161,2420,1935,2931,2870,2816,2612,2565,2469,2516,7381,2660,2711,2207,3308,2764,3409,3188,2117,3356,2368,2320,2263,3091,2073,3035,1977,2028,3248,7329,1392,7243,1701,1799,1651,1749,1603,1555,1219,1167,5237,5161,5362,6292,5685,5620,5764,5875,6054,5949,5304,5550,5428,5494,5101,6138,6217,7063,6977,7111,6644,6542,6496,6605,1340,4238,4654,4962,4894,5025,4594,4545,4499,4450,1046,1113"
},
"to": {
- "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925",
- "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
- "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
- "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986"
+ "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "215,384,427,500,566,639,689,729,777,825,870,927,965,1019,1069,1109,1171,1239,1316,1375,1440,1503,1558,1618,1681,1735,1795,1848,1910,1995,2076,2126,2185,2227,2270,2323,2366,2417,2467,2527,2580,2631,2677,2725,2773,2819,2868,2915,2965,3010,3069,3121,3173,3225,3268,3313,3360,3416,3471,3526,3570,3612,3653,3703,3762,3804,3855,3899,3948,3997,4044,4091,4138,4183,4234,4287,4362,4421,4478,4552,4616,4685,4763,4873,4977,5050,5116,5171,5236,5301,5350,5433,5511,5557,5601,5648,5686,5731,5779,5841,5898,5953,6012,6079,6137,6199,6247,6292,6340,6391,6457",
+ "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118",
+ "endColumns": "14,42,72,65,72,49,39,47,47,44,56,37,53,49,39,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,41,42,52,42,50,49,59,52,50,45,47,47,45,48,46,49,44,58,51,51,51,42,44,46,55,54,54,43,41,40,49,58,41,50,43,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,45,43,46,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+ "endOffsets": "379,422,495,561,634,684,724,772,820,865,922,960,1014,1064,1104,1166,1234,1311,1370,1435,1498,1553,1613,1676,1730,1790,1843,1905,1990,2071,2121,2180,2222,2265,2318,2361,2412,2462,2522,2575,2626,2672,2720,2768,2814,2863,2910,2960,3005,3064,3116,3168,3220,3263,3308,3355,3411,3466,3521,3565,3607,3648,3698,3757,3799,3850,3894,3943,3992,4039,4086,4133,4178,4229,4282,4357,4416,4473,4547,4611,4680,4758,4868,4972,5045,5111,5166,5231,5296,5345,5428,5506,5552,5596,5643,5681,5726,5774,5836,5893,5948,6007,6074,6132,6194,6242,6287,6335,6386,6452,6518"
}
},
{
- "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
+ "source": "C:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
"from": {
"startLines": "18",
"startColumns": "4",
- "startOffsets": "712",
+ "startOffsets": "730",
"endLines": "21",
"endColumns": "19",
- "endOffsets": "817"
+ "endOffsets": "838"
},
"to": {
"startLines": "2",
@@ -44,75 +44,70 @@
]
},
{
- "outputFile": "net.micode.notes.app-merged_res-4:/values-zh-rCN_values-zh-rCN.arsc.flat",
+ "outputFile": "net.micode.notes.app-merged_res-4:/values_values.arsc.flat",
"map": [
{
- "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
+ "source": "C:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\src\\main\\res\\values\\dimens.xml",
"from": {
- "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,45,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,46,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
- "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
- "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2122,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2164,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
- "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,41,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,43,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
- "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2159,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2203,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "19,20,21,22,18",
+ "startColumns": "4,4,4,4,4",
+ "startOffsets": "783,836,890,944,730",
+ "endColumns": "51,52,52,51,51",
+ "endOffsets": "830,884,938,991,777"
},
"to": {
- "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1030,1092,1160,1237,1296,1361,1424,1479,1539,1602,1656,1716,1769,1831,1916,1997,2047,2106,2149,2202,2245,2296,2346,2406,2459,2510,2556,2604,2652,2698,2745,2795,2840,2899,2951,3003,3046,3093,3149,3204,3259,3303,3345,3386,3436,3495,3539,3590,3639,3688,3735,3782,3829,3874,3925,3978,4053,4112,4169,4243,4307,4376,4454,4564,4668,4741,4807,4862,4927,4992,5041,5124,5202,5240,5285,5333,5395,5452,5507,5566,5633,5691,5753,5801,5846,5894,5945,6011",
- "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108",
- "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,41,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,43,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
- "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1025,1087,1155,1232,1291,1356,1419,1474,1534,1597,1651,1711,1764,1826,1911,1992,2042,2101,2144,2197,2240,2291,2341,2401,2454,2505,2551,2599,2647,2693,2740,2790,2835,2894,2946,2998,3041,3088,3144,3199,3254,3298,3340,3381,3431,3490,3534,3585,3634,3683,3730,3777,3824,3869,3920,3973,4048,4107,4164,4238,4302,4371,4449,4559,4663,4736,4802,4857,4922,4987,5036,5119,5197,5235,5280,5328,5390,5447,5502,5561,5628,5686,5748,5796,5841,5889,5940,6006,6072"
+ "startLines": "13,14,15,16,17",
+ "startColumns": "4,4,4,4,4",
+ "startOffsets": "477,529,582,635,687",
+ "endColumns": "51,52,52,51,51",
+ "endOffsets": "524,577,630,682,734"
}
},
{
- "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
+ "source": "C:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\src\\main\\res\\values\\colors.xml",
"from": {
- "startLines": "-1",
- "startColumns": "-1",
- "startOffsets": "-1"
+ "startLines": "18",
+ "startColumns": "4",
+ "startOffsets": "730",
+ "endColumns": "56",
+ "endOffsets": "782"
},
"to": {
- "startLines": "2",
+ "startLines": "12",
"startColumns": "4",
- "startOffsets": "105",
- "endLines": "5",
- "endColumns": "19",
- "endOffsets": "210"
+ "startOffsets": "420",
+ "endColumns": "56",
+ "endOffsets": "472"
}
- }
- ]
- },
- {
- "outputFile": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\values_values.arsc.flat",
- "map": [
+ },
{
- "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\strings.xml",
+ "source": "C:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\src\\main\\res\\values\\styles.xml",
"from": {
- "startLines": "130,74,77,76,75,19,20,21,120,121,129,128,49,26,83,84,82,81,80,96,95,94,86,39,38,66,29,30,87,41,78,122,73,69,42,48,55,43,65,64,63,59,58,56,57,60,61,51,72,62,70,47,54,53,52,68,46,67,44,45,71,50,28,34,36,33,35,32,31,25,24,103,102,106,118,111,110,112,113,115,114,104,105,109,107,108,101,116,117,127,125,124,126,27,85,93,98,97,99,92,91,90,89,22,23",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "8106,3996,4257,4161,4092,827,870,922,7604,7653,8048,7997,2518,1282,4711,4805,4640,4556,4473,5672,5589,5487,4981,2004,1953,3495,1486,1539,5042,2097,4340,7716,3925,3680,2156,2471,2870,2214,3424,3363,3306,3084,3032,2929,2982,3134,3184,2616,3859,3244,3729,2424,2815,2727,2669,3618,2374,3573,2271,2314,3792,2566,1431,1750,1858,1703,1805,1647,1599,1227,1174,6128,6061,6369,7507,6733,6652,6807,6896,7138,7059,6212,6287,6593,6433,6513,6006,7282,7404,7956,7829,7772,7882,1366,4913,5401,5807,5738,5887,5342,5287,5225,5165,974,1084",
- "endLines": "134,74,77,76,75,19,20,21,120,121,129,128,49,26,83,84,82,81,80,96,95,94,86,39,38,66,29,30,87,41,78,122,73,69,42,48,55,43,65,64,63,59,58,56,57,60,61,51,72,62,70,47,54,53,52,68,46,67,44,45,71,50,28,34,36,33,35,32,31,25,24,103,102,106,118,111,110,112,113,115,114,104,105,109,107,108,101,116,117,127,125,124,126,27,85,93,98,97,99,92,91,90,89,22,23",
- "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,47,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,49,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
- "endOffsets": "8510,4087,4335,4252,4156,865,917,969,7648,7711,8101,8043,2561,1361,4800,4908,4706,4635,4551,5733,5667,5584,5037,2061,1999,3568,1534,1594,5142,2151,4437,7766,3991,3724,2209,2513,2924,2266,3490,3419,3358,3129,3079,2977,3027,3179,3239,2664,3920,3301,3787,2466,2865,2810,2722,3675,2419,3613,2309,2369,3854,2611,1481,1800,1906,1745,1853,1698,1642,1277,1222,6207,6123,6428,7598,6802,6728,6891,7054,7277,7133,6282,6364,6647,6508,6588,6056,7399,7502,7992,7877,7824,7951,1426,4976,5482,5882,5802,5976,5396,5337,5282,5220,1079,1169"
+ "startLines": "50,55,64,60,22,26,30,35,40,18,45",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905",
+ "endLines": "53,58,67,62,25,29,33,38,43,21,48",
+ "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
+ "endOffsets": "2314,2531,2913,2696,1098,1287,1476,1685,1897,911,2104"
},
"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,1852,1936,2030,2138,2209,2293,2376,2442,2525,2627,2688,2750,2801,2879,2932,2992,3097,3156,3258,3313,3384,3433,3491,3538,3597,3654,3725,3786,3843,3893,3945,3998,4048,4098,4158,4211,4277,4339,4402,4449,4504,4592,4650,4712,4762,4807,4850,4910,4977,5027,5082,5137,5190,5237,5290,5346,5394,5449,5502,5586,5653,5717,5813,5887,5968,6057,6220,6364,6443,6518,6600,6659,6739,6819,6874,6996,7099,7140,7193,7250,7324,7389,7457,7543,7623,7692,7786,7845,7900,7962,8022,8132",
- "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,47,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,49,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
- "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1847,1931,2025,2133,2204,2288,2371,2437,2520,2622,2683,2745,2796,2874,2927,2987,3092,3151,3253,3308,3379,3428,3486,3533,3592,3649,3720,3781,3838,3888,3940,3993,4043,4093,4153,4206,4272,4334,4397,4444,4499,4587,4645,4707,4757,4802,4845,4905,4972,5022,5077,5132,5185,5232,5285,5341,5389,5444,5497,5581,5648,5712,5808,5882,5963,6052,6215,6359,6438,6513,6595,6654,6734,6814,6869,6991,7094,7135,7188,7245,7319,7384,7452,7538,7618,7687,7781,7840,7895,7957,8017,8127,8217"
+ "startLines": "137,141,145,149,152,156,160,164,168,172,176",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "8750,8954,9165,9375,9535,9718,9903,10088,10291,10497,10680",
+ "endLines": "140,144,148,151,155,159,163,167,171,175,179",
+ "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
+ "endOffsets": "8949,9160,9370,9530,9713,9898,10083,10286,10492,10675,10876"
}
},
{
- "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml",
+ "source": "C:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\src\\main\\res\\values\\arrays.xml",
"from": {
"startLines": "19,26",
"startColumns": "4,4",
- "startOffsets": "739,1047",
+ "startOffsets": "758,1073",
"endLines": "24,29",
"endColumns": "19,19",
- "endOffsets": "1041,1162"
+ "endOffsets": "1065,1191"
},
"to": {
"startLines": "2,8",
@@ -124,72 +119,57 @@
}
},
{
- "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\styles.xml",
+ "source": "C:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\src\\main\\res\\values\\strings.xml",
"from": {
- "startLines": "50,55,64,60,22,26,30,35,40,18,45",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860",
- "endLines": "53,58,67,62,25,29,33,38,43,21,48",
- "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
- "endOffsets": "2261,2473,2846,2634,1073,1258,1443,1647,1854,890,2056"
+ "startLines": "134,144,78,81,80,79,19,20,21,124,125,141,133,132,149,26,87,88,86,85,84,100,99,98,90,39,38,64,29,30,91,41,82,126,77,145,67,42,48,53,43,63,62,61,57,56,54,55,152,58,59,49,70,60,74,68,47,73,52,51,50,66,46,65,44,45,69,150,28,146,34,36,33,35,32,31,25,24,107,106,110,122,115,114,116,117,119,118,108,109,113,111,112,105,120,121,142,140,143,131,129,128,130,27,89,97,102,101,103,96,95,94,93,22,23",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "8275,8910,4109,4373,4276,4206,846,890,943,7763,7813,8747,8216,8164,9058,1308,4833,4928,4761,4676,4592,5807,5723,5620,5106,2043,1991,3461,1515,1569,5168,2138,4457,7877,4037,8958,3649,2198,2519,2825,2257,3389,3327,3269,3043,2990,2885,2939,9160,3094,3145,2567,3831,3206,3969,3699,2471,3915,2769,2680,2621,3586,2420,3540,2315,2359,3763,9107,1459,9006,1784,1894,1736,1840,1679,1630,1252,1198,6270,6202,6514,7664,6883,6801,6958,7048,7292,7212,6355,6431,6741,6579,6660,6146,7437,7560,8790,8691,8849,8122,7993,7935,8047,1393,5037,5533,5944,5874,6025,5473,5417,5354,5293,996,1107",
+ "endLines": "138,144,78,81,80,79,19,20,21,124,125,141,133,132,149,26,87,88,86,85,84,100,99,98,90,39,38,64,29,30,91,41,82,126,77,145,67,42,48,53,43,63,62,61,57,56,54,55,152,58,59,49,70,60,74,68,47,73,52,51,50,66,46,65,44,45,69,150,28,146,34,36,33,35,32,31,25,24,107,106,110,122,115,114,116,117,119,118,108,109,113,111,112,105,120,121,142,140,143,131,129,128,130,27,89,97,102,101,103,96,95,94,93,22,23",
+ "endColumns": "14,46,95,82,95,68,42,51,51,48,62,41,57,50,47,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,46,48,57,46,58,56,70,60,56,49,51,52,49,55,49,59,52,65,61,62,62,46,52,54,87,57,61,49,44,42,59,66,49,54,46,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,57,54,59,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
+ "endOffsets": "8683,8952,4200,4451,4367,4270,884,937,990,7807,7871,8784,8269,8210,9101,1387,4922,5031,4827,4755,4670,5868,5801,5717,5162,2100,2037,3534,1563,1624,5268,2192,4554,7927,4103,9000,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,9211,3139,3200,2615,3892,3263,4027,3757,2513,3963,2819,2763,2674,3643,2465,3580,2353,2414,3825,9152,1509,9048,1834,1942,1778,1888,1730,1673,1302,1246,6349,6264,6573,7755,6952,6877,7042,7206,7431,7286,6425,6508,6795,6654,6735,6196,7554,7658,8843,8741,8904,8158,8041,7987,8116,1453,5100,5614,6019,5938,6114,5527,5467,5411,5348,1101,1192"
},
"to": {
- "startLines": "127,131,135,139,142,146,150,154,158,162,166",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "8222,8426,8637,8847,9007,9190,9375,9560,9763,9969,10152",
- "endLines": "130,134,138,141,145,149,153,157,161,165,169",
- "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
- "endOffsets": "8421,8632,8842,9002,9185,9370,9555,9758,9964,10147,10348"
+ "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "739,1092,1139,1235,1318,1414,1483,1526,1578,1630,1679,1742,1784,1842,1893,1941,2025,2119,2227,2298,2382,2465,2531,2614,2716,2777,2839,2890,2968,3021,3081,3186,3245,3347,3402,3473,3520,3569,3627,3674,3733,3790,3861,3922,3979,4029,4081,4134,4184,4240,4290,4350,4403,4469,4531,4594,4657,4704,4757,4812,4900,4958,5020,5070,5115,5158,5218,5285,5335,5390,5437,5492,5545,5592,5645,5701,5749,5804,5857,5941,6008,6072,6168,6242,6323,6412,6575,6719,6798,6873,6955,7014,7094,7174,7229,7351,7454,7512,7567,7627,7668,7721,7778,7852,7917,7985,8071,8151,8220,8314,8373,8428,8490,8550,8660",
+ "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136",
+ "endColumns": "14,46,95,82,95,68,42,51,51,48,62,41,57,50,47,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,46,48,57,46,58,56,70,60,56,49,51,52,49,55,49,59,52,65,61,62,62,46,52,54,87,57,61,49,44,42,59,66,49,54,46,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,57,54,59,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
+ "endOffsets": "1087,1134,1230,1313,1409,1478,1521,1573,1625,1674,1737,1779,1837,1888,1936,2020,2114,2222,2293,2377,2460,2526,2609,2711,2772,2834,2885,2963,3016,3076,3181,3240,3342,3397,3468,3515,3564,3622,3669,3728,3785,3856,3917,3974,4024,4076,4129,4179,4235,4285,4345,4398,4464,4526,4589,4652,4699,4752,4807,4895,4953,5015,5065,5110,5153,5213,5280,5330,5385,5432,5487,5540,5587,5640,5696,5744,5799,5852,5936,6003,6067,6163,6237,6318,6407,6570,6714,6793,6868,6950,7009,7089,7169,7224,7346,7449,7507,7562,7622,7663,7716,7773,7847,7912,7980,8066,8146,8215,8309,8368,8423,8485,8545,8655,8745"
}
- },
+ }
+ ]
+ },
+ {
+ "outputFile": "net.micode.notes.app-merged_res-4:/values-zh-rTW_values-zh-rTW.arsc.flat",
+ "map": [
{
- "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\colors.xml",
+ "source": "C:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
"from": {
- "startLines": "18",
- "startColumns": "4",
- "startOffsets": "712",
- "endColumns": "56",
- "endOffsets": "764"
+ "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,125,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "6629,3647,3580,3506,3455,846,887,936,6169,6215,6574,6523,1225,3911,3980,3851,3784,3720,4654,4593,4529,4114,3018,1398,1452,4169,1805,6273,3395,3178,1917,2204,2455,1971,2957,2903,2851,2652,2603,2507,2556,2699,2747,2248,3335,2798,3222,2160,2407,2350,2294,3122,2115,3079,2022,2064,3275,1346,6809,1657,1755,1609,1707,1561,1515,1173,1119,5036,4976,5179,6092,5495,5425,5560,5639,5824,5750,5112,5369,5237,5303,4926,5929,6013,6484,6375,6326,6421,1288,4058,4469,4769,4710,4837,4420,4374,4325,4273,985,1052",
+ "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,125,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
+ "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,43,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+ "endOffsets": "6803,3714,3641,3574,3500,881,930,979,6209,6267,6623,6568,1282,3974,4052,3905,3845,3778,4704,4648,4587,4163,3073,1446,1509,4248,1880,6318,3449,3216,1965,2242,2501,2016,3012,2951,2897,2693,2646,2550,2597,2741,2792,2288,3389,2845,3269,2198,2449,2401,2344,3172,2154,3116,2058,2109,3329,1392,6848,1701,1799,1651,1749,1603,1555,1219,1167,5106,5030,5231,6161,5554,5489,5633,5744,5923,5818,5173,5419,5297,5363,4970,6007,6086,6517,6415,6369,6478,1340,4108,4523,4831,4763,4894,4463,4414,4368,4319,1046,1113"
},
"to": {
- "startLines": "12",
- "startColumns": "4",
- "startOffsets": "420",
- "endColumns": "56",
- "endOffsets": "472"
+ "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3546,3595,3644,3691,3738,3785,3830,3881,3934,4009,4068,4125,4199,4263,4332,4410,4520,4624,4697,4763,4818,4883,4948,4997,5080,5158,5196,5241,5289,5351,5408,5463,5522,5589,5647,5709,5757,5802,5850,5901,5967",
+ "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107",
+ "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,43,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+ "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3541,3590,3639,3686,3733,3780,3825,3876,3929,4004,4063,4120,4194,4258,4327,4405,4515,4619,4692,4758,4813,4878,4943,4992,5075,5153,5191,5236,5284,5346,5403,5458,5517,5584,5642,5704,5752,5797,5845,5896,5962,6028"
}
},
{
- "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml",
- "from": {
- "startLines": "19,20,21,22,18",
- "startColumns": "4,4,4,4,4",
- "startOffsets": "764,816,869,922,712",
- "endColumns": "51,52,52,51,51",
- "endOffsets": "811,864,917,969,759"
- },
- "to": {
- "startLines": "13,14,15,16,17",
- "startColumns": "4,4,4,4,4",
- "startOffsets": "477,529,582,635,687",
- "endColumns": "51,52,52,51,51",
- "endOffsets": "524,577,630,682,734"
- }
- }
- ]
- },
- {
- "outputFile": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\values-zh-rTW_values-zh-rTW.arsc.flat",
- "map": [
- {
- "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
+ "source": "C:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
"from": {
"startLines": "18",
"startColumns": "4",
- "startOffsets": "712",
+ "startOffsets": "730",
"endLines": "21",
"endColumns": "19",
- "endOffsets": "817"
+ "endOffsets": "838"
},
"to": {
"startLines": "2",
@@ -199,25 +179,6 @@
"endColumns": "19",
"endOffsets": "210"
}
- },
- {
- "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
- "from": {
- "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029",
- "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
- "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
- "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090"
- },
- "to": {
- "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923",
- "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
- "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
- "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984"
- }
}
]
}
diff --git a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
index 72c5e4e..f255cfe 100644
--- a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
+++ b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
@@ -4,72 +4,33 @@
"outputFile": "net.micode.notes.app-mergeDebugResources-2:/values-zh-rCN/values-zh-rCN.xml",
"map": [
{
- "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
+ "source": "C:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
"from": {
- "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,45,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,46,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
- "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
- "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2122,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2164,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
- "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,41,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,43,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
- "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2159,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2203,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "125,133,75,74,73,72,19,20,21,116,117,130,124,123,137,26,81,82,80,79,78,94,93,92,84,60,29,30,85,76,118,71,134,63,38,44,49,39,59,58,57,53,52,50,51,140,54,55,45,66,56,69,64,43,68,48,47,46,62,42,61,40,41,65,138,28,135,34,36,33,35,32,31,25,24,101,100,103,115,108,107,109,110,112,111,102,106,104,105,99,113,114,131,129,132,122,120,119,121,27,83,91,96,95,97,90,89,88,87,22,23",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "6756,7117,3669,3602,3528,3477,846,887,936,6298,6344,6983,6701,6650,7251,1225,4041,4110,3981,3915,3851,4785,4724,4660,4244,2937,1398,1452,4299,3743,6402,3417,7161,3097,1836,2123,2374,1890,2876,2822,2770,2571,2522,2426,2475,7337,2618,2666,2167,3254,2717,3362,3141,2079,3316,2326,2269,2213,3041,2034,2998,1941,1983,3194,7292,1346,7204,1657,1755,1609,1707,1561,1515,1173,1119,5167,5107,5310,6223,5626,5556,5691,5770,5955,5881,5243,5500,5368,5434,5057,6060,6144,7022,6938,7069,6611,6502,6453,6548,1288,4188,4600,4900,4841,4968,4551,4505,4456,4404,985,1052",
+ "endLines": "127,133,75,74,73,72,19,20,21,116,117,130,124,123,137,26,81,82,80,79,78,94,93,92,84,60,29,30,85,76,118,71,134,63,38,44,49,39,59,58,57,53,52,50,51,140,54,55,45,66,56,69,64,43,68,48,47,46,62,42,61,40,41,65,138,28,135,34,36,33,35,32,31,25,24,101,100,103,115,108,107,109,110,112,111,102,106,104,105,99,113,114,131,129,132,122,120,119,121,27,83,91,96,95,97,90,89,88,87,22,23",
+ "endColumns": "14,42,72,65,72,49,39,47,47,44,56,37,53,49,39,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,41,42,52,42,50,49,59,52,50,45,47,47,45,48,46,49,44,58,51,51,51,42,44,46,55,54,54,43,41,40,49,58,41,50,43,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,45,43,46,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+ "endOffsets": "6930,7155,3737,3663,3596,3522,881,930,979,6338,6396,7016,6750,6695,7286,1282,4104,4182,4035,3975,3909,4835,4779,4718,4293,2992,1446,1509,4379,3819,6447,3471,7198,3135,1884,2161,2420,1935,2931,2870,2816,2612,2565,2469,2516,7381,2660,2711,2207,3308,2764,3409,3188,2117,3356,2368,2320,2263,3091,2073,3035,1977,2028,3248,7329,1392,7243,1701,1799,1651,1749,1603,1555,1219,1167,5237,5161,5362,6292,5685,5620,5764,5875,6054,5949,5304,5550,5428,5494,5101,6138,6217,7063,6977,7111,6644,6542,6496,6605,1340,4238,4654,4962,4894,5025,4594,4545,4499,4450,1046,1113"
},
"to": {
- "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1030,1092,1160,1237,1296,1361,1424,1479,1539,1602,1656,1716,1769,1831,1916,1997,2047,2106,2149,2202,2245,2296,2346,2406,2459,2510,2556,2604,2652,2698,2745,2795,2840,2899,2951,3003,3046,3093,3149,3204,3259,3303,3345,3386,3436,3495,3539,3590,3639,3688,3735,3782,3829,3874,3925,3978,4053,4112,4169,4243,4307,4376,4454,4564,4668,4741,4807,4862,4927,4992,5041,5124,5202,5240,5285,5333,5395,5452,5507,5566,5633,5691,5753,5801,5846,5894,5945,6011",
- "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108",
- "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,41,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,43,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
- "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1025,1087,1155,1232,1291,1356,1419,1474,1534,1597,1651,1711,1764,1826,1911,1992,2042,2101,2144,2197,2240,2291,2341,2401,2454,2505,2551,2599,2647,2693,2740,2790,2835,2894,2946,2998,3041,3088,3144,3199,3254,3298,3340,3381,3431,3490,3534,3585,3634,3683,3730,3777,3824,3869,3920,3973,4048,4107,4164,4238,4302,4371,4449,4559,4663,4736,4802,4857,4922,4987,5036,5119,5197,5235,5280,5328,5390,5447,5502,5561,5628,5686,5748,5796,5841,5889,5940,6006,6072"
+ "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "215,384,427,500,566,639,689,729,777,825,870,927,965,1019,1069,1109,1171,1239,1316,1375,1440,1503,1558,1618,1681,1735,1795,1848,1910,1995,2076,2126,2185,2227,2270,2323,2366,2417,2467,2527,2580,2631,2677,2725,2773,2819,2868,2915,2965,3010,3069,3121,3173,3225,3268,3313,3360,3416,3471,3526,3570,3612,3653,3703,3762,3804,3855,3899,3948,3997,4044,4091,4138,4183,4234,4287,4362,4421,4478,4552,4616,4685,4763,4873,4977,5050,5116,5171,5236,5301,5350,5433,5511,5557,5601,5648,5686,5731,5779,5841,5898,5953,6012,6079,6137,6199,6247,6292,6340,6391,6457",
+ "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118",
+ "endColumns": "14,42,72,65,72,49,39,47,47,44,56,37,53,49,39,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,41,42,52,42,50,49,59,52,50,45,47,47,45,48,46,49,44,58,51,51,51,42,44,46,55,54,54,43,41,40,49,58,41,50,43,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,45,43,46,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+ "endOffsets": "379,422,495,561,634,684,724,772,820,865,922,960,1014,1064,1104,1166,1234,1311,1370,1435,1498,1553,1613,1676,1730,1790,1843,1905,1990,2071,2121,2180,2222,2265,2318,2361,2412,2462,2522,2575,2626,2672,2720,2768,2814,2863,2910,2960,3005,3064,3116,3168,3220,3263,3308,3355,3411,3466,3521,3565,3607,3648,3698,3757,3799,3850,3894,3943,3992,4039,4086,4133,4178,4229,4282,4357,4416,4473,4547,4611,4680,4758,4868,4972,5045,5111,5166,5231,5296,5345,5428,5506,5552,5596,5643,5681,5726,5774,5836,5893,5948,6007,6074,6132,6194,6242,6287,6335,6386,6452,6518"
}
},
{
- "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
- "from": {
- "startLines": "-1",
- "startColumns": "-1",
- "startOffsets": "-1"
- },
- "to": {
- "startLines": "2",
- "startColumns": "4",
- "startOffsets": "105",
- "endLines": "5",
- "endColumns": "19",
- "endOffsets": "210"
- }
- }
- ]
- },
- {
- "outputFile": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-mergeDebugResources-2:\\values-zh-rCN\\values-zh-rCN.xml",
- "map": [
- {
- "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
- "from": {
- "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029",
- "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
- "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
- "endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090"
- },
- "to": {
- "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925",
- "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
- "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
- "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986"
- }
- },
- {
- "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
+ "source": "C:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
"from": {
"startLines": "18",
"startColumns": "4",
- "startOffsets": "712",
+ "startOffsets": "730",
"endLines": "21",
"endColumns": "19",
- "endOffsets": "817"
+ "endOffsets": "838"
},
"to": {
"startLines": "2",
diff --git a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
index bd40dd3..a5c01bd 100644
--- a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
+++ b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
@@ -4,14 +4,33 @@
"outputFile": "net.micode.notes.app-mergeDebugResources-2:/values-zh-rTW/values-zh-rTW.xml",
"map": [
{
- "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
+ "source": "C:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
+ "from": {
+ "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,125,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "6629,3647,3580,3506,3455,846,887,936,6169,6215,6574,6523,1225,3911,3980,3851,3784,3720,4654,4593,4529,4114,3018,1398,1452,4169,1805,6273,3395,3178,1917,2204,2455,1971,2957,2903,2851,2652,2603,2507,2556,2699,2747,2248,3335,2798,3222,2160,2407,2350,2294,3122,2115,3079,2022,2064,3275,1346,6809,1657,1755,1609,1707,1561,1515,1173,1119,5036,4976,5179,6092,5495,5425,5560,5639,5824,5750,5112,5369,5237,5303,4926,5929,6013,6484,6375,6326,6421,1288,4058,4469,4769,4710,4837,4420,4374,4325,4273,985,1052",
+ "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,125,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
+ "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,43,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+ "endOffsets": "6803,3714,3641,3574,3500,881,930,979,6209,6267,6623,6568,1282,3974,4052,3905,3845,3778,4704,4648,4587,4163,3073,1446,1509,4248,1880,6318,3449,3216,1965,2242,2501,2016,3012,2951,2897,2693,2646,2550,2597,2741,2792,2288,3389,2845,3269,2198,2449,2401,2344,3172,2154,3116,2058,2109,3329,1392,6848,1701,1799,1651,1749,1603,1555,1219,1167,5106,5030,5231,6161,5554,5489,5633,5744,5923,5818,5173,5419,5297,5363,4970,6007,6086,6517,6415,6369,6478,1340,4108,4523,4831,4763,4894,4463,4414,4368,4319,1046,1113"
+ },
+ "to": {
+ "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3546,3595,3644,3691,3738,3785,3830,3881,3934,4009,4068,4125,4199,4263,4332,4410,4520,4624,4697,4763,4818,4883,4948,4997,5080,5158,5196,5241,5289,5351,5408,5463,5522,5589,5647,5709,5757,5802,5850,5901,5967",
+ "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107",
+ "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,43,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+ "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3541,3590,3639,3686,3733,3780,3825,3876,3929,4004,4063,4120,4194,4258,4327,4405,4515,4619,4692,4758,4813,4878,4943,4992,5075,5153,5191,5236,5284,5346,5403,5458,5517,5584,5642,5704,5752,5797,5845,5896,5962,6028"
+ }
+ },
+ {
+ "source": "C:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
"from": {
"startLines": "18",
"startColumns": "4",
- "startOffsets": "712",
+ "startOffsets": "730",
"endLines": "21",
"endColumns": "19",
- "endOffsets": "817"
+ "endOffsets": "838"
},
"to": {
"startLines": "2",
@@ -21,25 +40,6 @@
"endColumns": "19",
"endOffsets": "210"
}
- },
- {
- "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
- "from": {
- "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029",
- "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
- "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
- "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090"
- },
- "to": {
- "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923",
- "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
- "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
- "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984"
- }
}
]
}
diff --git a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
index f7d6e37..a45c1d2 100644
--- a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
+++ b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
@@ -4,94 +4,94 @@
"outputFile": "net.micode.notes.app-mergeDebugResources-2:/values/values.xml",
"map": [
{
- "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\strings.xml",
+ "source": "C:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\src\\main\\res\\values\\dimens.xml",
"from": {
- "startLines": "130,74,77,76,75,19,20,21,120,121,129,128,49,26,83,84,82,81,80,96,95,94,86,39,38,66,29,30,87,41,78,122,73,69,42,48,55,43,65,64,63,59,58,56,57,60,61,51,72,62,70,47,54,53,52,68,46,67,44,45,71,50,28,34,36,33,35,32,31,25,24,103,102,106,118,111,110,112,113,115,114,104,105,109,107,108,101,116,117,127,125,124,126,27,85,93,98,97,99,92,91,90,89,22,23",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "8106,3996,4257,4161,4092,827,870,922,7604,7653,8048,7997,2518,1282,4711,4805,4640,4556,4473,5672,5589,5487,4981,2004,1953,3495,1486,1539,5042,2097,4340,7716,3925,3680,2156,2471,2870,2214,3424,3363,3306,3084,3032,2929,2982,3134,3184,2616,3859,3244,3729,2424,2815,2727,2669,3618,2374,3573,2271,2314,3792,2566,1431,1750,1858,1703,1805,1647,1599,1227,1174,6128,6061,6369,7507,6733,6652,6807,6896,7138,7059,6212,6287,6593,6433,6513,6006,7282,7404,7956,7829,7772,7882,1366,4913,5401,5807,5738,5887,5342,5287,5225,5165,974,1084",
- "endLines": "134,74,77,76,75,19,20,21,120,121,129,128,49,26,83,84,82,81,80,96,95,94,86,39,38,66,29,30,87,41,78,122,73,69,42,48,55,43,65,64,63,59,58,56,57,60,61,51,72,62,70,47,54,53,52,68,46,67,44,45,71,50,28,34,36,33,35,32,31,25,24,103,102,106,118,111,110,112,113,115,114,104,105,109,107,108,101,116,117,127,125,124,126,27,85,93,98,97,99,92,91,90,89,22,23",
- "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,47,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,49,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
- "endOffsets": "8510,4087,4335,4252,4156,865,917,969,7648,7711,8101,8043,2561,1361,4800,4908,4706,4635,4551,5733,5667,5584,5037,2061,1999,3568,1534,1594,5142,2151,4437,7766,3991,3724,2209,2513,2924,2266,3490,3419,3358,3129,3079,2977,3027,3179,3239,2664,3920,3301,3787,2466,2865,2810,2722,3675,2419,3613,2309,2369,3854,2611,1481,1800,1906,1745,1853,1698,1642,1277,1222,6207,6123,6428,7598,6802,6728,6891,7054,7277,7133,6282,6364,6647,6508,6588,6056,7399,7502,7992,7877,7824,7951,1426,4976,5482,5882,5802,5976,5396,5337,5282,5220,1079,1169"
+ "startLines": "19,20,21,22,18",
+ "startColumns": "4,4,4,4,4",
+ "startOffsets": "783,836,890,944,730",
+ "endColumns": "51,52,52,51,51",
+ "endOffsets": "830,884,938,991,777"
},
"to": {
- "startLines": "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,1852,1936,2030,2138,2209,2293,2376,2442,2525,2627,2688,2750,2801,2879,2932,2992,3097,3156,3258,3313,3384,3433,3491,3538,3597,3654,3725,3786,3843,3893,3945,3998,4048,4098,4158,4211,4277,4339,4402,4449,4504,4592,4650,4712,4762,4807,4850,4910,4977,5027,5082,5137,5190,5237,5290,5346,5394,5449,5502,5586,5653,5717,5813,5887,5968,6057,6220,6364,6443,6518,6600,6659,6739,6819,6874,6996,7099,7140,7193,7250,7324,7389,7457,7543,7623,7692,7786,7845,7900,7962,8022,8132",
- "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,47,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,49,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
- "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1847,1931,2025,2133,2204,2288,2371,2437,2520,2622,2683,2745,2796,2874,2927,2987,3092,3151,3253,3308,3379,3428,3486,3533,3592,3649,3720,3781,3838,3888,3940,3993,4043,4093,4153,4206,4272,4334,4397,4444,4499,4587,4645,4707,4757,4802,4845,4905,4972,5022,5077,5132,5185,5232,5285,5341,5389,5444,5497,5581,5648,5712,5808,5882,5963,6052,6215,6359,6438,6513,6595,6654,6734,6814,6869,6991,7094,7135,7188,7245,7319,7384,7452,7538,7618,7687,7781,7840,7895,7957,8017,8127,8217"
+ "startLines": "13,14,15,16,17",
+ "startColumns": "4,4,4,4,4",
+ "startOffsets": "477,529,582,635,687",
+ "endColumns": "51,52,52,51,51",
+ "endOffsets": "524,577,630,682,734"
}
},
{
- "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml",
+ "source": "C:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\src\\main\\res\\values\\colors.xml",
"from": {
- "startLines": "19,26",
- "startColumns": "4,4",
- "startOffsets": "739,1047",
- "endLines": "24,29",
- "endColumns": "19,19",
- "endOffsets": "1041,1162"
+ "startLines": "18",
+ "startColumns": "4",
+ "startOffsets": "730",
+ "endColumns": "56",
+ "endOffsets": "782"
},
"to": {
- "startLines": "2,8",
- "startColumns": "4,4",
- "startOffsets": "105,300",
- "endLines": "7,11",
- "endColumns": "19,19",
- "endOffsets": "295,415"
+ "startLines": "12",
+ "startColumns": "4",
+ "startOffsets": "420",
+ "endColumns": "56",
+ "endOffsets": "472"
}
},
{
- "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\styles.xml",
+ "source": "C:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\src\\main\\res\\values\\styles.xml",
"from": {
"startLines": "50,55,64,60,22,26,30,35,40,18,45",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860",
+ "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905",
"endLines": "53,58,67,62,25,29,33,38,43,21,48",
"endColumns": "12,12,12,12,12,12,12,12,12,12,12",
- "endOffsets": "2261,2473,2846,2634,1073,1258,1443,1647,1854,890,2056"
+ "endOffsets": "2314,2531,2913,2696,1098,1287,1476,1685,1897,911,2104"
},
"to": {
- "startLines": "127,131,135,139,142,146,150,154,158,162,166",
+ "startLines": "137,141,145,149,152,156,160,164,168,172,176",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "8222,8426,8637,8847,9007,9190,9375,9560,9763,9969,10152",
- "endLines": "130,134,138,141,145,149,153,157,161,165,169",
+ "startOffsets": "8750,8954,9165,9375,9535,9718,9903,10088,10291,10497,10680",
+ "endLines": "140,144,148,151,155,159,163,167,171,175,179",
"endColumns": "12,12,12,12,12,12,12,12,12,12,12",
- "endOffsets": "8421,8632,8842,9002,9185,9370,9555,9758,9964,10147,10348"
+ "endOffsets": "8949,9160,9370,9530,9713,9898,10083,10286,10492,10675,10876"
}
},
{
- "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\colors.xml",
+ "source": "C:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\src\\main\\res\\values\\arrays.xml",
"from": {
- "startLines": "18",
- "startColumns": "4",
- "startOffsets": "712",
- "endColumns": "56",
- "endOffsets": "764"
+ "startLines": "19,26",
+ "startColumns": "4,4",
+ "startOffsets": "758,1073",
+ "endLines": "24,29",
+ "endColumns": "19,19",
+ "endOffsets": "1065,1191"
},
"to": {
- "startLines": "12",
- "startColumns": "4",
- "startOffsets": "420",
- "endColumns": "56",
- "endOffsets": "472"
+ "startLines": "2,8",
+ "startColumns": "4,4",
+ "startOffsets": "105,300",
+ "endLines": "7,11",
+ "endColumns": "19,19",
+ "endOffsets": "295,415"
}
},
{
- "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml",
+ "source": "C:\\Users\\lenovo\\Desktop\\Notes-master22222\\app\\src\\main\\res\\values\\strings.xml",
"from": {
- "startLines": "19,20,21,22,18",
- "startColumns": "4,4,4,4,4",
- "startOffsets": "764,816,869,922,712",
- "endColumns": "51,52,52,51,51",
- "endOffsets": "811,864,917,969,759"
+ "startLines": "134,144,78,81,80,79,19,20,21,124,125,141,133,132,149,26,87,88,86,85,84,100,99,98,90,39,38,64,29,30,91,41,82,126,77,145,67,42,48,53,43,63,62,61,57,56,54,55,152,58,59,49,70,60,74,68,47,73,52,51,50,66,46,65,44,45,69,150,28,146,34,36,33,35,32,31,25,24,107,106,110,122,115,114,116,117,119,118,108,109,113,111,112,105,120,121,142,140,143,131,129,128,130,27,89,97,102,101,103,96,95,94,93,22,23",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "8275,8910,4109,4373,4276,4206,846,890,943,7763,7813,8747,8216,8164,9058,1308,4833,4928,4761,4676,4592,5807,5723,5620,5106,2043,1991,3461,1515,1569,5168,2138,4457,7877,4037,8958,3649,2198,2519,2825,2257,3389,3327,3269,3043,2990,2885,2939,9160,3094,3145,2567,3831,3206,3969,3699,2471,3915,2769,2680,2621,3586,2420,3540,2315,2359,3763,9107,1459,9006,1784,1894,1736,1840,1679,1630,1252,1198,6270,6202,6514,7664,6883,6801,6958,7048,7292,7212,6355,6431,6741,6579,6660,6146,7437,7560,8790,8691,8849,8122,7993,7935,8047,1393,5037,5533,5944,5874,6025,5473,5417,5354,5293,996,1107",
+ "endLines": "138,144,78,81,80,79,19,20,21,124,125,141,133,132,149,26,87,88,86,85,84,100,99,98,90,39,38,64,29,30,91,41,82,126,77,145,67,42,48,53,43,63,62,61,57,56,54,55,152,58,59,49,70,60,74,68,47,73,52,51,50,66,46,65,44,45,69,150,28,146,34,36,33,35,32,31,25,24,107,106,110,122,115,114,116,117,119,118,108,109,113,111,112,105,120,121,142,140,143,131,129,128,130,27,89,97,102,101,103,96,95,94,93,22,23",
+ "endColumns": "14,46,95,82,95,68,42,51,51,48,62,41,57,50,47,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,46,48,57,46,58,56,70,60,56,49,51,52,49,55,49,59,52,65,61,62,62,46,52,54,87,57,61,49,44,42,59,66,49,54,46,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,57,54,59,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
+ "endOffsets": "8683,8952,4200,4451,4367,4270,884,937,990,7807,7871,8784,8269,8210,9101,1387,4922,5031,4827,4755,4670,5868,5801,5717,5162,2100,2037,3534,1563,1624,5268,2192,4554,7927,4103,9000,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,9211,3139,3200,2615,3892,3263,4027,3757,2513,3963,2819,2763,2674,3643,2465,3580,2353,2414,3825,9152,1509,9048,1834,1942,1778,1888,1730,1673,1302,1246,6349,6264,6573,7755,6952,6877,7042,7206,7431,7286,6425,6508,6795,6654,6735,6196,7554,7658,8843,8741,8904,8158,8041,7987,8116,1453,5100,5614,6019,5938,6114,5527,5467,5411,5348,1101,1192"
},
"to": {
- "startLines": "13,14,15,16,17",
- "startColumns": "4,4,4,4,4",
- "startOffsets": "477,529,582,635,687",
- "endColumns": "51,52,52,51,51",
- "endOffsets": "524,577,630,682,734"
+ "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "739,1092,1139,1235,1318,1414,1483,1526,1578,1630,1679,1742,1784,1842,1893,1941,2025,2119,2227,2298,2382,2465,2531,2614,2716,2777,2839,2890,2968,3021,3081,3186,3245,3347,3402,3473,3520,3569,3627,3674,3733,3790,3861,3922,3979,4029,4081,4134,4184,4240,4290,4350,4403,4469,4531,4594,4657,4704,4757,4812,4900,4958,5020,5070,5115,5158,5218,5285,5335,5390,5437,5492,5545,5592,5645,5701,5749,5804,5857,5941,6008,6072,6168,6242,6323,6412,6575,6719,6798,6873,6955,7014,7094,7174,7229,7351,7454,7512,7567,7627,7668,7721,7778,7852,7917,7985,8071,8151,8220,8314,8373,8428,8490,8550,8660",
+ "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136",
+ "endColumns": "14,46,95,82,95,68,42,51,51,48,62,41,57,50,47,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,46,48,57,46,58,56,70,60,56,49,51,52,49,55,49,59,52,65,61,62,62,46,52,54,87,57,61,49,44,42,59,66,49,54,46,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,57,54,59,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
+ "endOffsets": "1087,1134,1230,1313,1409,1478,1521,1573,1625,1674,1737,1779,1837,1888,1936,2020,2114,2222,2293,2377,2460,2526,2609,2711,2772,2834,2885,2963,3016,3076,3181,3240,3342,3397,3468,3515,3564,3622,3669,3728,3785,3856,3917,3974,4024,4076,4129,4179,4235,4285,4345,4398,4464,4526,4589,4652,4699,4752,4807,4895,4953,5015,5065,5110,5153,5213,5280,5330,5385,5432,5487,5540,5587,5640,5696,5744,5799,5852,5936,6003,6067,6163,6237,6318,6407,6570,6714,6793,6868,6950,7009,7089,7169,7224,7346,7449,7507,7562,7622,7663,7716,7773,7847,7912,7980,8066,8146,8215,8309,8368,8423,8485,8545,8655,8745"
}
}
]
diff --git a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
index 8ded382..a8d21ef 100644
--- a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
+++ b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
@@ -1,390 +1,406 @@
[
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_new_note_pressed.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\new_note_pressed.png"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_font_normal.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/font_normal.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_red_up.9.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_red_up.9.png"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_yellow_single.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_yellow_single.9.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\layout_datetime_picker.xml.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\layout\\datetime_picker.xml"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_2x_blue.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_2x_blue.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\layout_note_list.xml.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\layout\\note_list.xml"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_new_note_pressed.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/new_note_pressed.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\layout_note_edit.xml.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\layout\\note_edit.xml"
+ "merged": "net.micode.notes.app-merged_res-4:/color_secondary_text_dark.xml.flat",
+ "source": "net.micode.notes.app-main-6:/color/secondary_text_dark.xml"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\menu_sub_folder.xml.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\menu\\sub_folder.xml"
+ "merged": "net.micode.notes.app-merged_res-4:/color_primary_text_dark.xml.flat",
+ "source": "net.micode.notes.app-main-6:/color/primary_text_dark.xml"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\layout_dialog_edit_text.xml.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\layout\\dialog_edit_text.xml"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_green_single.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_green_single.9.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_background.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_background.png"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_white_middle.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_white_middle.9.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_dropdown_icon.9.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\dropdown_icon.9.png"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_new_note_normal.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/new_note_normal.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_white_middle.9.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_white_middle.9.png"
+ "merged": "net.micode.notes.app-merged_res-4:/layout_dialog_edit_text.xml.flat",
+ "source": "net.micode.notes.app-main-6:/layout/dialog_edit_text.xml"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_widget_4x_green.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\widget_4x_green.png"
+ "merged": "net.micode.notes.app-merged_res-4:/layout_note_edit.xml.flat",
+ "source": "net.micode.notes.app-main-6:/layout/note_edit.xml"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_delete.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\delete.png"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_white_up.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_white_up.9.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_edit_blue.9.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\edit_blue.9.png"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_white_down.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_white_down.9.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_edit_yellow.9.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\edit_yellow.9.png"
+ "merged": "net.micode.notes.app-merged_res-4:/layout_folder_list_item.xml.flat",
+ "source": "net.micode.notes.app-main-6:/layout/folder_list_item.xml"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_widget_2x_white.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\widget_2x_white.png"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_font_small.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/font_small.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\layout_note_item.xml.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\layout\\note_item.xml"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_red_down.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_red_down.9.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\layout_folder_list_item.xml.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\layout\\folder_list_item.xml"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_red_single.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_red_single.9.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_font_super.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\font_super.png"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_note_edit_color_selector_panel.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/note_edit_color_selector_panel.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_yellow_single.9.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_yellow_single.9.png"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_yellow_up.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_yellow_up.9.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_note_edit_color_selector_panel.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\note_edit_color_selector_panel.png"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_clock.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/clock.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\raw-zh-rCN_introduction.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\raw-zh-rCN\\introduction"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_action_italic.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/action_italic.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\layout_widget_4x.xml.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\layout\\widget_4x.xml"
+ "merged": "net.micode.notes.app-merged_res-4:/layout_note_list.xml.flat",
+ "source": "net.micode.notes.app-main-6:/layout/note_list.xml"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_search_result.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\search_result.png"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable_p2.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable/p2.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\menu_note_list_dropdown.xml.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\menu\\note_list_dropdown.xml"
+ "merged": "net.micode.notes.app-merged_res-4:/menu_note_list_dropdown.xml.flat",
+ "source": "net.micode.notes.app-main-6:/menu/note_list_dropdown.xml"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_call_record.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\call_record.png"
+ "merged": "net.micode.notes.app-merged_res-4:/font_msyh.ttc.flat",
+ "source": "net.micode.notes.app-main-6:/font/msyh.ttc"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_widget_2x_green.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\widget_2x_green.png"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_bg_btn_set_color.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/bg_btn_set_color.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\xml_preferences.xml.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\xml\\preferences.xml"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_green_down.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_green_down.9.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable_p1.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable\\p1.png"
+ "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\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_folder.9.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_folder.9.png"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_blue_middle.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_blue_middle.9.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_widget_4x_white.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\widget_4x_white.png"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_4x_blue.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_4x_blue.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\raw_introduction.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\raw\\introduction"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_title_alert.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/title_alert.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\xml_widget_4x_info.xml.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\xml\\widget_4x_info.xml"
+ "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\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_blue_down.9.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_blue_down.9.png"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_blue_single.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_blue_single.9.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_menu_delete.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\menu_delete.png"
+ "merged": "net.micode.notes.app-merged_res-4:/menu_note_list_options.xml.flat",
+ "source": "net.micode.notes.app-main-6:/menu/note_list_options.xml"
},
{
- "merged": "net.micode.notes.app-merged_res-4:/drawable_p2.png.flat",
- "source": "net.micode.notes.app-main-6:/drawable/p2.png"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_4x_white.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_4x_white.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-4:/layout_widget_2x.xml.flat",
+ "source": "net.micode.notes.app-main-6:/layout/widget_2x.xml"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-4:/menu_call_record_folder.xml.flat",
+ "source": "net.micode.notes.app-main-6:/menu/call_record_folder.xml"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_font_large.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/font_large.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_title_yellow.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_title_yellow.9.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\layout_note_edit_list_item.xml.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\layout\\note_edit_list_item.xml"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_call_record.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/call_record.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\layout_note_list_footer.xml.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\layout\\note_list_footer.xml"
+ "merged": "net.micode.notes.app-merged_res-4:/xml_widget_4x_info.xml.flat",
+ "source": "net.micode.notes.app-main-6:/xml/widget_4x_info.xml"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_red_single.9.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_red_single.9.png"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_menu_delete.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/menu_delete.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\layout_account_dialog_title.xml.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\layout\\account_dialog_title.xml"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_selected.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/selected.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_red_middle.9.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_red_middle.9.png"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_2x_yellow.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_2x_yellow.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_menu_move.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\menu_move.png"
+ "merged": "net.micode.notes.app-merged_res-4:/layout_settings_header.xml.flat",
+ "source": "net.micode.notes.app-main-6:/layout/settings_header.xml"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\menu_note_list_options.xml.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\menu\\note_list_options.xml"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_title_blue.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_title_blue.9.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_clock.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\clock.png"
+ "merged": "net.micode.notes.app-merged_res-4:/layout_widget_4x.xml.flat",
+ "source": "net.micode.notes.app-main-6:/layout/widget_4x.xml"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_bg_btn_set_color.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\bg_btn_set_color.png"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable_new_note.xml.flat",
+ "source": "net.micode.notes.app-main-6:/drawable/new_note.xml"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_edit_white.9.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\edit_white.9.png"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_white_single.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_white_single.9.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_edit_title_green.9.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\edit_title_green.9.png"
+ "merged": "net.micode.notes.app-merged_res-4:/layout_account_dialog_title.xml.flat",
+ "source": "net.micode.notes.app-main-6:/layout/account_dialog_title.xml"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\menu_call_note_edit.xml.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\menu\\call_note_edit.xml"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_yellow_middle.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_yellow_middle.9.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_yellow_middle.9.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_yellow_middle.9.png"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_4x_green.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_4x_green.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_bg_color_btn_mask.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\bg_color_btn_mask.png"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_search_result.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/search_result.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_edit_title_white.9.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\edit_title_white.9.png"
+ "merged": "net.micode.notes.app-merged_res-4:/layout_note_list_dropdown_menu.xml.flat",
+ "source": "net.micode.notes.app-main-6:/layout/note_list_dropdown_menu.xml"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_green_up.9.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_green_up.9.png"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_font_super.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/font_super.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_selected.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\selected.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\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\layout_add_account_text.xml.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\layout\\add_account_text.xml"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_yellow.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_yellow.9.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_notification.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\notification.png"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_dropdown_icon.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/dropdown_icon.9.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\xml_searchable.xml.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\xml\\searchable.xml"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_red_middle.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_red_middle.9.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_edit_title_blue.9.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\edit_title_blue.9.png"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_delete.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/delete.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_widget_4x_blue.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\widget_4x_blue.png"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_background.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_background.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\layout_widget_2x.xml.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\layout\\widget_2x.xml"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_yellow_down.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_yellow_down.9.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\menu_note_edit.xml.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\menu\\note_edit.xml"
+ "merged": "net.micode.notes.app-merged_res-4:/layout_note_edit_list_item.xml.flat",
+ "source": "net.micode.notes.app-main-6:/layout/note_edit_list_item.xml"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_widget_4x_yellow.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\widget_4x_yellow.png"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_font_size_selector_bg.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/font_size_selector_bg.9.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_blue_single.9.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_blue_single.9.png"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_title_bar_bg.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/title_bar_bg.9.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_footer_bg.9.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_footer_bg.9.png"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_4x_yellow.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_4x_yellow.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_font_small.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\font_small.png"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_footer_bg.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_footer_bg.9.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_title_bar_bg.9.png.flat",
- "source": "C:\\Users\\刘\\.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:/drawable-hdpi_widget_2x_green.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_2x_green.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_widget_2x_yellow.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\widget_2x_yellow.png"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_bg_color_btn_mask.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/bg_color_btn_mask.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_white_up.9.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_white_up.9.png"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_red_up.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_red_up.9.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\layout_settings_header.xml.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\layout\\settings_header.xml"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_title_green.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_title_green.9.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_new_note_normal.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\new_note_normal.png"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_2x_white.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_2x_white.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_title_alert.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\title_alert.png"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_red.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_red.9.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_font_normal.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\font_normal.png"
+ "merged": "net.micode.notes.app-merged_res-4:/layout_note_item.xml.flat",
+ "source": "net.micode.notes.app-main-6:/layout/note_item.xml"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\layout_note_list_dropdown_menu.xml.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\layout\\note_list_dropdown_menu.xml"
+ "merged": "net.micode.notes.app-merged_res-4:/xml_searchable.xml.flat",
+ "source": "net.micode.notes.app-main-6:/xml/searchable.xml"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_green_down.9.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_green_down.9.png"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_icon_app.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/icon_app.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_edit_green.9.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\edit_green.9.png"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_menu_move.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/menu_move.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_widget_2x_red.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\widget_2x_red.png"
+ "merged": "net.micode.notes.app-merged_res-4:/layout_note_list_footer.xml.flat",
+ "source": "net.micode.notes.app-main-6:/layout/note_list_footer.xml"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_white_single.9.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_white_single.9.png"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_green.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_green.9.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_red_down.9.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_red_down.9.png"
+ "merged": "net.micode.notes.app-merged_res-4:/raw-zh-rCN_introduction.flat",
+ "source": "net.micode.notes.app-main-6:/raw-zh-rCN/introduction"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_green_middle.9.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_green_middle.9.png"
+ "merged": "net.micode.notes.app-merged_res-4:/layout_add_account_text.xml.flat",
+ "source": "net.micode.notes.app-main-6:/layout/add_account_text.xml"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\color_secondary_text_dark.xml.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\color\\secondary_text_dark.xml"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_notification.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/notification.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\menu_call_record_folder.xml.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\menu\\call_record_folder.xml"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_white.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_white.9.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_font_large.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\font_large.png"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_4x_red.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_4x_red.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_edit_title_red.9.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\edit_title_red.9.png"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable_p1.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable/p1.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_edit_title_yellow.9.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\edit_title_yellow.9.png"
+ "merged": "net.micode.notes.app-merged_res-4:/xml_widget_2x_info.xml.flat",
+ "source": "net.micode.notes.app-main-6:/xml/widget_2x_info.xml"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_white_down.9.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_white_down.9.png"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_title_white.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_title_white.9.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_green_single.9.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_green_single.9.png"
+ "merged": "net.micode.notes.app-merged_res-4:/menu_call_note_edit.xml.flat",
+ "source": "net.micode.notes.app-main-6:/menu/call_note_edit.xml"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_widget_2x_blue.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\widget_2x_blue.png"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_blue.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_blue.9.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_icon_app.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\icon_app.png"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_blue_up.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_blue_up.9.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_blue_up.9.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_blue_up.9.png"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_blue_down.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_blue_down.9.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_yellow_up.9.png.flat",
- "source": "C:\\Users\\刘\\.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:/drawable-hdpi_edit_title_red.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_title_red.9.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_widget_4x_red.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\widget_4x_red.png"
+ "merged": "net.micode.notes.app-merged_res-4:/xml_preferences.xml.flat",
+ "source": "net.micode.notes.app-main-6:/xml/preferences.xml"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_yellow_down.9.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_yellow_down.9.png"
+ "merged": "net.micode.notes.app-merged_res-4:/layout_activity_loging.xml.flat",
+ "source": "net.micode.notes.app-main-6:/layout/activity_loging.xml"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\color_primary_text_dark.xml.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\color\\primary_text_dark.xml"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_green_up.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_green_up.9.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable_new_note.xml.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable\\new_note.xml"
+ "merged": "net.micode.notes.app-merged_res-4:/layout_datetime_picker.xml.flat",
+ "source": "net.micode.notes.app-main-6:/layout/datetime_picker.xml"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_font_size_selector_bg.9.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\font_size_selector_bg.9.png"
+ "merged": "net.micode.notes.app-merged_res-4:/raw_introduction.flat",
+ "source": "net.micode.notes.app-main-6:/raw/introduction"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\xml_widget_2x_info.xml.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\xml\\widget_2x_info.xml"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_green_middle.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_green_middle.9.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_blue_middle.9.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_blue_middle.9.png"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_action_bold.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/action_bold.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_edit_red.9.png.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\edit_red.9.png"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_2x_red.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_2x_red.png"
},
{
- "merged": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\menu_note_list.xml.flat",
- "source": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\menu\\note_list.xml"
+ "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_folder.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_folder.9.png"
}
]
\ No newline at end of file
diff --git a/src/Notes-master/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml b/src/Notes-master/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml
index 3067a07..7175b02 100644
--- a/src/Notes-master/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml
+++ b/src/Notes-master/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml
@@ -49,6 +49,16 @@
+
+
+
+
+
+
+
diff --git a/src/Notes-master/app/build/intermediates/packaged_res/debug/color/primary_text_dark.xml b/src/Notes-master/app/build/intermediates/packaged_res/debug/color/primary_text_dark.xml
index 8ad98e3..d349a08 100644
--- a/src/Notes-master/app/build/intermediates/packaged_res/debug/color/primary_text_dark.xml
+++ b/src/Notes-master/app/build/intermediates/packaged_res/debug/color/primary_text_dark.xml
@@ -1,22 +1,22 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Notes-master/app/build/intermediates/packaged_res/debug/color/secondary_text_dark.xml b/src/Notes-master/app/build/intermediates/packaged_res/debug/color/secondary_text_dark.xml
index 9cf8a1a..6e67d86 100644
--- a/src/Notes-master/app/build/intermediates/packaged_res/debug/color/secondary_text_dark.xml
+++ b/src/Notes-master/app/build/intermediates/packaged_res/debug/color/secondary_text_dark.xml
@@ -1,20 +1,20 @@
-
-
-
-
-
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Notes-master/app/build/intermediates/packaged_res/debug/drawable/new_note.xml b/src/Notes-master/app/build/intermediates/packaged_res/debug/drawable/new_note.xml
index 2154ebc..5a661a6 100644
--- a/src/Notes-master/app/build/intermediates/packaged_res/debug/drawable/new_note.xml
+++ b/src/Notes-master/app/build/intermediates/packaged_res/debug/drawable/new_note.xml
@@ -1,23 +1,23 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/src/Notes-master/app/build/intermediates/packaged_res/debug/layout/account_dialog_title.xml b/src/Notes-master/app/build/intermediates/packaged_res/debug/layout/account_dialog_title.xml
index 7717112..c0b9f81 100644
--- a/src/Notes-master/app/build/intermediates/packaged_res/debug/layout/account_dialog_title.xml
+++ b/src/Notes-master/app/build/intermediates/packaged_res/debug/layout/account_dialog_title.xml
@@ -1,43 +1,43 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Notes-master/app/build/intermediates/packaged_res/debug/layout/add_account_text.xml b/src/Notes-master/app/build/intermediates/packaged_res/debug/layout/add_account_text.xml
index c799178..30288be 100644
--- a/src/Notes-master/app/build/intermediates/packaged_res/debug/layout/add_account_text.xml
+++ b/src/Notes-master/app/build/intermediates/packaged_res/debug/layout/add_account_text.xml
@@ -1,32 +1,32 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Notes-master/app/build/intermediates/packaged_res/debug/layout/datetime_picker.xml b/src/Notes-master/app/build/intermediates/packaged_res/debug/layout/datetime_picker.xml
index f10d592..22ef05d 100644
--- a/src/Notes-master/app/build/intermediates/packaged_res/debug/layout/datetime_picker.xml
+++ b/src/Notes-master/app/build/intermediates/packaged_res/debug/layout/datetime_picker.xml
@@ -1,56 +1,56 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Notes-master/app/build/intermediates/packaged_res/debug/layout/dialog_edit_text.xml b/src/Notes-master/app/build/intermediates/packaged_res/debug/layout/dialog_edit_text.xml
index 361b39a..ade0e70 100644
--- a/src/Notes-master/app/build/intermediates/packaged_res/debug/layout/dialog_edit_text.xml
+++ b/src/Notes-master/app/build/intermediates/packaged_res/debug/layout/dialog_edit_text.xml
@@ -1,23 +1,23 @@
-
-
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/src/Notes-master/app/build/intermediates/packaged_res/debug/layout/folder_list_item.xml b/src/Notes-master/app/build/intermediates/packaged_res/debug/layout/folder_list_item.xml
index 77e8148..79ac443 100644
--- a/src/Notes-master/app/build/intermediates/packaged_res/debug/layout/folder_list_item.xml
+++ b/src/Notes-master/app/build/intermediates/packaged_res/debug/layout/folder_list_item.xml
@@ -1,29 +1,29 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Notes-master/app/build/intermediates/packaged_res/debug/layout/note_edit.xml b/src/Notes-master/app/build/intermediates/packaged_res/debug/layout/note_edit.xml
index 10b2aa7..65c3819 100644
--- a/src/Notes-master/app/build/intermediates/packaged_res/debug/layout/note_edit.xml
+++ b/src/Notes-master/app/build/intermediates/packaged_res/debug/layout/note_edit.xml
@@ -1,400 +1,416 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Notes-master/app/build/intermediates/packaged_res/debug/layout/note_edit_list_item.xml b/src/Notes-master/app/build/intermediates/packaged_res/debug/layout/note_edit_list_item.xml
index a885f9c..33a11c3 100644
--- a/src/Notes-master/app/build/intermediates/packaged_res/debug/layout/note_edit_list_item.xml
+++ b/src/Notes-master/app/build/intermediates/packaged_res/debug/layout/note_edit_list_item.xml
@@ -1,39 +1,39 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Notes-master/app/build/intermediates/packaged_res/debug/layout/note_item.xml b/src/Notes-master/app/build/intermediates/packaged_res/debug/layout/note_item.xml
index d541f6a..d75cf98 100644
--- a/src/Notes-master/app/build/intermediates/packaged_res/debug/layout/note_item.xml
+++ b/src/Notes-master/app/build/intermediates/packaged_res/debug/layout/note_item.xml
@@ -1,78 +1,78 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Notes-master/app/build/intermediates/packaged_res/debug/layout/note_list.xml b/src/Notes-master/app/build/intermediates/packaged_res/debug/layout/note_list.xml
index ef857ad..8484435 100644
--- a/src/Notes-master/app/build/intermediates/packaged_res/debug/layout/note_list.xml
+++ b/src/Notes-master/app/build/intermediates/packaged_res/debug/layout/note_list.xml
@@ -1,57 +1,58 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Notes-master/app/build/intermediates/packaged_res/debug/layout/note_list_dropdown_menu.xml b/src/Notes-master/app/build/intermediates/packaged_res/debug/layout/note_list_dropdown_menu.xml
index 3fa271d..9031370 100644
--- a/src/Notes-master/app/build/intermediates/packaged_res/debug/layout/note_list_dropdown_menu.xml
+++ b/src/Notes-master/app/build/intermediates/packaged_res/debug/layout/note_list_dropdown_menu.xml
@@ -1,32 +1,32 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Notes-master/app/build/intermediates/packaged_res/debug/layout/note_list_footer.xml b/src/Notes-master/app/build/intermediates/packaged_res/debug/layout/note_list_footer.xml
index 5ca7b22..1ed085e 100644
--- a/src/Notes-master/app/build/intermediates/packaged_res/debug/layout/note_list_footer.xml
+++ b/src/Notes-master/app/build/intermediates/packaged_res/debug/layout/note_list_footer.xml
@@ -1,24 +1,24 @@
-
-
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/src/Notes-master/app/build/intermediates/packaged_res/debug/layout/settings_header.xml b/src/Notes-master/app/build/intermediates/packaged_res/debug/layout/settings_header.xml
index 5eb8c50..196a95c 100644
--- a/src/Notes-master/app/build/intermediates/packaged_res/debug/layout/settings_header.xml
+++ b/src/Notes-master/app/build/intermediates/packaged_res/debug/layout/settings_header.xml
@@ -1,41 +1,41 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Notes-master/app/build/intermediates/packaged_res/debug/layout/widget_2x.xml b/src/Notes-master/app/build/intermediates/packaged_res/debug/layout/widget_2x.xml
index 55970ce..1b3d1fc 100644
--- a/src/Notes-master/app/build/intermediates/packaged_res/debug/layout/widget_2x.xml
+++ b/src/Notes-master/app/build/intermediates/packaged_res/debug/layout/widget_2x.xml
@@ -1,37 +1,37 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/src/Notes-master/app/build/intermediates/packaged_res/debug/layout/widget_4x.xml b/src/Notes-master/app/build/intermediates/packaged_res/debug/layout/widget_4x.xml
index dc9bb51..d8e569f 100644
--- a/src/Notes-master/app/build/intermediates/packaged_res/debug/layout/widget_4x.xml
+++ b/src/Notes-master/app/build/intermediates/packaged_res/debug/layout/widget_4x.xml
@@ -1,39 +1,39 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Notes-master/app/build/intermediates/packaged_res/debug/menu/call_note_edit.xml b/src/Notes-master/app/build/intermediates/packaged_res/debug/menu/call_note_edit.xml
index 02c0528..4d7381b 100644
--- a/src/Notes-master/app/build/intermediates/packaged_res/debug/menu/call_note_edit.xml
+++ b/src/Notes-master/app/build/intermediates/packaged_res/debug/menu/call_note_edit.xml
@@ -1,48 +1,48 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/src/Notes-master/app/build/intermediates/packaged_res/debug/menu/call_record_folder.xml b/src/Notes-master/app/build/intermediates/packaged_res/debug/menu/call_record_folder.xml
index c664346..375e850 100644
--- a/src/Notes-master/app/build/intermediates/packaged_res/debug/menu/call_record_folder.xml
+++ b/src/Notes-master/app/build/intermediates/packaged_res/debug/menu/call_record_folder.xml
@@ -1,23 +1,23 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/src/Notes-master/app/build/intermediates/packaged_res/debug/menu/note_edit.xml b/src/Notes-master/app/build/intermediates/packaged_res/debug/menu/note_edit.xml
index 35cacd1..74c96e9 100644
--- a/src/Notes-master/app/build/intermediates/packaged_res/debug/menu/note_edit.xml
+++ b/src/Notes-master/app/build/intermediates/packaged_res/debug/menu/note_edit.xml
@@ -1,52 +1,68 @@
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Notes-master/app/build/intermediates/packaged_res/debug/menu/note_list.xml b/src/Notes-master/app/build/intermediates/packaged_res/debug/menu/note_list.xml
index e69a4c6..5d21a8d 100644
--- a/src/Notes-master/app/build/intermediates/packaged_res/debug/menu/note_list.xml
+++ b/src/Notes-master/app/build/intermediates/packaged_res/debug/menu/note_list.xml
@@ -1,47 +1,54 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/src/Notes-master/app/build/intermediates/packaged_res/debug/menu/note_list_dropdown.xml b/src/Notes-master/app/build/intermediates/packaged_res/debug/menu/note_list_dropdown.xml
index 7cbaadc..756acd2 100644
--- a/src/Notes-master/app/build/intermediates/packaged_res/debug/menu/note_list_dropdown.xml
+++ b/src/Notes-master/app/build/intermediates/packaged_res/debug/menu/note_list_dropdown.xml
@@ -1,20 +1,20 @@
-
-
-
-
-