调试

src/Notes-master1/.idea/sonarlint/issuestore/8/c/8c55c3ccc257e5907959013f99656e4c8ec3903e

@@ -1,2 +1,2 @@
 
-x	xml:S5594,"1Implement permissions on this exported component.(ˆ©…»ùÿÿÿÿ
8ÞÙ´“Í1J$61a13240-4d96-408d-9df7-7c1fa811c0ff
+x	xml:S5594,"1Implement permissions on this exported component.(ˆ©…»ùÿÿÿÿ
8¿Ë<EFBFBD>ÒÑ1J$53eacfb5-d43b-4f6a-a9f6-511a0df49c69

src/Notes-master1/.idea/sonarlint/issuestore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32

@@ -1,85 +1,85 @@
 
 ³

 AYy_MCKNhZ96u27hlWRk
-java:S2293ó"YReplace the type specification in this constructor call with the diamond operator ("<>").(艥ð8¸Š¡—Å1J$03033aa3-7adf-4d00-bfd2-95062e53f200
+java:S2293ó"YReplace the type specification in this constructor call with the diamond operator ("<>").(艥ð8¸Š¡—Å1J$ac22eb65-2e1e-4bb5-a659-85c8798c4d60
 <EFBFBD>

 AYy_MCKNhZ96u27hlWRl
-java:S1604÷
"(Make this anonymous inner class a lambda(—̺V8¸Š¡—Å1J$3f72a9b3-3b4d-4559-82c3-f1a782cdd1ae
+java:S1604÷
"(Make this anonymous inner class a lambda(—̺V8¸Š¡—Å1J$24a19e5f-8aa9-46b8-9fc5-9452b29bcd1c
 ‚

 AYy_MCKNhZ96u27hlWRm
-java:S1604¼"(Make this anonymous inner class a lambda(ά¯”8¸Š¡—Å1J$03493ba5-4c58-4b8d-915d-bd239b684d5f
+java:S1604¼"(Make this anonymous inner class a lambda(ά¯”8¸Š¡—Å1J$8ea37c12-d937-4594-8e1c-3d45dcdd7651
 ‚

 AYy_MCKNhZ96u27hlWRn
-java:S1604°"(Make this anonymous inner class a lambda(¿Ü´ã8¸Š¡—Å1J$0953ec8b-091f-4845-bb5f-239e80458012
+java:S1604°"(Make this anonymous inner class a lambda(¿Ü´ã8¸Š¡—Å1J$51c0677b-f3b5-47f8-8dd3-f4f720af35b8
 ‡

 AYy_MCKNhZ96u27hlWRo
-java:S1604Å"(Make this anonymous inner class a lambda(ˆÐï<C390>øÿÿÿÿ
8¸Š¡—Å1J$92651ecc-0dda-4e01-80fb-84c259a32076
+java:S1604Å"(Make this anonymous inner class a lambda(ˆÐï<C390>øÿÿÿÿ
8¸Š¡—Å1J$004f0e32-967d-4a67-8bf5-7b1ba05f79c6
 ‚

 AYy_MCKNhZ96u27hlWRp
-java:S1604Í"(Make this anonymous inner class a lambda(øÄì‡8¸Š¡—Å1J$7c22c005-22dc-4295-b4b8-e57e25c6cd67
+java:S1604Í"(Make this anonymous inner class a lambda(øÄì‡8¸Š¡—Å1J$be53ebb8-ae81-49ce-8592-b24aeb11a5f8
 ‚

 AYy_MCKNhZ96u27hlWRq
-java:S1604²"(Make this anonymous inner class a lambda(Û±¼ 8¸Š¡—Å1J$e211111e-24b9-4d13-ae4c-8a9a3dbc2325
+java:S1604²"(Make this anonymous inner class a lambda(Û±¼ 8¸Š¡—Å1J$e26b98e6-8e52-4b17-a707-063ac69a97d2
 ‚

 AYy_MCKNhZ96u27hlWRr
-java:S1604Õ"(Make this anonymous inner class a lambda(ά¯”8¸Š¡—Å1J$9c21483b-679c-4d70-b964-4d48174b1fcd
+java:S1604Õ"(Make this anonymous inner class a lambda(ά¯”8¸Š¡—Å1J$a45f84e6-14e8-420e-a3a6-e16ad2052d2b
 z
 AYy_MCKNhZ96u27hlWR_
-java:S1116`"Remove this empty statement.(ôŸŽìúÿÿÿÿ
8¸Š¡—Å1J$79a7770d-2c7c-4ea4-a8a3-1bc600b52596
+java:S1116`"Remove this empty statement.(ôŸŽìúÿÿÿÿ
8¸Š¡—Å1J$fd374c03-43b3-4b16-a754-58a855fdbd9b
 ¤

 AYy_MCKNhZ96u27hlWRw
-java:S1124‡
"EReorder the modifiers to comply with the Java Language Specification.(¹úæµûÿÿÿÿ
8¸Š¡—Å1J$e3d03956-a91f-4585-82ed-277b6259ba14
+java:S1124‡
"EReorder the modifiers to comply with the Java Language Specification.(¹úæµûÿÿÿÿ
8¸Š¡—Å1J$bbec4b96-49b3-424c-af89-4de93a60fbda
 ˆ

-java:S1124ˆ
"EReorder the modifiers to comply with the Java Language Specification.(ìѾk8´“Ï•Í1J$d233f9ce-7fb1-497c-9f15-30ccb41d3c74
-„
	java:S125Ž
"<This block of commented-out lines of code should be removed.(õÓ´Õýÿÿÿÿ
8ªºöÏÑ1J$92f9e800-01d3-4f2c-a1ed-eeff9da7e526
+java:S1124ˆ
"EReorder the modifiers to comply with the Java Language Specification.(ìѾk8´“Ï•Í1J$8554636e-c5fb-4c21-8e43-ba5bd9e251cb
+„
	java:S125Ž
"<This block of commented-out lines of code should be removed.(õÓ´Õýÿÿÿÿ
8ªºöÏÑ1J$c17c40a5-6500-449d-87e7-71d0ed02b95a
 _
-java:S3626»
"Remove this redundant jump.(ûÁÝ…
8Ó›±êÌ1J$1137f0ba-a101-4475-80c1-38c59f632ac1
+java:S3626»
"Remove this redundant jump.(ûÁÝ…
8Ó›±êÌ1J$9316d490-9c9a-4a48-bd80-5ef229a82807
 ²

 AYy_MCKNhZ96u27hlWR6
-java:S1450ß
"XRemove the "mMoveMenu" field and declare it as a local variable in the relevant methods.(ž¢—ò
8¸Š¡—Å1J$b6894339-2b1f-42ad-bbfe-2d9fe1e11f11
+java:S1450ß
"XRemove the "mMoveMenu" field and declare it as a local variable in the relevant methods.(ž¢—ò
8¸Š¡—Å1J$928963f2-e36e-4672-a27b-92076f8fac95
 ±

 AYy_MCKNhZ96u27hlWR7
-java:S3252Ü
"RUse static access with "android.widget.AbsListView" for "MultiChoiceModeListener".(¦Ûî„úÿÿÿÿ
8¸Š¡—Å1J$e761805f-b6ee-4e18-b8cb-d4883ba2590d
+java:S3252Ü
"RUse static access with "android.widget.AbsListView" for "MultiChoiceModeListener".(¦Ûî„úÿÿÿÿ
8¸Š¡—Å1J$a320ca5b-065b-4941-b81e-81997b80ac51
 ‘

 AYy_MCKNhZ96u27hlWR8
-java:S1135”"2Complete the task associated to this TODO comment.(» æžÿÿÿÿÿ
8¸Š¡—Å1J$79f3c85a-c160-4d19-82ab-4d32fb1e24ec
+java:S1135”"2Complete the task associated to this TODO comment.(» æžÿÿÿÿÿ
8¸Š¡—Å1J$5a588bb9-a625-4471-914c-71b64bb58919
 ‘

 AYy_MCKNhZ96u27hlWR9
-java:S1135™"2Complete the task associated to this TODO comment.(» æžÿÿÿÿÿ
8¸Š¡—Å1J$fc928f74-44df-4796-a86d-2c302053ebd8
+java:S1135™"2Complete the task associated to this TODO comment.(» æžÿÿÿÿÿ
8¸Š¡—Å1J$65038617-8652-4c08-b69b-c35a69d4810b
 <EFBFBD>

 AYy_MCKNhZ96u27hlWR-
-java:S1874Ó"1Remove this use of "getHeight"; it is deprecated.(·¡ªÃýÿÿÿÿ
8¸Š¡—Å1J$1072de40-da00-4c90-abd2-7b92395e14fc
+java:S1874Ó"1Remove this use of "getHeight"; it is deprecated.(·¡ªÃýÿÿÿÿ
8¸Š¡—Å1J$9b95e449-3bea-4a08-9344-119940d48801
 e
-java:S1116‰"Remove this empty statement.(ôŸŽìúÿÿÿÿ
8Ý“Ï•Í1J$82854009-f30d-4df7-85ec-991aef30ce13
+java:S1116‰"Remove this empty statement.(ôŸŽìúÿÿÿÿ
8Ý“Ï•Í1J$8433b3ea-f3af-4298-9afa-9f6a5a601f5d
 ¬

 AYy_MCKNhZ96u27hlWSA
-java:S3776È"RRefactor this method to reduce its Cognitive Complexity from 20 to the 15 allowed.(ãìîí
8¸Š¡—Å1J$76b60240-cafb-4579-8cd6-e177cefdda5f
+java:S3776È"RRefactor this method to reduce its Cognitive Complexity from 20 to the 15 allowed.(ãìîí
8¸Š¡—Å1J$cdd27059-d047-443b-b5b8-10f22a2aae60
 ‚

-AYy_MCKNhZ96u27hlWSB	java:S108Ï")Either remove or fill this block of code.(žûÊ¥8¸Š¡—Å1J$478470cf-b842-4e38-981b-3c99530096fd
+AYy_MCKNhZ96u27hlWSB	java:S108Ï")Either remove or fill this block of code.(žûÊ¥8¸Š¡—Å1J$2392471e-84d2-43a8-923b-d37db19fde8a
 «

 AYy_MCKNhZ96u27hlWSC
-java:S3776²"RRefactor this method to reduce its Cognitive Complexity from 17 to the 15 allowed.(ÅôÉ#8¸Š¡—Å1J$fba14e0f-24e7-40f2-910f-caff23937468
+java:S3776²"RRefactor this method to reduce its Cognitive Complexity from 17 to the 15 allowed.(ÅôÉ#8¸Š¡—Å1J$08557294-40b9-4509-8828-502b26a48586
 ‘

 AYy_MCKNhZ96u27hlWSD
-java:S1135ô"2Complete the task associated to this TODO comment.(» æžÿÿÿÿÿ
8¸Š¡—Å1J$296a28e4-1cd0-4d2d-85db-54ccf6f1aa20
+java:S1135ô"2Complete the task associated to this TODO comment.(» æžÿÿÿÿÿ
8¸Š¡—Å1J$a7ab543e-d235-41b0-b71e-d590513b9194
 ¡

 AYy_MCKNhZ96u27hlWSE
-java:S1126ù"BReplace this if-then-else statement by a single method invocation.(玒¦ýÿÿÿÿ
8¸Š¡—Å1J$fc75e65f-091e-4be9-9373-25c406f204f0
+java:S1126ù"BReplace this if-then-else statement by a single method invocation.(玒¦ýÿÿÿÿ
8¸Š¡—Å1J$9fbee853-a72c-4d75-837c-7396e0b244a1
 ‘

 AYy_MCKNhZ96u27hlWSF
-java:S1135<18>"2Complete the task associated to this TODO comment.(» æžÿÿÿÿÿ
8¸Š¡—Å1J$0538b172-510e-4141-a128-312b1ed89239
+java:S1135<18>"2Complete the task associated to this TODO comment.(» æžÿÿÿÿÿ
8¸Š¡—Å1J$0c272c5d-d8f0-4e9d-aec9-5a41a4142be7
 «

 AYy_MCKNhZ96u27hlWSH
-java:S3776Ð"RRefactor this method to reduce its Cognitive Complexity from 18 to the 15 allowed.(ôŒùb8¸Š¡—Å1J$834d20ec-f4b6-49e5-a410-6af2016a6626
+java:S3776Ð"RRefactor this method to reduce its Cognitive Complexity from 18 to the 15 allowed.(ôŒùb8¸Š¡—Å1J$ce6d4e2b-9451-4c37-94e4-02e2f1ccdb2f
 Š

 AYy_MCKNhZ96u27hlWSK
-java:S3398ˆ"0Move this method into "OnListItemClickListener".(‘ðð¡8¸Š¡—Å1J$3a534f99-4a72-4c2e-bd91-8ba52cfa5b3b
+java:S3398ˆ"0Move this method into "OnListItemClickListener".(‘ðð¡8¸Š¡—Å1J$724af73f-f8f6-4792-8298-bdef7f6269ce
 Ž

 AYy_MCKNhZ96u27hlWSL
-java:S3398¬"/Move this method into "BackgroundQueryHandler".(—÷õŽüÿÿÿÿ
8¸Š¡—Å1J$970e9c44-b917-4186-8e17-3bfc8f0f99f6
+java:S3398¬"/Move this method into "BackgroundQueryHandler".(—÷õŽüÿÿÿÿ
8¸Š¡—Å1J$6ff2ad7e-6adc-4eeb-88e7-5b2d235592f1
 „

 AYy_MCKNhZ96u27hlWSJ
-java:S3398÷"%Move this method into "ModeCallback".(“ðÉçýÿÿÿÿ
8¸Š¡—Å1J$d500ca09-f344-441a-9dc8-ad6ee6145c80
+java:S3398÷"%Move this method into "ModeCallback".(“ðÉçýÿÿÿÿ
8¸Š¡—Å1J$bc64da26-9893-4ff2-9c8c-72d0308bef43
 
 AYy_MCKNhZ96u27hlWSI
-java:S3398È"%Move this method into "ModeCallback".(ãìîí
8¸Š¡—Å1J$b8256528-018e-4767-ba37-83ef2db61249
+java:S3398È"%Move this method into "ModeCallback".(ãìîí
8¸Š¡—Å1J$2bd0900e-294a-4e05-8b8c-0e25de6df094

src/Notes-master1/.idea/sonarlint/securityhotspotstore/8/c/8c55c3ccc257e5907959013f99656e4c8ec3903e

@@ -1,10 +1,10 @@
 
 <EFBFBD>
	xml:S5604
-"FMake sure the use of "WRITE_EXTERNAL_STORAGE" permission is necessary.(¤˜ÿB8ÝÙ´“Í1J$09ffe851-1822-40df-ab3e-128ee85c9180
-„
	xml:S5604
"=Make sure the use of "READ_CONTACTS" permission is necessary.(£Û §øÿÿÿÿ
8ÞÙ´“Í1J$3cf054ce-e7f7-4a8b-b0cd-28ef0aa70a81
-~	xml:S5604"<Make sure the use of "GET_ACCOUNTS" permission is necessary.(–½«Ø8ÞÙ´“Í1J$ac59c110-e582-4f37-85d0-321470a6f22e
-w	xml:S5322S"0Make sure that intents are received safely here.(èç‚óûÿÿÿÿ
8ÞÙ´“Í1J$14430cc3-d6a3-43f6-ba45-07bacb974a29
-w	xml:S5322`"0Make sure that intents are received safely here.(èç‚óûÿÿÿÿ
8ÞÙ´“Í1J$13c2891e-df74-456d-9fb7-0d99ff933210
-r	xml:S5322m"0Make sure that intents are received safely here.(¦Ç´ù8ÞÙ´“Í1J$6f64457f-d96a-4b52-8dfa-4d5909fd1102
-Ã
	xml:S5332"|"usesCleartextTraffic" is implicitly enabled for older Android versions. Make sure allowing clear-text traffic is safe here.(縸òþÿÿÿÿ
8ÞÙ´“Í1J$6035da5b-7ace-4ee0-85c7-8c999f76e383
-y	xml:S6358"2Make sure backup of application data is safe here.(縸òþÿÿÿÿ
8àÙ´“Í1J$855b785e-4195-4d61-b143-fd8c95d5652b
+"FMake sure the use of "WRITE_EXTERNAL_STORAGE" permission is necessary.(¤˜ÿB8¿Ë<EFBFBD>ÒÑ1J$b46648dc-2a26-4e47-b133-870ef889f70d
+„
	xml:S5604
"=Make sure the use of "READ_CONTACTS" permission is necessary.(£Û §øÿÿÿÿ
8¿Ë<EFBFBD>ÒÑ1J$583c7200-1f69-4a05-b4a7-86411c7e9a4d
+~	xml:S5604"<Make sure the use of "GET_ACCOUNTS" permission is necessary.(–½«Ø8¿Ë<EFBFBD>ÒÑ1J$dcc00a83-5ddc-4b59-bb3f-692dafb88d7b
+w	xml:S5322S"0Make sure that intents are received safely here.(èç‚óûÿÿÿÿ
8ÀË<EFBFBD>ÒÑ1J$12c85812-abf4-4483-b8a7-e3b6d0a1ec37
+w	xml:S5322`"0Make sure that intents are received safely here.(èç‚óûÿÿÿÿ
8ÀË<EFBFBD>ÒÑ1J$78a7d66f-0ad7-42cd-9111-6a0275d9c01f
+r	xml:S5322m"0Make sure that intents are received safely here.(¦Ç´ù8ÀË<EFBFBD>ÒÑ1J$f55dfa92-17d5-4274-a1e8-129a513c895e
+Ã
	xml:S5332"|"usesCleartextTraffic" is implicitly enabled for older Android versions. Make sure allowing clear-text traffic is safe here.(縸òþÿÿÿÿ
8ÁË<EFBFBD>ÒÑ1J$c3e99491-dd70-4294-9e9f-e0dd77d25f87
+y	xml:S6358"2Make sure backup of application data is safe here.(縸òþÿÿÿÿ
8ÂË<EFBFBD>ÒÑ1J$ace342a4-d6b2-4c47-abc0-db1f576be691

src/Notes-master1/.idea/sonarlint/securityhotspotstore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32

@@ -1,9 +1,9 @@
 
 <EFBFBD>

 AYy_MCKNhZ96u27hlWR1
-java:S6291¢
"5Make sure using an unencrypted database is safe here.(­©Ð8¸Š¡—Å1J$74c0ba08-4139-4c8a-acb3-ca7549143e3a
+java:S6291¢
"5Make sure using an unencrypted database is safe here.(­©Ð8¸Š¡—Å1J$344fb41b-121e-495b-98cd-c3033fece982
 ž

-java:S4507¯
"UMake sure this debug feature is deactivated before delivering the code in production.(€ÉÔ…ýÿÿÿÿ
8Õ›±êÌ1J$6e30347b-0d1d-4495-8a0c-9bd40d13f530
+java:S4507¯
"UMake sure this debug feature is deactivated before delivering the code in production.(€ÉÔ…ýÿÿÿÿ
8Õ›±êÌ1J$da7328db-4eeb-498b-a266-97045a6b0c77
 <EFBFBD>

 AYy_MCKNhZ96u27hlWSG
-java:S5320®"1Make sure that broadcasting intents is safe here.(ªé<C2AA><C3A9>ûÿÿÿÿ
8¸Š¡—Å1J$e1b05762-6b95-4c53-a646-254d92d7b6a0
+java:S5320®"1Make sure that broadcasting intents is safe here.(ªé<C2AA><C3A9>ûÿÿÿÿ
8¸Š¡—Å1J$54f40af8-04e3-4ccd-b083-054bceecefd3

src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties

@@ -1,4 +1,4 @@
-#Thu Jan 18 08:42:07 CST 2024
+#Thu Jan 18 10:11: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/batterfly.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_batterfly.png.flat

src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml

@@ -193,7 +193,7 @@
     <string name="alert_message_delete_note">Confirm to delete this note?</string>
     <string name="alert_message_delete_notes">Confirm to delete the selected %d notes?</string>
     <string name="alert_title_delete">Delete selected notes</string>
-    <string name="app_name">Notes</string>
+    <string name="app_name">原神</string>
     <string name="app_widget2x2">Notes 2x2</string>
     <string name="app_widget4x4">Notes 4x4</string>
     <string name="button_delete">Delete</string>
@@ -1221,8 +1221,8 @@
         <item name="android:textColor">@color/secondary_text_dark</item>
     </style>
     <style name="NoteActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid">
-        <item name="android:displayOptions"/>
-        <item name="android:visibility">gone</item>
+
+        <item name="android:visibility">visible</item>
     </style>
     <style name="NoteTheme" parent="@android:style/Theme.Holo.Light">
         <item name="android:actionBarStyle">@style/NoteActionBarStyle</item>

src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties

@@ -1,4 +1,4 @@
-#Thu Jan 18 08:42:07 CST 2024
+#Thu Jan 18 10:11: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/batterfly.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\batterfly.png

src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml

@@ -30,7 +30,7 @@
     <string name="alert_message_delete_note">Confirm to delete this note?</string>
     <string name="alert_message_delete_notes">Confirm to delete the selected %d notes?</string>
     <string name="alert_title_delete">Delete selected notes</string>
-    <string name="app_name">Notes</string>
+    <string name="app_name">原神</string>
     <string name="app_widget2x2">Notes 2x2</string>
     <string name="app_widget4x4">Notes 4x4</string>
     <string name="button_delete">Delete</string>
@@ -141,8 +141,8 @@
         <item name="android:textColor">@color/secondary_text_dark</item>
     </style>
     <style name="NoteActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid">
-        <item name="android:displayOptions"/>
-        <item name="android:visibility">gone</item>
+
+        <item name="android:visibility">visible</item>
     </style>
     <style name="NoteTheme" parent="@android:style/Theme.Holo.Light">
         <item name="android:actionBarStyle">@style/NoteActionBarStyle</item>

src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt

@@ -1,4 +1,4 @@
-#Thu Jan 18 08:42:13 CST 2024
+#Thu Jan 18 10:11:12 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

src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt

@@ -55,8 +55,8 @@
 28-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:25:13-74
 29            android:exported="true"
 29-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:26:13-36
-30            android:label="@string/title_activity_splash"
-30-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:27:13-58
+30            android:label="@string/app_name"
+30-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:27:13-45
 31            android:theme="@style/Theme.Notesmaster1.Fullscreen" >
 31-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:28:13-65
 32            <intent-filter>

src/Notes-master1/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml

@@ -27,7 +27,7 @@
             android:name="net.micode.notes.ui.SplashActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:exported="true"
-            android:label="@string/title_activity_splash"
+            android:label="@string/app_name"
             android:theme="@style/Theme.Notesmaster1.Fullscreen" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

src/Notes-master1/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml

@@ -27,7 +27,7 @@
             android:name="net.micode.notes.ui.SplashActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:exported="true"
-            android:label="@string/title_activity_splash"
+            android:label="@string/app_name"
             android:theme="@style/Theme.Notesmaster1.Fullscreen" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json

@@ -1471,20 +1471,17 @@
                 {
                     "source": "D:\\Android\\MiNote\\src\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml",
                     "from": {
-                        "startLines": "128,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startColumns": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "8133,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endLines": "132,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "8540,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+                        "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
                     },
                     "to": {
                         "startLines": "169,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,286,287,288,289,290,291,292,293,294,295,296,297",
                         "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",
-                        "startOffsets": "10826,12430,12526,12609,12705,12774,12817,12869,12921,12970,13033,13091,13142,13226,13280,13337,13431,13539,13610,13694,13777,13843,13926,14028,14089,14151,14202,14280,14333,14393,14498,14557,14659,14714,14785,14834,14892,14939,14998,15055,15126,15187,15244,15294,15346,15399,15449,15499,15559,15612,15678,15740,15803,15850,15905,15993,16051,16113,16163,16208,16251,16311,16378,16433,16480,16535,16588,16635,16688,16744,16792,16847,16900,16984,17051,17115,17211,17285,17366,17455,17618,17762,17841,17916,17998,18057,18137,18217,18272,18394,18497,18538,18591,18648,18722,18858,18926,19012,19092,19161,19255,19314,19369,19431,19491,19556,19666",
+                        "startOffsets": "10826,12430,12526,12609,12705,12774,12814,12866,12918,12967,13030,13088,13139,13223,13277,13334,13428,13536,13607,13691,13774,13840,13923,14025,14086,14148,14199,14277,14330,14390,14495,14554,14656,14711,14782,14831,14889,14936,14995,15052,15123,15184,15241,15291,15343,15396,15446,15496,15556,15609,15675,15737,15800,15847,15902,15990,16048,16110,16160,16205,16248,16308,16375,16430,16477,16532,16585,16632,16685,16741,16789,16844,16897,16981,17048,17112,17208,17282,17363,17452,17615,17759,17838,17913,17995,18054,18134,18214,18269,18391,18494,18535,18588,18645,18719,18855,18923,19009,19089,19158,19252,19311,19366,19428,19488,19553,19663",
                         "endLines": "173,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,286,287,288,289,290,291,292,293,294,295,296,297",
-                        "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,53,56,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,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,40,52,56,73,64,67,85,79,68,93,58,54,61,59,64,109,89",
-                        "endOffsets": "11173,12521,12604,12700,12769,12812,12864,12916,12965,13028,13086,13137,13221,13275,13332,13426,13534,13605,13689,13772,13838,13921,14023,14084,14146,14197,14275,14328,14388,14493,14552,14654,14709,14780,14829,14887,14934,14993,15050,15121,15182,15239,15289,15341,15394,15444,15494,15554,15607,15673,15735,15798,15845,15900,15988,16046,16108,16158,16203,16246,16306,16373,16428,16475,16530,16583,16630,16683,16739,16787,16842,16895,16979,17046,17110,17206,17280,17361,17450,17613,17757,17836,17911,17993,18052,18132,18212,18267,18389,18492,18533,18586,18643,18717,18782,18921,19007,19087,19156,19250,19309,19364,19426,19486,19551,19661,19751"
+                        "endColumns": "14,95,82,95,68,39,51,51,48,62,57,50,83,53,56,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,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,40,52,56,73,64,67,85,79,68,93,58,54,61,59,64,109,89",
+                        "endOffsets": "11173,12521,12604,12700,12769,12809,12861,12913,12962,13025,13083,13134,13218,13272,13329,13423,13531,13602,13686,13769,13835,13918,14020,14081,14143,14194,14272,14325,14385,14490,14549,14651,14706,14777,14826,14884,14931,14990,15047,15118,15179,15236,15286,15338,15391,15441,15491,15551,15604,15670,15732,15795,15842,15897,15985,16043,16105,16155,16200,16243,16303,16370,16425,16472,16527,16580,16627,16680,16736,16784,16839,16892,16976,17043,17107,17203,17277,17358,17447,17610,17754,17833,17908,17990,18049,18129,18209,18264,18386,18489,18530,18583,18640,18714,18779,18918,19004,19084,19153,19247,19306,19361,19423,19483,19548,19658,19748"
                     }
                 },
                 {
@@ -1497,10 +1494,10 @@
                     "to": {
                         "startLines": "12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,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,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,137,138,139,140,141,142,143,144,145,146,147,148,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,285,298,299,300,301,302,309,310,314,318,323,329,336,340,344,349,353,357,361,365,369,373,377,381,385,387,389,393,397,401,406,410,413,417,421,425,429,433,437,442,445,448,451,454,457,460,463,465,467,468,469,472,474,476,478,483,484,488,494,498,499,501,512,513,517,523,527,528,529,533,560,564,592,737,759,904,926,933,938,959,964,969,979,988,999,1003,1010,1018,1025,1026,1035,1038,1041,1046,1050,1053,1056,1060,1064,1072,1077,1084,1090,1091,1095,1100,1102,1104,1107,1110,1112,1116,1123,1126,1129,1133,1135,1139,1141,1147,1149,1153,1165,1171,1176,1191,1194,1199,1209,1229,1267,1306,1316,1325,1327,1331,1335,1338,1341,1344,1347,1351,1354,1357,1360,1364,1367,1370,1371,1372,1373,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,1385,1387,1389,1390,1391,1392,1394,1396,1397,1398,1399,1400,1401,1402,1404,1406,1408,1410,1412,1414,1415,1417,1418,1420,1422,1424,1425,1426,1427,1428,1429,1430,1431,1433,1435,1465,1466,1467,1468,1469,1470,1472,1473,1474,1475,1476,1477,1479,1483,1494,1495,1496,1497,1498,1503,1505,1507,1509,1511,1513,1514,1515,1516,1518,1520,1522,1523,1524,1525,1526,1527,1528,1529,1530,1531,1532,1535,1536,1537,1539,1541,1542,1544,1545,1547,1549,1551,1552,1553,1554,1555,1556,1557,1558,1559,1560,1561,1563,1565,1566,1567,1569,1570,1571,1573,1575,1577,1579,1581,1583,1584,1585,1586,1587,1588,1589,1590,1591,1592",
                         "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,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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": "420,475,520,569,610,665,728,804,866,939,1007,1085,1166,1227,1302,1378,1455,1533,1603,1674,1735,1847,1924,2002,2108,2214,2293,2373,2430,2488,2562,2637,2702,2768,2835,2903,3007,3319,3399,3480,3539,3598,3657,3716,3775,3838,3902,3960,4019,4090,4162,4234,4307,4364,4422,4495,4569,4643,4718,4790,4863,4933,5061,5130,5200,5270,5347,5426,5502,5579,5643,5708,5777,5854,5929,5998,6066,6143,6209,6306,6371,6440,6539,6598,6656,6713,6772,6844,6912,6980,7039,7102,7192,7283,7343,7409,7476,7542,7612,7676,7729,7842,7900,7965,8029,8078,8139,8200,8261,8323,8387,8451,8515,8580,8643,8703,8764,8823,8883,8945,9016,9076,9144,9211,9279,9347,9415,9501,9588,9650,9711,10030,10102,10159,10207,10256,10307,10341,10388,10437,10483,10515,10579,10641,10696,10756,11178,11252,11330,11423,11493,11571,11625,11695,11780,11832,11905,11979,12048,12123,12197,12271,12360,18787,19756,19834,19924,20012,20108,20609,20698,20945,21226,21511,21904,22381,22603,22825,23093,23320,23550,23780,24010,24240,24467,24706,24932,25177,25307,25437,25667,25915,26134,26417,26625,26756,26983,27229,27454,27703,27924,28169,28464,28686,28924,29138,29368,29591,29806,30014,30138,30262,30367,30484,30698,30844,30984,31070,31418,31506,31736,32138,32371,32453,32551,33143,33243,33479,33887,34126,34220,34278,34515,36533,36775,38925,47639,48906,57730,59011,59547,59877,61000,61256,61492,62039,62533,63206,63421,63949,64513,64888,65006,65544,65701,65845,66165,66335,66476,66605,66904,67207,67766,68028,68378,68731,68825,69131,69393,69518,69645,69884,70095,70214,70407,70862,71043,71165,71424,71537,71724,71826,72270,72394,72679,73566,73860,74190,75110,75282,75618,76284,77355,80182,83150,83738,84332,84445,84674,85012,85172,85324,85495,85662,85905,86075,86248,86419,86693,86892,87139,87223,87319,87415,87513,87613,87715,87817,87919,88021,88123,88223,88319,88431,88560,88683,88837,88991,89089,89203,89297,89437,89571,89667,89779,89879,89995,90091,90203,90343,90491,90655,90797,90955,91105,91246,91390,91525,91661,91803,91945,92057,92197,92265,92338,92412,92485,92559,92705,92849,94333,94399,94489,94569,94661,94759,94869,94947,95053,95145,95249,95359,95481,95644,96198,96278,96378,96468,96578,96905,97005,97117,97231,97347,97463,97557,97671,97789,97891,98011,98133,98215,98319,98439,98565,98659,98747,98859,98975,99097,99209,99384,99500,99586,99698,99822,99889,100015,100083,100211,100355,100483,100552,100647,100762,100875,100974,101083,101194,101305,101406,101511,101623,101753,101844,101967,102079,102165,102269,102377,102477,102595,102699,102803,102929,103017,103107,103217,103301,103355,103477,103583,103693,103777",
+                        "startOffsets": "420,475,520,569,610,665,728,804,866,939,1007,1085,1166,1227,1302,1378,1455,1533,1603,1674,1735,1847,1924,2002,2108,2214,2293,2373,2430,2488,2562,2637,2702,2768,2835,2903,3007,3319,3399,3480,3539,3598,3657,3716,3775,3838,3902,3960,4019,4090,4162,4234,4307,4364,4422,4495,4569,4643,4718,4790,4863,4933,5061,5130,5200,5270,5347,5426,5502,5579,5643,5708,5777,5854,5929,5998,6066,6143,6209,6306,6371,6440,6539,6598,6656,6713,6772,6844,6912,6980,7039,7102,7192,7283,7343,7409,7476,7542,7612,7676,7729,7842,7900,7965,8029,8078,8139,8200,8261,8323,8387,8451,8515,8580,8643,8703,8764,8823,8883,8945,9016,9076,9144,9211,9279,9347,9415,9501,9588,9650,9711,10030,10102,10159,10207,10256,10307,10341,10388,10437,10483,10515,10579,10641,10696,10756,11178,11252,11330,11423,11493,11571,11625,11695,11780,11832,11905,11979,12048,12123,12197,12271,12360,18784,19753,19831,19921,20009,20105,20606,20695,20942,21223,21508,21901,22378,22600,22822,23090,23317,23547,23777,24007,24237,24464,24703,24929,25174,25304,25434,25664,25912,26131,26414,26622,26753,26980,27226,27451,27700,27921,28166,28461,28683,28921,29135,29365,29588,29803,30011,30135,30259,30364,30481,30695,30841,30981,31067,31415,31503,31733,32135,32368,32450,32548,33140,33240,33476,33884,34123,34217,34275,34512,36530,36772,38922,47636,48903,57727,59008,59544,59874,60997,61253,61489,62036,62530,63203,63418,63946,64510,64885,65003,65541,65698,65842,66162,66332,66473,66602,66901,67204,67763,68025,68375,68728,68822,69128,69390,69515,69642,69881,70092,70211,70404,70859,71040,71162,71421,71534,71721,71823,72267,72391,72676,73563,73857,74187,75107,75279,75615,76281,77310,80137,83105,83693,84287,84400,84629,84967,85127,85279,85450,85617,85860,86030,86203,86374,86648,86847,87094,87178,87274,87370,87468,87568,87670,87772,87874,87976,88078,88178,88274,88386,88515,88638,88792,88946,89044,89158,89252,89392,89526,89622,89734,89834,89950,90046,90158,90298,90446,90610,90752,90910,91060,91201,91345,91480,91616,91758,91900,92012,92152,92220,92293,92367,92440,92514,92660,92804,94288,94354,94444,94524,94616,94714,94824,94902,95008,95100,95204,95314,95436,95599,96153,96233,96333,96423,96533,96860,96960,97072,97186,97302,97418,97512,97626,97744,97846,97966,98088,98170,98274,98394,98520,98614,98702,98814,98930,99052,99164,99339,99455,99541,99653,99777,99844,99970,100038,100166,100310,100438,100507,100602,100717,100830,100929,101038,101149,101260,101361,101466,101578,101708,101799,101922,102034,102120,102224,102332,102432,102550,102654,102758,102884,102972,103062,103172,103256,103310,103432,103538,103648,103732",
                         "endLines": "12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,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,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,137,138,139,140,141,142,143,144,145,146,147,148,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,285,298,299,300,301,308,309,313,317,322,328,335,339,343,348,352,356,360,364,368,372,376,380,384,386,388,392,396,400,405,409,412,416,420,424,428,432,436,441,444,447,450,453,456,459,462,464,466,467,468,471,473,475,477,482,483,487,493,497,498,500,511,512,516,522,526,527,528,532,559,563,591,736,758,903,925,932,937,958,963,968,978,987,998,1002,1009,1017,1024,1025,1034,1037,1040,1045,1049,1052,1055,1059,1063,1071,1076,1083,1089,1090,1094,1099,1101,1103,1106,1109,1111,1115,1122,1125,1128,1132,1134,1138,1140,1146,1148,1152,1164,1170,1175,1190,1193,1198,1208,1213,1266,1305,1315,1324,1326,1330,1334,1337,1340,1343,1346,1350,1353,1356,1359,1363,1366,1369,1370,1371,1372,1373,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,1386,1388,1389,1390,1391,1393,1395,1396,1397,1398,1399,1400,1401,1403,1405,1407,1409,1411,1413,1414,1416,1417,1419,1421,1423,1424,1425,1426,1427,1428,1429,1430,1432,1434,1436,1465,1466,1467,1468,1469,1471,1472,1473,1474,1475,1476,1478,1482,1486,1494,1495,1496,1497,1498,1504,1506,1508,1510,1512,1513,1514,1515,1517,1519,1521,1522,1523,1524,1525,1526,1527,1528,1529,1530,1531,1534,1535,1536,1538,1540,1541,1543,1544,1546,1548,1550,1551,1552,1553,1554,1555,1556,1557,1558,1559,1560,1562,1564,1565,1566,1568,1569,1570,1572,1574,1576,1578,1580,1582,1583,1584,1585,1586,1587,1588,1589,1590,1591,1592",
                         "endColumns": "54,44,48,40,54,62,75,61,72,67,77,80,60,74,75,76,77,69,70,60,61,76,77,105,105,78,79,56,57,73,74,64,65,66,67,103,105,79,80,58,58,58,58,58,62,63,57,58,70,71,71,72,56,57,72,73,73,74,71,72,69,70,68,69,69,76,78,75,76,63,64,68,76,74,68,67,76,65,96,64,68,98,58,57,56,58,71,67,67,58,62,89,90,59,65,66,65,69,63,52,112,57,64,63,48,60,60,60,61,63,63,63,64,62,59,60,58,59,61,70,59,67,66,67,67,67,85,86,61,60,56,71,56,47,48,50,33,46,48,45,31,63,61,54,59,69,73,77,92,69,77,53,69,84,51,72,73,68,74,73,73,88,69,70,77,89,87,95,12,88,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,104,116,12,12,12,12,12,87,12,12,12,81,12,12,99,12,12,12,93,57,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,117,12,12,12,12,12,12,12,12,12,12,12,12,12,93,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,83,95,95,97,99,101,101,101,101,101,99,95,111,128,122,12,12,97,113,93,12,12,95,111,99,115,95,111,12,12,12,12,12,12,140,12,134,12,12,12,111,139,67,72,73,72,73,12,12,12,65,89,79,91,97,12,77,105,91,103,109,12,12,12,79,99,89,109,91,12,12,12,12,12,93,113,117,12,12,12,81,103,119,125,93,87,111,115,121,111,12,115,85,12,12,66,12,67,12,12,12,68,94,114,112,98,108,110,110,100,104,12,12,90,122,12,85,103,12,12,12,12,12,12,87,89,109,83,53,121,105,109,83,125",
-                        "endOffsets": "470,515,564,605,660,723,799,861,934,1002,1080,1161,1222,1297,1373,1450,1528,1598,1669,1730,1792,1919,1997,2103,2209,2288,2368,2425,2483,2557,2632,2697,2763,2830,2898,3002,3108,3394,3475,3534,3593,3652,3711,3770,3833,3897,3955,4014,4085,4157,4229,4302,4359,4417,4490,4564,4638,4713,4785,4858,4928,4999,5125,5195,5265,5342,5421,5497,5574,5638,5703,5772,5849,5924,5993,6061,6138,6204,6301,6366,6435,6534,6593,6651,6708,6767,6839,6907,6975,7034,7097,7187,7278,7338,7404,7471,7537,7607,7671,7724,7837,7895,7960,8024,8073,8134,8195,8256,8318,8382,8446,8510,8575,8638,8698,8759,8818,8878,8940,9011,9071,9139,9206,9274,9342,9410,9496,9583,9645,9706,9763,10097,10154,10202,10251,10302,10336,10383,10432,10478,10510,10574,10636,10691,10751,10821,11247,11325,11418,11488,11566,11620,11690,11775,11827,11900,11974,12043,12118,12192,12266,12355,12425,18853,19829,19919,20007,20103,20604,20693,20940,21221,21506,21899,22376,22598,22820,23088,23315,23545,23775,24005,24235,24462,24701,24927,25172,25302,25432,25662,25910,26129,26412,26620,26751,26978,27224,27449,27698,27919,28164,28459,28681,28919,29133,29363,29586,29801,30009,30133,30257,30362,30479,30693,30839,30979,31065,31413,31501,31731,32133,32366,32448,32546,33138,33238,33474,33882,34121,34215,34273,34510,36528,36770,38920,47634,48901,57725,59006,59542,59872,60995,61251,61487,62034,62528,63201,63416,63944,64508,64883,65001,65539,65696,65840,66160,66330,66471,66600,66899,67202,67761,68023,68373,68726,68820,69126,69388,69513,69640,69879,70090,70209,70402,70857,71038,71160,71419,71532,71719,71821,72265,72389,72674,73561,73855,74185,75105,75277,75613,76279,76564,80177,83145,83733,84327,84440,84669,85007,85167,85319,85490,85657,85900,86070,86243,86414,86688,86887,87134,87218,87314,87410,87508,87608,87710,87812,87914,88016,88118,88218,88314,88426,88555,88678,88832,88986,89084,89198,89292,89432,89566,89662,89774,89874,89990,90086,90198,90338,90486,90650,90792,90950,91100,91241,91385,91520,91656,91798,91940,92052,92192,92260,92333,92407,92480,92554,92700,92844,92982,94394,94484,94564,94656,94754,94864,94942,95048,95140,95244,95354,95476,95639,95796,96273,96373,96463,96573,96665,97000,97112,97226,97342,97458,97552,97666,97784,97886,98006,98128,98210,98314,98434,98560,98654,98742,98854,98970,99092,99204,99379,99495,99581,99693,99817,99884,100010,100078,100206,100350,100478,100547,100642,100757,100870,100969,101078,101189,101300,101401,101506,101618,101748,101839,101962,102074,102160,102264,102372,102472,102590,102694,102798,102924,103012,103102,103212,103296,103350,103472,103578,103688,103772,103898"
+                        "endOffsets": "470,515,564,605,660,723,799,861,934,1002,1080,1161,1222,1297,1373,1450,1528,1598,1669,1730,1792,1919,1997,2103,2209,2288,2368,2425,2483,2557,2632,2697,2763,2830,2898,3002,3108,3394,3475,3534,3593,3652,3711,3770,3833,3897,3955,4014,4085,4157,4229,4302,4359,4417,4490,4564,4638,4713,4785,4858,4928,4999,5125,5195,5265,5342,5421,5497,5574,5638,5703,5772,5849,5924,5993,6061,6138,6204,6301,6366,6435,6534,6593,6651,6708,6767,6839,6907,6975,7034,7097,7187,7278,7338,7404,7471,7537,7607,7671,7724,7837,7895,7960,8024,8073,8134,8195,8256,8318,8382,8446,8510,8575,8638,8698,8759,8818,8878,8940,9011,9071,9139,9206,9274,9342,9410,9496,9583,9645,9706,9763,10097,10154,10202,10251,10302,10336,10383,10432,10478,10510,10574,10636,10691,10751,10821,11247,11325,11418,11488,11566,11620,11690,11775,11827,11900,11974,12043,12118,12192,12266,12355,12425,18850,19826,19916,20004,20100,20601,20690,20937,21218,21503,21896,22373,22595,22817,23085,23312,23542,23772,24002,24232,24459,24698,24924,25169,25299,25429,25659,25907,26126,26409,26617,26748,26975,27221,27446,27695,27916,28161,28456,28678,28916,29130,29360,29583,29798,30006,30130,30254,30359,30476,30690,30836,30976,31062,31410,31498,31728,32130,32363,32445,32543,33135,33235,33471,33879,34118,34212,34270,34507,36525,36767,38917,47631,48898,57722,59003,59539,59869,60992,61248,61484,62031,62525,63198,63413,63941,64505,64880,64998,65536,65693,65837,66157,66327,66468,66597,66896,67199,67758,68020,68370,68723,68817,69123,69385,69510,69637,69876,70087,70206,70399,70854,71035,71157,71416,71529,71716,71818,72262,72386,72671,73558,73852,74182,75102,75274,75610,76276,76561,80132,83100,83688,84282,84395,84624,84962,85122,85274,85445,85612,85855,86025,86198,86369,86643,86842,87089,87173,87269,87365,87463,87563,87665,87767,87869,87971,88073,88173,88269,88381,88510,88633,88787,88941,89039,89153,89247,89387,89521,89617,89729,89829,89945,90041,90153,90293,90441,90605,90747,90905,91055,91196,91340,91475,91611,91753,91895,92007,92147,92215,92288,92362,92435,92509,92655,92799,92937,94349,94439,94519,94611,94709,94819,94897,95003,95095,95199,95309,95431,95594,95751,96228,96328,96418,96528,96620,96955,97067,97181,97297,97413,97507,97621,97739,97841,97961,98083,98165,98269,98389,98515,98609,98697,98809,98925,99047,99159,99334,99450,99536,99648,99772,99839,99965,100033,100161,100305,100433,100502,100597,100712,100825,100924,101033,101144,101255,101356,101461,101573,101703,101794,101917,102029,102115,102219,102327,102427,102545,102649,102753,102879,102967,103057,103167,103251,103305,103427,103533,103643,103727,103853"
                     }
                 },
                 {
@@ -1513,10 +1510,10 @@
                     "to": {
                         "startLines": "1487,1488,1499",
                         "startColumns": "4,4,4",
-                        "startOffsets": "95801,95871,96670",
+                        "startOffsets": "95756,95826,96625",
                         "endLines": "1487,1493,1502",
                         "endColumns": "69,12,12",
-                        "endOffsets": "95866,96193,96900"
+                        "endOffsets": "95821,96148,96855"
                     }
                 },
                 {
@@ -1537,17 +1534,20 @@
                 {
                     "source": "D:\\Android\\MiNote\\src\\Notes-master1\\app\\src\\main\\res\\values\\styles.xml",
                     "from": {
-                        "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+                        "startLines": "-1,-1,68,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,-1,2648,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endLines": "-1,-1,71,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "-1,-1,12,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endOffsets": "-1,-1,2861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
                     },
                     "to": {
                         "startLines": "1214,1218,1222,1226,1437,1441,1445,1449,1453,1457,1461,1593,1596",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "76569,76777,76988,77195,92987,93170,93355,93540,93743,93949,94132,103903,104086",
+                        "startOffsets": "76566,76774,76985,77150,92942,93125,93310,93495,93698,93904,94087,103858,104041",
                         "endLines": "1217,1221,1225,1228,1440,1444,1448,1452,1456,1460,1464,1595,1599",
                         "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "76772,76983,77190,77350,93165,93350,93535,93738,93944,94127,94328,104081,104318"
+                        "endOffsets": "76769,76980,77145,77305,93120,93305,93490,93693,93899,94082,94283,104036,104273"
                     }
                 },
                 {

src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json

@@ -21,20 +21,17 @@
                 {
                     "source": "D:\\Android\\MiNote\\src\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml",
                     "from": {
-                        "startLines": "128,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startColumns": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "8133,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endLines": "132,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "8540,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+                        "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
                     },
                     "to": {
                         "startLines": "169,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,286,287,288,289,290,291,292,293,294,295,296,297",
                         "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",
-                        "startOffsets": "10826,12430,12526,12609,12705,12774,12817,12869,12921,12970,13033,13091,13142,13226,13280,13337,13431,13539,13610,13694,13777,13843,13926,14028,14089,14151,14202,14280,14333,14393,14498,14557,14659,14714,14785,14834,14892,14939,14998,15055,15126,15187,15244,15294,15346,15399,15449,15499,15559,15612,15678,15740,15803,15850,15905,15993,16051,16113,16163,16208,16251,16311,16378,16433,16480,16535,16588,16635,16688,16744,16792,16847,16900,16984,17051,17115,17211,17285,17366,17455,17618,17762,17841,17916,17998,18057,18137,18217,18272,18394,18497,18538,18591,18648,18722,18858,18926,19012,19092,19161,19255,19314,19369,19431,19491,19556,19666",
+                        "startOffsets": "10826,12430,12526,12609,12705,12774,12814,12866,12918,12967,13030,13088,13139,13223,13277,13334,13428,13536,13607,13691,13774,13840,13923,14025,14086,14148,14199,14277,14330,14390,14495,14554,14656,14711,14782,14831,14889,14936,14995,15052,15123,15184,15241,15291,15343,15396,15446,15496,15556,15609,15675,15737,15800,15847,15902,15990,16048,16110,16160,16205,16248,16308,16375,16430,16477,16532,16585,16632,16685,16741,16789,16844,16897,16981,17048,17112,17208,17282,17363,17452,17615,17759,17838,17913,17995,18054,18134,18214,18269,18391,18494,18535,18588,18645,18719,18855,18923,19009,19089,19158,19252,19311,19366,19428,19488,19553,19663",
                         "endLines": "173,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,286,287,288,289,290,291,292,293,294,295,296,297",
-                        "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,53,56,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,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,40,52,56,73,64,67,85,79,68,93,58,54,61,59,64,109,89",
-                        "endOffsets": "11173,12521,12604,12700,12769,12812,12864,12916,12965,13028,13086,13137,13221,13275,13332,13426,13534,13605,13689,13772,13838,13921,14023,14084,14146,14197,14275,14328,14388,14493,14552,14654,14709,14780,14829,14887,14934,14993,15050,15121,15182,15239,15289,15341,15394,15444,15494,15554,15607,15673,15735,15798,15845,15900,15988,16046,16108,16158,16203,16246,16306,16373,16428,16475,16530,16583,16630,16683,16739,16787,16842,16895,16979,17046,17110,17206,17280,17361,17450,17613,17757,17836,17911,17993,18052,18132,18212,18267,18389,18492,18533,18586,18643,18717,18782,18921,19007,19087,19156,19250,19309,19364,19426,19486,19551,19661,19751"
+                        "endColumns": "14,95,82,95,68,39,51,51,48,62,57,50,83,53,56,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,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,40,52,56,73,64,67,85,79,68,93,58,54,61,59,64,109,89",
+                        "endOffsets": "11173,12521,12604,12700,12769,12809,12861,12913,12962,13025,13083,13134,13218,13272,13329,13423,13531,13602,13686,13769,13835,13918,14020,14081,14143,14194,14272,14325,14385,14490,14549,14651,14706,14777,14826,14884,14931,14990,15047,15118,15179,15236,15286,15338,15391,15441,15491,15551,15604,15670,15732,15795,15842,15897,15985,16043,16105,16155,16200,16243,16303,16370,16425,16472,16527,16580,16627,16680,16736,16784,16839,16892,16976,17043,17107,17203,17277,17358,17447,17610,17754,17833,17908,17990,18049,18129,18209,18264,18386,18489,18530,18583,18640,18714,18779,18918,19004,19084,19153,19247,19306,19361,19423,19483,19548,19658,19748"
                     }
                 },
                 {
@@ -47,10 +44,10 @@
                     "to": {
                         "startLines": "12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,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,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,137,138,139,140,141,142,143,144,145,146,147,148,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,285,298,299,300,301,302,309,310,314,318,323,329,336,340,344,349,353,357,361,365,369,373,377,381,385,387,389,393,397,401,406,410,413,417,421,425,429,433,437,442,445,448,451,454,457,460,463,465,467,468,469,472,474,476,478,483,484,488,494,498,499,501,512,513,517,523,527,528,529,533,560,564,592,737,759,904,926,933,938,959,964,969,979,988,999,1003,1010,1018,1025,1026,1035,1038,1041,1046,1050,1053,1056,1060,1064,1072,1077,1084,1090,1091,1095,1100,1102,1104,1107,1110,1112,1116,1123,1126,1129,1133,1135,1139,1141,1147,1149,1153,1165,1171,1176,1191,1194,1199,1209,1229,1267,1306,1316,1325,1327,1331,1335,1338,1341,1344,1347,1351,1354,1357,1360,1364,1367,1370,1371,1372,1373,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,1385,1387,1389,1390,1391,1392,1394,1396,1397,1398,1399,1400,1401,1402,1404,1406,1408,1410,1412,1414,1415,1417,1418,1420,1422,1424,1425,1426,1427,1428,1429,1430,1431,1433,1435,1465,1466,1467,1468,1469,1470,1472,1473,1474,1475,1476,1477,1479,1483,1494,1495,1496,1497,1498,1503,1505,1507,1509,1511,1513,1514,1515,1516,1518,1520,1522,1523,1524,1525,1526,1527,1528,1529,1530,1531,1532,1535,1536,1537,1539,1541,1542,1544,1545,1547,1549,1551,1552,1553,1554,1555,1556,1557,1558,1559,1560,1561,1563,1565,1566,1567,1569,1570,1571,1573,1575,1577,1579,1581,1583,1584,1585,1586,1587,1588,1589,1590,1591,1592",
                         "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,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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": "420,475,520,569,610,665,728,804,866,939,1007,1085,1166,1227,1302,1378,1455,1533,1603,1674,1735,1847,1924,2002,2108,2214,2293,2373,2430,2488,2562,2637,2702,2768,2835,2903,3007,3319,3399,3480,3539,3598,3657,3716,3775,3838,3902,3960,4019,4090,4162,4234,4307,4364,4422,4495,4569,4643,4718,4790,4863,4933,5061,5130,5200,5270,5347,5426,5502,5579,5643,5708,5777,5854,5929,5998,6066,6143,6209,6306,6371,6440,6539,6598,6656,6713,6772,6844,6912,6980,7039,7102,7192,7283,7343,7409,7476,7542,7612,7676,7729,7842,7900,7965,8029,8078,8139,8200,8261,8323,8387,8451,8515,8580,8643,8703,8764,8823,8883,8945,9016,9076,9144,9211,9279,9347,9415,9501,9588,9650,9711,10030,10102,10159,10207,10256,10307,10341,10388,10437,10483,10515,10579,10641,10696,10756,11178,11252,11330,11423,11493,11571,11625,11695,11780,11832,11905,11979,12048,12123,12197,12271,12360,18787,19756,19834,19924,20012,20108,20609,20698,20945,21226,21511,21904,22381,22603,22825,23093,23320,23550,23780,24010,24240,24467,24706,24932,25177,25307,25437,25667,25915,26134,26417,26625,26756,26983,27229,27454,27703,27924,28169,28464,28686,28924,29138,29368,29591,29806,30014,30138,30262,30367,30484,30698,30844,30984,31070,31418,31506,31736,32138,32371,32453,32551,33143,33243,33479,33887,34126,34220,34278,34515,36533,36775,38925,47639,48906,57730,59011,59547,59877,61000,61256,61492,62039,62533,63206,63421,63949,64513,64888,65006,65544,65701,65845,66165,66335,66476,66605,66904,67207,67766,68028,68378,68731,68825,69131,69393,69518,69645,69884,70095,70214,70407,70862,71043,71165,71424,71537,71724,71826,72270,72394,72679,73566,73860,74190,75110,75282,75618,76284,77355,80182,83150,83738,84332,84445,84674,85012,85172,85324,85495,85662,85905,86075,86248,86419,86693,86892,87139,87223,87319,87415,87513,87613,87715,87817,87919,88021,88123,88223,88319,88431,88560,88683,88837,88991,89089,89203,89297,89437,89571,89667,89779,89879,89995,90091,90203,90343,90491,90655,90797,90955,91105,91246,91390,91525,91661,91803,91945,92057,92197,92265,92338,92412,92485,92559,92705,92849,94333,94399,94489,94569,94661,94759,94869,94947,95053,95145,95249,95359,95481,95644,96198,96278,96378,96468,96578,96905,97005,97117,97231,97347,97463,97557,97671,97789,97891,98011,98133,98215,98319,98439,98565,98659,98747,98859,98975,99097,99209,99384,99500,99586,99698,99822,99889,100015,100083,100211,100355,100483,100552,100647,100762,100875,100974,101083,101194,101305,101406,101511,101623,101753,101844,101967,102079,102165,102269,102377,102477,102595,102699,102803,102929,103017,103107,103217,103301,103355,103477,103583,103693,103777",
+                        "startOffsets": "420,475,520,569,610,665,728,804,866,939,1007,1085,1166,1227,1302,1378,1455,1533,1603,1674,1735,1847,1924,2002,2108,2214,2293,2373,2430,2488,2562,2637,2702,2768,2835,2903,3007,3319,3399,3480,3539,3598,3657,3716,3775,3838,3902,3960,4019,4090,4162,4234,4307,4364,4422,4495,4569,4643,4718,4790,4863,4933,5061,5130,5200,5270,5347,5426,5502,5579,5643,5708,5777,5854,5929,5998,6066,6143,6209,6306,6371,6440,6539,6598,6656,6713,6772,6844,6912,6980,7039,7102,7192,7283,7343,7409,7476,7542,7612,7676,7729,7842,7900,7965,8029,8078,8139,8200,8261,8323,8387,8451,8515,8580,8643,8703,8764,8823,8883,8945,9016,9076,9144,9211,9279,9347,9415,9501,9588,9650,9711,10030,10102,10159,10207,10256,10307,10341,10388,10437,10483,10515,10579,10641,10696,10756,11178,11252,11330,11423,11493,11571,11625,11695,11780,11832,11905,11979,12048,12123,12197,12271,12360,18784,19753,19831,19921,20009,20105,20606,20695,20942,21223,21508,21901,22378,22600,22822,23090,23317,23547,23777,24007,24237,24464,24703,24929,25174,25304,25434,25664,25912,26131,26414,26622,26753,26980,27226,27451,27700,27921,28166,28461,28683,28921,29135,29365,29588,29803,30011,30135,30259,30364,30481,30695,30841,30981,31067,31415,31503,31733,32135,32368,32450,32548,33140,33240,33476,33884,34123,34217,34275,34512,36530,36772,38922,47636,48903,57727,59008,59544,59874,60997,61253,61489,62036,62530,63203,63418,63946,64510,64885,65003,65541,65698,65842,66162,66332,66473,66602,66901,67204,67763,68025,68375,68728,68822,69128,69390,69515,69642,69881,70092,70211,70404,70859,71040,71162,71421,71534,71721,71823,72267,72391,72676,73563,73857,74187,75107,75279,75615,76281,77310,80137,83105,83693,84287,84400,84629,84967,85127,85279,85450,85617,85860,86030,86203,86374,86648,86847,87094,87178,87274,87370,87468,87568,87670,87772,87874,87976,88078,88178,88274,88386,88515,88638,88792,88946,89044,89158,89252,89392,89526,89622,89734,89834,89950,90046,90158,90298,90446,90610,90752,90910,91060,91201,91345,91480,91616,91758,91900,92012,92152,92220,92293,92367,92440,92514,92660,92804,94288,94354,94444,94524,94616,94714,94824,94902,95008,95100,95204,95314,95436,95599,96153,96233,96333,96423,96533,96860,96960,97072,97186,97302,97418,97512,97626,97744,97846,97966,98088,98170,98274,98394,98520,98614,98702,98814,98930,99052,99164,99339,99455,99541,99653,99777,99844,99970,100038,100166,100310,100438,100507,100602,100717,100830,100929,101038,101149,101260,101361,101466,101578,101708,101799,101922,102034,102120,102224,102332,102432,102550,102654,102758,102884,102972,103062,103172,103256,103310,103432,103538,103648,103732",
                         "endLines": "12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,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,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,137,138,139,140,141,142,143,144,145,146,147,148,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,285,298,299,300,301,308,309,313,317,322,328,335,339,343,348,352,356,360,364,368,372,376,380,384,386,388,392,396,400,405,409,412,416,420,424,428,432,436,441,444,447,450,453,456,459,462,464,466,467,468,471,473,475,477,482,483,487,493,497,498,500,511,512,516,522,526,527,528,532,559,563,591,736,758,903,925,932,937,958,963,968,978,987,998,1002,1009,1017,1024,1025,1034,1037,1040,1045,1049,1052,1055,1059,1063,1071,1076,1083,1089,1090,1094,1099,1101,1103,1106,1109,1111,1115,1122,1125,1128,1132,1134,1138,1140,1146,1148,1152,1164,1170,1175,1190,1193,1198,1208,1213,1266,1305,1315,1324,1326,1330,1334,1337,1340,1343,1346,1350,1353,1356,1359,1363,1366,1369,1370,1371,1372,1373,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,1386,1388,1389,1390,1391,1393,1395,1396,1397,1398,1399,1400,1401,1403,1405,1407,1409,1411,1413,1414,1416,1417,1419,1421,1423,1424,1425,1426,1427,1428,1429,1430,1432,1434,1436,1465,1466,1467,1468,1469,1471,1472,1473,1474,1475,1476,1478,1482,1486,1494,1495,1496,1497,1498,1504,1506,1508,1510,1512,1513,1514,1515,1517,1519,1521,1522,1523,1524,1525,1526,1527,1528,1529,1530,1531,1534,1535,1536,1538,1540,1541,1543,1544,1546,1548,1550,1551,1552,1553,1554,1555,1556,1557,1558,1559,1560,1562,1564,1565,1566,1568,1569,1570,1572,1574,1576,1578,1580,1582,1583,1584,1585,1586,1587,1588,1589,1590,1591,1592",
                         "endColumns": "54,44,48,40,54,62,75,61,72,67,77,80,60,74,75,76,77,69,70,60,61,76,77,105,105,78,79,56,57,73,74,64,65,66,67,103,105,79,80,58,58,58,58,58,62,63,57,58,70,71,71,72,56,57,72,73,73,74,71,72,69,70,68,69,69,76,78,75,76,63,64,68,76,74,68,67,76,65,96,64,68,98,58,57,56,58,71,67,67,58,62,89,90,59,65,66,65,69,63,52,112,57,64,63,48,60,60,60,61,63,63,63,64,62,59,60,58,59,61,70,59,67,66,67,67,67,85,86,61,60,56,71,56,47,48,50,33,46,48,45,31,63,61,54,59,69,73,77,92,69,77,53,69,84,51,72,73,68,74,73,73,88,69,70,77,89,87,95,12,88,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,104,116,12,12,12,12,12,87,12,12,12,81,12,12,99,12,12,12,93,57,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,117,12,12,12,12,12,12,12,12,12,12,12,12,12,93,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,83,95,95,97,99,101,101,101,101,101,99,95,111,128,122,12,12,97,113,93,12,12,95,111,99,115,95,111,12,12,12,12,12,12,140,12,134,12,12,12,111,139,67,72,73,72,73,12,12,12,65,89,79,91,97,12,77,105,91,103,109,12,12,12,79,99,89,109,91,12,12,12,12,12,93,113,117,12,12,12,81,103,119,125,93,87,111,115,121,111,12,115,85,12,12,66,12,67,12,12,12,68,94,114,112,98,108,110,110,100,104,12,12,90,122,12,85,103,12,12,12,12,12,12,87,89,109,83,53,121,105,109,83,125",
-                        "endOffsets": "470,515,564,605,660,723,799,861,934,1002,1080,1161,1222,1297,1373,1450,1528,1598,1669,1730,1792,1919,1997,2103,2209,2288,2368,2425,2483,2557,2632,2697,2763,2830,2898,3002,3108,3394,3475,3534,3593,3652,3711,3770,3833,3897,3955,4014,4085,4157,4229,4302,4359,4417,4490,4564,4638,4713,4785,4858,4928,4999,5125,5195,5265,5342,5421,5497,5574,5638,5703,5772,5849,5924,5993,6061,6138,6204,6301,6366,6435,6534,6593,6651,6708,6767,6839,6907,6975,7034,7097,7187,7278,7338,7404,7471,7537,7607,7671,7724,7837,7895,7960,8024,8073,8134,8195,8256,8318,8382,8446,8510,8575,8638,8698,8759,8818,8878,8940,9011,9071,9139,9206,9274,9342,9410,9496,9583,9645,9706,9763,10097,10154,10202,10251,10302,10336,10383,10432,10478,10510,10574,10636,10691,10751,10821,11247,11325,11418,11488,11566,11620,11690,11775,11827,11900,11974,12043,12118,12192,12266,12355,12425,18853,19829,19919,20007,20103,20604,20693,20940,21221,21506,21899,22376,22598,22820,23088,23315,23545,23775,24005,24235,24462,24701,24927,25172,25302,25432,25662,25910,26129,26412,26620,26751,26978,27224,27449,27698,27919,28164,28459,28681,28919,29133,29363,29586,29801,30009,30133,30257,30362,30479,30693,30839,30979,31065,31413,31501,31731,32133,32366,32448,32546,33138,33238,33474,33882,34121,34215,34273,34510,36528,36770,38920,47634,48901,57725,59006,59542,59872,60995,61251,61487,62034,62528,63201,63416,63944,64508,64883,65001,65539,65696,65840,66160,66330,66471,66600,66899,67202,67761,68023,68373,68726,68820,69126,69388,69513,69640,69879,70090,70209,70402,70857,71038,71160,71419,71532,71719,71821,72265,72389,72674,73561,73855,74185,75105,75277,75613,76279,76564,80177,83145,83733,84327,84440,84669,85007,85167,85319,85490,85657,85900,86070,86243,86414,86688,86887,87134,87218,87314,87410,87508,87608,87710,87812,87914,88016,88118,88218,88314,88426,88555,88678,88832,88986,89084,89198,89292,89432,89566,89662,89774,89874,89990,90086,90198,90338,90486,90650,90792,90950,91100,91241,91385,91520,91656,91798,91940,92052,92192,92260,92333,92407,92480,92554,92700,92844,92982,94394,94484,94564,94656,94754,94864,94942,95048,95140,95244,95354,95476,95639,95796,96273,96373,96463,96573,96665,97000,97112,97226,97342,97458,97552,97666,97784,97886,98006,98128,98210,98314,98434,98560,98654,98742,98854,98970,99092,99204,99379,99495,99581,99693,99817,99884,100010,100078,100206,100350,100478,100547,100642,100757,100870,100969,101078,101189,101300,101401,101506,101618,101748,101839,101962,102074,102160,102264,102372,102472,102590,102694,102798,102924,103012,103102,103212,103296,103350,103472,103578,103688,103772,103898"
+                        "endOffsets": "470,515,564,605,660,723,799,861,934,1002,1080,1161,1222,1297,1373,1450,1528,1598,1669,1730,1792,1919,1997,2103,2209,2288,2368,2425,2483,2557,2632,2697,2763,2830,2898,3002,3108,3394,3475,3534,3593,3652,3711,3770,3833,3897,3955,4014,4085,4157,4229,4302,4359,4417,4490,4564,4638,4713,4785,4858,4928,4999,5125,5195,5265,5342,5421,5497,5574,5638,5703,5772,5849,5924,5993,6061,6138,6204,6301,6366,6435,6534,6593,6651,6708,6767,6839,6907,6975,7034,7097,7187,7278,7338,7404,7471,7537,7607,7671,7724,7837,7895,7960,8024,8073,8134,8195,8256,8318,8382,8446,8510,8575,8638,8698,8759,8818,8878,8940,9011,9071,9139,9206,9274,9342,9410,9496,9583,9645,9706,9763,10097,10154,10202,10251,10302,10336,10383,10432,10478,10510,10574,10636,10691,10751,10821,11247,11325,11418,11488,11566,11620,11690,11775,11827,11900,11974,12043,12118,12192,12266,12355,12425,18850,19826,19916,20004,20100,20601,20690,20937,21218,21503,21896,22373,22595,22817,23085,23312,23542,23772,24002,24232,24459,24698,24924,25169,25299,25429,25659,25907,26126,26409,26617,26748,26975,27221,27446,27695,27916,28161,28456,28678,28916,29130,29360,29583,29798,30006,30130,30254,30359,30476,30690,30836,30976,31062,31410,31498,31728,32130,32363,32445,32543,33135,33235,33471,33879,34118,34212,34270,34507,36525,36767,38917,47631,48898,57722,59003,59539,59869,60992,61248,61484,62031,62525,63198,63413,63941,64505,64880,64998,65536,65693,65837,66157,66327,66468,66597,66896,67199,67758,68020,68370,68723,68817,69123,69385,69510,69637,69876,70087,70206,70399,70854,71035,71157,71416,71529,71716,71818,72262,72386,72671,73558,73852,74182,75102,75274,75610,76276,76561,80132,83100,83688,84282,84395,84624,84962,85122,85274,85445,85612,85855,86025,86198,86369,86643,86842,87089,87173,87269,87365,87463,87563,87665,87767,87869,87971,88073,88173,88269,88381,88510,88633,88787,88941,89039,89153,89247,89387,89521,89617,89729,89829,89945,90041,90153,90293,90441,90605,90747,90905,91055,91196,91340,91475,91611,91753,91895,92007,92147,92215,92288,92362,92435,92509,92655,92799,92937,94349,94439,94519,94611,94709,94819,94897,95003,95095,95199,95309,95431,95594,95751,96228,96328,96418,96528,96620,96955,97067,97181,97297,97413,97507,97621,97739,97841,97961,98083,98165,98269,98389,98515,98609,98697,98809,98925,99047,99159,99334,99450,99536,99648,99772,99839,99965,100033,100161,100305,100433,100502,100597,100712,100825,100924,101033,101144,101255,101356,101461,101573,101703,101794,101917,102029,102115,102219,102327,102427,102545,102649,102753,102879,102967,103057,103167,103251,103305,103427,103533,103643,103727,103853"
                     }
                 },
                 {
@@ -63,10 +60,10 @@
                     "to": {
                         "startLines": "1487,1488,1499",
                         "startColumns": "4,4,4",
-                        "startOffsets": "95801,95871,96670",
+                        "startOffsets": "95756,95826,96625",
                         "endLines": "1487,1493,1502",
                         "endColumns": "69,12,12",
-                        "endOffsets": "95866,96193,96900"
+                        "endOffsets": "95821,96148,96855"
                     }
                 },
                 {
@@ -87,17 +84,20 @@
                 {
                     "source": "D:\\Android\\MiNote\\src\\Notes-master1\\app\\src\\main\\res\\values\\styles.xml",
                     "from": {
-                        "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+                        "startLines": "-1,-1,68,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,-1,2648,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endLines": "-1,-1,71,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "-1,-1,12,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endOffsets": "-1,-1,2861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
                     },
                     "to": {
                         "startLines": "1214,1218,1222,1226,1437,1441,1445,1449,1453,1457,1461,1593,1596",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "76569,76777,76988,77195,92987,93170,93355,93540,93743,93949,94132,103903,104086",
+                        "startOffsets": "76566,76774,76985,77150,92942,93125,93310,93495,93698,93904,94087,103858,104041",
                         "endLines": "1217,1221,1225,1228,1440,1444,1448,1452,1456,1460,1464,1595,1599",
                         "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "76772,76983,77190,77350,93165,93350,93535,93738,93944,94127,94328,104081,104318"
+                        "endOffsets": "76769,76980,77145,77305,93120,93305,93490,93693,93899,94082,94283,104036,104273"
                     }
                 },
                 {

src/Notes-master1/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml

@@ -27,7 +27,7 @@
             android:name="net.micode.notes.ui.SplashActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:exported="true"
-            android:label="@string/title_activity_splash"
+            android:label="@string/app_name"
             android:theme="@style/Theme.Notesmaster1.Fullscreen" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

src/Notes-master1/app/build/intermediates/packaged_res/debug/values/values.xml

@@ -30,7 +30,7 @@
     <string name="alert_message_delete_note">Confirm to delete this note?</string>
     <string name="alert_message_delete_notes">Confirm to delete the selected %d notes?</string>
     <string name="alert_title_delete">Delete selected notes</string>
-    <string name="app_name">Notes</string>
+    <string name="app_name">原神</string>
     <string name="app_widget2x2">Notes 2x2</string>
     <string name="app_widget4x4">Notes 4x4</string>
     <string name="button_delete">Delete</string>
@@ -141,8 +141,8 @@
         <item name="android:textColor">@color/secondary_text_dark</item>
     </style>
     <style name="NoteActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid">
-        <item name="android:displayOptions"/>
-        <item name="android:visibility">gone</item>
+
+        <item name="android:visibility">visible</item>
     </style>
     <style name="NoteTheme" parent="@android:style/Theme.Holo.Light">
         <item name="android:actionBarStyle">@style/NoteActionBarStyle</item>

src/Notes-master1/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt

@@ -1,156 +1,154 @@
+net.micode.notes:style/RtlOverlay.Widget.AppCompat.Search.DropDown.Icon2 = 0x7f0f009d
 net.micode.notes:style/Widget.AppCompat.Toolbar.Button.Navigation = 0x7f0f0131
+net.micode.notes:style/Widget.AppCompat.Light.ActionButton.Overflow = 0x7f0f0114
 net.micode.notes:style/Widget.AppCompat.Button.Small = 0x7f0f0100
 net.micode.notes:drawable/list_green_single = 0x7f07005b
-net.micode.notes:style/Base.Widget.AppCompat.ActionButton.CloseMode = 0x7f0f005b
-net.micode.notes:style/RtlOverlay.Widget.AppCompat.ActionBar.TitleItem = 0x7f0f0095
 net.micode.notes:styleable/TextAppearance = 0x7f100015
 net.micode.notes:style/Base.TextAppearance.AppCompat.SearchResult.Subtitle = 0x7f0f001d
-net.micode.notes:style/Widget.AppCompat.Light.ActionButton.Overflow = 0x7f0f0114
-net.micode.notes:style/TextAppearance.AppCompat.Widget.DropDownItem = 0x7f0f00c7
 net.micode.notes:style/Widget.AppCompat.PopupWindow = 0x7f0f0125
-net.micode.notes:style/Widget.AppCompat.ListView.DropDown = 0x7f0f0121
 net.micode.notes:styleable/ActionBar = 0x7f100000
+net.micode.notes:style/Widget.AppCompat.ListView.DropDown = 0x7f0f0121
 net.micode.notes:string/menu_house = 0x7f0e007d
-net.micode.notes:style/Widget.AppCompat.Toolbar = 0x7f0f0130
+net.micode.notes:style/Widget.AppCompat.PopupMenu = 0x7f0f0123
+net.micode.notes:style/Base.Widget.AppCompat.ActionButton.CloseMode = 0x7f0f005b
 net.micode.notes:style/TextAppearanceLarge = 0x7f0f00d4
 net.micode.notes:id/menu_house = 0x7f0800a4
-net.micode.notes:style/Widget.AppCompat.ActionButton.Overflow = 0x7f0f00f8
-net.micode.notes:id/line1 = 0x7f08004a
-net.micode.notes:style/TextAppearance.AppCompat.Light.SearchResult.Title = 0x7f0f00b0
+net.micode.notes:style/Widget.AppCompat.Toolbar = 0x7f0f0130
+net.micode.notes:style/Widget.AppCompat.ActivityChooserView = 0x7f0f00fa
 net.micode.notes:style/TextAppearance.AppCompat.Widget.PopupMenu.Large = 0x7f0f00c8
-net.micode.notes:string/call_record_folder_name = 0x7f0e0019
-net.micode.notes:style/Base.Widget.AppCompat.ActionButton = 0x7f0f005a
-net.micode.notes:style/TextAppearance.AppCompat.SearchResult.Title = 0x7f0f00b7
 net.micode.notes:style/Base.AlertDialog.AppCompat = 0x7f0f0004
-net.micode.notes:menu/note_edit = 0x7f0b0002
-net.micode.notes:style/TextAppearance.AppCompat.Light.Widget.PopupMenu.Small = 0x7f0f00b2
-net.micode.notes:style/Widget.AppCompat.Light.ActionMode.Inverse = 0x7f0f0115
-net.micode.notes:style/Widget.AppCompat.EditText = 0x7f0f0108
-net.micode.notes:id/ll_font_super = 0x7f080051
-net.micode.notes:style/Base.V7.Theme.AppCompat.Light = 0x7f0f0051
-net.micode.notes:string/success_sync_account = 0x7f0e0071
-net.micode.notes:style/RtlOverlay.Widget.AppCompat.Search.DropDown.Query = 0x7f0f009e
-net.micode.notes:drawable/abc_btn_borderless_material = 0x7f070001
-net.micode.notes:styleable/LinearLayoutCompat = 0x7f10000a
-net.micode.notes:id/custom = 0x7f080020
-net.micode.notes:id/menu_notes = 0x7f0800a6
-net.micode.notes:style/Base.TextAppearance.AppCompat = 0x7f0f000a
-net.micode.notes:string/success_sdcard_export = 0x7f0e0070
-net.micode.notes:string/preferences_menu_remove_account = 0x7f0e0066
-net.micode.notes:style/Widget.AppCompat.Light.ActionBar.TabBar.Inverse = 0x7f0f010d
-net.micode.notes:style/Theme.AppCompat.Light.DialogWhenLarge = 0x7f0f00e6
+net.micode.notes:style/TextAppearance.AppCompat.Light.SearchResult.Title = 0x7f0f00b0
+net.micode.notes:id/line1 = 0x7f08004a
 net.micode.notes:style/Widget.AppCompat.Light.SearchView = 0x7f0f011d
+net.micode.notes:style/Widget.AppCompat.Light.ActionMode.Inverse = 0x7f0f0115
+net.micode.notes:style/TextAppearance.AppCompat.SearchResult.Title = 0x7f0f00b7
+net.micode.notes:style/TextAppearance.AppCompat.Light.Widget.PopupMenu.Small = 0x7f0f00b2
+net.micode.notes:menu/note_edit = 0x7f0b0002
+net.micode.notes:style/RtlOverlay.Widget.AppCompat.ActionBar.TitleItem = 0x7f0f0095
 net.micode.notes:style/Base.Widget.AppCompat.Button.Borderless = 0x7f0f0061
-net.micode.notes:style/Widget.AppCompat.ActionButton = 0x7f0f00f6
+net.micode.notes:layout/settings_header = 0x7f0a0030
 net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0e0061
 net.micode.notes:id/text_num = 0x7f080091
-net.micode.notes:style/TextAppearance.StatusBar.EventContent.Line2 = 0x7f0f00ce
-net.micode.notes:style/Widget.AppCompat.ActivityChooserView = 0x7f0f00fa
-net.micode.notes:style/Widget.AppCompat.PopupMenu = 0x7f0f0123
-net.micode.notes:string/status_bar_notification_info_overflow = 0x7f0e006f
+net.micode.notes:style/Widget.AppCompat.ActionButton = 0x7f0f00f6
+net.micode.notes:style/Widget.AppCompat.EditText = 0x7f0f0108
+net.micode.notes:style/TextAppearance.AppCompat.Widget.DropDownItem = 0x7f0f00c7
+net.micode.notes:drawable/abc_btn_borderless_material = 0x7f070001
+net.micode.notes:style/RtlOverlay.Widget.AppCompat.Search.DropDown.Query = 0x7f0f009e
 net.micode.notes:drawable/abc_ic_menu_share_mtrl_alpha = 0x7f07001c
-net.micode.notes:styleable/ListPopupWindow = 0x7f10000c
-net.micode.notes:style/Base.Widget.AppCompat.ListView.DropDown = 0x7f0f0078
-net.micode.notes:styleable/PopupWindowBackgroundState = 0x7f100011
-net.micode.notes:id/dialog = 0x7f080026
-net.micode.notes:id/time = 0x7f080092
-net.micode.notes:style/Base.Widget.AppCompat.ProgressBar = 0x7f0f007d
-net.micode.notes:style/ThemeOverlay.AppCompat.ActionBar = 0x7f0f00ec
+net.micode.notes:string/status_bar_notification_info_overflow = 0x7f0e006f
+net.micode.notes:id/ll_font_super = 0x7f080051
+net.micode.notes:style/Base.V7.Theme.AppCompat.Light = 0x7f0f0051
+net.micode.notes:string/success_sync_account = 0x7f0e0071
 net.micode.notes:style/ThemeOverlay.AppCompat.Light = 0x7f0f00ef
 net.micode.notes:id/screen = 0x7f080074
 net.micode.notes:style/Platform.ThemeOverlay.AppCompat.Dark = 0x7f0f008e
+net.micode.notes:style/Base.Widget.AppCompat.ProgressBar = 0x7f0f007d
+net.micode.notes:style/ThemeOverlay.AppCompat.ActionBar = 0x7f0f00ec
+net.micode.notes:string/preferences_menu_remove_account = 0x7f0e0066
+net.micode.notes:style/ThemeOverlay.Notesmaster1.FullscreenContainer = 0x7f0f00f0
+net.micode.notes:drawable/edit_title_blue = 0x7f070044
 net.micode.notes:string/dummy_content = 0x7f0e001e
 net.micode.notes:style/TextAppearance.AppCompat.Display1 = 0x7f0f00a7
-net.micode.notes:drawable/edit_title_blue = 0x7f070044
 net.micode.notes:id/wrap_content = 0x7f0800a2
 net.micode.notes:style/Platform.V11.AppCompat.Light = 0x7f0f0091
 net.micode.notes:style/Widget.AppCompat.Light.ListView.DropDown = 0x7f0f011a
 net.micode.notes:styleable/ActionMode = 0x7f100004
-net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.ActionBar.Title.Inverse = 0x7f0f0029
+net.micode.notes:styleable/ListPopupWindow = 0x7f10000c
+net.micode.notes:style/Base.Widget.AppCompat.ListView.DropDown = 0x7f0f0078
+net.micode.notes:id/custom = 0x7f080020
+net.micode.notes:styleable/LinearLayoutCompat = 0x7f10000a
+net.micode.notes:id/menu_notes = 0x7f0800a6
+net.micode.notes:string/success_sdcard_export = 0x7f0e0070
+net.micode.notes:style/Theme.AppCompat.Light.DialogWhenLarge = 0x7f0f00e6
 net.micode.notes:drawable/edit_red = 0x7f070043
 net.micode.notes:style/TextAppearance.AppCompat.Medium.Inverse = 0x7f0f00b4
 net.micode.notes:dimen/abc_action_button_min_width_material = 0x7f06000d
+net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.ActionBar.Title.Inverse = 0x7f0f0029
 net.micode.notes:id/collapseActionView = 0x7f08001e
 net.micode.notes:drawable/bg_btn_set_color = 0x7f07003b
 net.micode.notes:id/menu_new_folder = 0x7f080059
 net.micode.notes:style/TextAppearance.AppCompat.Small = 0x7f0f00b8
 net.micode.notes:string/preferences_add_account = 0x7f0e005a
 net.micode.notes:style/TextAppearance.AppCompat.Menu = 0x7f0f00b5
-net.micode.notes:layout/settings_header = 0x7f0a0030
 net.micode.notes:style/TextAppearance.AppCompat.Widget.ActionMode.Subtitle = 0x7f0f00c3
 net.micode.notes:style/RtlOverlay.Widget.AppCompat.SearchView.MagIcon = 0x7f0f00a0
 net.micode.notes:string/menu_send_to_desktop = 0x7f0e0048
 net.micode.notes:style/TextAppearance.AppCompat.Title.Inverse = 0x7f0f00bd
 net.micode.notes:style/TextAppearance.AppCompat.Button = 0x7f0f00a5
-net.micode.notes:style/TextAppearance.AppCompat.Caption = 0x7f0f00a6
+net.micode.notes:style/RtlOverlay.Widget.AppCompat.Search.DropDown.Icon1 = 0x7f0f009c
 net.micode.notes:style/TextAppearance.AppCompat.Widget.ActionBar.Title.Inverse = 0x7f0f00c2
-net.micode.notes:style/ThemeOverlay.Notesmaster1.FullscreenContainer = 0x7f0f00f0
-net.micode.notes:style/Widget.AppCompat.Light.ActionBar = 0x7f0f0109
-net.micode.notes:string/menu_select_none = 0x7f0e0046
+net.micode.notes:style/TextAppearance.AppCompat.Caption = 0x7f0f00a6
+net.micode.notes:style/Base.Widget.AppCompat.ActionButton = 0x7f0f005a
+net.micode.notes:style/TextAppearance.StatusBar.EventContent.Line2 = 0x7f0f00ce
 net.micode.notes:style/Widget.AppCompat.ListView = 0x7f0f0120
+net.micode.notes:string/menu_select_none = 0x7f0e0046
+net.micode.notes:style/Widget.AppCompat.Light.ActionBar = 0x7f0f0109
+net.micode.notes:menu/call_note_edit = 0x7f0b0000
+net.micode.notes:string/menu_share = 0x7f0e004a
 net.micode.notes:style/Base.Theme.AppCompat.Light.DialogWhenLarge = 0x7f0f0041
 net.micode.notes:style/Widget.AppCompat.Light.ActionBar.Solid = 0x7f0f010a
-net.micode.notes:style/Base.TextAppearance.AppCompat.Light.Widget.PopupMenu.Small = 0x7f0f0018
-net.micode.notes:layout/abc_alert_dialog_material = 0x7f0a0009
 net.micode.notes:string/menu_font_size = 0x7f0e003c
-net.micode.notes:style/Widget.AppCompat.CompoundButton.CheckBox = 0x7f0f0103
-net.micode.notes:drawable/abc_ic_voice_search_api_mtrl_alpha = 0x7f07001e
-net.micode.notes:attr/maxButtonHeight = 0x7f030077
-net.micode.notes:style/RtlOverlay.Widget.AppCompat.Search.DropDown.Icon2 = 0x7f0f009d
-net.micode.notes:string/preferences_account_title = 0x7f0e0059
+net.micode.notes:layout/abc_alert_dialog_material = 0x7f0a0009
+net.micode.notes:style/Base.TextAppearance.AppCompat.Light.Widget.PopupMenu.Small = 0x7f0f0018
 net.micode.notes:style/Base.Widget.AppCompat.CompoundButton.CheckBox = 0x7f0f0067
-net.micode.notes:string/menu_share = 0x7f0e004a
-net.micode.notes:menu/call_note_edit = 0x7f0b0000
-net.micode.notes:style/RtlOverlay.Widget.AppCompat.Search.DropDown.Icon1 = 0x7f0f009c
-net.micode.notes:attr/spinnerStyle = 0x7f03009c
-net.micode.notes:id/action_mode_close_button = 0x7f080010
+net.micode.notes:string/preferences_account_title = 0x7f0e0059
 net.micode.notes:string/search_label = 0x7f0e006c
 net.micode.notes:menu/note_list_dropdown = 0x7f0b0004
-net.micode.notes:style/Theme.AppCompat.Light.Dialog.MinWidth = 0x7f0f00e5
-net.micode.notes:style/Widget.AppCompat.ProgressBar = 0x7f0f0126
+net.micode.notes:style/Widget.AppCompat.Light.ActionBar.TabBar.Inverse = 0x7f0f010d
+net.micode.notes:id/action_mode_close_button = 0x7f080010
+net.micode.notes:attr/spinnerStyle = 0x7f03009c
 net.micode.notes:style/Base.Widget.AppCompat.ButtonBar.AlertDialog = 0x7f0f0066
 net.micode.notes:style/TextAppearance.AppCompat.Display4 = 0x7f0f00aa
+net.micode.notes:style/Base.V7.Theme.AppCompat.Light.Dialog = 0x7f0f0052
+net.micode.notes:styleable/LinearLayoutCompat_Layout = 0x7f10000b
 net.micode.notes:style/RtlOverlay.Widget.AppCompat.PopupMenuItem = 0x7f0f0098
 net.micode.notes:drawable/edit_blue = 0x7f070041
 net.micode.notes:style/Base.Widget.AppCompat.SearchView = 0x7f0f0080
 net.micode.notes:style/Base.Theme.AppCompat.Light.Dialog.FixedSize = 0x7f0f003f
 net.micode.notes:style/Base.Widget.AppCompat.ButtonBar = 0x7f0f0065
+net.micode.notes:style/RtlOverlay.DialogWindowTitle.AppCompat = 0x7f0f0094
 net.micode.notes:style/Platform.V11.AppCompat = 0x7f0f0090
 net.micode.notes:style/TextAppearance.StatusBar.EventContent.Info = 0x7f0f00cd
 net.micode.notes:menu/note_list = 0x7f0b0003
 net.micode.notes:style/TextAppearance.AppCompat.Widget.ActionMode.Subtitle.Inverse = 0x7f0f00c4
+net.micode.notes:id/beginning = 0x7f080016
+net.micode.notes:string/menu_create_folder = 0x7f0e0033
+net.micode.notes:string/format_exported_file_location = 0x7f0e002d
+net.micode.notes:style/TextAppearance.AppCompat.Small.Inverse = 0x7f0f00b9
 net.micode.notes:style/Base.Widget.AppCompat.TextView.SpinnerItem = 0x7f0f0085
 net.micode.notes:id/iv_bg_red = 0x7f080040
-net.micode.notes:style/Widget.AppCompat.ActionMode = 0x7f0f00f9
 net.micode.notes:drawable/abc_btn_radio_to_on_mtrl_015 = 0x7f070008
-net.micode.notes:string/format_exported_file_location = 0x7f0e002d
-net.micode.notes:style/TextAppearance.AppCompat.Small.Inverse = 0x7f0f00b9
-net.micode.notes:id/beginning = 0x7f080016
-net.micode.notes:string/menu_create_folder = 0x7f0e0033
-net.micode.notes:style/Widget.AppCompat.Light.ActionBar.TabView.Inverse = 0x7f0f0111
+net.micode.notes:style/Widget.AppCompat.ActionMode = 0x7f0f00f9
+net.micode.notes:string/call_record_folder_name = 0x7f0e0019
+net.micode.notes:id/time = 0x7f080092
+net.micode.notes:styleable/PopupWindowBackgroundState = 0x7f100011
+net.micode.notes:id/dialog = 0x7f080026
+net.micode.notes:style/Widget.AppCompat.ProgressBar = 0x7f0f0126
+net.micode.notes:style/Theme.AppCompat.Light.Dialog.MinWidth = 0x7f0f00e5
 net.micode.notes:id/homeAsUp = 0x7f080035
 net.micode.notes:attr/colorControlHighlight = 0x7f030040
+net.micode.notes:style/Widget.AppCompat.Light.ActionBar.TabView.Inverse = 0x7f0f0111
 net.micode.notes:style/Base.Widget.AppCompat.SearchView.ActionBar = 0x7f0f0081
 net.micode.notes:style/Base.TextAppearance.Widget.AppCompat.Toolbar.Title = 0x7f0f0033
-net.micode.notes:style/Base.ThemeOverlay.AppCompat.Light = 0x7f0f0046
-net.micode.notes:style/Base.TextAppearance.AppCompat.Large = 0x7f0f0015
-net.micode.notes:style/Widget.AppCompat.Spinner.Underlined = 0x7f0f012e
-net.micode.notes:xml/widget_4x_info = 0x7f110003
 net.micode.notes:style/Base.Widget.AppCompat.ProgressBar.Horizontal = 0x7f0f007e
+net.micode.notes:xml/widget_4x_info = 0x7f110003
 net.micode.notes:style/Base.Widget.AppCompat.PopupWindow = 0x7f0f007c
 net.micode.notes:style/Base.TextAppearance.AppCompat.Display4 = 0x7f0f0012
 net.micode.notes:attr/listPopupWindowStyle = 0x7f030070
 net.micode.notes:id/search_voice_btn = 0x7f08007f
+net.micode.notes:style/Base.ThemeOverlay.AppCompat.Light = 0x7f0f0046
+net.micode.notes:style/Base.TextAppearance.AppCompat.Large = 0x7f0f0015
+net.micode.notes:style/Widget.AppCompat.Spinner.Underlined = 0x7f0f012e
 net.micode.notes:layout/notification_template_part_time = 0x7f0a002c
 net.micode.notes:style/Base.Widget.AppCompat.Button.Small = 0x7f0f0064
 net.micode.notes:style/Base.Widget.AppCompat.Toolbar = 0x7f0f0086
 net.micode.notes:string/error_sdcard_export = 0x7f0e0022
 net.micode.notes:style/Widget.AppCompat.ListPopupWindow = 0x7f0f011f
-net.micode.notes:style/Widget.AppCompat.ActionBar.TabBar = 0x7f0f00f3
-net.micode.notes:style/Base.Widget.AppCompat.Light.ActionBar.TabView = 0x7f0f0073
-net.micode.notes:style/Base.TextAppearance.AppCompat.SearchResult = 0x7f0f001c
 net.micode.notes:string/abc_shareactionprovider_share_with_application = 0x7f0e000f
 net.micode.notes:style/Widget.Theme.Notesmaster1.ButtonBar.Fullscreen = 0x7f0f0133
+net.micode.notes:style/Base.Widget.AppCompat.Light.ActionBar.TabView = 0x7f0f0073
+net.micode.notes:style/Widget.AppCompat.ActionBar.TabBar = 0x7f0f00f3
+net.micode.notes:style/Base.TextAppearance.AppCompat.SearchResult = 0x7f0f001c
 net.micode.notes:style/TextAppearance.AppCompat.Body2 = 0x7f0f00a4
 net.micode.notes:string/search_setting_description = 0x7f0e006d
 net.micode.notes:string/abc_searchview_description_clear = 0x7f0e0009
@@ -175,32 +173,29 @@ net.micode.notes:drawable/edit_green = 0x7f070042
 net.micode.notes:id/account_dialog_subtitle = 0x7f080000
 net.micode.notes:id/search_edit_frame = 0x7f08007a
 net.micode.notes:style/Widget.AppCompat.Light.DropDownItem.Spinner = 0x7f0f0118
-net.micode.notes:layout/notification_media_action = 0x7f0a0025
-net.micode.notes:string/menu_sync_cancel = 0x7f0e004c
 net.micode.notes:string/preferences_button_sync_immediately = 0x7f0e005d
 net.micode.notes:drawable/delete = 0x7f07003f
 net.micode.notes:string/menu_move_parent_folder = 0x7f0e0041
 net.micode.notes:style/Base.Widget.AppCompat.ActionButton.Overflow = 0x7f0f005c
 net.micode.notes:style/Widget.AppCompat.ActionButton.CloseMode = 0x7f0f00f7
-net.micode.notes:style/RtlOverlay.Widget.AppCompat.Search.DropDown.Text = 0x7f0f009f
-net.micode.notes:id/iv_bg_white_select = 0x7f080043
+net.micode.notes:string/menu_sync_cancel = 0x7f0e004c
+net.micode.notes:layout/notification_media_action = 0x7f0a0025
 net.micode.notes:style/Base.Widget.AppCompat.ActionMode = 0x7f0f005d
 net.micode.notes:string/ticker_cancel = 0x7f0e0075
 net.micode.notes:style/Base.V7.Theme.AppCompat.Dialog = 0x7f0f0050
-net.micode.notes:style/Platform.AppCompat = 0x7f0f008c
-net.micode.notes:style/Base.Widget.AppCompat.CompoundButton.RadioButton = 0x7f0f0068
-net.micode.notes:style/RtlOverlay.DialogWindowTitle.AppCompat = 0x7f0f0094
 net.micode.notes:style/RtlOverlay.Widget.AppCompat.DialogTitle.Icon = 0x7f0f0097
 net.micode.notes:id/search_go_btn = 0x7f08007b
 net.micode.notes:attr/textAppearanceLargePopupMenu = 0x7f0300a9
 net.micode.notes:style/Widget.AppCompat.Light.ActionBar.TabText = 0x7f0f010e
-net.micode.notes:style/Base.V7.Theme.AppCompat.Light.Dialog = 0x7f0f0052
-net.micode.notes:styleable/LinearLayoutCompat_Layout = 0x7f10000b
-net.micode.notes:style/Base.Animation.AppCompat.Dialog = 0x7f0f0006
+net.micode.notes:id/iv_bg_white_select = 0x7f080043
+net.micode.notes:style/RtlOverlay.Widget.AppCompat.Search.DropDown.Text = 0x7f0f009f
 net.micode.notes:drawable/abc_tab_indicator_mtrl_alpha = 0x7f070034
-net.micode.notes:style/Base.Theme.AppCompat.Light = 0x7f0f003b
+net.micode.notes:style/Base.Animation.AppCompat.Dialog = 0x7f0f0006
 net.micode.notes:layout/abc_dialog_title_material = 0x7f0a000a
 net.micode.notes:id/et_edit_text = 0x7f08002d
+net.micode.notes:style/Base.Theme.AppCompat.Light = 0x7f0f003b
+net.micode.notes:style/Platform.AppCompat = 0x7f0f008c
+net.micode.notes:style/Base.Widget.AppCompat.CompoundButton.RadioButton = 0x7f0f0068
 net.micode.notes:style/Widget.AppCompat.ActionBar.Solid = 0x7f0f00f2
 net.micode.notes:layout/notification_template_part_chronometer = 0x7f0a002b
 net.micode.notes:style/Base.Widget.AppCompat.ActivityChooserView = 0x7f0f005e
@@ -216,84 +211,88 @@ net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.ActionMode.Subtitle
 net.micode.notes:string/notealert_ok = 0x7f0e0055
 net.micode.notes:attr/windowActionBar = 0x7f0300c1
 net.micode.notes:id/multiply = 0x7f080063
-net.micode.notes:id/iv_small_select = 0x7f080048
 net.micode.notes:style/Base.ThemeOverlay.AppCompat = 0x7f0f0042
+net.micode.notes:id/iv_small_select = 0x7f080048
 net.micode.notes:menu/note_list_options = 0x7f0b0005
 net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.PopupMenu.Large = 0x7f0f002d
 net.micode.notes:style/Theme.AppCompat = 0x7f0f00db
 net.micode.notes:style/Base.TextAppearance.AppCompat.Headline = 0x7f0f0013
-net.micode.notes:style/Base.AlertDialog.AppCompat.Light = 0x7f0f0005
-net.micode.notes:styleable/SearchView = 0x7f100012
 net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.ActionBar.Subtitle.Inverse = 0x7f0f0027
 net.micode.notes:style/Widget.AppCompat.Spinner.DropDown.ActionBar = 0x7f0f012d
 net.micode.notes:style/Base.TextAppearance.AppCompat.Title = 0x7f0f0023
 net.micode.notes:string/datetime_dialog_ok = 0x7f0e001b
 net.micode.notes:drawable/font_super = 0x7f07004f
-net.micode.notes:style/Theme.AppCompat.DialogWhenLarge = 0x7f0f00e0
 net.micode.notes:style/TextAppearance.AppCompat.Widget.Switch = 0x7f0f00ca
+net.micode.notes:style/Theme.AppCompat.DialogWhenLarge = 0x7f0f00e0
+net.micode.notes:style/Widget.AppCompat.ActionButton.Overflow = 0x7f0f00f8
+net.micode.notes:styleable/ViewStubCompat = 0x7f100019
+net.micode.notes:style/Widget.AppCompat.Light.ListPopupWindow = 0x7f0f0119
 net.micode.notes:attr/navigationMode = 0x7f03007d
 net.micode.notes:drawable/abc_item_background_holo_dark = 0x7f07001f
-net.micode.notes:style/Widget.AppCompat.Light.ListPopupWindow = 0x7f0f0119
-net.micode.notes:styleable/ViewStubCompat = 0x7f100019
 net.micode.notes:style/Base.TextAppearance.AppCompat.Subhead.Inverse = 0x7f0f0022
 net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.ActionMode.Title = 0x7f0f002b
 net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.ActionBar.Menu = 0x7f0f0025
 net.micode.notes:style/ThemeOverlay.AppCompat.Dark = 0x7f0f00ed
+net.micode.notes:drawable/abc_ic_menu_cut_mtrl_alpha = 0x7f070018
 net.micode.notes:drawable/abc_list_pressed_holo_light = 0x7f070025
 net.micode.notes:color/switch_thumb_material_dark = 0x7f050041
 net.micode.notes:color/material_blue_grey_800 = 0x7f05002a
-net.micode.notes:drawable/abc_ic_menu_cut_mtrl_alpha = 0x7f070018
 net.micode.notes:style/Widget.AppCompat.ActionBar.TabView = 0x7f0f00f5
 net.micode.notes:dimen/abc_dropdownitem_icon_width = 0x7f06001f
 net.micode.notes:style/Base.TextAppearance.AppCompat.Medium.Inverse = 0x7f0f001a
 net.micode.notes:style/TextAppearance.Widget.AppCompat.Toolbar.Title = 0x7f0f00d3
-net.micode.notes:style/Base.Theme.AppCompat.Dialog = 0x7f0f0036
 net.micode.notes:id/action_context_bar = 0x7f08000a
 net.micode.notes:style/Widget.AppCompat.Light.ActionBar.TabText.Inverse = 0x7f0f010f
 net.micode.notes:style/TextAppearance.AppCompat.SearchResult.Subtitle = 0x7f0f00b6
 net.micode.notes:id/iv_super_select = 0x7f080049
 net.micode.notes:color/abc_primary_text_disable_only_material_dark = 0x7f050003
+net.micode.notes:style/Base.Theme.AppCompat.Dialog = 0x7f0f0036
 net.micode.notes:style/Base.TextAppearance.AppCompat.Light.Widget.PopupMenu.Large = 0x7f0f0017
 net.micode.notes:string/folder_exist = 0x7f0e002a
 net.micode.notes:drawable/bg_color_btn_mask = 0x7f07003c
+net.micode.notes:styleable/SearchView = 0x7f100012
+net.micode.notes:style/Base.AlertDialog.AppCompat.Light = 0x7f0f0005
 net.micode.notes:style/TextAppearance.AppCompat.Widget.ActionBar.Title = 0x7f0f00c1
 net.micode.notes:style/Base.TextAppearance.AppCompat.Display3 = 0x7f0f0011
 net.micode.notes:style/Base.TextAppearance.AppCompat.Body2 = 0x7f0f000c
 net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0f00da
 net.micode.notes:style/Widget.AppCompat.Light.AutoCompleteTextView = 0x7f0f0117
-net.micode.notes:style/TextAppearance.AppCompat.Medium = 0x7f0f00b3
-net.micode.notes:drawable/batterfly = 0x7f070080
-net.micode.notes:style/Widget.AppCompat.Light.PopupMenu.Overflow = 0x7f0f011c
 net.micode.notes:style/Base.V21.Theme.AppCompat.Light = 0x7f0f004d
-net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.Switch = 0x7f0f002f
+net.micode.notes:style/Widget.AppCompat.Light.PopupMenu.Overflow = 0x7f0f011c
+net.micode.notes:drawable/batterfly = 0x7f070080
+net.micode.notes:style/TextAppearance.AppCompat.Medium = 0x7f0f00b3
 net.micode.notes:id/tv_title_bar = 0x7f08009c
+net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.Switch = 0x7f0f002f
 net.micode.notes:color/light_blue_600 = 0x7f050024
+net.micode.notes:style/Widget.AppCompat.CompoundButton.CheckBox = 0x7f0f0103
+net.micode.notes:drawable/abc_ic_voice_search_api_mtrl_alpha = 0x7f07001e
+net.micode.notes:attr/maxButtonHeight = 0x7f030077
 net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.DropDownItem = 0x7f0f002c
 net.micode.notes:style/Base.Widget.AppCompat.Button = 0x7f0f0060
+net.micode.notes:style/Animation.AppCompat.DropDownUp = 0x7f0f0003
 net.micode.notes:style/TextAppearance.AppCompat.Headline = 0x7f0f00ab
 net.micode.notes:id/showCustom = 0x7f080083
 net.micode.notes:anim/abc_slide_out_bottom = 0x7f010008
-net.micode.notes:style/Animation.AppCompat.DropDownUp = 0x7f0f0003
-net.micode.notes:drawable/abc_dialog_material_background_light = 0x7f070011
 net.micode.notes:id/iv_bg_blue_select = 0x7f08003d
+net.micode.notes:drawable/abc_dialog_material_background_light = 0x7f070011
 net.micode.notes:style/Animation.AppCompat.Dialog = 0x7f0f0002
 net.micode.notes:style/Widget.AppCompat.SearchView = 0x7f0f0129
 net.micode.notes:style/AlertDialog.AppCompat.Light = 0x7f0f0001
 net.micode.notes:drawable/abc_textfield_default_mtrl_alpha = 0x7f070037
 net.micode.notes:layout/note_list_footer = 0x7f0a0024
 net.micode.notes:string/preferences_title = 0x7f0e0067
-net.micode.notes:style/Base.Widget.AppCompat.ActionBar.Solid = 0x7f0f0056
 net.micode.notes:style/AlertDialog.AppCompat = 0x7f0f0000
+net.micode.notes:style/Base.Widget.AppCompat.ActionBar.Solid = 0x7f0f0056
 net.micode.notes:layout/notification_template_big_media_narrow = 0x7f0a0028
-net.micode.notes:id/prefenerece_sync_status_textview = 0x7f08006f
-net.micode.notes:dimen/abc_action_bar_content_inset_material = 0x7f060000
 net.micode.notes:attr/dividerHorizontal = 0x7f030051
 net.micode.notes:string/title_activity_splash = 0x7f0e0079
 net.micode.notes:style/Base.TextAppearance.AppCompat.Menu = 0x7f0f001b
+net.micode.notes:dimen/abc_action_bar_content_inset_material = 0x7f060000
+net.micode.notes:id/prefenerece_sync_status_textview = 0x7f08006f
 net.micode.notes:string/ticker_syncing = 0x7f0e0078
 net.micode.notes:string/file_name_txt_format = 0x7f0e0028
-net.micode.notes:drawable/list_blue_middle = 0x7f070054
 net.micode.notes:string/ticker_fail = 0x7f0e0076
+net.micode.notes:drawable/list_blue_middle = 0x7f070054
 net.micode.notes:layout/abc_action_menu_item_layout = 0x7f0a0003
 net.micode.notes:style/Base.TextAppearance.AppCompat.Caption = 0x7f0f000e
 net.micode.notes:string/set_remind_time_message = 0x7f0e006e
@@ -315,15 +314,16 @@ net.micode.notes:id/select_dialog_listview = 0x7f080080
 net.micode.notes:drawable/abc_switch_track_mtrl_alpha = 0x7f070032
 net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0e005b
 net.micode.notes:style/Theme.Notesmaster1.Fullscreen = 0x7f0f00ea
+net.micode.notes:layout/datetime_picker = 0x7f0a001c
+net.micode.notes:color/user_query_highlight = 0x7f050045
 net.micode.notes:drawable/edit_title_white = 0x7f070047
 net.micode.notes:attr/colorAccent = 0x7f03003d
-net.micode.notes:color/user_query_highlight = 0x7f050045
-net.micode.notes:layout/datetime_picker = 0x7f0a001c
+net.micode.notes:style/Base.TextAppearance.AppCompat = 0x7f0f000a
 net.micode.notes:string/note_link_tel = 0x7f0e0052
 net.micode.notes:style/Base.TextAppearance.Widget.AppCompat.Toolbar.Subtitle = 0x7f0f0032
-net.micode.notes:style/Base.TextAppearance.AppCompat.Title.Inverse = 0x7f0f0024
 net.micode.notes:string/note_link_other = 0x7f0e0051
 net.micode.notes:style/Base.ThemeOverlay.AppCompat.Dark = 0x7f0f0044
+net.micode.notes:style/Base.TextAppearance.AppCompat.Title.Inverse = 0x7f0f0024
 net.micode.notes:string/note_length = 0x7f0e004f
 net.micode.notes:style/Base.TextAppearance.AppCompat.Body1 = 0x7f0f000b
 net.micode.notes:string/menu_title_select_folder = 0x7f0e004d
@@ -357,12 +357,12 @@ net.micode.notes:style/TextAppearance.AppCompat.Subhead.Inverse = 0x7f0f00bb
 net.micode.notes:style/Base.Widget.AppCompat.Button.Borderless.Colored = 0x7f0f0062
 net.micode.notes:string/abc_action_bar_home_description_format = 0x7f0e0001
 net.micode.notes:string/abc_searchview_description_search = 0x7f0e000b
+net.micode.notes:layout/abc_search_dropdown_item_icons_2line = 0x7f0a0015
+net.micode.notes:string/sync_progress_syncing = 0x7f0e0074
+net.micode.notes:string/menu_export_text = 0x7f0e0036
 net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0f00d7
 net.micode.notes:string/notelist_menu_new = 0x7f0e0056
-net.micode.notes:string/menu_export_text = 0x7f0e0036
 net.micode.notes:style/TextAppearance.AppCompat.Large = 0x7f0f00ad
-net.micode.notes:layout/abc_search_dropdown_item_icons_2line = 0x7f0a0015
-net.micode.notes:string/sync_progress_syncing = 0x7f0e0074
 net.micode.notes:layout/abc_expanded_menu_layout = 0x7f0a000b
 net.micode.notes:plurals/search_results_title = 0x7f0c0000
 net.micode.notes:style/Widget.AppCompat.Light.ActionBar.TabBar = 0x7f0f010c
@@ -374,21 +374,21 @@ net.micode.notes:style/Widget.AppCompat.ButtonBar = 0x7f0f0101
 net.micode.notes:layout/select_dialog_item_material = 0x7f0a002d
 net.micode.notes:id/note_title = 0x7f08006c
 net.micode.notes:string/menu_lattice = 0x7f0e007e
-net.micode.notes:color/link_text_material_dark = 0x7f050028
 net.micode.notes:attr/actionModeCopyDrawable = 0x7f030013
 net.micode.notes:layout/notification_media_cancel_action = 0x7f0a0026
-net.micode.notes:id/tv_folder_name = 0x7f080097
-net.micode.notes:id/action_divider = 0x7f08000b
-net.micode.notes:id/menu_cat = 0x7f0800a3
+net.micode.notes:color/link_text_material_dark = 0x7f050028
 net.micode.notes:style/Base.DialogWindowTitleBackground.AppCompat = 0x7f0f0009
 net.micode.notes:layout/note_list = 0x7f0a0022
 net.micode.notes:dimen/disabled_alpha_material_light = 0x7f060041
+net.micode.notes:id/tv_folder_name = 0x7f080097
+net.micode.notes:id/action_divider = 0x7f08000b
+net.micode.notes:id/menu_cat = 0x7f0800a3
 net.micode.notes:layout/folder_list_item = 0x7f0a001e
 net.micode.notes:style/Base.Widget.AppCompat.AutoCompleteTextView = 0x7f0f005f
 net.micode.notes:string/error_sdcard_unmounted = 0x7f0e0023
-net.micode.notes:string/note_link_web = 0x7f0e0053
-net.micode.notes:id/activity_chooser_view_content = 0x7f080012
 net.micode.notes:layout/dialog_edit_text = 0x7f0a001d
+net.micode.notes:id/activity_chooser_view_content = 0x7f080012
+net.micode.notes:string/note_link_web = 0x7f0e0053
 net.micode.notes:string/dummy_button = 0x7f0e001d
 net.micode.notes:style/Widget.AppCompat.Light.PopupMenu = 0x7f0f011b
 net.micode.notes:layout/account_dialog_title = 0x7f0a0019
@@ -424,13 +424,13 @@ net.micode.notes:layout/abc_search_view = 0x7f0a0016
 net.micode.notes:integer/abc_config_activityShortDur = 0x7f090001
 net.micode.notes:integer/abc_config_activityDefaultDur = 0x7f090000
 net.micode.notes:style/Widget.AppCompat.ButtonBar.AlertDialog = 0x7f0f0102
-net.micode.notes:id/withText = 0x7f0800a1
 net.micode.notes:attr/thumbTextPadding = 0x7f0300b3
+net.micode.notes:id/withText = 0x7f0800a1
 net.micode.notes:id/widget_bg_image = 0x7f08009f
 net.micode.notes:styleable/ActionBarLayout = 0x7f100001
+net.micode.notes:drawable/abc_dialog_material_background_dark = 0x7f070010
 net.micode.notes:id/text2 = 0x7f08008f
 net.micode.notes:attr/fullscreenBackgroundColor = 0x7f03005d
-net.micode.notes:drawable/abc_dialog_material_background_dark = 0x7f070010
 net.micode.notes:id/text = 0x7f08008e
 net.micode.notes:integer/status_bar_notification_info_maxnum = 0x7f090004
 net.micode.notes:id/sv_note_edit = 0x7f08008c
@@ -440,13 +440,13 @@ net.micode.notes:id/src_over = 0x7f080089
 net.micode.notes:id/submit_area = 0x7f08008b
 net.micode.notes:style/Widget.AppCompat.ActionBar = 0x7f0f00f1
 net.micode.notes:style/TextAppearance.AppCompat.Widget.ActionMode.Title = 0x7f0f00c5
-net.micode.notes:id/shortcut = 0x7f080082
 net.micode.notes:dimen/notification_large_icon_height = 0x7f060042
+net.micode.notes:id/shortcut = 0x7f080082
 net.micode.notes:style/Base.Widget.AppCompat.Light.PopupMenu.Overflow = 0x7f0f0075
 net.micode.notes:id/middle = 0x7f080060
 net.micode.notes:id/search_plate = 0x7f08007d
-net.micode.notes:drawable/abc_btn_check_material = 0x7f070002
 net.micode.notes:string/menu_font_super = 0x7f0e003e
+net.micode.notes:drawable/abc_btn_check_material = 0x7f070002
 net.micode.notes:style/TextAppearance.StatusBar.EventContent.Time = 0x7f0f00cf
 net.micode.notes:id/search_badge = 0x7f080076
 net.micode.notes:style/Base.V11.Theme.AppCompat.Light.Dialog = 0x7f0f0048
@@ -471,8 +471,8 @@ net.micode.notes:id/note_edit_list = 0x7f080069
 net.micode.notes:layout/notification_template_lines = 0x7f0a0029
 net.micode.notes:styleable/View = 0x7f100018
 net.micode.notes:dimen/abc_button_inset_horizontal_material = 0x7f060010
-net.micode.notes:id/normal = 0x7f080067
 net.micode.notes:id/src_in = 0x7f080088
+net.micode.notes:id/normal = 0x7f080067
 net.micode.notes:id/never = 0x7f080065
 net.micode.notes:styleable/Spinner = 0x7f100013
 net.micode.notes:id/navigation_bar = 0x7f080064

src/Notes-master1/app/build/outputs/logs/manifest-merger-debug-report.txt

@@ -95,7 +95,7 @@ MERGED from [com.android.support:support-v4:22.2.1] C:\Users\15536\.gradle\cache
 activity#net.micode.notes.ui.SplashActivity
 ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:23:9-34:20
 	android:label
-		ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:27:13-58
+		ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:27:13-45
 	android:exported
 		ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:26:13-36
 	android:configChanges

src/Notes-master1/app/src/main/AndroidManifest.xml

@@ -24,7 +24,7 @@
             android:name=".ui.SplashActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:exported="true"
-            android:label="@string/title_activity_splash"
+            android:label="@string/app_name"
             android:theme="@style/Theme.Notesmaster1.Fullscreen">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

src/Notes-master1/app/src/main/res/values-zh-rCN/strings.xml

@@ -17,7 +17,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name">便签</string>
+    <string name="app_name">原神</string>
     <string name="app_widget2x2">便签2x2</string>
     <string name="app_widget4x4">便签4x4</string>
     <string name="widget_havenot_content">没有关联内容，点击新建便签。</string>

src/Notes-master1/app/src/main/res/values/strings.xml

@@ -16,7 +16,7 @@
 -->
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name">Notes</string>
+    <string name="app_name">原神</string>
     <string name="app_widget2x2">Notes 2x2</string>
     <string name="app_widget4x4">Notes 4x4</string>
     <string name="widget_havenot_content">No associated note found, click to create associated note.</string>

src/Notes-master1/app/src/main/res/values/styles.xml

@@ -67,8 +67,8 @@
     </style>
 
     <style name="NoteActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid">
-        <item name="android:displayOptions" />
-        <item name="android:visibility">gone</item>
+<!--        <item name="android:displayOptions" />-->
+        <item name="android:visibility">visible</item>
     </style>
 
     <style name="Widget.Theme.Notesmaster1.ActionBar.Fullscreen" parent="Widget.AppCompat.ActionBar">

src/Notes-master1/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+zipStorePath=wrapper/dists