diff --git a/doc/~$软件泛读、标注和维护报告.docx b/doc/~$软件泛读、标注和维护报告.docx
new file mode 100644
index 0000000..e737a02
Binary files /dev/null and b/doc/~$软件泛读、标注和维护报告.docx differ
diff --git a/doc/实践考评-阅读维护开源软件的汇报.pptx b/doc/实践考评-阅读维护开源软件的汇报.pptx
new file mode 100644
index 0000000..4970a8e
Binary files /dev/null and b/doc/实践考评-阅读维护开源软件的汇报.pptx differ
diff --git a/doc/实践考评-阅读维护开源软件的汇报模板.pptx b/doc/实践考评-阅读维护开源软件的汇报模板.pptx
deleted file mode 100644
index 9228003..0000000
Binary files a/doc/实践考评-阅读维护开源软件的汇报模板.pptx and /dev/null differ
diff --git a/doc/开源软件泛读、标注和维护报告.docx b/doc/开源软件泛读、标注和维护报告.docx
index cec1fd2..af722fa 100644
Binary files a/doc/开源软件泛读、标注和维护报告.docx and b/doc/开源软件泛读、标注和维护报告.docx differ
diff --git a/src/Notes-master1/.gradle/8.0/executionHistory/executionHistory.bin b/src/Notes-master1/.gradle/8.0/executionHistory/executionHistory.bin
index 07a62ba..3031cdd 100644
Binary files a/src/Notes-master1/.gradle/8.0/executionHistory/executionHistory.bin and b/src/Notes-master1/.gradle/8.0/executionHistory/executionHistory.bin differ
diff --git a/src/Notes-master1/.gradle/8.0/executionHistory/executionHistory.lock b/src/Notes-master1/.gradle/8.0/executionHistory/executionHistory.lock
index 7cf3828..927e30c 100644
Binary files a/src/Notes-master1/.gradle/8.0/executionHistory/executionHistory.lock and b/src/Notes-master1/.gradle/8.0/executionHistory/executionHistory.lock differ
diff --git a/src/Notes-master1/.gradle/8.0/fileHashes/fileHashes.bin b/src/Notes-master1/.gradle/8.0/fileHashes/fileHashes.bin
index 7041b3b..337a700 100644
Binary files a/src/Notes-master1/.gradle/8.0/fileHashes/fileHashes.bin and b/src/Notes-master1/.gradle/8.0/fileHashes/fileHashes.bin differ
diff --git a/src/Notes-master1/.gradle/8.0/fileHashes/fileHashes.lock b/src/Notes-master1/.gradle/8.0/fileHashes/fileHashes.lock
index 98009ce..29f0605 100644
Binary files a/src/Notes-master1/.gradle/8.0/fileHashes/fileHashes.lock and b/src/Notes-master1/.gradle/8.0/fileHashes/fileHashes.lock differ
diff --git a/src/Notes-master1/.gradle/8.0/fileHashes/resourceHashesCache.bin b/src/Notes-master1/.gradle/8.0/fileHashes/resourceHashesCache.bin
index ebf842d..6dbfd3a 100644
Binary files a/src/Notes-master1/.gradle/8.0/fileHashes/resourceHashesCache.bin and b/src/Notes-master1/.gradle/8.0/fileHashes/resourceHashesCache.bin differ
diff --git a/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 9530f9e..ced1b67 100644
Binary files a/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/src/Notes-master1/.gradle/file-system.probe b/src/Notes-master1/.gradle/file-system.probe
index f6bc0ab..7b10aa8 100644
Binary files a/src/Notes-master1/.gradle/file-system.probe and b/src/Notes-master1/.gradle/file-system.probe differ
diff --git a/src/Notes-master1/.idea/deploymentTargetDropDown.xml b/src/Notes-master1/.idea/deploymentTargetDropDown.xml
index 1fe7e43..fe6dd34 100644
--- a/src/Notes-master1/.idea/deploymentTargetDropDown.xml
+++ b/src/Notes-master1/.idea/deploymentTargetDropDown.xml
@@ -12,6 +12,6 @@
-
+
\ No newline at end of file
diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c b/src/Notes-master1/.idea/sonarlint/issuestore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c
index 3c48d59..4f0e0b9 100644
--- a/src/Notes-master1/.idea/sonarlint/issuestore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c
+++ b/src/Notes-master1/.idea/sonarlint/issuestore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c
@@ -1,60 +1,77 @@
-
-AYy_MCFfhZ96u27hlWQF
-java:S2293["YReplace the type specification in this constructor call with the diamond operator ("<>").(ӏ81J$04670076-c93a-46ca-8bfa-79a197b6608f
-
-AYy_MCFfhZ96u27hlWQG
-java:S2293e"YReplace the type specification in this constructor call with the diamond operator ("<>").(81J$5cb3604e-201a-478a-a215-93fe3cb6b94e
AYy_MCFfhZ96u27hlWQH
-java:S2293o"YReplace the type specification in this constructor call with the diamond operator ("<>").(81J$7aa91c5d-bdf6-4f92-b698-24d5d23a845c
-
+java:S2293m"YReplace the type specification in this constructor call with the diamond operator ("<>").(ӏ81J$6d57d7a3-9a60-4cd5-ba7c-f2de55aad7ed
+
AYy_MCFfhZ96u27hlWQI
-java:S2293x"YReplace the type specification in this constructor call with the diamond operator ("<>").(81J$a90129ec-fe97-4cbc-9f39-961cf084787e
+java:S2293w"YReplace the type specification in this constructor call with the diamond operator ("<>").(81J$a3b9fd34-f251-4cb2-9ddb-5ff63882059b
+
+java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(81J$3a192498-b65f-4093-95bb-e68038a3e3c4
-java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(艥81J$547f0d33-844c-4491-9d96-9192d54dd252
- java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(81J$e208bcf9-c34b-42fa-b979-05ec16afc2a9
- java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ӏ81J$9568e7c5-e325-4191-a36e-f1722a42ff2e
+java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(81J$fc89b639-7c13-4a53-a5fd-88faa2db3f5c
+
+java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(艥81J$07052fbc-0d26-4f34-be43-5201c2cceb22
+
+java:S1192"HDefine a constant instead of duplicating this literal "[local]" 3 times.(8曌1J$b519b7d7-5b4b-4864-a8a0-02b0470f2e64
+
+java:S1192"IDefine a constant instead of duplicating this literal "[/local]" 3 times.(8盌1J$b69b1cac-3d3a-4f6f-ba3c-7130d80b8b81
+ java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ţ81J$f98538ce-99c7-4b7c-866b-0dfcffaba253
+ java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(81J$b5020ab0-f005-47fc-979b-3eba494d5e29
+ java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(81J$cfa7447a-96a0-48cd-88b9-d7198a9d19c8
+ java:S117 "QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(8蛌1J$598f7ac3-3837-48d6-a8b4-0a605e6fe1c3
+ java:S117 "QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(8雌1J$38938bca-9246-4d3b-bee5-d2b6649275d2
+ java:S117
+"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(81J$cdcf9f01-05dd-4234-a7e9-790cbdcc0e12
+ java:S117
+"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ӏ81J$85595208-91b4-448d-bc35-c35986b5ec0d
l
-java:S1604"(Make this anonymous inner class a lambda(ά81J$53226dd7-9700-4578-8a0f-2c4809ed178d
+java:S1604"(Make this anonymous inner class a lambda(Ư81J$311cf529-5d81-4c36-8311-9be6f0eba076
+
+AYy_MCFfhZ96u27hlWQL
+java:S1604"(Make this anonymous inner class a lambda(ά81J$b4b5edb3-262e-4d68-be34-4a502a513a44
l
-java:S1604"(Make this anonymous inner class a lambda(81J$4cad29cf-7bfe-41d5-a983-d969bd1d0bd3
+java:S1604"(Make this anonymous inner class a lambda(81J$8bc1bca2-648a-42cf-90b2-bd3fa5adda58
l
-java:S1604"(Make this anonymous inner class a lambda(ߒ81J$cc0564e4-dd54-40ad-8344-402e0d014e32
-
-AYy_MCFfhZ96u27hlWQN
-java:S1104R"VMake tvModified a static final constant or non-public and provide accessors if needed.(ԣ81J$b42cbaae-983d-45c3-a1cc-faa00eafd461
-
-AYy_MCFfhZ96u27hlWQO
-java:S1104T"WMake ivAlertIcon a static final constant or non-public and provide accessors if needed.(න81J$8a2dc97a-4a98-4b73-8bd5-74ab09fcdfe9
-
-AYy_MCFfhZ96u27hlWQP
-java:S1104V"WMake tvAlertDate a static final constant or non-public and provide accessors if needed.(81J$f7045ff1-a503-4f05-8cd2-ef11d8583ff5
-
-AYy_MCFfhZ96u27hlWQQ
-java:S1104X"XMake ibSetBgColor a static final constant or non-public and provide accessors if needed.(81J$ca81cd33-e785-4e2c-9398-1e9af6343470
-
-AYy_MCFfhZ96u27hlWQR
-java:S1104"XMake mWorkingNote a static final constant or non-public and provide accessors if needed.(ܒ81J$dfd89654-06e2-4433-9ae8-f8cf81b44e80
-
-AYy_MCFfhZ96u27hlWQT
-java:S1450"WRemove the "mPattern" field and declare it as a local variable in the relevant methods.(81J$fd99cfcd-d8ce-4f3c-ada2-a591806f8564
+java:S1604"(Make this anonymous inner class a lambda(ߒ81J$5c722640-e14a-4221-a5b8-7392e9f624b4
+
+java:S1301 "KReplace this "switch" statement by "if" statements to increase readability.(8ꛌ1J$9456372a-4407-4602-9aea-088393f41a3d
+
+java:S1104d"VMake tvModified a static final constant or non-public and provide accessors if needed.(ԣ81J$a55bc6c0-6708-4159-98cf-8e3de481a305
+
+java:S1104f"WMake ivAlertIcon a static final constant or non-public and provide accessors if needed.(න81J$296384f0-e5b5-4384-b96c-8e11c7d80c44
+
+java:S1104h"WMake tvAlertDate a static final constant or non-public and provide accessors if needed.(81J$54ad0048-24e5-45a3-91dd-e63fdcf88a8b
+
+java:S1104j"XMake ibSetBgColor a static final constant or non-public and provide accessors if needed.(81J$5f64a10e-81da-4c8e-baf9-40394447301c
+
+java:S1104"XMake mWorkingNote a static final constant or non-public and provide accessors if needed.(ܒ81J$204f057c-83ec-44cf-bd2c-f598c16eb27f
+ java:S116"XRename this field "PHOTO_REQUEST" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(81J$055b37b0-38d2-4b52-bd43-517440f99825
+j
+java:S1170"!Make this final field static too.(81J$dfd28b82-bf54-49e1-bf01-9d5e881b12ac
+
+java:S1450"WRemove the "mPattern" field and declare it as a local variable in the relevant methods.(81J$d6b2a110-b7ac-4560-be1c-d22097f7a438
-java:S1149"_Replace the synchronized class "StringBuffer" by an unsynchronized one such as "StringBuilder".(᯲81J$45fba2b7-e9bb-4953-9ad3-e61a68cb9cc6
-
-AYy_MCFfhZ96u27hlWQU java:S125"").(艥81J$930f1fbf-0951-47fe-a630-f4a3e0d86ec5
+java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(艥81J$873d9e6f-125e-4e9b-b99b-185f6e57755b
k
-java:S1604"(Make this anonymous inner class a lambda(̺V81J$30220161-b794-4cd4-a9a0-fcb1ea154ce4
+java:S1604"(Make this anonymous inner class a lambda(̺V81J$1cc991fc-79b2-4582-999f-5acda6b0c5bf
l
-java:S1604"(Make this anonymous inner class a lambda(ά81J$a5f8cecd-b462-4d12-ad8f-ed430b3cf719
+java:S1604"(Make this anonymous inner class a lambda(ά81J$9c9829e5-6d30-45e9-9be3-f00b67987ffc
l
-java:S1604"(Make this anonymous inner class a lambda(ܴ81J$a3126d98-4e2e-45b1-8e06-e6e06d090007
+java:S1604"(Make this anonymous inner class a lambda(ܴ81J$6db4d422-08c2-4b16-b098-3641cf49a939
q
-java:S1604"(Make this anonymous inner class a lambda(81J$88fc9794-0e48-4c9a-bb00-69c6f3749d11
+java:S1604"(Make this anonymous inner class a lambda(81J$7b60996e-c5fd-4cdf-8a9c-1f233f429459
l
-java:S1604"(Make this anonymous inner class a lambda(81J$e88ca270-b67b-457d-977d-328ca9d21284
+java:S1604"(Make this anonymous inner class a lambda(81J$531bb353-b9aa-4115-a5cb-1a0584d8dfa4
l
-java:S1604"(Make this anonymous inner class a lambda(۱81J$cbe3ef3c-31ed-46d1-9fef-1ccabbe89d96
+java:S1604"(Make this anonymous inner class a lambda(۱81J$923e74dc-031e-4513-85fe-a39d77d31346
l
-java:S1604"(Make this anonymous inner class a lambda(ά81J$736b65bc-e499-4170-9262-ad0f1130f282
+java:S1604"(Make this anonymous inner class a lambda(ά81J$2093c347-4bcf-46db-b2d5-c7283cb1da10
z
AYy_MCKNhZ96u27hlWRu
-java:S1116`"Remove this empty statement.(81J$d9d37c46-f020-443d-a287-559bcf588ddd
+java:S1116`"Remove this empty statement.(81J$7f3d9a56-66ae-40ae-886e-3f02d37d2828
AYy_MCKNhZ96u27hlWRv
-java:S1124"EReorder the modifiers to comply with the Java Language Specification.(81J$9daee7f4-4274-4f67-97f8-7e46317fd46a
+java:S1124"EReorder the modifiers to comply with the Java Language Specification.(81J$156d670e-a64c-4b97-81f8-8f7b0118188e
AYy_MCKNhZ96u27hlWRw
-java:S1124"EReorder the modifiers to comply with the Java Language Specification.(Ѿk81J$f442b85b-d6d1-48c4-b4f5-a362e313b7a8
+java:S1124"EReorder the modifiers to comply with the Java Language Specification.(Ѿk81J$f2f352a0-3519-4012-a322-aa55498f1c59
_
-java:S3626"Remove this redundant jump.(݅81J$34aa57a6-9403-4bf7-8246-424e6acc3425
+java:S3626"Remove this redundant jump.(݅81J$9162c90d-1bb9-4b71-8bde-d8c3654e0acc
-java:S1450"XRemove the "mMoveMenu" field and declare it as a local variable in the relevant methods.(81J$ca65ff54-41e0-4e87-8ae9-3fd0ff955bfc
+java:S1450"XRemove the "mMoveMenu" field and declare it as a local variable in the relevant methods.(81J$78bfb6d4-1533-4dad-96bc-6c4af361df50
-java:S3252"RUse static access with "android.widget.AbsListView" for "MultiChoiceModeListener".(81J$740b2f71-8aef-40fd-b8bd-20ef2868358f
+java:S3252"RUse static access with "android.widget.AbsListView" for "MultiChoiceModeListener".(81J$5b621e6c-e9e8-4a2b-ade0-09848e92fb4a
{
-java:S1135"2Complete the task associated to this TODO comment.(81J$3dc5371a-4238-4243-8395-78ed33b886ce
+java:S1135"2Complete the task associated to this TODO comment.(81J$4ab40f65-6b54-43b7-ae47-90db2bdae8f7
{
-java:S1135"2Complete the task associated to this TODO comment.(81J$6bdbcc50-ff75-48f1-a9d2-1aa474d4faa3
+java:S1135"2Complete the task associated to this TODO comment.(81J$d0b30d7d-c418-40a9-9712-539b368b42b8
z
-java:S1874"1Remove this use of "getHeight"; it is deprecated.(81J$b211cd69-7a3c-4000-92f7-390533272b67
+java:S1874"1Remove this use of "getHeight"; it is deprecated.(81J$fe0cb416-249d-49f4-b2e2-1eab7e36ff59
e
-java:S1116"Remove this empty statement.(81J$f7526317-3bcc-4d77-b8b7-78cec19ceaae
+java:S1116"Remove this empty statement.(81J$7119a1b9-4929-4fd3-bd64-2b03f3b59a29
-java:S3776"RRefactor this method to reduce its Cognitive Complexity from 20 to the 15 allowed.(81J$3b7ada59-2cfc-4560-a287-454a1ae847d6
-l java:S108")Either remove or fill this block of code.(ʥ81J$fc51a11b-74eb-4005-aec9-35ee53abf6e3
+java:S3776"RRefactor this method to reduce its Cognitive Complexity from 20 to the 15 allowed.(81J$6131e336-43cf-4443-87a6-16705563c207
+l java:S108")Either remove or fill this block of code.(ʥ81J$7ad9f713-6b1c-4015-bf70-14d13e3d5301
-java:S3776"RRefactor this method to reduce its Cognitive Complexity from 17 to the 15 allowed.(#81J$7cbad1eb-a132-4cab-8d60-81b68212e1c1
+java:S3776"RRefactor this method to reduce its Cognitive Complexity from 17 to the 15 allowed.(#81J$867e528a-ef4d-4487-8b62-863ef0aeeee2
{
-java:S1135"2Complete the task associated to this TODO comment.(81J$ff9c8989-0451-4562-a4ee-028788002fbc
+java:S1135"2Complete the task associated to this TODO comment.(81J$b4e660de-ec98-4588-b958-3b7d7403c51f
-java:S1126"BReplace this if-then-else statement by a single method invocation.(玒81J$753af3d9-dad0-4f3c-9959-c8b69921739d
+java:S1126"BReplace this if-then-else statement by a single method invocation.(玒81J$38c30bd8-de91-473a-ba00-d95b3a8a1d4b
{
-java:S1135"2Complete the task associated to this TODO comment.(81J$a216e3f3-9367-48a0-a2f5-642b84a30be5
+java:S1135"2Complete the task associated to this TODO comment.(81J$baf9147a-ca48-4ade-b884-97cddc489849
-java:S3776"RRefactor this method to reduce its Cognitive Complexity from 16 to the 15 allowed.(8œ1J$2187763a-da4b-4ec7-9e5b-32a603fe3993
+java:S3776"RRefactor this method to reduce its Cognitive Complexity from 16 to the 15 allowed.(8œ1J$f50dc9f9-d800-4e83-9b13-0b677a3b5800
-java:S3776"RRefactor this method to reduce its Cognitive Complexity from 18 to the 15 allowed.(b8ԓ1J$1711a887-9da4-4d76-bbcc-e72869e9c270
+java:S3776"RRefactor this method to reduce its Cognitive Complexity from 18 to the 15 allowed.(b8ԓ1J$21db198a-175f-4aea-9068-3cc630f2a0b6
t
-java:S3398"0Move this method into "OnListItemClickListener".(8ܓ1J$eead26b1-9d11-405f-805b-c5f45b7a986c
+java:S3398"0Move this method into "OnListItemClickListener".(8ܓ1J$4dea9eac-6677-49fc-abac-9cec52746b86
x
-java:S3398"/Move this method into "BackgroundQueryHandler".(8ܓ1J$7c1c71c5-2e9c-4c72-93bf-e6322c565995
+java:S3398"/Move this method into "BackgroundQueryHandler".(8ܓ1J$51d907be-c0be-4bc7-9e3d-9e204e3c8321
n
-java:S3398"%Move this method into "ModeCallback".(8ܓ1J$590936c3-737c-4e76-93e1-143f95a5e819
+java:S3398"%Move this method into "ModeCallback".(8ܓ1J$08511eda-d1cb-4c06-9c6b-7fbbabf2ae4a
i
-java:S3398"%Move this method into "ModeCallback".(8ݓ1J$e0820375-b2f5-4732-9d55-3c285326c3dd
\ No newline at end of file
+java:S3398"%Move this method into "ModeCallback".(8ݓ1J$908dbc7a-33a0-4297-a367-71a73e7626d4
\ No newline at end of file
diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/c/6/c65f5dc8218ef1da6f6bfb5d1b14aea855a54d7f b/src/Notes-master1/.idea/sonarlint/issuestore/c/6/c65f5dc8218ef1da6f6bfb5d1b14aea855a54d7f
new file mode 100644
index 0000000..efdabe3
--- /dev/null
+++ b/src/Notes-master1/.idea/sonarlint/issuestore/c/6/c65f5dc8218ef1da6f6bfb5d1b14aea855a54d7f
@@ -0,0 +1,46 @@
+
+
+AYy_MCSLhZ96u27hlWV3
+java:S1118":Add a private constructor to hide the implicit public one.(ڦ81J$618d7de4-485e-46f3-8b4c-6d02175a9671
+
+AYy_MCSLhZ96u27hlWV4
+java:S1118*":Add a private constructor to hide the implicit public one.(81J$aa8ae1bd-02f5-4cb4-9dda-4abc11312ad2
+
+AYy_MCSLhZ96u27hlWV5
+java:S1124+"EReorder the modifiers to comply with the Java Language Specification.(Ɠ81J$531c2459-87a5-462f-9c68-ceb54338b165
+
+AYy_MCSLhZ96u27hlWV6
+java:S11243"EReorder the modifiers to comply with the Java Language Specification.(81J$2f6b41b4-17da-48bd-a42b-f90a77227e67
+
+AYy_MCSLhZ96u27hlWV8
+java:S2140G")Use "java.util.Random.nextInt()" instead.(81J$2490a9cd-5896-4180-a8c0-4d9828709a31
+
+AYy_MCSLhZ96u27hlWV-
+java:S1118M":Add a private constructor to hide the implicit public one.(Ū81J$35b1b617-0f03-4604-86ca-b2edbe244702
+
+AYy_MCSLhZ96u27hlWV_
+java:S1124N"EReorder the modifiers to comply with the Java Language Specification.(81J$0c1ed466-0f41-4801-9362-90a49b1b3f2b
+
+AYy_MCSLhZ96u27hlWWA
+java:S1124V"EReorder the modifiers to comply with the Java Language Specification.(81J$a7ee775e-7547-40f5-9e30-194faabc7fac
+
+AYy_MCSLhZ96u27hlWWB
+java:S1124^"EReorder the modifiers to comply with the Java Language Specification.(81J$586a789f-a458-46ba-88a5-176d9d24b39b
+
+AYy_MCSLhZ96u27hlWWC
+java:S1124f"EReorder the modifiers to comply with the Java Language Specification.(ɜ81J$a7dae421-86a1-454b-99b1-d00fd8042ae2
+
+AYy_MCSLhZ96u27hlWWD
+java:S1118":Add a private constructor to hide the implicit public one.(ֹ81J$47173ffa-c720-46c7-9dfe-4911a6649325
+
+AYy_MCSLhZ96u27hlWWE
+java:S1124"EReorder the modifiers to comply with the Java Language Specification.(81J$7c5f9dd7-9b51-4c53-93ba-4554d6a8eb10
+
+AYy_MCSLhZ96u27hlWWF
+java:S1124"EReorder the modifiers to comply with the Java Language Specification.(81J$9d2b208f-be46-4105-8c97-f6d9f843f8e7
+
+AYy_MCSLhZ96u27hlWWG
+java:S1118":Add a private constructor to hide the implicit public one.(81J$ebd6dde5-c282-4a4e-8edf-2836b820e9fd
+
+AYy_MCSLhZ96u27hlWWH
+java:S1124"EReorder the modifiers to comply with the Java Language Specification.(81J$239b2f5a-d16c-4269-b3a6-d330eed62b2e
\ No newline at end of file
diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/index.pb b/src/Notes-master1/.idea/sonarlint/issuestore/index.pb
index 4f6f9d2..e0a0066 100644
--- a/src/Notes-master1/.idea/sonarlint/issuestore/index.pb
+++ b/src/Notes-master1/.idea/sonarlint/issuestore/index.pb
@@ -30,4 +30,6 @@ i
X
(gradle/wrapper/gradle-wrapper.properties,f\b\fbe448ebfc3eb2d4e308f6b8b043666f5b57235e
@
-local.properties,0\7\0712df971a99ac4d2fccb8e0fb19f377f3374cca
\ No newline at end of file
+local.properties,0\7\0712df971a99ac4d2fccb8e0fb19f377f3374cca
+k
+;app/src/main/java/net/micode/notes/tool/ResourceParser.java,c\6\c65f5dc8218ef1da6f6bfb5d1b14aea855a54d7f
\ No newline at end of file
diff --git a/src/Notes-master1/.idea/sonarlint/securityhotspotstore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c b/src/Notes-master1/.idea/sonarlint/securityhotspotstore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c
index 87041d7..87ded94 100644
--- a/src/Notes-master1/.idea/sonarlint/securityhotspotstore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c
+++ b/src/Notes-master1/.idea/sonarlint/securityhotspotstore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c
@@ -1,7 +1,11 @@
+
+java:S4507"UMake sure this debug feature is deactivated before delivering the code in production.(ԅ81J$c516564e-39b1-4eb9-ab6f-2aaad601692a
y
-java:S6291"5Make sure using an unencrypted database is safe here.(81J$e322f1f7-f9cb-41e7-8b5b-bae4aa2c109d
+java:S6291"5Make sure using an unencrypted database is safe here.(81J$24a4aaf0-d21d-4523-8567-4f2446db2c22
z
-java:S5320"1Make sure that broadcasting intents is safe here.(遏81J$e244f6f5-6d38-44ce-a96d-1ace99f8ef86
+java:S5320"1Make sure that broadcasting intents is safe here.(遏81J$64d2e4a0-5dd6-47e0-9956-3cbcb043c164
u
-java:S5320"1Make sure that broadcasting intents is safe here.(Ν81J$1bc548e8-03f4-4eb5-8baf-98e8d1583fef
\ No newline at end of file
+java:S5320"1Make sure that broadcasting intents is safe here.(Ν81J$32053a74-f892-4016-83b5-c4c44e9777fb
+
+java:S4507 "UMake sure this debug feature is deactivated before delivering the code in production.(ԅ81J$fffca0f6-e367-424d-b8d5-1d41f5c325a1
\ No newline at end of file
diff --git a/src/Notes-master1/.idea/sonarlint/securityhotspotstore/8/c/8c55c3ccc257e5907959013f99656e4c8ec3903e b/src/Notes-master1/.idea/sonarlint/securityhotspotstore/8/c/8c55c3ccc257e5907959013f99656e4c8ec3903e
index 6d1f673..de7b67c 100644
--- a/src/Notes-master1/.idea/sonarlint/securityhotspotstore/8/c/8c55c3ccc257e5907959013f99656e4c8ec3903e
+++ b/src/Notes-master1/.idea/sonarlint/securityhotspotstore/8/c/8c55c3ccc257e5907959013f99656e4c8ec3903e
@@ -1,10 +1,10 @@
xml:S5604
-"FMake sure the use of "WRITE_EXTERNAL_STORAGE" permission is necessary.(B8ˁ1J$0e4606ce-2113-4039-a464-6fdee37b7d3b
- xml:S5604
"=Make sure the use of "READ_CONTACTS" permission is necessary.(۠8ˁ1J$5cb0ab68-d024-420c-a309-c315594b3677
-~ xml:S5604"
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/Notes-master1/app/build/intermediates/data_binding_layout_info_type_package/debug/out/note_edit-layout.xml b/src/Notes-master1/app/build/intermediates/data_binding_layout_info_type_package/debug/out/note_edit-layout.xml
index b9495cb..1950b97 100644
--- a/src/Notes-master1/app/build/intermediates/data_binding_layout_info_type_package/debug/out/note_edit-layout.xml
+++ b/src/Notes-master1/app/build/intermediates/data_binding_layout_info_type_package/debug/out/note_edit-layout.xml
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex
index 53c41d7..8bc06bc 100644
Binary files a/src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex and b/src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out
index e8bb1ca..f5c531b 100644
Binary files a/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and b/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/dataBindingGenBaseClassesDebug/base_builder_log.json b/src/Notes-master1/app/build/intermediates/incremental/dataBindingGenBaseClassesDebug/base_builder_log.json
index fe45e18..d897786 100644
Binary files a/src/Notes-master1/app/build/intermediates/incremental/dataBindingGenBaseClassesDebug/base_builder_log.json and b/src/Notes-master1/app/build/intermediates/incremental/dataBindingGenBaseClassesDebug/base_builder_log.json differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/7N1Fbo0oDCw635wIxKLI5QEdFrw= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/7N1Fbo0oDCw635wIxKLI5QEdFrw=
new file mode 100644
index 0000000..9adc4b5
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/7N1Fbo0oDCw635wIxKLI5QEdFrw= differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Xh6dKtdc2x02R26lM3eawMmUvJ0= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Xh6dKtdc2x02R26lM3eawMmUvJ0=
new file mode 100644
index 0000000..31dcdbe
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Xh6dKtdc2x02R26lM3eawMmUvJ0= differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/_iB6X2vJ4iM2fHhzpkdVyI+f+fQ= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/_iB6X2vJ4iM2fHhzpkdVyI+f+fQ=
new file mode 100644
index 0000000..33e6c51
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/_iB6X2vJ4iM2fHhzpkdVyI+f+fQ= differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/mm4Ya6eGYo59HwyXJ6m_DDV3hcw= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/mm4Ya6eGYo59HwyXJ6m_DDV3hcw=
new file mode 100644
index 0000000..0821412
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/mm4Ya6eGYo59HwyXJ6m_DDV3hcw= differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/qZC2EbrfmYHD3dgRVApa3hwILzs= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/qZC2EbrfmYHD3dgRVApa3hwILzs=
new file mode 100644
index 0000000..72b088f
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/qZC2EbrfmYHD3dgRVApa3hwILzs= differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
index a3239be..0297000 100644
--- a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
+++ b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
@@ -1,4 +1,4 @@
-#Thu Jan 18 15:22:07 CST 2024
+#Thu Jan 18 20:22:11 CST 2024
net.micode.notes.app-main-7\:/color/primary_text_dark.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
net.micode.notes.app-main-7\:/color/secondary_text_dark.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
net.micode.notes.app-main-7\:/drawable-hdpi/bg_btn_set_color.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/stripped.dir/layout/note_edit.xml b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/stripped.dir/layout/note_edit.xml
new file mode 100644
index 0000000..929aaf4
--- /dev/null
+++ b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/stripped.dir/layout/note_edit.xml
@@ -0,0 +1,417 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/stripped.dir/layout/note_list.xml b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/stripped.dir/layout/note_list.xml
deleted file mode 100644
index 234fa83..0000000
--- a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/stripped.dir/layout/note_list.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties b/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
index 86dda76..4ea5641 100644
--- a/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
+++ b/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
@@ -1,4 +1,4 @@
-#Thu Jan 18 15:22:07 CST 2024
+#Thu Jan 18 20:22:11 CST 2024
net.micode.notes.app-main-5\:/color/primary_text_dark.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\color\\primary_text_dark.xml
net.micode.notes.app-main-5\:/color/secondary_text_dark.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\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\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_btn_set_color.png
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/stripped.dir/layout/note_edit.xml b/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/stripped.dir/layout/note_edit.xml
new file mode 100644
index 0000000..929aaf4
--- /dev/null
+++ b/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/stripped.dir/layout/note_edit.xml
@@ -0,0 +1,417 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/stripped.dir/layout/note_list.xml b/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/stripped.dir/layout/note_list.xml
deleted file mode 100644
index 234fa83..0000000
--- a/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/stripped.dir/layout/note_list.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
index bd74049..de84ca3 100644
--- a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
+++ b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
@@ -1,4 +1,4 @@
-#Thu Jan 18 15:31:28 CST 2024
+#Thu Jan 18 23:16:33 CST 2024
base.0=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
path.0=classes.dex
renamed.0=classes.dex
diff --git a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
index 7a19b7d..4a79f34 100644
Binary files a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteEditBinding.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteEditBinding.class
index 613c0e5..3f1e1d4 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteEditBinding.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteEditBinding.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class
index df71afc..371c8ff 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class
index 8165610..82308ee 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class
index afe8560..fa446d8 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class
index 4354abc..45ded81 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class
index 0da6532..dc5cd09 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class differ
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$4.class.uniqueId37 b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$5.class
similarity index 79%
rename from src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$4.class.uniqueId37
rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$5.class
index 0da6532..4df7d70 100644
Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$4.class.uniqueId37 and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$5.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class
index 3c39825..5d53c53 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class
index 4971679..973c348 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class
index f3f6409..fef2ab5 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class differ
diff --git a/src/Notes-master1/app/build/intermediates/local_only_symbol_list/debug/R-def.txt b/src/Notes-master1/app/build/intermediates/local_only_symbol_list/debug/R-def.txt
index 99d8c71..025def4 100644
--- a/src/Notes-master1/app/build/intermediates/local_only_symbol_list/debug/R-def.txt
+++ b/src/Notes-master1/app/build/intermediates/local_only_symbol_list/debug/R-def.txt
@@ -91,6 +91,7 @@ drawable widget_4x_yellow
id account_dialog_subtitle
id account_dialog_title
id action_select_all
+id add_img_btn
id amPm
id btn_new_note
id btn_set_bg_color
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat
index e635381..2a26c6d 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
index acda6fc..90dc29e 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
@@ -7,14 +7,14 @@
"merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_icon_app_yuan.png.flat",
"source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\drawable-hdpi\\icon_app_yuan.png"
},
- {
- "merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_splash.png.flat",
- "source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\drawable-hdpi\\splash.png"
- },
{
"merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_bg_btn_set_color.png.flat",
"source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\drawable-hdpi\\bg_btn_set_color.png"
},
+ {
+ "merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_splash.png.flat",
+ "source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\drawable-hdpi\\splash.png"
+ },
{
"merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_icon_app.png.flat",
"source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\drawable-hdpi\\icon_app.png"
@@ -63,14 +63,14 @@
"merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-5:\\layout_dialog_edit_text.xml.flat",
"source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\layout\\dialog_edit_text.xml"
},
- {
- "merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_yellow.png.flat",
- "source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_yellow.png"
- },
{
"merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-5:\\layout_folder_list_item.xml.flat",
"source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\layout\\folder_list_item.xml"
},
+ {
+ "merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_yellow.png.flat",
+ "source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_yellow.png"
+ },
{
"merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_fly.png.flat",
"source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\drawable-hdpi\\fly.png"
@@ -112,8 +112,8 @@
"source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_red.png"
},
{
- "merged": "net.micode.notes.app-merged_res-5:/layout_note_list.xml.flat",
- "source": "net.micode.notes.app-main-7:/layout/note_list.xml"
+ "merged": "net.micode.notes.app-merged_res-5:/layout_note_edit.xml.flat",
+ "source": "net.micode.notes.app-main-7:/layout/note_edit.xml"
},
{
"merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_green.png.flat",
@@ -123,14 +123,14 @@
"merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_super.png.flat",
"source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_super.png"
},
- {
- "merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_middle.9.png.flat",
- "source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_middle.9.png"
- },
{
"merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_new_note_pressed.png.flat",
"source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\drawable-hdpi\\new_note_pressed.png"
},
+ {
+ "merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_middle.9.png.flat",
+ "source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_middle.9.png"
+ },
{
"merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-5:\\layout_widget_2x.xml.flat",
"source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\layout\\widget_2x.xml"
@@ -139,10 +139,6 @@
"merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_normal.png.flat",
"source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_normal.png"
},
- {
- "merged": "net.micode.notes.app-merged_res-5:/menu_note_list.xml.flat",
- "source": "net.micode.notes.app-main-7:/menu/note_list.xml"
- },
{
"merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_notification.png.flat",
"source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\drawable-hdpi\\notification.png"
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/layout.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/layout.json
index 168ce89..7685619 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/layout.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/layout.json
@@ -1,8 +1,4 @@
[
- {
- "merged": "net.micode.notes.app-mergeDebugResources-4:/layout/note_list.xml",
- "source": "net.micode.notes.app-main-7:/layout/note_list.xml"
- },
{
"merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-mergeDebugResources-4:\\layout\\activity_splash.xml",
"source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\layout\\activity_splash.xml"
@@ -31,6 +27,10 @@
"merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-mergeDebugResources-4:\\layout\\folder_list_item.xml",
"source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\layout\\folder_list_item.xml"
},
+ {
+ "merged": "net.micode.notes.app-mergeDebugResources-4:/layout/note_edit.xml",
+ "source": "net.micode.notes.app-main-7:/layout/note_edit.xml"
+ },
{
"merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-mergeDebugResources-4:\\layout\\dialog_edit_text.xml",
"source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\layout\\dialog_edit_text.xml"
@@ -39,14 +39,14 @@
"merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-mergeDebugResources-4:\\layout\\add_account_text.xml",
"source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\layout\\add_account_text.xml"
},
- {
- "merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-mergeDebugResources-4:\\layout\\note_list_dropdown_menu.xml",
- "source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\layout\\note_list_dropdown_menu.xml"
- },
{
"merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-mergeDebugResources-4:\\layout\\note_edit.xml",
"source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\layout\\note_edit.xml"
},
+ {
+ "merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-mergeDebugResources-4:\\layout\\note_list_dropdown_menu.xml",
+ "source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\layout\\note_list_dropdown_menu.xml"
+ },
{
"merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-mergeDebugResources-4:\\layout\\datetime_picker.xml",
"source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\layout\\datetime_picker.xml"
diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/layout/note_edit.xml b/src/Notes-master1/app/build/intermediates/packaged_res/debug/layout/note_edit.xml
index 9d3e52a..929aaf4 100644
--- a/src/Notes-master1/app/build/intermediates/packaged_res/debug/layout/note_edit.xml
+++ b/src/Notes-master1/app/build/intermediates/packaged_res/debug/layout/note_edit.xml
@@ -124,6 +124,15 @@
+
+
15 && img_fragment.endsWith("[/local]") && img_fragment.startsWith("[local]")){
+ int limit = 7; //[local]为7个字符
+ //[local][/local]共15个字符,剩下的为真正的path长度
+ int len = img_fragment.length()-15;
+ //从[local]之后的len个字符就是path
+ String path = img_fragment.substring(limit,limit+len);//获取到了图片路径
+ Bitmap bitmap = null;
+ Log.d(TAG, "图片的路径是:"+path);
+ try {
+ bitmap = BitmapFactory.decodeFile(path);//将图片路径解码为图片格式
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ if(bitmap!=null){ //若图片存在
+ Log.d(TAG, "图片不为null");
+ ImageSpan imageSpan = new ImageSpan(NoteEditActivity.this, bitmap);
+ //4.创建一个SpannableString对象,以便插入用ImageSpan对象封装的图像
+ String ss = "[local]" + path + "[/local]";
+ SpannableString spannableString = new SpannableString(ss);
+ //5.将指定的标记对象附加到文本的开始...结束范围
+ spannableString.setSpan(imageSpan, 0, ss.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+ Log.d(TAG, "Create spannable string success!");
+ Editable edit_text = noteEditText.getEditableText();
+ edit_text.delete(i,i+len+15); //6.删掉图片路径的文字
+ edit_text.insert(i, spannableString); //7.在路径的起始位置插入图片
+ }
+ }
+ }
+ }
+ }
@Override
protected void onNewIntent(Intent intent) {
super.onNewIntent(intent);
@@ -393,7 +470,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
//如果触控的位置超出了给定的范围,返回false
{
return false;
- }
+ }
return true;
}
@@ -931,6 +1008,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
mEditTextList.setVisibility(View.GONE);
mNoteEditor.setVisibility(View.VISIBLE);
//修改文本编辑器的内容和可见性
+ convertToImage(); //退出清单模式,应该将有图片的地方显示出来
}
}
@@ -1068,6 +1146,137 @@ public class NoteEditActivity extends Activity implements OnClickListener,
Toast.makeText(this, resId, duration).show();
}
+ //获取数据列_获取此 Uri 的数据列的值。这对MediaStore Uris 和其他基于文件的 ContentProvider。
+ public String getDataColumn(Context context, Uri uri, String selection, String[] selectionArgs) {
+
+ Cursor cursor = null;
+ final String column = "_data";
+ final String[] projection = {column};
+
+ try {
+ cursor = context.getContentResolver().query(uri, projection, selection, selectionArgs, null);
+ if (cursor != null && cursor.moveToFirst()) {
+ final int column_index = cursor.getColumnIndexOrThrow(column);
+ return cursor.getString(column_index);
+ }
+ } finally {
+ if (cursor != null)
+ cursor.close();
+ }
+ return null;
+ }
+
+ public boolean isMediaDocument(Uri uri) {
+ return "com.android.providers.media.documents".equals(uri.getAuthority());
+ }
+
+ //获取文件的real path
+ public String getPath(final Context context, final Uri uri) {
+
+ final boolean isKitKat = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT;
+
+ // DocumentProvider
+ if (isKitKat && DocumentsContract.isDocumentUri(context, uri)) {
+ // ExternalStorageProvider
+// if (isExternalStorageDocument(uri)) {
+// final String docId = DocumentsContract.getDocumentId(uri);
+// final String[] split = docId.split(":");
+// final String type = split[0];
+//
+// if ("primary".equalsIgnoreCase(type)) {
+// return Environment.getExternalStorageDirectory() + "/" + split[1];
+// }
+// }
+// // DownloadsProvider
+// else if (isDownloadsDocument(uri)) {
+// final String id = DocumentsContract.getDocumentId(uri);
+// final Uri contentUri = ContentUris.withAppendedId(Uri.parse("content://downloads/public_downloads"), Long.valueOf(id));
+// return getDataColumn(context, contentUri, null, null);
+// }
+ // MediaProvider
+// else
+ if (isMediaDocument(uri)) {
+ final String docId = DocumentsContract.getDocumentId(uri);
+ final String[] split = docId.split(":");
+ final String type = split[0];
+
+ Uri contentUri = null;
+ if ("image".equals(type)) {
+ contentUri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI;
+ }
+
+ final String selection = "_id=?";
+ final String[] selectionArgs = new String[]{split[1]};
+
+ return getDataColumn(context, contentUri, selection, selectionArgs);
+ }
+ }
+ // Media
+ else if ("content".equalsIgnoreCase(uri.getScheme())) {
+ return getDataColumn(context, uri, null, null);
+ }
+ // File
+ else if ("file".equalsIgnoreCase(uri.getScheme())) {
+ return uri.getPath();
+ }
+ return null;
+ }
+
+
+ @Override
+ //重写onActivityResult()来处理返回的数据
+ protected void onActivityResult(int requestCode, int resultCode, Intent intent) {
+ super.onActivityResult(requestCode, resultCode, intent);
+ ContentResolver resolver = getContentResolver();
+ switch (requestCode) {
+ case PHOTO_REQUEST:
+ Uri originalUri = intent.getData(); //1.获得图片的真实路径
+ Bitmap bitmap = null;
+ try {
+ bitmap = BitmapFactory.decodeStream(resolver.openInputStream(originalUri));//2.解码图片
+ } catch (FileNotFoundException e) {
+ Log.d(TAG, "onActivityResult: get file_exception");
+ e.printStackTrace();
+ }
+
+ if(bitmap != null){
+ //3.根据Bitmap对象创建ImageSpan对象
+ Log.d(TAG, "onActivityResult: bitmap is not null");
+ ImageSpan imageSpan = new ImageSpan(NoteEditActivity.this, bitmap);
+ String path = getPath(this,originalUri);
+ //4.使用[local][/local]将path括起来,用于之后方便识别图片路径在note中的位置
+ String img_fragment= "[local]" + path + "[/local]";
+ //创建一个SpannableString对象,以便插入用ImageSpan对象封装的图像
+ SpannableString spannableString = new SpannableString(img_fragment);
+ spannableString.setSpan(imageSpan, 0, img_fragment.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+ //5.将选择的图片追加到EditText中光标所在位置
+ NoteEditText e = (NoteEditText) findViewById(R.id.note_edit_view);
+ int index = e.getSelectionStart(); //获取光标所在位置
+ Log.d(TAG, "Index是: " + index);
+ Editable edit_text = e.getEditableText();
+ edit_text.insert(index, spannableString); //将图片插入到光标所在位置
+
+ mWorkingNote.mContent = e.getText().toString();
+ //6.把改动提交到数据库中,两个数据库表都要改的
+ ContentResolver contentResolver = getContentResolver();
+ ContentValues contentValues = new ContentValues();
+ final long id = mWorkingNote.getNoteId();
+ contentValues.put("snippet",mWorkingNote.mContent);
+ contentResolver.update(Uri.parse("content://micode_notes/note"), contentValues,"_id=?",new String[]{""+id});
+ ContentValues contentValues1 = new ContentValues();
+ contentValues1.put("content",mWorkingNote.mContent);
+ contentResolver.update(Uri.parse("content://micode_notes/data"), contentValues1,"mime_type=? and note_id=?", new String[]{"vnd.android.cursor.item/text_note",""+id});
+
+ }else{
+ Toast.makeText(NoteEditActivity.this, "获取图片失败", Toast.LENGTH_SHORT).show();
+ }
+ break;
+ default:
+ break;
+ }
+ }
+
+
private String Textchange(String oriText){
StringBuffer stringBuffer = new StringBuffer(oriText);
int Flag1 = -1;
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
index 7f678ea..2ab555e 100644
--- a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
+++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
@@ -859,7 +859,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
.getString(R.string.menu_trash));
// 不显示底部的“写便签”
mAddNewNote.setVisibility(View.GONE);
- mTitleBar.setVisibility(View.GONE);
+ mTitleBar.setVisibility(View.VISIBLE);
}
private class OnListItemClickListener implements OnItemClickListener {
diff --git a/src/Notes-master1/app/src/main/res/layout/note_edit.xml b/src/Notes-master1/app/src/main/res/layout/note_edit.xml
index 9d3e52a..929aaf4 100644
--- a/src/Notes-master1/app/src/main/res/layout/note_edit.xml
+++ b/src/Notes-master1/app/src/main/res/layout/note_edit.xml
@@ -124,6 +124,15 @@
+
+