diff --git a/doc/~$泛读报告.docx b/doc/~$泛读报告.docx
new file mode 100644
index 0000000..575aac4
Binary files /dev/null and b/doc/~$泛读报告.docx differ
diff --git a/doc/实践一/第一次实践分工.txt b/doc/实践一/第一次实践分工.txt
index a2d715d..c0e5987 100644
--- a/doc/实践一/第一次实践分工.txt
+++ b/doc/实践一/第一次实践分工.txt
@@ -2,19 +2,9 @@
胡逸飞：SonarQube的开源软件质量报告,软件体系结构图；
王俊龙：描述开源软件的模块构成,软件体系结构图;
王志成:软件体系结构图;
-
由于小米便签软件体系结构图内容繁多，故细分给小组成员如下：
-<<<<<<< HEAD
-<<<<<<< HEAD
谢成扬 data（74+280+363+306=1023）model(254+369=623)
-胡逸飞：tool,widget
王俊龙: gtask （82+101+189+505+351+343+33+34+133+585+800+128=3284）
-=======
-谢成扬 data，model
-=======
-胡逸飞：tool,widget
-谢成扬 data，model (74+280+363+306=1023) (254+369=623）
->>>>>>> bfe22819090f7c7b9ef26e33482b64759f60cc3a
胡逸飞：tool（342+296+114+182=934），widget(133+47+47=227)
王俊龙: gtask
王志成:ui （159+66+31+486+90+62+81+874+218+225+955+184+123+389=3943）
diff --git a/doc/泛读报告.docx b/doc/泛读报告.docx
index 25af470..d2bc1f7 100644
Binary files a/doc/泛读报告.docx and b/doc/泛读报告.docx differ
diff --git a/src/Notes-master3/.gradle/7.5/executionHistory/executionHistory.bin b/src/Notes-master3/.gradle/7.5/executionHistory/executionHistory.bin
index 8c063c7..7b354dd 100644
Binary files a/src/Notes-master3/.gradle/7.5/executionHistory/executionHistory.bin and b/src/Notes-master3/.gradle/7.5/executionHistory/executionHistory.bin differ
diff --git a/src/Notes-master3/.gradle/7.5/executionHistory/executionHistory.lock b/src/Notes-master3/.gradle/7.5/executionHistory/executionHistory.lock
index 5cebefd..b65026d 100644
Binary files a/src/Notes-master3/.gradle/7.5/executionHistory/executionHistory.lock and b/src/Notes-master3/.gradle/7.5/executionHistory/executionHistory.lock differ
diff --git a/src/Notes-master3/.gradle/7.5/fileHashes/fileHashes.bin b/src/Notes-master3/.gradle/7.5/fileHashes/fileHashes.bin
index 397e99e..81666bc 100644
Binary files a/src/Notes-master3/.gradle/7.5/fileHashes/fileHashes.bin and b/src/Notes-master3/.gradle/7.5/fileHashes/fileHashes.bin differ
diff --git a/src/Notes-master3/.gradle/7.5/fileHashes/fileHashes.lock b/src/Notes-master3/.gradle/7.5/fileHashes/fileHashes.lock
index c2cda0b..93801a4 100644
Binary files a/src/Notes-master3/.gradle/7.5/fileHashes/fileHashes.lock and b/src/Notes-master3/.gradle/7.5/fileHashes/fileHashes.lock differ
diff --git a/src/Notes-master3/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/Notes-master3/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 3226fae..bf4ad10 100644
Binary files a/src/Notes-master3/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/src/Notes-master3/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/src/Notes-master3/.gradle/buildOutputCleanup/outputFiles.bin b/src/Notes-master3/.gradle/buildOutputCleanup/outputFiles.bin
index 0543e86..3737029 100644
Binary files a/src/Notes-master3/.gradle/buildOutputCleanup/outputFiles.bin and b/src/Notes-master3/.gradle/buildOutputCleanup/outputFiles.bin differ
diff --git a/src/Notes-master3/.gradle/file-system.probe b/src/Notes-master3/.gradle/file-system.probe
index ef9fb1a..82a5830 100644
Binary files a/src/Notes-master3/.gradle/file-system.probe and b/src/Notes-master3/.gradle/file-system.probe differ
diff --git a/src/Notes-master3/.idea/Notes-master3.iml b/src/Notes-master3/.idea/Notes-master3.iml
deleted file mode 100644
index d6ebd48..0000000
--- a/src/Notes-master3/.idea/Notes-master3.iml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Notes-master3/.idea/misc.xml b/src/Notes-master3/.idea/misc.xml
index a9f22fe..5da8073 100644
--- a/src/Notes-master3/.idea/misc.xml
+++ b/src/Notes-master3/.idea/misc.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/src/Notes-master3/.idea/modules.xml b/src/Notes-master3/.idea/modules.xml
deleted file mode 100644
index 5db786f..0000000
--- a/src/Notes-master3/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Notes-master3/app/build/intermediates/apk/debug/app-debug.apk b/src/Notes-master3/app/build/intermediates/apk/debug/app-debug.apk
index ab52cd4..b4d361f 100644
Binary files a/src/Notes-master3/app/build/intermediates/apk/debug/app-debug.apk and b/src/Notes-master3/app/build/intermediates/apk/debug/app-debug.apk differ
diff --git a/src/Notes-master3/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/src/Notes-master3/app/build/intermediates/dex_archive_input_jar_hashes/debug/out
index 56b20fc..8ed1618 100644
Binary files a/src/Notes-master3/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and b/src/Notes-master3/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ
diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
index 7e63071..c5dfba3 100644
--- a/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
+++ b/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
@@ -1,4 +1,4 @@
-#Wed Apr 05 15:19:48 CST 2023
+#Fri Apr 07 16:47:23 CST 2023
net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat
diff --git a/src/Notes-master3/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/src/Notes-master3/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
index 36b31d1..653cc20 100644
--- a/src/Notes-master3/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
+++ b/src/Notes-master3/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
@@ -1,2 +1,2 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/Notes-master3/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/src/Notes-master3/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
index 13c8488..47bb771 100644
--- a/src/Notes-master3/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
+++ b/src/Notes-master3/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
@@ -1,2 +1,2 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/Notes-master3/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/src/Notes-master3/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
index 6e03a2d..c3c2d0d 100644
--- a/src/Notes-master3/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
+++ b/src/Notes-master3/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
@@ -1,2 +1,2 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
index 25511cd..45e4554 100644
--- a/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
+++ b/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
@@ -1,4 +1,4 @@
-#Fri Mar 31 17:04:20 CST 2023
-base.0=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
+#Fri Apr 07 16:47:35 CST 2023
+base.0=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
renamed.0=classes.dex
path.0=classes.dex
diff --git a/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
index ebe91fc..582922f 100644
Binary files a/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ
diff --git a/src/Notes-master3/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/src/Notes-master3/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
index 3ff6fc1..59afc0a 100644
--- a/src/Notes-master3/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
+++ b/src/Notes-master3/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
@@ -20,266 +20,266 @@
20 android:versionName="0.1" >
21
22 E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
+22-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
23 android:minSdkVersion="14"
-23-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:15-41
+23-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:15-41
24 android:targetSdkVersion="33" />
-24-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
+24-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
25
26
-26-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:27:5-81
-26-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:27:22-78
+26-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:27:5-81
+26-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:27:22-78
27
-27-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:28:5-88
-27-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:28:22-85
+27-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:28:5-88
+27-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:28:22-85
28
-28-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:29:5-67
-28-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:29:22-64
+28-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:29:5-67
+28-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:29:22-64
29
-29-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:30:5-72
-29-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:30:22-69
+29-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:30:5-72
+29-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:30:22-69
30
-30-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:31:5-74
-30-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:31:22-71
+30-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:31:5-74
+30-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:31:22-71
31
-31-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:32:5-80
-31-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:32:22-77
+31-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:32:5-80
+31-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:32:22-77
32
-32-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:33:5-71
-32-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:33:22-68
+32-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:33:5-71
+32-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:33:22-68
33
-33-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:34:5-74
-33-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:34:22-71
+33-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:34:5-74
+33-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:34:22-71
34
-34-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:35:5-81
-34-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:35:22-78
+34-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:35:5-81
+34-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:35:22-78
35
36 E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:37:5-158:19
+36-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:37:5-158:19
37 android:debuggable="true"
38 android:icon="@drawable/icon_app"
-38-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:38:9-42
+38-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:38:9-42
39 android:label="@string/app_name"
-39-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:39:9-41
+39-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:39:9-41
40 android:testOnly="true" >
41 E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:40:9-53:20
+41-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:40:9-53:20
42 android:name="net.micode.notes.ui.NotesListActivity"
-42-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:41:13-49
+42-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:41:13-49
43 android:configChanges="keyboardHidden|orientation|screenSize"
-43-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:42:13-74
+43-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:42:13-74
44 android:exported="true"
-44-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:43:13-36
+44-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:43:13-36
45 android:launchMode="singleTop"
-45-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:44:13-43
+45-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:44:13-43
46 android:theme="@style/NoteTheme"
-46-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:45:13-45
+46-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:45:13-45
47 android:uiOptions="splitActionBarWhenNarrow"
-47-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:46:13-57
+47-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:46:13-57
48 android:windowSoftInputMode="adjustPan" >
-48-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:47:13-52
+48-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:47:13-52
49
-49-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:49:13-52:29
+49-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:49:13-52:29
50
-50-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:50:17-69
-50-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:50:25-66
+50-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:50:17-69
+50-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:50:25-66
51
52
-52-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:51:17-77
-52-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:51:27-74
+52-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:51:17-77
+52-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:51:27-74
53
54
55 E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:55:9-85:20
+55-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:55:9-85:20
56 android:name="net.micode.notes.ui.NoteEditActivity"
-56-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:56:13-48
+56-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:56:13-48
57 android:configChanges="keyboardHidden|orientation|screenSize"
-57-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:57:13-74
+57-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:57:13-74
58 android:exported="true"
-58-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:60:13-36
+58-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:60:13-36
59 android:launchMode="singleTop"
-59-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:58:13-43
+59-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:58:13-43
60 android:theme="@style/NoteTheme" >
-60-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:59:13-45
+60-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:59:13-45
61
-61-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:62:13-68:29
-61-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:62:28-49
+61-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:62:13-68:29
+61-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:62:28-49
62
-62-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:64:17-69
-62-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:64:25-66
+62-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:64:17-69
+62-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:64:25-66
63
64
-64-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:17-76
-64-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:27-73
+64-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:17-76
+64-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:27-73
65
66
-66-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78
-66-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75
+66-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78
+66-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75
67
-67-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78
-67-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75
+67-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78
+67-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75
68
69
-69-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:70:13-75:29
+69-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:70:13-75:29
70
-70-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:71:17-79
-70-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:71:25-76
+70-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:71:17-79
+70-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:71:25-76
71
72
-72-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:17-76
-72-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:27-73
+72-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:17-76
+72-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:27-73
73
74
-74-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78
-74-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75
+74-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78
+74-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75
75
-75-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78
-75-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75
+75-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78
+75-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75
76
77
-77-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:77:13-80:29
+77-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:77:13-80:29
78
-78-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:78:17-71
-78-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:78:25-68
+78-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:78:17-71
+78-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:78:25-68
79
80
-80-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:17-76
-80-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:27-73
+80-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:17-76
+80-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:27-73
81
82
83 E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:82:13-84:54
+83-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:82:13-84:54
84 android:name="android.app.searchable"
-84-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:83:17-54
+84-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:83:17-54
85 android:resource="@xml/searchable" />
-85-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:84:17-51
+85-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:84:17-51
86
87
88 E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:87:9-91:40
+88-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:87:9-91:40
89 android:name="net.micode.notes.data.NotesProvider"
-89-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:88:13-63
+89-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:88:13-63
90 android:authorities="micode_notes"
-90-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:89:13-47
+90-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:89:13-47
91 android:exported="false"
-91-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:91:13-37
+91-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:91:13-37
92 android:multiprocess="true" />
-92-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:90:13-40
+92-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:90:13-40
93
94 E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:93:9-106:20
+94-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:93:9-106:20
95 android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
-95-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:94:13-57
+95-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:94:13-57
96 android:exported="true"
-96-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:96:13-36
+96-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:96:13-36
97 android:label="@string/app_widget2x2" >
-97-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:95:13-50
+97-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:95:13-50
98
-98-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:97:13-101:29
+98-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:97:13-101:29
99
-99-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:17-84
-99-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:25-81
+99-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:17-84
+99-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:25-81
100
-100-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:99:17-85
-100-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:99:25-82
+100-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:99:17-85
+100-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:99:25-82
101
-101-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:100:17-85
-101-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:100:25-82
+101-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:100:17-85
+101-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:100:25-82
102
103
104 E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:103:13-105:58
+104-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:103:13-105:58
105 android:name="android.appwidget.provider"
-105-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:104:17-58
+105-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:104:17-58
106 android:resource="@xml/widget_2x_info" />
-106-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:105:17-55
+106-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:105:17-55
107
108 E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:107:9-121:20
+108-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:107:9-121:20
109 android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
-109-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:108:13-57
+109-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:108:13-57
110 android:exported="true"
-110-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:110:13-36
+110-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:110:13-36
111 android:label="@string/app_widget4x4" >
-111-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:109:13-50
+111-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:109:13-50
112
-112-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:97:13-101:29
+112-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:97:13-101:29
113
-113-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:17-84
-113-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:25-81
+113-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:17-84
+113-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:25-81
114
-114-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:99:17-85
-114-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:99:25-82
+114-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:99:17-85
+114-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:99:25-82
115
-115-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:100:17-85
-115-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:100:25-82
+115-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:100:17-85
+115-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:100:25-82
116
117
118 E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:103:13-105:58
+118-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:103:13-105:58
119 android:name="android.appwidget.provider"
-119-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:104:17-58
+119-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:104:17-58
120 android:resource="@xml/widget_4x_info" />
-120-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:105:17-55
+120-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:105:17-55
121
122 E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:123:9-128:20
+122-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:123:9-128:20
123 android:name="net.micode.notes.ui.AlarmInitReceiver"
-123-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:123:19-55
+123-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:123:19-55
124 android:exported="true" >
-124-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:124:13-36
+124-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:124:13-36
125
-125-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:125:13-127:29
+125-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:125:13-127:29
126
-126-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:126:17-79
-126-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:126:25-76
+126-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:126:17-79
+126-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:126:25-76
127
128
129 E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:130:9-133:20
+129-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:130:9-133:20
130 android:name="net.micode.notes.ui.AlarmReceiver"
-130-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:131:13-61
+130-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:131:13-61
131 android:process=":remote" >
-131-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:132:13-38
+131-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:132:13-38
132
133
134 E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:135:9-141:20
+134-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:135:9-141:20
135 android:name="net.micode.notes.ui.AlarmAlertActivity"
-135-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:136:13-50
+135-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:136:13-50
136 android:label="@string/app_name"
-136-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:137:13-45
+136-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:137:13-45
137 android:launchMode="singleInstance"
-137-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:138:13-48
+137-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:138:13-48
138 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
-138-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:139:13-75
+138-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:139:13-75
139
140 E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:143:9-148:20
+140-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:143:9-148:20
141 android:name="net.micode.notes.ui.NotesPreferenceActivity"
-141-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:144:13-71
+141-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:144:13-71
142 android:label="@string/preferences_title"
-142-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:145:13-54
+142-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:145:13-54
143 android:launchMode="singleTop"
-143-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:146:13-43
+143-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:146:13-43
144 android:theme="@android:style/Theme.Holo.Light" >
-144-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:147:13-60
+144-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:147:13-60
145
146
147 E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:150:9-153:19
+147-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:150:9-153:19
148 android:name="net.micode.notes.gtask.remote.GTaskSyncService"
-148-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:151:13-74
+148-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:151:13-74
149 android:exported="false" >
-149-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:152:13-37
+149-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:152:13-37
150
151
152 E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:155:9-157:52
+152-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:155:9-157:52
153 android:name="android.app.default_searchable"
-153-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:156:13-58
+153-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:156:13-58
154 android:value=".ui.NoteEditActivity" />
-154-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:157:13-49
+154-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:157:13-49
155
156
157
diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat
index e25eb7b..17cb018 100644
Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat and b/src/Notes-master3/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat differ
diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
index d169236..be3949e 100644
--- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
+++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
@@ -8,10 +8,10 @@
"from": {
"startLines": "18",
"startColumns": "4",
- "startOffsets": "730",
+ "startOffsets": "712",
"endLines": "21",
"endColumns": "19",
- "endOffsets": "838"
+ "endOffsets": "817"
},
"to": {
"startLines": "2",
@@ -27,10 +27,10 @@
"from": {
"startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "6653,3566,3499,3425,3374,846,887,936,6195,6241,6598,6547,1225,3938,4007,3878,3812,3748,4682,4621,4557,4141,2937,1398,1452,4196,3640,6299,3314,3097,1836,2123,2374,1890,2876,2822,2770,2571,2522,2426,2475,2618,2666,2167,3254,2717,3141,2079,2326,2269,2213,3041,2034,2998,1941,1983,3194,1346,1657,1755,1609,1707,1561,1515,1173,1119,5064,5004,5207,6120,5523,5453,5588,5667,5852,5778,5140,5397,5265,5331,4954,5957,6041,6508,6399,6350,6445,1288,4085,4497,4797,4738,4865,4448,4402,4353,4301,985,1052",
+ "startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029",
"endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
"endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
- "endOffsets": "6827,3634,3560,3493,3419,881,930,979,6235,6293,6647,6592,1282,4001,4079,3932,3872,3806,4732,4676,4615,4190,2992,1446,1509,4276,3716,6344,3368,3135,1884,2161,2420,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3308,2764,3188,2117,2368,2320,2263,3091,2073,3035,1977,2028,3248,1392,1701,1799,1651,1749,1603,1555,1219,1167,5134,5058,5259,6189,5582,5517,5661,5772,5951,5846,5201,5447,5325,5391,4998,6035,6114,6541,6439,6393,6502,1340,4135,4551,4859,4791,4922,4491,4442,4396,4347,1046,1113"
+ "endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090"
},
"to": {
"startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
@@ -51,9 +51,9 @@
"from": {
"startLines": "19,20,21,22,18",
"startColumns": "4,4,4,4,4",
- "startOffsets": "783,836,890,944,730",
+ "startOffsets": "764,816,869,922,712",
"endColumns": "51,52,52,51,51",
- "endOffsets": "830,884,938,991,777"
+ "endOffsets": "811,864,917,969,759"
},
"to": {
"startLines": "13,14,15,16,17",
@@ -68,10 +68,10 @@
"from": {
"startLines": "19,26",
"startColumns": "4,4",
- "startOffsets": "758,1073",
+ "startOffsets": "739,1047",
"endLines": "24,29",
"endColumns": "19,19",
- "endOffsets": "1065,1191"
+ "endOffsets": "1041,1162"
},
"to": {
"startLines": "2,8",
@@ -87,10 +87,10 @@
"from": {
"startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "8136,3970,4234,4137,4067,846,890,943,7624,7674,8077,8025,1308,4694,4789,4622,4537,4453,5668,5584,5481,4967,2043,1991,3461,1515,1569,5029,2138,4318,7738,3898,3649,2198,2519,2825,2257,3389,3327,3269,3043,2990,2885,2939,3094,3145,2567,3831,3206,3699,2471,2769,2680,2621,3586,2420,3540,2315,2359,3763,1459,1784,1894,1736,1840,1679,1630,1252,1198,6131,6063,6375,7525,6744,6662,6819,6909,7153,7073,6216,6292,6602,6440,6521,6007,7298,7421,7983,7854,7796,7908,1393,4898,5394,5805,5735,5886,5334,5278,5215,5154,996,1107",
+ "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084",
"endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
"endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
- "endOffsets": "8544,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,1834,1942,1778,1888,1730,1673,1302,1246,6210,6125,6434,7616,6813,6738,6903,7067,7292,7147,6286,6369,6656,6515,6596,6057,7415,7519,8019,7902,7848,7977,1453,4961,5475,5880,5799,5975,5388,5328,5272,5209,1101,1192"
+ "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169"
},
"to": {
"startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
@@ -106,10 +106,10 @@
"from": {
"startLines": "50,55,64,60,22,26,30,35,40,18,45",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905",
+ "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860",
"endLines": "53,58,67,62,25,29,33,38,43,21,48",
"endColumns": "12,12,12,12,12,12,12,12,12,12,12",
- "endOffsets": "2314,2531,2910,2696,1098,1287,1476,1685,1897,911,2104"
+ "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056"
},
"to": {
"startLines": "125,129,133,137,140,144,148,152,156,160,164",
@@ -125,9 +125,9 @@
"from": {
"startLines": "18",
"startColumns": "4",
- "startOffsets": "730",
+ "startOffsets": "712",
"endColumns": "56",
- "endOffsets": "782"
+ "endOffsets": "764"
},
"to": {
"startLines": "12",
@@ -147,10 +147,10 @@
"from": {
"startLines": "18",
"startColumns": "4",
- "startOffsets": "730",
+ "startOffsets": "712",
"endLines": "21",
"endColumns": "19",
- "endOffsets": "838"
+ "endOffsets": "817"
},
"to": {
"startLines": "2",
@@ -166,10 +166,10 @@
"from": {
"startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "6629,3647,3580,3506,3455,846,887,936,6169,6215,6574,6523,1225,3911,3980,3851,3784,3720,4654,4593,4529,4114,3018,1398,1452,4169,1805,6273,3395,3178,1917,2204,2455,1971,2957,2903,2851,2652,2603,2507,2556,2699,2747,2248,3335,2798,3222,2160,2407,2350,2294,3122,2115,3079,2022,2064,3275,1346,1657,1755,1609,1707,1561,1515,1173,1119,5036,4976,5179,6092,5495,5425,5560,5639,5824,5750,5112,5369,5237,5303,4926,5929,6013,6484,6375,6326,6421,1288,4058,4469,4769,4710,4837,4420,4374,4325,4273,985,1052",
+ "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029",
"endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
"endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
- "endOffsets": "6803,3714,3641,3574,3500,881,930,979,6209,6267,6623,6568,1282,3974,4052,3905,3845,3778,4704,4648,4587,4163,3073,1446,1509,4248,1880,6318,3449,3216,1965,2242,2501,2016,3012,2951,2897,2693,2646,2550,2597,2741,2792,2288,3389,2845,3269,2198,2449,2401,2344,3172,2154,3116,2058,2109,3329,1392,1701,1799,1651,1749,1603,1555,1219,1167,5106,5030,5231,6161,5554,5489,5633,5744,5923,5818,5173,5419,5297,5363,4970,6007,6086,6517,6415,6369,6478,1340,4108,4523,4831,4763,4894,4463,4414,4368,4319,1046,1113"
+ "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090"
},
"to": {
"startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
index ee1fb7d..97aabf6 100644
--- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
+++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
@@ -8,10 +8,10 @@
"from": {
"startLines": "18",
"startColumns": "4",
- "startOffsets": "730",
+ "startOffsets": "712",
"endLines": "21",
"endColumns": "19",
- "endOffsets": "838"
+ "endOffsets": "817"
},
"to": {
"startLines": "2",
@@ -27,10 +27,10 @@
"from": {
"startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "6653,3566,3499,3425,3374,846,887,936,6195,6241,6598,6547,1225,3938,4007,3878,3812,3748,4682,4621,4557,4141,2937,1398,1452,4196,3640,6299,3314,3097,1836,2123,2374,1890,2876,2822,2770,2571,2522,2426,2475,2618,2666,2167,3254,2717,3141,2079,2326,2269,2213,3041,2034,2998,1941,1983,3194,1346,1657,1755,1609,1707,1561,1515,1173,1119,5064,5004,5207,6120,5523,5453,5588,5667,5852,5778,5140,5397,5265,5331,4954,5957,6041,6508,6399,6350,6445,1288,4085,4497,4797,4738,4865,4448,4402,4353,4301,985,1052",
+ "startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029",
"endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
"endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
- "endOffsets": "6827,3634,3560,3493,3419,881,930,979,6235,6293,6647,6592,1282,4001,4079,3932,3872,3806,4732,4676,4615,4190,2992,1446,1509,4276,3716,6344,3368,3135,1884,2161,2420,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3308,2764,3188,2117,2368,2320,2263,3091,2073,3035,1977,2028,3248,1392,1701,1799,1651,1749,1603,1555,1219,1167,5134,5058,5259,6189,5582,5517,5661,5772,5951,5846,5201,5447,5325,5391,4998,6035,6114,6541,6439,6393,6502,1340,4135,4551,4859,4791,4922,4491,4442,4396,4347,1046,1113"
+ "endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090"
},
"to": {
"startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
index 1630d03..fe6ada6 100644
--- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
+++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
@@ -8,10 +8,10 @@
"from": {
"startLines": "18",
"startColumns": "4",
- "startOffsets": "730",
+ "startOffsets": "712",
"endLines": "21",
"endColumns": "19",
- "endOffsets": "838"
+ "endOffsets": "817"
},
"to": {
"startLines": "2",
@@ -27,10 +27,10 @@
"from": {
"startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "6629,3647,3580,3506,3455,846,887,936,6169,6215,6574,6523,1225,3911,3980,3851,3784,3720,4654,4593,4529,4114,3018,1398,1452,4169,1805,6273,3395,3178,1917,2204,2455,1971,2957,2903,2851,2652,2603,2507,2556,2699,2747,2248,3335,2798,3222,2160,2407,2350,2294,3122,2115,3079,2022,2064,3275,1346,1657,1755,1609,1707,1561,1515,1173,1119,5036,4976,5179,6092,5495,5425,5560,5639,5824,5750,5112,5369,5237,5303,4926,5929,6013,6484,6375,6326,6421,1288,4058,4469,4769,4710,4837,4420,4374,4325,4273,985,1052",
+ "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029",
"endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
"endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
- "endOffsets": "6803,3714,3641,3574,3500,881,930,979,6209,6267,6623,6568,1282,3974,4052,3905,3845,3778,4704,4648,4587,4163,3073,1446,1509,4248,1880,6318,3449,3216,1965,2242,2501,2016,3012,2951,2897,2693,2646,2550,2597,2741,2792,2288,3389,2845,3269,2198,2449,2401,2344,3172,2154,3116,2058,2109,3329,1392,1701,1799,1651,1749,1603,1555,1219,1167,5106,5030,5231,6161,5554,5489,5633,5744,5923,5818,5173,5419,5297,5363,4970,6007,6086,6517,6415,6369,6478,1340,4108,4523,4831,4763,4894,4463,4414,4368,4319,1046,1113"
+ "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090"
},
"to": {
"startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
index 5b285d0..ba55bf8 100644
--- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
+++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
@@ -8,9 +8,9 @@
"from": {
"startLines": "19,20,21,22,18",
"startColumns": "4,4,4,4,4",
- "startOffsets": "783,836,890,944,730",
+ "startOffsets": "764,816,869,922,712",
"endColumns": "51,52,52,51,51",
- "endOffsets": "830,884,938,991,777"
+ "endOffsets": "811,864,917,969,759"
},
"to": {
"startLines": "13,14,15,16,17",
@@ -25,10 +25,10 @@
"from": {
"startLines": "19,26",
"startColumns": "4,4",
- "startOffsets": "758,1073",
+ "startOffsets": "739,1047",
"endLines": "24,29",
"endColumns": "19,19",
- "endOffsets": "1065,1191"
+ "endOffsets": "1041,1162"
},
"to": {
"startLines": "2,8",
@@ -44,10 +44,10 @@
"from": {
"startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "8136,3970,4234,4137,4067,846,890,943,7624,7674,8077,8025,1308,4694,4789,4622,4537,4453,5668,5584,5481,4967,2043,1991,3461,1515,1569,5029,2138,4318,7738,3898,3649,2198,2519,2825,2257,3389,3327,3269,3043,2990,2885,2939,3094,3145,2567,3831,3206,3699,2471,2769,2680,2621,3586,2420,3540,2315,2359,3763,1459,1784,1894,1736,1840,1679,1630,1252,1198,6131,6063,6375,7525,6744,6662,6819,6909,7153,7073,6216,6292,6602,6440,6521,6007,7298,7421,7983,7854,7796,7908,1393,4898,5394,5805,5735,5886,5334,5278,5215,5154,996,1107",
+ "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084",
"endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
"endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
- "endOffsets": "8544,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,1834,1942,1778,1888,1730,1673,1302,1246,6210,6125,6434,7616,6813,6738,6903,7067,7292,7147,6286,6369,6656,6515,6596,6057,7415,7519,8019,7902,7848,7977,1453,4961,5475,5880,5799,5975,5388,5328,5272,5209,1101,1192"
+ "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169"
},
"to": {
"startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
@@ -63,10 +63,10 @@
"from": {
"startLines": "50,55,64,60,22,26,30,35,40,18,45",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905",
+ "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860",
"endLines": "53,58,67,62,25,29,33,38,43,21,48",
"endColumns": "12,12,12,12,12,12,12,12,12,12,12",
- "endOffsets": "2314,2531,2910,2696,1098,1287,1476,1685,1897,911,2104"
+ "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056"
},
"to": {
"startLines": "125,129,133,137,140,144,148,152,156,160,164",
@@ -82,9 +82,9 @@
"from": {
"startLines": "18",
"startColumns": "4",
- "startOffsets": "730",
+ "startOffsets": "712",
"endColumns": "56",
- "endOffsets": "782"
+ "endOffsets": "764"
},
"to": {
"startLines": "12",
diff --git a/src/Notes-master3/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/src/Notes-master3/app/build/intermediates/processed_res/debug/out/resources-debug.ap_
index 80170f5..5253e98 100644
Binary files a/src/Notes-master3/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ and b/src/Notes-master3/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ differ
diff --git a/src/Notes-master3/app/build/outputs/logs/manifest-merger-debug-report.txt b/src/Notes-master3/app/build/outputs/logs/manifest-merger-debug-report.txt
index 8a80d46..00c3013 100644
--- a/src/Notes-master3/app/build/outputs/logs/manifest-merger-debug-report.txt
+++ b/src/Notes-master3/app/build/outputs/logs/manifest-merger-debug-report.txt
@@ -1,255 +1,255 @@
-- Merging decision tree log ---
manifest
-ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12
-INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12
-INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12
-INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12
-INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12
-INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12
-INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12
+ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12
+INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12
+INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12
+INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12
+INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12
+INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12
+INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12
package
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:20:5-31
- INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml
- INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:20:5-31
+ INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml
+ INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml
android:versionName
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:22:5-30
- INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml
- INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:22:5-30
+ INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml
+ INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml
xmlns:tools
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:19:5-51
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:19:5-51
xmlns:android
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:11-69
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:11-69
android:versionCode
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:21:5-28
- INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml
- INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:21:5-28
+ INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml
+ INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml
uses-sdk
-ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
-INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
-INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
-INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
-INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
+ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
+INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
+INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
+INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
+INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
android:targetSdkVersion
- INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
- INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml
+ INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
+ INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml
tools:ignore
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:25:9-39
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:25:9-39
android:minSdkVersion
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:15-41
- INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml
- INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:15-41
+ INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml
+ INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml
uses-permission#android.permission.WRITE_EXTERNAL_STORAGE
-ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:27:5-81
+ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:27:5-81
android:name
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:27:22-78
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:27:22-78
uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT
-ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:28:5-88
+ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:28:5-88
android:name
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:28:22-85
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:28:22-85
uses-permission#android.permission.INTERNET
-ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:29:5-67
+ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:29:5-67
android:name
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:29:22-64
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:29:22-64
uses-permission#android.permission.READ_CONTACTS
-ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:30:5-72
+ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:30:5-72
android:name
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:30:22-69
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:30:22-69
uses-permission#android.permission.MANAGE_ACCOUNTS
-ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:31:5-74
+ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:31:5-74
android:name
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:31:22-71
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:31:22-71
uses-permission#android.permission.AUTHENTICATE_ACCOUNTS
-ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:32:5-80
+ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:32:5-80
android:name
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:32:22-77
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:32:22-77
uses-permission#android.permission.GET_ACCOUNTS
-ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:33:5-71
+ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:33:5-71
android:name
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:33:22-68
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:33:22-68
uses-permission#android.permission.USE_CREDENTIALS
-ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:34:5-74
+ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:34:5-74
android:name
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:34:22-71
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:34:22-71
uses-permission#android.permission.RECEIVE_BOOT_COMPLETED
-ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:35:5-81
+ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:35:5-81
android:name
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:35:22-78
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:35:22-78
application
-ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:37:5-158:19
+ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:37:5-158:19
android:label
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:39:9-41
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:39:9-41
android:icon
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:38:9-42
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:38:9-42
activity#net.micode.notes.ui.NotesListActivity
-ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:40:9-53:20
+ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:40:9-53:20
android:launchMode
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:44:13-43
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:44:13-43
android:windowSoftInputMode
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:47:13-52
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:47:13-52
android:exported
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:43:13-36
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:43:13-36
android:uiOptions
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:46:13-57
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:46:13-57
android:configChanges
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:42:13-74
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:42:13-74
android:theme
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:45:13-45
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:45:13-45
android:name
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:41:13-49
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:41:13-49
intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER
-ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:49:13-52:29
+ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:49:13-52:29
action#android.intent.action.MAIN
-ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:50:17-69
+ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:50:17-69
android:name
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:50:25-66
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:50:25-66
category#android.intent.category.LAUNCHER
-ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:51:17-77
+ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:51:17-77
android:name
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:51:27-74
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:51:27-74
activity#net.micode.notes.ui.NoteEditActivity
-ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:55:9-85:20
+ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:55:9-85:20
android:launchMode
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:58:13-43
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:58:13-43
android:exported
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:60:13-36
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:60:13-36
android:configChanges
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:57:13-74
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:57:13-74
android:theme
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:59:13-45
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:59:13-45
android:name
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:56:13-48
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:56:13-48
intent-filter#action:name:android.intent.action.VIEW+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note
-ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:62:13-68:29
+ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:62:13-68:29
android:scheme
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:62:28-49
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:62:28-49
tools:ignore
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:63:17-47
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:63:17-47
action#android.intent.action.VIEW
-ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:64:17-69
+ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:64:17-69
android:name
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:64:25-66
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:64:25-66
category#android.intent.category.DEFAULT
-ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:17-76
+ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:17-76
android:name
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:27-73
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:27-73
data
-ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78
+ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78
android:mimeType
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75
intent-filter#action:name:android.intent.action.INSERT_OR_EDIT+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note
-ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:70:13-75:29
+ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:70:13-75:29
action#android.intent.action.INSERT_OR_EDIT
-ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:71:17-79
+ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:71:17-79
android:name
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:71:25-76
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:71:25-76
intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT
-ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:77:13-80:29
+ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:77:13-80:29
action#android.intent.action.SEARCH
-ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:78:17-71
+ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:78:17-71
android:name
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:78:25-68
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:78:25-68
meta-data#android.app.searchable
-ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:82:13-84:54
+ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:82:13-84:54
android:resource
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:84:17-51
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:84:17-51
android:name
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:83:17-54
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:83:17-54
provider#net.micode.notes.data.NotesProvider
-ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:87:9-91:40
+ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:87:9-91:40
android:authorities
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:89:13-47
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:89:13-47
android:multiprocess
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:90:13-40
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:90:13-40
android:exported
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:91:13-37
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:91:13-37
android:name
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:88:13-63
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:88:13-63
receiver#net.micode.notes.widget.NoteWidgetProvider_2x
-ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:93:9-106:20
+ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:93:9-106:20
android:label
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:95:13-50
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:95:13-50
android:exported
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:96:13-36
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:96:13-36
android:name
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:94:13-57
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:94:13-57
intent-filter#action:name:android.appwidget.action.APPWIDGET_DELETED+action:name:android.appwidget.action.APPWIDGET_UPDATE+action:name:android.intent.action.PRIVACY_MODE_CHANGED
-ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:97:13-101:29
+ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:97:13-101:29
action#android.appwidget.action.APPWIDGET_UPDATE
-ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:17-84
+ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:17-84
android:name
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:25-81
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:25-81
action#android.appwidget.action.APPWIDGET_DELETED
-ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:99:17-85
+ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:99:17-85
android:name
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:99:25-82
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:99:25-82
action#android.intent.action.PRIVACY_MODE_CHANGED
-ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:100:17-85
+ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:100:17-85
android:name
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:100:25-82
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:100:25-82
meta-data#android.appwidget.provider
-ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:103:13-105:58
+ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:103:13-105:58
android:resource
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:105:17-55
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:105:17-55
android:name
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:104:17-58
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:104:17-58
receiver#net.micode.notes.widget.NoteWidgetProvider_4x
-ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:107:9-121:20
+ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:107:9-121:20
android:label
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:109:13-50
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:109:13-50
android:exported
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:110:13-36
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:110:13-36
android:name
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:108:13-57
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:108:13-57
receiver#net.micode.notes.ui.AlarmInitReceiver
-ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:123:9-128:20
+ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:123:9-128:20
android:exported
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:124:13-36
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:124:13-36
android:name
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:123:19-55
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:123:19-55
intent-filter#action:name:android.intent.action.BOOT_COMPLETED
-ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:125:13-127:29
+ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:125:13-127:29
action#android.intent.action.BOOT_COMPLETED
-ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:126:17-79
+ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:126:17-79
android:name
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:126:25-76
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:126:25-76
receiver#net.micode.notes.ui.AlarmReceiver
-ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:130:9-133:20
+ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:130:9-133:20
android:process
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:132:13-38
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:132:13-38
android:name
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:131:13-61
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:131:13-61
activity#net.micode.notes.ui.AlarmAlertActivity
-ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:135:9-141:20
+ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:135:9-141:20
android:label
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:137:13-45
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:137:13-45
android:launchMode
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:138:13-48
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:138:13-48
tools:ignore
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:140:13-42
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:140:13-42
android:theme
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:139:13-75
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:139:13-75
android:name
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:136:13-50
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:136:13-50
activity#net.micode.notes.ui.NotesPreferenceActivity
-ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:143:9-148:20
+ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:143:9-148:20
android:label
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:145:13-54
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:145:13-54
android:launchMode
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:146:13-43
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:146:13-43
android:theme
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:147:13-60
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:147:13-60
android:name
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:144:13-71
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:144:13-71
service#net.micode.notes.gtask.remote.GTaskSyncService
-ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:150:9-153:19
+ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:150:9-153:19
android:exported
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:152:13-37
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:152:13-37
android:name
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:151:13-74
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:151:13-74
meta-data#android.app.default_searchable
-ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:155:9-157:52
+ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:155:9-157:52
android:value
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:157:13-49
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:157:13-49
android:name
- ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:156:13-58
+ ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:156:13-58
diff --git a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin
index de3f596..cd4959d 100644
Binary files a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin and b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin differ